version 0.7.10.7.1

4 files changed, 49 insertions, 64 deletions

diff --git a/LICENSE b/LICENSE
index 97e1553..2061827 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,30 +1,19 @@
-Copyright (c)2010, Patrick Brisbin
+Copyright (c) 2015 Pat Brisbin <pbrisbin@gmail.com>
 
-All rights reserved.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-
-    * Neither the name of Patrick Brisbin nor the names of other
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/gravatar.cabal b/gravatar.cabal
index 57a253e..154d870 100644
--- a/gravatar.cabal
+++ b/gravatar.cabal
@@ -1,28 +1,36 @@
-name:                gravatar
-version:             0.7
-description:         Look up gravatar image urls by email address
-synopsis:            Look up gravatar image urls by email address
-homepage:            http://github.com/pbrisbin/gravatar
-license:             BSD3
-license-file:        LICENSE
-author:              Patrick Brisbin
-maintainer:          me@pbrisbin.com
-category:            Web, Yesod
-build-type:          Simple
-cabal-version:       >=1.6
+name:                   gravatar
+version:                0.7.1
+author:                 Pat Brisbin <pbrisbin@gmail.com>
+maintainer:             Pat Brisbin <pbrisbin@gmail.com>
+license:                MIT
+license-file:           LICENSE
+synopsis:               Generate Gravatar image URLs
+description:            Generate Gravatar image URLs
+cabal-version:          >= 1.10
+build-type:             Simple
 
 library
-  exposed-modules: Network.Gravatar
+  default-language:     Haskell2010
+  hs-source-dirs:       src
+  ghc-options:          -Wall
+  exposed-modules:      Network.Gravatar
+  build-depends:        base       >= 4     && < 5
+                      , text       >= 0.11  && < 2.0
+                      , bytestring >= 0.9.1 && < 0.11
+                      , pureMD5                < 3
+                      , HTTP
+                      , data-default
 
-  build-depends: base       >= 4     && < 5
-               , text       >= 0.11  && < 2.0
-               , bytestring >= 0.9.1 && < 0.11
-               , pureMD5    < 3
-               , HTTP
-               , data-default
+test-suite spec
+  type:                 exitcode-stdio-1.0
+  default-language:     Haskell2010
+  hs-source-dirs:       test
+  ghc-options:          -Wall
+  main-is:              Spec.hs
+  build-depends:        base
+                      , hspec
+                      , gravatar
 
-  ghc-options: -Wall
-  
 source-repository head
-  type:         git
-  location:     git://github.com/pbrisbin/gravatar.git
+  type:                 git
+  location:             https://github.com/pbrisbin/gravatar
diff --git a/Network/Gravatar.hs b/src/Network/Gravatar.hs
index b37ba69..3fd5f88 100644
--- a/Network/Gravatar.hs
+++ b/src/Network/Gravatar.hs
@@ -1,16 +1,3 @@
--------------------------------------------------------------------------------
--- |
--- Module      :  Network.Gravatar
--- Copyright   :  (c) Patrick Brisbin 2010
--- License     :  as-is
---
--- Maintainer  :  pbrisbin@gmail.com
--- Stability   :  unstable
--- Portability :  unportable
---
--- <http://en.gravatar.com/>.
---
--------------------------------------------------------------------------------
 module Network.Gravatar
     ( gravatar
 
@@ -20,9 +7,9 @@ module Network.Gravatar
     , DefaultImg(..)
     , ForceDefault(..)
     , Rating(..)
+    , Scheme (..)
     , Default(..)
     , defaultConfig
-    , Scheme (..)
     ) where
 
 import Data.Digest.Pure.MD5 (md5)
diff --git a/test/Spec.hs b/test/Spec.hs
new file mode 100644
index 0000000..a824f8c
--- /dev/null
+++ b/test/Spec.hs
@@ -0,0 +1 @@
+{-# OPTIONS_GHC -F -pgmF hspec-discover #-}