diff --git a/project_template/default/foo.cabal b/project_template/default/foo.cabal --- a/project_template/default/foo.cabal +++ b/project_template/default/foo.cabal @@ -31,7 +31,7 @@ snap-core >= 0.9 && < 0.11, snap-server >= 0.9 && < 0.11, snap-loader-static >= 0.9 && < 0.10, - text >= 0.11 && < 0.12, + text >= 0.11 && < 1.2, time >= 1.1 && < 1.5, xmlhtml >= 0.1 diff --git a/snap.cabal b/snap.cabal --- a/snap.cabal +++ b/snap.cabal @@ -1,5 +1,5 @@ name: snap -version: 0.13.1.2 +version: 0.13.2.0 synopsis: Top-level package for the Snap Web Framework description: This is the top-level package for the official Snap Framework libraries. @@ -145,7 +145,7 @@ build-depends: MonadCatchIO-transformers >= 0.2 && < 0.4, aeson >= 0.6 && < 0.7, - attoparsec >= 0.10 && < 0.11, + attoparsec >= 0.10 && < 0.12, bytestring >= 0.9.1 && < 0.11, cereal >= 0.3 && < 0.5, clientsession >= 0.8 && < 0.10, @@ -169,7 +169,7 @@ snap-server >= 0.9 && < 0.11, stm >= 2.2 && < 2.5, syb >= 0.1 && < 0.5, - text >= 0.11 && < 0.12, + text >= 0.11 && < 1.2, time >= 1.1 && < 1.5, transformers >= 0.2 && < 0.4, unordered-containers >= 0.1.4 && < 0.3, @@ -232,7 +232,7 @@ old-time >= 1.0 && < 1.2, snap-server >= 0.9 && < 0.11, template-haskell >= 2.2 && < 2.9, - text >= 0.11 && < 0.12 + text >= 0.11 && < 1.2 extensions: OverloadedStrings diff --git a/src/Snap/Snaplet/Auth/Handlers.hs b/src/Snap/Snaplet/Auth/Handlers.hs --- a/src/Snap/Snaplet/Auth/Handlers.hs +++ b/src/Snap/Snaplet/Auth/Handlers.hs @@ -447,7 +447,7 @@ (runMaybeT $ do field <- MaybeT $ return remf value <- MaybeT $ getParam field - return $ value == "1") + return $ value == "1" || value == "on") password <- noteT PasswordMissing $ hoistMaybe mbPassword username <- noteT UsernameMissing $ hoistMaybe mbUsername diff --git a/src/Snap/Snaplet/Internal/Initializer.hs b/src/Snap/Snaplet/Internal/Initializer.hs --- a/src/Snap/Snaplet/Internal/Initializer.hs +++ b/src/Snap/Snaplet/Internal/Initializer.hs @@ -304,13 +304,21 @@ ------------------------------------------------------------------------------ -- | Runs another snaplet's initializer and returns the initialized Snaplet --- value. The difference between this and nestSnaplet is the first type +-- value. The difference between this and 'nestSnaplet' is the first type -- parameter in the third argument. The \"v1 v1\" makes the child snaplet --- think that it is top-level, which means that it will not be able to use --- functionality provided by snaplets included above it in the snaplet tree. --- This strongly isolates the child snaplet, and allows you to eliminate the b --- type variable. The embedded snaplet can still get functionality from other --- snaplets, but only if it nests or embeds the snaplet itself. +-- think that it is the top-level state, which means that it will not be able +-- to use functionality provided by snaplets included above it in the snaplet +-- tree. This strongly isolates the child snaplet, and allows you to eliminate +-- the b type variable. The embedded snaplet can still get functionality +-- from other snaplets, but only if it nests or embeds the snaplet itself. +-- +-- Note that this function does not change where this snaplet is located in +-- the filesystem. The snaplet directory structure convention stays the same. +-- Also, embedSnaplet limits the ways that snaplets can interact, so we +-- usually recommend using nestSnaplet instead. However, we provide this +-- function because sometimes reduced flexibility is useful. In short, if +-- you don't understand what this function does for you from looking at its +-- type, you probably don't want to use it. embedSnaplet :: ByteString -- ^ The root url for all the snaplet's routes. An empty -- string gives the routes the same root as the parent diff --git a/test/snap-testsuite.cabal b/test/snap-testsuite.cabal --- a/test/snap-testsuite.cabal +++ b/test/snap-testsuite.cabal @@ -27,7 +27,7 @@ MonadCatchIO-transformers >= 0.2 && < 0.4, aeson >= 0.6 && < 0.7, - attoparsec >= 0.10 && < 0.11, + attoparsec >= 0.10 && < 0.12, bytestring >= 0.9.1 && < 0.11, cereal >= 0.3 && < 0.5, clientsession >= 0.8 && < 0.10, @@ -51,7 +51,7 @@ snap-server >= 0.9 && < 0.11, stm >= 2.2 && < 2.5, syb >= 0.1 && < 0.5, - text >= 0.11 && < 0.12, + text >= 0.11 && < 1.2, time >= 1.1 && < 1.5, transformers >= 0.2 && < 0.4, unordered-containers >= 0.1.4 && < 0.3, @@ -99,7 +99,7 @@ build-depends: MonadCatchIO-transformers >= 0.2 && < 0.4, aeson >= 0.6 && < 0.7, - attoparsec >= 0.10 && < 0.11, + attoparsec >= 0.10 && < 0.12, bytestring >= 0.9.1 && < 0.11, cereal >= 0.3 && < 0.5, clientsession >= 0.8 && < 0.10, @@ -123,7 +123,7 @@ snap-server >= 0.9 && < 0.11, stm >= 2.2 && < 2.5, syb >= 0.1 && < 0.5, - text >= 0.11 && < 0.12, + text >= 0.11 && < 1.2, time >= 1.1 && < 1.5, transformers >= 0.2 && < 0.4, unordered-containers >= 0.1.4 && < 0.3, @@ -181,7 +181,7 @@ MonadCatchIO-transformers >= 0.2 && < 0.4, aeson >= 0.6 && < 0.7, - attoparsec >= 0.10 && < 0.11, + attoparsec >= 0.10 && < 0.12, bytestring >= 0.9.1 && < 0.11, cereal >= 0.3 && < 0.5, clientsession >= 0.8 && < 0.10, @@ -205,7 +205,7 @@ snap-server >= 0.9 && < 0.11, stm >= 2.2 && < 2.5, syb >= 0.1 && < 0.5, - text >= 0.11 && < 0.12, + text >= 0.11 && < 1.2, time >= 1.1 && < 1.5, transformers >= 0.2 && < 0.4, unordered-containers >= 0.1.4 && < 0.3,