From ba686f16e978c1a7ea79789234fa4f33c9eda315 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 1 May 2011 22:14:32 +0300 Subject: [PATCH] Remove "Helpers" --- Yesod/{Helpers => }/Auth.hs | 2 +- Yesod/{Helpers => }/Auth/Dummy.hs | 4 ++-- Yesod/{Helpers => }/Auth/Email.hs | 4 ++-- Yesod/{Helpers => }/Auth/Facebook.hs | 4 ++-- Yesod/{Helpers => }/Auth/HashDB.hs | 8 ++++---- Yesod/{Helpers => }/Auth/OAuth.hs | 4 ++-- Yesod/{Helpers => }/Auth/OpenId.hs | 4 ++-- Yesod/{Helpers => }/Auth/Rpxnow.hs | 4 ++-- yesod-auth.cabal | 22 +++++++++++----------- 9 files changed, 28 insertions(+), 28 deletions(-) rename Yesod/{Helpers => }/Auth.hs (99%) rename Yesod/{Helpers => }/Auth/Dummy.hs (94%) rename Yesod/{Helpers => }/Auth/Email.hs (99%) rename Yesod/{Helpers => }/Auth/Facebook.hs (97%) rename Yesod/{Helpers => }/Auth/HashDB.hs (97%) rename Yesod/{Helpers => }/Auth/OAuth.hs (98%) rename Yesod/{Helpers => }/Auth/OpenId.hs (98%) rename Yesod/{Helpers => }/Auth/Rpxnow.hs (96%) diff --git a/Yesod/Helpers/Auth.hs b/Yesod/Auth.hs similarity index 99% rename from Yesod/Helpers/Auth.hs rename to Yesod/Auth.hs index 0057966b..4d4a966e 100644 --- a/Yesod/Helpers/Auth.hs +++ b/Yesod/Auth.hs @@ -5,7 +5,7 @@ {-# LANGUAGE RankNTypes #-} {-# LANGUAGE CPP #-} {-# LANGUAGE OverloadedStrings #-} -module Yesod.Helpers.Auth +module Yesod.Auth ( -- * Subsite Auth , AuthPlugin (..) diff --git a/Yesod/Helpers/Auth/Dummy.hs b/Yesod/Auth/Dummy.hs similarity index 94% rename from Yesod/Helpers/Auth/Dummy.hs rename to Yesod/Auth/Dummy.hs index e5125932..405a7ea5 100644 --- a/Yesod/Helpers/Auth/Dummy.hs +++ b/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) diff --git a/Yesod/Helpers/Auth/Email.hs b/Yesod/Auth/Email.hs similarity index 99% rename from Yesod/Helpers/Auth/Email.hs rename to Yesod/Auth/Email.hs index 94f9ac76..4708e72c 100644 --- a/Yesod/Helpers/Auth/Email.hs +++ b/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 ((<$>), (<*>)) diff --git a/Yesod/Helpers/Auth/Facebook.hs b/Yesod/Auth/Facebook.hs similarity index 97% rename from Yesod/Helpers/Auth/Facebook.hs rename to Yesod/Auth/Facebook.hs index 26427995..6d57aa92 100644 --- a/Yesod/Helpers/Auth/Facebook.hs +++ b/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) diff --git a/Yesod/Helpers/Auth/HashDB.hs b/Yesod/Auth/HashDB.hs similarity index 97% rename from Yesod/Helpers/Auth/HashDB.hs rename to Yesod/Auth/HashDB.hs index 42a90791..14e346e8 100644 --- a/Yesod/Helpers/Auth/HashDB.hs +++ b/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 ((<$>), (<*>)) diff --git a/Yesod/Helpers/Auth/OAuth.hs b/Yesod/Auth/OAuth.hs similarity index 98% rename from Yesod/Helpers/Auth/OAuth.hs rename to Yesod/Auth/OAuth.hs index 4e8131d1..347425d5 100644 --- a/Yesod/Helpers/Auth/OAuth.hs +++ b/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 diff --git a/Yesod/Helpers/Auth/OpenId.hs b/Yesod/Auth/OpenId.hs similarity index 98% rename from Yesod/Helpers/Auth/OpenId.hs rename to Yesod/Auth/OpenId.hs index 91626169..9828b352 100644 --- a/Yesod/Helpers/Auth/OpenId.hs +++ b/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 diff --git a/Yesod/Helpers/Auth/Rpxnow.hs b/Yesod/Auth/Rpxnow.hs similarity index 96% rename from Yesod/Helpers/Auth/Rpxnow.hs rename to Yesod/Auth/Rpxnow.hs index f16f680b..b3a06daa 100644 --- a/Yesod/Helpers/Auth/Rpxnow.hs +++ b/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) diff --git a/yesod-auth.cabal b/yesod-auth.cabal index 6e5ff119..31a95502 100644 --- a/yesod-auth.cabal +++ b/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 - Yesod.Helpers.Auth.Dummy - Yesod.Helpers.Auth.Email - Yesod.Helpers.Auth.Facebook - Yesod.Helpers.Auth.OpenId - Yesod.Helpers.Auth.OAuth - Yesod.Helpers.Auth.Rpxnow - Yesod.Helpers.Auth.HashDB + exposed-modules: Yesod.Auth + Yesod.Auth.Dummy + Yesod.Auth.Email + Yesod.Auth.Facebook + Yesod.Auth.OpenId + Yesod.Auth.OAuth + Yesod.Auth.Rpxnow + Yesod.Auth.HashDB ghc-options: -Wall source-repository head