Merge remote-tracking branch 'origin/master' into persistent2-simpler-dispatch

yesod-bin/HsFile.hs

@@ -2,17 +2,31 @@
 module HsFile (mkHsFile) where
 import Text.ProjectTemplate (createTemplate)
 import Data.Conduit 
-    ( ($$), (=$), runResourceT, ResourceT, ConduitM, awaitForever, yield )
+    ( ($$), (=$), runResourceT, ResourceT, ConduitM, awaitForever, yield, Source )
 import qualified Data.Conduit.List as CL
-import Data.Conduit.Filesystem (traverse, sourceFile)
 import Prelude hiding (FilePath)
 import Filesystem.Path ( FilePath )
 import Filesystem.Path.CurrentOS ( encodeString )
+import qualified Filesystem as F
 import qualified Data.ByteString as BS
 import Control.Monad.IO.Class (liftIO)
 
+traverse :: FilePath -> Source (ResourceT IO) FilePath
+traverse dir = do
+    liftIO (F.listDirectory dir) >>= mapM_ go
+  where
+    go fp = do
+        isFile' <- liftIO $ F.isFile fp
+        if isFile'
+            then yield fp
+            else do
+                isDir <- liftIO $ F.isDirectory fp
+                if isDir
+                    then traverse fp
+                    else return ()
+
 mkHsFile :: IO ()
-mkHsFile = runResourceT $ traverse False "."
+mkHsFile = runResourceT $ traverse "."
         $$ readIt
         =$ createTemplate 
         =$ awaitForever (liftIO . BS.putStr)

yesod-bin/yesod-bin.cabal

@@ -1,5 +1,5 @@
 name:            yesod-bin
-version:         1.2.7.2
+version:         1.2.7.3
 license:         MIT
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
@@ -90,7 +90,6 @@ executable             yesod
                      , warp               >= 1.3.7.5
                      , wai                >= 1.4
                      , data-default-class
-                     , filesystem-conduit >= 1.0          && < 2.0
 
     ghc-options:       -Wall -threaded
     main-is:           main.hs

yesod-core/Yesod/Core/Handler.hs

@@ -9,6 +9,7 @@
 {-# LANGUAGE TupleSections              #-}
 {-# LANGUAGE TypeFamilies               #-}
 {-# LANGUAGE RankNTypes                 #-}
+{-# LANGUAGE DeriveDataTypeable         #-}
 ---------------------------------------------------------
 --
 -- Module        : Yesod.Handler
@@ -74,6 +75,7 @@ module Yesod.Core.Handler
     , redirect
     , redirectWith
     , redirectToPost
+    , Fragment(..)
       -- ** Errors
     , notFound
     , badMethod
@@ -188,6 +190,7 @@ import           Data.Dynamic                  (fromDynamic, toDyn)
 import qualified Data.IORef.Lifted             as I
 import           Data.Maybe                    (listToMaybe, mapMaybe)
 import           Data.Typeable                 (Typeable, typeOf)
+import           Web.PathPieces                (PathPiece(..))
 import           Yesod.Core.Class.Handler
 import           Yesod.Core.Types
 import           Yesod.Routes.Class            (Route)
@@ -758,6 +761,18 @@ instance (key ~ Text, val ~ Text) => RedirectUrl master (Route master, [(key, va
 instance (key ~ Text, val ~ Text) => RedirectUrl master (Route master, Map.Map key val) where
     toTextUrl (url, params) = toTextUrl (url, Map.toList params)
 
+-- | Add a fragment identifier to a route to be used when
+-- redirecting.  For example:
+--
+-- > redirect (NewsfeedR :#: storyId)
+--
+-- Since 1.2.9.
+data Fragment a b = a :#: b deriving (Show, Typeable)
+
+instance (RedirectUrl master a, PathPiece b) => RedirectUrl master (Fragment a b) where
+  toTextUrl (a :#: b) = (\ua -> T.concat [ua, "#", toPathPiece b]) <$> toTextUrl a
+
+
 -- | Lookup for session data.
 lookupSession :: MonadHandler m => Text -> m (Maybe Text)
 lookupSession = (liftM . fmap) (decodeUtf8With lenientDecode) . lookupSessionBS

yesod-core/yesod-core.cabal

@@ -1,5 +1,5 @@
 name:            yesod-core
-version:         1.2.8
+version:         1.2.9
 license:         MIT
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>

yesod-form/hello-forms.hs

@@ -23,7 +23,8 @@ mkYesod "HelloForms" [parseRoutes|
 /file FileR GET POST
 |]
 
-myForm = fixType $ runFormGet $ renderDivs $ pure (,,,,,,,,,)
+myForm = fixType $ runFormGet $ renderDivs $ pure (,,,,,,,,,,)
+    <*> pure "pure works!"
     <*> areq boolField "Bool field" Nothing
     <*> aopt boolField "Opt bool field" Nothing
     <*> areq textField "Text field" Nothing

yesod-persistent/Yesod/Persist/Core.hs

@@ -28,8 +28,7 @@ import Control.Monad.Trans.Reader (ReaderT, runReaderT)
 import Yesod.Core
 import Data.Conduit
 import Blaze.ByteString.Builder (Builder)
-import Data.IORef.Lifted
+import Data.Pool
-import Data.Conduit.Pool
 import Control.Monad.Trans.Resource
 import Control.Exception (throwIO)
 import Yesod.Core.Types (HandlerContents (HCError))
@@ -103,24 +102,23 @@ defaultGetDBRunner :: YesodPersistBackend site ~ SqlPersistT
                    => (site -> Pool SQL.Connection)
                    -> HandlerT site IO (DBRunner site, HandlerT site IO ())
 defaultGetDBRunner getPool = do
-    ididSucceed <- newIORef False
-
     pool <- fmap getPool getYesod
-    managedConn <- takeResource pool
+    let withPrep conn f = f conn (SQL.connPrepare conn)
-    let conn = mrValue managedConn
+    (relKey, (conn, local)) <- allocate
+        (do
+            (conn, local) <- takeResource pool
+            withPrep conn SQL.connBegin
+            return (conn, local)
+            )
+        (\(conn, local) -> do
+            withPrep conn SQL.connRollback
+            destroyResource pool local conn)
 
-    let withPrep f = f conn (SQL.connPrepare conn)
+    let cleanup = liftIO $ do
-    (finishTransaction, ()) <- allocate (withPrep SQL.connBegin) $ \() -> do
+            withPrep conn SQL.connCommit
-        didSucceed <- readIORef ididSucceed
+            putResource local conn
-        withPrep $ if didSucceed
+            _ <- unprotect relKey
-            then SQL.connCommit
+            return ()
-            else SQL.connRollback
-
-    let cleanup = do
-            writeIORef ididSucceed True
-            release finishTransaction
-            mrReuse managedConn True
-            mrRelease managedConn
 
     return (DBRunner $ \x -> runReaderT (unSqlPersistT x) conn, cleanup)
 

yesod-persistent/yesod-persistent.cabal

@@ -1,5 +1,5 @@
 name:            yesod-persistent
-version:         1.2.2.1
+version:         1.2.2.2
 license:         MIT
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
@@ -20,9 +20,8 @@ library
                    , transformers              >= 0.2.2    && < 0.4
                    , blaze-builder
                    , conduit
-                   , lifted-base
+                   , resourcet                 >= 0.4.5
-                   , pool-conduit
+                   , resource-pool
-                   , resourcet
     exposed-modules: Yesod.Persist
                      Yesod.Persist.Core
     ghc-options:     -Wall

yesod-test/yesod-test.cabal

@@ -1,5 +1,5 @@
 name:               yesod-test
-version:            1.2.1
+version:            1.2.1.1
 license:            MIT
 license-file:       LICENSE
 author:             Nubis <nubis@woobiz.com.ar>