Remove "Helpers"

Yesod/Auth.hs

@@ -5,7 +5,7 @@
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
-module Yesod.Helpers.Auth
+module Yesod.Auth
     ( -- * Subsite
       Auth
     , AuthPlugin (..)

Yesod/Auth/Dummy.hs

@@ -4,11 +4,11 @@
 -- | Provides a dummy authentication module that simply lets a user specify
 -- his/her identifier. This is not intended for real world use, just for
 -- testing.
-module Yesod.Helpers.Auth.Dummy
+module Yesod.Auth.Dummy
     ( authDummy
     ) where
 
-import Yesod.Helpers.Auth
+import Yesod.Auth
 import Yesod.Form (runFormPost', stringInput)
 import Yesod.Handler (notFound)
 import Text.Hamlet (hamlet)

Yesod/Auth/Email.hs

@@ -2,7 +2,7 @@
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE FlexibleContexts #-}
-module Yesod.Helpers.Auth.Email
+module Yesod.Auth.Email
     ( -- * Plugin
       authEmail
     , YesodAuthEmail (..)
@@ -15,7 +15,7 @@ module Yesod.Helpers.Auth.Email
     ) where
 
 import Network.Mail.Mime (randomString)
-import Yesod.Helpers.Auth
+import Yesod.Auth
 import System.Random
 import Control.Monad (when)
 import Control.Applicative ((<$>), (<*>))

Yesod/Auth/Facebook.hs

@@ -1,12 +1,12 @@
 {-# LANGUAGE QuasiQuotes #-}
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
-module Yesod.Helpers.Auth.Facebook
+module Yesod.Auth.Facebook
     ( authFacebook
     , facebookUrl
     ) where
 
-import Yesod.Helpers.Auth
+import Yesod.Auth
 import qualified Web.Authenticate.Facebook as Facebook
 import Data.Aeson
 import Data.Aeson.Types (parseMaybe)

Yesod/Auth/HashDB.hs

@@ -7,7 +7,7 @@
 {-# LANGUAGE OverloadedStrings          #-}
 -------------------------------------------------------------------------------
 -- |
--- Module      :  Yesod.Helpers.Auth.HashDB
+-- Module      :  Yesod.Auth.HashDB
 -- Copyright   :  (c) Patrick Brisbin 2010 
 -- License     :  as-is
 --
@@ -22,7 +22,7 @@
 -- Example usage:
 --
 -- > -- import the function
--- > import Helpers.Auth.HashDB
+-- > import Auth.HashDB
 -- >
 -- > -- make sure you have an auth route
 -- > mkYesodData "MyApp" [$parseRoutes|
@@ -57,7 +57,7 @@
 -- can be used to get the hash from the commandline.
 --
 -------------------------------------------------------------------------------
-module Yesod.Helpers.Auth.HashDB
+module Yesod.Auth.HashDB
     ( authHashDB
     , getAuthIdHashDB
     , UserId
@@ -67,7 +67,7 @@ module Yesod.Helpers.Auth.HashDB
 import Yesod.Persist
 import Yesod.Handler
 import Yesod.Form
-import Yesod.Helpers.Auth
+import Yesod.Auth
 import Text.Hamlet (hamlet)
 
 import Control.Applicative         ((<$>), (<*>))

Yesod/Auth/OAuth.hs

@@ -1,12 +1,12 @@
 {-# LANGUAGE CPP, QuasiQuotes, OverloadedStrings #-}
 {-# OPTIONS_GHC -fwarn-unused-imports #-}
-module Yesod.Helpers.Auth.OAuth
+module Yesod.Auth.OAuth
     ( authOAuth
     , oauthUrl
     , authTwitter
     , twitterUrl
     ) where
-import Yesod.Helpers.Auth
+import Yesod.Auth
 import Yesod.Form
 import Yesod.Handler
 import Yesod.Widget

Yesod/Auth/OpenId.hs

@@ -1,12 +1,12 @@
 {-# LANGUAGE QuasiQuotes #-}
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
-module Yesod.Helpers.Auth.OpenId
+module Yesod.Auth.OpenId
     ( authOpenId
     , forwardUrl
     ) where
 
-import Yesod.Helpers.Auth
+import Yesod.Auth
 import qualified Web.Authenticate.OpenId as OpenId
 import Control.Monad.Attempt
 

Yesod/Auth/Rpxnow.hs

@@ -1,11 +1,11 @@
 {-# LANGUAGE QuasiQuotes #-}
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
-module Yesod.Helpers.Auth.Rpxnow
+module Yesod.Auth.Rpxnow
     ( authRpxnow
     ) where
 
-import Yesod.Helpers.Auth
+import Yesod.Auth
 import qualified Web.Authenticate.Rpxnow as Rpxnow
 import Control.Monad (mplus)
 

yesod-auth.cabal

@@ -1,5 +1,5 @@
 name:            yesod-auth
-version:         0.4.0.1
+version:         0.5.0
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman, Patrick Brisbin
@@ -21,7 +21,7 @@ library
         build-depends:   base                      >= 4        && < 4.3
     build-depends:   authenticate            >= 0.9       && < 0.10
                    , bytestring              >= 0.9.1.4   && < 0.10
-                   , yesod-core              >= 0.8       && < 0.9
+                   , yesod-core              >= 0.8.1     && < 0.9
                    , wai                     >= 0.4       && < 0.5
                    , template-haskell
                    , pureMD5                 >= 1.1       && < 2.2
@@ -31,7 +31,7 @@ library
                    , mime-mail               >= 0.3       && < 0.4
                    , blaze-html              >= 0.4       && < 0.5
                    , yesod-persistent        >= 0.1       && < 0.2
-                   , hamlet                  >= 0.8       && < 0.9
+                   , hamlet                  >= 0.8.1     && < 0.9
                    , yesod-json              >= 0.1       && < 0.2
                    , containers              >= 0.2       && < 0.5
                    , yesod-form              >= 0.1       && < 0.2
@@ -43,14 +43,14 @@ library
                    , aeson                   >= 0.3.2.2   && < 0.4
                    , web-routes-quasi        >= 0.7       && < 0.8
 
-    exposed-modules: Yesod.Helpers.Auth
+    exposed-modules: Yesod.Auth
-                     Yesod.Helpers.Auth.Dummy
+                     Yesod.Auth.Dummy
-                     Yesod.Helpers.Auth.Email
+                     Yesod.Auth.Email
-                     Yesod.Helpers.Auth.Facebook
+                     Yesod.Auth.Facebook
-                     Yesod.Helpers.Auth.OpenId
+                     Yesod.Auth.OpenId
-                     Yesod.Helpers.Auth.OAuth
+                     Yesod.Auth.OAuth
-                     Yesod.Helpers.Auth.Rpxnow
+                     Yesod.Auth.Rpxnow
-                     Yesod.Helpers.Auth.HashDB
+                     Yesod.Auth.HashDB
     ghc-options:     -Wall
 
 source-repository head