diff --git a/README.md b/README.md index 37e71c7c..5098481a 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ Isolating an entire project with a virtual machine is also a great idea, you jus cabal-dev creates a sandboxed environment for an individual cabal package. Instead of using the `cabal` command, use the `cabal-dev` command which will use the sandbox. -Use `yesod-devel --dev` when developing your application. +Use `yesod devel --dev` when developing your application. diff --git a/yesod-auth-oauth/yesod-auth-oauth.cabal b/yesod-auth-oauth/yesod-auth-oauth.cabal index 187617aa..556aa6e0 100644 --- a/yesod-auth-oauth/yesod-auth-oauth.cabal +++ b/yesod-auth-oauth/yesod-auth-oauth.cabal @@ -1,5 +1,5 @@ name: yesod-auth-oauth -version: 1.1.0.1 +version: 1.1.0.2 license: BSD3 license-file: LICENSE author: Hiromi Ishii @@ -21,7 +21,7 @@ library else build-depends: base >= 4 && < 4.3 build-depends: authenticate-oauth >= 1.4 && < 1.5 - , bytestring >= 0.9.1.4 && < 0.10 + , bytestring >= 0.9.1.4 , yesod-core >= 1.1 && < 1.2 , yesod-auth >= 1.1 && < 1.2 , text >= 0.7 && < 0.12 diff --git a/yesod-auth/Yesod/Auth/BrowserId.hs b/yesod-auth/Yesod/Auth/BrowserId.hs index 70aed162..9aab88ac 100644 --- a/yesod-auth/Yesod/Auth/BrowserId.hs +++ b/yesod-auth/Yesod/Auth/BrowserId.hs @@ -1,5 +1,6 @@ {-# LANGUAGE QuasiQuotes #-} {-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE TemplateHaskell #-} module Yesod.Auth.BrowserId ( authBrowserId , authBrowserIdAudience @@ -19,6 +20,8 @@ import Control.Exception (throwIO) import Text.Julius (julius, rawJS) import Data.Aeson (toJSON) import Network.URI (uriPath, parseURI) +import Data.FileEmbed (embedFile) +import Data.ByteString (ByteString) pid :: Text pid = "browserid" @@ -62,6 +65,10 @@ helper maudience = AuthPlugin , credsIdent = email , credsExtra = [] } + ("GET", ["static", "sign-in.png"]) -> sendResponse + ( "image/png" :: ByteString + , toContent $(embedFile "persona_sign_in_blue.png") + ) (_, []) -> badMethod _ -> notFound , apLogin = \toMaster -> do @@ -76,10 +83,11 @@ helper maudience = AuthPlugin $newline never

- + |] } where + loginIcon = PluginR pid ["static", "sign-in.png"] stripScheme t = fromMaybe t $ T.stripPrefix "//" $ snd $ T.breakOn "//" t -- | Generates a function to handle on-click events, and returns that function diff --git a/yesod-auth/persona_sign_in_blue.png b/yesod-auth/persona_sign_in_blue.png new file mode 100644 index 00000000..ab88a715 Binary files /dev/null and b/yesod-auth/persona_sign_in_blue.png differ diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal index cada4030..4c8bd144 100644 --- a/yesod-auth/yesod-auth.cabal +++ b/yesod-auth/yesod-auth.cabal @@ -1,5 +1,5 @@ name: yesod-auth -version: 1.1.4.1 +version: 1.1.5.3 license: MIT license-file: LICENSE author: Michael Snoyman, Patrick Brisbin @@ -11,37 +11,39 @@ cabal-version: >= 1.6.0 build-type: Simple homepage: http://www.yesodweb.com/ description: Authentication for Yesod. +extra-source-files: persona_sign_in_blue.png library build-depends: base >= 4 && < 5 - , authenticate >= 1.3 && < 1.4 + , authenticate >= 1.3 , bytestring >= 0.9.1.4 , yesod-core >= 1.1 && < 1.2 - , wai >= 1.3 && < 1.4 + , wai >= 1.3 , template-haskell - , pureMD5 >= 2.0 && < 2.2 - , random >= 1.0.0.2 && < 1.1 - , text >= 0.7 && < 0.12 - , mime-mail >= 0.3 && < 0.5 - , yesod-persistent >= 1.1 && < 1.2 + , pureMD5 >= 2.0 + , random >= 1.0.0.2 + , text >= 0.7 + , mime-mail >= 0.3 + , yesod-persistent >= 1.1 , hamlet >= 1.1 && < 1.2 , shakespeare-css >= 1.0 && < 1.1 , shakespeare-js >= 1.0.2 && < 1.2 , containers , unordered-containers , yesod-form >= 1.1 && < 1.3 - , transformers >= 0.2.2 && < 0.4 + , transformers >= 0.2.2 , persistent >= 1.0 && < 1.2 , persistent-template >= 1.0 && < 1.2 - , SHA >= 1.4.1.3 && < 1.7 - , http-conduit >= 1.5 && < 1.9 + , SHA >= 1.4.1.3 + , http-conduit >= 1.5 , aeson >= 0.5 - , pwstore-fast >= 2.2 && < 3 + , pwstore-fast >= 2.2 , lifted-base >= 0.1 - , blaze-html >= 0.5 && < 0.6 - , blaze-markup >= 0.5.1 && < 0.6 + , blaze-html >= 0.5 + , blaze-markup >= 0.5.1 , network , http-types + , file-embed exposed-modules: Yesod.Auth Yesod.Auth.BrowserId diff --git a/yesod-core/Yesod/Handler.hs b/yesod-core/Yesod/Handler.hs index 99edcc31..ccc3a0c4 100644 --- a/yesod-core/Yesod/Handler.hs +++ b/yesod-core/Yesod/Handler.hs @@ -1056,10 +1056,16 @@ instance MonadResource (GHandler sub master) where #endif instance MonadLogger (GHandler sub master) where +#if MIN_VERSION_monad_logger(0, 3, 0) + monadLoggerLog a b c d = do + hd <- ask + liftIO $ handlerLog hd a b c (toLogStr d) +#else monadLoggerLog a c d = monadLoggerLogSource a "" c d monadLoggerLogSource a b c d = do hd <- ask liftIO $ handlerLog hd a b c (toLogStr d) +#endif instance Exception e => Failure e (GHandler sub master) where failure = liftIO . throwIO diff --git a/yesod-core/Yesod/Internal/Core.hs b/yesod-core/Yesod/Internal/Core.hs index c4a9796f..cd3f0c02 100644 --- a/yesod-core/Yesod/Internal/Core.hs +++ b/yesod-core/Yesod/Internal/Core.hs @@ -909,6 +909,9 @@ runFakeHandler fakeSessionMap logger master handler = liftIO $ do , W.queryString = [] , W.requestBody = mempty , W.vault = mempty +#if MIN_VERSION_wai(1, 4, 0) + , W.requestBodyLength = W.KnownLength 0 +#endif } fakeRequest = Request diff --git a/yesod-core/Yesod/Widget.hs b/yesod-core/Yesod/Widget.hs index 2a4ec532..6642bc60 100644 --- a/yesod-core/Yesod/Widget.hs +++ b/yesod-core/Yesod/Widget.hs @@ -313,5 +313,9 @@ instance MonadResource (GWidget sub master) where #endif instance MonadLogger (GWidget sub master) where +#if MIN_VERSION_monad_logger(0, 3, 0) + monadLoggerLog a b c = lift . monadLoggerLog a b c +#else monadLoggerLog a b = lift . monadLoggerLog a b monadLoggerLogSource a b c = lift . monadLoggerLogSource a b c +#endif diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal index 071791af..16215a81 100644 --- a/yesod-core/yesod-core.cabal +++ b/yesod-core/yesod-core.cabal @@ -1,5 +1,5 @@ name: yesod-core -version: 1.1.8 +version: 1.1.8.2 license: MIT license-file: LICENSE author: Michael Snoyman @@ -50,7 +50,7 @@ library build-depends: base >= 4.3 && < 5 , time >= 1.1.4 , yesod-routes >= 1.1 && < 1.2 - , wai >= 1.3 && < 1.4 + , wai >= 1.3 && < 1.5 , wai-extra >= 1.3 && < 1.4 , bytestring >= 0.9.1.4 , text >= 0.7 && < 0.12 @@ -79,13 +79,13 @@ library , vector >= 0.9 && < 0.11 , aeson >= 0.5 , fast-logger >= 0.2 - , monad-logger >= 0.2.1 && < 0.3 - , conduit >= 0.5 && < 0.6 + , monad-logger >= 0.2.1 && < 0.4 + , conduit >= 0.5 , resourcet >= 0.3 && < 0.5 , lifted-base >= 0.1 - , blaze-html >= 0.5 && < 0.6 - , blaze-markup >= 0.5.1 && < 0.6 , attoparsec-conduit + , blaze-html >= 0.5 + , blaze-markup >= 0.5.1 exposed-modules: Yesod.Content Yesod.Core diff --git a/yesod-default/yesod-default.cabal b/yesod-default/yesod-default.cabal index 013db642..130c7ba4 100644 --- a/yesod-default/yesod-default.cabal +++ b/yesod-default/yesod-default.cabal @@ -1,5 +1,5 @@ name: yesod-default -version: 1.1.3 +version: 1.1.3.2 license: MIT license-file: LICENSE author: Patrick Brisbin @@ -20,7 +20,7 @@ library build-depends: base >= 4 && < 5 , yesod-core >= 1.1 && < 1.2 , warp >= 1.3 && < 1.4 - , wai >= 1.3 && < 1.4 + , wai >= 1.3 && < 1.5 , wai-extra >= 1.3 && < 1.4 , bytestring >= 0.9.1.4 , transformers >= 0.2.2 && < 0.4 @@ -30,7 +30,7 @@ library , shakespeare-js >= 1.0 && < 1.2 , template-haskell , yaml >= 0.8 && < 0.9 - , network-conduit >= 0.5 && < 0.7 + , network-conduit >= 0.5 , unordered-containers , hamlet >= 1.1 && < 1.2 , data-default diff --git a/yesod-form/Yesod/Form/Fields.hs b/yesod-form/Yesod/Form/Fields.hs index 7917ce27..adc59deb 100644 --- a/yesod-form/Yesod/Form/Fields.hs +++ b/yesod-form/Yesod/Form/Fields.hs @@ -328,7 +328,7 @@ $newline never