From d3c7ccebe16434034bf8674cddc4724b57417534 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Sat, 10 Sep 2011 23:21:35 -0400
Subject: [PATCH 001/189] Provide sane defaults with less scaffolding

Yesod.Settings provides the typical definitions for AppConfig,
AppEnvironment, and loadConfig (read from YAML).

Yesod.Main provides a single defaultMain function which accepts your
usual withSiteArg function and runs via Warp calling the now provided
loadConfig to figure out what to do.

Note: Yesod re-exports Y.Settings and Y.Main -- This is probably not the
right thing to do since it would cause collisions with users not using
the provided functionality (including all existing users).
---
 yesod-core/Yesod/Main.hs     | 51 ++++++++++++++++++++++++++++++++++++
 yesod-core/Yesod/Settings.hs | 42 +++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+)
 create mode 100644 yesod-core/Yesod/Main.hs
 create mode 100644 yesod-core/Yesod/Settings.hs

diff --git a/yesod-core/Yesod/Main.hs b/yesod-core/Yesod/Main.hs
new file mode 100644
index 00000000..fda8f99a
--- /dev/null
+++ b/yesod-core/Yesod/Main.hs
@@ -0,0 +1,51 @@
+{-# LANGUAGE CPP, DeriveDataTypeable #-}
+module Yesod.Main (defaultMain) where
+
+import Yesod.Logger (Logger, makeLogger)
+import Yesod.Settings (AppEnvironment(..), AppConfig(..), loadConfig)
+import Network.Wai (Application)
+import Network.Wai.Handler.Warp (run)
+import System.Console.CmdArgs hiding (args)
+import Data.Char (toUpper, toLower)
+
+defaultMain :: (AppConfig -> Logger -> (Application -> IO ()) -> IO ()) -> IO ()
+defaultMain withSite = do
+    logger <- makeLogger
+    args   <- cmdArgs argConfig
+    env    <- getAppEnv args
+    config <- loadConfig env
+
+    let c = if port args /= 0 
+            then config { appPort = port args }
+            else config
+
+    withSite c logger $ run (appPort c)
+
+data ArgConfig = ArgConfig
+    { environment :: String
+    , port        :: Int
+    } deriving (Show, Data, Typeable)
+
+argConfig :: ArgConfig
+argConfig = ArgConfig
+    { environment = def 
+        &= help ("application environment, one of: " ++ (foldl1 (\a b -> a ++ ", " ++ b) environments))
+        &= typ   "ENVIRONMENT"
+    , port = def
+        &= help "the port to listen on"
+        &= typ  "PORT"
+    }
+
+getAppEnv :: ArgConfig -> IO AppEnvironment
+getAppEnv cfg = do
+    let e = if environment cfg /= ""
+            then environment cfg
+            else "development"
+    return $ read $ capitalize e
+
+    where
+        capitalize [] = []
+        capitalize (x:xs) = toUpper x : map toLower xs
+
+environments :: [String]
+environments = map ((map toLower) . show) ([minBound..maxBound] :: [AppEnvironment])
diff --git a/yesod-core/Yesod/Settings.hs b/yesod-core/Yesod/Settings.hs
new file mode 100644
index 00000000..840264ca
--- /dev/null
+++ b/yesod-core/Yesod/Settings.hs
@@ -0,0 +1,42 @@
+module Yesod.Settings where
+
+import Control.Monad (join)
+import Data.Object
+import Data.Text (Text)
+
+import qualified Data.Object.Yaml as YAML
+import qualified Data.Text        as T
+
+data AppEnvironment = Development
+                    | Test
+                    | Staging
+                    | Production
+                    deriving (Eq, Show, Read, Enum, Bounded)
+
+data AppConfig = AppConfig
+    { appEnv             :: AppEnvironment
+    , appPort            :: Int
+    , connectionPoolSize :: Int
+    , appRoot            :: Text
+    } deriving (Show)
+
+loadConfig :: AppEnvironment -> IO AppConfig
+loadConfig env = do
+    allSettings <- (join $ YAML.decodeFile ("config/settings.yml" :: String)) >>= fromMapping
+    settings    <- lookupMapping (show env) allSettings
+    hostS       <- lookupScalar "host" settings
+    port        <- fmap read $ lookupScalar "port" settings
+    connectionPoolSizeS <- lookupScalar "connectionPoolSize" settings
+
+    return $ AppConfig
+        { appEnv  = env
+        , appPort = port
+        , appRoot = T.pack $ hostS ++ addPort port
+        , connectionPoolSize = read connectionPoolSizeS
+        }
+
+    where
+        addPort :: Int -> String
+        addPort p = case env of
+            Production -> ""
+            _          -> ":" ++ show p

From b5a3bd4671edbde2375eb902879f3f85a07eec7b Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Sat, 10 Sep 2011 23:32:41 -0400
Subject: [PATCH 002/189] Add dependencies and expose new modules

---
 yesod-core/yesod-core.cabal | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index f33a1f88..9fa70f24 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -54,6 +54,10 @@ library
                    , case-insensitive          >= 0.2      && < 0.4
                    , parsec                    >= 2        && < 3.2
                    , directory                 >= 1        && < 1.2
+                   , cmdargs                   >= 0.8      && < 0.9
+                   , data-object               >= 0.3      && < 0.4
+                   , data-object-yaml          >= 0.3      && < 0.4
+                   , warp                      >= 0.4      && < 0.5
                    -- for logger. Probably logger should be a separate package
                    , strict-concurrency        >= 0.2.4    && < 0.2.5
 
@@ -65,6 +69,8 @@ library
                      Yesod.Request
                      Yesod.Widget
                      Yesod.Message
+                     Yesod.Settings
+                     Yesod.Main
     other-modules:   Yesod.Internal
                      Yesod.Internal.Core
                      Yesod.Internal.Session

From 63d34a3bb46f612a8285cc0fbd954f19ed05f0c4 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Sat, 10 Sep 2011 23:33:17 -0400
Subject: [PATCH 003/189] Update scaffold for defaultMain

---
 yesod/Scaffolding/Scaffolder.hs       |  4 +-
 yesod/scaffold/Application.hs.cg      |  2 +-
 yesod/scaffold/Foundation.hs.cg       |  4 +-
 yesod/scaffold/Settings.hs.cg         | 66 +-------------------------
 yesod/scaffold/main.hs.cg             | 67 +--------------------------
 yesod/scaffold/tiny/Application.hs.cg |  3 +-
 yesod/scaffold/tiny/Foundation.hs.cg  |  5 +-
 yesod/scaffold/tiny/Settings.hs.cg    | 52 +--------------------
 8 files changed, 14 insertions(+), 189 deletions(-)

diff --git a/yesod/Scaffolding/Scaffolder.hs b/yesod/Scaffolding/Scaffolder.hs
index 287bb8a9..c8fe885d 100644
--- a/yesod/Scaffolding/Scaffolder.hs
+++ b/yesod/Scaffolding/Scaffolder.hs
@@ -95,8 +95,8 @@ scaffold = do
           Tiny       -> ""
 
         settingsTextImport = case backend of
-          Postgresql -> "import Data.Text (Text, pack, concat)\nimport Prelude hiding (concat)"
-          _          -> "import Data.Text (Text, pack)"
+          Postgresql -> "import Data.Text (Text, concat)\nimport Prelude hiding (concat)"
+          _          -> "import Data.Text (Text)"
 
         packages =
           if backend == MongoDB
diff --git a/yesod/scaffold/Application.hs.cg b/yesod/scaffold/Application.hs.cg
index 03153b5a..8688fe02 100644
--- a/yesod/scaffold/Application.hs.cg
+++ b/yesod/scaffold/Application.hs.cg
@@ -68,7 +68,7 @@ withDevelAppPort =
   where
     go :: ((Int, Application) -> IO ()) -> IO ()
     go f = do
-        conf <- Settings.loadConfig Settings.Development
+        conf <- loadConfig Development
         let port = appPort conf
         logger <- makeLogger
         logString logger $ "Devel application launched, listening on port " ++ show port
diff --git a/yesod/scaffold/Foundation.hs.cg b/yesod/scaffold/Foundation.hs.cg
index 3f000eb5..a925401f 100644
--- a/yesod/scaffold/Foundation.hs.cg
+++ b/yesod/scaffold/Foundation.hs.cg
@@ -45,7 +45,7 @@ import Text.Shakespeare.Text (stext)
 -- starts running, such as database connections. Every handler will have
 -- access to the data present here.
 data ~sitearg~ = ~sitearg~
-    { settings :: Settings.AppConfig
+    { settings :: AppConfig
     , getLogger :: Logger
     , getStatic :: Static -- ^ Settings for static file serving.
     , connPool :: Settings.ConnectionPool -- ^ Database connection pool.
@@ -75,7 +75,7 @@ mkYesodData "~sitearg~" $(parseRoutesFile "config/routes")
 -- Please see the documentation for the Yesod typeclass. There are a number
 -- of settings which can be configured by overriding methods here.
 instance Yesod ~sitearg~ where
-    approot = Settings.appRoot . settings
+    approot = appRoot . settings
 
     -- Place the session key file in the config folder
     encryptKey _ = fmap Just $ getKey "config/client_session_key.aes"
diff --git a/yesod/scaffold/Settings.hs.cg b/yesod/scaffold/Settings.hs.cg
index 9109198e..fdcf3c59 100644
--- a/yesod/scaffold/Settings.hs.cg
+++ b/yesod/scaffold/Settings.hs.cg
@@ -18,9 +18,6 @@ module Settings
     , runConnectionPool
     , staticRoot
     , staticDir
-    , loadConfig
-    , AppEnvironment(..)
-    , AppConfig(..)
     ) where
 
 import qualified Text.Hamlet as S
@@ -32,6 +29,7 @@ import Text.Shakespeare.Text (st)
 import Language.Haskell.TH.Syntax
 import Database.Persist.~importPersist~
 import Yesod (liftIO, MonadControlIO, addWidget, addCassius, addJulius, addLucius, whamletFile)
+import Yesod.Settings
 import Data.Monoid (mempty)
 import System.Directory (doesFileExist)
 ~settingsTextImport~
@@ -39,68 +37,6 @@ import Data.Object
 import qualified Data.Object.Yaml as YAML
 import Control.Monad (join)
 
-data AppEnvironment = Test
-                    | Development
-                    | Staging
-                    | Production
-                    deriving (Eq, Show, Read, Enum, Bounded)
-
--- | Dynamic per-environment configuration loaded from the YAML file Settings.yaml.
--- Use dynamic settings to avoid the need to re-compile the application (between staging and production environments).
---
--- By convention these settings should be overwritten by any command line arguments.
--- See config/Foundation.hs for command line arguments
--- Command line arguments provide some convenience but are also required for hosting situations where a setting is read from the environment (appPort on Heroku).
---
-data AppConfig = AppConfig {
-    appEnv :: AppEnvironment
-
-  , appPort :: Int
-
-    -- | Your application will keep a connection pool and take connections from
-    -- there as necessary instead of continually creating new connections. This
-    -- value gives the maximum number of connections to be open at a given time.
-    -- If your application requests a connection when all connections are in
-    -- use, that request will fail. Try to choose a number that will work well
-    -- with the system resources available to you while providing enough
-    -- connections for your expected load.
-    --
-    -- Connections are returned to the pool as quickly as possible by
-    -- Yesod to avoid resource exhaustion. A connection is only considered in
-    -- use while within a call to runDB.
-  , connectionPoolSize :: Int
-
-    -- | The base URL for your application. This will usually be different for
-    -- development and production. Yesod automatically constructs URLs for you,
-    -- so this value must be accurate to create valid links.
-    -- Please note that there is no trailing slash.
-    --
-    -- You probably want to change this! If your domain name was "yesod.com",
-    -- you would probably want it to be:
-    -- > "http://yesod.com"
-  , appRoot :: Text
-} deriving (Show)
-
-loadConfig :: AppEnvironment -> IO AppConfig
-loadConfig env = do
-    allSettings <- (join $ YAML.decodeFile ("config/settings.yml" :: String)) >>= fromMapping
-    settings <- lookupMapping (show env) allSettings
-    hostS <- lookupScalar "host" settings
-    port <- fmap read $ lookupScalar "port" settings
-    connectionPoolSizeS <- lookupScalar "connectionPoolSize" settings
-    return $ AppConfig {
-      appEnv = env
-    , appPort = port
-    , appRoot = pack $ hostS ++ addPort port
-    , connectionPoolSize = read connectionPoolSizeS
-    }
-    where
-        addPort :: Int -> String
-#ifdef PRODUCTION
-        addPort _ = ""
-#else
-        addPort p = ":" ++ (show p)
-#endif
 
 -- Static setting below. Changing these requires a recompile
 
diff --git a/yesod/scaffold/main.hs.cg b/yesod/scaffold/main.hs.cg
index eede5e55..1e7f88ac 100644
--- a/yesod/scaffold/main.hs.cg
+++ b/yesod/scaffold/main.hs.cg
@@ -1,68 +1,5 @@
-{-# LANGUAGE CPP, DeriveDataTypeable #-}
-import Settings (AppEnvironment(..), AppConfig(..), loadConfig)
+import Yesod.Main (defaultMain)
 import Application (with~sitearg~)
-import Network.Wai.Handler.Warp (run)
-import System.Console.CmdArgs hiding (args)
-import Data.Char (toUpper, toLower)
-
-#ifndef PRODUCTION
-import Network.Wai.Middleware.Debug (debugHandle)
-import Yesod.Logger (logString, logLazyText, flushLogger, makeLogger)
-#else
-import Yesod.Logger (makeLogger)
-#endif
 
 main :: IO ()
-main = do
-    logger <- makeLogger
-    args   <- cmdArgs argConfig
-    env    <- getAppEnv args
-    config <- loadConfig env
-    let c = if port args /= 0
-            then config { appPort = port args }
-            else config
-
-#if PRODUCTION
-    with~sitearg~ c logger $ run (appPort c)
-#else
-    logString logger $ (show env) ++ " application launched, listening on port " ++ show (appPort c)
-    with~sitearg~ c logger $ run (appPort c) . debugHandle (logHandle logger)
-    flushLogger logger
-
-    where
-        logHandle logger msg = logLazyText logger msg >> flushLogger logger
-#endif
-
-data ArgConfig = ArgConfig
-    { environment :: String
-    , port        :: Int
-    } deriving (Show, Data, Typeable)
-
-argConfig :: ArgConfig
-argConfig = ArgConfig
-    { environment = def 
-        &= help ("application environment, one of: " ++ (foldl1 (\a b -> a ++ ", " ++ b) environments))
-        &= typ "ENVIRONMENT"
-    , port = def
-        &= typ "PORT"
-    }
-
-environments :: [String]
-environments = map ((map toLower) . show) ([minBound..maxBound] :: [AppEnvironment])
-
--- | retrieve the -e environment option
-getAppEnv :: ArgConfig -> IO AppEnvironment
-getAppEnv cfg = do
-    let e = if environment cfg /= ""
-            then environment cfg
-            else
-#if PRODUCTION
-                "production"
-#else
-                "development"
-#endif
-    return $ read $ capitalize e
-
-    where
-        capitalize [] = []
-        capitalize (x:xs) = toUpper x : map toLower xs
+main = defaultMain with~sitearg~
diff --git a/yesod/scaffold/tiny/Application.hs.cg b/yesod/scaffold/tiny/Application.hs.cg
index 99e4d7f9..e4e2aaef 100644
--- a/yesod/scaffold/tiny/Application.hs.cg
+++ b/yesod/scaffold/tiny/Application.hs.cg
@@ -11,6 +11,7 @@ module Application
 import Foundation
 import Settings
 import Yesod.Static
+import Yesod.Settings
 import Yesod.Logger (makeLogger, flushLogger, Logger, logLazyText, logString)
 import Data.ByteString (ByteString)
 import Network.Wai (Application)
@@ -54,7 +55,7 @@ withDevelAppPort =
   where
     go :: ((Int, Application) -> IO ()) -> IO ()
     go f = do
-        conf <- Settings.loadConfig Settings.Development
+        conf <- loadConfig Development
         let port = appPort conf
         logger <- makeLogger
         logString logger $ "Devel application launched, listening on port " ++ show port
diff --git a/yesod/scaffold/tiny/Foundation.hs.cg b/yesod/scaffold/tiny/Foundation.hs.cg
index 72993157..5e950805 100644
--- a/yesod/scaffold/tiny/Foundation.hs.cg
+++ b/yesod/scaffold/tiny/Foundation.hs.cg
@@ -14,6 +14,7 @@ module Foundation
     ) where
 
 import Yesod.Core
+import Yesod.Settings (AppConfig(..))
 import Yesod.Static (Static, base64md5, StaticRoute(..))
 import Settings.StaticFiles
 import Yesod.Logger (Logger, logLazyText)
@@ -32,7 +33,7 @@ import Web.ClientSession (getKey)
 -- starts running, such as database connections. Every handler will have
 -- access to the data present here.
 data ~sitearg~ = ~sitearg~
-    { settings :: Settings.AppConfig
+    { settings :: AppConfig
     , getLogger :: Logger
     , getStatic :: Static -- ^ Settings for static file serving.
     }
@@ -61,7 +62,7 @@ mkYesodData "~sitearg~" $(parseRoutesFile "config/routes")
 -- Please see the documentation for the Yesod typeclass. There are a number
 -- of settings which can be configured by overriding methods here.
 instance Yesod ~sitearg~ where
-    approot = Settings.appRoot . settings
+    approot = appRoot . settings
 
     -- Place the session key file in the config folder
     encryptKey _ = fmap Just $ getKey "config/client_session_key.aes"
diff --git a/yesod/scaffold/tiny/Settings.hs.cg b/yesod/scaffold/tiny/Settings.hs.cg
index bec5d248..73e226ad 100644
--- a/yesod/scaffold/tiny/Settings.hs.cg
+++ b/yesod/scaffold/tiny/Settings.hs.cg
@@ -14,9 +14,6 @@ module Settings
     , widgetFile
     , staticRoot
     , staticDir
-    , loadConfig
-    , AppEnvironment(..)
-    , AppConfig(..)
     ) where
 
 import qualified Text.Hamlet as S
@@ -27,6 +24,7 @@ import qualified Text.Shakespeare.Text as S
 import Text.Shakespeare.Text (st)
 import Language.Haskell.TH.Syntax
 import Yesod.Widget (addWidget, addCassius, addJulius, addLucius, whamletFile)
+import Yesod.Settings
 import Data.Monoid (mempty)
 import System.Directory (doesFileExist)
 ~settingsTextImport~
@@ -34,54 +32,6 @@ import Data.Object
 import qualified Data.Object.Yaml as YAML
 import Control.Monad (join)
 
-data AppEnvironment = Test
-                    | Development
-                    | Staging
-                    | Production
-                    deriving (Eq, Show, Read, Enum, Bounded)
-
--- | Dynamic per-environment configuration loaded from the YAML file Settings.yaml.
--- Use dynamic settings to avoid the need to re-compile the application (between staging and production environments).
---
--- By convention these settings should be overwritten by any command line arguments.
--- See config/~sitearg~.hs for command line arguments
--- Command line arguments provide some convenience but are also required for hosting situations where a setting is read from the environment (appPort on Heroku).
---
-data AppConfig = AppConfig {
-    appEnv :: AppEnvironment
-
-  , appPort :: Int
-
-    -- | The base URL for your application. This will usually be different for
-    -- development and production. Yesod automatically constructs URLs for you,
-    -- so this value must be accurate to create valid links.
-    -- Please note that there is no trailing slash.
-    --
-    -- You probably want to change this! If your domain name was "yesod.com",
-    -- you would probably want it to be:
-    -- > "http://yesod.com"
-  , appRoot :: Text
-} deriving (Show)
-
-loadConfig :: AppEnvironment -> IO AppConfig
-loadConfig env = do
-    allSettings <- (join $ YAML.decodeFile ("config/settings.yml" :: String)) >>= fromMapping
-    settings <- lookupMapping (show env) allSettings
-    hostS <- lookupScalar "host" settings
-    port <- fmap read $ lookupScalar "port" settings
-    return $ AppConfig {
-      appEnv = env
-    , appPort = port
-    , appRoot = pack $ hostS ++ addPort port
-    }
-    where
-        addPort :: Int -> String
-#ifdef PRODUCTION
-        addPort _ = ""
-#else
-        addPort p = ":" ++ (show p)
-#endif
-
 -- | The location of static files on your system. This is a file system
 -- path. The default value works properly with your scaffolded site.
 staticDir :: FilePath

From 4654776fa42fdfebba758f95114858809c3ee652 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Sat, 10 Sep 2011 23:33:31 -0400
Subject: [PATCH 004/189] Re-export new modules

---
 yesod/Yesod.hs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/yesod/Yesod.hs b/yesod/Yesod.hs
index 7724a345..6fc6ee98 100644
--- a/yesod/Yesod.hs
+++ b/yesod/Yesod.hs
@@ -7,6 +7,8 @@ module Yesod
     , module Yesod.Form
     , module Yesod.Json
     , module Yesod.Persist
+    , module Yesod.Settings
+    , module Yesod.Main
       -- * Running your application
     , warp
     , warpDebug
@@ -46,6 +48,8 @@ import Text.Julius
 import Yesod.Form
 import Yesod.Json
 import Yesod.Persist
+import Yesod.Settings
+import Yesod.Main
 import Network.Wai (Application)
 import Network.Wai.Middleware.Debug
 import Control.Monad.Trans.Class (lift)

From 86c8abb853fd25f65143ade8f49816e05a777484 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Sun, 11 Sep 2011 00:16:43 -0400
Subject: [PATCH 005/189] Limit exports

---
 yesod-core/Yesod/Settings.hs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/yesod-core/Yesod/Settings.hs b/yesod-core/Yesod/Settings.hs
index 840264ca..4d84e144 100644
--- a/yesod-core/Yesod/Settings.hs
+++ b/yesod-core/Yesod/Settings.hs
@@ -1,4 +1,8 @@
-module Yesod.Settings where
+module Yesod.Settings
+    ( AppEnvironment(..)
+    , AppConfig(..)
+    , loadConfig
+    ) where
 
 import Control.Monad (join)
 import Data.Object

From dcb27df1fc0ce6c58c9655818c42d51d67e51380 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Sun, 11 Sep 2011 00:17:07 -0400
Subject: [PATCH 006/189] Be a little more configurable

---
 yesod-core/Yesod/Main.hs | 91 +++++++++++++++++++++++++---------------
 1 file changed, 58 insertions(+), 33 deletions(-)

diff --git a/yesod-core/Yesod/Main.hs b/yesod-core/Yesod/Main.hs
index fda8f99a..fab4ead0 100644
--- a/yesod-core/Yesod/Main.hs
+++ b/yesod-core/Yesod/Main.hs
@@ -1,5 +1,9 @@
-{-# LANGUAGE CPP, DeriveDataTypeable #-}
-module Yesod.Main (defaultMain) where
+{-# LANGUAGE DeriveDataTypeable #-}
+module Yesod.Main
+    ( defaultMain
+    , fromArgs
+    , fromArgsWith
+    ) where
 
 import Yesod.Logger (Logger, makeLogger)
 import Yesod.Settings (AppEnvironment(..), AppConfig(..), loadConfig)
@@ -8,44 +12,65 @@ import Network.Wai.Handler.Warp (run)
 import System.Console.CmdArgs hiding (args)
 import Data.Char (toUpper, toLower)
 
-defaultMain :: (AppConfig -> Logger -> (Application -> IO ()) -> IO ()) -> IO ()
-defaultMain withSite = do
-    logger <- makeLogger
-    args   <- cmdArgs argConfig
-    env    <- getAppEnv args
-    config <- loadConfig env
-
-    let c = if port args /= 0 
-            then config { appPort = port args }
-            else config
-
-    withSite c logger $ run (appPort c)
-
 data ArgConfig = ArgConfig
     { environment :: String
     , port        :: Int
     } deriving (Show, Data, Typeable)
 
-argConfig :: ArgConfig
-argConfig = ArgConfig
-    { environment = def 
-        &= help ("application environment, one of: " ++ (foldl1 (\a b -> a ++ ", " ++ b) environments))
-        &= typ   "ENVIRONMENT"
-    , port = def
-        &= help "the port to listen on"
-        &= typ  "PORT"
-    }
+-- | Load an @'AppConfig'@ using the provided function, then start your
+--   app via Warp on the configured port.
+--
+--   > -- main.hs
+--   > import Application (withMySite)
+--   > import Yesod.Main  (defaultMain, fromArgs)
+--   >
+--   > main :: IO ()
+--   > main = defaultMain fromArgs withMySite
+--
+defaultMain :: IO AppConfig -> (AppConfig -> Logger -> (Application -> IO ()) -> IO ()) -> IO ()
+defaultMain load withSite = do
+    config <- load
+    logger <- makeLogger
+    withSite config logger $ run (appPort config)
 
-getAppEnv :: ArgConfig -> IO AppEnvironment
-getAppEnv cfg = do
-    let e = if environment cfg /= ""
-            then environment cfg
-            else "development"
-    return $ read $ capitalize e
+-- | Call the @'Yesod.Settings.loadConfig'@ function for the environment
+--   passed on the commandline (or the default, \"development\") and
+--   override the port if passed.
+fromArgs :: IO AppConfig
+fromArgs = fromArgsWith loadConfig
+
+-- | Same, but allows one to provide their own custom @'loadConfig'@
+fromArgsWith :: (AppEnvironment -> IO AppConfig) -> IO AppConfig
+fromArgsWith load = do
+    args <- cmdArgs argConfig
+
+    let env = read
+            $ capitalize
+            $ if environment args /= ""
+              then environment args
+              else "development"
+
+    config <- load env
+
+    let c = if port args /= 0
+            then config { appPort = port args }
+            else config
+
+    return $ config
 
     where
+        argConfig :: ArgConfig
+        argConfig = ArgConfig
+            { environment = def 
+                &= help ("application environment, one of: " ++ (foldl1 (\a b -> a ++ ", " ++ b) environments))
+                &= typ   "ENVIRONMENT"
+            , port = def
+                &= help "the port to listen on"
+                &= typ  "PORT"
+            }
+
+        environments :: [String]
+        environments = map ((map toLower) . show) ([minBound..maxBound] :: [AppEnvironment])
+
         capitalize [] = []
         capitalize (x:xs) = toUpper x : map toLower xs
-
-environments :: [String]
-environments = map ((map toLower) . show) ([minBound..maxBound] :: [AppEnvironment])

From fed3f0c0fa72ea97e680c1918e227330f6bc3214 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Sun, 11 Sep 2011 00:35:34 -0400
Subject: [PATCH 007/189] Fix logical error

---
 yesod-core/Yesod/Main.hs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/yesod-core/Yesod/Main.hs b/yesod-core/Yesod/Main.hs
index fab4ead0..bba1fd3e 100644
--- a/yesod-core/Yesod/Main.hs
+++ b/yesod-core/Yesod/Main.hs
@@ -47,16 +47,14 @@ fromArgsWith load = do
     let env = read
             $ capitalize
             $ if environment args /= ""
-              then environment args
-              else "development"
+                  then environment args
+                  else "development"
 
     config <- load env
 
-    let c = if port args /= 0
-            then config { appPort = port args }
-            else config
-
-    return $ config
+    return $ if port args /= 0
+                then config { appPort = port args }
+                else config
 
     where
         argConfig :: ArgConfig

From 6360cb5e62535b3cf88f9e6c46c5995a9064df78 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Sun, 11 Sep 2011 00:35:46 -0400
Subject: [PATCH 008/189] Update scaffold to use fromArgs

---
 yesod/scaffold/main.hs.cg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yesod/scaffold/main.hs.cg b/yesod/scaffold/main.hs.cg
index 1e7f88ac..94f61c28 100644
--- a/yesod/scaffold/main.hs.cg
+++ b/yesod/scaffold/main.hs.cg
@@ -1,5 +1,5 @@
-import Yesod.Main (defaultMain)
+import Yesod.Main (defaultMain, fromArgs)
 import Application (with~sitearg~)
 
 main :: IO ()
-main = defaultMain with~sitearg~
+main = defaultMain fromArgs with~sitearg~

From bd843a7acc629bc0cf592e9ab5fdae8861944070 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Sun, 11 Sep 2011 12:30:22 -0400
Subject: [PATCH 009/189] Add typical connStr loading functions

---
 yesod-core/Yesod/Settings.hs | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/yesod-core/Yesod/Settings.hs b/yesod-core/Yesod/Settings.hs
index 4d84e144..f42862e9 100644
--- a/yesod-core/Yesod/Settings.hs
+++ b/yesod-core/Yesod/Settings.hs
@@ -1,12 +1,16 @@
+{-# LANGUAGE QuasiQuotes #-}
 module Yesod.Settings
     ( AppEnvironment(..)
     , AppConfig(..)
     , loadConfig
+    , loadPostgresqlConnStr
+    , loadSqliteConnStr
     ) where
 
 import Control.Monad (join)
 import Data.Object
 import Data.Text (Text)
+import Text.Shakespeare.Text (st)
 
 import qualified Data.Object.Yaml as YAML
 import qualified Data.Text        as T
@@ -44,3 +48,22 @@ loadConfig env = do
         addPort p = case env of
             Production -> ""
             _          -> ":" ++ show p
+
+loadPostgresqlConnStr :: AppEnvironment -> IO Text
+loadPostgresqlConnStr env = do
+    allSettings <- (join $ YAML.decodeFile ("config/postgesql.yml" :: String)) >>= fromMapping
+    settings    <- lookupMapping (show env) allSettings
+    database    <- lookupScalar "database" settings :: IO Text
+
+    connPart <- fmap T.concat $ (flip mapM) ["user", "password", "host", "port"] $ \key -> do
+      value <- lookupScalar key settings
+      return $ [st| #{key}=#{value} |]
+    return $ [st|#{connPart} dbname=#{database}|]
+
+loadSqliteConnStr :: AppEnvironment -> IO Text
+loadSqliteConnStr env = do
+    allSettings <- (join $ YAML.decodeFile ("config/sqlite.yml" :: String)) >>= fromMapping
+    settings <- lookupMapping (show env) allSettings
+    lookupScalar "database" settings
+
+-- TODO: Mongo

From 80314a4027befb522e5922d78807a0e8e92a1b64 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Sun, 11 Sep 2011 12:30:31 -0400
Subject: [PATCH 010/189] Add shakespeare-text dep

---
 yesod-core/yesod-core.cabal | 1 +
 1 file changed, 1 insertion(+)

diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index 6b33e2f5..ce7a8c0c 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -38,6 +38,7 @@ library
                    , shakespeare               >= 0.10     && < 0.11
                    , shakespeare-js            >= 0.10     && < 0.11
                    , shakespeare-css           >= 0.10     && < 0.11
+                   , shakespeare-text          >= 0.10     && < 0.11
                    , blaze-builder             >= 0.2.1    && < 0.4
                    , transformers              >= 0.2      && < 0.3
                    , clientsession             >= 0.7.2    && < 0.8

From 256245cd2b186305ea3f22f08511d9ae88b89709 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Sun, 11 Sep 2011 13:06:53 -0400
Subject: [PATCH 011/189] Add mongo connection loader

---
 yesod-core/Yesod/Settings.hs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/yesod-core/Yesod/Settings.hs b/yesod-core/Yesod/Settings.hs
index f42862e9..8e303972 100644
--- a/yesod-core/Yesod/Settings.hs
+++ b/yesod-core/Yesod/Settings.hs
@@ -1,10 +1,12 @@
-{-# LANGUAGE QuasiQuotes #-}
+{-# OPTIONS -fno-warn-missing-signatures #-}
+{-# LANGUAGE QuasiQuotes                 #-}
 module Yesod.Settings
     ( AppEnvironment(..)
     , AppConfig(..)
     , loadConfig
     , loadPostgresqlConnStr
     , loadSqliteConnStr
+    , loadMongoConnParams
     ) where
 
 import Control.Monad (join)
@@ -63,7 +65,14 @@ loadPostgresqlConnStr env = do
 loadSqliteConnStr :: AppEnvironment -> IO Text
 loadSqliteConnStr env = do
     allSettings <- (join $ YAML.decodeFile ("config/sqlite.yml" :: String)) >>= fromMapping
-    settings <- lookupMapping (show env) allSettings
+    settings    <- lookupMapping (show env) allSettings
     lookupScalar "database" settings
 
--- TODO: Mongo
+-- note: no type signature to avoid Persistent.MongoDB dep
+--loadMongoConnParams :: AppEnvironment -> IO (Database, HostName)
+loadMongoConnParams env = do
+    allSettings <- (join $ YAML.decodeFile ("config/mongoDB.yml" :: String)) >>= fromMapping
+    settings    <- lookupMapping (show env) allSettings
+    database    <- lookupScalar "database" settings
+    host        <- lookupScalar "host" settings
+    return (database, host)

From fa3fabcfbaadc8977dd888b4bd50e7da13e332a8 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Sun, 11 Sep 2011 14:57:06 -0400
Subject: [PATCH 012/189] Update scaffolding with new load connection functions

Yesod.Settings provides load functions which were previously scaffolded.
They load the ConsStrs for SQL and ConnParams for Mongo.

This prevents the need for a lot of the imports in the scaffolding
settings and simplifies the existing Text import.
---
 yesod/Scaffolding/Scaffolder.hs      |  4 ----
 yesod/scaffold/Settings.hs.cg        |  5 +----
 yesod/scaffold/mongoDBConnPool.cg    | 12 ++----------
 yesod/scaffold/postgresqlConnPool.cg | 15 +--------------
 yesod/scaffold/sqliteConnPool.cg     | 10 +---------
 yesod/scaffold/tiny/Settings.hs.cg   |  5 +----
 6 files changed, 6 insertions(+), 45 deletions(-)

diff --git a/yesod/Scaffolding/Scaffolder.hs b/yesod/Scaffolding/Scaffolder.hs
index c8fe885d..293032b6 100644
--- a/yesod/Scaffolding/Scaffolder.hs
+++ b/yesod/Scaffolding/Scaffolder.hs
@@ -94,10 +94,6 @@ scaffold = do
           MongoDB    -> $(codegen $ "mongoDBConnPool")
           Tiny       -> ""
 
-        settingsTextImport = case backend of
-          Postgresql -> "import Data.Text (Text, concat)\nimport Prelude hiding (concat)"
-          _          -> "import Data.Text (Text)"
-
         packages =
           if backend == MongoDB
             then "                 , persistent-mongoDB >= 0.6.1 && < 0.7\n                 , mongoDB >= 1.1\n                 , bson >= 0.1.5\n"
diff --git a/yesod/scaffold/Settings.hs.cg b/yesod/scaffold/Settings.hs.cg
index fdcf3c59..36bd1576 100644
--- a/yesod/scaffold/Settings.hs.cg
+++ b/yesod/scaffold/Settings.hs.cg
@@ -32,10 +32,7 @@ import Yesod (liftIO, MonadControlIO, addWidget, addCassius, addJulius, addLuciu
 import Yesod.Settings
 import Data.Monoid (mempty)
 import System.Directory (doesFileExist)
-~settingsTextImport~
-import Data.Object
-import qualified Data.Object.Yaml as YAML
-import Control.Monad (join)
+import Data.Text (Text)
 
 
 -- Static setting below. Changing these requires a recompile
diff --git a/yesod/scaffold/mongoDBConnPool.cg b/yesod/scaffold/mongoDBConnPool.cg
index 57cb2aa0..4292d22f 100644
--- a/yesod/scaffold/mongoDBConnPool.cg
+++ b/yesod/scaffold/mongoDBConnPool.cg
@@ -3,14 +3,6 @@ runConnectionPool = runMongoDBConn (ConfirmWrites [u"j" =: True])
 
 withConnectionPool :: (MonadControlIO m, Applicative m) => AppConfig -> (ConnectionPool -> m b) -> m b
 withConnectionPool conf f = do
-    (database,host) <- liftIO $ loadConnParams (appEnv conf)
+    (database,host) <- liftIO $ loadMongoConnParams (appEnv conf)
     withMongoDBPool (u database) host (connectionPoolSize conf) f
-  where
-    -- | The database connection parameters.
-    --  loadConnParams :: AppEnvironment -> IO (Database, HostName)
-    loadConnParams env = do
-        allSettings <- (join $ YAML.decodeFile ("config/mongoDB.yml" :: String)) >>= fromMapping
-        settings <- lookupMapping (show env) allSettings
-        database <- lookupScalar "database" settings
-        host <- lookupScalar "host" settings
-        return (database, host)
+
diff --git a/yesod/scaffold/postgresqlConnPool.cg b/yesod/scaffold/postgresqlConnPool.cg
index 9cf1129b..e8597e4f 100644
--- a/yesod/scaffold/postgresqlConnPool.cg
+++ b/yesod/scaffold/postgresqlConnPool.cg
@@ -3,21 +3,8 @@ runConnectionPool = runSqlPool
 
 withConnectionPool :: MonadControlIO m => AppConfig -> (ConnectionPool -> m a) -> m a
 withConnectionPool conf f = do
-    cs <- liftIO $ loadConnStr (appEnv conf)
+    cs <- liftIO $ load~upper~ConnStr (appEnv conf)
     with~upper~Pool cs (connectionPoolSize conf) f
-  where
-    -- | The database connection string. The meaning of this string is backend-
-    -- specific.
-    loadConnStr :: AppEnvironment -> IO Text
-    loadConnStr env = do
-        allSettings <- (join $ YAML.decodeFile ("config/~backendLower~.yml" :: String)) >>= fromMapping
-        settings <- lookupMapping (show env) allSettings
-        database <- lookupScalar "database" settings :: IO Text
-
-        connPart <- fmap concat $ (flip mapM) ["user", "password", "host", "port"] $ \key -> do
-          value <- lookupScalar key settings
-          return $ [st| #{key}=#{value} |]
-        return $ [st|#{connPart} dbname=#{database}|]
 
 -- Example of making a dynamic configuration static
 -- use /return $(mkConnStr Production)/ instead of loadConnStr
diff --git a/yesod/scaffold/sqliteConnPool.cg b/yesod/scaffold/sqliteConnPool.cg
index ba4981f2..e8597e4f 100644
--- a/yesod/scaffold/sqliteConnPool.cg
+++ b/yesod/scaffold/sqliteConnPool.cg
@@ -3,16 +3,8 @@ runConnectionPool = runSqlPool
 
 withConnectionPool :: MonadControlIO m => AppConfig -> (ConnectionPool -> m a) -> m a
 withConnectionPool conf f = do
-    cs <- liftIO $ loadConnStr (appEnv conf)
+    cs <- liftIO $ load~upper~ConnStr (appEnv conf)
     with~upper~Pool cs (connectionPoolSize conf) f
-  where
-    -- | The database connection string. The meaning of this string is backend-
-    -- specific.
-    loadConnStr :: AppEnvironment -> IO Text
-    loadConnStr env = do
-        allSettings <- (join $ YAML.decodeFile ("config/~backendLower~.yml" :: String)) >>= fromMapping
-        settings <- lookupMapping (show env) allSettings
-        lookupScalar "database" settings
 
 -- Example of making a dynamic configuration static
 -- use /return $(mkConnStr Production)/ instead of loadConnStr
diff --git a/yesod/scaffold/tiny/Settings.hs.cg b/yesod/scaffold/tiny/Settings.hs.cg
index 73e226ad..a36c764b 100644
--- a/yesod/scaffold/tiny/Settings.hs.cg
+++ b/yesod/scaffold/tiny/Settings.hs.cg
@@ -27,10 +27,7 @@ import Yesod.Widget (addWidget, addCassius, addJulius, addLucius, whamletFile)
 import Yesod.Settings
 import Data.Monoid (mempty)
 import System.Directory (doesFileExist)
-~settingsTextImport~
-import Data.Object
-import qualified Data.Object.Yaml as YAML
-import Control.Monad (join)
+import Data.Text (Text)
 
 -- | The location of static files on your system. This is a file system
 -- path. The default value works properly with your scaffolded site.

From a9ac0a11b600e8ffcd5e344aebf984f6078ab4e5 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Sun, 11 Sep 2011 14:59:32 -0400
Subject: [PATCH 013/189] Fix up scaffold.sh

Use bash -e instead of single pipeline
Unregister foobar after testing it
---
 yesod/test/scaffold.sh | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/yesod/test/scaffold.sh b/yesod/test/scaffold.sh
index 34798202..303a9656 100755
--- a/yesod/test/scaffold.sh
+++ b/yesod/test/scaffold.sh
@@ -1,3 +1,12 @@
-#!/bin/bash -x
+#!/bin/bash -ex
 
-rm -rf foobar && runghc main.hs init && cd foobar && cabal install && cabal install -fdevel && cd ..
+rm -rf foobar
+runghc main.hs init
+
+(
+  cd foobar
+  cabal install
+  cabal install -fdevel
+)
+
+ghc-pkg unregister foobar

From 2aa6f989a6b66405ac532a379841d468b764f64a Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Sun, 11 Sep 2011 15:00:20 -0400
Subject: [PATCH 014/189] Complete rewrite of test/run.sh

Output is more useful (IMO). Everything is silenced for the duration of
the tests but a count of tests/failures and any errors are output at the
end. Pass --verbose to watch stdout during the tests.

Logic is also seperated into core setup/runners and individual test
definitions. Should be more easily extensible.
---
 yesod/test/run.sh | 111 +++++++++++++++++++++++++++++++++++++---------
 1 file changed, 91 insertions(+), 20 deletions(-)

diff --git a/yesod/test/run.sh b/yesod/test/run.sh
index 948e7689..3b81e612 100755
--- a/yesod/test/run.sh
+++ b/yesod/test/run.sh
@@ -1,26 +1,97 @@
-#!/bin/bash -ex
+#!/bin/bash -e
 #
-# A wrapper for the shelltest test. Passes along options to shelltest.
+# Runs test/scaffold.sh with a variety of inputs. Hides all output
+# besides failure details.
 #
-#   cabal install shelltestrunner
+###
 
-cabal clean && cabal install && cabal sdist
+[[ "$1" =~ -v|--verbose ]] && stdout=/dev/stdout || stdout=/dev/null
 
-# I am not that good at shell scripting
-# this for loop only operates on 1 file (as per tail -1)
-for f in $(ls -1rt dist/*.tar.gz | tail -1)
-do
-  tar -xzvf $f && cd `basename $f .tar.gz`
+tmp='/tmp'
+pwd="$PWD"
 
-  # shelltest is designed to show you the diff of an expected stdout/stdin. We don't care about that. If it compiles, it compiles
-  # shelltest ../test/scaffold.shelltest --color --diff --all $@ -- --hide-successes
+pkg=
+dir=
 
-  ../test/scaffold.sh < ../test/sqlite-input.txt &&
-  ../test/scaffold.sh < ../test/postgresql-input.txt &&
-  ../test/scaffold.sh < ../test/tiny-input.txt &&
-  ../test/scaffold.sh < ../test/mongodb-input.txt ||
-    (echo "FAILED" && exit 1)
-  cd ..
-  rm -r `basename $f .tar.gz`
-done
-echo "PASSED"
+failures=()
+n_tested=0
+n_failed=0
+
+# runs the function named by $1, silencing stdout and redirecting stderr
+# to /tmp/function.errors. failures are tracked to be reported on during
+# cleanup
+run_test() { # {{{
+  local test_function="$*"
+
+  n_tested=$((n_tested+1))
+
+  if $test_function >"$stdout" 2>"$tmp/$test_function.errors"; then
+    echo -n '.'
+    [[ -f "$tmp/$test_function.errors" ]] && rm "$tmp/$test_function.errors"
+  else
+    echo -n 'F'
+    failures+=( "$test_function" )
+    n_failed=$((n_failed+1))
+  fi
+}
+# }}}
+
+# changes back to the original directory, removes the dist file and
+# outputs a report of tests and failures
+cleanup() { # {{{
+  cd "$pwd"
+  [[ -d "$dir" ]] && rm -r "$dir"
+
+  echo
+  echo
+  echo "Tests: $n_tested, Failures: $n_failed."
+  echo
+
+  [[ $n_failed -eq 0 ]] && return 0
+
+  for test in ${failures[@]}; do
+    echo "Failure: $test"
+    echo 'details:'
+    echo
+
+    if [[ -f "$tmp/$test.errors" ]]; then
+      cat "$tmp/$test.errors"
+      rm  "$tmp/$test.errors"
+    else
+      echo '<no stderr captured>'
+    fi
+
+    echo
+  done
+
+  return $n_failed
+}
+# }}}
+
+# compilation is test #1, sets global variable dir. other tests are run
+# from within this directory and it is removed as part of cleanup
+test_compile() {
+  cabal clean
+  cabal install
+  cabal sdist
+
+  read -r pkg < <(find dist/ -type f -name '*.tar.gz' | sort -rV)
+  dir="$(basename "$pkg" .tar.gz)"
+
+  tar -xzf "$pkg" && cd "$dir"
+}
+
+test_sqlite()     { ../test/scaffold.sh < ../test/sqlite-input.txt    ; }
+test_postgresql() { ../test/scaffold.sh < ../test/postgresql-input.txt; }
+test_mongodb()    { ../test/scaffold.sh < ../test/mongodb-input.txt   ; }
+test_tiny()       { ../test/scaffold.sh < ../test/tiny-input.txt      ; }
+
+echo 'Started'
+run_test 'test_compile'
+run_test 'test_sqlite'
+run_test 'test_postgresql'
+run_test 'test_mongodb'
+run_test 'test_tiny'
+cleanup
+
+exit $?

From b9bc2ee1c5efce1bb2571ecb3f457c8730e1a953 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Sun, 11 Sep 2011 15:12:06 -0400
Subject: [PATCH 015/189] Fix typo in the postgres yaml name

---
 yesod-core/Yesod/Settings.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yesod-core/Yesod/Settings.hs b/yesod-core/Yesod/Settings.hs
index 8e303972..7b924472 100644
--- a/yesod-core/Yesod/Settings.hs
+++ b/yesod-core/Yesod/Settings.hs
@@ -53,7 +53,7 @@ loadConfig env = do
 
 loadPostgresqlConnStr :: AppEnvironment -> IO Text
 loadPostgresqlConnStr env = do
-    allSettings <- (join $ YAML.decodeFile ("config/postgesql.yml" :: String)) >>= fromMapping
+    allSettings <- (join $ YAML.decodeFile ("config/postgresql.yml" :: String)) >>= fromMapping
     settings    <- lookupMapping (show env) allSettings
     database    <- lookupScalar "database" settings :: IO Text
 

From 41f17183877d5700e8407a302a465d9bbb7bf970 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Sun, 11 Sep 2011 16:52:54 -0400
Subject: [PATCH 016/189] Provide a default for withDevelAppPort

---
 yesod-core/Yesod/Main.hs | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/yesod-core/Yesod/Main.hs b/yesod-core/Yesod/Main.hs
index bba1fd3e..98b13de4 100644
--- a/yesod-core/Yesod/Main.hs
+++ b/yesod-core/Yesod/Main.hs
@@ -3,12 +3,15 @@ module Yesod.Main
     ( defaultMain
     , fromArgs
     , fromArgsWith
+    , defaultDevelApp
+    , defaultDevelAppWith
     ) where
 
-import Yesod.Logger (Logger, makeLogger)
+import Yesod.Logger (Logger, makeLogger, logString, logLazyText, flushLogger)
 import Yesod.Settings (AppEnvironment(..), AppConfig(..), loadConfig)
 import Network.Wai (Application)
 import Network.Wai.Handler.Warp (run)
+import Network.Wai.Middleware.Debug (debugHandle)
 import System.Console.CmdArgs hiding (args)
 import Data.Char (toUpper, toLower)
 
@@ -72,3 +75,33 @@ fromArgsWith load = do
 
         capitalize [] = []
         capitalize (x:xs) = toUpper x : map toLower xs
+
+-- | A default argument for use with yesod devel with debug logging
+--   enabled. Uses @'Yesod.Settings.loadConfig'@ for the @'Development'@
+--   environment.
+--
+--   > -- Application.hs
+--   > 
+--   > withDevelAppPort :: Dynamic
+--   > withDevelAppPort = toDyn $ defaultDevelApp withMySite
+--
+defaultDevelApp :: (AppConfig -> Logger -> (Application -> IO ()) -> IO ())
+                -> ((Int, Application) -> IO ())
+                -> IO ()
+defaultDevelApp = defaultDevelAppWith loadConfig
+
+-- | Same, but allows one to provide their own cust @'loadConfig'@
+defaultDevelAppWith :: (AppEnvironment -> IO AppConfig)
+                    -> (AppConfig -> Logger -> (Application -> IO ()) -> IO ())
+                    -> ((Int, Application) -> IO ())
+                    -> IO ()
+defaultDevelAppWith load withSite f = do
+        conf   <- load Development
+        logger <- makeLogger
+        let p = appPort conf
+        logString logger $ "Devel application launched, listening on port " ++ show p
+        withSite conf logger $ \app -> f (p, debugHandle (logHandle logger) app)
+        flushLogger logger
+
+        where
+            logHandle logger msg = logLazyText logger msg >> flushLogger logger

From f06f11ff2616da1ce43d70c21fb85445a68f9d7c Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Sun, 11 Sep 2011 17:15:35 -0400
Subject: [PATCH 017/189] Simplify scaffold futher by using defaultDevelApp

---
 yesod/scaffold/Application.hs.cg      | 17 ++---------------
 yesod/scaffold/tiny/Application.hs.cg | 18 +++---------------
 2 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/yesod/scaffold/Application.hs.cg b/yesod/scaffold/Application.hs.cg
index 8688fe02..02d95819 100644
--- a/yesod/scaffold/Application.hs.cg
+++ b/yesod/scaffold/Application.hs.cg
@@ -12,11 +12,10 @@ import Foundation
 import Settings
 import Settings.StaticFiles (static)
 import Yesod.Auth
-import Yesod.Logger (makeLogger, flushLogger, Logger, logString, logLazyText)
+import Yesod.Logger (Logger)
 import Database.Persist.~importGenericDB~
 import Data.ByteString (ByteString)
 import Data.Dynamic (Dynamic, toDyn)
-import Network.Wai.Middleware.Debug (debugHandle)
 
 #ifndef WINDOWS
 import qualified System.Posix.Signals as Signal
@@ -63,16 +62,4 @@ with~sitearg~ conf logger f = do
 
 -- for yesod devel
 withDevelAppPort :: Dynamic
-withDevelAppPort =
-    toDyn go
-  where
-    go :: ((Int, Application) -> IO ()) -> IO ()
-    go f = do
-        conf <- loadConfig Development
-        let port = appPort conf
-        logger <- makeLogger
-        logString logger $ "Devel application launched, listening on port " ++ show port
-        with~sitearg~ conf logger $ \app -> f (port, debugHandle (logHandle logger) app)
-        flushLogger logger
-      where
-        logHandle logger msg = logLazyText logger msg >> flushLogger logger
+withDevelAppPort = toDyn $ defaultDevelApp with~sitearg~
diff --git a/yesod/scaffold/tiny/Application.hs.cg b/yesod/scaffold/tiny/Application.hs.cg
index e4e2aaef..77c73898 100644
--- a/yesod/scaffold/tiny/Application.hs.cg
+++ b/yesod/scaffold/tiny/Application.hs.cg
@@ -12,11 +12,11 @@ import Foundation
 import Settings
 import Yesod.Static
 import Yesod.Settings
-import Yesod.Logger (makeLogger, flushLogger, Logger, logLazyText, logString)
+import Yesod.Main (defaultDevelApp)
+import Yesod.Logger (Logger)
 import Data.ByteString (ByteString)
 import Network.Wai (Application)
 import Data.Dynamic (Dynamic, toDyn)
-import Network.Wai.Middleware.Debug (debugHandle)
 
 -- Import all relevant handler modules here.
 import Handler.Root
@@ -50,16 +50,4 @@ with~sitearg~ conf logger f = do
 
 -- for yesod devel
 withDevelAppPort :: Dynamic
-withDevelAppPort =
-    toDyn go
-  where
-    go :: ((Int, Application) -> IO ()) -> IO ()
-    go f = do
-        conf <- loadConfig Development
-        let port = appPort conf
-        logger <- makeLogger
-        logString logger $ "Devel application launched, listening on port " ++ show port
-        with~sitearg~ conf logger $ \app -> f (port, debugHandle (logHandle logger) app)
-        flushLogger logger
-      where
-        logHandle logger msg = logLazyText logger msg >> flushLogger logger
+withDevelAppPort = toDyn $ defaultDevelApp with~sitearg~

From 900e9476f3bd88ab10b445e7c5c374c2c0398c2c Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Tue, 13 Sep 2011 21:28:33 -0400
Subject: [PATCH 018/189] Move Settings/Main out of -core

---
 yesod-core/yesod-core.cabal             | 7 -------
 {yesod-core => yesod}/Yesod/Main.hs     | 0
 {yesod-core => yesod}/Yesod/Settings.hs | 0
 yesod/yesod.cabal                       | 6 ++++++
 4 files changed, 6 insertions(+), 7 deletions(-)
 rename {yesod-core => yesod}/Yesod/Main.hs (100%)
 rename {yesod-core => yesod}/Yesod/Settings.hs (100%)

diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index ce7a8c0c..1b520dc4 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -38,7 +38,6 @@ library
                    , shakespeare               >= 0.10     && < 0.11
                    , shakespeare-js            >= 0.10     && < 0.11
                    , shakespeare-css           >= 0.10     && < 0.11
-                   , shakespeare-text          >= 0.10     && < 0.11
                    , blaze-builder             >= 0.2.1    && < 0.4
                    , transformers              >= 0.2      && < 0.3
                    , clientsession             >= 0.7.2    && < 0.8
@@ -55,10 +54,6 @@ library
                    , case-insensitive          >= 0.2      && < 0.4
                    , parsec                    >= 2        && < 3.2
                    , directory                 >= 1        && < 1.2
-                   , cmdargs                   >= 0.8      && < 0.9
-                   , data-object               >= 0.3      && < 0.4
-                   , data-object-yaml          >= 0.3      && < 0.4
-                   , warp                      >= 0.4      && < 0.5
                    -- for logger. Probably logger should be a separate package
                    , strict-concurrency        >= 0.2.4    && < 0.2.5
 
@@ -70,8 +65,6 @@ library
                      Yesod.Request
                      Yesod.Widget
                      Yesod.Message
-                     Yesod.Settings
-                     Yesod.Main
     other-modules:   Yesod.Internal
                      Yesod.Internal.Core
                      Yesod.Internal.Session
diff --git a/yesod-core/Yesod/Main.hs b/yesod/Yesod/Main.hs
similarity index 100%
rename from yesod-core/Yesod/Main.hs
rename to yesod/Yesod/Main.hs
diff --git a/yesod-core/Yesod/Settings.hs b/yesod/Yesod/Settings.hs
similarity index 100%
rename from yesod-core/Yesod/Settings.hs
rename to yesod/Yesod/Settings.hs
diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index 94a340d4..37c0634a 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -74,9 +74,15 @@ library
                    , hamlet                    >= 0.10     && < 0.11
                    , shakespeare-js            >= 0.10     && < 0.11
                    , shakespeare-css           >= 0.10     && < 0.11
+                   , shakespeare-text          >= 0.10     && < 0.11
                    , warp                      >= 0.4      && < 0.5
                    , blaze-html                >= 0.4      && < 0.5
+                   , cmdargs                   >= 0.8      && < 0.9
+                   , data-object               >= 0.3      && < 0.4
+                   , data-object-yaml          >= 0.3      && < 0.4
     exposed-modules: Yesod
+                     Yesod.Settings
+                     Yesod.Main
     ghc-options:     -Wall
 
 executable             yesod

From 2d0d70fd60c93f6aa29ddadd9e40d83670f3a660 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Tue, 13 Sep 2011 21:55:11 -0400
Subject: [PATCH 019/189] bring comments back in

---
 yesod/Yesod/Settings.hs | 41 +++++++++++++++++++++++++++++++++++++----
 1 file changed, 37 insertions(+), 4 deletions(-)

diff --git a/yesod/Yesod/Settings.hs b/yesod/Yesod/Settings.hs
index 7b924472..148b081a 100644
--- a/yesod/Yesod/Settings.hs
+++ b/yesod/Yesod/Settings.hs
@@ -23,13 +23,41 @@ data AppEnvironment = Development
                     | Production
                     deriving (Eq, Show, Read, Enum, Bounded)
 
+-- | Dynamic per-environment configuration which can be loaded at
+--   run-time negating the need to recompile between environments.
 data AppConfig = AppConfig
-    { appEnv             :: AppEnvironment
-    , appPort            :: Int
+    { appEnv  :: AppEnvironment
+    , appPort :: Int
+
+    -- | Your application will keep a connection pool and take
+    --   connections from there as necessary instead of continually
+    --   creating new connections. This value gives the maximum number
+    --   of connections to be open at a given time. If your application
+    --   requests a connection when all connections are in use, that
+    --   request will fail. Try to choose a number that will work well
+    --   with the system resources available to you while providing
+    --   enough connections for your expected load.
+    --
+    --   Connections are returned to the pool as quickly as possible by
+    --   Yesod to avoid resource exhaustion. A connection is only
+    --   considered in use while within a call to runDB.
     , connectionPoolSize :: Int
-    , appRoot            :: Text
+
+    -- | The base URL for your application. This will usually be
+    --   different for development and production. Yesod automatically
+    --   constructs URLs for you, so this value must be accurate to
+    --   create valid links.
+    --
+    --   If your domain name was "yesod.com", you would probably want it
+    --   to be:
+    --
+    --   > "http://yesod.com"
+    --
+    , appRoot :: Text
     } deriving (Show)
 
+-- | Load an @'AppConfig'@ from a YAML-formatted file located at
+--   @config\/settings.yml@.
 loadConfig :: AppEnvironment -> IO AppConfig
 loadConfig env = do
     allSettings <- (join $ YAML.decodeFile ("config/settings.yml" :: String)) >>= fromMapping
@@ -51,6 +79,8 @@ loadConfig env = do
             Production -> ""
             _          -> ":" ++ show p
 
+-- | Load Postgresql settings from a YAML-formatted file located at
+--   @config\/postgresql.yml@.
 loadPostgresqlConnStr :: AppEnvironment -> IO Text
 loadPostgresqlConnStr env = do
     allSettings <- (join $ YAML.decodeFile ("config/postgresql.yml" :: String)) >>= fromMapping
@@ -62,13 +92,16 @@ loadPostgresqlConnStr env = do
       return $ [st| #{key}=#{value} |]
     return $ [st|#{connPart} dbname=#{database}|]
 
+-- | Load Sqlite settings from a YAML-formatted file located at
+--   @config\/sqlite.yml@.
 loadSqliteConnStr :: AppEnvironment -> IO Text
 loadSqliteConnStr env = do
     allSettings <- (join $ YAML.decodeFile ("config/sqlite.yml" :: String)) >>= fromMapping
     settings    <- lookupMapping (show env) allSettings
     lookupScalar "database" settings
 
--- note: no type signature to avoid Persistent.MongoDB dep
+-- note: no type signature to avoid an extra Persistent.MongoDB dep for
+-- those that don't need it
 --loadMongoConnParams :: AppEnvironment -> IO (Database, HostName)
 loadMongoConnParams env = do
     allSettings <- (join $ YAML.decodeFile ("config/mongoDB.yml" :: String)) >>= fromMapping

From f41029fd4cc53454f353fa56855e9c5ef080751c Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Tue, 13 Sep 2011 23:07:27 -0400
Subject: [PATCH 020/189] Add yesod dep to tiny scaffold

---
 yesod/scaffold/tiny/project.cabal.cg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/yesod/scaffold/tiny/project.cabal.cg b/yesod/scaffold/tiny/project.cabal.cg
index 527f265b..6e5c3cc5 100644
--- a/yesod/scaffold/tiny/project.cabal.cg
+++ b/yesod/scaffold/tiny/project.cabal.cg
@@ -46,6 +46,7 @@ executable         ~project~
     hs-source-dirs: .
 
     build-depends: base         >= 4       && < 5
+                 , yesod        >= 0.9     && < 0.10
                  , yesod-core   >= 0.9     && < 0.10
                  , yesod-static
                  , clientsession

From cfb6e1e24a6eb5f8ebafc6d1c1c038b3278ce98f Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Mon, 19 Sep 2011 15:12:19 -0400
Subject: [PATCH 021/189] Move bulk of Settings/Main out of -core

Trim settings to only the AppConfig def and an AppEnv typeclass, rename
to Config but leave in -core
---
 .../Settings.hs => yesod-core/Yesod/Config.hs |  40 +++----
 yesod-core/Yesod/Core.hs                      |   2 +
 yesod-core/yesod-core.cabal                   |   4 +
 yesod/Yesod/Main.hs                           | 107 ------------------
 4 files changed, 19 insertions(+), 134 deletions(-)
 rename yesod/Yesod/Settings.hs => yesod-core/Yesod/Config.hs (70%)
 delete mode 100644 yesod/Yesod/Main.hs

diff --git a/yesod/Yesod/Settings.hs b/yesod-core/Yesod/Config.hs
similarity index 70%
rename from yesod/Yesod/Settings.hs
rename to yesod-core/Yesod/Config.hs
index 148b081a..2fccc1e6 100644
--- a/yesod/Yesod/Settings.hs
+++ b/yesod-core/Yesod/Config.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS -fno-warn-missing-signatures #-}
 {-# LANGUAGE QuasiQuotes                 #-}
-module Yesod.Settings
-    ( AppEnvironment(..)
+module Yesod.Config
+    ( AppEnv(..)
     , AppConfig(..)
     , loadConfig
     , loadPostgresqlConnStr
@@ -17,30 +17,16 @@ import Text.Shakespeare.Text (st)
 import qualified Data.Object.Yaml as YAML
 import qualified Data.Text        as T
 
-data AppEnvironment = Development
-                    | Test
-                    | Staging
-                    | Production
-                    deriving (Eq, Show, Read, Enum, Bounded)
+class AppEnv e where
+    displayPort :: e -> Bool
 
 -- | Dynamic per-environment configuration which can be loaded at
 --   run-time negating the need to recompile between environments.
-data AppConfig = AppConfig
-    { appEnv  :: AppEnvironment
+data AppConfig e = AppConfig
+    { appEnv  :: e
     , appPort :: Int
 
-    -- | Your application will keep a connection pool and take
-    --   connections from there as necessary instead of continually
-    --   creating new connections. This value gives the maximum number
-    --   of connections to be open at a given time. If your application
-    --   requests a connection when all connections are in use, that
-    --   request will fail. Try to choose a number that will work well
-    --   with the system resources available to you while providing
-    --   enough connections for your expected load.
-    --
-    --   Connections are returned to the pool as quickly as possible by
-    --   Yesod to avoid resource exhaustion. A connection is only
-    --   considered in use while within a call to runDB.
+    -- TODO: put this in db configs
     , connectionPoolSize :: Int
 
     -- | The base URL for your application. This will usually be
@@ -56,9 +42,10 @@ data AppConfig = AppConfig
     , appRoot :: Text
     } deriving (Show)
 
+
 -- | Load an @'AppConfig'@ from a YAML-formatted file located at
 --   @config\/settings.yml@.
-loadConfig :: AppEnvironment -> IO AppConfig
+loadConfig :: AppEnv e => e -> IO (AppConfig e)
 loadConfig env = do
     allSettings <- (join $ YAML.decodeFile ("config/settings.yml" :: String)) >>= fromMapping
     settings    <- lookupMapping (show env) allSettings
@@ -75,13 +62,12 @@ loadConfig env = do
 
     where
         addPort :: Int -> String
-        addPort p = case env of
-            Production -> ""
-            _          -> ":" ++ show p
+        addPort p = if displayPort env
+                        then ":" ++ show p else ""
 
 -- | Load Postgresql settings from a YAML-formatted file located at
 --   @config\/postgresql.yml@.
-loadPostgresqlConnStr :: AppEnvironment -> IO Text
+loadPostgresqlConnStr :: Show e => e -> IO Text
 loadPostgresqlConnStr env = do
     allSettings <- (join $ YAML.decodeFile ("config/postgresql.yml" :: String)) >>= fromMapping
     settings    <- lookupMapping (show env) allSettings
@@ -94,7 +80,7 @@ loadPostgresqlConnStr env = do
 
 -- | Load Sqlite settings from a YAML-formatted file located at
 --   @config\/sqlite.yml@.
-loadSqliteConnStr :: AppEnvironment -> IO Text
+loadSqliteConnStr :: Show e => e -> IO Text
 loadSqliteConnStr env = do
     allSettings <- (join $ YAML.decodeFile ("config/sqlite.yml" :: String)) >>= fromMapping
     settings    <- lookupMapping (show env) allSettings
diff --git a/yesod-core/Yesod/Core.hs b/yesod-core/Yesod/Core.hs
index 9f137991..2e395856 100644
--- a/yesod-core/Yesod/Core.hs
+++ b/yesod-core/Yesod/Core.hs
@@ -33,6 +33,7 @@ module Yesod.Core
     , module Yesod.Request
     , module Yesod.Widget
     , module Yesod.Message
+    , module Yesod.Config
     ) where
 
 import Yesod.Internal.Core
@@ -42,6 +43,7 @@ import Yesod.Handler
 import Yesod.Request
 import Yesod.Widget
 import Yesod.Message
+import Yesod.Config
 
 import Language.Haskell.TH.Syntax
 import Data.Text (Text)
diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index 1b520dc4..a499a2d3 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -38,6 +38,7 @@ library
                    , shakespeare               >= 0.10     && < 0.11
                    , shakespeare-js            >= 0.10     && < 0.11
                    , shakespeare-css           >= 0.10     && < 0.11
+                   , shakespeare-text          >= 0.10     && < 0.11
                    , blaze-builder             >= 0.2.1    && < 0.4
                    , transformers              >= 0.2      && < 0.3
                    , clientsession             >= 0.7.2    && < 0.8
@@ -54,6 +55,8 @@ library
                    , case-insensitive          >= 0.2      && < 0.4
                    , parsec                    >= 2        && < 3.2
                    , directory                 >= 1        && < 1.2
+                   , data-object               >= 0.3      && < 0.4
+                   , data-object-yaml          >= 0.3      && < 0.4
                    -- for logger. Probably logger should be a separate package
                    , strict-concurrency        >= 0.2.4    && < 0.2.5
 
@@ -65,6 +68,7 @@ library
                      Yesod.Request
                      Yesod.Widget
                      Yesod.Message
+                     Yesod.Config
     other-modules:   Yesod.Internal
                      Yesod.Internal.Core
                      Yesod.Internal.Session
diff --git a/yesod/Yesod/Main.hs b/yesod/Yesod/Main.hs
deleted file mode 100644
index 98b13de4..00000000
--- a/yesod/Yesod/Main.hs
+++ /dev/null
@@ -1,107 +0,0 @@
-{-# LANGUAGE DeriveDataTypeable #-}
-module Yesod.Main
-    ( defaultMain
-    , fromArgs
-    , fromArgsWith
-    , defaultDevelApp
-    , defaultDevelAppWith
-    ) where
-
-import Yesod.Logger (Logger, makeLogger, logString, logLazyText, flushLogger)
-import Yesod.Settings (AppEnvironment(..), AppConfig(..), loadConfig)
-import Network.Wai (Application)
-import Network.Wai.Handler.Warp (run)
-import Network.Wai.Middleware.Debug (debugHandle)
-import System.Console.CmdArgs hiding (args)
-import Data.Char (toUpper, toLower)
-
-data ArgConfig = ArgConfig
-    { environment :: String
-    , port        :: Int
-    } deriving (Show, Data, Typeable)
-
--- | Load an @'AppConfig'@ using the provided function, then start your
---   app via Warp on the configured port.
---
---   > -- main.hs
---   > import Application (withMySite)
---   > import Yesod.Main  (defaultMain, fromArgs)
---   >
---   > main :: IO ()
---   > main = defaultMain fromArgs withMySite
---
-defaultMain :: IO AppConfig -> (AppConfig -> Logger -> (Application -> IO ()) -> IO ()) -> IO ()
-defaultMain load withSite = do
-    config <- load
-    logger <- makeLogger
-    withSite config logger $ run (appPort config)
-
--- | Call the @'Yesod.Settings.loadConfig'@ function for the environment
---   passed on the commandline (or the default, \"development\") and
---   override the port if passed.
-fromArgs :: IO AppConfig
-fromArgs = fromArgsWith loadConfig
-
--- | Same, but allows one to provide their own custom @'loadConfig'@
-fromArgsWith :: (AppEnvironment -> IO AppConfig) -> IO AppConfig
-fromArgsWith load = do
-    args <- cmdArgs argConfig
-
-    let env = read
-            $ capitalize
-            $ if environment args /= ""
-                  then environment args
-                  else "development"
-
-    config <- load env
-
-    return $ if port args /= 0
-                then config { appPort = port args }
-                else config
-
-    where
-        argConfig :: ArgConfig
-        argConfig = ArgConfig
-            { environment = def 
-                &= help ("application environment, one of: " ++ (foldl1 (\a b -> a ++ ", " ++ b) environments))
-                &= typ   "ENVIRONMENT"
-            , port = def
-                &= help "the port to listen on"
-                &= typ  "PORT"
-            }
-
-        environments :: [String]
-        environments = map ((map toLower) . show) ([minBound..maxBound] :: [AppEnvironment])
-
-        capitalize [] = []
-        capitalize (x:xs) = toUpper x : map toLower xs
-
--- | A default argument for use with yesod devel with debug logging
---   enabled. Uses @'Yesod.Settings.loadConfig'@ for the @'Development'@
---   environment.
---
---   > -- Application.hs
---   > 
---   > withDevelAppPort :: Dynamic
---   > withDevelAppPort = toDyn $ defaultDevelApp withMySite
---
-defaultDevelApp :: (AppConfig -> Logger -> (Application -> IO ()) -> IO ())
-                -> ((Int, Application) -> IO ())
-                -> IO ()
-defaultDevelApp = defaultDevelAppWith loadConfig
-
--- | Same, but allows one to provide their own cust @'loadConfig'@
-defaultDevelAppWith :: (AppEnvironment -> IO AppConfig)
-                    -> (AppConfig -> Logger -> (Application -> IO ()) -> IO ())
-                    -> ((Int, Application) -> IO ())
-                    -> IO ()
-defaultDevelAppWith load withSite f = do
-        conf   <- load Development
-        logger <- makeLogger
-        let p = appPort conf
-        logString logger $ "Devel application launched, listening on port " ++ show p
-        withSite conf logger $ \app -> f (p, debugHandle (logHandle logger) app)
-        flushLogger logger
-
-        where
-            logHandle logger msg = logLazyText logger msg >> flushLogger logger

From 4f52f22a2ccb89f87257ef66d0871066012d587b Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Mon, 19 Sep 2011 15:14:41 -0400
Subject: [PATCH 022/189] Put yesod module back as it was

---
 yesod/Yesod.hs    | 4 ----
 yesod/yesod.cabal | 6 ------
 2 files changed, 10 deletions(-)

diff --git a/yesod/Yesod.hs b/yesod/Yesod.hs
index 6fc6ee98..7724a345 100644
--- a/yesod/Yesod.hs
+++ b/yesod/Yesod.hs
@@ -7,8 +7,6 @@ module Yesod
     , module Yesod.Form
     , module Yesod.Json
     , module Yesod.Persist
-    , module Yesod.Settings
-    , module Yesod.Main
       -- * Running your application
     , warp
     , warpDebug
@@ -48,8 +46,6 @@ import Text.Julius
 import Yesod.Form
 import Yesod.Json
 import Yesod.Persist
-import Yesod.Settings
-import Yesod.Main
 import Network.Wai (Application)
 import Network.Wai.Middleware.Debug
 import Control.Monad.Trans.Class (lift)
diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index 37c0634a..94a340d4 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -74,15 +74,9 @@ library
                    , hamlet                    >= 0.10     && < 0.11
                    , shakespeare-js            >= 0.10     && < 0.11
                    , shakespeare-css           >= 0.10     && < 0.11
-                   , shakespeare-text          >= 0.10     && < 0.11
                    , warp                      >= 0.4      && < 0.5
                    , blaze-html                >= 0.4      && < 0.5
-                   , cmdargs                   >= 0.8      && < 0.9
-                   , data-object               >= 0.3      && < 0.4
-                   , data-object-yaml          >= 0.3      && < 0.4
     exposed-modules: Yesod
-                     Yesod.Settings
-                     Yesod.Main
     ghc-options:     -Wall
 
 executable             yesod

From b031702a9bec56c9a1bfba6275ce867a260f182b Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Mon, 19 Sep 2011 15:15:04 -0400
Subject: [PATCH 023/189] Add yesod-default

Still needs the cabal, Setup, etc etc but at least it compiles and is
somewhat extensible.
---
 yesod-default/Yesod/Default/Config.hs | 76 +++++++++++++++++++++++++++
 yesod-default/Yesod/Default/Main.hs   | 65 +++++++++++++++++++++++
 2 files changed, 141 insertions(+)
 create mode 100644 yesod-default/Yesod/Default/Config.hs
 create mode 100644 yesod-default/Yesod/Default/Main.hs

diff --git a/yesod-default/Yesod/Default/Config.hs b/yesod-default/Yesod/Default/Config.hs
new file mode 100644
index 00000000..7f92b3b8
--- /dev/null
+++ b/yesod-default/Yesod/Default/Config.hs
@@ -0,0 +1,76 @@
+{-# LANGUAGE DeriveDataTypeable #-}
+module Yesod.Default.Config
+    ( DefaultEnv(..)
+    , ArgConfig(..)
+    , defaultArgConfig
+    , fromArgs
+    , fromArgsWith
+    , loadDevelopmentConfig
+
+    -- reexport
+    , module Yesod.Config
+    ) where
+
+import Yesod.Config
+import Data.Char (toUpper, toLower)
+import System.Console.CmdArgs hiding (args)
+
+-- | A yesod-provided @'AppEnv'@, allows for Development, Testing, and
+--   Production environments
+data DefaultEnv = Development
+                | Testing
+                | Production deriving (Read, Show, Enum, Bounded)
+
+instance AppEnv DefaultEnv where
+    displayPort Production = False
+    displayPort _          = True
+
+-- | Setup commandline arguments for environment and port
+data ArgConfig = ArgConfig
+    { environment :: String
+    , port        :: Int
+    } deriving (Show, Data, Typeable)
+
+-- | A default @'ArgConfig'@ if using the provided @'DefaultEnv'@ type.
+defaultArgConfig :: ArgConfig
+defaultArgConfig =
+    ArgConfig
+        { environment = def 
+            &= opt "development"
+            &= help ("application environment, one of: " ++ environments)
+            &= typ   "ENVIRONMENT"
+        , port = def
+            &= help "the port to listen on"
+            &= typ  "PORT"
+        }
+
+    where
+        environments :: String
+        environments = foldl1 (\a b -> a ++ ", " ++ b)
+                     . map ((map toLower) . show)
+                     $ ([minBound..maxBound] :: [DefaultEnv])
+
+-- | Load an @'AppConfig'@ using the @'DefaultEnv'@ environments from
+--   commandline arguments.
+fromArgs :: IO (AppConfig DefaultEnv)
+fromArgs = fromArgsWith defaultArgConfig
+
+fromArgsWith :: AppEnv e => ArgConfig -> IO (AppConfig e)
+fromArgsWith argConfig = do
+    args   <- cmdArgs argConfig
+
+    let env = read $ capitalize $ environment args
+
+    config <- loadConfig env
+
+    return $ if port args /= 0
+                then config { appPort = port args }
+                else config
+
+    where
+        capitalize [] = []
+        capitalize (x:xs) = toUpper x : map toLower xs
+
+-- | Load your development config (when using @'DefaultEnv'@)
+loadDevelopmentConfig :: IO (AppConfig DefaultEnv)
+loadDevelopmentConfig = loadConfig Development
diff --git a/yesod-default/Yesod/Default/Main.hs b/yesod-default/Yesod/Default/Main.hs
new file mode 100644
index 00000000..9a1e2e45
--- /dev/null
+++ b/yesod-default/Yesod/Default/Main.hs
@@ -0,0 +1,65 @@
+{-# LANGUAGE DeriveDataTypeable #-}
+module Yesod.Default.Main
+    ( defaultMain
+    , defaultDevelApp
+    , defaultDevelAppWith
+    ) where
+
+import Yesod.Default.Config
+import Yesod.Logger (Logger, makeLogger, logString, logLazyText, flushLogger)
+import Network.Wai (Application)
+import Network.Wai.Handler.Warp (run)
+import Network.Wai.Middleware.Debug (debugHandle)
+
+-- | Run your app, taking environment and port settings from the
+--   commandline.
+--
+--   Use @'fromArgs'@ when using the provided @'DefaultEnv'@ type, or
+--   @'fromArgsWith'@ when using a custom type
+--
+--   > main :: IO ()
+--   > main = defaultMain fromArgs withMySite
+--
+--   or
+--
+--   > main :: IO ()
+--   > main = defaultMain (fromArgsWith customArgConfig) withMySite
+--
+defaultMain :: AppEnv e => IO (AppConfig e) -> (AppConfig e -> Logger -> (Application -> IO ()) -> IO ()) -> IO ()
+defaultMain load withSite = do
+    config <- load
+    logger <- makeLogger
+    withSite config logger $ run (appPort config)
+
+-- | Run your development app using the provided @'DefaultEnv'@ type
+--
+--   > withDevelAppPort :: Dynamic
+--   > withDevelAppPort = toDyn $ defaultDevelApp withMySite
+--
+defaultDevelApp :: (AppConfig DefaultEnv -> Logger -> (Application -> IO ()) -> IO ())
+                -> ((Int, Application) -> IO ())
+                -> IO ()
+defaultDevelApp = defaultDevelAppWith loadDevelopmentConfig
+
+-- | Run your development app using a custom environment type and loader
+--   function
+--
+--   > withDevelAppPort :: Dynamic
+--   > withDevelAppPort = toDyn $ (defaultDevelAppWith customLoadAppConfig) withMySite
+--
+defaultDevelAppWith :: AppEnv e
+                    -- | A means to load your development @'AppConfig'@
+                    => IO (AppConfig e)
+                    -- | Your @withMySite@ function
+                    -> (AppConfig e -> Logger -> (Application -> IO ()) -> IO ())
+                    -> ((Int, Application) -> IO ()) -> IO ()
+defaultDevelAppWith load withSite f = do
+        conf   <- load
+        logger <- makeLogger
+        let p = appPort conf
+        logString logger $ "Devel application launched, listening on port " ++ show p
+        withSite conf logger $ \app -> f (p, debugHandle (logHandle logger) app)
+        flushLogger logger
+
+        where
+            logHandle logger msg = logLazyText logger msg >> flushLogger logger

From aef2992005a53a8a49c1e2bb5c266072bbdc9d73 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Mon, 19 Sep 2011 16:10:46 -0400
Subject: [PATCH 024/189] fix haddock parse

---
 yesod-default/Yesod/Default/Main.hs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/yesod-default/Yesod/Default/Main.hs b/yesod-default/Yesod/Default/Main.hs
index 9a1e2e45..2ac9ee69 100644
--- a/yesod-default/Yesod/Default/Main.hs
+++ b/yesod-default/Yesod/Default/Main.hs
@@ -48,10 +48,8 @@ defaultDevelApp = defaultDevelAppWith loadDevelopmentConfig
 --   > withDevelAppPort = toDyn $ (defaultDevelAppWith customLoadAppConfig) withMySite
 --
 defaultDevelAppWith :: AppEnv e
-                    -- | A means to load your development @'AppConfig'@
-                    => IO (AppConfig e)
-                    -- | Your @withMySite@ function
-                    -> (AppConfig e -> Logger -> (Application -> IO ()) -> IO ())
+                    => IO (AppConfig e) -- ^ A means to load your development @'AppConfig'@
+                    -> (AppConfig e -> Logger -> (Application -> IO ()) -> IO ()) -- ^ Your @withMySite@ function
                     -> ((Int, Application) -> IO ()) -> IO ()
 defaultDevelAppWith load withSite f = do
         conf   <- load

From 0563a2d5e47a650a774c2b7c084bf91c1205f6b9 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Mon, 19 Sep 2011 16:10:59 -0400
Subject: [PATCH 025/189] Make yesod-default installable

---
 yesod-default/LICENSE             | 25 +++++++++++++++++++++++++
 yesod-default/README              |  0
 yesod-default/Setup.lhs           |  7 +++++++
 yesod-default/yesod-default.cabal | 31 +++++++++++++++++++++++++++++++
 4 files changed, 63 insertions(+)
 create mode 100644 yesod-default/LICENSE
 create mode 100644 yesod-default/README
 create mode 100755 yesod-default/Setup.lhs
 create mode 100644 yesod-default/yesod-default.cabal

diff --git a/yesod-default/LICENSE b/yesod-default/LICENSE
new file mode 100644
index 00000000..8643e5d8
--- /dev/null
+++ b/yesod-default/LICENSE
@@ -0,0 +1,25 @@
+The following license covers this documentation, and the source code, except
+where otherwise indicated.
+
+Copyright 2010, Michael Snoyman. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS "AS IS" AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/yesod-default/README b/yesod-default/README
new file mode 100644
index 00000000..e69de29b
diff --git a/yesod-default/Setup.lhs b/yesod-default/Setup.lhs
new file mode 100755
index 00000000..06e2708f
--- /dev/null
+++ b/yesod-default/Setup.lhs
@@ -0,0 +1,7 @@
+#!/usr/bin/env runhaskell
+
+> module Main where
+> import Distribution.Simple
+
+> main :: IO ()
+> main = defaultMain
diff --git a/yesod-default/yesod-default.cabal b/yesod-default/yesod-default.cabal
new file mode 100644
index 00000000..306b6fb1
--- /dev/null
+++ b/yesod-default/yesod-default.cabal
@@ -0,0 +1,31 @@
+name:            yesod-default
+version:         0.3.1
+license:         BSD3
+license-file:    LICENSE
+author:          Patrick Brisbin
+maintainer:      Patrick Brisbin <pbrisbin@gmail.com>
+synopsis:        Default config and main functions for your yesod application
+category:        Web, Yesod
+stability:       Stable
+cabal-version:   >= 1.6
+build-type:      Simple
+homepage:        http://www.yesodweb.com/
+description:     Convenient wrappers for your the configuration and
+                 execution of your yesod application
+
+library
+    build-depends:   base       >= 4   && < 5
+                   , yesod-core >= 0.9 && < 0.10
+                   , cmdargs    >= 0.8 && < 0.9
+                   , warp       >= 0.4 && < 0.5
+                   , wai        >= 0.4 && < 0.5
+                   , wai-extra  >= 0.4 && < 0.5
+
+    exposed-modules: Yesod.Default.Config
+                   , Yesod.Default.Main
+
+    ghc-options:     -Wall
+
+source-repository head
+  type:     git
+  location: git://github.com/yesodweb/yesod.git

From d2e93341c0762e3996bd6bde28f5a268bd14fbc8 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Tue, 20 Sep 2011 10:25:26 +0300
Subject: [PATCH 026/189] OptionList

---
 yesod-form/Yesod/Form/Fields.hs | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/yesod-form/Yesod/Form/Fields.hs b/yesod-form/Yesod/Form/Fields.hs
index 32dfb93f..6ea1db92 100644
--- a/yesod-form/Yesod/Form/Fields.hs
+++ b/yesod-form/Yesod/Form/Fields.hs
@@ -35,6 +35,8 @@ module Yesod.Form.Fields
     , selectField'
     , radioField'
     , Option (..)
+    , OptionList (..)
+    , mkOptionList
     , optionsPersist
     , optionsPairs
     , optionsEnum
@@ -76,6 +78,7 @@ import Yesod.Request (FileInfo)
 
 import Yesod.Core (toSinglePiece, GGHandler, SinglePiece)
 import Yesod.Persist (selectList, runDB, Filter, SelectOpt, YesodPersistBackend, Key, YesodPersist, PersistEntity, PersistBackend)
+import Control.Arrow ((&&&))
 
 #if __GLASGOW_HASKELL__ >= 700
 #define WHAMLET whamlet
@@ -303,7 +306,7 @@ urlField = Field
 selectField :: (Eq a, RenderMessage master FormMessage) => [(Text, a)] -> Field sub master a
 selectField = selectField' . optionsPairs
 
-selectField' :: (Eq a, RenderMessage master FormMessage) => GGHandler sub master IO [Option a] -> Field sub master a
+selectField' :: (Eq a, RenderMessage master FormMessage) => GGHandler sub master IO (OptionList a) -> Field sub master a
 selectField' = selectFieldHelper
     (\theId name inside -> [WHAMLET|<select ##{theId} name=#{name}>^{inside}|]) -- outside
     (\_theId _name isSel -> [WHAMLET|<option value=none :isSel:selected>_{MsgSelectNone}|]) -- onOpt
@@ -317,7 +320,7 @@ multiSelectField = multiSelectFieldHelper
 radioField :: (Eq a, RenderMessage master FormMessage) => [(Text, a)] -> Field sub master a
 radioField = radioField' . optionsPairs
 
-radioField' :: (Eq a, RenderMessage master FormMessage) => GGHandler sub master IO [Option a] -> Field sub master a
+radioField' :: (Eq a, RenderMessage master FormMessage) => GGHandler sub master IO (OptionList a) -> Field sub master a
 radioField' = selectFieldHelper
     (\theId _name inside -> [WHAMLET|<div ##{theId}>^{inside}|])
     (\theId name isSel -> [WHAMLET|
@@ -380,20 +383,31 @@ multiSelectFieldHelper outside inside opts = Field
     selectParser xs | not $ null (["", "none"] `intersect` xs) = Right Nothing
                     | otherwise = (Right . Just . map snd . catMaybes . map (\y -> lookup y pairs) . nub . map fst . rights . map Data.Text.Read.decimal) xs
 
+data OptionList a = OptionList
+    { olOptions :: [Option a]
+    , olReadExternal :: Text -> Maybe a
+    }
+
+mkOptionList :: [Option a] -> OptionList a
+mkOptionList os = OptionList
+    { olOptions = os
+    , olReadExternal = flip Map.lookup $ Map.fromList $ map (optionExternalValue &&& optionInternalValue) os
+    }
+
 data Option a = Option
     { optionDisplay :: Text
     , optionInternalValue :: a
     , optionExternalValue :: Text
     }
 
-optionsPairs :: [(Text, a)] -> GGHandler sub master IO [Option a]
-optionsPairs = return . zipWith (\external (display, internal) -> Option
+optionsPairs :: [(Text, a)] -> GGHandler sub master IO (OptionList a)
+optionsPairs = return . mkOptionList . zipWith (\external (display, internal) -> Option
     { optionDisplay = display
     , optionInternalValue = internal
     , optionExternalValue = pack $ show external
     }) [1 :: Int ..]
 
-optionsEnum :: (Show a, Enum a, Bounded a) => GGHandler sub master IO [Option a]
+optionsEnum :: (Show a, Enum a, Bounded a) => GGHandler sub master IO (OptionList a)
 optionsEnum = optionsPairs $ map (\x -> (pack $ show x, x)) [minBound..maxBound]
 
 optionsPersist :: ( YesodPersist master, PersistEntity a, PersistBackend (YesodPersistBackend master) (GGHandler sub master IO)
@@ -413,13 +427,13 @@ selectFieldHelper
         => (Text -> Text -> GWidget sub master () -> GWidget sub master ())
         -> (Text -> Text -> Bool -> GWidget sub master ())
         -> (Text -> Text -> Text -> Bool -> Text -> GWidget sub master ())
-        -> GGHandler sub master IO [Option a] -> Field sub master a
+        -> GGHandler sub master IO (OptionList a) -> Field sub master a
 selectFieldHelper outside onOpt inside opts' = Field
     { fieldParse = \x -> do
         opts <- opts'
         return $ selectParser opts x
     , fieldView = \theId name val isReq -> do
-        opts <- lift $ liftIOHandler opts'
+        opts <- fmap olOptions $ lift $ liftIOHandler opts'
         outside theId name $ do
             unless isReq $ onOpt theId name $ not $ render opts val `elem` map optionExternalValue opts
             flip mapM_ opts $ \opt -> inside
@@ -436,9 +450,9 @@ selectFieldHelper outside onOpt inside opts' = Field
     selectParser opts (s:_) = case s of
             "" -> Right Nothing
             "none" -> Right Nothing
-            x -> case listToMaybe $ filter ((== x) . optionExternalValue) opts of
+            x -> case olReadExternal opts x of
                     Nothing -> Left $ SomeMessage $ MsgInvalidEntry x
-                    Just y -> Right $ Just $ optionInternalValue y
+                    Just y -> Right $ Just y
 
 fileAFormReq :: (RenderMessage master msg, RenderMessage master FormMessage) => FieldSettings msg -> AForm sub master FileInfo
 fileAFormReq fs = AForm $ \(master, langs) menvs ints -> do

From ca55a891c81a9248f2dd0cb5df7a2afb3a1f1fb5 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Tue, 20 Sep 2011 22:55:31 -0400
Subject: [PATCH 027/189] Rewrite AppConfig loader

* Remove AppEnv
* Add logic to set approort smartly in most cases
* Refactor YAML parser
* Update yesod-default to match

There's still much todo...
---
 yesod-core/Yesod/Config.hs            | 137 ++++++++++++++------------
 yesod-default/Yesod/Default/Config.hs |   6 +-
 yesod-default/Yesod/Default/Main.hs   |   4 +-
 3 files changed, 79 insertions(+), 68 deletions(-)

diff --git a/yesod-core/Yesod/Config.hs b/yesod-core/Yesod/Config.hs
index 2fccc1e6..5aa1a9a7 100644
--- a/yesod-core/Yesod/Config.hs
+++ b/yesod-core/Yesod/Config.hs
@@ -1,8 +1,7 @@
 {-# OPTIONS -fno-warn-missing-signatures #-}
 {-# LANGUAGE QuasiQuotes                 #-}
 module Yesod.Config
-    ( AppEnv(..)
-    , AppConfig(..)
+    ( AppConfig(..)
     , loadConfig
     , loadPostgresqlConnStr
     , loadSqliteConnStr
@@ -10,88 +9,104 @@ module Yesod.Config
     ) where
 
 import Control.Monad (join)
+import Data.Maybe (fromMaybe)
 import Data.Object
+import Data.Object.Yaml
 import Data.Text (Text)
-import Text.Shakespeare.Text (st)
+--import Text.Shakespeare.Text (st)
 
-import qualified Data.Object.Yaml as YAML
 import qualified Data.Text        as T
 
-class AppEnv e where
-    displayPort :: e -> Bool
-
 -- | Dynamic per-environment configuration which can be loaded at
 --   run-time negating the need to recompile between environments.
 data AppConfig e = AppConfig
     { appEnv  :: e
     , appPort :: Int
-
-    -- TODO: put this in db configs
-    , connectionPoolSize :: Int
-
-    -- | The base URL for your application. This will usually be
-    --   different for development and production. Yesod automatically
-    --   constructs URLs for you, so this value must be accurate to
-    --   create valid links.
-    --
-    --   If your domain name was "yesod.com", you would probably want it
-    --   to be:
-    --
-    --   > "http://yesod.com"
-    --
     , appRoot :: Text
     } deriving (Show)
 
+-- | Dynamic per-environment database configuration which can be loaded
+--   at run-time
+data DbConfig = PostgresConf String String Int -- ^ Connection string, Database, Pool size
+              | SqliteConf String Int          -- ^ Database, Pool size
+              | MongoConf (String,String) Int  -- ^ (Database,Host), Pool size
 
 -- | Load an @'AppConfig'@ from a YAML-formatted file located at
---   @config\/settings.yml@.
-loadConfig :: AppEnv e => e -> IO (AppConfig e)
-loadConfig env = do
-    allSettings <- (join $ YAML.decodeFile ("config/settings.yml" :: String)) >>= fromMapping
-    settings    <- lookupMapping (show env) allSettings
-    hostS       <- lookupScalar "host" settings
-    port        <- fmap read $ lookupScalar "port" settings
-    connectionPoolSizeS <- lookupScalar "connectionPoolSize" settings
+--   @config\/settings.yml@. @'show'@ will be called on the first
+--   parameter to determine which environment block to load
+loadConfig :: Show e => e -> IO (AppConfig e)
+loadConfig env = withYamlEnvironment "config/settings.yml" env $ \e -> do
+    let mssl     = lookupScalar "ssl"     e
+    let mhost    = lookupScalar "host"    e
+    let mport    = lookupScalar "port"    e
+    let mapproot = lookupScalar "approot" e
+
+    -- set some default arguments
+    let ssl = toBool $ fromMaybe "false" mssl
+    port <- safeRead $ fromMaybe (if ssl then "443" else "80") mport
+
+    approot <- case (mhost, mapproot) of
+        (_        , Just ar) -> Just ar
+        (Just host, _      ) -> Just $ (if ssl then "http://" else "https://") ++ host ++ (addPort ssl port)
+        _                    -> Nothing
 
     return $ AppConfig
         { appEnv  = env
         , appPort = port
-        , appRoot = T.pack $ hostS ++ addPort port
-        , connectionPoolSize = read connectionPoolSizeS
+        , appRoot = T.pack approot
         }
 
     where
-        addPort :: Int -> String
-        addPort p = if displayPort env
-                        then ":" ++ show p else ""
+        toBool :: String -> Bool
+        toBool = (`elem` ["true", "TRUE", "yes", "YES", "Y", "1"])
 
--- | Load Postgresql settings from a YAML-formatted file located at
---   @config\/postgresql.yml@.
-loadPostgresqlConnStr :: Show e => e -> IO Text
-loadPostgresqlConnStr env = do
-    allSettings <- (join $ YAML.decodeFile ("config/postgresql.yml" :: String)) >>= fromMapping
-    settings    <- lookupMapping (show env) allSettings
-    database    <- lookupScalar "database" settings :: IO Text
+        safeRead :: String -> Maybe Int
+        safeRead = undefined
 
-    connPart <- fmap T.concat $ (flip mapM) ["user", "password", "host", "port"] $ \key -> do
-      value <- lookupScalar key settings
-      return $ [st| #{key}=#{value} |]
-    return $ [st|#{connPart} dbname=#{database}|]
+        addPort :: Bool -> Int -> String
+        addPort True  443 = ""
+        addPort False 80  = ""
+        addPort _     p   = ":" ++ show p
 
--- | Load Sqlite settings from a YAML-formatted file located at
---   @config\/sqlite.yml@.
-loadSqliteConnStr :: Show e => e -> IO Text
-loadSqliteConnStr env = do
-    allSettings <- (join $ YAML.decodeFile ("config/sqlite.yml" :: String)) >>= fromMapping
-    settings    <- lookupMapping (show env) allSettings
-    lookupScalar "database" settings
+loadPostgresqlConnStr :: Show e => e -> IO DbConfig
+loadPostgresqlConnStr env = withYamlEnvironment "config/postgresql.yml" env $ \e -> do
+    db   <- lookupScalar "database" e
+    pool <- lookupScalar "poolsize" e
 
--- note: no type signature to avoid an extra Persistent.MongoDB dep for
--- those that don't need it
---loadMongoConnParams :: AppEnvironment -> IO (Database, HostName)
-loadMongoConnParams env = do
-    allSettings <- (join $ YAML.decodeFile ("config/mongoDB.yml" :: String)) >>= fromMapping
-    settings    <- lookupMapping (show env) allSettings
-    database    <- lookupScalar "database" settings
-    host        <- lookupScalar "host" settings
-    return (database, host)
+    -- TODO: the rest of this
+    return $ PostgresConf "todo" db (read pool)
+
+    {-connPart <- fmap T.concat $ (flip mapM) ["user", "password", "host", "port"] $ \key -> do-}
+      {-value <- lookupScalar key settings-}
+      {-return $ [st| #{key}=#{value} |]-}
+    {-return $ [st|#{connPart} dbname=#{database}|]-}
+
+loadSqliteConnStr :: Show e => e -> IO DbConfig
+loadSqliteConnStr env = withYamlEnvironment "config/sqlite.yml" env $ \e -> do
+    db   <- lookupScalar "database" e
+    pool <- lookupScalar "poolsize" e
+
+    -- TODO: safer read
+    return $ SqliteConf db (read pool)
+
+loadMongoConnParams :: Show e => e -> IO DbConfig
+loadMongoConnParams env = withYamlEnvironment "config/mongoDB.yml" env $ \e -> do
+    db   <- lookupScalar "database" e
+    host <- lookupScalar "host"     e
+    pool <- lookupScalar "poolsize" e
+
+    -- TODO: safer read
+    return $ MongoConf (db, host) (read pool)
+
+-- TODO: type sig -- ghci and I disagree here...
+withYamlEnvironment fp env f = do
+    obj <- join $ decodeFile fp
+    case go obj env of
+        Just v  -> return v
+        Nothing -> error $ fp ++ ": invalid configuration file."
+
+    where
+        go o e = do
+            envs <- fromMapping o
+            conf <- lookupMapping (show e) envs
+            f conf
diff --git a/yesod-default/Yesod/Default/Config.hs b/yesod-default/Yesod/Default/Config.hs
index 7f92b3b8..94be769d 100644
--- a/yesod-default/Yesod/Default/Config.hs
+++ b/yesod-default/Yesod/Default/Config.hs
@@ -21,10 +21,6 @@ data DefaultEnv = Development
                 | Testing
                 | Production deriving (Read, Show, Enum, Bounded)
 
-instance AppEnv DefaultEnv where
-    displayPort Production = False
-    displayPort _          = True
-
 -- | Setup commandline arguments for environment and port
 data ArgConfig = ArgConfig
     { environment :: String
@@ -55,7 +51,7 @@ defaultArgConfig =
 fromArgs :: IO (AppConfig DefaultEnv)
 fromArgs = fromArgsWith defaultArgConfig
 
-fromArgsWith :: AppEnv e => ArgConfig -> IO (AppConfig e)
+fromArgsWith :: (Read e, Show e) => ArgConfig -> IO (AppConfig e)
 fromArgsWith argConfig = do
     args   <- cmdArgs argConfig
 
diff --git a/yesod-default/Yesod/Default/Main.hs b/yesod-default/Yesod/Default/Main.hs
index 2ac9ee69..f19e5d41 100644
--- a/yesod-default/Yesod/Default/Main.hs
+++ b/yesod-default/Yesod/Default/Main.hs
@@ -25,7 +25,7 @@ import Network.Wai.Middleware.Debug (debugHandle)
 --   > main :: IO ()
 --   > main = defaultMain (fromArgsWith customArgConfig) withMySite
 --
-defaultMain :: AppEnv e => IO (AppConfig e) -> (AppConfig e -> Logger -> (Application -> IO ()) -> IO ()) -> IO ()
+defaultMain :: (Show e, Read e) => IO (AppConfig e) -> (AppConfig e -> Logger -> (Application -> IO ()) -> IO ()) -> IO ()
 defaultMain load withSite = do
     config <- load
     logger <- makeLogger
@@ -47,7 +47,7 @@ defaultDevelApp = defaultDevelAppWith loadDevelopmentConfig
 --   > withDevelAppPort :: Dynamic
 --   > withDevelAppPort = toDyn $ (defaultDevelAppWith customLoadAppConfig) withMySite
 --
-defaultDevelAppWith :: AppEnv e
+defaultDevelAppWith :: (Show e, Read e)
                     => IO (AppConfig e) -- ^ A means to load your development @'AppConfig'@
                     -> (AppConfig e -> Logger -> (Application -> IO ()) -> IO ()) -- ^ Your @withMySite@ function
                     -> ((Int, Application) -> IO ()) -> IO ()

From bea386e23803ee3ff4e7c10715f169ee6da97fa9 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 21 Sep 2011 16:37:13 +0300
Subject: [PATCH 028/189] optionsPersist returns an OptionList

---
 yesod-form/Yesod/Form/Fields.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yesod-form/Yesod/Form/Fields.hs b/yesod-form/Yesod/Form/Fields.hs
index 6ea1db92..4d5bc805 100644
--- a/yesod-form/Yesod/Form/Fields.hs
+++ b/yesod-form/Yesod/Form/Fields.hs
@@ -413,8 +413,8 @@ optionsEnum = optionsPairs $ map (\x -> (pack $ show x, x)) [minBound..maxBound]
 optionsPersist :: ( YesodPersist master, PersistEntity a, PersistBackend (YesodPersistBackend master) (GGHandler sub master IO)
                   , SinglePiece (Key (YesodPersistBackend master) a)
                   )
-               => [Filter a] -> [SelectOpt a] -> (a -> Text) -> GGHandler sub master IO [Option (Key (YesodPersistBackend master) a, a)]
-optionsPersist filts ords toDisplay = do
+               => [Filter a] -> [SelectOpt a] -> (a -> Text) -> GGHandler sub master IO (OptionList (Key (YesodPersistBackend master) a, a))
+optionsPersist filts ords toDisplay = fmap mkOptionList $ do
     pairs <- runDB $ selectList filts ords
     return $ map (\(key, value) -> Option
         { optionDisplay = toDisplay value

From 4d1ea8520afe16bf4e085da381bdbcd0825b5458 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjo=CC=88rn=20Buckwalter?= <bjorn@buckwalter.se>
Date: Wed, 21 Sep 2011 21:53:57 +0800
Subject: [PATCH 029/189] Revert 33ee15d56facfc5204b5c4dbade95b44e428bc8b.

Revert to the older faster toChar. I would have just removed the
old commit from history but it seems that would call for a rebase
which I hear is a bad idea in a public branch. Thus this commit.
---
 yesod-core/Yesod/Internal/Request.hs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/yesod-core/Yesod/Internal/Request.hs b/yesod-core/Yesod/Internal/Request.hs
index 8825d27e..ce7ce7d9 100644
--- a/yesod-core/Yesod/Internal/Request.hs
+++ b/yesod-core/Yesod/Internal/Request.hs
@@ -75,7 +75,10 @@ parseWaiRequest' env session' key' gen = Request gets'' cookies' env langs' nonc
 randomString :: RandomGen g => Int -> g -> String
 randomString len = take len . map toChar . randomRs (0, 61)
   where
-    toChar i = (['A'..'Z'] ++ ['a'..'z'] ++ ['0'..'9']) !! i
+    toChar i
+        | i < 26 = toEnum $ i + fromEnum 'A'
+        | i < 52 = toEnum $ i + fromEnum 'a' - 26
+        | otherwise = toEnum $ i + fromEnum '0' - 52
 
 -- | A tuple containing both the POST parameters and submitted files.
 type RequestBodyContents =

From 39ef74cb10b096cb8d7672e28d686f5bd0156996 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjo=CC=88rn=20Buckwalter?= <bjorn@buckwalter.se>
Date: Wed, 21 Sep 2011 22:31:59 +0800
Subject: [PATCH 030/189] Altered nonce comment (modeled after encryptKey).

I note that for `key' == Nothing` it should probably hold that
`session' == []` as implemented in defaultYesodRunner, so perhaps the
comment regarding ignoring pre-existing `nonceKey` is redundant. But
a custom `yesodRunner` could arguably violate this invariant(?).
---
 yesod-core/Yesod/Internal/Request.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yesod-core/Yesod/Internal/Request.hs b/yesod-core/Yesod/Internal/Request.hs
index ce7ce7d9..263823d8 100644
--- a/yesod-core/Yesod/Internal/Request.hs
+++ b/yesod-core/Yesod/Internal/Request.hs
@@ -60,9 +60,9 @@ parseWaiRequest' env session' key' gen = Request gets'' cookies' env langs' nonc
                        , lookup langKey cookies'     -- Cookie _LANG
                        , lookup langKey session'     -- Session _LANG
                        ] ++ langs                    -- Accept-Language(s)
-    -- If the session is not secure a nonce should not be
-    -- used (any nonce present in the session is ignored).
-    -- If a secure session has no nonceKey a new one is
+    -- If sessions are disabled nonces should not be used (any
+    -- nonceKey present in the session is ignored). If sessions
+    -- are enabled and a session has no nonceKey a new one is
     -- generated.
     nonce = case (key', lookup nonceKey session') of
                 (Nothing, _) -> Nothing

From 8f02508500767be0f3993d55e2a856d2ea9421b4 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Wed, 21 Sep 2011 16:19:46 -0400
Subject: [PATCH 031/189] Finalizing Yesod.Config

* Split DbConfig into separate types to ease scaffolding
* Add safeRead and type sig on withYaml...
* Add documentation
---
 yesod-core/Yesod/Config.hs | 161 +++++++++++++++++++++++++++----------
 1 file changed, 119 insertions(+), 42 deletions(-)

diff --git a/yesod-core/Yesod/Config.hs b/yesod-core/Yesod/Config.hs
index 5aa1a9a7..9a10315f 100644
--- a/yesod-core/Yesod/Config.hs
+++ b/yesod-core/Yesod/Config.hs
@@ -1,21 +1,21 @@
-{-# OPTIONS -fno-warn-missing-signatures #-}
-{-# LANGUAGE QuasiQuotes                 #-}
 module Yesod.Config
     ( AppConfig(..)
+    , PostgresConf(..)
+    , SqliteConf(..)
+    , MongoConf(..)
     , loadConfig
-    , loadPostgresqlConnStr
-    , loadSqliteConnStr
-    , loadMongoConnParams
+    , loadPostgresql
+    , loadSqlite
+    , loadMongo
     ) where
 
-import Control.Monad (join)
+import Control.Monad (join, forM)
 import Data.Maybe (fromMaybe)
 import Data.Object
 import Data.Object.Yaml
-import Data.Text (Text)
---import Text.Shakespeare.Text (st)
 
-import qualified Data.Text        as T
+import Data.Text (Text)
+import qualified Data.Text as T
 
 -- | Dynamic per-environment configuration which can be loaded at
 --   run-time negating the need to recompile between environments.
@@ -25,15 +25,58 @@ data AppConfig e = AppConfig
     , appRoot :: Text
     } deriving (Show)
 
--- | Dynamic per-environment database configuration which can be loaded
---   at run-time
-data DbConfig = PostgresConf String String Int -- ^ Connection string, Database, Pool size
-              | SqliteConf String Int          -- ^ Database, Pool size
-              | MongoConf (String,String) Int  -- ^ (Database,Host), Pool size
+-- separate types means more code here, but it's easier to use in the
+-- scaffold
 
--- | Load an @'AppConfig'@ from a YAML-formatted file located at
---   @config\/settings.yml@. @'show'@ will be called on the first
---   parameter to determine which environment block to load
+-- | Information required to connect to a postgres database
+data PostgresConf = PostgresConf
+    { pgConnStr  :: String
+    , pgDatabase :: String
+    , pgPoolSize :: Int
+    }
+
+-- | Information required to connect to a sqlite database
+data SqliteConf = SqliteConf
+    { sqlDatabase :: String
+    , sqlPoolSize :: Int
+    }
+
+-- | Information required to connect to a mongo database
+data MongoConf = MongoConf
+    { mgDatabase :: String
+    , mgHost     :: String
+    , mgPoolSize :: Int
+    }
+
+-- | Load an @'AppConfig'@ from @config\/settings.yml@.
+--
+--   Some examples:
+--
+--   > -- typical local development
+--   > Development:
+--   >   host: localhost
+--   >   port: 3000
+--   >
+--   >   -- ssl: will default false
+--   >   -- approot: will default to "http://localhost:3000"
+--
+--   > -- typical outward-facing production box
+--   > Production:
+--   >   host: www.example.com
+--   >
+--   >   -- ssl: will default false
+--   >   -- port: will default 80
+--   >   -- approot: will default "http://www.example.com"
+--
+--   > -- maybe you're reverse proxying connections to the running app
+--   > -- on some other port
+--   > Production:
+--   >   port: 8080
+--   >   approot: "http://example.com"
+--   >
+--   > -- approot is specified so that the non-80 port is not appended
+--   > -- automatically.
+--
 loadConfig :: Show e => e -> IO (AppConfig e)
 loadConfig env = withYamlEnvironment "config/settings.yml" env $ \e -> do
     let mssl     = lookupScalar "ssl"     e
@@ -42,12 +85,12 @@ loadConfig env = withYamlEnvironment "config/settings.yml" env $ \e -> do
     let mapproot = lookupScalar "approot" e
 
     -- set some default arguments
-    let ssl = toBool $ fromMaybe "false" mssl
+    let ssl = maybe False toBool mssl
     port <- safeRead $ fromMaybe (if ssl then "443" else "80") mport
 
     approot <- case (mhost, mapproot) of
         (_        , Just ar) -> Just ar
-        (Just host, _      ) -> Just $ (if ssl then "http://" else "https://") ++ host ++ (addPort ssl port)
+        (Just host, _      ) -> Just $ (if ssl then "https://" else "http://") ++ host ++ (addPort ssl port)
         _                    -> Nothing
 
     return $ AppConfig
@@ -60,45 +103,73 @@ loadConfig env = withYamlEnvironment "config/settings.yml" env $ \e -> do
         toBool :: String -> Bool
         toBool = (`elem` ["true", "TRUE", "yes", "YES", "Y", "1"])
 
-        safeRead :: String -> Maybe Int
-        safeRead = undefined
-
         addPort :: Bool -> Int -> String
         addPort True  443 = ""
         addPort False 80  = ""
         addPort _     p   = ":" ++ show p
 
-loadPostgresqlConnStr :: Show e => e -> IO DbConfig
-loadPostgresqlConnStr env = withYamlEnvironment "config/postgresql.yml" env $ \e -> do
+-- | Load a @'PostgresConf'@ from @config\/postgresql.yml@.
+-- 
+--   > Production:
+--   >   user: jsmith
+--   >   password: secret
+--   >   host: localhost
+--   >   port: 5432
+--   >   database: some_db
+--   >   poolsize: 100
+--
+loadPostgresql :: Show e => e -> IO PostgresConf
+loadPostgresql env = withYamlEnvironment "config/postgresql.yml" env $ \e -> do
     db   <- lookupScalar "database" e
-    pool <- lookupScalar "poolsize" e
+    pool <- safeRead =<< lookupScalar "poolsize" e
 
-    -- TODO: the rest of this
-    return $ PostgresConf "todo" db (read pool)
+    -- TODO: default host/port?
+    connparts <- forM ["user", "password", "host", "port"] $ \k -> do
+        v <- lookupScalar k e
+        return $ k ++ "=" ++ v
 
-    {-connPart <- fmap T.concat $ (flip mapM) ["user", "password", "host", "port"] $ \key -> do-}
-      {-value <- lookupScalar key settings-}
-      {-return $ [st| #{key}=#{value} |]-}
-    {-return $ [st|#{connPart} dbname=#{database}|]-}
+    conn <- return $ concat connparts
 
-loadSqliteConnStr :: Show e => e -> IO DbConfig
-loadSqliteConnStr env = withYamlEnvironment "config/sqlite.yml" env $ \e -> do
+    return $ PostgresConf conn db pool
+
+-- | Load a @'SqliteConf'@ from @config\/sqlite.yml@.
+--
+--   > Production:
+--   >   database: foo.s3db
+--   >   poolsize: 100
+--
+loadSqlite :: Show e => e -> IO SqliteConf
+loadSqlite env = withYamlEnvironment "config/sqlite.yml" env $ \e -> do
     db   <- lookupScalar "database" e
-    pool <- lookupScalar "poolsize" e
+    pool <- safeRead =<< lookupScalar "poolsize" e
 
-    -- TODO: safer read
-    return $ SqliteConf db (read pool)
+    return $ SqliteConf db pool
 
-loadMongoConnParams :: Show e => e -> IO DbConfig
-loadMongoConnParams env = withYamlEnvironment "config/mongoDB.yml" env $ \e -> do
+-- | Load a @'MongoConf'@ from @config\/mongoDB.yml@.
+--
+--   > Production:
+--   >   database: some_db
+--   >   host:     localhost
+--   >   poolsize: 100
+--
+loadMongo :: Show e => e -> IO MongoConf
+loadMongo env = withYamlEnvironment "config/mongoDB.yml" env $ \e -> do
     db   <- lookupScalar "database" e
     host <- lookupScalar "host"     e
-    pool <- lookupScalar "poolsize" e
+    pool <- safeRead =<< lookupScalar "poolsize" e
 
-    -- TODO: safer read
-    return $ MongoConf (db, host) (read pool)
+    return $ MongoConf db host pool
 
--- TODO: type sig -- ghci and I disagree here...
+-- | Loads the configuration block in the passed file named by the
+--   passed environment, yeilds to the passed function as a mapping.
+--
+--   Errors in the case of a bad load or if your function returns
+--   @Nothing@.
+withYamlEnvironment :: (IsYamlScalar v, Show e)
+                    => FilePath -- ^ the yaml file
+                    -> e        -- ^ the environment you want to load
+                    -> ([(String, Object String v)] -> Maybe a) -- ^ what to do with the mapping
+                    -> IO a
 withYamlEnvironment fp env f = do
     obj <- join $ decodeFile fp
     case go obj env of
@@ -110,3 +181,9 @@ withYamlEnvironment fp env f = do
             envs <- fromMapping o
             conf <- lookupMapping (show e) envs
             f conf
+
+-- | Returns Nothing if read fails
+safeRead :: String -> Maybe Int
+safeRead s = case reads s of
+    (i, _):_ -> Just i
+    []       -> Nothing

From 372f6268d6926eeffb81c40f1f68c195ccbb91d9 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Wed, 21 Sep 2011 16:29:14 -0400
Subject: [PATCH 032/189] updated scripts repo

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index f56426fa..e791ced0 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit f56426fada59012329f23c928a2d7f9c3a515d75
+Subproject commit e791ced0395245e30d37b5098a27bba5e818ecb7

From cfb11cca891dc60b598b51126840bb45098dcc56 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Wed, 21 Sep 2011 17:29:55 -0400
Subject: [PATCH 033/189] Remove -text dep, make Postgresql work...

---
 yesod-core/Yesod/Config.hs  | 7 +++----
 yesod-core/yesod-core.cabal | 1 -
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/yesod-core/Yesod/Config.hs b/yesod-core/Yesod/Config.hs
index 9a10315f..dcd2902e 100644
--- a/yesod-core/Yesod/Config.hs
+++ b/yesod-core/Yesod/Config.hs
@@ -30,8 +30,7 @@ data AppConfig e = AppConfig
 
 -- | Information required to connect to a postgres database
 data PostgresConf = PostgresConf
-    { pgConnStr  :: String
-    , pgDatabase :: String
+    { pgConnStr  :: Text
     , pgPoolSize :: Int
     }
 
@@ -126,11 +125,11 @@ loadPostgresql env = withYamlEnvironment "config/postgresql.yml" env $ \e -> do
     -- TODO: default host/port?
     connparts <- forM ["user", "password", "host", "port"] $ \k -> do
         v <- lookupScalar k e
-        return $ k ++ "=" ++ v
+        return $ k ++ "=" ++ v ++ " "
 
     conn <- return $ concat connparts
 
-    return $ PostgresConf conn db pool
+    return $ PostgresConf (T.pack $ conn ++ " dbname=" ++ db) pool
 
 -- | Load a @'SqliteConf'@ from @config\/sqlite.yml@.
 --
diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index 1007919a..12d2e97b 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -38,7 +38,6 @@ library
                    , shakespeare               >= 0.10     && < 0.11
                    , shakespeare-js            >= 0.10     && < 0.11
                    , shakespeare-css           >= 0.10     && < 0.11
-                   , shakespeare-text          >= 0.10     && < 0.11
                    , blaze-builder             >= 0.2.1    && < 0.4
                    , transformers              >= 0.2      && < 0.3
                    , clientsession             >= 0.7.2    && < 0.8

From b13875b8a67a6dd2dcc4151ff3078508ef1030e6 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Wed, 21 Sep 2011 18:52:08 -0400
Subject: [PATCH 034/189] make sqlite db a Text

---
 yesod-core/Yesod/Config.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yesod-core/Yesod/Config.hs b/yesod-core/Yesod/Config.hs
index dcd2902e..86ba3873 100644
--- a/yesod-core/Yesod/Config.hs
+++ b/yesod-core/Yesod/Config.hs
@@ -36,7 +36,7 @@ data PostgresConf = PostgresConf
 
 -- | Information required to connect to a sqlite database
 data SqliteConf = SqliteConf
-    { sqlDatabase :: String
+    { sqlDatabase :: Text
     , sqlPoolSize :: Int
     }
 
@@ -142,7 +142,7 @@ loadSqlite env = withYamlEnvironment "config/sqlite.yml" env $ \e -> do
     db   <- lookupScalar "database" e
     pool <- safeRead =<< lookupScalar "poolsize" e
 
-    return $ SqliteConf db pool
+    return $ SqliteConf (T.pack db) pool
 
 -- | Load a @'MongoConf'@ from @config\/mongoDB.yml@.
 --

From a20c28dfad409d8a5631e5b084d37cb5ad91aeb6 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Wed, 21 Sep 2011 18:52:27 -0400
Subject: [PATCH 035/189] add Staging to match scaffolded ymls

---
 yesod-default/Yesod/Default/Config.hs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/yesod-default/Yesod/Default/Config.hs b/yesod-default/Yesod/Default/Config.hs
index 94be769d..6137fe67 100644
--- a/yesod-default/Yesod/Default/Config.hs
+++ b/yesod-default/Yesod/Default/Config.hs
@@ -19,6 +19,7 @@ import System.Console.CmdArgs hiding (args)
 --   Production environments
 data DefaultEnv = Development
                 | Testing
+                | Staging
                 | Production deriving (Read, Show, Enum, Bounded)
 
 -- | Setup commandline arguments for environment and port

From a6e7924e7c7fabce6db447243abcef72065c7ec5 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Wed, 21 Sep 2011 18:52:57 -0400
Subject: [PATCH 036/189] New Scaffold! hurrah!

---
 yesod/scaffold/Application.hs.cg        | 4 +++-
 yesod/scaffold/Foundation.hs.cg         | 3 ++-
 yesod/scaffold/Settings.hs.cg           | 4 ++--
 yesod/scaffold/config/mongoDB.yml.cg    | 3 +++
 yesod/scaffold/config/postgresql.yml.cg | 4 ++++
 yesod/scaffold/config/settings.yml.cg   | 1 -
 yesod/scaffold/config/sqlite.yml.cg     | 3 +++
 yesod/scaffold/main.hs.cg               | 5 +++--
 yesod/scaffold/mongoDBConnPool.cg       | 6 +++---
 yesod/scaffold/postgresqlConnPool.cg    | 6 +++---
 yesod/scaffold/project.cabal.cg         | 1 +
 yesod/scaffold/sqliteConnPool.cg        | 6 +++---
 yesod/scaffold/tiny/Application.hs.cg   | 6 +++---
 yesod/scaffold/tiny/Foundation.hs.cg    | 4 ++--
 yesod/scaffold/tiny/Settings.hs.cg      | 4 ++--
 yesod/scaffold/tiny/project.cabal.cg    | 2 +-
 16 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/yesod/scaffold/Application.hs.cg b/yesod/scaffold/Application.hs.cg
index 02d95819..6c9a5c65 100644
--- a/yesod/scaffold/Application.hs.cg
+++ b/yesod/scaffold/Application.hs.cg
@@ -12,6 +12,8 @@ import Foundation
 import Settings
 import Settings.StaticFiles (static)
 import Yesod.Auth
+import Yesod.Default.Config
+import Yesod.Default.Main
 import Yesod.Logger (Logger)
 import Database.Persist.~importGenericDB~
 import Data.ByteString (ByteString)
@@ -43,7 +45,7 @@ getRobotsR = return $ RepPlain $ toContent ("User-agent: *" :: ByteString)
 -- performs initialization and creates a WAI application. This is also the
 -- place to put your migrate statements to have automatic database
 -- migrations handled by Yesod.
-with~sitearg~ :: AppConfig -> Logger -> (Application -> IO a) -> IO ()
+with~sitearg~ :: AppConfig DefaultEnv -> Logger -> (Application -> IO a) -> IO ()
 with~sitearg~ conf logger f = do
     s <- static Settings.staticDir
     Settings.withConnectionPool conf $ \p -> do~runMigration~
diff --git a/yesod/scaffold/Foundation.hs.cg b/yesod/scaffold/Foundation.hs.cg
index a925401f..6910cd26 100644
--- a/yesod/scaffold/Foundation.hs.cg
+++ b/yesod/scaffold/Foundation.hs.cg
@@ -22,6 +22,7 @@ import Settings.StaticFiles
 import Yesod.Auth
 import Yesod.Auth.OpenId
 import Yesod.Auth.Email
+import Yesod.Default.Config
 import Yesod.Logger (Logger, logLazyText)
 import qualified Settings
 import System.Directory
@@ -45,7 +46,7 @@ import Text.Shakespeare.Text (stext)
 -- starts running, such as database connections. Every handler will have
 -- access to the data present here.
 data ~sitearg~ = ~sitearg~
-    { settings :: AppConfig
+    { settings :: AppConfig DefaultEnv
     , getLogger :: Logger
     , getStatic :: Static -- ^ Settings for static file serving.
     , connPool :: Settings.ConnectionPool -- ^ Database connection pool.
diff --git a/yesod/scaffold/Settings.hs.cg b/yesod/scaffold/Settings.hs.cg
index 36bd1576..c60fb3f6 100644
--- a/yesod/scaffold/Settings.hs.cg
+++ b/yesod/scaffold/Settings.hs.cg
@@ -29,7 +29,7 @@ import Text.Shakespeare.Text (st)
 import Language.Haskell.TH.Syntax
 import Database.Persist.~importPersist~
 import Yesod (liftIO, MonadControlIO, addWidget, addCassius, addJulius, addLucius, whamletFile)
-import Yesod.Settings
+import Yesod.Default.Config
 import Data.Monoid (mempty)
 import System.Directory (doesFileExist)
 import Data.Text (Text)
@@ -55,7 +55,7 @@ staticDir = "static"
 -- have to make a corresponding change here.
 --
 -- To see how this value is used, see urlRenderOverride in Foundation.hs
-staticRoot :: AppConfig ->  Text
+staticRoot :: AppConfig DefaultEnv ->  Text
 staticRoot conf = [st|#{appRoot conf}/static|]
 
 
diff --git a/yesod/scaffold/config/mongoDB.yml.cg b/yesod/scaffold/config/mongoDB.yml.cg
index 60f74187..b97d7dfa 100644
--- a/yesod/scaffold/config/mongoDB.yml.cg
+++ b/yesod/scaffold/config/mongoDB.yml.cg
@@ -4,6 +4,7 @@ Default: &defaults
   host: localhost
   port: 27017
   database: ~project~
+  poolsize: 10
 
 Development:
   <<: *defaults
@@ -14,8 +15,10 @@ Test:
 
 Staging:
   database: ~project~_staging
+  poolsize: 100
   <<: *defaults
 
 Production:
   database: ~project~_production
+  poolsize: 100
   <<: *defaults
diff --git a/yesod/scaffold/config/postgresql.yml.cg b/yesod/scaffold/config/postgresql.yml.cg
index 2f60ddab..aceae393 100644
--- a/yesod/scaffold/config/postgresql.yml.cg
+++ b/yesod/scaffold/config/postgresql.yml.cg
@@ -4,6 +4,7 @@ Default: &defaults
   host: localhost
   port: 5432
   database: ~project~
+  poolsize: 10
 
 Development:
   <<: *defaults
@@ -14,7 +15,10 @@ Test:
 
 Staging:
   database: ~project~_staging
+  poolsize: 100
+  <<: *defaults
 
 Production:
   database: ~project~_production
+  poolsize: 100
   <<: *defaults
diff --git a/yesod/scaffold/config/settings.yml.cg b/yesod/scaffold/config/settings.yml.cg
index 1485242c..d6fad856 100644
--- a/yesod/scaffold/config/settings.yml.cg
+++ b/yesod/scaffold/config/settings.yml.cg
@@ -1,7 +1,6 @@
 Default: &defaults
   host: "http://localhost"
   port: 3000
-  connectionPoolSize: 10
 
 Development:
   <<: *defaults
diff --git a/yesod/scaffold/config/sqlite.yml.cg b/yesod/scaffold/config/sqlite.yml.cg
index b9f01df1..ebee1fa8 100644
--- a/yesod/scaffold/config/sqlite.yml.cg
+++ b/yesod/scaffold/config/sqlite.yml.cg
@@ -1,5 +1,6 @@
 Default: &defaults
   database: ~project~.sqlite3
+  poolsize: 10
 
 Development:
   <<: *defaults
@@ -10,8 +11,10 @@ Test:
 
 Staging:
   database: ~project~_staging.sqlite3
+  poolsize: 100
   <<: *defaults
 
 Production:
   database: ~project~_production.sqlite3
+  poolsize: 100
   <<: *defaults
diff --git a/yesod/scaffold/main.hs.cg b/yesod/scaffold/main.hs.cg
index 94f61c28..db9ccf5b 100644
--- a/yesod/scaffold/main.hs.cg
+++ b/yesod/scaffold/main.hs.cg
@@ -1,5 +1,6 @@
-import Yesod.Main (defaultMain, fromArgs)
-import Application (with~sitearg~)
+import Yesod.Default.Config (fromArgs)
+import Yesod.Default.Main   (defaultMain)
+import Application          (with~sitearg~)
 
 main :: IO ()
 main = defaultMain fromArgs with~sitearg~
diff --git a/yesod/scaffold/mongoDBConnPool.cg b/yesod/scaffold/mongoDBConnPool.cg
index 4292d22f..4269f2fa 100644
--- a/yesod/scaffold/mongoDBConnPool.cg
+++ b/yesod/scaffold/mongoDBConnPool.cg
@@ -1,8 +1,8 @@
 runConnectionPool :: MonadControlIO m => Action m a -> ConnectionPool -> m a
 runConnectionPool = runMongoDBConn (ConfirmWrites [u"j" =: True])
 
-withConnectionPool :: (MonadControlIO m, Applicative m) => AppConfig -> (ConnectionPool -> m b) -> m b
+withConnectionPool :: (MonadControlIO m, Applicative m) => AppConfig DefaultEnv -> (ConnectionPool -> m b) -> m b
 withConnectionPool conf f = do
-    (database,host) <- liftIO $ loadMongoConnParams (appEnv conf)
-    withMongoDBPool (u database) host (connectionPoolSize conf) f
+    dbConf <- liftIO $ loadMongo (appEnv conf)
+    withMongoDBPool (u $ mgDatabase dbConf) (mgHost dbConf) (mgPoolSize dbConf) f
 
diff --git a/yesod/scaffold/postgresqlConnPool.cg b/yesod/scaffold/postgresqlConnPool.cg
index e8597e4f..6619a88e 100644
--- a/yesod/scaffold/postgresqlConnPool.cg
+++ b/yesod/scaffold/postgresqlConnPool.cg
@@ -1,10 +1,10 @@
 runConnectionPool :: MonadControlIO m => SqlPersist m a -> ConnectionPool -> m a
 runConnectionPool = runSqlPool
 
-withConnectionPool :: MonadControlIO m => AppConfig -> (ConnectionPool -> m a) -> m a
+withConnectionPool :: MonadControlIO m => AppConfig DefaultEnv -> (ConnectionPool -> m a) -> m a
 withConnectionPool conf f = do
-    cs <- liftIO $ load~upper~ConnStr (appEnv conf)
-    with~upper~Pool cs (connectionPoolSize conf) f
+    dbConf <- liftIO $ load~upper~ (appEnv conf)
+    with~upper~Pool (pgConnStr dbConf) (pgPoolSize dbConf) f
 
 -- Example of making a dynamic configuration static
 -- use /return $(mkConnStr Production)/ instead of loadConnStr
diff --git a/yesod/scaffold/project.cabal.cg b/yesod/scaffold/project.cabal.cg
index 3109b5ed..28a7f889 100644
--- a/yesod/scaffold/project.cabal.cg
+++ b/yesod/scaffold/project.cabal.cg
@@ -58,6 +58,7 @@ executable         ~project~
                  , yesod-core
                  , yesod-auth
                  , yesod-static
+                 , yesod-default
                  , blaze-html
                  , yesod-form
                  , mime-mail
diff --git a/yesod/scaffold/sqliteConnPool.cg b/yesod/scaffold/sqliteConnPool.cg
index e8597e4f..56e1ae9d 100644
--- a/yesod/scaffold/sqliteConnPool.cg
+++ b/yesod/scaffold/sqliteConnPool.cg
@@ -1,10 +1,10 @@
 runConnectionPool :: MonadControlIO m => SqlPersist m a -> ConnectionPool -> m a
 runConnectionPool = runSqlPool
 
-withConnectionPool :: MonadControlIO m => AppConfig -> (ConnectionPool -> m a) -> m a
+withConnectionPool :: MonadControlIO m => AppConfig DefaultEnv -> (ConnectionPool -> m a) -> m a
 withConnectionPool conf f = do
-    cs <- liftIO $ load~upper~ConnStr (appEnv conf)
-    with~upper~Pool cs (connectionPoolSize conf) f
+    dbConf <- liftIO $ load~upper~ (appEnv conf)
+    with~upper~Pool (sqlDatabase dbConf) (sqlPoolSize dbConf) f
 
 -- Example of making a dynamic configuration static
 -- use /return $(mkConnStr Production)/ instead of loadConnStr
diff --git a/yesod/scaffold/tiny/Application.hs.cg b/yesod/scaffold/tiny/Application.hs.cg
index 77c73898..0bd1d218 100644
--- a/yesod/scaffold/tiny/Application.hs.cg
+++ b/yesod/scaffold/tiny/Application.hs.cg
@@ -11,8 +11,8 @@ module Application
 import Foundation
 import Settings
 import Yesod.Static
-import Yesod.Settings
-import Yesod.Main (defaultDevelApp)
+import Yesod.Default.Config
+import Yesod.Default.Main (defaultDevelApp)
 import Yesod.Logger (Logger)
 import Data.ByteString (ByteString)
 import Network.Wai (Application)
@@ -38,7 +38,7 @@ getRobotsR = return $ RepPlain $ toContent ("User-agent: *" :: ByteString)
 -- performs initialization and creates a WAI application. This is also the
 -- place to put your migrate statements to have automatic database
 -- migrations handled by Yesod.
-with~sitearg~ :: AppConfig -> Logger -> (Application -> IO a) -> IO a
+with~sitearg~ :: AppConfig DefaultEnv -> Logger -> (Application -> IO a) -> IO a
 with~sitearg~ conf logger f = do
 #ifdef PRODUCTION
     s <- static Settings.staticDir
diff --git a/yesod/scaffold/tiny/Foundation.hs.cg b/yesod/scaffold/tiny/Foundation.hs.cg
index 5e950805..58bb57c9 100644
--- a/yesod/scaffold/tiny/Foundation.hs.cg
+++ b/yesod/scaffold/tiny/Foundation.hs.cg
@@ -14,7 +14,7 @@ module Foundation
     ) where
 
 import Yesod.Core
-import Yesod.Settings (AppConfig(..))
+import Yesod.Default.Config
 import Yesod.Static (Static, base64md5, StaticRoute(..))
 import Settings.StaticFiles
 import Yesod.Logger (Logger, logLazyText)
@@ -33,7 +33,7 @@ import Web.ClientSession (getKey)
 -- starts running, such as database connections. Every handler will have
 -- access to the data present here.
 data ~sitearg~ = ~sitearg~
-    { settings :: AppConfig
+    { settings :: AppConfig DefaultEnv
     , getLogger :: Logger
     , getStatic :: Static -- ^ Settings for static file serving.
     }
diff --git a/yesod/scaffold/tiny/Settings.hs.cg b/yesod/scaffold/tiny/Settings.hs.cg
index a36c764b..605bc709 100644
--- a/yesod/scaffold/tiny/Settings.hs.cg
+++ b/yesod/scaffold/tiny/Settings.hs.cg
@@ -24,7 +24,7 @@ import qualified Text.Shakespeare.Text as S
 import Text.Shakespeare.Text (st)
 import Language.Haskell.TH.Syntax
 import Yesod.Widget (addWidget, addCassius, addJulius, addLucius, whamletFile)
-import Yesod.Settings
+import Yesod.Default.Config
 import Data.Monoid (mempty)
 import System.Directory (doesFileExist)
 import Data.Text (Text)
@@ -47,7 +47,7 @@ staticDir = "static"
 -- have to make a corresponding change here.
 --
 -- To see how this value is used, see urlRenderOverride in ~project~.hs
-staticRoot :: AppConfig ->  Text
+staticRoot :: AppConfig DefaultEnv ->  Text
 staticRoot conf = [st|#{appRoot conf}/static|]
 
 -- The rest of this file contains settings which rarely need changing by a
diff --git a/yesod/scaffold/tiny/project.cabal.cg b/yesod/scaffold/tiny/project.cabal.cg
index 6e5c3cc5..1cc7fb75 100644
--- a/yesod/scaffold/tiny/project.cabal.cg
+++ b/yesod/scaffold/tiny/project.cabal.cg
@@ -46,9 +46,9 @@ executable         ~project~
     hs-source-dirs: .
 
     build-depends: base         >= 4       && < 5
-                 , yesod        >= 0.9     && < 0.10
                  , yesod-core   >= 0.9     && < 0.10
                  , yesod-static
+                 , yesod-default
                  , clientsession
                  , wai-extra
                  , directory

From 1dbbfc8d06a1c8099893adb9fa3c7b336d14794b Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 22 Sep 2011 07:32:50 +0300
Subject: [PATCH 037/189] More explicit config error messages; fix
 defaultArgConfig

---
 yesod-core/Yesod/Config.hs            | 38 +++++++++++----------------
 yesod-default/Yesod/Default/Config.hs |  8 +++---
 2 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/yesod-core/Yesod/Config.hs b/yesod-core/Yesod/Config.hs
index 86ba3873..51216e59 100644
--- a/yesod-core/Yesod/Config.hs
+++ b/yesod-core/Yesod/Config.hs
@@ -85,12 +85,12 @@ loadConfig env = withYamlEnvironment "config/settings.yml" env $ \e -> do
 
     -- set some default arguments
     let ssl = maybe False toBool mssl
-    port <- safeRead $ fromMaybe (if ssl then "443" else "80") mport
+    port <- safeRead "port" $ fromMaybe (if ssl then "443" else "80") mport
 
     approot <- case (mhost, mapproot) of
-        (_        , Just ar) -> Just ar
-        (Just host, _      ) -> Just $ (if ssl then "https://" else "http://") ++ host ++ (addPort ssl port)
-        _                    -> Nothing
+        (_        , Just ar) -> return ar
+        (Just host, _      ) -> return $ (if ssl then "https://" else "http://") ++ host ++ (addPort ssl port)
+        _                    -> fail "You must supply either a host or approot"
 
     return $ AppConfig
         { appEnv  = env
@@ -120,7 +120,7 @@ loadConfig env = withYamlEnvironment "config/settings.yml" env $ \e -> do
 loadPostgresql :: Show e => e -> IO PostgresConf
 loadPostgresql env = withYamlEnvironment "config/postgresql.yml" env $ \e -> do
     db   <- lookupScalar "database" e
-    pool <- safeRead =<< lookupScalar "poolsize" e
+    pool <- safeRead "poolsize" =<< lookupScalar "poolsize" e
 
     -- TODO: default host/port?
     connparts <- forM ["user", "password", "host", "port"] $ \k -> do
@@ -140,7 +140,7 @@ loadPostgresql env = withYamlEnvironment "config/postgresql.yml" env $ \e -> do
 loadSqlite :: Show e => e -> IO SqliteConf
 loadSqlite env = withYamlEnvironment "config/sqlite.yml" env $ \e -> do
     db   <- lookupScalar "database" e
-    pool <- safeRead =<< lookupScalar "poolsize" e
+    pool <- safeRead "poolsize" =<< lookupScalar "poolsize" e
 
     return $ SqliteConf (T.pack db) pool
 
@@ -155,7 +155,7 @@ loadMongo :: Show e => e -> IO MongoConf
 loadMongo env = withYamlEnvironment "config/mongoDB.yml" env $ \e -> do
     db   <- lookupScalar "database" e
     host <- lookupScalar "host"     e
-    pool <- safeRead =<< lookupScalar "poolsize" e
+    pool <- safeRead "poolsize" =<< lookupScalar "poolsize" e
 
     return $ MongoConf db host pool
 
@@ -167,22 +167,16 @@ loadMongo env = withYamlEnvironment "config/mongoDB.yml" env $ \e -> do
 withYamlEnvironment :: (IsYamlScalar v, Show e)
                     => FilePath -- ^ the yaml file
                     -> e        -- ^ the environment you want to load
-                    -> ([(String, Object String v)] -> Maybe a) -- ^ what to do with the mapping
+                    -> ([(String, Object String v)] -> IO a) -- ^ what to do with the mapping
                     -> IO a
 withYamlEnvironment fp env f = do
     obj <- join $ decodeFile fp
-    case go obj env of
-        Just v  -> return v
-        Nothing -> error $ fp ++ ": invalid configuration file."
+    envs <- fromMapping obj
+    conf <- lookupMapping (show env) envs
+    f conf
 
-    where
-        go o e = do
-            envs <- fromMapping o
-            conf <- lookupMapping (show e) envs
-            f conf
-
--- | Returns Nothing if read fails
-safeRead :: String -> Maybe Int
-safeRead s = case reads s of
-    (i, _):_ -> Just i
-    []       -> Nothing
+-- | Returns 'fail' if read fails
+safeRead :: Monad m => String -> String -> m Int
+safeRead name s = case reads s of
+    (i, _):_ -> return i
+    []       -> fail $ concat ["Invalid value for ", name, ": ", s]
diff --git a/yesod-default/Yesod/Default/Config.hs b/yesod-default/Yesod/Default/Config.hs
index 6137fe67..742967bb 100644
--- a/yesod-default/Yesod/Default/Config.hs
+++ b/yesod-default/Yesod/Default/Config.hs
@@ -32,8 +32,7 @@ data ArgConfig = ArgConfig
 defaultArgConfig :: ArgConfig
 defaultArgConfig =
     ArgConfig
-        { environment = def 
-            &= opt "development"
+        { environment = "development"
             &= help ("application environment, one of: " ++ environments)
             &= typ   "ENVIRONMENT"
         , port = def
@@ -56,7 +55,10 @@ fromArgsWith :: (Read e, Show e) => ArgConfig -> IO (AppConfig e)
 fromArgsWith argConfig = do
     args   <- cmdArgs argConfig
 
-    let env = read $ capitalize $ environment args
+    env <-
+        case reads $ capitalize $ environment args of
+            (e, _):_ -> return e
+            [] -> error $ "Invalid environment: " ++ environment args
 
     config <- loadConfig env
 

From 632bb4c7ed5cfce844d7b7de6c1f0099b27bfe6f Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 22 Sep 2011 08:44:57 +0300
Subject: [PATCH 038/189] addStaticContentExternal

---
 yesod-default/Yesod/Default/Util.hs | 43 +++++++++++++++++++++++++++++
 yesod-default/yesod-default.cabal   | 17 ++++++++----
 yesod/scaffold/Foundation.hs.cg     | 21 ++------------
 3 files changed, 57 insertions(+), 24 deletions(-)
 create mode 100644 yesod-default/Yesod/Default/Util.hs

diff --git a/yesod-default/Yesod/Default/Util.hs b/yesod-default/Yesod/Default/Util.hs
new file mode 100644
index 00000000..ba36cb14
--- /dev/null
+++ b/yesod-default/Yesod/Default/Util.hs
@@ -0,0 +1,43 @@
+{-# LANGUAGE OverloadedStrings #-}
+-- | Various utilities used in the scaffolded site.
+module Yesod.Default.Util
+    ( addStaticContentExternal
+    ) where
+
+import Control.Monad.IO.Class (liftIO)
+import qualified Data.ByteString.Lazy as L
+import Data.Text (Text, pack, unpack)
+import Yesod.Core -- purposely using complete import so that Haddock will see addStaticContent
+import Control.Monad (unless)
+import System.Directory (doesFileExist, createDirectoryIfMissing)
+
+-- | An implementation of 'addStaticContent' which stores the contents in an
+-- external file. Files are created in the given static folder with names based
+-- on a hash of their content. This allows expiration dates to be set far in
+-- the future without worry of users receiving stale content.
+addStaticContentExternal
+    :: (L.ByteString -> Either a L.ByteString) -- ^ javascript minifier
+    -> (L.ByteString -> String) -- ^ hash function to determine file name
+    -> FilePath -- ^ location of static directory. files will be placed within a "tmp" subfolder
+    -> ([Text] -> Route master) -- ^ route constructor, taking a list of pieces
+    -> Text -- ^ filename extension
+    -> Text -- ^ mime type
+    -> L.ByteString -- ^ file contents
+    -> GHandler sub master (Maybe (Either Text (Route master, [(Text, Text)])))
+addStaticContentExternal minify hash staticDir toRoute ext' _ content = do
+    liftIO $ createDirectoryIfMissing True statictmp
+    exists <- liftIO $ doesFileExist fn'
+    unless exists $ liftIO $ L.writeFile fn' content'
+    return $ Just $ Right (toRoute ["tmp", pack fn], [])
+  where
+    fn, statictmp, fn' :: FilePath
+    -- by basing the hash off of the un-minified content, we avoid a costly
+    -- minification if the file already exists
+    fn = hash content ++ '.' : unpack ext'
+    statictmp = staticDir ++ "/tmp/"
+    fn' = statictmp ++ fn
+
+    content' :: L.ByteString
+    content'
+        | ext' == "js" = either (const content) id $ minify content
+        | otherwise = content
diff --git a/yesod-default/yesod-default.cabal b/yesod-default/yesod-default.cabal
index 306b6fb1..8eea3d63 100644
--- a/yesod-default/yesod-default.cabal
+++ b/yesod-default/yesod-default.cabal
@@ -14,15 +14,20 @@ description:     Convenient wrappers for your the configuration and
                  execution of your yesod application
 
 library
-    build-depends:   base       >= 4   && < 5
-                   , yesod-core >= 0.9 && < 0.10
-                   , cmdargs    >= 0.8 && < 0.9
-                   , warp       >= 0.4 && < 0.5
-                   , wai        >= 0.4 && < 0.5
-                   , wai-extra  >= 0.4 && < 0.5
+    build-depends:   base              >= 4   && < 5
+                   , yesod-core        >= 0.9 && < 0.10
+                   , cmdargs           >= 0.8 && < 0.9
+                   , warp              >= 0.4 && < 0.5
+                   , wai               >= 0.4 && < 0.5
+                   , wai-extra         >= 0.4 && < 0.5
+                   , bytestring        >= 0.9 && < 0.10
+                   , transformers      >= 0.2 && < 0.3
+                   , text              >= 0.9 && < 1.0
+                   , directory         >= 1.0 && < 1.2
 
     exposed-modules: Yesod.Default.Config
                    , Yesod.Default.Main
+                   , Yesod.Default.Util
 
     ghc-options:     -Wall
 
diff --git a/yesod/scaffold/Foundation.hs.cg b/yesod/scaffold/Foundation.hs.cg
index 6910cd26..1aa391c1 100644
--- a/yesod/scaffold/Foundation.hs.cg
+++ b/yesod/scaffold/Foundation.hs.cg
@@ -23,19 +23,18 @@ import Yesod.Auth
 import Yesod.Auth.OpenId
 import Yesod.Auth.Email
 import Yesod.Default.Config
+import Yesod.Default.Util (addStaticContentExternal)
 import Yesod.Logger (Logger, logLazyText)
 import qualified Settings
-import System.Directory
 import qualified Data.ByteString.Lazy as L
 import Database.Persist.~importGenericDB~
 import Settings (hamletFile, cassiusFile, luciusFile, juliusFile, widgetFile)
 import Model
 import Data.Maybe (isJust)
-import Control.Monad (join, unless)
+import Control.Monad (join)
 import Network.Mail.Mime
 import qualified Data.Text.Lazy.Encoding
 import Text.Jasmine (minifym)
-import qualified Data.Text as T
 import Web.ClientSession (getKey)
 import Text.Blaze.Renderer.Utf8 (renderHtml)
 import Text.Hamlet (shamlet)
@@ -104,21 +103,7 @@ instance Yesod ~sitearg~ where
     -- and names them based on a hash of their content. This allows
     -- expiration dates to be set far in the future without worry of
     -- users receiving stale content.
-    addStaticContent ext' _ content = do
-        let fn = base64md5 content ++ '.' : T.unpack ext'
-        let content' =
-                if ext' == "js"
-                    then case minifym content of
-                            Left _ -> content
-                            Right y -> y
-                    else content
-        let statictmp = Settings.staticDir ++ "/tmp/"
-        liftIO $ createDirectoryIfMissing True statictmp
-        let fn' = statictmp ++ fn
-        exists <- liftIO $ doesFileExist fn'
-        unless exists $ liftIO $ L.writeFile fn' content'
-        return $ Just $ Right (StaticR $ StaticRoute ["tmp", T.pack fn] [], [])
-
+    addStaticContent = addStaticContentExternal minifym base64md5 Settings.staticDir (StaticR . flip StaticRoute [])
 
 -- How to run database actions.
 instance YesodPersist ~sitearg~ where

From bb7f7c82f2ad2ee2f7e5262c72d59dacc15cd8b0 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 22 Sep 2011 08:55:18 +0300
Subject: [PATCH 039/189] normalize is a Lucius file

---
 yesod/Scaffolding/Scaffolder.hs                               | 4 ++--
 yesod/scaffold/Foundation.hs.cg                               | 1 +
 yesod/scaffold/hamlet/boilerplate-layout.hamlet.cg            | 1 -
 yesod/scaffold/hamlet/default-layout.hamlet.cg                | 1 -
 .../css/normalize.css.cg => lucius/normalize.lucius.cg}       | 0
 yesod/scaffold/tiny/Foundation.hs.cg                          | 1 +
 yesod/yesod.cabal                                             | 2 +-
 7 files changed, 5 insertions(+), 5 deletions(-)
 rename yesod/scaffold/{static/css/normalize.css.cg => lucius/normalize.lucius.cg} (100%)

diff --git a/yesod/Scaffolding/Scaffolder.hs b/yesod/Scaffolding/Scaffolder.hs
index 293032b6..9bf2cd0a 100644
--- a/yesod/Scaffolding/Scaffolder.hs
+++ b/yesod/Scaffolding/Scaffolder.hs
@@ -149,8 +149,8 @@ scaffold = do
         $(codegen "hamlet/default-layout.hamlet")
     writeFile' "hamlet/boilerplate-layout.hamlet"
         $(codegen "hamlet/boilerplate-layout.hamlet")
-    writeFile' "static/css/normalize.css"
-        $(codegen "static/css/normalize.css")
+    writeFile' "lucius/normalize.lucius"
+        $(codegen "lucius/normalize.lucius")
     writeFile' "hamlet/homepage.hamlet" $ ifTiny $(codegen "tiny/hamlet/homepage.hamlet") $(codegen "hamlet/homepage.hamlet")
     writeFile' "config/routes" $ ifTiny $(codegen "tiny/config/routes") $(codegen "config/routes")
     writeFile' "cassius/homepage.cassius" $(codegen "cassius/homepage.cassius")
diff --git a/yesod/scaffold/Foundation.hs.cg b/yesod/scaffold/Foundation.hs.cg
index 1aa391c1..42d81293 100644
--- a/yesod/scaffold/Foundation.hs.cg
+++ b/yesod/scaffold/Foundation.hs.cg
@@ -84,6 +84,7 @@ instance Yesod ~sitearg~ where
         mmsg <- getMessage
         pc <- widgetToPageContent $ do
             widget
+            addLucius $(luciusFile "normalize")
             addCassius $(cassiusFile "default-layout")
         hamletToRepHtml $(hamletFile "default-layout")
 
diff --git a/yesod/scaffold/hamlet/boilerplate-layout.hamlet.cg b/yesod/scaffold/hamlet/boilerplate-layout.hamlet.cg
index 522df932..22a5aca4 100644
--- a/yesod/scaffold/hamlet/boilerplate-layout.hamlet.cg
+++ b/yesod/scaffold/hamlet/boilerplate-layout.hamlet.cg
@@ -15,7 +15,6 @@
 
         <title>#{pageTitle pc}
 
-        <link rel="stylesheet" href=@{StaticR css_normalize_css}>
         ^{pageHead pc}
       
         <!--[if lt IE 9]>
diff --git a/yesod/scaffold/hamlet/default-layout.hamlet.cg b/yesod/scaffold/hamlet/default-layout.hamlet.cg
index 0a4d08f4..f31acb19 100644
--- a/yesod/scaffold/hamlet/default-layout.hamlet.cg
+++ b/yesod/scaffold/hamlet/default-layout.hamlet.cg
@@ -2,7 +2,6 @@
 <html
     <head
         <title>#{pageTitle pc}
-        <link rel="stylesheet" href=@{StaticR css_normalize_css}>
         ^{pageHead pc}
     <body
         $maybe msg <- mmsg
diff --git a/yesod/scaffold/static/css/normalize.css.cg b/yesod/scaffold/lucius/normalize.lucius.cg
similarity index 100%
rename from yesod/scaffold/static/css/normalize.css.cg
rename to yesod/scaffold/lucius/normalize.lucius.cg
diff --git a/yesod/scaffold/tiny/Foundation.hs.cg b/yesod/scaffold/tiny/Foundation.hs.cg
index 58bb57c9..1f4262dc 100644
--- a/yesod/scaffold/tiny/Foundation.hs.cg
+++ b/yesod/scaffold/tiny/Foundation.hs.cg
@@ -71,6 +71,7 @@ instance Yesod ~sitearg~ where
         mmsg <- getMessage
         pc <- widgetToPageContent $ do
             widget
+            addLucius $(luciusFile "normalize")
             addCassius $(cassiusFile "default-layout")
         hamletToRepHtml $(hamletFile "default-layout")
 
diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index 9b13dcdf..7fc47113 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -30,7 +30,7 @@ extra-source-files:
   scaffold/tiny/Handler/Root.hs.cg
   scaffold/tiny/config/routes.cg
   scaffold/tiny/Settings.hs.cg
-  scaffold/static/css/normalize.css.cg
+  scaffold/lucius/normalize.lucius.cg
   scaffold/postgresqlConnPool.cg
   scaffold/sqliteConnPool.cg
   scaffold/.ghci.cg

From 9815fe8891848d169baf4ae56321df26639d8e86 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 22 Sep 2011 08:59:52 +0300
Subject: [PATCH 040/189] tiny/Foundation uses addStaticContentExternal

---
 yesod/scaffold/tiny/Foundation.hs.cg | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/yesod/scaffold/tiny/Foundation.hs.cg b/yesod/scaffold/tiny/Foundation.hs.cg
index 1f4262dc..38152df9 100644
--- a/yesod/scaffold/tiny/Foundation.hs.cg
+++ b/yesod/scaffold/tiny/Foundation.hs.cg
@@ -15,17 +15,14 @@ module Foundation
 
 import Yesod.Core
 import Yesod.Default.Config
+import Yesod.Default.Util (addStaticContentExternal)
 import Yesod.Static (Static, base64md5, StaticRoute(..))
 import Settings.StaticFiles
 import Yesod.Logger (Logger, logLazyText)
 import qualified Settings
-import System.Directory
-import qualified Data.ByteString.Lazy as L
 import Settings (hamletFile, cassiusFile, luciusFile, juliusFile, widgetFile)
-import Control.Monad (unless)
 import Control.Monad.Trans.Class (lift)
 import Control.Monad.IO.Class (liftIO)
-import qualified Data.Text as T
 import Web.ClientSession (getKey)
 
 -- | The site argument for your application. This can be a good place to
@@ -88,11 +85,4 @@ instance Yesod ~sitearg~ where
     -- and names them based on a hash of their content. This allows
     -- expiration dates to be set far in the future without worry of
     -- users receiving stale content.
-    addStaticContent ext' _ content = do
-        let fn = base64md5 content ++ '.' : T.unpack ext'
-        let statictmp = Settings.staticDir ++ "/tmp/"
-        liftIO $ createDirectoryIfMissing True statictmp
-        let fn' = statictmp ++ fn
-        exists <- liftIO $ doesFileExist fn'
-        unless exists $ liftIO $ L.writeFile fn' content
-        return $ Just $ Right (StaticR $ StaticRoute ["tmp", T.pack fn] [], [])
+    addStaticContent = addStaticContentExternal (const $ Left ()) base64md5 Settings.staticDir (StaticR . flip StaticRoute [])

From 29ce11cd5ac6ad230ced9b02b9a4e3236448221c Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 22 Sep 2011 09:01:27 +0300
Subject: [PATCH 041/189] Quicker builds on development

---
 yesod/main.hs                   | 2 +-
 yesod/scaffold/project.cabal.cg | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/yesod/main.hs b/yesod/main.hs
index 988edfc6..a5719efa 100755
--- a/yesod/main.hs
+++ b/yesod/main.hs
@@ -36,7 +36,7 @@ main = do
 #endif
         ["devel"] -> devel isDev
         ["version"] -> putStrLn "0.9"
-        "configure":rest -> rawSystem cmd ("configure":rest) >>= exitWith
+        "configure":rest -> rawSystem cmd ("configure":"--disable-library-profiling":rest) >>= exitWith
         _ -> do
             putStrLn "Usage: yesod <command>"
             putStrLn "Available commands:"
diff --git a/yesod/scaffold/project.cabal.cg b/yesod/scaffold/project.cabal.cg
index 28a7f889..3055a7e6 100644
--- a/yesod/scaffold/project.cabal.cg
+++ b/yesod/scaffold/project.cabal.cg
@@ -37,6 +37,8 @@ library
                      Settings.StaticFiles
                      Handler.Root
 
+    ghc-options:   -Wall -threaded -O0
+
 executable         ~project~
     if flag(devel)
         Buildable: False
@@ -45,7 +47,7 @@ executable         ~project~
         cpp-options:   -DPRODUCTION
         ghc-options:   -Wall -threaded -O2
     else
-        ghc-options:   -Wall -threaded
+        ghc-options:   -Wall -threaded -O0
 
     if os(windows)
         cpp-options: -DWINDOWS

From 8c094f154ff53d8e953553fb8931afca0ee5dd55 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 22 Sep 2011 09:02:27 +0300
Subject: [PATCH 042/189] Fixed settings.yml.cg

---
 yesod/scaffold/config/settings.yml.cg | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/yesod/scaffold/config/settings.yml.cg b/yesod/scaffold/config/settings.yml.cg
index d6fad856..816a2db6 100644
--- a/yesod/scaffold/config/settings.yml.cg
+++ b/yesod/scaffold/config/settings.yml.cg
@@ -1,5 +1,5 @@
 Default: &defaults
-  host: "http://localhost"
+  host: "localhost"
   port: 3000
 
 Development:
@@ -12,4 +12,5 @@ Staging:
   <<: *defaults
 
 Production:
+  approot: "http://www.example.com"
   <<: *defaults

From 31dd38d1039a1ffa724407e28e64dfc34ce459f1 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 22 Sep 2011 09:07:59 +0300
Subject: [PATCH 043/189] Unified homepage between main and tiny scaffolding

---
 yesod/Scaffolding/Scaffolder.hs               |  4 ++--
 yesod/scaffold/Handler/Root.hs.cg             |  1 -
 yesod/scaffold/hamlet/homepage.hamlet.cg      | 11 -----------
 yesod/scaffold/tiny/Handler/Root.hs.cg        | 18 ------------------
 yesod/scaffold/tiny/hamlet/homepage.hamlet.cg |  2 --
 yesod/yesod.cabal                             |  2 --
 6 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100644 yesod/scaffold/tiny/Handler/Root.hs.cg
 delete mode 100644 yesod/scaffold/tiny/hamlet/homepage.hamlet.cg

diff --git a/yesod/Scaffolding/Scaffolder.hs b/yesod/Scaffolding/Scaffolder.hs
index 9bf2cd0a..ddede346 100644
--- a/yesod/Scaffolding/Scaffolder.hs
+++ b/yesod/Scaffolding/Scaffolder.hs
@@ -139,7 +139,7 @@ scaffold = do
     writeFile' "LICENSE" $(codegen "LICENSE")
     writeFile' ("Foundation.hs") $ ifTiny $(codegen "tiny/Foundation.hs") $(codegen "Foundation.hs")
     writeFile' "Application.hs" $ ifTiny $(codegen "tiny/Application.hs") $(codegen "Application.hs")
-    writeFile' "Handler/Root.hs" $ ifTiny $(codegen "tiny/Handler/Root.hs") $(codegen "Handler/Root.hs")
+    writeFile' "Handler/Root.hs" $(codegen "Handler/Root.hs")
     unless isTiny $ writeFile' "Model.hs" $(codegen "Model.hs")
     writeFile' "Settings.hs" $ ifTiny $(codegen "tiny/Settings.hs") $(codegen "Settings.hs")
     writeFile' "Settings/StaticFiles.hs" $(codegen "Settings/StaticFiles.hs")
@@ -151,7 +151,7 @@ scaffold = do
         $(codegen "hamlet/boilerplate-layout.hamlet")
     writeFile' "lucius/normalize.lucius"
         $(codegen "lucius/normalize.lucius")
-    writeFile' "hamlet/homepage.hamlet" $ ifTiny $(codegen "tiny/hamlet/homepage.hamlet") $(codegen "hamlet/homepage.hamlet")
+    writeFile' "hamlet/homepage.hamlet" $(codegen "hamlet/homepage.hamlet")
     writeFile' "config/routes" $ ifTiny $(codegen "tiny/config/routes") $(codegen "config/routes")
     writeFile' "cassius/homepage.cassius" $(codegen "cassius/homepage.cassius")
     writeFile' "julius/homepage.julius" $(codegen "julius/homepage.julius")
diff --git a/yesod/scaffold/Handler/Root.hs.cg b/yesod/scaffold/Handler/Root.hs.cg
index 99bf711d..e485b7cd 100644
--- a/yesod/scaffold/Handler/Root.hs.cg
+++ b/yesod/scaffold/Handler/Root.hs.cg
@@ -12,7 +12,6 @@ import Foundation
 -- inclined, or create a single monolithic file.
 getRootR :: Handler RepHtml
 getRootR = do
-    mu <- maybeAuth
     defaultLayout $ do
         h2id <- lift newIdent
         setTitle "~project~ homepage"
diff --git a/yesod/scaffold/hamlet/homepage.hamlet.cg b/yesod/scaffold/hamlet/homepage.hamlet.cg
index 727f0eb6..34432b74 100644
--- a/yesod/scaffold/hamlet/homepage.hamlet.cg
+++ b/yesod/scaffold/hamlet/homepage.hamlet.cg
@@ -1,13 +1,2 @@
 <h1>Hello
 <h2 ##{h2id}>You do not have Javascript enabled.
-$maybe u <- mu
-    <p
-        You are logged in as #{userIdent $ snd u}. #
-        <a href=@{AuthR LogoutR}>Logout
-        .
-$nothing
-    <p
-        You are not logged in. #
-        <a href=@{AuthR LoginR}>Login now
-        .
-
diff --git a/yesod/scaffold/tiny/Handler/Root.hs.cg b/yesod/scaffold/tiny/Handler/Root.hs.cg
deleted file mode 100644
index e485b7cd..00000000
--- a/yesod/scaffold/tiny/Handler/Root.hs.cg
+++ /dev/null
@@ -1,18 +0,0 @@
-{-# LANGUAGE TemplateHaskell, QuasiQuotes, OverloadedStrings #-}
-module Handler.Root where
-
-import Foundation
-
--- This is a handler function for the GET request method on the RootR
--- resource pattern. All of your resource patterns are defined in
--- config/routes
---
--- The majority of the code you will write in Yesod lives in these handler
--- functions. You can spread them across multiple files if you are so
--- inclined, or create a single monolithic file.
-getRootR :: Handler RepHtml
-getRootR = do
-    defaultLayout $ do
-        h2id <- lift newIdent
-        setTitle "~project~ homepage"
-        addWidget $(widgetFile "homepage")
diff --git a/yesod/scaffold/tiny/hamlet/homepage.hamlet.cg b/yesod/scaffold/tiny/hamlet/homepage.hamlet.cg
deleted file mode 100644
index 34432b74..00000000
--- a/yesod/scaffold/tiny/hamlet/homepage.hamlet.cg
+++ /dev/null
@@ -1,2 +0,0 @@
-<h1>Hello
-<h2 ##{h2id}>You do not have Javascript enabled.
diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index 7fc47113..08543eab 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -26,8 +26,6 @@ extra-source-files:
   scaffold/tiny/Foundation.hs.cg
   scaffold/tiny/project.cabal.cg
   scaffold/tiny/Application.hs.cg
-  scaffold/tiny/hamlet/homepage.hamlet.cg
-  scaffold/tiny/Handler/Root.hs.cg
   scaffold/tiny/config/routes.cg
   scaffold/tiny/Settings.hs.cg
   scaffold/lucius/normalize.lucius.cg

From eb42fbd976bfcf15ace1c3617058974a325cdd42 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 22 Sep 2011 09:26:36 +0300
Subject: [PATCH 044/189] staticFilesList

---
 yesod-static/Yesod/Static.hs    | 30 +++++++++++++++++++++++++++++-
 yesod-static/yesod-static.cabal |  2 +-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/yesod-static/Yesod/Static.hs b/yesod-static/Yesod/Static.hs
index f26813b7..be5e45e8 100644
--- a/yesod-static/Yesod/Static.hs
+++ b/yesod-static/Yesod/Static.hs
@@ -29,6 +29,7 @@ module Yesod.Static
     , embed
       -- * Template Haskell helpers
     , staticFiles
+    , staticFilesList
     , publicFiles
       -- * Hashing
     , base64md5
@@ -155,6 +156,25 @@ getFileListPieces = flip go id
 staticFiles :: Prelude.FilePath -> Q [Dec]
 staticFiles dir = mkStaticFiles dir
 
+-- | Same as 'staticFiles', but takes an explicit list of files to create
+-- identifiers for. The files are given relative to the static folder. For
+-- example, to get the files \"static/js/jquery.js\" and
+-- \"static/css/normalize.css\", you would use:
+--
+-- > staticFilesList "static" ["js/jquery.js"], ["css/normalize.css"]]
+--
+-- This can be useful when you have a very large number of static files, but
+-- only need to refer to a few of them from Haskell.
+staticFilesList :: Prelude.FilePath -> [Prelude.FilePath] -> Q [Dec]
+staticFilesList dir fs =
+    mkStaticFilesList dir (map split fs) "StaticRoute" True
+  where
+    split :: Prelude.FilePath -> [String]
+    split [] = []
+    split x =
+        let (a, b) = break (== '/') x
+         in a : split (drop 1 b)
+
 -- | like staticFiles, but doesn't append an etag to the query string
 -- This will compile faster, but doesn't achieve as great of caching.
 -- The browser can avoid downloading the file, but it always needs to send a request with the etag value or the last-modified value to the server to see if its copy is up to dat
@@ -212,6 +232,15 @@ mkStaticFiles' :: Prelude.FilePath -- ^ static directory
                -> Q [Dec]
 mkStaticFiles' fp routeConName makeHash = do
     fs <- qRunIO $ getFileListPieces fp
+    mkStaticFilesList fp fs routeConName makeHash
+
+mkStaticFilesList
+    :: Prelude.FilePath -- ^ static directory
+    -> [[String]] -- ^ list of files to create identifiers for
+    -> String   -- ^ route constructor "StaticRoute"
+    -> Bool     -- ^ append checksum query parameter
+    -> Q [Dec]
+mkStaticFilesList fp fs routeConName makeHash = do
     concat `fmap` mapM mkRoute fs
   where
     replace' c
@@ -233,7 +262,6 @@ mkStaticFiles' fp routeConName makeHash = do
         pack' <- [|pack|]
         qs <- if makeHash
                     then do hash <- qRunIO $ base64md5File $ pathFromRawPieces fp f
-        -- FIXME hash <- qRunIO . calcHash $ fp ++ '/' : intercalate "/" f
                             [|[(pack $(lift hash), mempty)]|]
                     else return $ ListE []
         return
diff --git a/yesod-static/yesod-static.cabal b/yesod-static/yesod-static.cabal
index e503db0c..18e26a80 100644
--- a/yesod-static/yesod-static.cabal
+++ b/yesod-static/yesod-static.cabal
@@ -1,5 +1,5 @@
 name:            yesod-static
-version:         0.3.0.1
+version:         0.3.1
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>

From ecca686b73ad7f59bebdffad92fa468a1c91ad49 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 22 Sep 2011 09:37:22 +0300
Subject: [PATCH 045/189] Cassius -> Lucius

---
 yesod/Scaffolding/Scaffolder.hs                             | 6 +++---
 yesod/scaffold/Foundation.hs.cg                             | 4 ++--
 yesod/scaffold/cassius/default-layout.cassius.cg            | 3 ---
 yesod/scaffold/lucius/default-layout.lucius.cg              | 4 ++++
 .../homepage.cassius.cg => lucius/homepage.lucius.cg}       | 6 ++++--
 yesod/scaffold/tiny/Foundation.hs.cg                        | 4 ++--
 yesod/yesod.cabal                                           | 4 ++--
 7 files changed, 17 insertions(+), 14 deletions(-)
 delete mode 100644 yesod/scaffold/cassius/default-layout.cassius.cg
 create mode 100644 yesod/scaffold/lucius/default-layout.lucius.cg
 rename yesod/scaffold/{cassius/homepage.cassius.cg => lucius/homepage.lucius.cg} (64%)

diff --git a/yesod/Scaffolding/Scaffolder.hs b/yesod/Scaffolding/Scaffolder.hs
index ddede346..bb3dadc2 100644
--- a/yesod/Scaffolding/Scaffolder.hs
+++ b/yesod/Scaffolding/Scaffolder.hs
@@ -143,8 +143,8 @@ scaffold = do
     unless isTiny $ writeFile' "Model.hs" $(codegen "Model.hs")
     writeFile' "Settings.hs" $ ifTiny $(codegen "tiny/Settings.hs") $(codegen "Settings.hs")
     writeFile' "Settings/StaticFiles.hs" $(codegen "Settings/StaticFiles.hs")
-    writeFile' "cassius/default-layout.cassius"
-        $(codegen "cassius/default-layout.cassius")
+    writeFile' "lucius/default-layout.lucius"
+        $(codegen "lucius/default-layout.lucius")
     writeFile' "hamlet/default-layout.hamlet"
         $(codegen "hamlet/default-layout.hamlet")
     writeFile' "hamlet/boilerplate-layout.hamlet"
@@ -153,7 +153,7 @@ scaffold = do
         $(codegen "lucius/normalize.lucius")
     writeFile' "hamlet/homepage.hamlet" $(codegen "hamlet/homepage.hamlet")
     writeFile' "config/routes" $ ifTiny $(codegen "tiny/config/routes") $(codegen "config/routes")
-    writeFile' "cassius/homepage.cassius" $(codegen "cassius/homepage.cassius")
+    writeFile' "lucius/homepage.lucius" $(codegen "lucius/homepage.lucius")
     writeFile' "julius/homepage.julius" $(codegen "julius/homepage.julius")
     unless isTiny $ writeFile' "config/models" $(codegen "config/models")
   
diff --git a/yesod/scaffold/Foundation.hs.cg b/yesod/scaffold/Foundation.hs.cg
index 42d81293..11c82fa5 100644
--- a/yesod/scaffold/Foundation.hs.cg
+++ b/yesod/scaffold/Foundation.hs.cg
@@ -84,8 +84,8 @@ instance Yesod ~sitearg~ where
         mmsg <- getMessage
         pc <- widgetToPageContent $ do
             widget
-            addLucius $(luciusFile "normalize")
-            addCassius $(cassiusFile "default-layout")
+            toWidget $(luciusFile "normalize")
+            toWidget $(luciusFile "default-layout")
         hamletToRepHtml $(hamletFile "default-layout")
 
     -- This is done to provide an optimization for serving static files from
diff --git a/yesod/scaffold/cassius/default-layout.cassius.cg b/yesod/scaffold/cassius/default-layout.cassius.cg
deleted file mode 100644
index 77177469..00000000
--- a/yesod/scaffold/cassius/default-layout.cassius.cg
+++ /dev/null
@@ -1,3 +0,0 @@
-body
-    font-family: sans-serif
-
diff --git a/yesod/scaffold/lucius/default-layout.lucius.cg b/yesod/scaffold/lucius/default-layout.lucius.cg
new file mode 100644
index 00000000..799dec4f
--- /dev/null
+++ b/yesod/scaffold/lucius/default-layout.lucius.cg
@@ -0,0 +1,4 @@
+body {
+    font-family: sans-serif;
+}
+
diff --git a/yesod/scaffold/cassius/homepage.cassius.cg b/yesod/scaffold/lucius/homepage.lucius.cg
similarity index 64%
rename from yesod/scaffold/cassius/homepage.cassius.cg
rename to yesod/scaffold/lucius/homepage.lucius.cg
index 2ac20924..e8cf5292 100644
--- a/yesod/scaffold/cassius/homepage.cassius.cg
+++ b/yesod/scaffold/lucius/homepage.lucius.cg
@@ -1,5 +1,7 @@
-h1
+h1 {
     text-align: center
-h2##{h2id}
+}
+h2##{h2id} {
     color: #990
+}
 
diff --git a/yesod/scaffold/tiny/Foundation.hs.cg b/yesod/scaffold/tiny/Foundation.hs.cg
index 38152df9..d80e957e 100644
--- a/yesod/scaffold/tiny/Foundation.hs.cg
+++ b/yesod/scaffold/tiny/Foundation.hs.cg
@@ -68,8 +68,8 @@ instance Yesod ~sitearg~ where
         mmsg <- getMessage
         pc <- widgetToPageContent $ do
             widget
-            addLucius $(luciusFile "normalize")
-            addCassius $(cassiusFile "default-layout")
+            toWidget $(luciusFile "normalize")
+            toWidget $(luciusFile "default-layout")
         hamletToRepHtml $(hamletFile "default-layout")
 
     -- This is done to provide an optimization for serving static files from
diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index 08543eab..4e43b436 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -17,8 +17,8 @@ homepage:        http://www.yesodweb.com/
 
 extra-source-files:
   input/*.cg
-  scaffold/cassius/default-layout.cassius.cg
-  scaffold/cassius/homepage.cassius.cg
+  scaffold/lucius/default-layout.lucius.cg
+  scaffold/lucius/homepage.lucius.cg
   scaffold/Model.hs.cg
   scaffold/Foundation.hs.cg
   scaffold/LICENSE.cg

From 189b3d2bab38a3f4d44a5f004f5e7e9eef281767 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 22 Sep 2011 09:50:12 +0300
Subject: [PATCH 046/189] Included messages in scaffolded site

---
 yesod/Scaffolding/Scaffolder.hs          | 4 +++-
 yesod/scaffold/Foundation.hs.cg          | 4 ++++
 yesod/scaffold/hamlet/homepage.hamlet.cg | 2 +-
 yesod/scaffold/messages/en.msg.cg        | 1 +
 yesod/scaffold/tiny/Foundation.hs.cg     | 6 +++++-
 yesod/yesod.cabal                        | 1 +
 6 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 yesod/scaffold/messages/en.msg.cg

diff --git a/yesod/Scaffolding/Scaffolder.hs b/yesod/Scaffolding/Scaffolder.hs
index bb3dadc2..5cd5569e 100644
--- a/yesod/Scaffolding/Scaffolder.hs
+++ b/yesod/Scaffolding/Scaffolder.hs
@@ -120,6 +120,7 @@ scaffold = do
     mkDir "Model"
     mkDir "deploy"
     mkDir "Settings"
+    mkDir "messages"
      
     writeFile' ("deploy/Procfile") $(codegen "deploy/Procfile")
 
@@ -156,7 +157,8 @@ scaffold = do
     writeFile' "lucius/homepage.lucius" $(codegen "lucius/homepage.lucius")
     writeFile' "julius/homepage.julius" $(codegen "julius/homepage.julius")
     unless isTiny $ writeFile' "config/models" $(codegen "config/models")
-  
+    writeFile' "messages/en.msg" $(codegen "messages/en.msg")
+
     S.writeFile (dir ++ "/config/favicon.ico")
         $(runIO (S.readFile "scaffold/config/favicon.ico.cg") >>= \bs -> do
             pack <- [|S.pack|]
diff --git a/yesod/scaffold/Foundation.hs.cg b/yesod/scaffold/Foundation.hs.cg
index 11c82fa5..d0740589 100644
--- a/yesod/scaffold/Foundation.hs.cg
+++ b/yesod/scaffold/Foundation.hs.cg
@@ -4,6 +4,7 @@
 module Foundation
     ( ~sitearg~ (..)
     , ~sitearg~Route (..)
+    , ~sitearg~Message (..)
     , resources~sitearg~
     , Handler
     , Widget
@@ -51,6 +52,9 @@ data ~sitearg~ = ~sitearg~
     , connPool :: Settings.ConnectionPool -- ^ Database connection pool.
     }
 
+-- Set up i18n messages. See the message folder.
+mkMessage "~sitearg~" "messages" "en"
+
 -- This is where we define all of the routes in our application. For a full
 -- explanation of the syntax, please see:
 -- http://www.yesodweb.com/book/handler
diff --git a/yesod/scaffold/hamlet/homepage.hamlet.cg b/yesod/scaffold/hamlet/homepage.hamlet.cg
index 34432b74..e8907860 100644
--- a/yesod/scaffold/hamlet/homepage.hamlet.cg
+++ b/yesod/scaffold/hamlet/homepage.hamlet.cg
@@ -1,2 +1,2 @@
-<h1>Hello
+<h1>_{MsgHello}
 <h2 ##{h2id}>You do not have Javascript enabled.
diff --git a/yesod/scaffold/messages/en.msg.cg b/yesod/scaffold/messages/en.msg.cg
new file mode 100644
index 00000000..e928c34b
--- /dev/null
+++ b/yesod/scaffold/messages/en.msg.cg
@@ -0,0 +1 @@
+Hello: Hello
diff --git a/yesod/scaffold/tiny/Foundation.hs.cg b/yesod/scaffold/tiny/Foundation.hs.cg
index d80e957e..ca02521b 100644
--- a/yesod/scaffold/tiny/Foundation.hs.cg
+++ b/yesod/scaffold/tiny/Foundation.hs.cg
@@ -1,8 +1,9 @@
 {-# LANGUAGE QuasiQuotes, TemplateHaskell, TypeFamilies #-}
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE OverloadedStrings, MultiParamTypeClasses #-}
 module Foundation
     ( ~sitearg~ (..)
     , ~sitearg~Route (..)
+    , ~sitearg~Message (..)
     , resources~sitearg~
     , Handler
     , Widget
@@ -35,6 +36,9 @@ data ~sitearg~ = ~sitearg~
     , getStatic :: Static -- ^ Settings for static file serving.
     }
 
+-- Set up i18n messages. See the message folder.
+mkMessage "~sitearg~" "messages" "en"
+
 -- This is where we define all of the routes in our application. For a full
 -- explanation of the syntax, please see:
 -- http://docs.yesodweb.com/book/web-routes-quasi/
diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index 4e43b436..ef65d087 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -50,6 +50,7 @@ extra-source-files:
   scaffold/config/routes.cg
   scaffold/Settings.hs.cg
   scaffold/Settings/StaticFiles.hs.cg
+  scaffold/messages/en.msg.cg
 
 
 flag ghc7

From d77972ab601eac1ca1f7ba2498e4f878c590b534 Mon Sep 17 00:00:00 2001
From: Rune <rune@rune-90X3A.(none)>
Date: Thu, 22 Sep 2011 09:21:00 +0200
Subject: [PATCH 047/189] added customErrorMessage to Yesod.Form.Functions to
 allow the user to overwrite the parse-error messages on fields.

---
 yesod-form/Yesod/Form/Functions.hs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/yesod-form/Yesod/Form/Functions.hs b/yesod-form/Yesod/Form/Functions.hs
index b5910e4e..f762b621 100644
--- a/yesod-form/Yesod/Form/Functions.hs
+++ b/yesod-form/Yesod/Form/Functions.hs
@@ -31,6 +31,7 @@ module Yesod.Form.Functions
     , check
     , checkBool
     , checkM
+    , customErrorMessage
     ) where
 
 import Yesod.Form.Types
@@ -309,3 +310,8 @@ checkM f field = field
             Right Nothing -> return $ Right Nothing
             Right (Just a) -> fmap (either (Left . SomeMessage) (Right . Just)) $ f a
     }
+
+-- | Allows you to overwrite the error message on parse error.
+customErrorMessage :: SomeMessage master -> Field sub master a -> Field sub master a
+customErrorMessage msg field = field { fieldParse = \ts -> fmap (either
+(const $ Left msg) Right) $ fieldParse field ts }

From 05ca4bc907706479342e2a941777cd524a080453 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 22 Sep 2011 12:02:08 +0300
Subject: [PATCH 048/189] Proper disable-library-profiling

---
 yesod/Devel.hs | 4 ++--
 yesod/main.hs  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/yesod/Devel.hs b/yesod/Devel.hs
index 03d8795f..09ce09aa 100755
--- a/yesod/Devel.hs
+++ b/yesod/Devel.hs
@@ -66,8 +66,8 @@ devel isDevel = do
       checkCabalFile gpd
 
       _ <- if isDevel
-        then rawSystem "cabal-dev" ["configure", "--cabal-install-arg=-fdevel"]
-        else rawSystem "cabal"     ["configure", "-fdevel"]
+        then rawSystem "cabal-dev" ["configure", "--cabal-install-arg=-fdevel", "--disable-library-profiling"]
+        else rawSystem "cabal"     ["configure", "-fdevel", "--disable-library-profiling"]
 
       T.writeFile "dist/devel.hs" (develFile pid)
 
diff --git a/yesod/main.hs b/yesod/main.hs
index a5719efa..988edfc6 100755
--- a/yesod/main.hs
+++ b/yesod/main.hs
@@ -36,7 +36,7 @@ main = do
 #endif
         ["devel"] -> devel isDev
         ["version"] -> putStrLn "0.9"
-        "configure":rest -> rawSystem cmd ("configure":"--disable-library-profiling":rest) >>= exitWith
+        "configure":rest -> rawSystem cmd ("configure":rest) >>= exitWith
         _ -> do
             putStrLn "Usage: yesod <command>"
             putStrLn "Available commands:"

From ab98799e8d8dd960b9fdb3c93c893ca3ac232793 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjo=CC=88rn=20Buckwalter?= <bjorn@buckwalter.se>
Date: Thu, 22 Sep 2011 22:23:41 +0800
Subject: [PATCH 049/189] Alter nonce terminology in tests too.

---
 yesod-core/test/Test/InternalRequest.hs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/yesod-core/test/Test/InternalRequest.hs b/yesod-core/test/Test/InternalRequest.hs
index ba510cb5..97e90b98 100644
--- a/yesod-core/test/Test/InternalRequest.hs
+++ b/yesod-core/test/Test/InternalRequest.hs
@@ -30,16 +30,16 @@ g = undefined
 
 nonceSpecs :: [Spec]
 nonceSpecs = describe "Yesod.Internal.Request.parseWaiRequest (reqNonce)"
-  [ it "is Nothing for unsecure sessions" noUnsecureNonce
-  , it "ignores pre-existing nonce for unsecure sessions" ignoreUnsecureNonce
-  , it "uses preexisting nonce for secure sessions" useOldNonce
-  , it "generates a new nonce for secure sessions without nonce" generateNonce
+  [ it "is Nothing if sessions are disabled" noDisabledNonce
+  , it "ignores pre-existing nonce if sessions are disabled" ignoreDisabledNonce
+  , it "uses preexisting nonce in session" useOldNonce
+  , it "generates a new nonce for sessions without nonce" generateNonce
   ]
 
-noUnsecureNonce = reqNonce r == Nothing where
+noDisabledNonce = reqNonce r == Nothing where
   r = parseWaiRequest' defaultRequest [] Nothing g
 
-ignoreUnsecureNonce = reqNonce r == Nothing where
+ignoreDisabledNonce = reqNonce r == Nothing where
   r = parseWaiRequest' defaultRequest [("_NONCE", "old")] Nothing g
 
 useOldNonce = reqNonce r == Just "old" where

From 8a615e14938b7a22681e523a0597fb9aaa79f725 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Thu, 22 Sep 2011 13:53:57 -0400
Subject: [PATCH 050/189] update scripts

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index e791ced0..2fc59a85 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit e791ced0395245e30d37b5098a27bba5e818ecb7
+Subproject commit 2fc59a850bdc49e01f7a5e062b813df321ce5c78

From 62030bee5a22091b190861dd7124b0a3f6bb907f Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Thu, 22 Sep 2011 13:54:32 -0400
Subject: [PATCH 051/189] Use new test runner from scripts

* Create scaffold_test.sh which holds actual tests (still calls
  scaffold.sh)
* Move rm/unregister of foobar to setup/teardown functions
* run.sh now prints deprecation warning and calls ../scripts/runtests
---
 yesod/test/run.sh           | 99 +++----------------------------------
 yesod/test/scaffold.sh      |  4 +-
 yesod/test/scaffold_test.sh |  7 +++
 3 files changed, 15 insertions(+), 95 deletions(-)
 create mode 100644 yesod/test/scaffold_test.sh

diff --git a/yesod/test/run.sh b/yesod/test/run.sh
index 3b81e612..7095acda 100755
--- a/yesod/test/run.sh
+++ b/yesod/test/run.sh
@@ -1,97 +1,12 @@
-#!/bin/bash -e
-#
-# Runs test/scaffold.sh with a variety of inputs. Hides all output
-# besides failure details.
-#
-###
+#!/bin/bash
 
-[[ "$1" =~ -v|--verbose ]] && stdout=/dev/stdout || stdout=/dev/null
+cat << EOF
 
-tmp='/tmp'
-pwd="$PWD"
+You're using the deprecated ./test/run.sh. This file will be removed
+soon in favor of ../scripts/runtests.
 
-pkg=
-dir=
+Running ../scripts/runtests...
 
-failures=()
-n_tested=0
-n_failed=0
+EOF
 
-# runs the function named by $1, silencing stdout and redirecting stderr
-# to /tmp/function.errors. failures are tracked to be reported on during
-# cleanup
-run_test() { # {{{
-  local test_function="$*"
-
-  n_tested=$((n_tested+1))
-
-  if $test_function >"$stdout" 2>"$tmp/$test_function.errors"; then
-    echo -n '.'
-    [[ -f "$tmp/$test_function.errors" ]] && rm "$tmp/$test_function.errors"
-  else
-    echo -n 'F'
-    failures+=( "$test_function" )
-    n_failed=$((n_failed+1))
-  fi
-}
-# }}}
-
-# changes back to the original directory, removes the dist file and
-# outputs a report of tests and failures
-cleanup() { # {{{
-  cd "$pwd"
-  [[ -d "$dir" ]] && rm -r "$dir"
-
-  echo
-  echo
-  echo "Tests: $n_tested, Failures: $n_failed."
-  echo
-
-  [[ $n_failed -eq 0 ]] && return 0
-
-  for test in ${failures[@]}; do
-    echo "Failure: $test"
-    echo 'details:'
-    echo
-
-    if [[ -f "$tmp/$test.errors" ]]; then
-      cat "$tmp/$test.errors"
-      rm  "$tmp/$test.errors"
-    else
-      echo '<no stderr captured>'
-    fi
-
-    echo
-  done
-
-  return $n_failed
-}
-# }}}
-
-# compilation is test #1, sets global variable dir. other tests are run
-# from within this directory and it is removed as part of cleanup
-test_compile() {
-  cabal clean
-  cabal install
-  cabal sdist
-
-  read -r pkg < <(find dist/ -type f -name '*.tar.gz' | sort -rV)
-  dir="$(basename "$pkg" .tar.gz)"
-
-  tar -xzf "$pkg" && cd "$dir"
-}
-
-test_sqlite()     { ../test/scaffold.sh < ../test/sqlite-input.txt    ; }
-test_postgresql() { ../test/scaffold.sh < ../test/postgresql-input.txt; }
-test_mongodb()    { ../test/scaffold.sh < ../test/mongodb-input.txt   ; }
-test_tiny()       { ../test/scaffold.sh < ../test/tiny-input.txt      ; }
-
-echo 'Started'
-run_test 'test_compile'
-run_test 'test_sqlite'
-run_test 'test_postgresql'
-run_test 'test_mongodb'
-run_test 'test_tiny'
-cleanup
-
-exit $?
+../scripts/runtests "$@"
diff --git a/yesod/test/scaffold.sh b/yesod/test/scaffold.sh
index 303a9656..303fc363 100755
--- a/yesod/test/scaffold.sh
+++ b/yesod/test/scaffold.sh
@@ -1,12 +1,10 @@
 #!/bin/bash -ex
 
-rm -rf foobar
 runghc main.hs init
 
 (
   cd foobar
   cabal install
   cabal install -fdevel
+  cabal install -fproduction
 )
-
-ghc-pkg unregister foobar
diff --git a/yesod/test/scaffold_test.sh b/yesod/test/scaffold_test.sh
new file mode 100644
index 00000000..d12ea1ea
--- /dev/null
+++ b/yesod/test/scaffold_test.sh
@@ -0,0 +1,7 @@
+setup()    { rm -rf foobar; }
+teardown() { rm -rf foobar; ghc-pkg unregister foobar &>/dev/null; }
+
+test_sqlite()     { ../test/scaffold.sh < ../test/sqlite-input.txt    ; }
+test_postgresql() { ../test/scaffold.sh < ../test/postgresql-input.txt; }
+test_mongodb()    { ../test/scaffold.sh < ../test/mongodb-input.txt   ; }
+test_tiny()       { ../test/scaffold.sh < ../test/tiny-input.txt      ; }

From 33e0f37400ead55119fe4e4d995add1ca2812bd1 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Thu, 22 Sep 2011 22:38:51 -0400
Subject: [PATCH 052/189] Add defaultRunner (not scaffold not updated)

---
 yesod-default/Yesod/Default/Main.hs | 38 +++++++++++++++++++++++++++++
 yesod-default/yesod-default.cabal   |  6 +++++
 2 files changed, 44 insertions(+)

diff --git a/yesod-default/Yesod/Default/Main.hs b/yesod-default/Yesod/Default/Main.hs
index f19e5d41..9cb36d8d 100644
--- a/yesod-default/Yesod/Default/Main.hs
+++ b/yesod-default/Yesod/Default/Main.hs
@@ -1,16 +1,25 @@
+{-# LANGUAGE CPP                #-}
 {-# LANGUAGE DeriveDataTypeable #-}
 module Yesod.Default.Main
     ( defaultMain
+    , defaultRunner
     , defaultDevelApp
     , defaultDevelAppWith
     ) where
 
+import Yesod.Core
 import Yesod.Default.Config
 import Yesod.Logger (Logger, makeLogger, logString, logLazyText, flushLogger)
 import Network.Wai (Application)
 import Network.Wai.Handler.Warp (run)
 import Network.Wai.Middleware.Debug (debugHandle)
 
+#ifndef WINDOWS
+import qualified System.Posix.Signals as Signal
+import Control.Concurrent (forkIO, killThread)
+import Control.Concurrent.MVar (newEmptyMVar, putMVar, takeMVar)
+#endif
+
 -- | Run your app, taking environment and port settings from the
 --   commandline.
 --
@@ -31,6 +40,35 @@ defaultMain load withSite = do
     logger <- makeLogger
     withSite config logger $ run (appPort config)
 
+-- | Run your application continously, listening for SIGINT and exiting
+--   when recieved
+--
+--   > withYourSite :: AppConfig DefaultEnv -> Logger -> (Application -> IO a) -> IO ()
+--   > withYourSite conf logger f = do
+--   >     Settings.withConnectionPool conf $ \p -> do
+--   >         runConnectionPool (runMigration yourMigration) p
+--   >         defaultRunner f $ YourSite conf logger p
+--
+--   TODO: ifdef WINDOWS
+--
+defaultRunner :: (YesodDispatch y y, Yesod y)
+              => (Application -> IO a)
+              -> y -- ^ your foundation type
+              -> IO ()
+defaultRunner f h =
+#ifdef WINDOWS
+    toWaiApp h >>= f >> return ()
+#else
+    do
+        tid <- forkIO $ toWaiApp h >>= f >> return ()
+        flag <- newEmptyMVar
+        _ <- Signal.installHandler Signal.sigINT (Signal.CatchOnce $ do
+            putStrLn "Caught an interrupt"
+            killThread tid
+            putMVar flag ()) Nothing
+        takeMVar flag
+#endif
+
 -- | Run your development app using the provided @'DefaultEnv'@ type
 --
 --   > withDevelAppPort :: Dynamic
diff --git a/yesod-default/yesod-default.cabal b/yesod-default/yesod-default.cabal
index 8eea3d63..6e346480 100644
--- a/yesod-default/yesod-default.cabal
+++ b/yesod-default/yesod-default.cabal
@@ -14,6 +14,9 @@ description:     Convenient wrappers for your the configuration and
                  execution of your yesod application
 
 library
+    if os(windows)
+        cpp-options: -DWINDOWS
+
     build-depends:   base              >= 4   && < 5
                    , yesod-core        >= 0.9 && < 0.10
                    , cmdargs           >= 0.8 && < 0.9
@@ -25,6 +28,9 @@ library
                    , text              >= 0.9 && < 1.0
                    , directory         >= 1.0 && < 1.2
 
+    if !os(windows)
+         build-depends: unix
+
     exposed-modules: Yesod.Default.Config
                    , Yesod.Default.Main
                    , Yesod.Default.Util

From 6a949e7f292b02d6f4e26372a77694594ffa9414 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Fri, 23 Sep 2011 07:02:31 +0300
Subject: [PATCH 053/189] Remove YesodAuthEmail from scaffolding

---
 yesod/scaffold/Foundation.hs.cg | 88 +++------------------------------
 1 file changed, 7 insertions(+), 81 deletions(-)

diff --git a/yesod/scaffold/Foundation.hs.cg b/yesod/scaffold/Foundation.hs.cg
index d0740589..6206099f 100644
--- a/yesod/scaffold/Foundation.hs.cg
+++ b/yesod/scaffold/Foundation.hs.cg
@@ -22,7 +22,6 @@ import Yesod.Static (Static, base64md5, StaticRoute(..))
 import Settings.StaticFiles
 import Yesod.Auth
 import Yesod.Auth.OpenId
-import Yesod.Auth.Email
 import Yesod.Default.Config
 import Yesod.Default.Util (addStaticContentExternal)
 import Yesod.Logger (Logger, logLazyText)
@@ -31,15 +30,12 @@ import qualified Data.ByteString.Lazy as L
 import Database.Persist.~importGenericDB~
 import Settings (hamletFile, cassiusFile, luciusFile, juliusFile, widgetFile)
 import Model
-import Data.Maybe (isJust)
-import Control.Monad (join)
-import Network.Mail.Mime
 import qualified Data.Text.Lazy.Encoding
 import Text.Jasmine (minifym)
 import Web.ClientSession (getKey)
-import Text.Blaze.Renderer.Utf8 (renderHtml)
-import Text.Hamlet (shamlet)
-import Text.Shakespeare.Text (stext)
+#if PRODUCTION
+import Network.Mail.Mime (sendmail)
+#endif
 
 -- | The site argument for your application. This can be a good place to
 -- keep settings and values requiring initialization before your application
@@ -131,9 +127,8 @@ instance YesodAuth ~sitearg~ where
             Nothing -> do
                 fmap Just $ insert $ User (credsIdent creds) Nothing
 
-    authPlugins = [ authOpenId
-                  , authEmail
-                  ]
+    -- You can add other plugins like BrowserID, email or OAuth here
+    authPlugins = [authOpenId]
 
 -- Sends off your mail. Requires sendmail in production!
 deliver :: ~sitearg~ -> L.ByteString -> IO ()
@@ -143,76 +138,7 @@ deliver _ = sendmail
 deliver y = logLazyText (getLogger y) . Data.Text.Lazy.Encoding.decodeUtf8
 #endif
 
-instance YesodAuthEmail ~sitearg~ where
-    type AuthEmailId ~sitearg~ = EmailId
-
-    addUnverified email verkey =
-        runDB $ insert $ Email email Nothing $ Just verkey
-
-    sendVerifyEmail email _ verurl = do
-        y <- getYesod
-        liftIO $ deliver y =<< renderMail' Mail
-            {
-              mailHeaders =
-                [ ("From", "noreply")
-                , ("To", email)
-                , ("Subject", "Verify your email address")
-                ]
-            , mailParts = [[textPart, htmlPart]]
-            }
-      where
-        textPart = Part
-            { partType = "text/plain; charset=utf-8"
-            , partEncoding = None
-            , partFilename = Nothing
-            , partContent = Data.Text.Lazy.Encoding.encodeUtf8 [stext|
-Please confirm your email address by clicking on the link below.
-
-\#{verurl}
-
-Thank you
-|]
-            , partHeaders = []
-            }
-        htmlPart = Part
-            { partType = "text/html; charset=utf-8"
-            , partEncoding = None
-            , partFilename = Nothing
-            , partContent = renderHtml [~qq~shamlet|
-<p>Please confirm your email address by clicking on the link below.
-<p>
-    <a href=#{verurl}>#{verurl}
-<p>Thank you
-|]
-            , partHeaders = []
-            }
-    getVerifyKey = runDB . fmap (join . fmap emailVerkey) . get
-    setVerifyKey eid key = runDB $ update eid [EmailVerkey =. Just key]
-    verifyAccount eid = runDB $ do
-        me <- get eid
-        case me of
-            Nothing -> return Nothing
-            Just e -> do
-                let email = emailEmail e
-                case emailUser e of
-                    Just uid -> return $ Just uid
-                    Nothing -> do
-                        uid <- insert $ User email Nothing
-                        update eid [EmailUser =. Just uid, EmailVerkey =. Nothing]
-                        return $ Just uid
-    getPassword = runDB . fmap (join . fmap userPassword) . get
-    setPassword uid pass = runDB $ update uid [UserPassword =. Just pass]
-    getEmailCreds email = runDB $ do
-        me <- getBy $ UniqueEmail email
-        case me of
-            Nothing -> return Nothing
-            Just (eid, e) -> return $ Just EmailCreds
-                { emailCredsId = eid
-                , emailCredsAuthId = emailUser e
-                , emailCredsStatus = isJust $ emailUser e
-                , emailCredsVerkey = emailVerkey e
-                }
-    getEmail = runDB . fmap (fmap emailEmail) . get
-
+-- This instance is required to use forms. You can modify renderMessage to
+-- achieve customized and internationalized form validation messages.
 instance RenderMessage ~sitearg~ FormMessage where
     renderMessage _ _ = defaultFormMessage

From 40143c6391c89142dd8c601dedb11e9dbc1bcfae Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Fri, 23 Sep 2011 08:13:30 +0300
Subject: [PATCH 054/189] widgetFile* provided by yesod-default

---
 yesod-default/Yesod/Default/Util.hs           | 35 ++++++++
 yesod-default/yesod-default.cabal             | 23 ++---
 yesod/Scaffolding/Scaffolder.hs               |  2 +
 yesod/scaffold/Foundation.hs.cg               | 17 ++--
 yesod/scaffold/Handler/Root.hs.cg             |  2 +-
 yesod/scaffold/Settings.hs.cg                 | 83 ++-----------------
 .../hamlet/default-layout-wrapper.hamlet.cg   |  8 ++
 .../scaffold/hamlet/default-layout.hamlet.cg  | 12 +--
 yesod/scaffold/tiny/Foundation.hs.cg          | 17 ++--
 yesod/scaffold/tiny/Settings.hs.cg            | 83 ++-----------------
 yesod/yesod.cabal                             |  1 +
 11 files changed, 100 insertions(+), 183 deletions(-)
 create mode 100644 yesod/scaffold/hamlet/default-layout-wrapper.hamlet.cg

diff --git a/yesod-default/Yesod/Default/Util.hs b/yesod-default/Yesod/Default/Util.hs
index ba36cb14..e715f002 100644
--- a/yesod-default/Yesod/Default/Util.hs
+++ b/yesod-default/Yesod/Default/Util.hs
@@ -1,7 +1,11 @@
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE TemplateHaskell #-}
 -- | Various utilities used in the scaffolded site.
 module Yesod.Default.Util
     ( addStaticContentExternal
+    , globFile
+    , widgetFileProduction
+    , widgetFileDebug
     ) where
 
 import Control.Monad.IO.Class (liftIO)
@@ -10,6 +14,11 @@ import Data.Text (Text, pack, unpack)
 import Yesod.Core -- purposely using complete import so that Haddock will see addStaticContent
 import Control.Monad (unless)
 import System.Directory (doesFileExist, createDirectoryIfMissing)
+import Language.Haskell.TH.Syntax
+import Text.Lucius (luciusFile, luciusFileDebug)
+import Text.Julius (juliusFile, juliusFileDebug)
+import Text.Cassius (cassiusFile, cassiusFileDebug)
+import Data.Monoid (mempty)
 
 -- | An implementation of 'addStaticContent' which stores the contents in an
 -- external file. Files are created in the given static folder with names based
@@ -41,3 +50,29 @@ addStaticContentExternal minify hash staticDir toRoute ext' _ content = do
     content'
         | ext' == "js" = either (const content) id $ minify content
         | otherwise = content
+
+-- | expects a root folder for each type, e.g: hamlet/ lucius/ julius/
+globFile :: String -> String -> FilePath
+globFile kind x = kind ++ "/" ++ x ++ "." ++ kind
+
+widgetFileProduction :: FilePath -> Q Exp
+widgetFileProduction x = do
+    let h = whenExists x "hamlet"  whamletFile
+    let c = whenExists x "cassius" cassiusFile
+    let j = whenExists x "julius"  juliusFile
+    let l = whenExists x "lucius"  luciusFile
+    [|$h >> addCassius $c >> addJulius $j >> addLucius $l|]
+
+widgetFileDebug :: FilePath -> Q Exp
+widgetFileDebug x = do
+    let h = whenExists x "hamlet"  whamletFile
+    let c = whenExists x "cassius" cassiusFileDebug
+    let j = whenExists x "julius"  juliusFileDebug
+    let l = whenExists x "lucius"  luciusFileDebug
+    [|$h >> addCassius $c >> addJulius $j >> addLucius $l|]
+
+whenExists :: String -> String -> (FilePath -> Q Exp) -> Q Exp
+whenExists x glob f = do
+    let fn = globFile glob x
+    e <- qRunIO $ doesFileExist fn
+    if e then f fn else [|mempty|]
diff --git a/yesod-default/yesod-default.cabal b/yesod-default/yesod-default.cabal
index 8eea3d63..96be62c0 100644
--- a/yesod-default/yesod-default.cabal
+++ b/yesod-default/yesod-default.cabal
@@ -14,16 +14,19 @@ description:     Convenient wrappers for your the configuration and
                  execution of your yesod application
 
 library
-    build-depends:   base              >= 4   && < 5
-                   , yesod-core        >= 0.9 && < 0.10
-                   , cmdargs           >= 0.8 && < 0.9
-                   , warp              >= 0.4 && < 0.5
-                   , wai               >= 0.4 && < 0.5
-                   , wai-extra         >= 0.4 && < 0.5
-                   , bytestring        >= 0.9 && < 0.10
-                   , transformers      >= 0.2 && < 0.3
-                   , text              >= 0.9 && < 1.0
-                   , directory         >= 1.0 && < 1.2
+    build-depends:   base              >= 4        && < 5
+                   , yesod-core        >= 0.9      && < 0.10
+                   , cmdargs           >= 0.8      && < 0.9
+                   , warp              >= 0.4      && < 0.5
+                   , wai               >= 0.4      && < 0.5
+                   , wai-extra         >= 0.4      && < 0.5
+                   , bytestring        >= 0.9      && < 0.10
+                   , transformers      >= 0.2      && < 0.3
+                   , text              >= 0.9      && < 1.0
+                   , directory         >= 1.0      && < 1.2
+                   , shakespeare-css   >= 0.10     && < 0.11
+                   , shakespeare-js    >= 0.10     && < 0.11
+                   , template-haskell
 
     exposed-modules: Yesod.Default.Config
                    , Yesod.Default.Main
diff --git a/yesod/Scaffolding/Scaffolder.hs b/yesod/Scaffolding/Scaffolder.hs
index 5cd5569e..e45b48fb 100644
--- a/yesod/Scaffolding/Scaffolder.hs
+++ b/yesod/Scaffolding/Scaffolder.hs
@@ -148,6 +148,8 @@ scaffold = do
         $(codegen "lucius/default-layout.lucius")
     writeFile' "hamlet/default-layout.hamlet"
         $(codegen "hamlet/default-layout.hamlet")
+    writeFile' "hamlet/default-layout-wrapper.hamlet"
+        $(codegen "hamlet/default-layout-wrapper.hamlet")
     writeFile' "hamlet/boilerplate-layout.hamlet"
         $(codegen "hamlet/boilerplate-layout.hamlet")
     writeFile' "lucius/normalize.lucius"
diff --git a/yesod/scaffold/Foundation.hs.cg b/yesod/scaffold/Foundation.hs.cg
index 6206099f..86c7a425 100644
--- a/yesod/scaffold/Foundation.hs.cg
+++ b/yesod/scaffold/Foundation.hs.cg
@@ -28,11 +28,12 @@ import Yesod.Logger (Logger, logLazyText)
 import qualified Settings
 import qualified Data.ByteString.Lazy as L
 import Database.Persist.~importGenericDB~
-import Settings (hamletFile, cassiusFile, luciusFile, juliusFile, widgetFile)
+import Settings (widgetFile)
 import Model
 import qualified Data.Text.Lazy.Encoding
 import Text.Jasmine (minifym)
 import Web.ClientSession (getKey)
+import Text.Hamlet (hamletFile)
 #if PRODUCTION
 import Network.Mail.Mime (sendmail)
 #endif
@@ -82,11 +83,17 @@ instance Yesod ~sitearg~ where
 
     defaultLayout widget = do
         mmsg <- getMessage
+
+        -- We break up the default layout into two components:
+        -- default-layout is the contents of the body tag, and
+        -- default-layout-wrapper is the entire page. Since the final
+        -- value passed to hamletToRepHtml cannot be a widget, this allows
+        -- you to use normal widget features in default-layout.
+
         pc <- widgetToPageContent $ do
-            widget
-            toWidget $(luciusFile "normalize")
-            toWidget $(luciusFile "default-layout")
-        hamletToRepHtml $(hamletFile "default-layout")
+            $(widgetFile "normalize")
+            $(widgetFile "default-layout")
+        hamletToRepHtml $(hamletFile "hamlet/default-layout-wrapper.hamlet")
 
     -- This is done to provide an optimization for serving static files from
     -- a separate domain. Please see the staticRoot setting in Settings.hs
diff --git a/yesod/scaffold/Handler/Root.hs.cg b/yesod/scaffold/Handler/Root.hs.cg
index e485b7cd..4ee59109 100644
--- a/yesod/scaffold/Handler/Root.hs.cg
+++ b/yesod/scaffold/Handler/Root.hs.cg
@@ -15,4 +15,4 @@ getRootR = do
     defaultLayout $ do
         h2id <- lift newIdent
         setTitle "~project~ homepage"
-        addWidget $(widgetFile "homepage")
+        $(widgetFile "homepage")
diff --git a/yesod/scaffold/Settings.hs.cg b/yesod/scaffold/Settings.hs.cg
index c60fb3f6..5a7a4f70 100644
--- a/yesod/scaffold/Settings.hs.cg
+++ b/yesod/scaffold/Settings.hs.cg
@@ -7,12 +7,7 @@
 -- by overriding methods in the Yesod typeclass. That instance is
 -- declared in the Foundation.hs file.
 module Settings
-    ( hamletFile
-    , cassiusFile
-    , juliusFile
-    , luciusFile
-    , textFile
-    , widgetFile
+    ( widgetFile
     , ConnectionPool
     , withConnectionPool
     , runConnectionPool
@@ -20,21 +15,14 @@ module Settings
     , staticDir
     ) where
 
-import qualified Text.Hamlet as S
-import qualified Text.Cassius as S
-import qualified Text.Julius as S
-import qualified Text.Lucius as S
-import qualified Text.Shakespeare.Text as S
 import Text.Shakespeare.Text (st)
 import Language.Haskell.TH.Syntax
 import Database.Persist.~importPersist~
-import Yesod (liftIO, MonadControlIO, addWidget, addCassius, addJulius, addLucius, whamletFile)
+import Yesod (liftIO, MonadControlIO)
 import Yesod.Default.Config
-import Data.Monoid (mempty)
-import System.Directory (doesFileExist)
+import qualified Yesod.Default.Util
 import Data.Text (Text)
 
-
 -- Static setting below. Changing these requires a recompile
 
 -- | The location of static files on your system. This is a file system
@@ -68,66 +56,9 @@ staticRoot conf = [st|#{appRoot conf}/static|]
 -- them yourself.
 ~withConnectionPool~
 
--- The following functions are used for calling HTML, CSS,
--- Javascript, and plain text templates from your Haskell code. During development,
--- the "Debug" versions of these functions are used so that changes to
--- the templates are immediately reflected in an already running
--- application. When making a production compile, the non-debug version
--- is used for increased performance.
---
--- You can see an example of how to call these functions in Handler/Root.hs
---
--- Note: due to polymorphic Hamlet templates, hamletFileDebug is no longer
--- used; to get the same auto-loading effect, it is recommended that you
--- use the devel server.
-
--- | expects a root folder for each type, e.g: hamlet/ lucius/ julius/
-globFile :: String -> String -> FilePath
-globFile kind x = kind ++ "/" ++ x ++ "." ++ kind
-
-hamletFile :: FilePath -> Q Exp
-hamletFile = S.hamletFile . globFile "hamlet"
-
-cassiusFile :: FilePath -> Q Exp
-cassiusFile = 
-#ifdef PRODUCTION
-  S.cassiusFile . globFile "cassius"
+widgetFile :: String -> Q Exp
+#if PRODUCTION
+widgetFile = Yesod.Default.Util.widgetFileProduction
 #else
-  S.cassiusFileDebug . globFile "cassius"
+widgetFile = Yesod.Default.Util.widgetFileDebug
 #endif
-
-luciusFile :: FilePath -> Q Exp
-luciusFile = 
-#ifdef PRODUCTION
-  S.luciusFile . globFile "lucius"
-#else
-  S.luciusFileDebug . globFile "lucius"
-#endif
-
-juliusFile :: FilePath -> Q Exp
-juliusFile =
-#ifdef PRODUCTION
-  S.juliusFile . globFile "julius"
-#else
-  S.juliusFileDebug . globFile "julius"
-#endif
-
-textFile :: FilePath -> Q Exp
-textFile =
-#ifdef PRODUCTION
-  S.textFile . globFile "text"
-#else
-  S.textFileDebug . globFile "text"
-#endif
-
-widgetFile :: FilePath -> Q Exp
-widgetFile x = do
-    let h = whenExists (globFile "hamlet")  (whamletFile . globFile "hamlet")
-    let c = whenExists (globFile "cassius") cassiusFile
-    let j = whenExists (globFile "julius")  juliusFile
-    let l = whenExists (globFile "lucius")  luciusFile
-    [|addWidget $h >> addCassius $c >> addJulius $j >> addLucius $l|]
-  where
-    whenExists tofn f = do
-        e <- qRunIO $ doesFileExist $ tofn x
-        if e then f x else [|mempty|]
diff --git a/yesod/scaffold/hamlet/default-layout-wrapper.hamlet.cg b/yesod/scaffold/hamlet/default-layout-wrapper.hamlet.cg
new file mode 100644
index 00000000..c411272c
--- /dev/null
+++ b/yesod/scaffold/hamlet/default-layout-wrapper.hamlet.cg
@@ -0,0 +1,8 @@
+!!!
+<html>
+    <head
+        <title>#{pageTitle pc}
+        ^{pageHead pc}
+    <body
+        ^{pageBody pc}
+
diff --git a/yesod/scaffold/hamlet/default-layout.hamlet.cg b/yesod/scaffold/hamlet/default-layout.hamlet.cg
index f31acb19..94d68dd5 100644
--- a/yesod/scaffold/hamlet/default-layout.hamlet.cg
+++ b/yesod/scaffold/hamlet/default-layout.hamlet.cg
@@ -1,10 +1,4 @@
-!!!
-<html
-    <head
-        <title>#{pageTitle pc}
-        ^{pageHead pc}
-    <body
-        $maybe msg <- mmsg
-            <div #message>#{msg}
-        ^{pageBody pc}
+$maybe msg <- mmsg
+    <div #message>#{msg}
+^{widget}
 
diff --git a/yesod/scaffold/tiny/Foundation.hs.cg b/yesod/scaffold/tiny/Foundation.hs.cg
index ca02521b..06038352 100644
--- a/yesod/scaffold/tiny/Foundation.hs.cg
+++ b/yesod/scaffold/tiny/Foundation.hs.cg
@@ -21,10 +21,11 @@ import Yesod.Static (Static, base64md5, StaticRoute(..))
 import Settings.StaticFiles
 import Yesod.Logger (Logger, logLazyText)
 import qualified Settings
-import Settings (hamletFile, cassiusFile, luciusFile, juliusFile, widgetFile)
+import Settings (widgetFile)
 import Control.Monad.Trans.Class (lift)
 import Control.Monad.IO.Class (liftIO)
 import Web.ClientSession (getKey)
+import Text.Hamlet (hamletFile)
 
 -- | The site argument for your application. This can be a good place to
 -- keep settings and values requiring initialization before your application
@@ -70,11 +71,17 @@ instance Yesod ~sitearg~ where
 
     defaultLayout widget = do
         mmsg <- getMessage
+
+        -- We break up the default layout into two components:
+        -- default-layout is the contents of the body tag, and
+        -- default-layout-wrapper is the entire page. Since the final
+        -- value passed to hamletToRepHtml cannot be a widget, this allows
+        -- you to use normal widget features in default-layout.
+
         pc <- widgetToPageContent $ do
-            widget
-            toWidget $(luciusFile "normalize")
-            toWidget $(luciusFile "default-layout")
-        hamletToRepHtml $(hamletFile "default-layout")
+            $(widgetFile "normalize")
+            $(widgetFile "default-layout")
+        hamletToRepHtml $(hamletFile "hamlet/default-layout-wrapper.hamlet")
 
     -- This is done to provide an optimization for serving static files from
     -- a separate domain. Please see the staticroot setting in Settings.hs
diff --git a/yesod/scaffold/tiny/Settings.hs.cg b/yesod/scaffold/tiny/Settings.hs.cg
index 605bc709..fa5aa732 100644
--- a/yesod/scaffold/tiny/Settings.hs.cg
+++ b/yesod/scaffold/tiny/Settings.hs.cg
@@ -7,26 +7,15 @@
 -- by overriding methods in the Yesod typeclass. That instance is
 -- declared in the ~project~.hs file.
 module Settings
-    ( hamletFile
-    , cassiusFile
-    , juliusFile
-    , luciusFile
-    , widgetFile
+    ( widgetFile
     , staticRoot
     , staticDir
     ) where
 
-import qualified Text.Hamlet as S
-import qualified Text.Cassius as S
-import qualified Text.Julius as S
-import qualified Text.Lucius as S
-import qualified Text.Shakespeare.Text as S
 import Text.Shakespeare.Text (st)
 import Language.Haskell.TH.Syntax
-import Yesod.Widget (addWidget, addCassius, addJulius, addLucius, whamletFile)
 import Yesod.Default.Config
-import Data.Monoid (mempty)
-import System.Directory (doesFileExist)
+import qualified Yesod.Default.Util
 import Data.Text (Text)
 
 -- | The location of static files on your system. This is a file system
@@ -50,69 +39,9 @@ staticDir = "static"
 staticRoot :: AppConfig DefaultEnv ->  Text
 staticRoot conf = [st|#{appRoot conf}/static|]
 
--- The rest of this file contains settings which rarely need changing by a
--- user.
-
--- The following functions are used for calling HTML, CSS,
--- Javascript, and plain text templates from your Haskell code. During development,
--- the "Debug" versions of these functions are used so that changes to
--- the templates are immediately reflected in an already running
--- application. When making a production compile, the non-debug version
--- is used for increased performance.
---
--- You can see an example of how to call these functions in Handler/Root.hs
---
--- Note: due to polymorphic Hamlet templates, hamletFileDebug is no longer
--- used; to get the same auto-loading effect, it is recommended that you
--- use the devel server.
-
--- | expects a root folder for each type, e.g: hamlet/ lucius/ julius/
-globFile :: String -> String -> FilePath
-globFile kind x = kind ++ "/" ++ x ++ "." ++ kind
-
-hamletFile :: FilePath -> Q Exp
-hamletFile = S.hamletFile . globFile "hamlet"
-
-cassiusFile :: FilePath -> Q Exp
-cassiusFile = 
-#ifdef PRODUCTION
-  S.cassiusFile . globFile "cassius"
+widgetFile :: String -> Q Exp
+#if PRODUCTION
+widgetFile = Yesod.Default.Util.widgetFileProduction
 #else
-  S.cassiusFileDebug . globFile "cassius"
+widgetFile = Yesod.Default.Util.widgetFileDebug
 #endif
-
-luciusFile :: FilePath -> Q Exp
-luciusFile = 
-#ifdef PRODUCTION
-  S.luciusFile . globFile "lucius"
-#else
-  S.luciusFileDebug . globFile "lucius"
-#endif
-
-juliusFile :: FilePath -> Q Exp
-juliusFile =
-#ifdef PRODUCTION
-  S.juliusFile . globFile "julius"
-#else
-  S.juliusFileDebug . globFile "julius"
-#endif
-
-textFile :: FilePath -> Q Exp
-textFile =
-#ifdef PRODUCTION
-  S.textFile . globFile "text"
-#else
-  S.textFileDebug . globFile "text"
-#endif
-
-widgetFile :: FilePath -> Q Exp
-widgetFile x = do
-    let h = whenExists (globFile "hamlet")  (whamletFile . globFile "hamlet")
-    let c = whenExists (globFile "cassius") cassiusFile
-    let j = whenExists (globFile "julius")  juliusFile
-    let l = whenExists (globFile "lucius")  luciusFile
-    [|addWidget $h >> addCassius $c >> addJulius $j >> addLucius $l|]
-  where
-    whenExists tofn f = do
-        e <- qRunIO $ doesFileExist $ tofn x
-        if e then f x else [|mempty|]
diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index ef65d087..ed0edb1b 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -37,6 +37,7 @@ extra-source-files:
   scaffold/julius/homepage.julius.cg
   scaffold/hamlet/homepage.hamlet.cg
   scaffold/hamlet/default-layout.hamlet.cg
+  scaffold/hamlet/default-layout-wrapper.hamlet.cg
   scaffold/hamlet/boilerplate-layout.hamlet.cg
   scaffold/deploy/Procfile.cg
   scaffold/main.hs.cg

From 0f3f6bd6cb1233c0e585779f38ec13f8ab32d65b Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Fri, 23 Sep 2011 08:31:47 +0300
Subject: [PATCH 055/189] runWaiApp

---
 yesod-default/Yesod/Default/Util.hs       | 27 ++++++++++++++++++++++
 yesod-default/yesod-default.cabal         |  5 ++++
 yesod/scaffold/Application.hs.cg          | 28 ++++++++---------------
 yesod/scaffold/Settings/StaticFiles.hs.cg | 11 +--------
 yesod/scaffold/tiny/Application.hs.cg     |  6 +++--
 5 files changed, 46 insertions(+), 31 deletions(-)

diff --git a/yesod-default/Yesod/Default/Util.hs b/yesod-default/Yesod/Default/Util.hs
index e715f002..c344b5c6 100644
--- a/yesod-default/Yesod/Default/Util.hs
+++ b/yesod-default/Yesod/Default/Util.hs
@@ -1,11 +1,13 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE CPP #-}
 -- | Various utilities used in the scaffolded site.
 module Yesod.Default.Util
     ( addStaticContentExternal
     , globFile
     , widgetFileProduction
     , widgetFileDebug
+    , runWaiApp
     ) where
 
 import Control.Monad.IO.Class (liftIO)
@@ -19,6 +21,13 @@ import Text.Lucius (luciusFile, luciusFileDebug)
 import Text.Julius (juliusFile, juliusFileDebug)
 import Text.Cassius (cassiusFile, cassiusFileDebug)
 import Data.Monoid (mempty)
+import Network.Wai (Application)
+
+#ifndef WINDOWS
+import qualified System.Posix.Signals as Signal
+import Control.Concurrent (forkIO, killThread)
+import Control.Concurrent.MVar (newEmptyMVar, putMVar, takeMVar)
+#endif
 
 -- | An implementation of 'addStaticContent' which stores the contents in an
 -- external file. Files are created in the given static folder with names based
@@ -76,3 +85,21 @@ whenExists x glob f = do
     let fn = globFile glob x
     e <- qRunIO $ doesFileExist fn
     if e then f fn else [|mempty|]
+
+-- | A signal-aware runner for WAI applications. On Windows, this doesn't do
+-- anything special. On POSIX systems, this installs a signal handler for INT
+-- and automatically kills the application when the signal is received. This
+-- allows you to add cleanup code (like log flushing) after an application
+-- exits.
+runWaiApp :: (Application -> IO ()) -> Application -> IO ()
+#ifdef WINDOWS
+runWaiApp f app = f app
+#else
+runWaiApp f app = do
+    tid <- forkIO $ f app >> return ()
+    flag <- newEmptyMVar
+    _ <- Signal.installHandler Signal.sigINT (Signal.CatchOnce $ do
+        killThread tid
+        putMVar flag ()) Nothing
+    takeMVar flag
+#endif
diff --git a/yesod-default/yesod-default.cabal b/yesod-default/yesod-default.cabal
index 96be62c0..aca6a020 100644
--- a/yesod-default/yesod-default.cabal
+++ b/yesod-default/yesod-default.cabal
@@ -28,6 +28,11 @@ library
                    , shakespeare-js    >= 0.10     && < 0.11
                    , template-haskell
 
+    if os(windows)
+        cpp-options: -DWINDOWS
+    else
+        build-depends: unix
+
     exposed-modules: Yesod.Default.Config
                    , Yesod.Default.Main
                    , Yesod.Default.Util
diff --git a/yesod/scaffold/Application.hs.cg b/yesod/scaffold/Application.hs.cg
index 6c9a5c65..56735e75 100644
--- a/yesod/scaffold/Application.hs.cg
+++ b/yesod/scaffold/Application.hs.cg
@@ -10,21 +10,16 @@ module Application
 
 import Foundation
 import Settings
-import Settings.StaticFiles (static)
+import Yesod.Static
 import Yesod.Auth
 import Yesod.Default.Config
 import Yesod.Default.Main
+import Yesod.Default.Util (runWaiApp)
 import Yesod.Logger (Logger)
 import Database.Persist.~importGenericDB~
 import Data.ByteString (ByteString)
 import Data.Dynamic (Dynamic, toDyn)
 
-#ifndef WINDOWS
-import qualified System.Posix.Signals as Signal
-import Control.Concurrent (forkIO, killThread)
-import Control.Concurrent.MVar (newEmptyMVar, putMVar, takeMVar)
-#endif
-
 -- Import all relevant handler modules here.
 import Handler.Root
 
@@ -45,22 +40,17 @@ getRobotsR = return $ RepPlain $ toContent ("User-agent: *" :: ByteString)
 -- performs initialization and creates a WAI application. This is also the
 -- place to put your migrate statements to have automatic database
 -- migrations handled by Yesod.
-with~sitearg~ :: AppConfig DefaultEnv -> Logger -> (Application -> IO a) -> IO ()
+with~sitearg~ :: AppConfig DefaultEnv -> Logger -> (Application -> IO ()) -> IO ()
 with~sitearg~ conf logger f = do
+#ifdef PRODUCTION
     s <- static Settings.staticDir
+#else
+    s <- staticDevel Settings.staticDir
+#endif
     Settings.withConnectionPool conf $ \p -> do~runMigration~
         let h = ~sitearg~ conf logger s p
-#ifdef WINDOWS
-        toWaiApp h >>= f >> return ()
-#else
-        tid <- forkIO $ toWaiApp h >>= f >> return ()
-        flag <- newEmptyMVar
-        _ <- Signal.installHandler Signal.sigINT (Signal.CatchOnce $ do
-            putStrLn "Caught an interrupt"
-            killThread tid
-            putMVar flag ()) Nothing
-        takeMVar flag
-#endif
+        app <- toWaiApp h
+        runWaiApp f app
 
 -- for yesod devel
 withDevelAppPort :: Dynamic
diff --git a/yesod/scaffold/Settings/StaticFiles.hs.cg b/yesod/scaffold/Settings/StaticFiles.hs.cg
index b59d0ca0..1be2b4ba 100644
--- a/yesod/scaffold/Settings/StaticFiles.hs.cg
+++ b/yesod/scaffold/Settings/StaticFiles.hs.cg
@@ -1,16 +1,7 @@
 {-# LANGUAGE CPP, QuasiQuotes, TemplateHaskell, TypeFamilies #-}
 module Settings.StaticFiles where
 
-import Yesod.Static
-import qualified Yesod.Static as Static
-
-static :: FilePath -> IO Static
-#ifdef PRODUCTION
-static = Static.static
-#else
-static = Static.staticDevel
-#endif
-
+import Yesod.Static (staticFiles)
 
 -- | This generates easy references to files in the static directory at compile time.
 --   The upside to this is that you have compile-time verification that referenced files
diff --git a/yesod/scaffold/tiny/Application.hs.cg b/yesod/scaffold/tiny/Application.hs.cg
index 0bd1d218..a13991fc 100644
--- a/yesod/scaffold/tiny/Application.hs.cg
+++ b/yesod/scaffold/tiny/Application.hs.cg
@@ -13,6 +13,7 @@ import Settings
 import Yesod.Static
 import Yesod.Default.Config
 import Yesod.Default.Main (defaultDevelApp)
+import Yesod.Default.Util (runWaiApp)
 import Yesod.Logger (Logger)
 import Data.ByteString (ByteString)
 import Network.Wai (Application)
@@ -38,7 +39,7 @@ getRobotsR = return $ RepPlain $ toContent ("User-agent: *" :: ByteString)
 -- performs initialization and creates a WAI application. This is also the
 -- place to put your migrate statements to have automatic database
 -- migrations handled by Yesod.
-with~sitearg~ :: AppConfig DefaultEnv -> Logger -> (Application -> IO a) -> IO a
+with~sitearg~ :: AppConfig DefaultEnv -> Logger -> (Application -> IO ()) -> IO ()
 with~sitearg~ conf logger f = do
 #ifdef PRODUCTION
     s <- static Settings.staticDir
@@ -46,7 +47,8 @@ with~sitearg~ conf logger f = do
     s <- staticDevel Settings.staticDir
 #endif
     let h = ~sitearg~ conf logger s
-    toWaiApp h >>= f
+    app <- toWaiApp h
+    runWaiApp f app
 
 -- for yesod devel
 withDevelAppPort :: Dynamic

From 1f3df69787f7c3b427b7726155d47091be8069de Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Fri, 23 Sep 2011 09:22:06 +0300
Subject: [PATCH 056/189] yepnopeJs

---
 scripts                           |  2 +-
 yesod-core/Yesod/Internal/Core.hs | 74 ++++++++++++++++++++++++++-----
 yesod-core/helloworld.hs          | 17 +++++--
 yesod-core/yesod-core.cabal       |  2 +
 4 files changed, 78 insertions(+), 17 deletions(-)

diff --git a/scripts b/scripts
index 2fc59a85..e791ced0 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 2fc59a850bdc49e01f7a5e062b813df321ce5c78
+Subproject commit e791ced0395245e30d37b5098a27bba5e818ecb7
diff --git a/yesod-core/Yesod/Internal/Core.hs b/yesod-core/Yesod/Internal/Core.hs
index 4ba14405..da038c13 100644
--- a/yesod-core/Yesod/Internal/Core.hs
+++ b/yesod-core/Yesod/Internal/Core.hs
@@ -52,7 +52,7 @@ import Control.Monad.Trans.RWS
 import Text.Hamlet
 import Text.Cassius
 import Text.Julius
-import Text.Blaze ((!), customAttribute, textTag, toValue)
+import Text.Blaze ((!), customAttribute, textTag, toValue, unsafeLazyByteString)
 import qualified Text.Blaze.Html5 as TBH
 import Data.Text.Lazy.Builder (toLazyText)
 import Data.Text.Lazy.Encoding (encodeUtf8)
@@ -75,6 +75,9 @@ import qualified Data.Text.Lazy.IO
 import qualified Data.Text.Lazy.Builder as TB
 import Language.Haskell.TH.Syntax (Loc (..), Lift (..))
 import Text.Blaze (preEscapedLazyText)
+import Data.Aeson (Value (Array, String))
+import Data.Aeson.Encode (encode)
+import qualified Data.Vector as Vector
 
 #if GHC7
 #define HAMLET hamlet
@@ -264,6 +267,11 @@ class RenderRoute (Route a) => Yesod a where
     gzipCompressFiles :: a -> Bool
     gzipCompressFiles _ = False
 
+    -- | Location of yepnope.js, if any. If one is provided, then all
+    -- Javascript files will be loaded asynchronously.
+    yepnopeJs :: a -> Maybe (Either Text (Route a))
+    yepnopeJs _ = Nothing
+
 messageLoggerHandler :: (Yesod m, MonadIO mo)
                      => Loc -> LogLevel -> Text -> GGHandler s m mo ()
 messageLoggerHandler loc level msg = do
@@ -472,18 +480,22 @@ maybeAuthorized r isWrite = do
     x <- isAuthorized r isWrite
     return $ if x == Authorized then Just r else Nothing
 
+jsToHtml :: Javascript -> Html
+jsToHtml (Javascript b) = preEscapedLazyText $ toLazyText b
+
+jelper :: JavascriptUrl url -> HtmlUrl url
+jelper = fmap jsToHtml
+
 -- | Convert a widget to a 'PageContent'.
 widgetToPageContent :: (Eq (Route master), Yesod master)
                     => GWidget sub master ()
                     -> GHandler sub master (PageContent (Route master))
 widgetToPageContent (GWidget w) = do
+    master <- getYesod
     ((), _, GWData (Body body) (Last mTitle) scripts' stylesheets' style jscript (Head head')) <- runRWST w () 0
     let title = maybe mempty unTitle mTitle
     let scripts = runUniqueList scripts'
     let stylesheets = runUniqueList stylesheets'
-    let jsToHtml (Javascript b) = preEscapedLazyText $ toLazyText b
-        jelper :: JavascriptUrl url -> HtmlUrl url
-        jelper = fmap jsToHtml
 
     render <- getUrlRenderParams
     let renderLoc x =
@@ -536,16 +548,54 @@ $forall s <- css
             <style media=#{media}>#{content}
         $nothing
             <style>#{content}
-$forall s <- scripts
-    ^{mkScriptTag s}
-$maybe j <- jscript
-    $maybe s <- jsLoc
-        <script src="#{s}">
-    $nothing
-        <script>^{jelper j}
+$maybe _ <- yepnopeJs master
+$nothing
+    $forall s <- scripts
+        ^{mkScriptTag s}
+    $maybe j <- jscript
+        $maybe s <- jsLoc
+            <script src="#{s}">
+        $nothing
+            <script>^{jelper j}
 \^{head'}
 |]
-    return $ PageContent title head'' body
+    let (mcomplete, ynscripts) = ynHelper render scripts jscript jsLoc
+    let bodyYN = [HAMLET|
+^{body}
+$maybe eyn <- yepnopeJs master
+    $maybe yn <- left eyn
+        <script src=#{yn}>
+    $maybe yn <- right eyn
+        <script src=@{yn}>
+    $maybe complete <- mcomplete
+        <script>yepnope({load:#{ynscripts},complete:function(){^{complete}}})
+    $nothing
+        <script>yepnope({load:#{ynscripts})
+|]
+    return $ PageContent title head'' bodyYN
+
+ynHelper :: (url -> [x] -> Text)
+         -> [Script (url)]
+         -> Maybe (JavascriptUrl (url))
+         -> Maybe Text
+         -> (Maybe (HtmlUrl (url)), Html)
+ynHelper render scripts jscript jsLoc =
+    (mcomplete, unsafeLazyByteString $ encode $ Array $ Vector.fromList $ map String scripts'')
+  where
+    scripts' = map goScript scripts
+    scripts'' =
+        case jsLoc of
+            Just s -> scripts' ++ [s]
+            Nothing -> scripts'
+    goScript (Script (Local url) _) = render url []
+    goScript (Script (Remote s) _) = s
+    mcomplete =
+        case jsLoc of
+            Just{} -> Nothing
+            Nothing ->
+                case jscript of
+                    Nothing -> Nothing
+                    Just j -> Just $ jelper j
 
 yesodVersion :: String
 yesodVersion = showVersion Paths_yesod_core.version
diff --git a/yesod-core/helloworld.hs b/yesod-core/helloworld.hs
index 7c974a30..34cf8c0c 100644
--- a/yesod-core/helloworld.hs
+++ b/yesod-core/helloworld.hs
@@ -5,10 +5,13 @@
 import Yesod.Core
 import Network.Wai.Handler.Warp (run)
 import Data.Text (unpack)
+import Text.Julius (julius)
 
 data Subsite = Subsite String
 
-mkYesodSub "Subsite" [] [$parseRoutes|
+type Strings = [String]
+
+mkYesodSub "Subsite" [] [parseRoutes|
 / SubRootR GET
 /multi/*Strings SubMultiR
 |]
@@ -32,9 +35,15 @@ mkYesod "HelloWorld" [$parseRoutes|
 / RootR GET
 /subsite/#String SubsiteR Subsite getSubsite
 |]
-instance Yesod HelloWorld where approot _ = ""
--- getRootR :: GHandler HelloWorld HelloWorld RepPlain -- FIXME remove type sig
+instance Yesod HelloWorld where
+    approot _ = ""
+    yepnopeJs _ = Just $ Left "http://cdnjs.cloudflare.com/ajax/libs/modernizr/2.0.6/modernizr.min.js"
+
 getRootR = do
     $(logOther "HAHAHA") "Here I am"
-    return $ RepPlain "Hello World"
+    defaultLayout $ do
+        addScriptRemote "https://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js"
+        toWidget [julius|$(function(){$("#mypara").css("color", "red")});|]
+        [whamlet|<p #mypara>Hello World|]
+
 main = toWaiApp (HelloWorld Subsite) >>= run 3000
diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index 12d2e97b..80b9c00a 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -58,6 +58,8 @@ library
                    , data-object-yaml          >= 0.3      && < 0.4
                    -- for logger. Probably logger should be a separate package
                    , strict-concurrency        >= 0.2.4    && < 0.2.5
+                   , vector                    >= 0.9      && < 0.10
+                   , aeson-native              >= 0.3.3.1  && < 0.4
 
     exposed-modules: Yesod.Content
                      Yesod.Core

From ea75eb6bfba670ba89f10281b8bf31069a5fb65c Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Fri, 23 Sep 2011 09:43:39 +0300
Subject: [PATCH 057/189] Fix yepnope typo

---
 yesod-core/Yesod/Internal/Core.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yesod-core/Yesod/Internal/Core.hs b/yesod-core/Yesod/Internal/Core.hs
index da038c13..5a38bd47 100644
--- a/yesod-core/Yesod/Internal/Core.hs
+++ b/yesod-core/Yesod/Internal/Core.hs
@@ -570,7 +570,7 @@ $maybe eyn <- yepnopeJs master
     $maybe complete <- mcomplete
         <script>yepnope({load:#{ynscripts},complete:function(){^{complete}}})
     $nothing
-        <script>yepnope({load:#{ynscripts})
+        <script>yepnope({load:#{ynscripts}})
 |]
     return $ PageContent title head'' bodyYN
 

From 0d88bbf741dfc9b3374c3fa838a83e1811f174e0 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Fri, 23 Sep 2011 09:48:42 +0300
Subject: [PATCH 058/189] modernizr.js in scaffolded site

---
 yesod/Scaffolding/Scaffolder.hs           | 4 ++++
 yesod/scaffold/Foundation.hs.cg           | 6 +++++-
 yesod/scaffold/Settings/StaticFiles.hs.cg | 2 +-
 yesod/scaffold/julius/homepage.julius.cg  | 4 +---
 yesod/scaffold/static/js/modernizr.js.cg  | 4 ++++
 yesod/scaffold/tiny/Foundation.hs.cg      | 3 +++
 yesod/yesod.cabal                         | 1 +
 7 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 yesod/scaffold/static/js/modernizr.js.cg

diff --git a/yesod/Scaffolding/Scaffolder.hs b/yesod/Scaffolding/Scaffolder.hs
index e45b48fb..5acaf438 100644
--- a/yesod/Scaffolding/Scaffolder.hs
+++ b/yesod/Scaffolding/Scaffolder.hs
@@ -161,6 +161,10 @@ scaffold = do
     unless isTiny $ writeFile' "config/models" $(codegen "config/models")
     writeFile' "messages/en.msg" $(codegen "messages/en.msg")
 
+    S.writeFile (dir ++ "/static/js/modernizr.js")
+        $(runIO (S.readFile "scaffold/static/js/modernizr.js.cg") >>= \bs ->
+            [|S.pack $(return $ LitE $ StringL $ S.unpack bs)|])
+
     S.writeFile (dir ++ "/config/favicon.ico")
         $(runIO (S.readFile "scaffold/config/favicon.ico.cg") >>= \bs -> do
             pack <- [|S.pack|]
diff --git a/yesod/scaffold/Foundation.hs.cg b/yesod/scaffold/Foundation.hs.cg
index 86c7a425..c8814801 100644
--- a/yesod/scaffold/Foundation.hs.cg
+++ b/yesod/scaffold/Foundation.hs.cg
@@ -30,12 +30,13 @@ import qualified Data.ByteString.Lazy as L
 import Database.Persist.~importGenericDB~
 import Settings (widgetFile)
 import Model
-import qualified Data.Text.Lazy.Encoding
 import Text.Jasmine (minifym)
 import Web.ClientSession (getKey)
 import Text.Hamlet (hamletFile)
 #if PRODUCTION
 import Network.Mail.Mime (sendmail)
+#else
+import qualified Data.Text.Lazy.Encoding
 #endif
 
 -- | The site argument for your application. This can be a good place to
@@ -113,6 +114,9 @@ instance Yesod ~sitearg~ where
     -- users receiving stale content.
     addStaticContent = addStaticContentExternal minifym base64md5 Settings.staticDir (StaticR . flip StaticRoute [])
 
+    -- Enable Javascript async loading
+    yepnopeJs _ = Just $ Right $ StaticR js_modernizr_js
+
 -- How to run database actions.
 instance YesodPersist ~sitearg~ where
     type YesodPersistBackend ~sitearg~ = ~dbMonad~
diff --git a/yesod/scaffold/Settings/StaticFiles.hs.cg b/yesod/scaffold/Settings/StaticFiles.hs.cg
index 1be2b4ba..5d9f51f3 100644
--- a/yesod/scaffold/Settings/StaticFiles.hs.cg
+++ b/yesod/scaffold/Settings/StaticFiles.hs.cg
@@ -1,7 +1,7 @@
 {-# LANGUAGE CPP, QuasiQuotes, TemplateHaskell, TypeFamilies #-}
 module Settings.StaticFiles where
 
-import Yesod.Static (staticFiles)
+import Yesod.Static (staticFiles, StaticRoute (StaticRoute))
 
 -- | This generates easy references to files in the static directory at compile time.
 --   The upside to this is that you have compile-time verification that referenced files
diff --git a/yesod/scaffold/julius/homepage.julius.cg b/yesod/scaffold/julius/homepage.julius.cg
index 9b38774d..5903b6ff 100644
--- a/yesod/scaffold/julius/homepage.julius.cg
+++ b/yesod/scaffold/julius/homepage.julius.cg
@@ -1,4 +1,2 @@
-window.onload = function(){
-    document.getElementById("#{h2id}").innerHTML = "<i>Added from JavaScript.</i>";
-}
+document.getElementById("#{h2id}").innerHTML = "<i>Added from JavaScript.</i>";
 
diff --git a/yesod/scaffold/static/js/modernizr.js.cg b/yesod/scaffold/static/js/modernizr.js.cg
new file mode 100644
index 00000000..76dc0298
--- /dev/null
+++ b/yesod/scaffold/static/js/modernizr.js.cg
@@ -0,0 +1,4 @@
+/* Modernizr 2.0.6 (Custom Build) | MIT & BSD
+ * Build: http://www.modernizr.com/download/#-fontface-backgroundsize-borderimage-borderradius-boxshadow-flexbox-hsla-multiplebgs-opacity-rgba-textshadow-cssanimations-csscolumns-generatedcontent-cssgradients-cssreflections-csstransforms-csstransforms3d-csstransitions-applicationcache-canvas-canvastext-draganddrop-hashchange-history-audio-video-indexeddb-input-inputtypes-localstorage-postmessage-sessionstorage-websockets-websqldatabase-webworkers-geolocation-inlinesvg-smil-svg-svgclippaths-touch-webgl-iepp-cssclasses-teststyles-testprop-testallprops-hasevent-prefixes-domprefixes-load
+ */
+;window.Modernizr=function(a,b,c){function H(){e.input=function(a){for(var b=0,c=a.length;b<c;b++)t[a[b]]=a[b]in l;return t}("autocomplete autofocus list placeholder max min multiple pattern required step".split(" ")),e.inputtypes=function(a){for(var d=0,e,f,h,i=a.length;d<i;d++)l.setAttribute("type",f=a[d]),e=l.type!=="text",e&&(l.value=m,l.style.cssText="position:absolute;visibility:hidden;",/^range$/.test(f)&&l.style.WebkitAppearance!==c?(g.appendChild(l),h=b.defaultView,e=h.getComputedStyle&&h.getComputedStyle(l,null).WebkitAppearance!=="textfield"&&l.offsetHeight!==0,g.removeChild(l)):/^(search|tel)$/.test(f)||(/^(url|email)$/.test(f)?e=l.checkValidity&&l.checkValidity()===!1:/^color$/.test(f)?(g.appendChild(l),g.offsetWidth,e=l.value!=m,g.removeChild(l)):e=l.value!=m)),s[a[d]]=!!e;return s}("search tel url email datetime date month week time datetime-local number range color".split(" "))}function F(a,b){var c=a.charAt(0).toUpperCase()+a.substr(1),d=(a+" "+p.join(c+" ")+c).split(" ");return E(d,b)}function E(a,b){for(var d in a)if(k[a[d]]!==c)return b=="pfx"?a[d]:!0;return!1}function D(a,b){return!!~(""+a).indexOf(b)}function C(a,b){return typeof a===b}function B(a,b){return A(o.join(a+";")+(b||""))}function A(a){k.cssText=a}var d="2.0.6",e={},f=!0,g=b.documentElement,h=b.head||b.getElementsByTagName("head")[0],i="modernizr",j=b.createElement(i),k=j.style,l=b.createElement("input"),m=":)",n=Object.prototype.toString,o=" -webkit- -moz- -o- -ms- -khtml- ".split(" "),p="Webkit Moz O ms Khtml".split(" "),q={svg:"http://www.w3.org/2000/svg"},r={},s={},t={},u=[],v=function(a,c,d,e){var f,h,j,k=b.createElement("div");if(parseInt(d,10))while(d--)j=b.createElement("div"),j.id=e?e[d]:i+(d+1),k.appendChild(j);f=["&shy;","<style>",a,"</style>"].join(""),k.id=i,k.innerHTML+=f,g.appendChild(k),h=c(k,a),k.parentNode.removeChild(k);return!!h},w=function(){function d(d,e){e=e||b.createElement(a[d]||"div"),d="on"+d;var f=d in e;f||(e.setAttribute||(e=b.createElement("div")),e.setAttribute&&e.removeAttribute&&(e.setAttribute(d,""),f=C(e[d],"function"),C(e[d],c)||(e[d]=c),e.removeAttribute(d))),e=null;return f}var a={select:"input",change:"input",submit:"form",reset:"form",error:"img",load:"img",abort:"img"};return d}(),x,y={}.hasOwnProperty,z;!C(y,c)&&!C(y.call,c)?z=function(a,b){return y.call(a,b)}:z=function(a,b){return b in a&&C(a.constructor.prototype[b],c)};var G=function(c,d){var f=c.join(""),g=d.length;v(f,function(c,d){var f=b.styleSheets[b.styleSheets.length-1],h=f.cssRules&&f.cssRules[0]?f.cssRules[0].cssText:f.cssText||"",i=c.childNodes,j={};while(g--)j[i[g].id]=i[g];e.touch="ontouchstart"in a||j.touch.offsetTop===9,e.csstransforms3d=j.csstransforms3d.offsetLeft===9,e.generatedcontent=j.generatedcontent.offsetHeight>=1,e.fontface=/src/i.test(h)&&h.indexOf(d.split(" ")[0])===0},g,d)}(['@font-face {font-family:"font";src:url("https://")}',["@media (",o.join("touch-enabled),("),i,")","{#touch{top:9px;position:absolute}}"].join(""),["@media (",o.join("transform-3d),("),i,")","{#csstransforms3d{left:9px;position:absolute}}"].join(""),['#generatedcontent:after{content:"',m,'";visibility:hidden}'].join("")],["fontface","touch","csstransforms3d","generatedcontent"]);r.flexbox=function(){function c(a,b,c,d){a.style.cssText=o.join(b+":"+c+";")+(d||"")}function a(a,b,c,d){b+=":",a.style.cssText=(b+o.join(c+";"+b)).slice(0,-b.length)+(d||"")}var d=b.createElement("div"),e=b.createElement("div");a(d,"display","box","width:42px;padding:0;"),c(e,"box-flex","1","width:10px;"),d.appendChild(e),g.appendChild(d);var f=e.offsetWidth===42;d.removeChild(e),g.removeChild(d);return f},r.canvas=function(){var a=b.createElement("canvas");return!!a.getContext&&!!a.getContext("2d")},r.canvastext=function(){return!!e.canvas&&!!C(b.createElement("canvas").getContext("2d").fillText,"function")},r.webgl=function(){return!!a.WebGLRenderingContext},r.touch=function(){return e.touch},r.geolocation=function(){return!!navigator.geolocation},r.postmessage=function(){return!!a.postMessage},r.websqldatabase=function(){var b=!!a.openDatabase;return b},r.indexedDB=function(){for(var b=-1,c=p.length;++b<c;)if(a[p[b].toLowerCase()+"IndexedDB"])return!0;return!!a.indexedDB},r.hashchange=function(){return w("hashchange",a)&&(b.documentMode===c||b.documentMode>7)},r.history=function(){return!!a.history&&!!history.pushState},r.draganddrop=function(){return w("dragstart")&&w("drop")},r.websockets=function(){for(var b=-1,c=p.length;++b<c;)if(a[p[b]+"WebSocket"])return!0;return"WebSocket"in a},r.rgba=function(){A("background-color:rgba(150,255,150,.5)");return D(k.backgroundColor,"rgba")},r.hsla=function(){A("background-color:hsla(120,40%,100%,.5)");return D(k.backgroundColor,"rgba")||D(k.backgroundColor,"hsla")},r.multiplebgs=function(){A("background:url(https://),url(https://),red url(https://)");return/(url\s*\(.*?){3}/.test(k.background)},r.backgroundsize=function(){return F("backgroundSize")},r.borderimage=function(){return F("borderImage")},r.borderradius=function(){return F("borderRadius")},r.boxshadow=function(){return F("boxShadow")},r.textshadow=function(){return b.createElement("div").style.textShadow===""},r.opacity=function(){B("opacity:.55");return/^0.55$/.test(k.opacity)},r.cssanimations=function(){return F("animationName")},r.csscolumns=function(){return F("columnCount")},r.cssgradients=function(){var a="background-image:",b="gradient(linear,left top,right bottom,from(#9f9),to(white));",c="linear-gradient(left top,#9f9, white);";A((a+o.join(b+a)+o.join(c+a)).slice(0,-a.length));return D(k.backgroundImage,"gradient")},r.cssreflections=function(){return F("boxReflect")},r.csstransforms=function(){return!!E(["transformProperty","WebkitTransform","MozTransform","OTransform","msTransform"])},r.csstransforms3d=function(){var a=!!E(["perspectiveProperty","WebkitPerspective","MozPerspective","OPerspective","msPerspective"]);a&&"webkitPerspective"in g.style&&(a=e.csstransforms3d);return a},r.csstransitions=function(){return F("transitionProperty")},r.fontface=function(){return e.fontface},r.generatedcontent=function(){return e.generatedcontent},r.video=function(){var a=b.createElement("video"),c=!1;try{if(c=!!a.canPlayType){c=new Boolean(c),c.ogg=a.canPlayType('video/ogg; codecs="theora"');var d='video/mp4; codecs="avc1.42E01E';c.h264=a.canPlayType(d+'"')||a.canPlayType(d+', mp4a.40.2"'),c.webm=a.canPlayType('video/webm; codecs="vp8, vorbis"')}}catch(e){}return c},r.audio=function(){var a=b.createElement("audio"),c=!1;try{if(c=!!a.canPlayType)c=new Boolean(c),c.ogg=a.canPlayType('audio/ogg; codecs="vorbis"'),c.mp3=a.canPlayType("audio/mpeg;"),c.wav=a.canPlayType('audio/wav; codecs="1"'),c.m4a=a.canPlayType("audio/x-m4a;")||a.canPlayType("audio/aac;")}catch(d){}return c},r.localstorage=function(){try{return!!localStorage.getItem}catch(a){return!1}},r.sessionstorage=function(){try{return!!sessionStorage.getItem}catch(a){return!1}},r.webworkers=function(){return!!a.Worker},r.applicationcache=function(){return!!a.applicationCache},r.svg=function(){return!!b.createElementNS&&!!b.createElementNS(q.svg,"svg").createSVGRect},r.inlinesvg=function(){var a=b.createElement("div");a.innerHTML="<svg/>";return(a.firstChild&&a.firstChild.namespaceURI)==q.svg},r.smil=function(){return!!b.createElementNS&&/SVG/.test(n.call(b.createElementNS(q.svg,"animate")))},r.svgclippaths=function(){return!!b.createElementNS&&/SVG/.test(n.call(b.createElementNS(q.svg,"clipPath")))};for(var I in r)z(r,I)&&(x=I.toLowerCase(),e[x]=r[I](),u.push((e[x]?"":"no-")+x));e.input||H(),A(""),j=l=null,a.attachEvent&&function(){var a=b.createElement("div");a.innerHTML="<elem></elem>";return a.childNodes.length!==1}()&&function(a,b){function s(a){var b=-1;while(++b<g)a.createElement(f[b])}a.iepp=a.iepp||{};var d=a.iepp,e=d.html5elements||"abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",f=e.split("|"),g=f.length,h=new RegExp("(^|\\s)("+e+")","gi"),i=new RegExp("<(/*)("+e+")","gi"),j=/^\s*[\{\}]\s*$/,k=new RegExp("(^|[^\\n]*?\\s)("+e+")([^\\n]*)({[\\n\\w\\W]*?})","gi"),l=b.createDocumentFragment(),m=b.documentElement,n=m.firstChild,o=b.createElement("body"),p=b.createElement("style"),q=/print|all/,r;d.getCSS=function(a,b){if(a+""===c)return"";var e=-1,f=a.length,g,h=[];while(++e<f){g=a[e];if(g.disabled)continue;b=g.media||b,q.test(b)&&h.push(d.getCSS(g.imports,b),g.cssText),b="all"}return h.join("")},d.parseCSS=function(a){var b=[],c;while((c=k.exec(a))!=null)b.push(((j.exec(c[1])?"\n":c[1])+c[2]+c[3]).replace(h,"$1.iepp_$2")+c[4]);return b.join("\n")},d.writeHTML=function(){var a=-1;r=r||b.body;while(++a<g){var c=b.getElementsByTagName(f[a]),d=c.length,e=-1;while(++e<d)c[e].className.indexOf("iepp_")<0&&(c[e].className+=" iepp_"+f[a])}l.appendChild(r),m.appendChild(o),o.className=r.className,o.id=r.id,o.innerHTML=r.innerHTML.replace(i,"<$1font")},d._beforePrint=function(){p.styleSheet.cssText=d.parseCSS(d.getCSS(b.styleSheets,"all")),d.writeHTML()},d.restoreHTML=function(){o.innerHTML="",m.removeChild(o),m.appendChild(r)},d._afterPrint=function(){d.restoreHTML(),p.styleSheet.cssText=""},s(b),s(l);d.disablePP||(n.insertBefore(p,n.firstChild),p.media="print",p.className="iepp-printshim",a.attachEvent("onbeforeprint",d._beforePrint),a.attachEvent("onafterprint",d._afterPrint))}(a,b),e._version=d,e._prefixes=o,e._domPrefixes=p,e.hasEvent=w,e.testProp=function(a){return E([a])},e.testAllProps=F,e.testStyles=v,g.className=g.className.replace(/\bno-js\b/,"")+(f?" js "+u.join(" "):"");return e}(this,this.document),function(a,b,c){function k(a){return!a||a=="loaded"||a=="complete"}function j(){var a=1,b=-1;while(p.length- ++b)if(p[b].s&&!(a=p[b].r))break;a&&g()}function i(a){var c=b.createElement("script"),d;c.src=a.s,c.onreadystatechange=c.onload=function(){!d&&k(c.readyState)&&(d=1,j(),c.onload=c.onreadystatechange=null)},m(function(){d||(d=1,j())},H.errorTimeout),a.e?c.onload():n.parentNode.insertBefore(c,n)}function h(a){var c=b.createElement("link"),d;c.href=a.s,c.rel="stylesheet",c.type="text/css";if(!a.e&&(w||r)){var e=function(a){m(function(){if(!d)try{a.sheet.cssRules.length?(d=1,j()):e(a)}catch(b){b.code==1e3||b.message=="security"||b.message=="denied"?(d=1,m(function(){j()},0)):e(a)}},0)};e(c)}else c.onload=function(){d||(d=1,m(function(){j()},0))},a.e&&c.onload();m(function(){d||(d=1,j())},H.errorTimeout),!a.e&&n.parentNode.insertBefore(c,n)}function g(){var a=p.shift();q=1,a?a.t?m(function(){a.t=="c"?h(a):i(a)},0):(a(),j()):q=0}function f(a,c,d,e,f,h){function i(){!o&&k(l.readyState)&&(r.r=o=1,!q&&j(),l.onload=l.onreadystatechange=null,m(function(){u.removeChild(l)},0))}var l=b.createElement(a),o=0,r={t:d,s:c,e:h};l.src=l.data=c,!s&&(l.style.display="none"),l.width=l.height="0",a!="object"&&(l.type=d),l.onload=l.onreadystatechange=i,a=="img"?l.onerror=i:a=="script"&&(l.onerror=function(){r.e=r.r=1,g()}),p.splice(e,0,r),u.insertBefore(l,s?null:n),m(function(){o||(u.removeChild(l),r.r=r.e=o=1,j())},H.errorTimeout)}function e(a,b,c){var d=b=="c"?z:y;q=0,b=b||"j",C(a)?f(d,a,b,this.i++,l,c):(p.splice(this.i++,0,a),p.length==1&&g());return this}function d(){var a=H;a.loader={load:e,i:0};return a}var l=b.documentElement,m=a.setTimeout,n=b.getElementsByTagName("script")[0],o={}.toString,p=[],q=0,r="MozAppearance"in l.style,s=r&&!!b.createRange().compareNode,t=r&&!s,u=s?l:n.parentNode,v=a.opera&&o.call(a.opera)=="[object Opera]",w="webkitAppearance"in l.style,x=w&&"async"in b.createElement("script"),y=r?"object":v||x?"img":"script",z=w?"img":y,A=Array.isArray||function(a){return o.call(a)=="[object Array]"},B=function(a){return Object(a)===a},C=function(a){return typeof a=="string"},D=function(a){return o.call(a)=="[object Function]"},E=[],F={},G,H;H=function(a){function f(a){var b=a.split("!"),c=E.length,d=b.pop(),e=b.length,f={url:d,origUrl:d,prefixes:b},g,h;for(h=0;h<e;h++)g=F[b[h]],g&&(f=g(f));for(h=0;h<c;h++)f=E[h](f);return f}function e(a,b,e,g,h){var i=f(a),j=i.autoCallback;if(!i.bypass){b&&(b=D(b)?b:b[a]||b[g]||b[a.split("/").pop().split("?")[0]]);if(i.instead)return i.instead(a,b,e,g,h);e.load(i.url,i.forceCSS||!i.forceJS&&/css$/.test(i.url)?"c":c,i.noexec),(D(b)||D(j))&&e.load(function(){d(),b&&b(i.origUrl,h,g),j&&j(i.origUrl,h,g)})}}function b(a,b){function c(a){if(C(a))e(a,h,b,0,d);else if(B(a))for(i in a)a.hasOwnProperty(i)&&e(a[i],h,b,i,d)}var d=!!a.test,f=d?a.yep:a.nope,g=a.load||a.both,h=a.callback,i;c(f),c(g),a.complete&&b.load(a.complete)}var g,h,i=this.yepnope.loader;if(C(a))e(a,0,i,0);else if(A(a))for(g=0;g<a.length;g++)h=a[g],C(h)?e(h,0,i,0):A(h)?H(h):B(h)&&b(h,i);else B(a)&&b(a,i)},H.addPrefix=function(a,b){F[a]=b},H.addFilter=function(a){E.push(a)},H.errorTimeout=1e4,b.readyState==null&&b.addEventListener&&(b.readyState="loading",b.addEventListener("DOMContentLoaded",G=function(){b.removeEventListener("DOMContentLoaded",G,0),b.readyState="complete"},0)),a.yepnope=d()}(this,this.document),Modernizr.load=function(){yepnope.apply(window,[].slice.call(arguments,0))};
\ No newline at end of file
diff --git a/yesod/scaffold/tiny/Foundation.hs.cg b/yesod/scaffold/tiny/Foundation.hs.cg
index 06038352..50e5e1ec 100644
--- a/yesod/scaffold/tiny/Foundation.hs.cg
+++ b/yesod/scaffold/tiny/Foundation.hs.cg
@@ -97,3 +97,6 @@ instance Yesod ~sitearg~ where
     -- expiration dates to be set far in the future without worry of
     -- users receiving stale content.
     addStaticContent = addStaticContentExternal (const $ Left ()) base64md5 Settings.staticDir (StaticR . flip StaticRoute [])
+
+    -- Enable Javascript async loading
+    yepnopeJs _ = Just $ Right $ StaticR js_modernizr_js
diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index ed0edb1b..6ad0e432 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -52,6 +52,7 @@ extra-source-files:
   scaffold/Settings.hs.cg
   scaffold/Settings/StaticFiles.hs.cg
   scaffold/messages/en.msg.cg
+  scaffold/static/js/modernizr.js.cg
 
 
 flag ghc7

From 6c58728ad39c74d30612037324d22038e8f44719 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Fri, 23 Sep 2011 10:16:54 +0300
Subject: [PATCH 059/189] Better scaffolded cabal file

---
 yesod/scaffold/project.cabal.cg      | 58 +++++++++-------------------
 yesod/scaffold/tiny/project.cabal.cg | 40 +++++++------------
 2 files changed, 33 insertions(+), 65 deletions(-)

diff --git a/yesod/scaffold/project.cabal.cg b/yesod/scaffold/project.cabal.cg
index 3055a7e6..a61906c4 100644
--- a/yesod/scaffold/project.cabal.cg
+++ b/yesod/scaffold/project.cabal.cg
@@ -26,10 +26,6 @@ library
     else
         Buildable: False
 
-    if os(windows)
-        cpp-options: -DWINDOWS
-
-    hs-source-dirs: .
     exposed-modules: Application
     other-modules:   Foundation
                      Model
@@ -49,42 +45,24 @@ executable         ~project~
     else
         ghc-options:   -Wall -threaded -O0
 
-    if os(windows)
-        cpp-options: -DWINDOWS
-
     main-is:       main.hs
-    hs-source-dirs: .
 
-    build-depends: base         >= 4       && < 5
-                 , yesod        >= 0.9     && < 0.10
-                 , yesod-core
-                 , yesod-auth
-                 , yesod-static
-                 , yesod-default
-                 , blaze-html
-                 , yesod-form
-                 , mime-mail
-                 , clientsession
-                 , wai-extra
-                 , directory
-                 , bytestring
-                 , text
-                 , persistent
-                 , persistent-template
-                 , persistent-~backendLower~ >= 0.6 && < 0.7
-                 ~packages~
+    build-depends: base                          >= 4          && < 5
+                 , yesod                         >= 0.9        && < 0.10
+                 , yesod-core                    >= 0.9.3      && < 0.10
+                 , yesod-auth                    >= 0.7.3      && < 0.8
+                 , yesod-static                  >= 0.3.1      && < 0.4
+                 , yesod-default                 >= 0.3.1      && < 0.4
+                 , yesod-form                    >= 0.3.3      && < 0.4
+                 , mime-mail                     >= 0.3.0.3    && < 0.4
+                 , clientsession                 >= 0.7.3      && < 0.8
+                 , bytestring                    >= 0.9        && < 0.10
+                 , text                          >= 0.11       && < 0.12
+                 , persistent                    >= 0.6.2      && < 0.7
+                 , persistent-~backendLower~     >= 0.6        && < 0.7
                  , template-haskell
-                 , hamlet               >= 0.10     && < 0.11
-                 , shakespeare-css      >= 0.10     && < 0.11
-                 , shakespeare-js       >= 0.10     && < 0.11
-                 , shakespeare-text     >= 0.10     && < 0.11
-                 , hjsmin
-                 , transformers
-                 , data-object
-                 , data-object-yaml
-                 , warp
-                 , blaze-builder
-                 , cmdargs
-
-    if !os(windows)
-         build-depends: unix
+                 , hamlet                        >= 0.10       && < 0.11
+                 , shakespeare-css               >= 0.10       && < 0.11
+                 , shakespeare-js                >= 0.10       && < 0.11
+                 , shakespeare-text              >= 0.10       && < 0.11
+                 , hjsmin                        >= 0.0.14     && < 0.1
diff --git a/yesod/scaffold/tiny/project.cabal.cg b/yesod/scaffold/tiny/project.cabal.cg
index 1cc7fb75..1d987f2d 100644
--- a/yesod/scaffold/tiny/project.cabal.cg
+++ b/yesod/scaffold/tiny/project.cabal.cg
@@ -26,12 +26,13 @@ library
     else
         Buildable: False
     exposed-modules: Application
-    hs-source-dirs: .
     other-modules:   Foundation
                      Settings
                      Settings.StaticFiles
                      Handler.Root
 
+    ghc-options:   -Wall -threaded -O0
+
 executable         ~project~
     if flag(devel)
         Buildable: False
@@ -40,31 +41,20 @@ executable         ~project~
         cpp-options:   -DPRODUCTION
         ghc-options:   -Wall -threaded -O2
     else
-        ghc-options:   -Wall -threaded
+        ghc-options:   -Wall -threaded -O0
 
     main-is:       main.hs
-    hs-source-dirs: .
 
-    build-depends: base         >= 4       && < 5
-                 , yesod-core   >= 0.9     && < 0.10
-                 , yesod-static
-                 , yesod-default
-                 , clientsession
-                 , wai-extra
-                 , directory
-                 , bytestring
-                 , text
+    build-depends: base                          >= 4          && < 5
+                 , yesod-core                    >= 0.9.3      && < 0.10
+                 , yesod-static                  >= 0.3.1      && < 0.4
+                 , yesod-default                 >= 0.3.1      && < 0.4
+                 , clientsession                 >= 0.7.3      && < 0.8
+                 , bytestring                    >= 0.9        && < 0.10
+                 , text                          >= 0.11       && < 0.12
                  , template-haskell
-                 , hamlet               >= 0.10     && < 0.11
-                 , shakespeare-css      >= 0.10     && < 0.11
-                 , shakespeare-js       >= 0.10     && < 0.11
-                 , shakespeare-text     >= 0.10     && < 0.11
-                 , transformers
-                 , data-object
-                 , data-object-yaml
-                 , wai
-                 , warp
-                 , blaze-builder
-                 , cmdargs
-                 , data-object
-                 , data-object-yaml
+                 , hamlet                        >= 0.10       && < 0.11
+                 , shakespeare-text              >= 0.10       && < 0.11
+                 , wai                           >= 0.4.2      && < 0.5
+                 , transformers                  >= 0.2        && < 0.3
+

From b8f1ee151dc78ef4058aaf12cda8bfeb0973df9f Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Fri, 23 Sep 2011 15:07:00 +0300
Subject: [PATCH 060/189] Added test files to tarballs

---
 yesod-core/yesod-core.cabal     | 10 ++++++++++
 yesod-static/yesod-static.cabal |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index 80b9c00a..4fdee421 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -14,6 +14,16 @@ stability:       Stable
 cabal-version:   >= 1.8
 build-type:      Simple
 homepage:        http://www.yesodweb.com/
+extra-source-files:
+  test/en.msg
+  test/Test/NoOverloadedStrings.hs
+  test/Test/Media.hs
+  test/Test/Exceptions.hs
+  test/Test/Widget.hs
+  test/Test/CleanPath.hs
+  test/Test/Links.hs
+  test/Test/InternalRequest.hs
+  test/main.hs
 
 flag test
   description: Build the executable to run unit tests
diff --git a/yesod-static/yesod-static.cabal b/yesod-static/yesod-static.cabal
index 18e26a80..50b1d2f6 100644
--- a/yesod-static/yesod-static.cabal
+++ b/yesod-static/yesod-static.cabal
@@ -11,6 +11,8 @@ cabal-version:   >= 1.8
 build-type:      Simple
 homepage:        http://www.yesodweb.com/
 description:     Static file serving subsite for Yesod Web Framework.
+extra-source-files:
+  tests/runtests.hs
 
 flag test
   description: Build the executable to run unit tests

From 22ca2af4215d41ee60ad76d14aa69adc6027ac52 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Fri, 23 Sep 2011 09:16:47 -0400
Subject: [PATCH 061/189] Remove defaultRunner, @snoyberg already has it in
 Utils

---
 yesod-default/Yesod/Default/Main.hs | 37 -----------------------------
 1 file changed, 37 deletions(-)

diff --git a/yesod-default/Yesod/Default/Main.hs b/yesod-default/Yesod/Default/Main.hs
index 9cb36d8d..ee6c83c5 100644
--- a/yesod-default/Yesod/Default/Main.hs
+++ b/yesod-default/Yesod/Default/Main.hs
@@ -2,24 +2,16 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 module Yesod.Default.Main
     ( defaultMain
-    , defaultRunner
     , defaultDevelApp
     , defaultDevelAppWith
     ) where
 
-import Yesod.Core
 import Yesod.Default.Config
 import Yesod.Logger (Logger, makeLogger, logString, logLazyText, flushLogger)
 import Network.Wai (Application)
 import Network.Wai.Handler.Warp (run)
 import Network.Wai.Middleware.Debug (debugHandle)
 
-#ifndef WINDOWS
-import qualified System.Posix.Signals as Signal
-import Control.Concurrent (forkIO, killThread)
-import Control.Concurrent.MVar (newEmptyMVar, putMVar, takeMVar)
-#endif
-
 -- | Run your app, taking environment and port settings from the
 --   commandline.
 --
@@ -40,35 +32,6 @@ defaultMain load withSite = do
     logger <- makeLogger
     withSite config logger $ run (appPort config)
 
--- | Run your application continously, listening for SIGINT and exiting
---   when recieved
---
---   > withYourSite :: AppConfig DefaultEnv -> Logger -> (Application -> IO a) -> IO ()
---   > withYourSite conf logger f = do
---   >     Settings.withConnectionPool conf $ \p -> do
---   >         runConnectionPool (runMigration yourMigration) p
---   >         defaultRunner f $ YourSite conf logger p
---
---   TODO: ifdef WINDOWS
---
-defaultRunner :: (YesodDispatch y y, Yesod y)
-              => (Application -> IO a)
-              -> y -- ^ your foundation type
-              -> IO ()
-defaultRunner f h =
-#ifdef WINDOWS
-    toWaiApp h >>= f >> return ()
-#else
-    do
-        tid <- forkIO $ toWaiApp h >>= f >> return ()
-        flag <- newEmptyMVar
-        _ <- Signal.installHandler Signal.sigINT (Signal.CatchOnce $ do
-            putStrLn "Caught an interrupt"
-            killThread tid
-            putMVar flag ()) Nothing
-        takeMVar flag
-#endif
-
 -- | Run your development app using the provided @'DefaultEnv'@ type
 --
 --   > withDevelAppPort :: Dynamic

From 94f4548adc448cecf16f3648f3d425c91b0c1eb6 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Fri, 23 Sep 2011 09:23:44 -0400
Subject: [PATCH 062/189] This reverts commit
 22ca2af4215d41ee60ad76d14aa69adc6027ac52.

---
 yesod-default/Yesod/Default/Main.hs | 37 +++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/yesod-default/Yesod/Default/Main.hs b/yesod-default/Yesod/Default/Main.hs
index ee6c83c5..9cb36d8d 100644
--- a/yesod-default/Yesod/Default/Main.hs
+++ b/yesod-default/Yesod/Default/Main.hs
@@ -2,16 +2,24 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 module Yesod.Default.Main
     ( defaultMain
+    , defaultRunner
     , defaultDevelApp
     , defaultDevelAppWith
     ) where
 
+import Yesod.Core
 import Yesod.Default.Config
 import Yesod.Logger (Logger, makeLogger, logString, logLazyText, flushLogger)
 import Network.Wai (Application)
 import Network.Wai.Handler.Warp (run)
 import Network.Wai.Middleware.Debug (debugHandle)
 
+#ifndef WINDOWS
+import qualified System.Posix.Signals as Signal
+import Control.Concurrent (forkIO, killThread)
+import Control.Concurrent.MVar (newEmptyMVar, putMVar, takeMVar)
+#endif
+
 -- | Run your app, taking environment and port settings from the
 --   commandline.
 --
@@ -32,6 +40,35 @@ defaultMain load withSite = do
     logger <- makeLogger
     withSite config logger $ run (appPort config)
 
+-- | Run your application continously, listening for SIGINT and exiting
+--   when recieved
+--
+--   > withYourSite :: AppConfig DefaultEnv -> Logger -> (Application -> IO a) -> IO ()
+--   > withYourSite conf logger f = do
+--   >     Settings.withConnectionPool conf $ \p -> do
+--   >         runConnectionPool (runMigration yourMigration) p
+--   >         defaultRunner f $ YourSite conf logger p
+--
+--   TODO: ifdef WINDOWS
+--
+defaultRunner :: (YesodDispatch y y, Yesod y)
+              => (Application -> IO a)
+              -> y -- ^ your foundation type
+              -> IO ()
+defaultRunner f h =
+#ifdef WINDOWS
+    toWaiApp h >>= f >> return ()
+#else
+    do
+        tid <- forkIO $ toWaiApp h >>= f >> return ()
+        flag <- newEmptyMVar
+        _ <- Signal.installHandler Signal.sigINT (Signal.CatchOnce $ do
+            putStrLn "Caught an interrupt"
+            killThread tid
+            putMVar flag ()) Nothing
+        takeMVar flag
+#endif
+
 -- | Run your development app using the provided @'DefaultEnv'@ type
 --
 --   > withDevelAppPort :: Dynamic

From ddea64b458805f079d729538e5ee7d6eeb3edbaa Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sat, 24 Sep 2011 20:47:03 +0300
Subject: [PATCH 063/189] OpenID: Google and Yahoo login buttons

---
 yesod-auth/Yesod/Auth/Message.hs | 4 ++++
 yesod-auth/Yesod/Auth/OpenId.hs  | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/yesod-auth/Yesod/Auth/Message.hs b/yesod-auth/Yesod/Auth/Message.hs
index c2d63645..5a154488 100644
--- a/yesod-auth/Yesod/Auth/Message.hs
+++ b/yesod-auth/Yesod/Auth/Message.hs
@@ -10,6 +10,8 @@ import Data.Text (Text)
 data AuthMessage =
       NoOpenID
     | LoginOpenID
+    | LoginGoogle
+    | LoginYahoo
     | Email
     | Password
     | Register
@@ -37,6 +39,8 @@ data AuthMessage =
 defaultMessage :: AuthMessage -> Text
 defaultMessage NoOpenID = "No OpenID identifier found"
 defaultMessage LoginOpenID = "Login via OpenID"
+defaultMessage LoginGoogle = "Login via Google"
+defaultMessage LoginYahoo = "Login via Yahoo"
 defaultMessage Email = "Email"
 defaultMessage Password = "Password"
 defaultMessage Register = "Register"
diff --git a/yesod-auth/Yesod/Auth/OpenId.hs b/yesod-auth/Yesod/Auth/OpenId.hs
index d27e49a6..4f650be4 100644
--- a/yesod-auth/Yesod/Auth/OpenId.hs
+++ b/yesod-auth/Yesod/Auth/OpenId.hs
@@ -39,6 +39,12 @@ authOpenId =
     padding-left: 18px;
 |]
         [QQ(whamlet)|
+<form method="get" action="@{tm forwardUrl}">
+    <input type="hidden" name="openid_identifier" value="https://www.google.com/accounts/o8/id">
+    <button .openid-google>_{Msg.LoginGoogle}
+<form method="get" action="@{tm forwardUrl}">
+    <input type="hidden" name="openid_identifier" value="http://me.yahoo.com">
+    <button .openid-yahoo>_{Msg.LoginYahoo}
 <form method="get" action="@{tm forwardUrl}">
     <label for="#{ident}">OpenID: #
     <input id="#{ident}" type="text" name="#{name}" value="http://">

From b589057be237fdbaafa238beb04f304fc1bfdbb3 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sat, 24 Sep 2011 21:21:38 +0300
Subject: [PATCH 064/189] Added openid.hs sample for yesod-auth

---
 yesod-auth/openid.hs | 48 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 yesod-auth/openid.hs

diff --git a/yesod-auth/openid.hs b/yesod-auth/openid.hs
new file mode 100644
index 00000000..e12cbe2a
--- /dev/null
+++ b/yesod-auth/openid.hs
@@ -0,0 +1,48 @@
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE QuasiQuotes #-}
+{-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+import Yesod.Core
+import Yesod.Auth
+import Yesod.Auth.OpenId
+import Data.Text (Text)
+import Text.Hamlet (hamlet)
+import Control.Monad.IO.Class (liftIO)
+import Yesod.Form
+import Network.Wai.Handler.Warp (run)
+
+data BID = BID
+
+mkYesod "BID" [parseRoutes|
+/ RootR GET
+/after AfterLoginR GET
+/auth AuthR Auth getAuth
+|]
+
+getRootR :: Handler ()
+getRootR = redirect RedirectTemporary $ AuthR LoginR
+
+getAfterLoginR :: Handler RepHtml
+getAfterLoginR = do
+    mauth <- maybeAuthId
+    defaultLayout $ addHamlet [hamlet|
+<p>Auth: #{show mauth}
+|]
+
+instance Yesod BID where
+    approot _ = "http://localhost:3000"
+
+instance YesodAuth BID where
+    type AuthId BID = Text
+    loginDest _ = AfterLoginR
+    logoutDest _ = AuthR LoginR
+    getAuthId = return . Just . credsIdent
+    authPlugins = [authOpenId]
+
+instance RenderMessage BID FormMessage where
+    renderMessage _ _ = defaultFormMessage
+
+main :: IO ()
+main = toWaiApp BID >>= run 3000
+

From 2fd9f18cf2be85f07201fc492288bc2f472c611a Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sat, 24 Sep 2011 21:38:35 +0300
Subject: [PATCH 065/189] Faster scaffold.sh

cabal configure runs much faster than cabal install.
---
 yesod/test/scaffold.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/yesod/test/scaffold.sh b/yesod/test/scaffold.sh
index 303fc363..8ea71803 100755
--- a/yesod/test/scaffold.sh
+++ b/yesod/test/scaffold.sh
@@ -4,7 +4,12 @@ runghc main.hs init
 
 (
   cd foobar
-  cabal install
-  cabal install -fdevel
-  cabal install -fproduction
+  cabal configure || cabal install
+  cabal build
+  cabal clean
+  cabal configure -fdevel
+  cabal build
+  cabal clean
+  cabal configure -fproduction
+  cabal build
 )

From 933f0086d2621544c27aca5f1f1fa0216c5a73a0 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sat, 24 Sep 2011 21:51:44 +0300
Subject: [PATCH 066/189] Scaffolding uses PersistConfig

---
 yesod-core/Yesod/Config.hs       | 114 ++++++-------------------------
 yesod/Scaffolding/Scaffolder.hs  |  27 ++++++--
 yesod/scaffold/Application.hs.cg |   6 +-
 yesod/scaffold/Foundation.hs.cg  |   5 +-
 yesod/scaffold/Settings.hs.cg    |  16 ++---
 5 files changed, 57 insertions(+), 111 deletions(-)

diff --git a/yesod-core/Yesod/Config.hs b/yesod-core/Yesod/Config.hs
index 51216e59..750893fe 100644
--- a/yesod-core/Yesod/Config.hs
+++ b/yesod-core/Yesod/Config.hs
@@ -1,15 +1,11 @@
+{-# LANGUAGE OverloadedStrings #-}
 module Yesod.Config
     ( AppConfig(..)
-    , PostgresConf(..)
-    , SqliteConf(..)
-    , MongoConf(..)
     , loadConfig
-    , loadPostgresql
-    , loadSqlite
-    , loadMongo
+    , withYamlEnvironment
     ) where
 
-import Control.Monad (join, forM)
+import Control.Monad (join)
 import Data.Maybe (fromMaybe)
 import Data.Object
 import Data.Object.Yaml
@@ -25,28 +21,6 @@ data AppConfig e = AppConfig
     , appRoot :: Text
     } deriving (Show)
 
--- separate types means more code here, but it's easier to use in the
--- scaffold
-
--- | Information required to connect to a postgres database
-data PostgresConf = PostgresConf
-    { pgConnStr  :: Text
-    , pgPoolSize :: Int
-    }
-
--- | Information required to connect to a sqlite database
-data SqliteConf = SqliteConf
-    { sqlDatabase :: Text
-    , sqlPoolSize :: Int
-    }
-
--- | Information required to connect to a mongo database
-data MongoConf = MongoConf
-    { mgDatabase :: String
-    , mgHost     :: String
-    , mgPoolSize :: Int
-    }
-
 -- | Load an @'AppConfig'@ from @config\/settings.yml@.
 --
 --   Some examples:
@@ -77,7 +51,8 @@ data MongoConf = MongoConf
 --   > -- automatically.
 --
 loadConfig :: Show e => e -> IO (AppConfig e)
-loadConfig env = withYamlEnvironment "config/settings.yml" env $ \e -> do
+loadConfig env = withYamlEnvironment "config/settings.yml" env $ \e' -> do
+    e <- maybe (fail "Expected map") return $ fromMapping e'
     let mssl     = lookupScalar "ssl"     e
     let mhost    = lookupScalar "host"    e
     let mport    = lookupScalar "port"    e
@@ -89,94 +64,49 @@ loadConfig env = withYamlEnvironment "config/settings.yml" env $ \e -> do
 
     approot <- case (mhost, mapproot) of
         (_        , Just ar) -> return ar
-        (Just host, _      ) -> return $ (if ssl then "https://" else "http://") ++ host ++ (addPort ssl port)
+        (Just host, _      ) -> return $ T.concat
+            [ if ssl then "https://" else "http://"
+            , host
+            , addPort ssl port
+            ]
         _                    -> fail "You must supply either a host or approot"
 
     return $ AppConfig
         { appEnv  = env
         , appPort = port
-        , appRoot = T.pack approot
+        , appRoot = approot
         }
 
     where
-        toBool :: String -> Bool
+        toBool :: Text -> Bool
         toBool = (`elem` ["true", "TRUE", "yes", "YES", "Y", "1"])
 
-        addPort :: Bool -> Int -> String
+        addPort :: Bool -> Int -> Text
         addPort True  443 = ""
         addPort False 80  = ""
-        addPort _     p   = ":" ++ show p
-
--- | Load a @'PostgresConf'@ from @config\/postgresql.yml@.
--- 
---   > Production:
---   >   user: jsmith
---   >   password: secret
---   >   host: localhost
---   >   port: 5432
---   >   database: some_db
---   >   poolsize: 100
---
-loadPostgresql :: Show e => e -> IO PostgresConf
-loadPostgresql env = withYamlEnvironment "config/postgresql.yml" env $ \e -> do
-    db   <- lookupScalar "database" e
-    pool <- safeRead "poolsize" =<< lookupScalar "poolsize" e
-
-    -- TODO: default host/port?
-    connparts <- forM ["user", "password", "host", "port"] $ \k -> do
-        v <- lookupScalar k e
-        return $ k ++ "=" ++ v ++ " "
-
-    conn <- return $ concat connparts
-
-    return $ PostgresConf (T.pack $ conn ++ " dbname=" ++ db) pool
-
--- | Load a @'SqliteConf'@ from @config\/sqlite.yml@.
---
---   > Production:
---   >   database: foo.s3db
---   >   poolsize: 100
---
-loadSqlite :: Show e => e -> IO SqliteConf
-loadSqlite env = withYamlEnvironment "config/sqlite.yml" env $ \e -> do
-    db   <- lookupScalar "database" e
-    pool <- safeRead "poolsize" =<< lookupScalar "poolsize" e
-
-    return $ SqliteConf (T.pack db) pool
-
--- | Load a @'MongoConf'@ from @config\/mongoDB.yml@.
---
---   > Production:
---   >   database: some_db
---   >   host:     localhost
---   >   poolsize: 100
---
-loadMongo :: Show e => e -> IO MongoConf
-loadMongo env = withYamlEnvironment "config/mongoDB.yml" env $ \e -> do
-    db   <- lookupScalar "database" e
-    host <- lookupScalar "host"     e
-    pool <- safeRead "poolsize" =<< lookupScalar "poolsize" e
-
-    return $ MongoConf db host pool
+        addPort _     p   = T.pack $ ':' : show p
 
 -- | Loads the configuration block in the passed file named by the
 --   passed environment, yeilds to the passed function as a mapping.
 --
 --   Errors in the case of a bad load or if your function returns
 --   @Nothing@.
-withYamlEnvironment :: (IsYamlScalar v, Show e)
+withYamlEnvironment :: Show e
                     => FilePath -- ^ the yaml file
                     -> e        -- ^ the environment you want to load
-                    -> ([(String, Object String v)] -> IO a) -- ^ what to do with the mapping
+                    -> (TextObject -> IO a) -- ^ what to do with the mapping
                     -> IO a
 withYamlEnvironment fp env f = do
     obj <- join $ decodeFile fp
     envs <- fromMapping obj
-    conf <- lookupMapping (show env) envs
+    conf <- maybe (fail $ "Could not find environment: " ++ show env) return
+          $ lookup (T.pack $ show env) envs
     f conf
 
 -- | Returns 'fail' if read fails
-safeRead :: Monad m => String -> String -> m Int
-safeRead name s = case reads s of
+safeRead :: Monad m => String -> Text -> m Int
+safeRead name t = case reads s of
     (i, _):_ -> return i
     []       -> fail $ concat ["Invalid value for ", name, ": ", s]
+  where
+    s = T.unpack t
diff --git a/yesod/Scaffolding/Scaffolder.hs b/yesod/Scaffolding/Scaffolder.hs
index 5acaf438..120ec18b 100644
--- a/yesod/Scaffolding/Scaffolder.hs
+++ b/yesod/Scaffolding/Scaffolder.hs
@@ -66,9 +66,9 @@ scaffold = do
     backendC <- prompt $ flip elem $ map (return . toLower . head . show) backends
     let (backend, importGenericDB, dbMonad, importPersist, mkPersistSettings) =
             case backendC of
-                "s" -> (Sqlite,     "GenericSql", "SqlPersist", "Sqlite\n", "sqlSettings")
-                "p" -> (Postgresql, "GenericSql", "SqlPersist", "Postgresql\n", "sqlSettings")
-                "m" -> (MongoDB,    "MongoDB", "Action", "MongoDB\nimport Control.Applicative (Applicative)\n", "MkPersistSettings { mpsBackend = ConT ''Action }")
+                "s" -> (Sqlite,     "GenericSql", "SqlPersist", "Sqlite", "sqlSettings")
+                "p" -> (Postgresql, "GenericSql", "SqlPersist", "Postgresql", "sqlSettings")
+                "m" -> (MongoDB,    "MongoDB", "Action", "MongoDB", "MkPersistSettings { mpsBackend = ConT ''Action }")
                 "t" -> (Tiny, "","","",undefined)
                 _ -> error $ "Invalid backend: " ++ backendC
         (modelImports) = case backend of
@@ -84,7 +84,26 @@ scaffold = do
     let runMigration  =
           case backend of
             MongoDB -> ""
-            _ -> "\n        runConnectionPool (runMigration migrateAll) p"
+            _ -> "\n        Database.Persist.Base.runPool dbconf (runMigration migrateAll) p"
+
+    let importMigration =
+          case backend of
+            MongoDB -> ""
+            _ -> "\nimport Database.Persist.GenericSql (runMigration)"
+
+    let dbConfigFile =
+          case backend of
+            MongoDB -> "mongoDB"
+            Sqlite -> "sqlite"
+            Postgresql -> "postgres"
+            Tiny -> error "Accessing dbConfigFile for Tiny"
+
+    let configPersist =
+          case backend of
+            MongoDB -> "MongoConf"
+            Sqlite -> "SqliteConf"
+            Postgresql -> "PostgresConf"
+            Tiny -> error "Accessing configPersist for Tiny"
 
     putStrLn "That's it! I'm creating your files now..."
 
diff --git a/yesod/scaffold/Application.hs.cg b/yesod/scaffold/Application.hs.cg
index ff12c582..46758e1d 100644
--- a/yesod/scaffold/Application.hs.cg
+++ b/yesod/scaffold/Application.hs.cg
@@ -15,9 +15,9 @@ import Yesod.Auth
 import Yesod.Default.Config
 import Yesod.Default.Main
 import Yesod.Logger (Logger)
-import Database.Persist.~importGenericDB~
 import Data.ByteString (ByteString)
 import Data.Dynamic (Dynamic, toDyn)
+import qualified Database.Persist.Base~importMigration~
 
 -- Import all relevant handler modules here.
 import Handler.Root
@@ -46,7 +46,9 @@ with~sitearg~ conf logger f = do
 #else
     s <- staticDevel Settings.staticDir
 #endif
-    Settings.withConnectionPool conf $ \p -> do~runMigration~
+    dbconf <- withYamlEnvironment "config/~dbConfigFile~.yml" (appEnv conf)
+            $ either error return . Database.Persist.Base.loadConfig
+    Database.Persist.Base.withPool (dbconf :: Settings.PersistConfig) $ \p -> do~runMigration~
         let h = ~sitearg~ conf logger s p
         defaultRunner f h
 
diff --git a/yesod/scaffold/Foundation.hs.cg b/yesod/scaffold/Foundation.hs.cg
index c8814801..4e1d736b 100644
--- a/yesod/scaffold/Foundation.hs.cg
+++ b/yesod/scaffold/Foundation.hs.cg
@@ -27,6 +27,7 @@ import Yesod.Default.Util (addStaticContentExternal)
 import Yesod.Logger (Logger, logLazyText)
 import qualified Settings
 import qualified Data.ByteString.Lazy as L
+import qualified Database.Persist.Base
 import Database.Persist.~importGenericDB~
 import Settings (widgetFile)
 import Model
@@ -47,7 +48,7 @@ data ~sitearg~ = ~sitearg~
     { settings :: AppConfig DefaultEnv
     , getLogger :: Logger
     , getStatic :: Static -- ^ Settings for static file serving.
-    , connPool :: Settings.ConnectionPool -- ^ Database connection pool.
+    , connPool :: Database.Persist.Base.PersistConfigPool Settings.PersistConfig -- ^ Database connection pool.
     }
 
 -- Set up i18n messages. See the message folder.
@@ -121,7 +122,7 @@ instance Yesod ~sitearg~ where
 instance YesodPersist ~sitearg~ where
     type YesodPersistBackend ~sitearg~ = ~dbMonad~
     runDB f = liftIOHandler
-            $ fmap connPool getYesod >>= Settings.runConnectionPool f
+            $ fmap connPool getYesod >>= Database.Persist.Base.runPool (undefined :: Settings.PersistConfig) f
 
 instance YesodAuth ~sitearg~ where
     type AuthId ~sitearg~ = UserId
diff --git a/yesod/scaffold/Settings.hs.cg b/yesod/scaffold/Settings.hs.cg
index 5a7a4f70..6ab29b6f 100644
--- a/yesod/scaffold/Settings.hs.cg
+++ b/yesod/scaffold/Settings.hs.cg
@@ -8,21 +8,21 @@
 -- declared in the Foundation.hs file.
 module Settings
     ( widgetFile
-    , ConnectionPool
-    , withConnectionPool
-    , runConnectionPool
+    , PersistConfig
     , staticRoot
     , staticDir
     ) where
 
 import Text.Shakespeare.Text (st)
 import Language.Haskell.TH.Syntax
-import Database.Persist.~importPersist~
-import Yesod (liftIO, MonadControlIO)
+import Database.Persist.~importPersist~ (~configPersist~)
 import Yesod.Default.Config
 import qualified Yesod.Default.Util
 import Data.Text (Text)
 
+-- | Which Persistent backend this site is using.
+type PersistConfig = ~configPersist~
+
 -- Static setting below. Changing these requires a recompile
 
 -- | The location of static files on your system. This is a file system
@@ -50,12 +50,6 @@ staticRoot conf = [st|#{appRoot conf}/static|]
 -- The rest of this file contains settings which rarely need changing by a
 -- user.
 
--- The next functions are for allocating a connection pool and running
--- database actions using a pool, respectively. They are used internally
--- by the scaffolded application, and therefore you will rarely need to use
--- them yourself.
-~withConnectionPool~
-
 widgetFile :: String -> Q Exp
 #if PRODUCTION
 widgetFile = Yesod.Default.Util.widgetFileProduction

From 06a83daec17a388e3ae4f4bf8315493284273ad6 Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Sun, 25 Sep 2011 18:22:02 -0700
Subject: [PATCH 067/189] update Heroku deploy instructions

---
 yesod/scaffold/deploy/Procfile.cg | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/yesod/scaffold/deploy/Procfile.cg b/yesod/scaffold/deploy/Procfile.cg
index 3f79f92c..dea34264 100644
--- a/yesod/scaffold/deploy/Procfile.cg
+++ b/yesod/scaffold/deploy/Procfile.cg
@@ -1,4 +1,4 @@
-# Simple and free deployment to Heroku.
+# Free deployment to Heroku.
 #
 #   !! Warning: You must use a 64 bit machine to compile !!
 #
@@ -10,11 +10,10 @@
 #
 #     mv deploy/Procfile ./
 #
-# * Create an empty Gemfile and Gemfile.lock
-#
-#    touch Gemfile && touch Gemfile.lock
-#
-# * TODO: code to read DATABASE_URL environment variable.
+# * Create an empty package.json
+#     echo '{ "name": "~project~", "version": "0.0.1", "dependencies": {} }' >> package.json
+# 
+# * add code to read DATABASE_URL environment variable.
 # 
 #   import System.Environment
 #   main = do
@@ -22,6 +21,20 @@
 #     # parse env variable
 #     # pass settings to withConnectionPool instead of directly using loadConnStr
 #
+# * add code in Settings.hs to turn that url into connection parameters. The below works for Postgresql.
+#
+#     #ifdef PRODUCTION
+#     import qualified Web.Heroku
+#     #endif
+#
+#     dbConnParams :: AppEnvironment -> IO [(Text, Text)]
+#     #ifdef PRODUCTION
+#     dbConnParams _ = Web.Heroku.dbConnParams
+#     #else
+#     dbConnParams env = do
+#       ...
+#
+#
 # Heroku setup:
 # Find the Heroku guide. Roughly:
 #
@@ -36,7 +49,9 @@
 # Repeat these steps to deploy:
 # * add your web executable binary (referenced below) to the git repository
 #
+#     git checkout deply
 #     git add ./dist/build/~project~/~project~
+#     git commit -m deploy
 #
 # * push to Heroku
 #

From affeaee3f714be8f3aeef3ed75c8766e5117f73c Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Sun, 25 Sep 2011 19:46:18 -0700
Subject: [PATCH 068/189] more Heroku instruction improvements

---
 yesod/scaffold/deploy/Procfile.cg | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/yesod/scaffold/deploy/Procfile.cg b/yesod/scaffold/deploy/Procfile.cg
index dea34264..69506c21 100644
--- a/yesod/scaffold/deploy/Procfile.cg
+++ b/yesod/scaffold/deploy/Procfile.cg
@@ -4,7 +4,7 @@
 #
 #   This could mean using a virtual machine. Give your VM as much memory as you can to speed up linking.
 #
-# Yesod setup:
+# Basic Yesod setup:
 #
 # * Move this file out of the deploy directory and into your root directory
 #
@@ -13,6 +13,8 @@
 # * Create an empty package.json
 #     echo '{ "name": "~project~", "version": "0.0.1", "dependencies": {} }' >> package.json
 # 
+# Postgresql Yesod setup:
+#
 # * add code to read DATABASE_URL environment variable.
 # 
 #   import System.Environment
@@ -21,6 +23,8 @@
 #     # parse env variable
 #     # pass settings to withConnectionPool instead of directly using loadConnStr
 #
+# * add a dependency on the "heroku" package in your cabal file
+#     
 # * add code in Settings.hs to turn that url into connection parameters. The below works for Postgresql.
 #
 #     #ifdef PRODUCTION
@@ -49,7 +53,7 @@
 # Repeat these steps to deploy:
 # * add your web executable binary (referenced below) to the git repository
 #
-#     git checkout deply
+#     git checkout deploy
 #     git add ./dist/build/~project~/~project~
 #     git commit -m deploy
 #

From 28e9a1f2356a46c078386521e48d4a340ce6ff20 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Tue, 27 Sep 2011 15:20:37 -0400
Subject: [PATCH 069/189] Add Y.Default.Handlers

* Provides the standard getFaviconR and getRobotsR
---
 yesod-default/Yesod/Default/Handlers.hs | 14 ++++++++++++++
 yesod-default/yesod-default.cabal       |  1 +
 2 files changed, 15 insertions(+)
 create mode 100644 yesod-default/Yesod/Default/Handlers.hs

diff --git a/yesod-default/Yesod/Default/Handlers.hs b/yesod-default/Yesod/Default/Handlers.hs
new file mode 100644
index 00000000..d5b95a1c
--- /dev/null
+++ b/yesod-default/Yesod/Default/Handlers.hs
@@ -0,0 +1,14 @@
+{-# LANGUAGE OverloadedStrings #-}
+module Yesod.Default.Handlers
+    ( getFaviconR
+    , getRobotsR
+    ) where
+
+import Yesod.Handler (GHandler, sendFile)
+import Yesod.Content (RepPlain(..), ToContent(..))
+
+getFaviconR :: GHandler s m ()
+getFaviconR = sendFile "image/x-icon" "config/favicon.ico"
+
+getRobotsR :: GHandler s m RepPlain
+getRobotsR = return $ RepPlain $ toContent ("User-agent: *" :: String)
diff --git a/yesod-default/yesod-default.cabal b/yesod-default/yesod-default.cabal
index ba8a818c..ec8524aa 100644
--- a/yesod-default/yesod-default.cabal
+++ b/yesod-default/yesod-default.cabal
@@ -37,6 +37,7 @@ library
     exposed-modules: Yesod.Default.Config
                    , Yesod.Default.Main
                    , Yesod.Default.Util
+                   , Yesod.Default.Handlers
 
     ghc-options:     -Wall
 

From bdd36399383701159ba0fe4e96cbafae880afa20 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Tue, 27 Sep 2011 17:27:48 -0400
Subject: [PATCH 070/189] update scaffold to import provided handlers

---
 yesod/scaffold/Application.hs.cg      | 10 +---------
 yesod/scaffold/tiny/Application.hs.cg | 10 +---------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/yesod/scaffold/Application.hs.cg b/yesod/scaffold/Application.hs.cg
index 46758e1d..3c60a604 100644
--- a/yesod/scaffold/Application.hs.cg
+++ b/yesod/scaffold/Application.hs.cg
@@ -1,6 +1,5 @@
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
-{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE CPP #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 module Application
@@ -14,6 +13,7 @@ import Yesod.Static
 import Yesod.Auth
 import Yesod.Default.Config
 import Yesod.Default.Main
+import Yesod.Default.Handlers
 import Yesod.Logger (Logger)
 import Data.ByteString (ByteString)
 import Data.Dynamic (Dynamic, toDyn)
@@ -27,14 +27,6 @@ import Handler.Root
 -- the comments there for more details.
 mkYesodDispatch "~sitearg~" resources~sitearg~
 
--- Some default handlers that ship with the Yesod site template. You will
--- very rarely need to modify this.
-getFaviconR :: Handler ()
-getFaviconR = sendFile "image/x-icon" "config/favicon.ico"
-
-getRobotsR :: Handler RepPlain
-getRobotsR = return $ RepPlain $ toContent ("User-agent: *" :: ByteString)
-
 -- This function allocates resources (such as a database connection pool),
 -- performs initialization and creates a WAI application. This is also the
 -- place to put your migrate statements to have automatic database
diff --git a/yesod/scaffold/tiny/Application.hs.cg b/yesod/scaffold/tiny/Application.hs.cg
index 5142288d..110747bc 100644
--- a/yesod/scaffold/tiny/Application.hs.cg
+++ b/yesod/scaffold/tiny/Application.hs.cg
@@ -1,6 +1,5 @@
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
-{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE CPP #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 module Application
@@ -13,6 +12,7 @@ import Settings
 import Yesod.Static
 import Yesod.Default.Config
 import Yesod.Default.Main (defaultDevelApp, defaultRunner)
+import Yesod.Default.Handlers (getFaviconR, getRobotsR)
 import Yesod.Logger (Logger)
 import Data.ByteString (ByteString)
 import Network.Wai (Application)
@@ -26,14 +26,6 @@ import Handler.Root
 -- the comments there for more details.
 mkYesodDispatch "~sitearg~" resources~sitearg~
 
--- Some default handlers that ship with the Yesod site template. You will
--- very rarely need to modify this.
-getFaviconR :: Handler ()
-getFaviconR = sendFile "image/x-icon" "config/favicon.ico"
-
-getRobotsR :: Handler RepPlain
-getRobotsR = return $ RepPlain $ toContent ("User-agent: *" :: ByteString)
-
 -- This function allocates resources (such as a database connection pool),
 -- performs initialization and creates a WAI application. This is also the
 -- place to put your migrate statements to have automatic database

From c7889b5e1d27d45f7d0ae5e87176884b4719ff93 Mon Sep 17 00:00:00 2001
From: Joachim Breitner <mail@joachim-breitner.de>
Date: Wed, 28 Sep 2011 11:06:41 +0200
Subject: [PATCH 071/189] Allow disabling the threaded runtime via a cabal flag

---
 yesod/yesod.cabal | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index 6ad0e432..f2e4711c 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -57,6 +57,10 @@ extra-source-files:
 
 flag ghc7
 
+flag threaded
+    default: True
+    description: Build with support for multithreaded execution
+
 library
     if flag(ghc7)
         build-depends:   base                  >= 4.3      && < 5
@@ -103,7 +107,9 @@ executable             yesod
                      , blaze-builder      >= 0.2          && < 0.4
                      , filepath           >= 1.1          && < 1.3
                      , process
-    ghc-options:       -Wall -threaded
+    ghc-options:       -Wall
+    if flag(threaded)
+        ghc-options:    -threaded
     main-is:           main.hs
     other-modules:     Scaffolding.CodeGen
                        Scaffolding.Scaffolder

From ce3f475873d4d26e458d95a348511b81629f3e7c Mon Sep 17 00:00:00 2001
From: Selman ULUG <selman.ulug@gmail.com>
Date: Thu, 29 Sep 2011 23:19:34 +0300
Subject: [PATCH 072/189] typo

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ec612e31..087952d2 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ for repo in hamlet persistent wai yesod; do
   (
     cd $repo
     git submodule update --init
-    ./script/install
+    ./scripts/install
   )
 done
 ~~~

From bdd27cbcaf5c5222062685561fdf8ca7a2e50876 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sun, 2 Oct 2011 17:04:21 +0200
Subject: [PATCH 073/189] Remove some debug output

---
 yesod-form/Yesod/Form/Fields.hs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/yesod-form/Yesod/Form/Fields.hs b/yesod-form/Yesod/Form/Fields.hs
index 4d5bc805..2440cd12 100644
--- a/yesod-form/Yesod/Form/Fields.hs
+++ b/yesod-form/Yesod/Form/Fields.hs
@@ -486,7 +486,6 @@ fileAFormReq fs = AForm $ \(master, langs) menvs ints -> do
 
 fileAFormOpt :: (RenderMessage master msg, RenderMessage master FormMessage) => FieldSettings msg -> AForm sub master (Maybe FileInfo)
 fileAFormOpt fs = AForm $ \(master, langs) menvs ints -> do
-    liftIO $ print menvs
     let (name, ints') =
             case fsName fs of
                 Just x -> (x, ints)

From 85e825ca90a3f6b339bba303d5bceee76eca8099 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sun, 2 Oct 2011 17:14:07 +0200
Subject: [PATCH 074/189] Fix a warning

---
 yesod-form/Yesod/Form/Fields.hs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/yesod-form/Yesod/Form/Fields.hs b/yesod-form/Yesod/Form/Fields.hs
index 2440cd12..ad94b825 100644
--- a/yesod-form/Yesod/Form/Fields.hs
+++ b/yesod-form/Yesod/Form/Fields.hs
@@ -68,7 +68,6 @@ import qualified Data.ByteString as S
 import qualified Data.ByteString.Lazy as L
 import Data.Text (Text, unpack, pack)
 import qualified Data.Text.Read
-import Control.Monad.IO.Class (liftIO)
 import Control.Monad.Trans.Class (lift)
 
 import Control.Applicative ((<$>))

From dff2de9cae47a16d9647b8981b4653543a6a559a Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 3 Oct 2011 14:43:21 +0200
Subject: [PATCH 075/189] clientsession version bump

---
 yesod-core/yesod-core.cabal | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index 4fdee421..361eb4ff 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -1,5 +1,5 @@
 name:            yesod-core
-version:         0.9.3
+version:         0.9.3.1
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
@@ -50,7 +50,7 @@ library
                    , shakespeare-css           >= 0.10     && < 0.11
                    , blaze-builder             >= 0.2.1    && < 0.4
                    , transformers              >= 0.2      && < 0.3
-                   , clientsession             >= 0.7.2    && < 0.8
+                   , clientsession             >= 0.7.3.1  && < 0.8
                    , random                    >= 1.0.0.2  && < 1.1
                    , cereal                    >= 0.2      && < 0.4
                    , old-locale                >= 1.0.0.2  && < 1.1

From 1f88d34c0c180961ce599ecbb40abe69d679c6cf Mon Sep 17 00:00:00 2001
From: Luite Stegeman <stegeman@gmail.com>
Date: Tue, 4 Oct 2011 17:15:08 +0300
Subject: [PATCH 076/189] fix bulleted lists, typo

---
 yesod/README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/yesod/README.md b/yesod/README.md
index fc0a9e8e..842611e5 100644
--- a/yesod/README.md
+++ b/yesod/README.md
@@ -1,11 +1,13 @@
 # Overview
 
 The yesod package
+
 * groups together the various Yesod related packages into one cohesive whole.
 * contains the executable yesod
 
 There are 2 main features of the executable
-* yesod devel - star a development environment
+
+* yesod devel - start a development environment
 * yesod init - create a scaffolded site
 
 # Scaffolding

From 4070b8e49a30a697e6096a7c4544a604c41cf4a1 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 5 Oct 2011 07:19:37 +0200
Subject: [PATCH 077/189] yesod-auth: redirectToReferer

---
 yesod-auth/Yesod/Auth.hs    | 14 ++++++++++++--
 yesod-auth/openid.hs        | 10 ++++++++--
 yesod-auth/yesod-auth.cabal |  2 +-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/yesod-auth/Yesod/Auth.hs b/yesod-auth/Yesod/Auth.hs
index ae5e5074..07b9ed86 100644
--- a/yesod-auth/Yesod/Auth.hs
+++ b/yesod-auth/Yesod/Auth.hs
@@ -96,6 +96,11 @@ class (Yesod m, SinglePiece (AuthId m), RenderMessage m FormMessage) => YesodAut
                       -> AuthMessage -> Text
     renderAuthMessage _ _ = defaultMessage
 
+    -- | After login and logout, redirect to the referring page, instead of
+    -- 'loginDest' and 'logoutDest'. Default is 'False'.
+    redirectToReferer :: m -> Bool
+    redirectToReferer _ = False
+
 mkYesodSub "Auth"
     [ ClassP ''YesodAuth [VarT $ mkName "master"]
     ]
@@ -149,11 +154,16 @@ $nothing
             [ (T.pack "logged_in", Bool $ maybe False (const True) creds)
             ]
 
+setUltDestReferer' :: YesodAuth master => GHandler sub master ()
+setUltDestReferer' = do
+    m <- getYesod
+    when (redirectToReferer m) setUltDestReferer
+
 getLoginR :: YesodAuth m => GHandler Auth m RepHtml
-getLoginR = setUltDestReferer >> loginHandler
+getLoginR = setUltDestReferer' >> loginHandler
 
 getLogoutR :: YesodAuth m => GHandler Auth m ()
-getLogoutR = setUltDestReferer >> postLogoutR -- FIXME redirect to post
+getLogoutR = setUltDestReferer' >> postLogoutR -- FIXME redirect to post
 
 postLogoutR :: YesodAuth m => GHandler Auth m ()
 postLogoutR = do
diff --git a/yesod-auth/openid.hs b/yesod-auth/openid.hs
index e12cbe2a..74105021 100644
--- a/yesod-auth/openid.hs
+++ b/yesod-auth/openid.hs
@@ -20,14 +20,20 @@ mkYesod "BID" [parseRoutes|
 /auth AuthR Auth getAuth
 |]
 
-getRootR :: Handler ()
-getRootR = redirect RedirectTemporary $ AuthR LoginR
+getRootR :: Handler RepHtml
+getRootR = getAfterLoginR
 
 getAfterLoginR :: Handler RepHtml
 getAfterLoginR = do
     mauth <- maybeAuthId
     defaultLayout $ addHamlet [hamlet|
 <p>Auth: #{show mauth}
+$maybe _ <- mauth
+    <p>
+        <a href=@{AuthR LogoutR}>Logout
+$nothing
+    <p>
+        <a href=@{AuthR LoginR}>Login
 |]
 
 instance Yesod BID where
diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal
index 331da47b..3e51bb21 100644
--- a/yesod-auth/yesod-auth.cabal
+++ b/yesod-auth/yesod-auth.cabal
@@ -1,5 +1,5 @@
 name:            yesod-auth
-version:         0.7.3
+version:         0.7.4
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman, Patrick Brisbin

From 8e1d49aa59440990eee8c04ec4fac04c5a41c128 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 5 Oct 2011 13:36:10 +0200
Subject: [PATCH 078/189] Avoid resource exhaustion in yesod-static

---
 yesod-static/Yesod/Static.hs    | 32 ++++++++++++++++++++++++--------
 yesod-static/yesod-static.cabal |  3 ++-
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/yesod-static/Yesod/Static.hs b/yesod-static/Yesod/Static.hs
index be5e45e8..77c3a438 100644
--- a/yesod-static/Yesod/Static.hs
+++ b/yesod-static/Yesod/Static.hs
@@ -65,6 +65,9 @@ import qualified Data.ByteString as S
 import Network.HTTP.Types (status301)
 import System.PosixCompat.Files (getFileStatus, modificationTime)
 import System.Posix.Types (EpochTime)
+import qualified Data.Enumerator as E
+import qualified Data.Enumerator.List as EL
+import qualified Data.Enumerator.Binary as EB
 
 import Network.Wai.Application.Static
     ( StaticSettings (..)
@@ -271,22 +274,35 @@ mkStaticFilesList fp fs routeConName makeHash = do
                 ]
             ]
 
+-- don't use L.readFile here, since it doesn't close handles quickly enough if
+-- there are lots of files in the static folder, it will cause exhausted file
+-- descriptors
 base64md5File :: Prelude.FilePath -> IO String
 base64md5File file = do
-  contents <- L.readFile file
-  return $ base64md5 contents
+    bss <- E.run_ $ EB.enumFile file E.$$ EL.consume
+    return $ base64md5 $ L.fromChunks bss
+    -- FIXME I'd like something streaming instead
+    {-
+    fmap (base64 . finalize) $ E.run_ $
+    EB.enumFile file E.$$ EL.fold go (md5InitialContext, "")
+  where
+    go (context, prev) next = (md5Update context prev, next)
+    finalize (context, end) = md5Finalize context end
+    -}
 
 -- | md5-hashes the given lazy bytestring and returns the hash as
 -- base64url-encoded string.
 --
 -- This function returns the first 8 characters of the hash.
 base64md5 :: L.ByteString -> String
-base64md5 = map tr
-          . take 8
-          . S8.unpack
-          . Data.ByteString.Base64.encode
-          . Data.Serialize.encode
-          . md5
+base64md5 = base64 . md5
+
+base64 :: MD5Digest -> String
+base64 = map tr
+       . take 8
+       . S8.unpack
+       . Data.ByteString.Base64.encode
+       . Data.Serialize.encode
   where
     tr '+' = '-'
     tr '/' = '_'
diff --git a/yesod-static/yesod-static.cabal b/yesod-static/yesod-static.cabal
index 50b1d2f6..fc455c10 100644
--- a/yesod-static/yesod-static.cabal
+++ b/yesod-static/yesod-static.cabal
@@ -1,5 +1,5 @@
 name:            yesod-static
-version:         0.3.1
+version:         0.3.1.1
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
@@ -36,6 +36,7 @@ library
                    , file-embed                >= 0.0.4.1  && < 0.5
                    , http-types                >= 0.6.5    && < 0.7
                    , unix-compat               >= 0.2      && < 0.3
+                   , enumerator                >= 0.4.14   && < 0.5
     exposed-modules: Yesod.Static
     ghc-options:     -Wall
 

From e5426f8696866d056449f1f3c4ebcdc887fc990a Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 5 Oct 2011 14:35:44 +0200
Subject: [PATCH 079/189] Yesod version bump

---
 yesod/yesod.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index f2e4711c..2692cb3d 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -1,5 +1,5 @@
 name:            yesod
-version:         0.9.2.2
+version:         0.9.3
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>

From 35274e4859e3f6c777dda8fbd789797fc5ec9a1d Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 6 Oct 2011 16:22:21 +0200
Subject: [PATCH 080/189] ErrorHandlingBug (from Aur)

---
 yesod-core/test/Test/ErrorHandling.hs | 98 +++++++++++++++++++++++++++
 yesod-core/test/main.hs               |  2 +
 yesod-core/yesod-core.cabal           |  5 +-
 3 files changed, 103 insertions(+), 2 deletions(-)
 create mode 100644 yesod-core/test/Test/ErrorHandling.hs

diff --git a/yesod-core/test/Test/ErrorHandling.hs b/yesod-core/test/Test/ErrorHandling.hs
new file mode 100644
index 00000000..4d7761e0
--- /dev/null
+++ b/yesod-core/test/Test/ErrorHandling.hs
@@ -0,0 +1,98 @@
+{-# LANGUAGE TypeFamilies, QuasiQuotes, TemplateHaskell, MultiParamTypeClasses, OverloadedStrings #-}
+module Test.ErrorHandling
+    ( errorHandlingTest
+    , Widget
+    ) where
+import Yesod.Core
+import Test.Hspec
+import Test.Hspec.HUnit()
+import Network.Wai
+import Network.Wai.Test
+import Text.Hamlet (hamlet)
+import qualified Data.ByteString.Lazy as L
+import qualified Data.ByteString.Char8 as S8
+
+data App = App
+
+mkYesod "App" [parseRoutes|
+/               HomeR GET
+/not_found      NotFoundR POST
+/first_thing    FirstThingR POST
+/after_runRequestBody AfterRunRequestBodyR POST
+|]
+
+instance Yesod App where approot _ = ""
+
+getHomeR :: Handler RepHtml
+getHomeR = defaultLayout $ toWidget [hamlet|
+!!!
+
+<html>
+  <body>
+    <form method=post action=@{NotFoundR}>
+      <input type=submit value="Not found">
+    <form method=post action=@{FirstThingR}>
+      <input type=submit value="Error is thrown first thing in handler">
+    <form method=post action=@{AfterRunRequestBodyR}>
+      <input type=submit value="BUGGY: Error thrown after runRequestBody">
+|]
+
+postNotFoundR, postFirstThingR, postAfterRunRequestBodyR :: Handler RepHtml
+postNotFoundR = do
+   (_, _files) <- runRequestBody
+   _ <- notFound
+   getHomeR
+
+postFirstThingR = do
+   _ <- error "There was an error 3.14159"
+   getHomeR
+
+postAfterRunRequestBodyR = do
+   x <- runRequestBody
+   _ <- error $ show x
+   getHomeR
+
+errorHandlingTest :: [Spec]
+errorHandlingTest = describe "Test.ErrorHandling"
+    [ it "says not found" caseNotFound
+    , it "says 'There was an error' before runRequestBody" caseBefore
+    , it "says 'There was an error' after runRequestBody" caseAfter
+    ]
+
+runner :: Session () -> IO ()
+runner f = toWaiApp App >>= runSession f
+
+caseNotFound :: IO ()
+caseNotFound = runner $ do
+    res <- request defaultRequest
+            { pathInfo = ["not_found"]
+            , requestMethod = "POST"
+            }
+    assertStatus 404 res
+    assertBodyContains "Not Found" res
+
+caseBefore :: IO ()
+caseBefore = runner $ do
+    res <- request defaultRequest
+            { pathInfo = ["first_thing"]
+            , requestMethod = "POST"
+            }
+    assertStatus 500 res
+    assertBodyContains "There was an error 3.14159" res
+
+caseAfter :: IO ()
+caseAfter = runner $ do
+    let content = "foo=bar&baz=bin12345"
+    res <- srequest SRequest
+        { simpleRequest = defaultRequest
+            { pathInfo = ["after_runRequestBody"]
+            , requestMethod = "POST"
+            , requestHeaders =
+                [ ("content-type", "application/x-www-form-urlencoded")
+                , ("content-length", S8.pack $ show $ L.length content)
+                ]
+            }
+        , simpleRequestBody = content
+        }
+    assertStatus 500 res
+    assertBodyContains "There was an error 2.71828" res
diff --git a/yesod-core/test/main.hs b/yesod-core/test/main.hs
index 00cff379..2afdda64 100644
--- a/yesod-core/test/main.hs
+++ b/yesod-core/test/main.hs
@@ -7,6 +7,7 @@ import Test.Media
 import Test.Links
 import Test.NoOverloadedStrings
 import Test.InternalRequest
+import Test.ErrorHandling
 
 main :: IO ()
 main = hspecX $ descriptions $
@@ -17,4 +18,5 @@ main = hspecX $ descriptions $
     , linksTest
     , noOverloadedTest
     , internalRequestTest
+    , errorHandlingTest
     ]
diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index 361eb4ff..e3d3bbaa 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -23,6 +23,7 @@ extra-source-files:
   test/Test/CleanPath.hs
   test/Test/Links.hs
   test/Test/InternalRequest.hs
+  test/Test/ErrorHandling.hs
   test/main.hs
 
 flag test
@@ -107,8 +108,8 @@ test-suite runtests
         build-depends:   base                      >= 4        && < 4.3
         main-is:         main.hs
     cpp-options:   -DTEST
-    build-depends: hspec >= 0.8 && < 0.9
-                  ,wai-test
+    build-depends: hspec >= 0.8 && < 0.10
+                  ,wai-test >= 0.1.2 && < 0.2
                   ,wai
                   ,yesod-core
                   ,bytestring

From f5b5dc9b102e023e92093c2bb89658a7c6eb9510 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 6 Oct 2011 16:46:02 +0200
Subject: [PATCH 081/189] Distilled ErrorHandling bug to simple catchIter bug

---
 yesod-core/Yesod/Handler.hs           |  7 +------
 yesod-core/Yesod/Internal/TestApi.hs  | 11 +++++++++++
 yesod-core/test/Test/ErrorHandling.hs | 13 +++++++++++++
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/yesod-core/Yesod/Handler.hs b/yesod-core/Yesod/Handler.hs
index 8fe9ac22..e8659fb8 100644
--- a/yesod-core/Yesod/Handler.hs
+++ b/yesod-core/Yesod/Handler.hs
@@ -164,6 +164,7 @@ import Data.Text (Text)
 import Yesod.Message (RenderMessage (..))
 
 import Text.Blaze (toHtml, preEscapedText)
+import Yesod.Internal.TestApi (catchIter)
 
 -- | The type-safe URLs associated with a site argument.
 type family Route a
@@ -420,12 +421,6 @@ runHandler handler mrender sroute tomr ma sa =
                 finalSession
         HCWai r -> return $ YARWai r
 
-catchIter :: Exception e
-          => Iteratee ByteString IO a
-          -> (e -> Iteratee ByteString IO a)
-          -> Iteratee ByteString IO a
-catchIter (Iteratee mstep) f = Iteratee $ mstep `E.catch` (runIteratee . f)
-
 safeEh :: ErrorResponse -> YesodApp
 safeEh er = YesodApp $ \_ _ _ session -> do
     liftIO $ hPutStrLn stderr $ "Error handler errored out: " ++ show er
diff --git a/yesod-core/Yesod/Internal/TestApi.hs b/yesod-core/Yesod/Internal/TestApi.hs
index ffb1387e..55090ae5 100644
--- a/yesod-core/Yesod/Internal/TestApi.hs
+++ b/yesod-core/Yesod/Internal/TestApi.hs
@@ -6,6 +6,17 @@
 --
 module Yesod.Internal.TestApi
   ( randomString, parseWaiRequest'
+  , catchIter
   ) where
 
 import Yesod.Internal.Request (randomString, parseWaiRequest')
+import Control.Exception (Exception, catch)
+import Data.Enumerator (Iteratee (..))
+import Data.ByteString (ByteString)
+import Prelude hiding (catch)
+
+catchIter :: Exception e
+          => Iteratee ByteString IO a
+          -> (e -> Iteratee ByteString IO a)
+          -> Iteratee ByteString IO a
+catchIter (Iteratee mstep) f = Iteratee $ mstep `catch` (runIteratee . f)
diff --git a/yesod-core/test/Test/ErrorHandling.hs b/yesod-core/test/Test/ErrorHandling.hs
index 4d7761e0..7c853697 100644
--- a/yesod-core/test/Test/ErrorHandling.hs
+++ b/yesod-core/test/Test/ErrorHandling.hs
@@ -11,6 +11,10 @@ import Network.Wai.Test
 import Text.Hamlet (hamlet)
 import qualified Data.ByteString.Lazy as L
 import qualified Data.ByteString.Char8 as S8
+import Yesod.Internal.TestApi
+import qualified Data.Enumerator as E
+import qualified Data.Enumerator.List as EL
+import Control.Exception (SomeException)
 
 data App = App
 
@@ -57,6 +61,7 @@ errorHandlingTest = describe "Test.ErrorHandling"
     [ it "says not found" caseNotFound
     , it "says 'There was an error' before runRequestBody" caseBefore
     , it "says 'There was an error' after runRequestBody" caseAfter
+    , it "catchIter handles internal exceptions" caseCatchIter
     ]
 
 runner :: Session () -> IO ()
@@ -96,3 +101,11 @@ caseAfter = runner $ do
         }
     assertStatus 500 res
     assertBodyContains "There was an error 2.71828" res
+
+caseCatchIter :: IO ()
+caseCatchIter = E.run_ $ E.enumList 8 (replicate 1000 "foo") E.$$ flip catchIter ignorer $ do
+    _ <- EL.consume
+    error "foo"
+  where
+    ignorer :: SomeException -> E.Iteratee a IO ()
+    ignorer _ = return ()

From e5a44cfc8e0347368469c82c789dd43b35c41e81 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 6 Oct 2011 16:51:20 +0200
Subject: [PATCH 082/189] Fix catchIter

---
 yesod-core/Yesod/Handler.hs           | 1 -
 yesod-core/Yesod/Internal/TestApi.hs  | 9 +++++++--
 yesod-core/test/Test/ErrorHandling.hs | 2 +-
 yesod-core/yesod-core.cabal           | 1 +
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/yesod-core/Yesod/Handler.hs b/yesod-core/Yesod/Handler.hs
index e8659fb8..23e9a08f 100644
--- a/yesod-core/Yesod/Handler.hs
+++ b/yesod-core/Yesod/Handler.hs
@@ -119,7 +119,6 @@ import Yesod.Internal
 import Data.Time (UTCTime)
 
 import Control.Exception hiding (Handler, catch, finally)
-import qualified Control.Exception as E
 import Control.Applicative
 
 import Control.Monad (liftM, join, MonadPlus)
diff --git a/yesod-core/Yesod/Internal/TestApi.hs b/yesod-core/Yesod/Internal/TestApi.hs
index 55090ae5..8ff18528 100644
--- a/yesod-core/Yesod/Internal/TestApi.hs
+++ b/yesod-core/Yesod/Internal/TestApi.hs
@@ -11,7 +11,7 @@ module Yesod.Internal.TestApi
 
 import Yesod.Internal.Request (randomString, parseWaiRequest')
 import Control.Exception (Exception, catch)
-import Data.Enumerator (Iteratee (..))
+import Data.Enumerator (Iteratee (..), Step (..))
 import Data.ByteString (ByteString)
 import Prelude hiding (catch)
 
@@ -19,4 +19,9 @@ catchIter :: Exception e
           => Iteratee ByteString IO a
           -> (e -> Iteratee ByteString IO a)
           -> Iteratee ByteString IO a
-catchIter (Iteratee mstep) f = Iteratee $ mstep `catch` (runIteratee . f)
+catchIter (Iteratee mstep) f = Iteratee $ do
+    step <- mstep `catch` (runIteratee . f)
+    return $ case step of
+        Continue k -> Continue $ \s -> catchIter (k s) f
+        Yield b s -> Yield b s
+        Error e -> Error e
diff --git a/yesod-core/test/Test/ErrorHandling.hs b/yesod-core/test/Test/ErrorHandling.hs
index 7c853697..51dd8c67 100644
--- a/yesod-core/test/Test/ErrorHandling.hs
+++ b/yesod-core/test/Test/ErrorHandling.hs
@@ -100,7 +100,7 @@ caseAfter = runner $ do
         , simpleRequestBody = content
         }
     assertStatus 500 res
-    assertBodyContains "There was an error 2.71828" res
+    assertBodyContains "bin12345" res
 
 caseCatchIter :: IO ()
 caseCatchIter = E.run_ $ E.enumList 8 (replicate 1000 "foo") E.$$ flip catchIter ignorer $ do
diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index e3d3bbaa..e97a16c2 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -121,6 +121,7 @@ test-suite runtests
                   , random
                   ,HUnit
                   ,QuickCheck >= 2 && < 3
+                  , enumerator
     ghc-options:     -Wall
 
 source-repository head

From beca46247186a2de3874980a94042ea8651cdb2d Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 6 Oct 2011 20:38:29 +0200
Subject: [PATCH 083/189] Version bump

---
 yesod-core/yesod-core.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index e97a16c2..2bba3e64 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -1,5 +1,5 @@
 name:            yesod-core
-version:         0.9.3.1
+version:         0.9.3.2
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>

From 2ffb5007fe16987ee1440cf16f2856a07c807810 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Thu, 6 Oct 2011 21:45:17 -0400
Subject: [PATCH 084/189] fix filename mismatch in scaffolder

---
 yesod/Scaffolding/Scaffolder.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yesod/Scaffolding/Scaffolder.hs b/yesod/Scaffolding/Scaffolder.hs
index 120ec18b..15790c95 100644
--- a/yesod/Scaffolding/Scaffolder.hs
+++ b/yesod/Scaffolding/Scaffolder.hs
@@ -95,7 +95,7 @@ scaffold = do
           case backend of
             MongoDB -> "mongoDB"
             Sqlite -> "sqlite"
-            Postgresql -> "postgres"
+            Postgresql -> "postgresql"
             Tiny -> error "Accessing dbConfigFile for Tiny"
 
     let configPersist =

From 6757f2e2118fb00f92c28535b50d9eb69a020484 Mon Sep 17 00:00:00 2001
From: Clint Adams <clint@debian.org>
Date: Sat, 8 Oct 2011 12:13:26 -0400
Subject: [PATCH 085/189] Depend on a blaze-html version with
 unsafeLazyByteString.

---
 yesod-core/yesod-core.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index 2bba3e64..7c7bec8a 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -60,7 +60,7 @@ library
                    , monad-control             >= 0.2      && < 0.3
                    , enumerator                >= 0.4.7    && < 0.5
                    , cookie                    >= 0.3      && < 0.4
-                   , blaze-html                >= 0.4      && < 0.5
+                   , blaze-html                >= 0.4.1.3  && < 0.5
                    , http-types                >= 0.6.5    && < 0.7
                    , case-insensitive          >= 0.2      && < 0.4
                    , parsec                    >= 2        && < 3.2

From 7b801c279bfb21f6bd48210acbd45f23f8f3a3dd Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Sun, 9 Oct 2011 16:34:21 -0700
Subject: [PATCH 086/189] add comment

---
 yesod/scaffold/config/models.cg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/yesod/scaffold/config/models.cg b/yesod/scaffold/config/models.cg
index 38f54955..c6e732e2 100644
--- a/yesod/scaffold/config/models.cg
+++ b/yesod/scaffold/config/models.cg
@@ -8,3 +8,4 @@ Email
     verkey Text Maybe
     UniqueEmail email
 
+ -- By default this file is used in Model.hs (which is imported by Foundation.hs)

From ea224733c0fc96571ffbe9e285d46fbd20bc31a4 Mon Sep 17 00:00:00 2001
From: Nick Partridge <nkpart@gmail.com>
Date: Wed, 12 Oct 2011 09:21:22 +1000
Subject: [PATCH 087/189] Allows passing through a set of openid extension
 fields, and returns the full openid response params in credsExtra

---
 yesod-auth/Yesod/Auth/OpenId.hs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/yesod-auth/Yesod/Auth/OpenId.hs b/yesod-auth/Yesod/Auth/OpenId.hs
index 4f650be4..38891278 100644
--- a/yesod-auth/Yesod/Auth/OpenId.hs
+++ b/yesod-auth/Yesod/Auth/OpenId.hs
@@ -3,6 +3,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 module Yesod.Auth.OpenId
     ( authOpenId
+    , authOpenIdExtended
     , forwardUrl
     ) where
 
@@ -26,7 +27,10 @@ forwardUrl :: AuthRoute
 forwardUrl = PluginR "openid" ["forward"]
 
 authOpenId :: YesodAuth m => AuthPlugin m
-authOpenId =
+authOpenId = authOpenIdExtended []
+
+authOpenIdExtended :: YesodAuth m => [(Text, Text)] -> AuthPlugin m
+authOpenIdExtended extensionFields =
     AuthPlugin "openid" dispatch login
   where
     complete = PluginR "openid" ["complete"]
@@ -57,7 +61,7 @@ authOpenId =
                 render <- getUrlRender
                 toMaster <- getRouteToMaster
                 let complete' = render $ toMaster complete
-                res <- runAttemptT $ OpenId.getForwardUrl oid complete' Nothing []
+                res <- runAttemptT $ OpenId.getForwardUrl oid complete' Nothing extensionFields 
                 attempt
                   (\err -> do
                         setMessage $ toHtml $ show err
@@ -87,5 +91,5 @@ completeHelper gets' = do
             setMessage $ toHtml $ show err
             redirect RedirectTemporary $ toMaster LoginR
         let onSuccess (OpenId.Identifier ident, _) =
-                setCreds True $ Creds "openid" ident []
+                setCreds True $ Creds "openid" ident gets'
         attempt onFailure onSuccess res

From 0d716a50c28f3bb32125bf71bb07be27809546cf Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Fri, 14 Oct 2011 07:44:50 +0200
Subject: [PATCH 088/189] yesod-static: fix containers dep

---
 yesod-static/yesod-static.cabal | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yesod-static/yesod-static.cabal b/yesod-static/yesod-static.cabal
index fc455c10..8ca6961f 100644
--- a/yesod-static/yesod-static.cabal
+++ b/yesod-static/yesod-static.cabal
@@ -1,5 +1,5 @@
 name:            yesod-static
-version:         0.3.1.1
+version:         0.3.1.2
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
@@ -20,7 +20,7 @@ flag test
 
 library
     build-depends:   base                      >= 4        && < 5
-                   , containers                >= 0.4
+                   , containers
                    , old-time                  >= 1.0
                    , yesod-core                >= 0.9      && < 0.10
                    , base64-bytestring         >= 0.1.0.1  && < 0.2

From 7e37608df95c909913f6e96ab900be14cd1ddf70 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Fri, 14 Oct 2011 09:44:56 +0200
Subject: [PATCH 089/189] Scaffolding: unified templates folder

---
 yesod-default/Yesod/Default/Util.hs           | 16 ++++-----
 yesod-default/yesod-default.cabal             |  2 +-
 yesod/Scaffolding/Scaffolder.hs               | 34 +++++++++----------
 yesod/scaffold/Foundation.hs.cg               |  2 +-
 yesod/scaffold/project.cabal.cg               |  2 +-
 .../boilerplate-layout.hamlet.cg              |  0
 .../default-layout-wrapper.hamlet.cg          |  0
 .../default-layout.hamlet.cg                  |  0
 .../default-layout.lucius.cg                  |  0
 .../{hamlet => templates}/homepage.hamlet.cg  |  0
 .../{julius => templates}/homepage.julius.cg  |  0
 .../{lucius => templates}/homepage.lucius.cg  |  0
 .../{lucius => templates}/normalize.lucius.cg |  0
 yesod/scaffold/tiny/Application.hs.cg         |  1 -
 yesod/scaffold/tiny/Foundation.hs.cg          |  2 +-
 yesod/scaffold/tiny/project.cabal.cg          |  2 +-
 yesod/yesod.cabal                             | 16 ++++-----
 17 files changed, 38 insertions(+), 39 deletions(-)
 rename yesod/scaffold/{hamlet => templates}/boilerplate-layout.hamlet.cg (100%)
 rename yesod/scaffold/{hamlet => templates}/default-layout-wrapper.hamlet.cg (100%)
 rename yesod/scaffold/{hamlet => templates}/default-layout.hamlet.cg (100%)
 rename yesod/scaffold/{lucius => templates}/default-layout.lucius.cg (100%)
 rename yesod/scaffold/{hamlet => templates}/homepage.hamlet.cg (100%)
 rename yesod/scaffold/{julius => templates}/homepage.julius.cg (100%)
 rename yesod/scaffold/{lucius => templates}/homepage.lucius.cg (100%)
 rename yesod/scaffold/{lucius => templates}/normalize.lucius.cg (100%)

diff --git a/yesod-default/Yesod/Default/Util.hs b/yesod-default/Yesod/Default/Util.hs
index 4ab93b33..fa21a8b3 100644
--- a/yesod-default/Yesod/Default/Util.hs
+++ b/yesod-default/Yesod/Default/Util.hs
@@ -58,18 +58,18 @@ globFile kind x = kind ++ "/" ++ x ++ "." ++ kind
 
 widgetFileProduction :: FilePath -> Q Exp
 widgetFileProduction x = do
-    let h = whenExists x "hamlet"  whamletFile
-    let c = whenExists x "cassius" cassiusFile
-    let j = whenExists x "julius"  juliusFile
-    let l = whenExists x "lucius"  luciusFile
+    let h = whenExists x "templates"  whamletFile
+    let c = whenExists x "templates" cassiusFile
+    let j = whenExists x "templates"  juliusFile
+    let l = whenExists x "templates"  luciusFile
     [|$h >> addCassius $c >> addJulius $j >> addLucius $l|]
 
 widgetFileDebug :: FilePath -> Q Exp
 widgetFileDebug x = do
-    let h = whenExists x "hamlet"  whamletFile
-    let c = whenExists x "cassius" cassiusFileDebug
-    let j = whenExists x "julius"  juliusFileDebug
-    let l = whenExists x "lucius"  luciusFileDebug
+    let h = whenExists x "templates"  whamletFile
+    let c = whenExists x "templates" cassiusFileDebug
+    let j = whenExists x "templates"  juliusFileDebug
+    let l = whenExists x "templates"  luciusFileDebug
     [|$h >> addCassius $c >> addJulius $j >> addLucius $l|]
 
 whenExists :: String -> String -> (FilePath -> Q Exp) -> Q Exp
diff --git a/yesod-default/yesod-default.cabal b/yesod-default/yesod-default.cabal
index ec8524aa..7c43324a 100644
--- a/yesod-default/yesod-default.cabal
+++ b/yesod-default/yesod-default.cabal
@@ -1,5 +1,5 @@
 name:            yesod-default
-version:         0.3.1
+version:         0.4.0
 license:         BSD3
 license-file:    LICENSE
 author:          Patrick Brisbin
diff --git a/yesod/Scaffolding/Scaffolder.hs b/yesod/Scaffolding/Scaffolder.hs
index 15790c95..b48fcee2 100644
--- a/yesod/Scaffolding/Scaffolder.hs
+++ b/yesod/Scaffolding/Scaffolder.hs
@@ -128,10 +128,7 @@ scaffold = do
         mkDir fp = createDirectoryIfMissing True $ dir ++ '/' : fp
 
     mkDir "Handler"
-    mkDir "hamlet"
-    mkDir "cassius"
-    mkDir "lucius"
-    mkDir "julius"
+    mkDir "templates"
     mkDir "static"
     mkDir "static/css"
     mkDir "static/js"
@@ -163,20 +160,23 @@ scaffold = do
     unless isTiny $ writeFile' "Model.hs" $(codegen "Model.hs")
     writeFile' "Settings.hs" $ ifTiny $(codegen "tiny/Settings.hs") $(codegen "Settings.hs")
     writeFile' "Settings/StaticFiles.hs" $(codegen "Settings/StaticFiles.hs")
-    writeFile' "lucius/default-layout.lucius"
-        $(codegen "lucius/default-layout.lucius")
-    writeFile' "hamlet/default-layout.hamlet"
-        $(codegen "hamlet/default-layout.hamlet")
-    writeFile' "hamlet/default-layout-wrapper.hamlet"
-        $(codegen "hamlet/default-layout-wrapper.hamlet")
-    writeFile' "hamlet/boilerplate-layout.hamlet"
-        $(codegen "hamlet/boilerplate-layout.hamlet")
-    writeFile' "lucius/normalize.lucius"
-        $(codegen "lucius/normalize.lucius")
-    writeFile' "hamlet/homepage.hamlet" $(codegen "hamlet/homepage.hamlet")
+    writeFile' "templates/default-layout.lucius"
+        $(codegen "templates/default-layout.lucius")
+    writeFile' "templates/default-layout.hamlet"
+        $(codegen "templates/default-layout.hamlet")
+    writeFile' "templates/default-layout-wrapper.hamlet"
+        $(codegen "templates/default-layout-wrapper.hamlet")
+    writeFile' "templates/boilerplate-layout.hamlet"
+        $(codegen "templates/boilerplate-layout.hamlet")
+    writeFile' "templates/normalize.lucius"
+        $(codegen "templates/normalize.lucius")
+    writeFile' "templates/homepage.hamlet"
+        $(codegen "templates/homepage.hamlet")
     writeFile' "config/routes" $ ifTiny $(codegen "tiny/config/routes") $(codegen "config/routes")
-    writeFile' "lucius/homepage.lucius" $(codegen "lucius/homepage.lucius")
-    writeFile' "julius/homepage.julius" $(codegen "julius/homepage.julius")
+    writeFile' "templates/homepage.lucius"
+        $(codegen "templates/homepage.lucius")
+    writeFile' "templates/homepage.julius"
+        $(codegen "templates/homepage.julius")
     unless isTiny $ writeFile' "config/models" $(codegen "config/models")
     writeFile' "messages/en.msg" $(codegen "messages/en.msg")
 
diff --git a/yesod/scaffold/Foundation.hs.cg b/yesod/scaffold/Foundation.hs.cg
index 4e1d736b..caedd061 100644
--- a/yesod/scaffold/Foundation.hs.cg
+++ b/yesod/scaffold/Foundation.hs.cg
@@ -95,7 +95,7 @@ instance Yesod ~sitearg~ where
         pc <- widgetToPageContent $ do
             $(widgetFile "normalize")
             $(widgetFile "default-layout")
-        hamletToRepHtml $(hamletFile "hamlet/default-layout-wrapper.hamlet")
+        hamletToRepHtml $(hamletFile "templates/default-layout-wrapper.hamlet")
 
     -- This is done to provide an optimization for serving static files from
     -- a separate domain. Please see the staticRoot setting in Settings.hs
diff --git a/yesod/scaffold/project.cabal.cg b/yesod/scaffold/project.cabal.cg
index a61906c4..ac7297cb 100644
--- a/yesod/scaffold/project.cabal.cg
+++ b/yesod/scaffold/project.cabal.cg
@@ -52,7 +52,7 @@ executable         ~project~
                  , yesod-core                    >= 0.9.3      && < 0.10
                  , yesod-auth                    >= 0.7.3      && < 0.8
                  , yesod-static                  >= 0.3.1      && < 0.4
-                 , yesod-default                 >= 0.3.1      && < 0.4
+                 , yesod-default                 >= 0.4        && < 0.5
                  , yesod-form                    >= 0.3.3      && < 0.4
                  , mime-mail                     >= 0.3.0.3    && < 0.4
                  , clientsession                 >= 0.7.3      && < 0.8
diff --git a/yesod/scaffold/hamlet/boilerplate-layout.hamlet.cg b/yesod/scaffold/templates/boilerplate-layout.hamlet.cg
similarity index 100%
rename from yesod/scaffold/hamlet/boilerplate-layout.hamlet.cg
rename to yesod/scaffold/templates/boilerplate-layout.hamlet.cg
diff --git a/yesod/scaffold/hamlet/default-layout-wrapper.hamlet.cg b/yesod/scaffold/templates/default-layout-wrapper.hamlet.cg
similarity index 100%
rename from yesod/scaffold/hamlet/default-layout-wrapper.hamlet.cg
rename to yesod/scaffold/templates/default-layout-wrapper.hamlet.cg
diff --git a/yesod/scaffold/hamlet/default-layout.hamlet.cg b/yesod/scaffold/templates/default-layout.hamlet.cg
similarity index 100%
rename from yesod/scaffold/hamlet/default-layout.hamlet.cg
rename to yesod/scaffold/templates/default-layout.hamlet.cg
diff --git a/yesod/scaffold/lucius/default-layout.lucius.cg b/yesod/scaffold/templates/default-layout.lucius.cg
similarity index 100%
rename from yesod/scaffold/lucius/default-layout.lucius.cg
rename to yesod/scaffold/templates/default-layout.lucius.cg
diff --git a/yesod/scaffold/hamlet/homepage.hamlet.cg b/yesod/scaffold/templates/homepage.hamlet.cg
similarity index 100%
rename from yesod/scaffold/hamlet/homepage.hamlet.cg
rename to yesod/scaffold/templates/homepage.hamlet.cg
diff --git a/yesod/scaffold/julius/homepage.julius.cg b/yesod/scaffold/templates/homepage.julius.cg
similarity index 100%
rename from yesod/scaffold/julius/homepage.julius.cg
rename to yesod/scaffold/templates/homepage.julius.cg
diff --git a/yesod/scaffold/lucius/homepage.lucius.cg b/yesod/scaffold/templates/homepage.lucius.cg
similarity index 100%
rename from yesod/scaffold/lucius/homepage.lucius.cg
rename to yesod/scaffold/templates/homepage.lucius.cg
diff --git a/yesod/scaffold/lucius/normalize.lucius.cg b/yesod/scaffold/templates/normalize.lucius.cg
similarity index 100%
rename from yesod/scaffold/lucius/normalize.lucius.cg
rename to yesod/scaffold/templates/normalize.lucius.cg
diff --git a/yesod/scaffold/tiny/Application.hs.cg b/yesod/scaffold/tiny/Application.hs.cg
index 110747bc..7419e196 100644
--- a/yesod/scaffold/tiny/Application.hs.cg
+++ b/yesod/scaffold/tiny/Application.hs.cg
@@ -14,7 +14,6 @@ import Yesod.Default.Config
 import Yesod.Default.Main (defaultDevelApp, defaultRunner)
 import Yesod.Default.Handlers (getFaviconR, getRobotsR)
 import Yesod.Logger (Logger)
-import Data.ByteString (ByteString)
 import Network.Wai (Application)
 import Data.Dynamic (Dynamic, toDyn)
 
diff --git a/yesod/scaffold/tiny/Foundation.hs.cg b/yesod/scaffold/tiny/Foundation.hs.cg
index 50e5e1ec..c8c72d34 100644
--- a/yesod/scaffold/tiny/Foundation.hs.cg
+++ b/yesod/scaffold/tiny/Foundation.hs.cg
@@ -81,7 +81,7 @@ instance Yesod ~sitearg~ where
         pc <- widgetToPageContent $ do
             $(widgetFile "normalize")
             $(widgetFile "default-layout")
-        hamletToRepHtml $(hamletFile "hamlet/default-layout-wrapper.hamlet")
+        hamletToRepHtml $(hamletFile "templates/default-layout-wrapper.hamlet")
 
     -- This is done to provide an optimization for serving static files from
     -- a separate domain. Please see the staticroot setting in Settings.hs
diff --git a/yesod/scaffold/tiny/project.cabal.cg b/yesod/scaffold/tiny/project.cabal.cg
index 1d987f2d..d6725b56 100644
--- a/yesod/scaffold/tiny/project.cabal.cg
+++ b/yesod/scaffold/tiny/project.cabal.cg
@@ -48,7 +48,7 @@ executable         ~project~
     build-depends: base                          >= 4          && < 5
                  , yesod-core                    >= 0.9.3      && < 0.10
                  , yesod-static                  >= 0.3.1      && < 0.4
-                 , yesod-default                 >= 0.3.1      && < 0.4
+                 , yesod-default                 >= 0.4        && < 0.5
                  , clientsession                 >= 0.7.3      && < 0.8
                  , bytestring                    >= 0.9        && < 0.10
                  , text                          >= 0.11       && < 0.12
diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index 2692cb3d..9f202099 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -17,8 +17,8 @@ homepage:        http://www.yesodweb.com/
 
 extra-source-files:
   input/*.cg
-  scaffold/lucius/default-layout.lucius.cg
-  scaffold/lucius/homepage.lucius.cg
+  scaffold/templates/default-layout.lucius.cg
+  scaffold/templates/homepage.lucius.cg
   scaffold/Model.hs.cg
   scaffold/Foundation.hs.cg
   scaffold/LICENSE.cg
@@ -28,17 +28,17 @@ extra-source-files:
   scaffold/tiny/Application.hs.cg
   scaffold/tiny/config/routes.cg
   scaffold/tiny/Settings.hs.cg
-  scaffold/lucius/normalize.lucius.cg
+  scaffold/templates/normalize.lucius.cg
   scaffold/postgresqlConnPool.cg
   scaffold/sqliteConnPool.cg
   scaffold/.ghci.cg
   scaffold/project.cabal.cg
   scaffold/Application.hs.cg
-  scaffold/julius/homepage.julius.cg
-  scaffold/hamlet/homepage.hamlet.cg
-  scaffold/hamlet/default-layout.hamlet.cg
-  scaffold/hamlet/default-layout-wrapper.hamlet.cg
-  scaffold/hamlet/boilerplate-layout.hamlet.cg
+  scaffold/templates/homepage.julius.cg
+  scaffold/templates/homepage.hamlet.cg
+  scaffold/templates/default-layout.hamlet.cg
+  scaffold/templates/default-layout-wrapper.hamlet.cg
+  scaffold/templates/boilerplate-layout.hamlet.cg
   scaffold/deploy/Procfile.cg
   scaffold/main.hs.cg
   scaffold/Handler/Root.hs.cg

From 23139a579dbcd2b48062950355facf4f1e3ed122 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Fri, 14 Oct 2011 09:54:31 +0200
Subject: [PATCH 090/189] Import.hs in scaffolding

---
 yesod/Scaffolding/Scaffolder.hs      |  1 +
 yesod/scaffold/Application.hs.cg     |  1 -
 yesod/scaffold/Handler/Root.hs.cg    |  4 ++--
 yesod/scaffold/Import.hs.cg          | 18 ++++++++++++++++++
 yesod/scaffold/project.cabal.cg      |  1 +
 yesod/scaffold/tiny/project.cabal.cg |  1 +
 yesod/yesod.cabal                    |  1 +
 7 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 yesod/scaffold/Import.hs.cg

diff --git a/yesod/Scaffolding/Scaffolder.hs b/yesod/Scaffolding/Scaffolder.hs
index b48fcee2..0d814b49 100644
--- a/yesod/Scaffolding/Scaffolder.hs
+++ b/yesod/Scaffolding/Scaffolder.hs
@@ -155,6 +155,7 @@ scaffold = do
     writeFile' ".ghci" $(codegen ".ghci")
     writeFile' "LICENSE" $(codegen "LICENSE")
     writeFile' ("Foundation.hs") $ ifTiny $(codegen "tiny/Foundation.hs") $(codegen "Foundation.hs")
+    writeFile' "Import.hs" $(codegen "Import.hs")
     writeFile' "Application.hs" $ ifTiny $(codegen "tiny/Application.hs") $(codegen "Application.hs")
     writeFile' "Handler/Root.hs" $(codegen "Handler/Root.hs")
     unless isTiny $ writeFile' "Model.hs" $(codegen "Model.hs")
diff --git a/yesod/scaffold/Application.hs.cg b/yesod/scaffold/Application.hs.cg
index 3c60a604..e780f068 100644
--- a/yesod/scaffold/Application.hs.cg
+++ b/yesod/scaffold/Application.hs.cg
@@ -15,7 +15,6 @@ import Yesod.Default.Config
 import Yesod.Default.Main
 import Yesod.Default.Handlers
 import Yesod.Logger (Logger)
-import Data.ByteString (ByteString)
 import Data.Dynamic (Dynamic, toDyn)
 import qualified Database.Persist.Base~importMigration~
 
diff --git a/yesod/scaffold/Handler/Root.hs.cg b/yesod/scaffold/Handler/Root.hs.cg
index 4ee59109..1ab268e8 100644
--- a/yesod/scaffold/Handler/Root.hs.cg
+++ b/yesod/scaffold/Handler/Root.hs.cg
@@ -1,7 +1,7 @@
-{-# LANGUAGE TemplateHaskell, QuasiQuotes, OverloadedStrings #-}
+{-# LANGUAGE TemplateHaskell, QuasiQuotes, OverloadedStrings, NoImplicitPrelude #-}
 module Handler.Root where
 
-import Foundation
+import Import
 
 -- This is a handler function for the GET request method on the RootR
 -- resource pattern. All of your resource patterns are defined in
diff --git a/yesod/scaffold/Import.hs.cg b/yesod/scaffold/Import.hs.cg
new file mode 100644
index 00000000..cef85920
--- /dev/null
+++ b/yesod/scaffold/Import.hs.cg
@@ -0,0 +1,18 @@
+module Import
+    ( module Prelude
+    , module Foundation
+    , (<>)
+    , Text
+    , module Data.Monoid
+    , module Control.Applicative
+    ) where
+
+import Prelude hiding (writeFile, readFile)
+import Foundation
+import Data.Monoid (Monoid (mappend, mempty, mconcat))
+import Control.Applicative ((<$>), (<*>), pure)
+import Data.Text (Text)
+
+infixr 5 <>
+(<>) :: Monoid m => m -> m -> m
+(<>) = mappend
diff --git a/yesod/scaffold/project.cabal.cg b/yesod/scaffold/project.cabal.cg
index ac7297cb..a078def6 100644
--- a/yesod/scaffold/project.cabal.cg
+++ b/yesod/scaffold/project.cabal.cg
@@ -28,6 +28,7 @@ library
 
     exposed-modules: Application
     other-modules:   Foundation
+                     Import
                      Model
                      Settings
                      Settings.StaticFiles
diff --git a/yesod/scaffold/tiny/project.cabal.cg b/yesod/scaffold/tiny/project.cabal.cg
index d6725b56..f0a25a02 100644
--- a/yesod/scaffold/tiny/project.cabal.cg
+++ b/yesod/scaffold/tiny/project.cabal.cg
@@ -27,6 +27,7 @@ library
         Buildable: False
     exposed-modules: Application
     other-modules:   Foundation
+                     Import
                      Settings
                      Settings.StaticFiles
                      Handler.Root
diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index 9f202099..94ce8900 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -20,6 +20,7 @@ extra-source-files:
   scaffold/templates/default-layout.lucius.cg
   scaffold/templates/homepage.lucius.cg
   scaffold/Model.hs.cg
+  scaffold/Import.hs.cg
   scaffold/Foundation.hs.cg
   scaffold/LICENSE.cg
   scaffold/mongoDBConnPool.cg

From 39692f8379d2241b99b821dbde655f4e6db121a8 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Fri, 14 Oct 2011 10:10:05 +0200
Subject: [PATCH 091/189] Fixes for templates folder

---
 yesod-default/Yesod/Default/Util.hs | 20 ++++++++++----------
 yesod/Build.hs                      |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/yesod-default/Yesod/Default/Util.hs b/yesod-default/Yesod/Default/Util.hs
index fa21a8b3..1e3a5418 100644
--- a/yesod-default/Yesod/Default/Util.hs
+++ b/yesod-default/Yesod/Default/Util.hs
@@ -52,24 +52,24 @@ addStaticContentExternal minify hash staticDir toRoute ext' _ content = do
         | ext' == "js" = either (const content) id $ minify content
         | otherwise = content
 
--- | expects a root folder for each type, e.g: hamlet/ lucius/ julius/
+-- | expects a file extension for each type, e.g: hamlet lucius julius
 globFile :: String -> String -> FilePath
-globFile kind x = kind ++ "/" ++ x ++ "." ++ kind
+globFile kind x = "templates/" ++ x ++ "." ++ kind
 
 widgetFileProduction :: FilePath -> Q Exp
 widgetFileProduction x = do
-    let h = whenExists x "templates"  whamletFile
-    let c = whenExists x "templates" cassiusFile
-    let j = whenExists x "templates"  juliusFile
-    let l = whenExists x "templates"  luciusFile
+    let h = whenExists x "hamlet"  whamletFile
+    let c = whenExists x "cassius" cassiusFile
+    let j = whenExists x "julius"  juliusFile
+    let l = whenExists x "lucius"  luciusFile
     [|$h >> addCassius $c >> addJulius $j >> addLucius $l|]
 
 widgetFileDebug :: FilePath -> Q Exp
 widgetFileDebug x = do
-    let h = whenExists x "templates"  whamletFile
-    let c = whenExists x "templates" cassiusFileDebug
-    let j = whenExists x "templates"  juliusFileDebug
-    let l = whenExists x "templates"  luciusFileDebug
+    let h = whenExists x "hamlet"  whamletFile
+    let c = whenExists x "cassius" cassiusFileDebug
+    let j = whenExists x "julius"  juliusFileDebug
+    let l = whenExists x "lucius"  luciusFileDebug
     [|$h >> addCassius $c >> addJulius $j >> addLucius $l|]
 
 whenExists :: String -> String -> (FilePath -> Q Exp) -> Q Exp
diff --git a/yesod/Build.hs b/yesod/Build.hs
index f0b68ad4..51ff311c 100644
--- a/yesod/Build.hs
+++ b/yesod/Build.hs
@@ -125,7 +125,7 @@ determineHamletDeps x = do
         A.Fail{} -> return []
         A.Done _ r -> mapM go r >>= filterM doesFileExist . concat
   where
-    go (Just (Hamlet, f)) = return [f, "hamlet/" ++ f ++ ".hamlet"]
+    go (Just (Hamlet, f)) = return [f, "templates/" ++ f ++ ".hamlet"]
     go (Just (Verbatim, f)) = return [f]
     go (Just (Messages f, _)) = return [f]
     go (Just (StaticFiles fp, _)) = getFolderContents fp

From 22bf832cbbaede222abd0de2648eaf9c28620a9d Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Fri, 14 Oct 2011 10:22:54 +0200
Subject: [PATCH 092/189] Scaffolding: define extensions in cabal file

---
 yesod/scaffold/Application.hs.cg          |  5 +----
 yesod/scaffold/Foundation.hs.cg           |  4 +---
 yesod/scaffold/Handler/Root.hs.cg         |  1 -
 yesod/scaffold/Model.hs.cg                |  2 +-
 yesod/scaffold/Settings.hs.cg             |  4 +---
 yesod/scaffold/Settings/StaticFiles.hs.cg |  1 -
 yesod/scaffold/main.hs.cg                 |  1 +
 yesod/scaffold/project.cabal.cg           | 22 ++++++++++++++++++++++
 yesod/scaffold/tiny/Application.hs.cg     |  5 +----
 yesod/scaffold/tiny/Foundation.hs.cg      |  3 +--
 yesod/scaffold/tiny/Settings.hs.cg        |  4 +---
 yesod/scaffold/tiny/project.cabal.cg      | 18 ++++++++++++++++++
 12 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/yesod/scaffold/Application.hs.cg b/yesod/scaffold/Application.hs.cg
index e780f068..5914c84c 100644
--- a/yesod/scaffold/Application.hs.cg
+++ b/yesod/scaffold/Application.hs.cg
@@ -1,13 +1,10 @@
-{-# LANGUAGE TemplateHaskell #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
-{-# LANGUAGE CPP #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 module Application
     ( with~sitearg~
     , withDevelAppPort
     ) where
 
-import Foundation
+import Import
 import Settings
 import Yesod.Static
 import Yesod.Auth
diff --git a/yesod/scaffold/Foundation.hs.cg b/yesod/scaffold/Foundation.hs.cg
index caedd061..cbbbb074 100644
--- a/yesod/scaffold/Foundation.hs.cg
+++ b/yesod/scaffold/Foundation.hs.cg
@@ -1,6 +1,3 @@
-{-# LANGUAGE QuasiQuotes, TemplateHaskell, TypeFamilies #-}
-{-# LANGUAGE OverloadedStrings, MultiParamTypeClasses #-}
-{-# LANGUAGE CPP #-}
 module Foundation
     ( ~sitearg~ (..)
     , ~sitearg~Route (..)
@@ -17,6 +14,7 @@ module Foundation
     , AuthRoute (..)
     ) where
 
+import Prelude
 import Yesod
 import Yesod.Static (Static, base64md5, StaticRoute(..))
 import Settings.StaticFiles
diff --git a/yesod/scaffold/Handler/Root.hs.cg b/yesod/scaffold/Handler/Root.hs.cg
index 1ab268e8..708a5382 100644
--- a/yesod/scaffold/Handler/Root.hs.cg
+++ b/yesod/scaffold/Handler/Root.hs.cg
@@ -1,4 +1,3 @@
-{-# LANGUAGE TemplateHaskell, QuasiQuotes, OverloadedStrings, NoImplicitPrelude #-}
 module Handler.Root where
 
 import Import
diff --git a/yesod/scaffold/Model.hs.cg b/yesod/scaffold/Model.hs.cg
index 87f7e502..0c78f3d0 100644
--- a/yesod/scaffold/Model.hs.cg
+++ b/yesod/scaffold/Model.hs.cg
@@ -1,6 +1,6 @@
-{-# LANGUAGE QuasiQuotes, TypeFamilies, GeneralizedNewtypeDeriving, TemplateHaskell, GADTs #-}
 module Model where
 
+import Prelude
 import Yesod
 import Data.Text (Text)
 ~modelImports~
diff --git a/yesod/scaffold/Settings.hs.cg b/yesod/scaffold/Settings.hs.cg
index 6ab29b6f..37d07341 100644
--- a/yesod/scaffold/Settings.hs.cg
+++ b/yesod/scaffold/Settings.hs.cg
@@ -1,6 +1,3 @@
-{-# LANGUAGE CPP #-}
-{-# LANGUAGE TemplateHaskell, QuasiQuotes #-}
-{-# LANGUAGE OverloadedStrings #-}
 -- | Settings are centralized, as much as possible, into this file. This
 -- includes database connection settings, static file locations, etc.
 -- In addition, you can configure a number of different aspects of Yesod
@@ -13,6 +10,7 @@ module Settings
     , staticDir
     ) where
 
+import Prelude (FilePath, String)
 import Text.Shakespeare.Text (st)
 import Language.Haskell.TH.Syntax
 import Database.Persist.~importPersist~ (~configPersist~)
diff --git a/yesod/scaffold/Settings/StaticFiles.hs.cg b/yesod/scaffold/Settings/StaticFiles.hs.cg
index 5d9f51f3..f4f01920 100644
--- a/yesod/scaffold/Settings/StaticFiles.hs.cg
+++ b/yesod/scaffold/Settings/StaticFiles.hs.cg
@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP, QuasiQuotes, TemplateHaskell, TypeFamilies #-}
 module Settings.StaticFiles where
 
 import Yesod.Static (staticFiles, StaticRoute (StaticRoute))
diff --git a/yesod/scaffold/main.hs.cg b/yesod/scaffold/main.hs.cg
index db9ccf5b..08fb4a4c 100644
--- a/yesod/scaffold/main.hs.cg
+++ b/yesod/scaffold/main.hs.cg
@@ -1,6 +1,7 @@
 import Yesod.Default.Config (fromArgs)
 import Yesod.Default.Main   (defaultMain)
 import Application          (with~sitearg~)
+import Prelude              (IO)
 
 main :: IO ()
 main = defaultMain fromArgs with~sitearg~
diff --git a/yesod/scaffold/project.cabal.cg b/yesod/scaffold/project.cabal.cg
index a078def6..2af3df49 100644
--- a/yesod/scaffold/project.cabal.cg
+++ b/yesod/scaffold/project.cabal.cg
@@ -36,6 +36,17 @@ library
 
     ghc-options:   -Wall -threaded -O0
 
+    extensions: TemplateHaskell
+                QuasiQuotes
+                OverloadedStrings
+                NoImplicitPrelude
+                CPP
+                OverloadedStrings
+                MultiParamTypeClasses
+                TypeFamilies
+                GADTs
+                GeneralizedNewtypeDeriving
+
 executable         ~project~
     if flag(devel)
         Buildable: False
@@ -48,6 +59,17 @@ executable         ~project~
 
     main-is:       main.hs
 
+    extensions: TemplateHaskell
+                QuasiQuotes
+                OverloadedStrings
+                NoImplicitPrelude
+                CPP
+                OverloadedStrings
+                MultiParamTypeClasses
+                TypeFamilies
+                GADTs
+                GeneralizedNewtypeDeriving
+
     build-depends: base                          >= 4          && < 5
                  , yesod                         >= 0.9        && < 0.10
                  , yesod-core                    >= 0.9.3      && < 0.10
diff --git a/yesod/scaffold/tiny/Application.hs.cg b/yesod/scaffold/tiny/Application.hs.cg
index 7419e196..47ce7469 100644
--- a/yesod/scaffold/tiny/Application.hs.cg
+++ b/yesod/scaffold/tiny/Application.hs.cg
@@ -1,13 +1,10 @@
-{-# LANGUAGE TemplateHaskell #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
-{-# LANGUAGE CPP #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 module Application
     ( with~sitearg~
     , withDevelAppPort
     ) where
 
-import Foundation
+import Import
 import Settings
 import Yesod.Static
 import Yesod.Default.Config
diff --git a/yesod/scaffold/tiny/Foundation.hs.cg b/yesod/scaffold/tiny/Foundation.hs.cg
index c8c72d34..868d8fcd 100644
--- a/yesod/scaffold/tiny/Foundation.hs.cg
+++ b/yesod/scaffold/tiny/Foundation.hs.cg
@@ -1,5 +1,3 @@
-{-# LANGUAGE QuasiQuotes, TemplateHaskell, TypeFamilies #-}
-{-# LANGUAGE OverloadedStrings, MultiParamTypeClasses #-}
 module Foundation
     ( ~sitearg~ (..)
     , ~sitearg~Route (..)
@@ -14,6 +12,7 @@ module Foundation
     , liftIO
     ) where
 
+import Prelude
 import Yesod.Core
 import Yesod.Default.Config
 import Yesod.Default.Util (addStaticContentExternal)
diff --git a/yesod/scaffold/tiny/Settings.hs.cg b/yesod/scaffold/tiny/Settings.hs.cg
index fa5aa732..fdc06d96 100644
--- a/yesod/scaffold/tiny/Settings.hs.cg
+++ b/yesod/scaffold/tiny/Settings.hs.cg
@@ -1,6 +1,3 @@
-{-# LANGUAGE CPP #-}
-{-# LANGUAGE TemplateHaskell, QuasiQuotes  #-}
-{-# LANGUAGE OverloadedStrings #-}
 -- | Settings are centralized, as much as possible, into this file. This
 -- includes database connection settings, static file locations, etc.
 -- In addition, you can configure a number of different aspects of Yesod
@@ -12,6 +9,7 @@ module Settings
     , staticDir
     ) where
 
+import Prelude (FilePath, String)
 import Text.Shakespeare.Text (st)
 import Language.Haskell.TH.Syntax
 import Yesod.Default.Config
diff --git a/yesod/scaffold/tiny/project.cabal.cg b/yesod/scaffold/tiny/project.cabal.cg
index f0a25a02..72fe6f2b 100644
--- a/yesod/scaffold/tiny/project.cabal.cg
+++ b/yesod/scaffold/tiny/project.cabal.cg
@@ -34,6 +34,15 @@ library
 
     ghc-options:   -Wall -threaded -O0
 
+    extensions: TemplateHaskell
+                QuasiQuotes
+                OverloadedStrings
+                NoImplicitPrelude
+                CPP
+                OverloadedStrings
+                MultiParamTypeClasses
+                TypeFamilies
+
 executable         ~project~
     if flag(devel)
         Buildable: False
@@ -46,6 +55,15 @@ executable         ~project~
 
     main-is:       main.hs
 
+    extensions: TemplateHaskell
+                QuasiQuotes
+                OverloadedStrings
+                NoImplicitPrelude
+                CPP
+                OverloadedStrings
+                MultiParamTypeClasses
+                TypeFamilies
+
     build-depends: base                          >= 4          && < 5
                  , yesod-core                    >= 0.9.3      && < 0.10
                  , yesod-static                  >= 0.3.1      && < 0.4

From 325d912be34fc91fc6da742583e594337057461d Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Fri, 14 Oct 2011 11:08:44 +0200
Subject: [PATCH 093/189] yesod-default uses new GzipCacheFolder

---
 yesod-default/Yesod/Default/Main.hs | 31 +++++++++++++++++++----------
 yesod-default/yesod-default.cabal   |  2 +-
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/yesod-default/Yesod/Default/Main.hs b/yesod-default/Yesod/Default/Main.hs
index 9cb36d8d..22d4bbcd 100644
--- a/yesod-default/Yesod/Default/Main.hs
+++ b/yesod-default/Yesod/Default/Main.hs
@@ -13,6 +13,11 @@ import Yesod.Logger (Logger, makeLogger, logString, logLazyText, flushLogger)
 import Network.Wai (Application)
 import Network.Wai.Handler.Warp (run)
 import Network.Wai.Middleware.Debug (debugHandle)
+import System.Directory (doesDirectoryExist, removeDirectoryRecursive)
+import Network.Wai.Middleware.Gzip (gzip', GzipFiles (GzipCacheFolder), gzipFiles, def)
+import Network.Wai.Middleware.Autohead (autohead)
+import Network.Wai.Middleware.Jsonp (jsonp)
+import Control.Monad (when)
 
 #ifndef WINDOWS
 import qualified System.Posix.Signals as Signal
@@ -55,19 +60,25 @@ defaultRunner :: (YesodDispatch y y, Yesod y)
               => (Application -> IO a)
               -> y -- ^ your foundation type
               -> IO ()
-defaultRunner f h =
+defaultRunner f h = do
+    -- clear the .static-cache so we don't have stale content
+    exists <- doesDirectoryExist staticCache
+    when exists $ removeDirectoryRecursive staticCache
 #ifdef WINDOWS
-    toWaiApp h >>= f >> return ()
+    toWaiAppPlain h >>= f . middlewares >> return ()
 #else
-    do
-        tid <- forkIO $ toWaiApp h >>= f >> return ()
-        flag <- newEmptyMVar
-        _ <- Signal.installHandler Signal.sigINT (Signal.CatchOnce $ do
-            putStrLn "Caught an interrupt"
-            killThread tid
-            putMVar flag ()) Nothing
-        takeMVar flag
+    tid <- forkIO $ toWaiAppPlain h >>= f . middlewares >> return ()
+    flag <- newEmptyMVar
+    _ <- Signal.installHandler Signal.sigINT (Signal.CatchOnce $ do
+        putStrLn "Caught an interrupt"
+        killThread tid
+        putMVar flag ()) Nothing
+    takeMVar flag
 #endif
+  where
+    middlewares = gzip' gset . jsonp . autohead
+    gset = def { gzipFiles = GzipCacheFolder staticCache }
+    staticCache = ".static-cache"
 
 -- | Run your development app using the provided @'DefaultEnv'@ type
 --
diff --git a/yesod-default/yesod-default.cabal b/yesod-default/yesod-default.cabal
index 7c43324a..9806f68b 100644
--- a/yesod-default/yesod-default.cabal
+++ b/yesod-default/yesod-default.cabal
@@ -22,7 +22,7 @@ library
                    , cmdargs           >= 0.8 && < 0.9
                    , warp              >= 0.4 && < 0.5
                    , wai               >= 0.4 && < 0.5
-                   , wai-extra         >= 0.4 && < 0.5
+                   , wai-extra         >= 0.4.4 && < 0.5
                    , bytestring        >= 0.9 && < 0.10
                    , transformers      >= 0.2 && < 0.3
                    , text              >= 0.9 && < 1.0

From 0452ee452765bfd6ea3e0aa1b0220b8687905a3f Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 15 Oct 2011 11:00:02 +0200
Subject: [PATCH 094/189] configuration of robots.txt via config/robots.txt

---
 yesod-default/Yesod/Default/Handlers.hs | 4 ++--
 yesod/Scaffolding/Scaffolder.hs         | 4 ++++
 yesod/scaffold/config/robots.txt.cg     | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 yesod/scaffold/config/robots.txt.cg

diff --git a/yesod-default/Yesod/Default/Handlers.hs b/yesod-default/Yesod/Default/Handlers.hs
index d5b95a1c..cb58e07b 100644
--- a/yesod-default/Yesod/Default/Handlers.hs
+++ b/yesod-default/Yesod/Default/Handlers.hs
@@ -5,10 +5,10 @@ module Yesod.Default.Handlers
     ) where
 
 import Yesod.Handler (GHandler, sendFile)
-import Yesod.Content (RepPlain(..), ToContent(..))
+import Yesod.Content (RepPlain(..))
 
 getFaviconR :: GHandler s m ()
 getFaviconR = sendFile "image/x-icon" "config/favicon.ico"
 
 getRobotsR :: GHandler s m RepPlain
-getRobotsR = return $ RepPlain $ toContent ("User-agent: *" :: String)
+getRobotsR = sendFile "text/plain" "config/robots.txt"
diff --git a/yesod/Scaffolding/Scaffolder.hs b/yesod/Scaffolding/Scaffolder.hs
index 0d814b49..a886c4f3 100644
--- a/yesod/Scaffolding/Scaffolder.hs
+++ b/yesod/Scaffolding/Scaffolder.hs
@@ -189,5 +189,9 @@ scaffold = do
         $(runIO (S.readFile "scaffold/config/favicon.ico.cg") >>= \bs -> do
             pack <- [|S.pack|]
             return $ pack `AppE` LitE (StringL $ S.unpack bs))
+
+    S.writeFile (dir ++ "/config/robots.txt")
+        $(runIO (S.readFile "scaffold/config/robots.txt.cg") >>= \bs -> do
+            [|S.pack $(return $ LitE $ StringL $ S.unpack bs)|])
     
     puts $(codegenDir "input" "done")
diff --git a/yesod/scaffold/config/robots.txt.cg b/yesod/scaffold/config/robots.txt.cg
new file mode 100644
index 00000000..7d329b1d
--- /dev/null
+++ b/yesod/scaffold/config/robots.txt.cg
@@ -0,0 +1 @@
+User-agent: *

From 965884d675cf1656da27117ab48208508a41386a Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sat, 15 Oct 2011 21:46:46 +0200
Subject: [PATCH 095/189] Widgets use Builder for CSS

---
 yesod-core/Yesod/Internal.hs      | 6 ++++--
 yesod-core/Yesod/Internal/Core.hs | 3 +--
 yesod-core/Yesod/Widget.hs        | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/yesod-core/Yesod/Internal.hs b/yesod-core/Yesod/Internal.hs
index bd1adc91..9b97cd6b 100644
--- a/yesod-core/Yesod/Internal.hs
+++ b/yesod-core/Yesod/Internal.hs
@@ -29,7 +29,6 @@ module Yesod.Internal
     ) where
 
 import Text.Hamlet (HtmlUrl, hamlet, Html)
-import Text.Cassius (CssUrl)
 import Text.Julius (JavascriptUrl)
 import Data.Monoid (Monoid (..), Last)
 import Data.List (nub)
@@ -44,6 +43,7 @@ import qualified Network.HTTP.Types as A
 import Data.CaseInsensitive (CI)
 import Data.String (IsString)
 import qualified Data.Map as Map
+import Data.Text.Lazy.Builder (Builder)
 
 #if GHC7
 #define HAMLET hamlet
@@ -107,12 +107,14 @@ nonceKey = "_NONCE"
 sessionName :: IsString a => a
 sessionName = "_SESSION"
 
+type CssBuilderUrl a = (a -> [(Text, Text)] -> Text) -> Builder
+
 data GWData a = GWData
     !(Body a)
     !(Last Title)
     !(UniqueList (Script a))
     !(UniqueList (Stylesheet a))
-    !(Map.Map (Maybe Text) (CssUrl a)) -- media type
+    !(Map.Map (Maybe Text) (CssBuilderUrl a)) -- media type
     !(Maybe (JavascriptUrl a))
     !(Head a)
 instance Monoid (GWData a) where
diff --git a/yesod-core/Yesod/Internal/Core.hs b/yesod-core/Yesod/Internal/Core.hs
index 5a38bd47..00d44867 100644
--- a/yesod-core/Yesod/Internal/Core.hs
+++ b/yesod-core/Yesod/Internal/Core.hs
@@ -50,7 +50,6 @@ import qualified Data.ByteString.Lazy as L
 import Data.Monoid
 import Control.Monad.Trans.RWS
 import Text.Hamlet
-import Text.Cassius
 import Text.Julius
 import Text.Blaze ((!), customAttribute, textTag, toValue, unsafeLazyByteString)
 import qualified Text.Blaze.Html5 as TBH
@@ -504,7 +503,7 @@ widgetToPageContent (GWidget w) = do
                 Just (Left s) -> Just s
                 Just (Right (u, p)) -> Just $ render u p
     css <- forM (Map.toList style) $ \(mmedia, content) -> do
-        let rendered = renderCssUrl render content
+        let rendered = toLazyText $ content render
         x <- addStaticContent "css" "text/css; charset=utf-8"
            $ encodeUtf8 rendered
         return (mmedia,
diff --git a/yesod-core/Yesod/Widget.hs b/yesod-core/Yesod/Widget.hs
index 141a8f2f..ead6e285 100644
--- a/yesod-core/Yesod/Widget.hs
+++ b/yesod-core/Yesod/Widget.hs
@@ -192,7 +192,7 @@ addWidget = id
 
 -- | Add some raw CSS to the style tag. Applies to all media types.
 addCassius :: Monad m => CssUrl (Route master) -> GGWidget master m ()
-addCassius x = GWidget $ tell $ GWData mempty mempty mempty mempty (Map.singleton Nothing x) mempty mempty
+addCassius x = GWidget $ tell $ GWData mempty mempty mempty mempty (Map.singleton Nothing $ \r -> fromLazyText $ renderCss $ x r) mempty mempty
 
 -- | Identical to 'addCassius'.
 addLucius :: Monad m => CssUrl (Route master) -> GGWidget master m ()
@@ -200,7 +200,7 @@ addLucius = addCassius
 
 -- | Add some raw CSS to the style tag, for a specific media type.
 addCassiusMedia :: Monad m => Text -> CssUrl (Route master) -> GGWidget master m ()
-addCassiusMedia m x = GWidget $ tell $ GWData mempty mempty mempty mempty (Map.singleton (Just m) x) mempty mempty
+addCassiusMedia m x = GWidget $ tell $ GWData mempty mempty mempty mempty (Map.singleton (Just m) $ \r -> fromLazyText $ renderCss $ x r) mempty mempty
 
 -- | Identical to 'addCassiusMedia'.
 addLuciusMedia :: Monad m => Text -> CssUrl (Route master) -> GGWidget master m ()

From edab547eb7abbae5bc352ecd73f08ff932ff8fdd Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Tue, 18 Oct 2011 07:22:50 -0700
Subject: [PATCH 096/189] update to latest html5 boilerplate

---
 .../templates/boilerplate-layout.hamlet.cg    | 39 ++++++++++++-------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/yesod/scaffold/templates/boilerplate-layout.hamlet.cg b/yesod/scaffold/templates/boilerplate-layout.hamlet.cg
index 22a5aca4..6e935845 100644
--- a/yesod/scaffold/templates/boilerplate-layout.hamlet.cg
+++ b/yesod/scaffold/templates/boilerplate-layout.hamlet.cg
@@ -1,25 +1,23 @@
-\<!doctype html>
-\<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"> <![endif]-->
-\<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"> <![endif]-->
-\<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"> <![endif]-->
-\<!--[if IE 9 ]> <html lang="en" class="no-js ie9"> <![endif]-->
-\<!--[if (gt IE 9)|!(IE)]><!-->
-<html lang="en" class="no-js"><!--<![endif]-->
+\<!doctype html>
+\<!--[if lt IE 7]> <html class="no-js ie6 oldie" lang="en"> <![endif]-->
+\<!--[if IE 7]>    <html class="no-js ie7 oldie" lang="en"> <![endif]-->
+\<!--[if IE 8]>    <html class="no-js ie8 oldie" lang="en"> <![endif]-->
+\<!--[if gt IE 8]><!-->
+<html class="no-js" lang="en"> <!--<![endif]-->
     <head>
         <meta charset="UTF-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        
+
+        <title>#{pageTitle pc}
         <meta name="description" content="">
         <meta name="author" content="">
 
-        <title>#{pageTitle pc}
+        <meta name="viewport" content="width=device-width,initial-scale=1">
 
         ^{pageHead pc}
       
-        <!--[if lt IE 9]>
-        <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
+        \<!--[if lt IE 9]>
+        \<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        \<![endif]-->
 
         <script>
           document.documentElement.className = document.documentElement.className.replace(/\bno-js\b/,'js');
@@ -31,3 +29,16 @@
                     <div #message>#{msg}
                 ^{pageBody pc}
             <footer>
+
+        \<!-- Change UA-XXXXX-X to be your site's ID -->
+        <script>
+            window._gaq = [['_setAccount','UAXXXXXXXX1'],['_trackPageview'],['_trackPageLoadTime']];
+            YepNope.load({
+            \  load: ('https:' == location.protocol ? '//ssl' : '//www') + '.google-analytics.com/ga.js'
+            });
+        \<!-- Prompt IE 6 users to install Chrome Frame. Remove this if you want to support IE 6.  chromium.org/developers/how-tos/chrome-frame-getting-started -->
+        \<!--[if lt IE 7 ]>
+            <script src="//ajax.googleapis.com/ajax/libs/chrome-frame/1.0.3/CFInstall.min.js">
+            <script>
+                window.attachEvent('onload',function(){CFInstall.check({mode:'overlay'})})
+        \<![endif]-->

From 5ccd598d0bfaaef3f81bfd1e592309010916ecb7 Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Wed, 19 Oct 2011 20:29:38 -0700
Subject: [PATCH 097/189] change boilerplate-layout to boilerplate-wrapper

---
 .../templates/boilerplate-layout.hamlet.cg    | 44 -------------------
 .../templates/boilerplate-wrapper.hamlet.cg   | 42 ++++++++++++++++++
 2 files changed, 42 insertions(+), 44 deletions(-)
 create mode 100644 yesod/scaffold/templates/boilerplate-wrapper.hamlet.cg

diff --git a/yesod/scaffold/templates/boilerplate-layout.hamlet.cg b/yesod/scaffold/templates/boilerplate-layout.hamlet.cg
index 6e935845..e69de29b 100644
--- a/yesod/scaffold/templates/boilerplate-layout.hamlet.cg
+++ b/yesod/scaffold/templates/boilerplate-layout.hamlet.cg
@@ -1,44 +0,0 @@
-\<!doctype html>
-\<!--[if lt IE 7]> <html class="no-js ie6 oldie" lang="en"> <![endif]-->
-\<!--[if IE 7]>    <html class="no-js ie7 oldie" lang="en"> <![endif]-->
-\<!--[if IE 8]>    <html class="no-js ie8 oldie" lang="en"> <![endif]-->
-\<!--[if gt IE 8]><!-->
-<html class="no-js" lang="en"> <!--<![endif]-->
-    <head>
-        <meta charset="UTF-8">
-
-        <title>#{pageTitle pc}
-        <meta name="description" content="">
-        <meta name="author" content="">
-
-        <meta name="viewport" content="width=device-width,initial-scale=1">
-
-        ^{pageHead pc}
-      
-        \<!--[if lt IE 9]>
-        \<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        \<![endif]-->
-
-        <script>
-          document.documentElement.className = document.documentElement.className.replace(/\bno-js\b/,'js');
-    <body>
-        <div id="container">
-            <header>
-            <div id="main" role="main">
-                $maybe msg <- mmsg
-                    <div #message>#{msg}
-                ^{pageBody pc}
-            <footer>
-
-        \<!-- Change UA-XXXXX-X to be your site's ID -->
-        <script>
-            window._gaq = [['_setAccount','UAXXXXXXXX1'],['_trackPageview'],['_trackPageLoadTime']];
-            YepNope.load({
-            \  load: ('https:' == location.protocol ? '//ssl' : '//www') + '.google-analytics.com/ga.js'
-            });
-        \<!-- Prompt IE 6 users to install Chrome Frame. Remove this if you want to support IE 6.  chromium.org/developers/how-tos/chrome-frame-getting-started -->
-        \<!--[if lt IE 7 ]>
-            <script src="//ajax.googleapis.com/ajax/libs/chrome-frame/1.0.3/CFInstall.min.js">
-            <script>
-                window.attachEvent('onload',function(){CFInstall.check({mode:'overlay'})})
-        \<![endif]-->
diff --git a/yesod/scaffold/templates/boilerplate-wrapper.hamlet.cg b/yesod/scaffold/templates/boilerplate-wrapper.hamlet.cg
new file mode 100644
index 00000000..258cbbfa
--- /dev/null
+++ b/yesod/scaffold/templates/boilerplate-wrapper.hamlet.cg
@@ -0,0 +1,42 @@
+\<!doctype html>
+\<!--[if lt IE 7]> <html class="no-js ie6 oldie" lang="en"> <![endif]-->
+\<!--[if IE 7]>    <html class="no-js ie7 oldie" lang="en"> <![endif]-->
+\<!--[if IE 8]>    <html class="no-js ie8 oldie" lang="en"> <![endif]-->
+\<!--[if gt IE 8]><!-->
+<html class="no-js" lang="en"> <!--<![endif]-->
+    <head>
+        <meta charset="UTF-8">
+
+        <title>#{pageTitle pc}
+        <meta name="description" content="">
+        <meta name="author" content="">
+
+        <meta name="viewport" content="width=device-width,initial-scale=1">
+
+        ^{pageHead pc}
+
+        \<!--[if lt IE 9]>
+        \<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        \<![endif]-->
+
+        <script>
+          document.documentElement.className = document.documentElement.className.replace(/\bno-js\b/,'js');
+    <body>
+        <div id="container">
+            <header>
+            <div id="main" role="main">
+              ^{pageBody pc}
+            <footer>
+
+        \<!-- Change UA-XXXXX-X to be your site's ID -->
+        <script>
+            window._gaq = [['_setAccount','UAXXXXXXXX1'],['_trackPageview'],['_trackPageLoadTime']];
+            YepNope.load({
+            \  load: ('https:' == location.protocol ? '//ssl' : '//www') + '.google-analytics.com/ga.js'
+            });
+        \<!-- Prompt IE 6 users to install Chrome Frame. Remove this if you want to support IE 6.  chromium.org/developers/how-tos/chrome-frame-getting-started -->
+        \<!--[if lt IE 7 ]>
+            <script src="//ajax.googleapis.com/ajax/libs/chrome-frame/1.0.3/CFInstall.min.js">
+            <script>
+                window.attachEvent('onload',function(){CFInstall.check({mode:'overlay'})})
+        \<![endif]-->

From 88c34972b93fe1bc1d39e7944dea3be13f111d41 Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Thu, 20 Oct 2011 06:35:44 -0700
Subject: [PATCH 098/189] fix boilerplate-wrapper codegen

---
 yesod/Scaffolding/Scaffolder.hs | 4 ++--
 yesod/yesod.cabal               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/yesod/Scaffolding/Scaffolder.hs b/yesod/Scaffolding/Scaffolder.hs
index a886c4f3..1fa68016 100644
--- a/yesod/Scaffolding/Scaffolder.hs
+++ b/yesod/Scaffolding/Scaffolder.hs
@@ -167,8 +167,8 @@ scaffold = do
         $(codegen "templates/default-layout.hamlet")
     writeFile' "templates/default-layout-wrapper.hamlet"
         $(codegen "templates/default-layout-wrapper.hamlet")
-    writeFile' "templates/boilerplate-layout.hamlet"
-        $(codegen "templates/boilerplate-layout.hamlet")
+    writeFile' "templates/boilerplate-wrapper.hamlet"
+        $(codegen "templates/boilerplate-wrapper.hamlet")
     writeFile' "templates/normalize.lucius"
         $(codegen "templates/normalize.lucius")
     writeFile' "templates/homepage.hamlet"
diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index 94ce8900..b86ef83c 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -39,7 +39,7 @@ extra-source-files:
   scaffold/templates/homepage.hamlet.cg
   scaffold/templates/default-layout.hamlet.cg
   scaffold/templates/default-layout-wrapper.hamlet.cg
-  scaffold/templates/boilerplate-layout.hamlet.cg
+  scaffold/templates/boilerplate-wrapper.hamlet.cg
   scaffold/deploy/Procfile.cg
   scaffold/main.hs.cg
   scaffold/Handler/Root.hs.cg

From c1c0a9b2266a9495c17ca37875b9a60c71670b8c Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Sat, 22 Oct 2011 22:07:34 -0700
Subject: [PATCH 099/189] setSaltAndUserHash -> setUserHashAndSalt

---
 yesod-auth/Yesod/Auth/HashDB.hs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/yesod-auth/Yesod/Auth/HashDB.hs b/yesod-auth/Yesod/Auth/HashDB.hs
index 358c9345..27a81269 100644
--- a/yesod-auth/Yesod/Auth/HashDB.hs
+++ b/yesod-auth/Yesod/Auth/HashDB.hs
@@ -102,6 +102,12 @@ class HashDBUser user where
   setUserHashAndSalt :: Text    -- ^ Salt
                      -> Text    -- ^ Password hash
                      -> user -> user
+  setUserHashAndSalt = setSaltAndUserHash
+
+  setSaltAndUserHash :: Text    -- ^ Salt
+                     -> Text    -- ^ Password hash
+                     -> user -> user
+  setSaltAndUserHash = setUserHashAndSalt
 
 -- | Generate random salt. Length of 8 is chosen arbitrarily
 randomSalt :: MonadIO m => m Text
@@ -118,7 +124,7 @@ saltedHash salt =
 --   passwords. It generates random salt and calculates proper hashes.
 setPassword :: (MonadIO m, HashDBUser user) => Text -> user -> m user
 setPassword pwd u = do salt <- randomSalt
-                       return $ setUserHashAndSalt salt (saltedHash salt pwd) u
+                       return $ setSaltAndUserHash salt (saltedHash salt pwd) u
 
 
 ----------------------------------------------------------------
@@ -256,6 +262,6 @@ User
 instance HashDBUser (UserGeneric backend) where
   userPasswordHash = Just . userPassword
   userPasswordSalt = Just . userSalt
-  setUserHashAndSalt s h u = u { userSalt     = s
+  setSaltAndUserHash s h u = u { userSalt     = s
                                , userPassword = h
                                }

From 35d18b31ff81968e57641d9291d1111818005c98 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sun, 23 Oct 2011 15:40:05 +0200
Subject: [PATCH 100/189] Proper QQ in Settings

---
 yesod/scaffold/Settings.hs.cg      | 2 +-
 yesod/scaffold/tiny/Settings.hs.cg | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/yesod/scaffold/Settings.hs.cg b/yesod/scaffold/Settings.hs.cg
index 37d07341..ad7edac5 100644
--- a/yesod/scaffold/Settings.hs.cg
+++ b/yesod/scaffold/Settings.hs.cg
@@ -42,7 +42,7 @@ staticDir = "static"
 --
 -- To see how this value is used, see urlRenderOverride in Foundation.hs
 staticRoot :: AppConfig DefaultEnv ->  Text
-staticRoot conf = [st|#{appRoot conf}/static|]
+staticRoot conf = [~qq~st|#{appRoot conf}/static|]
 
 
 -- The rest of this file contains settings which rarely need changing by a
diff --git a/yesod/scaffold/tiny/Settings.hs.cg b/yesod/scaffold/tiny/Settings.hs.cg
index fdc06d96..5deb3cc7 100644
--- a/yesod/scaffold/tiny/Settings.hs.cg
+++ b/yesod/scaffold/tiny/Settings.hs.cg
@@ -35,7 +35,7 @@ staticDir = "static"
 --
 -- To see how this value is used, see urlRenderOverride in ~project~.hs
 staticRoot :: AppConfig DefaultEnv ->  Text
-staticRoot conf = [st|#{appRoot conf}/static|]
+staticRoot conf = [~qq~st|#{appRoot conf}/static|]
 
 widgetFile :: String -> Q Exp
 #if PRODUCTION

From 13eb7c82308c4f14c6ea5ad42034df566945edaa Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Mon, 24 Oct 2011 07:09:21 -0700
Subject: [PATCH 101/189] setSaltAndUserHash -> setSaltAndPasswordHash

---
 yesod-auth/Yesod/Auth/HashDB.hs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/yesod-auth/Yesod/Auth/HashDB.hs b/yesod-auth/Yesod/Auth/HashDB.hs
index 27a81269..5494d61b 100644
--- a/yesod-auth/Yesod/Auth/HashDB.hs
+++ b/yesod-auth/Yesod/Auth/HashDB.hs
@@ -98,16 +98,18 @@ class HashDBUser user where
   userPasswordHash :: user -> Maybe Text
   -- | Retrieve salt for password
   userPasswordSalt :: user -> Maybe Text
-  -- | Set hash and password
+
+  -- | Deprecated for the better named setSaltAndPasswordHash 
   setUserHashAndSalt :: Text    -- ^ Salt
                      -> Text    -- ^ Password hash
                      -> user -> user
-  setUserHashAndSalt = setSaltAndUserHash
+  setUserHashAndSalt = setSaltAndPasswordHash
 
-  setSaltAndUserHash :: Text    -- ^ Salt
+  -- | a callback for setPassword
+  setSaltAndPasswordHash :: Text    -- ^ Salt
                      -> Text    -- ^ Password hash
                      -> user -> user
-  setSaltAndUserHash = setUserHashAndSalt
+  setSaltAndPasswordHash = setUserHashAndSalt
 
 -- | Generate random salt. Length of 8 is chosen arbitrarily
 randomSalt :: MonadIO m => m Text
@@ -124,7 +126,7 @@ saltedHash salt =
 --   passwords. It generates random salt and calculates proper hashes.
 setPassword :: (MonadIO m, HashDBUser user) => Text -> user -> m user
 setPassword pwd u = do salt <- randomSalt
-                       return $ setSaltAndUserHash salt (saltedHash salt pwd) u
+                       return $ setSaltAndPasswordHash salt (saltedHash salt pwd) u
 
 
 ----------------------------------------------------------------
@@ -262,6 +264,6 @@ User
 instance HashDBUser (UserGeneric backend) where
   userPasswordHash = Just . userPassword
   userPasswordSalt = Just . userSalt
-  setSaltAndUserHash s h u = u { userSalt     = s
+  setSaltAndPasswordHash s h u = u { userSalt     = s
                                , userPassword = h
                                }

From 6d2c5355ba60949adbae85c5ee7f1335d9d23b96 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sun, 30 Oct 2011 16:07:48 +0200
Subject: [PATCH 102/189] Added missing robots.txt to cabal

---
 yesod/yesod.cabal | 1 +
 1 file changed, 1 insertion(+)

diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index b86ef83c..84769fb2 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -50,6 +50,7 @@ extra-source-files:
   scaffold/config/postgresql.yml.cg
   scaffold/config/mongoDB.yml.cg
   scaffold/config/routes.cg
+  scaffold/config/robots.txt.cg
   scaffold/Settings.hs.cg
   scaffold/Settings/StaticFiles.hs.cg
   scaffold/messages/en.msg.cg

From e6c67df5c28deb33ed2098f9c0382b6a375f1ed2 Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Sun, 6 Nov 2011 20:14:31 -0800
Subject: [PATCH 103/189] allow hspec 0.9

---
 scripts                                         | 2 +-
 yesod-static/tests/unicode/wai-app-static.cabal | 2 +-
 yesod-static/yesod-static.cabal                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts b/scripts
index e791ced0..2ae55585 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit e791ced0395245e30d37b5098a27bba5e818ecb7
+Subproject commit 2ae5558596ff9f26a12acf9c3a7cf8a92e6f2735
diff --git a/yesod-static/tests/unicode/wai-app-static.cabal b/yesod-static/tests/unicode/wai-app-static.cabal
index 066d54e3..80c2f6d9 100644
--- a/yesod-static/tests/unicode/wai-app-static.cabal
+++ b/yesod-static/tests/unicode/wai-app-static.cabal
@@ -48,7 +48,7 @@ test-suite runtests
     type: exitcode-stdio-1.0
 
     build-depends:   base                      >= 4        && < 5
-                   , hspec >= 0.8   && < 0.9
+                   , hspec >= 0.8   && < 0.10
                    , HUnit
                    , unix-compat               >= 0.2      && < 0.3
                    , time                      >= 1.1.4    && < 1.3
diff --git a/yesod-static/yesod-static.cabal b/yesod-static/yesod-static.cabal
index 8ca6961f..823ce5b1 100644
--- a/yesod-static/yesod-static.cabal
+++ b/yesod-static/yesod-static.cabal
@@ -47,7 +47,7 @@ test-suite runtests
     cpp-options:   -DTEST
     build-depends:   yesod-static
                    , base >= 4 && < 5
-                   , hspec >= 0.8   && < 0.9
+                   , hspec >= 0.8   && < 0.10
                    , HUnit
     ghc-options:     -Wall
     main-is:         runtests.hs

From e636c11c0369531f32095fa0459c26b0b07aebf5 Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Sun, 6 Nov 2011 20:14:50 -0800
Subject: [PATCH 104/189] get all examples compiling

---
 yesod-examples/src/chat.hs          | 15 +++++++--------
 yesod-examples/src/i18n.lhs         | 13 +++++++++++--
 yesod-examples/synopsis/hamlet.lhs  | 17 ++++++++++-------
 yesod-examples/yesod-examples.cabal |  6 +++++-
 4 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/yesod-examples/src/chat.hs b/yesod-examples/src/chat.hs
index b02a47fc..d0551238 100644
--- a/yesod-examples/src/chat.hs
+++ b/yesod-examples/src/chat.hs
@@ -6,7 +6,7 @@
 module Main where
 
 import Yesod
-import Yesod.Helpers.Static
+import Yesod.Static
 
 import Control.Concurrent.STM
 import Control.Concurrent.STM.TChan
@@ -18,8 +18,6 @@ import Data.Text (Text, unpack)
 -- speaker and content
 data Message = Message Text Text
 
-type Handler yesod = GHandler yesod yesod
-
 -- all those TChans are dupes, so writing to any one writes to them all, but reading is separate
 data Chat = Chat
   { chatClients    :: TVar [(Int, TChan Message)]
@@ -54,7 +52,7 @@ instance Yesod Chat where
     \
 |]
 
-getHomeR :: Handler Chat RepHtml
+getHomeR :: Handler RepHtml
 getHomeR = do
   Chat clients next _ <- getYesod
   client <- liftIO . atomically $ do
@@ -68,7 +66,7 @@ getHomeR = do
     return c
   defaultLayout $ do
     setTitle "Chat Page"
-    addWidget [$hamlet|\
+    toWidget [$hamlet|\
 \<!DOCTYPE html>
 
 <h1>Chat Example
@@ -81,7 +79,7 @@ getHomeR = do
 <script>var clientNumber = #{show client}
 |]
 
-getCheckR :: Handler Chat RepJson
+getCheckR :: Handler RepJson
 getCheckR = do
   liftIO $ putStrLn "Check"
   Chat clients _ _ <- getYesod
@@ -101,7 +99,7 @@ getCheckR = do
 
 zipJson x y = jsonMap $ map (unpack *** jsonScalar . unpack) $ zip x y
 
-getPostR :: Handler Chat RepJson
+getPostR :: Handler RepJson
 getPostR = do
   liftIO $ putStrLn "Post"
   Chat clients _ _ <- getYesod
@@ -122,4 +120,5 @@ main :: IO ()
 main = do
   clients <- newTVarIO []
   next <- newTVarIO 0
-  warpDebug 3000 $ Chat clients next $ static "static"
+  s <- static "static"
+  warpDebug 3000 $ Chat clients next s
diff --git a/yesod-examples/src/i18n.lhs b/yesod-examples/src/i18n.lhs
index abbe39a1..001cad3e 100644
--- a/yesod-examples/src/i18n.lhs
+++ b/yesod-examples/src/i18n.lhs
@@ -3,14 +3,23 @@
 > {-# LANGUAGE TypeFamilies #-}
 > {-# LANGUAGE MultiParamTypeClasses #-}
 > {-# LANGUAGE OverloadedStrings #-}
+> {-# LANGUAGE CPP #-}
 
 > import Yesod
 > import Data.Monoid (mempty)
 > import Data.Text (Text)
 
+To work on both ghc6 and ghc7
+
+#if GHC7
+# define QQ(x) x
+#else
+# define QQ(x) $x
+#endif
+
 > data I18N = I18N
 
-> mkYesod "I18N" [$parseRoutes|
+> mkYesod "I18N" [QQ(parseRoutes)|
 > /            HomepageR GET
 > /set/#Text SetLangR  GET
 > |]
@@ -29,7 +38,7 @@
 >             ]
 >     defaultLayout $ do
 >       setTitle "I18N Homepage"
->       addHamlet [$hamlet|
+>       addHamlet [QQ(hamlet)|
 > <h1>#{hello}
 > <p>In other languages:
 > <ul>
diff --git a/yesod-examples/synopsis/hamlet.lhs b/yesod-examples/synopsis/hamlet.lhs
index 7f3e2b05..a700a1ec 100644
--- a/yesod-examples/synopsis/hamlet.lhs
+++ b/yesod-examples/synopsis/hamlet.lhs
@@ -2,8 +2,11 @@
 {-# LANGUAGE QuasiQuotes, OverloadedStrings #-}
 
 import Text.Hamlet
-import qualified Data.ByteString.Lazy as L
+import Yesod.Widget
 import Data.Text (Text, cons)
+import qualified Data.Text.Lazy.IO as L
+import Text.Blaze.Renderer.Text (renderHtml)
+
 
 data Person = Person
     { name :: String
@@ -18,12 +21,12 @@ renderUrls :: PersonUrls -> [(Text, Text)] -> Text
 renderUrls Homepage _ = "/"
 renderUrls (PersonPage name) _ = '/' `cons` name
 
-footer :: Hamlet url
+footer :: HtmlUrl url
 footer = [$hamlet|\
 <div id="footer">Thank you, come again
 |]
 
-template :: Person -> Hamlet PersonUrls
+template :: Person -> HtmlUrl PersonUrls
 template person = [$hamlet|
 !!!
 
@@ -31,8 +34,8 @@ template person = [$hamlet|
     <head>
         <title>Hamlet Demo
     <body>
-        <h1>Information on #{string (name person)}
-        <p>#{string (name person)} is #{string (age person)} years old.
+        <h1>Information on #{name person}
+        <p>#{name person} is #{age person} years old.
         <h2>
             $if isMarried person
                 \Married
@@ -40,7 +43,7 @@ template person = [$hamlet|
                 \Not married
         <ul>
             $forall child <- children person
-                <li>#{string child}
+                <li>#{child}
         <p>
             <a href="@{page person}">See the page.
         \^{footer}
@@ -55,7 +58,7 @@ main = do
             , isMarried = True
             , children = ["Adam", "Ben", "Chris"]
             }
-    L.putStrLn $ renderHamlet renderUrls $ template person
+    L.putStrLn $ renderHtml $ (template person) renderUrls 
 \end{code}
 
 Outputs (new lines added for readability):
diff --git a/yesod-examples/yesod-examples.cabal b/yesod-examples/yesod-examples.cabal
index 2aa11620..c1bbcd6d 100644
--- a/yesod-examples/yesod-examples.cabal
+++ b/yesod-examples/yesod-examples.cabal
@@ -15,6 +15,8 @@ extra-source-files:  static/yesod/ajax/script.js,
                      static/yesod/ajax/style.css,
                      static/chat.js
 
+flag ghc7
+
 Executable yesod-blog
   Main-is:             src/blog.lhs
   Build-depends:       base >= 4 && < 5,
@@ -40,6 +42,8 @@ Executable yesod-pretty-yaml
 
 Executable yesod-i18n
   Main-is:             src/i18n.lhs
+  if flag(ghc7)
+      cpp-options:     -DGHC7
 
 Executable yesod-session
   Main-is:             src/session.lhs
@@ -62,7 +66,7 @@ Executable yesod-persistent-synopsis
 
 Executable yesod-hamlet-synopsis
   Main-is:             synopsis/hamlet.lhs
-  Build-depends:       hamlet
+  Build-depends:       hamlet, yesod-core
 
 Executable yesod-chat
   Main-is:             src/chat.hs

From be64c17467cb0a9c4203ff99e37b2df0b738235a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Lipt=C3=A1k?= <gliptak@gmail.com>
Date: Sun, 6 Nov 2011 09:26:55 -0500
Subject: [PATCH 105/189] Make i18n more international

---
 yesod-examples/src/i18n.lhs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/yesod-examples/src/i18n.lhs b/yesod-examples/src/i18n.lhs
index 001cad3e..12bd0f52 100644
--- a/yesod-examples/src/i18n.lhs
+++ b/yesod-examples/src/i18n.lhs
@@ -33,8 +33,8 @@ To work on both ghc6 and ghc7
 >     let hello = chooseHello ls
 >     let choices =
 >             [ ("en", "English") :: (Text, Text)
->             , ("es", "Spanish")
->             , ("he", "Hebrew")
+>             , ("es", "Español")
+>             , ("he", "עִבְרִית")
 >             ]
 >     defaultLayout $ do
 >       setTitle "I18N Homepage"
@@ -49,8 +49,8 @@ To work on both ghc6 and ghc7
 
 > chooseHello :: [Text] -> Text
 > chooseHello [] = "Hello"
-> chooseHello ("he":_) = "Shalom"
-> chooseHello ("es":_) = "Hola"
+> chooseHello ("he":_) = "שלום"
+> chooseHello ("es":_) = "¡Hola!"
 > chooseHello (_:rest) = chooseHello rest
 
 > getSetLangR :: Text -> Handler ()

From 6b685289fdf2f507566dbafb17036e71209ee69c Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Mon, 7 Nov 2011 07:37:05 -0800
Subject: [PATCH 106/189] mention virthualenv for development version

---
 README.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 087952d2..12e47a75 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,8 @@ featuring:
 
 ## Installation: http://www.yesodweb.com/page/five-minutes
 
+    cabal update && cabal install yesod
+
 ## Create a new project after installing
 
     yesod init
@@ -19,8 +21,10 @@ featuring:
 
 ## Installing the latest development version from github
 
-Yesod is built upon many smaller packages, all of which can be installed 
-with:
+If you are concerned about mucking with your installed packages, you might try using the new [virthualenv](http://hackage.haskell.org/package/virthualenv) tool to isolate a custom yesod build to a particular application.
+
+Yesod is broken up into 4 separate repos and built upon many smaller packages.
+All of them can be installed with the below command.
 
 ~~~ { .bash }
 cabal update

From e4fd390cf85730a8c0dbe05afb4b5816336eb95d Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 10 Nov 2011 02:25:40 +0200
Subject: [PATCH 107/189] Scaffolding has nicer Form datatype

---
 yesod-form/Yesod/Form/Types.hs  | 3 +++
 yesod-form/yesod-form.cabal     | 2 +-
 yesod/scaffold/Foundation.hs.cg | 5 ++++-
 yesod/scaffold/project.cabal.cg | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/yesod-form/Yesod/Form/Types.hs b/yesod-form/Yesod/Form/Types.hs
index c84743fd..cf3a6e7c 100644
--- a/yesod-form/Yesod/Form/Types.hs
+++ b/yesod-form/Yesod/Form/Types.hs
@@ -11,6 +11,7 @@ module Yesod.Form.Types
     , Ints (..)
       -- * Form
     , Form
+    , MForm
     , AForm (..)
       -- * Build forms
     , Field (..)
@@ -75,6 +76,8 @@ type FileEnv = Map.Map Text FileInfo
 
 type Lang = Text
 type Form sub master a = RWST (Maybe (Env, FileEnv), master, [Lang]) Enctype Ints (GGHandler sub master IO) a
+{-# DEPRECATE Form "Use MForm instead" #-}
+type MForm sub master a = RWST (Maybe (Env, FileEnv), master, [Lang]) Enctype Ints (GGHandler sub master IO) a
 
 newtype AForm sub master a = AForm
     { unAForm :: (master, [Text]) -> Maybe (Env, FileEnv) -> Ints -> GGHandler sub master IO (FormResult a, [FieldView sub master] -> [FieldView sub master], Ints, Enctype)
diff --git a/yesod-form/yesod-form.cabal b/yesod-form/yesod-form.cabal
index f6341445..e427d386 100644
--- a/yesod-form/yesod-form.cabal
+++ b/yesod-form/yesod-form.cabal
@@ -1,5 +1,5 @@
 name:            yesod-form
-version:         0.3.3
+version:         0.3.4
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
diff --git a/yesod/scaffold/Foundation.hs.cg b/yesod/scaffold/Foundation.hs.cg
index cbbbb074..a6ff5173 100644
--- a/yesod/scaffold/Foundation.hs.cg
+++ b/yesod/scaffold/Foundation.hs.cg
@@ -5,6 +5,7 @@ module Foundation
     , resources~sitearg~
     , Handler
     , Widget
+    , Form
     , maybeAuth
     , requireAuth
     , module Yesod
@@ -15,7 +16,7 @@ module Foundation
     ) where
 
 import Prelude
-import Yesod
+import Yesod hiding (Form)
 import Yesod.Static (Static, base64md5, StaticRoute(..))
 import Settings.StaticFiles
 import Yesod.Auth
@@ -73,6 +74,8 @@ mkMessage "~sitearg~" "messages" "en"
 -- split these actions into two functions and place them in separate files.
 mkYesodData "~sitearg~" $(parseRoutesFile "config/routes")
 
+type Form x = Html -> MForm ~sitearg~ ~sitearg~ (FormResult x, Widget)
+
 -- Please see the documentation for the Yesod typeclass. There are a number
 -- of settings which can be configured by overriding methods here.
 instance Yesod ~sitearg~ where
diff --git a/yesod/scaffold/project.cabal.cg b/yesod/scaffold/project.cabal.cg
index 2af3df49..63e25d8a 100644
--- a/yesod/scaffold/project.cabal.cg
+++ b/yesod/scaffold/project.cabal.cg
@@ -76,7 +76,7 @@ executable         ~project~
                  , yesod-auth                    >= 0.7.3      && < 0.8
                  , yesod-static                  >= 0.3.1      && < 0.4
                  , yesod-default                 >= 0.4        && < 0.5
-                 , yesod-form                    >= 0.3.3      && < 0.4
+                 , yesod-form                    >= 0.3.4      && < 0.4
                  , mime-mail                     >= 0.3.0.3    && < 0.4
                  , clientsession                 >= 0.7.3      && < 0.8
                  , bytestring                    >= 0.9        && < 0.10

From 9d270eb024ae16c85dad09fddd399dc7b0123260 Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Mon, 21 Nov 2011 15:28:31 -0600
Subject: [PATCH 108/189] update scripts

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 2ae55585..9dc05045 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 2ae5558596ff9f26a12acf9c3a7cf8a92e6f2735
+Subproject commit 9dc05045b5076d2c1e61035687cdf8207b4faae9

From d66ef9b057ecd7570e23a47b22bc6ad40d0bfc62 Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Tue, 22 Nov 2011 08:06:35 -0600
Subject: [PATCH 109/189] clarify findOverlaps RouteParsing code

---
 yesod-core/Yesod/Internal/RouteParsing.hs | 28 ++++++++++++++---------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/yesod-core/Yesod/Internal/RouteParsing.hs b/yesod-core/Yesod/Internal/RouteParsing.hs
index 8a37a496..6ce784ac 100644
--- a/yesod-core/Yesod/Internal/RouteParsing.hs
+++ b/yesod-core/Yesod/Internal/RouteParsing.hs
@@ -331,18 +331,24 @@ pieceFromString ('#':x) = SinglePiece x
 pieceFromString ('*':x) = MultiPiece x
 pieceFromString x = StaticPiece x
 
+-- this is n^2, should be a way to speed it up
 findOverlaps :: [Resource] -> [(Resource, Resource)]
-findOverlaps = gos . map justPieces
+findOverlaps = go . map justPieces
   where
+    justPieces :: Resource -> ([Piece], Resource)
     justPieces r@(Resource _ ps _) = (ps, r)
-    gos [] = []
-    gos (x:xs) = mapMaybe (go x) xs ++ gos xs
-    go (StaticPiece x:xs, xr) (StaticPiece y:ys, yr)
-        | x == y = go (xs, xr) (ys, yr)
+
+    go [] = []
+    go (x:xs) = mapMaybe (mOverlap x) xs ++ go xs
+
+    mOverlap :: ([Piece], Resource) -> ([Piece], Resource) -> 
+                Maybe (Resource, Resource)
+    mOverlap (StaticPiece x:xs, xr) (StaticPiece y:ys, yr)
+        | x == y = mOverlap (xs, xr) (ys, yr)
         | otherwise = Nothing
-    go (MultiPiece _:_, xr) (_, yr) = Just (xr, yr)
-    go (_, xr) (MultiPiece _:_, yr) = Just (xr, yr)
-    go ([], xr) ([], yr) = Just (xr, yr)
-    go ([], _) (_, _) = Nothing
-    go (_, _) ([], _) = Nothing
-    go (_:xs, xr) (_:ys, yr) = go (xs, xr) (ys, yr)
+    mOverlap (MultiPiece _:_, xr) (_, yr) = Just (xr, yr)
+    mOverlap (_, xr) (MultiPiece _:_, yr) = Just (xr, yr)
+    mOverlap ([], xr) ([], yr) = Just (xr, yr)
+    mOverlap ([], _) (_, _) = Nothing
+    mOverlap (_, _) ([], _) = Nothing
+    mOverlap (_:xs, xr) (_:ys, yr) = mOverlap (xs, xr) (ys, yr)

From 303057222fd0d8ffcebd560a29d8da9afe93949c Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Tue, 22 Nov 2011 08:30:43 -0600
Subject: [PATCH 110/189] comment & white space

---
 yesod-core/Yesod/Internal/RouteParsing.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yesod-core/Yesod/Internal/RouteParsing.hs b/yesod-core/Yesod/Internal/RouteParsing.hs
index 6ce784ac..dcb475c4 100644
--- a/yesod-core/Yesod/Internal/RouteParsing.hs
+++ b/yesod-core/Yesod/Internal/RouteParsing.hs
@@ -331,7 +331,7 @@ pieceFromString ('#':x) = SinglePiece x
 pieceFromString ('*':x) = MultiPiece x
 pieceFromString x = StaticPiece x
 
--- this is n^2, should be a way to speed it up
+-- n^2, should be a way to speed it up
 findOverlaps :: [Resource] -> [(Resource, Resource)]
 findOverlaps = go . map justPieces
   where
@@ -341,7 +341,7 @@ findOverlaps = go . map justPieces
     go [] = []
     go (x:xs) = mapMaybe (mOverlap x) xs ++ go xs
 
-    mOverlap :: ([Piece], Resource) -> ([Piece], Resource) -> 
+    mOverlap :: ([Piece], Resource) -> ([Piece], Resource) ->
                 Maybe (Resource, Resource)
     mOverlap (StaticPiece x:xs, xr) (StaticPiece y:ys, yr)
         | x == y = mOverlap (xs, xr) (ys, yr)

From f0b515ff7b7aadd895b7406e087b4a838b43e41e Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Tue, 22 Nov 2011 14:59:09 -0600
Subject: [PATCH 111/189] ignore cabal-dev

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 2534db8d..d18abfaa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 dist
 *.swp
 client_session_key.aes
+cabal-dev/

From 9391126712e62e5b4369b148c9aafb01768be32a Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Tue, 22 Nov 2011 15:19:03 -0600
Subject: [PATCH 112/189] bump yesod version command to 0.9.3

---
 yesod/main.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yesod/main.hs b/yesod/main.hs
index 988edfc6..671957c3 100755
--- a/yesod/main.hs
+++ b/yesod/main.hs
@@ -35,7 +35,7 @@ main = do
         ["touch"] -> touch
 #endif
         ["devel"] -> devel isDev
-        ["version"] -> putStrLn "0.9"
+        ["version"] -> putStrLn "0.9.3"
         "configure":rest -> rawSystem cmd ("configure":rest) >>= exitWith
         _ -> do
             putStrLn "Usage: yesod <command>"

From 21d4ff0696eccf519b4e00cf3c33b17eca364e3a Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Tue, 22 Nov 2011 21:17:39 -0600
Subject: [PATCH 113/189] update scripts

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 9dc05045..806eed3c 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 9dc05045b5076d2c1e61035687cdf8207b4faae9
+Subproject commit 806eed3cd050d2d49e86499be977684e5c0b1cbf

From d33bf4f909cc4f30fdfa28904b874ea5244d15af Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Tue, 22 Nov 2011 21:19:14 -0600
Subject: [PATCH 114/189] add yesod-mega

---
 LICENSE                           |  25 ++++
 input                             |   1 +
 scaffold                          |   1 +
 yesod-core/Yesod/Internal/Core.hs |  16 ++-
 yesod-mega.cabal                  | 191 ++++++++++++++++++++++++++++++
 5 files changed, 229 insertions(+), 5 deletions(-)
 create mode 100644 LICENSE
 create mode 120000 input
 create mode 120000 scaffold
 create mode 100644 yesod-mega.cabal

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 00000000..8643e5d8
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,25 @@
+The following license covers this documentation, and the source code, except
+where otherwise indicated.
+
+Copyright 2010, Michael Snoyman. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS "AS IS" AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/input b/input
new file mode 120000
index 00000000..83a4d036
--- /dev/null
+++ b/input
@@ -0,0 +1 @@
+yesod/input
\ No newline at end of file
diff --git a/scaffold b/scaffold
new file mode 120000
index 00000000..dde8823c
--- /dev/null
+++ b/scaffold
@@ -0,0 +1 @@
+yesod/scaffold
\ No newline at end of file
diff --git a/yesod-core/Yesod/Internal/Core.hs b/yesod-core/Yesod/Internal/Core.hs
index 00d44867..638e03fc 100644
--- a/yesod-core/Yesod/Internal/Core.hs
+++ b/yesod-core/Yesod/Internal/Core.hs
@@ -35,8 +35,6 @@ import Yesod.Handler
 
 import Control.Arrow ((***))
 import Control.Monad (forM)
-import qualified Paths_yesod_core
-import Data.Version (showVersion)
 import Yesod.Widget
 import Yesod.Request
 import qualified Network.Wai as W
@@ -78,6 +76,17 @@ import Data.Aeson (Value (Array, String))
 import Data.Aeson.Encode (encode)
 import qualified Data.Vector as Vector
 
+-- mega repo can't access this
+#ifndef MEGA
+import qualified Paths_yesod_core
+import Data.Version (showVersion)
+yesodVersion :: String
+yesodVersion = showVersion Paths_yesod_core.version
+#else
+yesodVersion :: String
+yesodVersion = "0.9.3.2"
+#endif
+
 #if GHC7
 #define HAMLET hamlet
 #else
@@ -596,9 +605,6 @@ ynHelper render scripts jscript jsLoc =
                     Nothing -> Nothing
                     Just j -> Just $ jelper j
 
-yesodVersion :: String
-yesodVersion = showVersion Paths_yesod_core.version
-
 yesodRender :: Yesod y
             => y
             -> Route y
diff --git a/yesod-mega.cabal b/yesod-mega.cabal
new file mode 100644
index 00000000..11714eef
--- /dev/null
+++ b/yesod-mega.cabal
@@ -0,0 +1,191 @@
+name:            yesod-mega
+version:         0.9.3
+license:         BSD3
+license-file:    LICENSE
+author:          Michael Snoyman <michael@snoyman.com>
+maintainer:      Michael Snoyman <michael@snoyman.com>
+synopsis:        Creation of type-safe, RESTful web applications.
+description:
+    Builds all yesod* repo code at once
+
+category:        Web, Yesod
+stability:       Stable
+cabal-version:   >= 1.6
+build-type:      Simple
+homepage:        http://www.yesodweb.com/
+
+flag ghc7
+
+flag threaded
+    default: True
+    description: Build with support for multithreaded execution
+
+library
+    hs-source-dirs: yesod, yesod-auth, yesod-core, yesod-default, yesod-examples, yesod-form, yesod-json, yesod-newsfeed, yesod-persistent, yesod-sitemap, yesod-static
+
+    exposed-modules:
+                     -- yesod
+                     Yesod
+                     -- yesod-static
+                     Yesod.Static
+                     -- yesod-persistent
+                     Yesod.Persist
+                     -- yesod-json
+                     Yesod.Json
+                     -- yesod-sitemap
+                     Yesod.Sitemap
+
+                     -- yesod-core
+                     Yesod.Content
+                     Yesod.Core
+                     Yesod.Dispatch
+                     Yesod.Handler
+                     Yesod.Logger
+                     Yesod.Request
+                     Yesod.Widget
+                     Yesod.Message
+                     Yesod.Config
+                     Yesod.Internal.TestApi
+
+                     -- yesod-form
+                     Yesod.Form
+                     Yesod.Form.Class
+                     Yesod.Form.Types
+                     Yesod.Form.Functions
+                     Yesod.Form.Input
+                     Yesod.Form.Fields
+                     Yesod.Form.Jquery
+                     Yesod.Form.Nic
+                     Yesod.Form.MassInput
+                     Yesod.Form.I18n.English
+                     Yesod.Form.I18n.Swedish
+
+                     -- yesod-auth
+                     Yesod.Auth
+                     Yesod.Auth.BrowserId
+                     Yesod.Auth.Dummy
+                     Yesod.Auth.Email
+                     Yesod.Auth.Facebook
+                     Yesod.Auth.OpenId
+                     Yesod.Auth.OAuth
+                     Yesod.Auth.Rpxnow
+                     Yesod.Auth.HashDB
+                     Yesod.Auth.Message
+                     Yesod.Auth.Kerberos
+
+                     -- yesod-default
+                     Yesod.Default.Config
+                     Yesod.Default.Main
+                     Yesod.Default.Util
+                     Yesod.Default.Handlers
+
+                     -- yesod-newsfeed
+                     Yesod.AtomFeed
+                     Yesod.RssFeed
+                     Yesod.Feed
+
+    other-modules: 
+                     -- yesod-core
+                     Yesod.Internal
+                     Yesod.Internal.Core
+                     Yesod.Internal.Session
+                     Yesod.Internal.Request
+                     Yesod.Internal.Dispatch
+                     Yesod.Internal.RouteParsing
+
+                     -- yesod
+                     Scaffolding.CodeGen
+                     Scaffolding.Scaffolder
+                     Devel
+                     Build
+
+
+    cpp-options:     -DMEGA
+
+    if flag(ghc7)
+        build-depends:   base                  >= 4.3      && < 5
+        cpp-options:     -DGHC7
+    else
+        build-depends:   base                  >= 4        && < 4.3
+
+    include-dirs: yesod-auth/include
+
+    if !os(windows)
+         build-depends: unix
+
+    build-depends:
+                   -- yesod
+                     Cabal              >= 1.8          && < 1.13
+                   , shakespeare-text   >= 0.10     && < 0.11
+                   , attoparsec-text    >= 0.8.5        && < 0.9
+                   , filepath           >= 1.1          && < 1.3
+                   , process
+                   -- yesod-sitemap
+                   -- empty
+
+                   -- yesod-newsfeed
+                   , wai-extra         >= 0.4.4 && < 0.5
+
+                   -- yesod-default
+                   , cmdargs           >= 0.8   && < 0.9
+
+                   -- yesod-auth
+                   , authenticate          >= 0.10      && < 0.11
+                   , control-monad-attempt >= 0.3.0     && < 0.4
+                   , mime-mail             >= 0.3       && < 0.4
+                   , SHA                   >= 1.4.1.3   && < 1.6
+                   , http-enumerator       >= 0.6       && < 0.8
+                   , pwstore-fast          >= 2.2       && < 3
+                   , old-time              >= 1.0
+                   , base64-bytestring     >= 0.1.0.1  && < 0.2
+                   , pureMD5               >= 2.1.0.3  && < 2.2
+                   , cereal                >= 0.3      && < 0.4
+                   , wai-app-static        >= 0.3.2.1  && < 0.4
+                   , file-embed            >= 0.0.4.1  && < 0.5
+                   , unix-compat           >= 0.2      && < 0.3
+                   , enumerator            >= 0.4.14   && < 0.5
+                   , transformers          >= 0.2.2    && < 0.3
+                   , data-default          >= 0.3      && < 0.4
+                   , xss-sanitize          >= 0.3.0.1  && < 0.4
+                   , blaze-builder         >= 0.2.1    && < 0.4
+                   , network               >= 2.2      && < 2.4
+                   , email-validate        >= 0.2.6    && < 0.3
+                   , persistent            >= 0.6      && < 0.7
+                   , persistent-template   >= 0.6      && < 0.7
+                   , failure               >= 0.1      && < 0.2
+                   , warp                  >= 0.4      && < 0.5
+                   , wai                   >= 0.4      && < 0.5
+                   , wai-extra             >= 0.4.1    && < 0.5
+                   , time                  >= 1.1.4    && < 1.3
+                   , bytestring            >= 0.9.1.4  && < 0.12
+                   , text                  >= 0.9      && < 0.12
+                   , template-haskell
+                   , path-pieces           >= 0.0      && < 0.1
+                   , hamlet                >= 0.10     && < 0.11
+                   , shakespeare           >= 0.10     && < 0.11
+                   , shakespeare-js        >= 0.10     && < 0.11
+                   , shakespeare-css       >= 0.10     && < 0.11
+                   , blaze-builder         >= 0.2.1    && < 0.4
+                   , clientsession         >= 0.7.3.1  && < 0.8
+                   , random                >= 1.0.0.2  && < 1.1
+                   , old-locale            >= 1.0.0.2  && < 1.1
+                   , failure               >= 0.1      && < 0.2
+                   , containers            >= 0.2      && < 0.5
+                   , monad-control         >= 0.2      && < 0.3
+                   , cookie                >= 0.3      && < 0.4
+                   , blaze-html            >= 0.4.1.3  && < 0.5
+                   , http-types            >= 0.6.5    && < 0.7
+                   , case-insensitive      >= 0.2      && < 0.4
+                   , parsec                >= 2.0      && < 3.2
+                   , directory             >= 1.0      && < 1.2
+                   , data-object           >= 0.3      && < 0.4
+                   , data-object-yaml      >= 0.3      && < 0.4
+                   , strict-concurrency    >= 0.2.4    && < 0.2.5
+                   , vector                >= 0.9      && < 0.10
+                   , aeson-native          >= 0.3.3.1  && < 0.4
+    ghc-options:     -Wall
+
+
+source-repository head
+  type:     git
+  location: git://github.com/yesodweb/yesod.git

From c8af14b75066c0481337481232f6e128ff444471 Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Wed, 23 Nov 2011 08:44:47 -0600
Subject: [PATCH 115/189] align yesod dependencies

---
 yesod-auth/yesod-auth.cabal                   | 14 ++--
 yesod-core/yesod-core.cabal                   | 66 +++++++++----------
 yesod-default/yesod-default.cabal             | 24 +++----
 yesod-examples/yesod-examples.cabal           | 13 ++--
 yesod-form/yesod-form.cabal                   | 40 +++++------
 yesod-json/yesod-json.cabal                   | 14 ++--
 yesod-newsfeed/yesod-newsfeed.cabal           | 12 ++--
 yesod-persistent/yesod-persistent.cabal       |  2 +-
 .../tests/unicode/wai-app-static.cabal        | 18 ++---
 yesod-static/yesod-static.cabal               | 34 +++++-----
 yesod/yesod.cabal                             |  8 +--
 11 files changed, 123 insertions(+), 122 deletions(-)

diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal
index 3e51bb21..a9fc0e07 100644
--- a/yesod-auth/yesod-auth.cabal
+++ b/yesod-auth/yesod-auth.cabal
@@ -17,33 +17,33 @@ flag ghc7
 
 library
     if flag(ghc7)
-        build-depends:   base                      >= 4.3      && < 5
+        build-depends:   base                >= 4.3      && < 5
         cpp-options:     -DGHC7
     else
-        build-depends:   base                      >= 4        && < 4.3
+        build-depends:   base                >= 4        && < 4.3
     build-depends:   authenticate            >= 0.10      && < 0.11
                    , bytestring              >= 0.9.1.4   && < 0.10
                    , yesod-core              >= 0.9       && < 0.10
                    , wai                     >= 0.4       && < 0.5
                    , template-haskell
-                   , pureMD5                 >= 1.1       && < 2.2
-                   , random                  >= 1.0       && < 1.1
+                   , pureMD5                 >= 2.0       && < 2.2
+                   , random                  >= 1.0.0.2  && < 1.1
                    , control-monad-attempt   >= 0.3.0     && < 0.4
                    , text                    >= 0.7       && < 0.12
                    , mime-mail               >= 0.3       && < 0.4
-                   , blaze-html              >= 0.4       && < 0.5
+                   , blaze-html              >= 0.4.1.3   && < 0.5
                    , yesod-persistent        >= 0.2       && < 0.3
                    , hamlet                  >= 0.10      && < 0.11
                    , shakespeare-css         >= 0.10      && < 0.11
                    , yesod-json              >= 0.2       && < 0.3
                    , containers              >= 0.2       && < 0.5
                    , yesod-form              >= 0.3       && < 0.4
-                   , transformers            >= 0.2       && < 0.3
+                   , transformers            >= 0.2.2     && < 0.3
                    , persistent              >= 0.6       && < 0.7
                    , persistent-template     >= 0.6       && < 0.7
                    , SHA                     >= 1.4.1.3   && < 1.6
                    , http-enumerator         >= 0.6       && < 0.8
-                   , aeson-native            >= 0.3.2.11  && < 0.4
+                   , aeson-native            >= 0.3.3.1   && < 0.4
                    , pwstore-fast            >= 2.2       && < 3
 
     exposed-modules: Yesod.Auth
diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index 7c7bec8a..d28212ab 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -34,43 +34,43 @@ flag ghc7
 
 library
     if flag(ghc7)
-        build-depends:   base                      >= 4.3      && < 5
+        build-depends:   base              >= 4.3      && < 5
         cpp-options:     -DGHC7
     else
-        build-depends:   base                      >= 4        && < 4.3
-    build-depends:   time                      >= 1.1.4    && < 1.4
-                   , wai                       >= 0.4      && < 0.5
-                   , wai-extra                 >= 0.4.1    && < 0.5
-                   , bytestring                >= 0.9.1.4  && < 0.10
-                   , text                      >= 0.5      && < 0.12
+        build-depends:   base              >= 4        && < 4.3
+    build-depends:   time                  >= 1.1.4    && < 1.3
+                   , wai                   >= 0.4      && < 0.5
+                   , wai-extra             >= 0.4.1    && < 0.5
+                   , bytestring            >= 0.9.1.4  && < 0.10
+                   , text                  >= 0.7      && < 0.12
                    , template-haskell
-                   , path-pieces               >= 0.0      && < 0.1
-                   , hamlet                    >= 0.10     && < 0.11
-                   , shakespeare               >= 0.10     && < 0.11
-                   , shakespeare-js            >= 0.10     && < 0.11
-                   , shakespeare-css           >= 0.10     && < 0.11
-                   , blaze-builder             >= 0.2.1    && < 0.4
-                   , transformers              >= 0.2      && < 0.3
-                   , clientsession             >= 0.7.3.1  && < 0.8
-                   , random                    >= 1.0.0.2  && < 1.1
-                   , cereal                    >= 0.2      && < 0.4
-                   , old-locale                >= 1.0.0.2  && < 1.1
-                   , failure                   >= 0.1      && < 0.2
-                   , containers                >= 0.2      && < 0.5
-                   , monad-control             >= 0.2      && < 0.3
-                   , enumerator                >= 0.4.7    && < 0.5
-                   , cookie                    >= 0.3      && < 0.4
-                   , blaze-html                >= 0.4.1.3  && < 0.5
-                   , http-types                >= 0.6.5    && < 0.7
-                   , case-insensitive          >= 0.2      && < 0.4
-                   , parsec                    >= 2        && < 3.2
-                   , directory                 >= 1        && < 1.2
-                   , data-object               >= 0.3      && < 0.4
-                   , data-object-yaml          >= 0.3      && < 0.4
+                   , path-pieces           >= 0.0      && < 0.1
+                   , hamlet                >= 0.10     && < 0.11
+                   , shakespeare           >= 0.10     && < 0.11
+                   , shakespeare-js        >= 0.10     && < 0.11
+                   , shakespeare-css       >= 0.10     && < 0.11
+                   , blaze-builder         >= 0.2.1.4  && < 0.4
+                   , transformers          >= 0.2.2    && < 0.3
+                   , clientsession         >= 0.7.3.1  && < 0.8
+                   , random                >= 1.0.0.2  && < 1.1
+                   , cereal                >= 0.3      && < 0.4
+                   , old-locale            >= 1.0.0.2  && < 1.1
+                   , failure               >= 0.1      && < 0.2
+                   , containers            >= 0.2      && < 0.5
+                   , monad-control         >= 0.2      && < 0.3
+                   , enumerator            >= 0.4.8    && < 0.5
+                   , cookie                >= 0.3      && < 0.4
+                   , blaze-html            >= 0.4.1.3  && < 0.5
+                   , http-types            >= 0.6.5    && < 0.7
+                   , case-insensitive      >= 0.2      && < 0.4
+                   , parsec                >= 2        && < 3.2
+                   , directory             >= 1        && < 1.2
+                   , data-object           >= 0.3      && < 0.4
+                   , data-object-yaml      >= 0.3      && < 0.4
                    -- for logger. Probably logger should be a separate package
-                   , strict-concurrency        >= 0.2.4    && < 0.2.5
-                   , vector                    >= 0.9      && < 0.10
-                   , aeson-native              >= 0.3.3.1  && < 0.4
+                   , strict-concurrency    >= 0.2.4    && < 0.2.5
+                   , vector                >= 0.9      && < 0.10
+                   , aeson-native          >= 0.3.3.1  && < 0.4
 
     exposed-modules: Yesod.Content
                      Yesod.Core
diff --git a/yesod-default/yesod-default.cabal b/yesod-default/yesod-default.cabal
index 9806f68b..0d361f58 100644
--- a/yesod-default/yesod-default.cabal
+++ b/yesod-default/yesod-default.cabal
@@ -17,18 +17,18 @@ library
     if os(windows)
         cpp-options: -DWINDOWS
 
-    build-depends:   base              >= 4   && < 5
-                   , yesod-core        >= 0.9 && < 0.10
-                   , cmdargs           >= 0.8 && < 0.9
-                   , warp              >= 0.4 && < 0.5
-                   , wai               >= 0.4 && < 0.5
-                   , wai-extra         >= 0.4.4 && < 0.5
-                   , bytestring        >= 0.9 && < 0.10
-                   , transformers      >= 0.2 && < 0.3
-                   , text              >= 0.9 && < 1.0
-                   , directory         >= 1.0 && < 1.2
-                   , shakespeare-css   >= 0.10     && < 0.11
-                   , shakespeare-js    >= 0.10     && < 0.11
+    build-depends:   base                  >= 4     && < 5
+                   , yesod-core            >= 0.9   && < 0.10
+                   , cmdargs               >= 0.8   && < 0.9
+                   , warp                  >= 0.4   && < 0.5
+                   , wai                   >= 0.4   && < 0.5
+                   , wai-extra             >= 0.4.4 && < 0.5
+                   , bytestring            >= 0.9.1.4  && < 0.10
+                   , transformers          >= 0.2.2 && < 0.3
+                   , text                  >= 0.9      && < 0.12
+                   , directory             >= 1.0   && < 1.2
+                   , shakespeare-css       >= 0.10  && < 0.11
+                   , shakespeare-js        >= 0.10  && < 0.11
                    , template-haskell
 
     if !os(windows)
diff --git a/yesod-examples/yesod-examples.cabal b/yesod-examples/yesod-examples.cabal
index c1bbcd6d..b60a6cbd 100644
--- a/yesod-examples/yesod-examples.cabal
+++ b/yesod-examples/yesod-examples.cabal
@@ -25,19 +25,20 @@ Executable yesod-blog
 Executable yesod-ajax
   Main-is:             src/ajax.lhs
   Build-depends:       yesod-static,
-                       blaze-html,
+                       blaze-html  >= 0.4.1.3  && < 0.5,
                        yesod >= 0.9
 
 Executable yesod-file-echo
   Main-is:             src/file-echo.lhs
-  Build-depends:       text,
+  Build-depends:     
+                       text              >= 0.9   && < 0.12
                        yesod >= 0.9
 
 Executable yesod-pretty-yaml
   Main-is:             src/pretty-yaml.lhs
   Build-depends:       data-object-yaml >= 0.3.0 && < 0.4,
                        data-object >= 0.3.1 && < 0.4,
-                       bytestring >= 0.9 && < 0.10,
+                       bytestring                >= 0.9.1.4  && < 0.10,
                        yesod >= 0.9
 
 Executable yesod-i18n
@@ -60,9 +61,9 @@ Executable yesod-form
 
 Executable yesod-persistent-synopsis
   Main-is:             synopsis/persistent.lhs
-  Build-depends:       transformers >= 0.2.1 && < 0.3,
-                       persistent-sqlite >= 0.6,
-                       persistent-template
+  Build-depends:       transformers >= 0.2.2 && < 0.3,
+                       persistent-sqlite   >= 0.6, && < 0.7
+                       persistent-template >= 0.6, && < 0.7
 
 Executable yesod-hamlet-synopsis
   Main-is:             synopsis/hamlet.lhs
diff --git a/yesod-form/yesod-form.cabal b/yesod-form/yesod-form.cabal
index e427d386..8c806e93 100644
--- a/yesod-form/yesod-form.cabal
+++ b/yesod-form/yesod-form.cabal
@@ -13,27 +13,27 @@ homepage:        http://www.yesodweb.com/
 description:     Form handling support for Yesod Web Framework
 
 library
-    build-depends:   base                      >= 4        && < 5
-                   , yesod-core                >= 0.9      && < 0.10
-                   , yesod-persistent          >= 0.2      && < 0.3
-                   , time                      >= 1.1.4    && < 1.3
-                   , hamlet                    >= 0.10     && < 0.11
-                   , shakespeare-css           >= 0.10     && < 0.11
-                   , shakespeare-js            >= 0.10     && < 0.11
-                   , persistent                >= 0.6      && < 0.7
-                   , yesod-persistent          >= 0.2      && < 0.3
+    build-depends:   base                  >= 4        && < 5
+                   , yesod-core            >= 0.9      && < 0.10
+                   , yesod-persistent      >= 0.2      && < 0.3
+                   , time                  >= 1.1.4    && < 1.3
+                   , hamlet                >= 0.10     && < 0.11
+                   , shakespeare-css       >= 0.10     && < 0.11
+                   , shakespeare-js        >= 0.10     && < 0.11
+                   , persistent            >= 0.6      && < 0.7
+                   , yesod-persistent      >= 0.2      && < 0.3
                    , template-haskell
-                   , transformers              >= 0.2.2    && < 0.3
-                   , data-default              >= 0.3      && < 0.4
-                   , xss-sanitize              >= 0.3.0.1  && < 0.4
-                   , blaze-builder             >= 0.2.1    && < 0.4
-                   , network                   >= 2.2      && < 2.4
-                   , email-validate            >= 0.2.6    && < 0.3
-                   , blaze-html                >= 0.4      && < 0.5
-                   , bytestring                >= 0.9      && < 0.10
-                   , text                      >= 0.7      && < 1.0
-                   , wai                       >= 0.4      && < 0.5
-                   , containers                >= 0.2      && < 0.5
+                   , transformers          >= 0.2.2    && < 0.3
+                   , data-default          >= 0.3      && < 0.4
+                   , xss-sanitize          >= 0.3.0.1  && < 0.4
+                   , blaze-builder      >= 0.2.1.4      && < 0.4
+                   , network               >= 2.2      && < 2.4
+                   , email-validate        >= 0.2.6    && < 0.3
+                   , blaze-html            >= 0.4.1.3  && < 0.5
+                   , bytestring            >= 0.9.1.4  && < 0.10
+                   , text                  >= 0.9      && < 0.12
+                   , wai                   >= 0.4      && < 0.5
+                   , containers            >= 0.2      && < 0.5
     exposed-modules: Yesod.Form
                      Yesod.Form.Class
                      Yesod.Form.Types
diff --git a/yesod-json/yesod-json.cabal b/yesod-json/yesod-json.cabal
index e240b679..7f4b919c 100644
--- a/yesod-json/yesod-json.cabal
+++ b/yesod-json/yesod-json.cabal
@@ -13,13 +13,13 @@ homepage:        http://www.yesodweb.com/
 description:     Generate content for Yesod using the aeson package.
 
 library
-    build-depends:   base                      >= 4        && < 5
-                   , yesod-core                >= 0.9      && < 0.10
-                   , aeson-native              >= 0.3.2.11 && < 0.4
-                   , text                      >= 0.8      && < 0.12
-                   , shakespeare-js            >= 0.10     && < 0.11
-                   , vector
-                   , containers
+    build-depends:   base                 >= 4        && < 5
+                   , yesod-core           >= 0.9      && < 0.10
+                   , aeson-native         >= 0.3.3.1  && < 0.4
+                   , text                 >= 0.8      && < 0.12
+                   , shakespeare-js       >= 0.10     && < 0.11
+                   , vector               >= 0.9
+                   , containers           >= 0.2      && < 0.5
     exposed-modules: Yesod.Json
     ghc-options:     -Wall
 
diff --git a/yesod-newsfeed/yesod-newsfeed.cabal b/yesod-newsfeed/yesod-newsfeed.cabal
index 932749b5..8a6cf819 100644
--- a/yesod-newsfeed/yesod-newsfeed.cabal
+++ b/yesod-newsfeed/yesod-newsfeed.cabal
@@ -13,12 +13,12 @@ homepage:        http://www.yesodweb.com/
 description:     Helper functions and data types for producing News feeds.
 
 library
-    build-depends:   base                      >= 4        && < 5
-                   , yesod-core                >= 0.9      && < 0.10
-                   , time                      >= 1.1.4    && < 1.3
-                   , hamlet                    >= 0.10     && < 0.11
-                   , bytestring                >= 0.9      && < 0.10
-                   , text                      >= 0.9      && < 1.0
+    build-depends:   base                 >= 4        && < 5
+                   , yesod-core           >= 0.9      && < 0.10
+                   , time                 >= 1.1.4    && < 1.3
+                   , hamlet               >= 0.10     && < 0.11
+                   , bytestring           >= 0.9.1.4  && < 0.10
+                   , text                 >= 0.9      && < 0.12
     exposed-modules: Yesod.AtomFeed
                    , Yesod.RssFeed
                    , Yesod.Feed
diff --git a/yesod-persistent/yesod-persistent.cabal b/yesod-persistent/yesod-persistent.cabal
index 6e89eaa1..a5340252 100644
--- a/yesod-persistent/yesod-persistent.cabal
+++ b/yesod-persistent/yesod-persistent.cabal
@@ -18,7 +18,7 @@ library
                    , persistent                >= 0.6      && < 0.7
                    , persistent-template       >= 0.6      && < 0.7
                    , failure                   >= 0.1      && < 0.2
-                   , transformers              >= 0.2      && < 0.3
+                   , transformers              >= 0.2.2    && < 0.3
     exposed-modules: Yesod.Persist
     ghc-options:     -Wall
 
diff --git a/yesod-static/tests/unicode/wai-app-static.cabal b/yesod-static/tests/unicode/wai-app-static.cabal
index 80c2f6d9..d527657a 100644
--- a/yesod-static/tests/unicode/wai-app-static.cabal
+++ b/yesod-static/tests/unicode/wai-app-static.cabal
@@ -48,21 +48,21 @@ test-suite runtests
     type: exitcode-stdio-1.0
 
     build-depends:   base                      >= 4        && < 5
-                   , hspec >= 0.8   && < 0.10
+                   , hspec                     >= 0.8   && < 0.10
                    , HUnit
                    , unix-compat               >= 0.2      && < 0.3
                    , time                      >= 1.1.4    && < 1.3
                    , old-locale                >= 1.0.0.2  && < 1.1
                    , http-date
                    , Cabal
-                   , wai-app-static >= 0.3
-                   , wai-test
-                   , wai
-                   , http-types
-                   , network
-                   , bytestring
-                   , text
-                   , transformers
+                   , wai-app-static            >= 0.3
+                   , wai-test                  >= 1.2 && < 2.0
+                   , wai                       >= 0.4      && < 0.5
+                   , http-types                >= 0.6      && < 0.7
+                   , network                   >= 2.2      && < 2.4
+                   , bytestring                >= 0.9.1.4  && < 0.10
+                   , text                      >= 0.5      && < 0.12
+                   , transformers              >= 0.2.2    && < 0.3
                    -- , containers
   ghc-options:   -Wall
 
diff --git a/yesod-static/yesod-static.cabal b/yesod-static/yesod-static.cabal
index 823ce5b1..8c0bfe7d 100644
--- a/yesod-static/yesod-static.cabal
+++ b/yesod-static/yesod-static.cabal
@@ -19,24 +19,24 @@ flag test
   default: False
 
 library
-    build-depends:   base                      >= 4        && < 5
-                   , containers
-                   , old-time                  >= 1.0
-                   , yesod-core                >= 0.9      && < 0.10
-                   , base64-bytestring         >= 0.1.0.1  && < 0.2
-                   , pureMD5                   >= 2.1.0.3  && < 2.2
-                   , cereal                    >= 0.3      && < 0.4
-                   , bytestring                >= 0.9      && < 0.10
+    build-depends:   base                  >= 4        && < 5
+                   , containers            >= 0.2      && < 0.5
+                   , old-time              >= 1.0
+                   , yesod-core            >= 0.9      && < 0.10
+                   , base64-bytestring     >= 0.1.0.1  && < 0.2
+                   , pureMD5               >= 2.1.0.3  && < 2.2
+                   , cereal                >= 0.3      && < 0.4
+                   , bytestring            >= 0.9.1.4  && < 0.10
                    , template-haskell
-                   , directory                 >= 1.0      && < 1.2
-                   , transformers              >= 0.2      && < 0.3
-                   , wai-app-static            >= 0.3.2.1  && < 0.4
-                   , wai                       >= 0.4      && < 0.5
-                   , text                      >= 0.5      && < 1.0
-                   , file-embed                >= 0.0.4.1  && < 0.5
-                   , http-types                >= 0.6.5    && < 0.7
-                   , unix-compat               >= 0.2      && < 0.3
-                   , enumerator                >= 0.4.14   && < 0.5
+                   , directory             >= 1.0      && < 1.2
+                   , transformers          >= 0.2.2    && < 0.3
+                   , wai-app-static        >= 0.3.2.1  && < 0.4
+                   , wai                   >= 0.4      && < 0.5
+                   , text                  >= 0.9      && < 0.12
+                   , file-embed            >= 0.0.4.1  && < 0.5
+                   , http-types            >= 0.6.5    && < 0.7
+                   , unix-compat           >= 0.2      && < 0.3
+                   , enumerator            >= 0.4.8    && < 0.5
     exposed-modules: Yesod.Static
     ghc-options:     -Wall
 
diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index 84769fb2..349e038a 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -75,14 +75,14 @@ library
                    , yesod-persistent          >= 0.2      && < 0.3
                    , yesod-form                >= 0.3      && < 0.4
                    , monad-control             >= 0.2      && < 0.3
-                   , transformers              >= 0.2      && < 0.3
+                   , transformers              >= 0.2.2    && < 0.3
                    , wai                       >= 0.4      && < 0.5
                    , wai-extra                 >= 0.4.1    && < 0.5
                    , hamlet                    >= 0.10     && < 0.11
                    , shakespeare-js            >= 0.10     && < 0.11
                    , shakespeare-css           >= 0.10     && < 0.11
                    , warp                      >= 0.4      && < 0.5
-                   , blaze-html                >= 0.4      && < 0.5
+                   , blaze-html                >= 0.4.1.3  && < 0.5
     exposed-modules: Yesod
     ghc-options:     -Wall
 
@@ -97,7 +97,7 @@ executable             yesod
     build-depends:     parsec             >= 2.1          && < 4
                      , text               >= 0.11         && < 0.12
                      , shakespeare-text   >= 0.10         && < 0.11
-                     , bytestring         >= 0.9          && < 0.10
+                     , bytestring         >= 0.9.1.4  && < 0.10
                      , time               >= 1.1.4        && < 1.3
                      , template-haskell
                      , directory          >= 1.0          && < 1.2
@@ -106,7 +106,7 @@ executable             yesod
                      , containers         >= 0.2          && < 0.5
                      , attoparsec-text    >= 0.8.5        && < 0.9
                      , http-types         >= 0.6.1        && < 0.7
-                     , blaze-builder      >= 0.2          && < 0.4
+                     , blaze-builder      >= 0.2.1.4      && < 0.4
                      , filepath           >= 1.1          && < 1.3
                      , process
     ghc-options:       -Wall

From d05160f458262f0e9cc9f7cafb970e534f54c1e2 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Thu, 24 Nov 2011 13:28:06 -0500
Subject: [PATCH 116/189] fix deprecated pragma and follow it ourselves

---
 yesod-form/Yesod/Form/Functions.hs | 34 +++++++++++++++---------------
 yesod-form/Yesod/Form/MassInput.hs |  6 +++---
 yesod-form/Yesod/Form/Types.hs     |  2 +-
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/yesod-form/Yesod/Form/Functions.hs b/yesod-form/Yesod/Form/Functions.hs
index f762b621..1c42ba02 100644
--- a/yesod-form/Yesod/Form/Functions.hs
+++ b/yesod-form/Yesod/Form/Functions.hs
@@ -62,7 +62,7 @@ import qualified Data.ByteString.Lazy as L
 #endif
 
 -- | Get a unique identifier.
-newFormIdent :: Form sub master Text
+newFormIdent :: MForm sub master Text
 newFormIdent = do
     i <- get
     let i' = incrInts i
@@ -72,12 +72,12 @@ newFormIdent = do
     incrInts (IntSingle i) = IntSingle $ i + 1
     incrInts (IntCons i is) = (i + 1) `IntCons` is
 
-formToAForm :: Form sub master (FormResult a, FieldView sub master) -> AForm sub master a
+formToAForm :: MForm sub master (FormResult a, FieldView sub master) -> AForm sub master a
 formToAForm form = AForm $ \(master, langs) env ints -> do
     ((a, xml), ints', enc) <- runRWST form (env, master, langs) ints
     return (a, (:) xml, ints', enc)
 
-aFormToForm :: AForm sub master a -> Form sub master (FormResult a, [FieldView sub master] -> [FieldView sub master])
+aFormToForm :: AForm sub master a -> MForm sub master (FormResult a, [FieldView sub master] -> [FieldView sub master])
 aFormToForm (AForm aform) = do
     ints <- get
     (env, master, langs) <- ask
@@ -86,24 +86,24 @@ aFormToForm (AForm aform) = do
     tell enc
     return (a, xml)
 
-askParams :: Form sub master (Maybe Env)
+askParams :: MForm sub master (Maybe Env)
 askParams = do
     (x, _, _) <- ask
     return $ liftM fst x
 
-askFiles :: Form sub master (Maybe FileEnv)
+askFiles :: MForm sub master (Maybe FileEnv)
 askFiles = do
     (x, _, _) <- ask
     return $ liftM snd x
 
 mreq :: (RenderMessage master msg, RenderMessage master FormMessage)
      => Field sub master a -> FieldSettings msg -> Maybe a
-     -> Form sub master (FormResult a, FieldView sub master)
+     -> MForm sub master (FormResult a, FieldView sub master)
 mreq field fs mdef = mhelper field fs mdef (\m l -> FormFailure [renderMessage m l MsgValueRequired]) FormSuccess True
 
 mopt :: RenderMessage master msg
      => Field sub master a -> FieldSettings msg -> Maybe (Maybe a)
-     -> Form sub master (FormResult (Maybe a), FieldView sub master)
+     -> MForm sub master (FormResult (Maybe a), FieldView sub master)
 mopt field fs mdef = mhelper field fs (join mdef) (const $ const $ FormSuccess Nothing) (FormSuccess . Just) False
 
 mhelper :: RenderMessage master msg
@@ -113,7 +113,7 @@ mhelper :: RenderMessage master msg
         -> (master -> [Text] -> FormResult b) -- ^ on missing
         -> (a -> FormResult b) -- ^ on success
         -> Bool -- ^ is it required?
-        -> Form sub master (FormResult b, FieldView sub master)
+        -> MForm sub master (FormResult b, FieldView sub master)
 
 mhelper Field {..} FieldSettings {..} mdef onMissing onFound isReq = do
     mp <- askParams
@@ -157,7 +157,7 @@ aopt :: RenderMessage master msg
      -> AForm sub master (Maybe a)
 aopt a b = formToAForm . mopt a b
 
-runFormGeneric :: MonadIO m => Form sub master a -> master -> [Text] -> Maybe (Env, FileEnv) -> GGHandler sub master m (a, Enctype)
+runFormGeneric :: MonadIO m => MForm sub master a -> master -> [Text] -> Maybe (Env, FileEnv) -> GGHandler sub master m (a, Enctype)
 runFormGeneric form master langs env = liftIOHandler $ evalRWST form (env, master, langs) (IntSingle 1)
 
 -- | This function is used to both initially render a form and to later extract
@@ -170,14 +170,14 @@ runFormGeneric form master langs env = liftIOHandler $ evalRWST form (env, maste
 -- the form submit to a POST page. In such a case, both the GET and POST
 -- handlers should use 'runFormPost'.
 runFormPost :: RenderMessage master FormMessage
-            => (Html -> Form sub master (FormResult a, xml))
+            => (Html -> MForm sub master (FormResult a, xml))
             -> GHandler sub master ((FormResult a, xml), Enctype)
 runFormPost form = do
     env <- postEnv
     postHelper form env
 
 postHelper  :: RenderMessage master FormMessage
-            => (Html -> Form sub master (FormResult a, xml))
+            => (Html -> MForm sub master (FormResult a, xml))
             -> Maybe (Env, FileEnv)
             -> GHandler sub master ((FormResult a, xml), Enctype)
 postHelper form env = do
@@ -204,7 +204,7 @@ postHelper form env = do
 -- general usage, you can stick with @runFormPost@.
 generateFormPost
     :: RenderMessage master FormMessage
-    => (Html -> Form sub master (FormResult a, xml))
+    => (Html -> MForm sub master (FormResult a, xml))
     -> GHandler sub master ((FormResult a, xml), Enctype)
 generateFormPost form = postHelper form Nothing
 
@@ -220,14 +220,14 @@ postEnv = do
   where
     notEmpty = not . L.null . fileContent
 
-runFormPostNoNonce :: (Html -> Form sub master (FormResult a, xml)) -> GHandler sub master ((FormResult a, xml), Enctype)
+runFormPostNoNonce :: (Html -> MForm sub master (FormResult a, xml)) -> GHandler sub master ((FormResult a, xml), Enctype)
 runFormPostNoNonce form = do
     langs <- languages
     m <- getYesod
     env <- postEnv
     runFormGeneric (form mempty) m langs env
 
-runFormGet :: (Html -> Form sub master a) -> GHandler sub master (a, Enctype)
+runFormGet :: (Html -> MForm sub master a) -> GHandler sub master (a, Enctype)
 runFormGet form = do
     gets <- liftM reqGetParams getRequest
     let env =
@@ -236,13 +236,13 @@ runFormGet form = do
                 Just _ -> Just (Map.unionsWith (++) $ map (\(x, y) -> Map.singleton x [y]) gets, Map.empty)
     getHelper form env
 
-generateFormGet :: (Html -> Form sub master a) -> GHandler sub master (a, Enctype)
+generateFormGet :: (Html -> MForm sub master a) -> GHandler sub master (a, Enctype)
 generateFormGet form = getHelper form Nothing
 
 getKey :: Text
 getKey = "_hasdata"
 
-getHelper :: (Html -> Form sub master a) -> Maybe (Env, FileEnv) -> GHandler sub master (a, Enctype)
+getHelper :: (Html -> MForm sub master a) -> Maybe (Env, FileEnv) -> GHandler sub master (a, Enctype)
 getHelper form env = do
     let fragment = [HTML|<input type=hidden name=#{getKey}>|]
     langs <- languages
@@ -252,7 +252,7 @@ getHelper form env = do
 type FormRender sub master a =
        AForm sub master a
     -> Html
-    -> Form sub master (FormResult a, GWidget sub master ())
+    -> MForm sub master (FormResult a, GWidget sub master ())
 
 renderTable, renderDivs :: FormRender sub master a
 renderTable aform fragment = do
diff --git a/yesod-form/Yesod/Form/MassInput.hs b/yesod-form/Yesod/Form/MassInput.hs
index 3a3eae40..a07fd7fe 100644
--- a/yesod-form/Yesod/Form/MassInput.hs
+++ b/yesod-form/Yesod/Form/MassInput.hs
@@ -35,7 +35,7 @@ import Data.Maybe (listToMaybe)
 #define WHAMLET $whamlet
 #endif
 
-down :: Int -> Form sub master ()
+down :: Int -> MForm sub master ()
 down 0 = return ()
 down i | i < 0 = error "called down with a negative number"
 down i = do
@@ -43,7 +43,7 @@ down i = do
     put $ IntCons 0 is
     down $ i - 1
 
-up :: Int -> Form sub master ()
+up :: Int -> MForm sub master ()
 up 0 = return ()
 up i | i < 0 = error "called down with a negative number"
 up i = do
@@ -98,7 +98,7 @@ inputList label fixXml single mdef = formToAForm $ do
 
 withDelete :: (xml ~ GWidget sub master (), RenderMessage master FormMessage)
            => AForm sub master a
-           -> Form sub master (Either xml (FormResult a, [FieldView sub master]))
+           -> MForm sub master (Either xml (FormResult a, [FieldView sub master]))
 withDelete af = do
     down 1
     deleteName <- newFormIdent
diff --git a/yesod-form/Yesod/Form/Types.hs b/yesod-form/Yesod/Form/Types.hs
index cf3a6e7c..ddd1cd48 100644
--- a/yesod-form/Yesod/Form/Types.hs
+++ b/yesod-form/Yesod/Form/Types.hs
@@ -76,7 +76,7 @@ type FileEnv = Map.Map Text FileInfo
 
 type Lang = Text
 type Form sub master a = RWST (Maybe (Env, FileEnv), master, [Lang]) Enctype Ints (GGHandler sub master IO) a
-{-# DEPRECATE Form "Use MForm instead" #-}
+{-# DEPRECATED Form "Use MForm instead" #-}
 type MForm sub master a = RWST (Maybe (Env, FileEnv), master, [Lang]) Enctype Ints (GGHandler sub master IO) a
 
 newtype AForm sub master a = AForm

From 4d2f4a3b4f7dee015c0c50dcac28918b0860cb32 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Fri, 25 Nov 2011 15:11:15 +0200
Subject: [PATCH 117/189] Remove a painful slowdown from randomIV

---
 .gitignore                        |  1 +
 yesod-core/Yesod/Internal/Core.hs | 15 ++++++++-------
 yesod-core/bench.sh               |  8 ++++++++
 yesod-core/bench/pong.hs          | 32 +++++++++++++++++++++++++++++++
 4 files changed, 49 insertions(+), 7 deletions(-)
 create mode 100755 yesod-core/bench.sh
 create mode 100644 yesod-core/bench/pong.hs

diff --git a/.gitignore b/.gitignore
index d18abfaa..0b1195cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *.o
+*.o_p
 *.hi
 dist
 *.swp
diff --git a/yesod-core/Yesod/Internal/Core.hs b/yesod-core/Yesod/Internal/Core.hs
index 638e03fc..150cc46c 100644
--- a/yesod-core/Yesod/Internal/Core.hs
+++ b/yesod-core/Yesod/Internal/Core.hs
@@ -343,12 +343,12 @@ defaultYesodRunner _ m toMaster _ murl _ req
             [] -> Nothing
             (x, _):_ -> Just x
 defaultYesodRunner s master toMasterRoute mkey murl handler req = do
-    now <- liftIO getCurrentTime
-    let getExpires m = fromIntegral (m * 60) `addUTCTime` now
-    let exp' = getExpires $ clientSessionDuration master
-    let rh = takeWhile (/= ':') $ show $ W.remoteHost req
+    now <- {-# SCC "getCurrentTime" #-} liftIO getCurrentTime
+    let getExpires m = {-# SCC "getExpires" #-} fromIntegral (m * 60) `addUTCTime` now
+    let exp' = {-# SCC "exp'" #-} getExpires $ clientSessionDuration master
+    let rh = {-# SCC "rh" #-} takeWhile (/= ':') $ show $ W.remoteHost req
     let host = if sessionIpAddress master then S8.pack rh else ""
-    let session' =
+    let session' = {-# SCC "session'" #-}
             case mkey of
                 Nothing -> []
                 Just key -> fromMaybe [] $ do
@@ -356,7 +356,7 @@ defaultYesodRunner s master toMasterRoute mkey murl handler req = do
                     val <- lookup sessionName $ parseCookies raw
                     decodeSession key now host val
     rr <- liftIO $ parseWaiRequest req session' mkey
-    let h = do
+    let h = {-# SCC "h" #-} do
           case murl of
             Nothing -> handler
             Just url -> do
@@ -377,7 +377,8 @@ defaultYesodRunner s master toMasterRoute mkey murl handler req = do
                    $ filter (\(x, _) -> x /= nonceKey) session'
     yar <- handlerToYAR master s toMasterRoute (yesodRender master) errorHandler rr murl sessionMap h
     let mnonce = reqNonce rr
-    iv <- liftIO CS.randomIV
+    -- FIXME should we be caching this IV value and reusing it for efficiency?
+    iv <- {-# SCC "iv" #-} maybe (return $ error "Should not be used") (const $ liftIO CS.randomIV) mkey
     return $ yarToResponse (hr iv mnonce getExpires host exp') yar
   where
     hr iv mnonce getExpires host exp' hs ct sm =
diff --git a/yesod-core/bench.sh b/yesod-core/bench.sh
new file mode 100755
index 00000000..40331201
--- /dev/null
+++ b/yesod-core/bench.sh
@@ -0,0 +1,8 @@
+#!/bin/bash -ex
+
+ghc --make bench/pong.hs
+ghc --make bench/pong.hs -prof -osuf o_p -caf-all -auto-all -rtsopts
+./bench/pong +RTS -p &
+sleep 2
+ab -n 1000 -c 5 http://localhost:3000/ 2>&1 | grep 'Time taken'
+curl http://localhost:3000/kill
diff --git a/yesod-core/bench/pong.hs b/yesod-core/bench/pong.hs
new file mode 100644
index 00000000..2c69a6d3
--- /dev/null
+++ b/yesod-core/bench/pong.hs
@@ -0,0 +1,32 @@
+{-# LANGUAGE OverloadedStrings, QuasiQuotes, TypeFamilies, TemplateHaskell, MultiParamTypeClasses #-}
+import Yesod.Dispatch
+import Yesod.Content
+import Yesod.Internal.Core
+import Data.ByteString (ByteString)
+import Network.Wai.Handler.Warp (run)
+import Control.Concurrent.MVar
+import Control.Concurrent
+import Network.Wai
+import Control.Monad.IO.Class
+
+data Pong = Pong
+mkYesod "Pong" [$parseRoutes|
+/ PongR GET
+|]
+
+instance Yesod Pong where
+    approot _ = ""
+    encryptKey _ = return Nothing
+
+getPongR = return $ RepPlain $ toContent ("PONG" :: ByteString)
+
+main = do
+    app <- toWaiAppPlain Pong
+    flag <- newEmptyMVar
+    forkIO $ run 3000 $ \req ->
+        if pathInfo req == ["kill"]
+            then do
+                liftIO $ putMVar flag ()
+                error "done"
+            else app req
+    takeMVar flag

From 68c06a87f1f4d0d0e7769bab20fe397f9df7d80e Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Sat, 26 Nov 2011 09:28:37 -0600
Subject: [PATCH 118/189] add sources file for cabal-dev add-source-list

---
 sources.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 sources.txt

diff --git a/sources.txt b/sources.txt
new file mode 100644
index 00000000..60ba2fa0
--- /dev/null
+++ b/sources.txt
@@ -0,0 +1,10 @@
+yesod-core
+yesod-json
+yesod-static
+yesod-persistent
+yesod-newsfeed
+yesod-form
+yesod-auth
+yesod-sitemap
+yesod-default
+yesod

From f35cb5ae3270c44f0cc6f1fb40993f4e7e4b1d87 Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Sat, 26 Nov 2011 09:56:25 -0600
Subject: [PATCH 119/189] add deepseq instruction

---
 README.md | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 12e47a75..93f517bf 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,23 @@ featuring:
 
 ## Installing the latest development version from github
 
-If you are concerned about mucking with your installed packages, you might try using the new [virthualenv](http://hackage.haskell.org/package/virthualenv) tool to isolate a custom yesod build to a particular application.
+Currently there is a very annoying issue that aeson, a Yesod dependency requires deepseq < 1.2
+A new version of aeson should be released fairly soon.
+This means that before installing Yesod you should
+
+~~~
+cabal install deepseq-1.1.0.2
+~~~
+
+To ensure that cabal prefers this package you need to first start from a clean slate.
+The easiest way to do that is to use [virthualenv](http://hackage.haskell.org/package/virthualenv), which will prevent any conflicts with presently installed packages by creating an isolated install environment.
+
+~~~
+cabal install virthualenv
+mkdir yesodweb
+cd yesodweb
+virthualenv --name=yesod
+~~~
 
 Yesod is broken up into 4 separate repos and built upon many smaller packages.
 All of them can be installed with the below command.

From 6b84fb4b7b6c36fa9477ab7c824fc42b735e085c Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Sat, 26 Nov 2011 09:57:49 -0600
Subject: [PATCH 120/189] DEPRECATED, not DEPRECATE

---
 yesod-form/Yesod/Form/Types.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yesod-form/Yesod/Form/Types.hs b/yesod-form/Yesod/Form/Types.hs
index cf3a6e7c..ddd1cd48 100644
--- a/yesod-form/Yesod/Form/Types.hs
+++ b/yesod-form/Yesod/Form/Types.hs
@@ -76,7 +76,7 @@ type FileEnv = Map.Map Text FileInfo
 
 type Lang = Text
 type Form sub master a = RWST (Maybe (Env, FileEnv), master, [Lang]) Enctype Ints (GGHandler sub master IO) a
-{-# DEPRECATE Form "Use MForm instead" #-}
+{-# DEPRECATED Form "Use MForm instead" #-}
 type MForm sub master a = RWST (Maybe (Env, FileEnv), master, [Lang]) Enctype Ints (GGHandler sub master IO) a
 
 newtype AForm sub master a = AForm

From 6816039b21025ae576d67a4bf62e1d2f05aae04c Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Sat, 26 Nov 2011 10:31:12 -0600
Subject: [PATCH 121/189] Form -> MForm

---
 yesod-form/Yesod/Form/Functions.hs | 36 +++++++++++++++---------------
 yesod-form/Yesod/Form/MassInput.hs |  6 ++---
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/yesod-form/Yesod/Form/Functions.hs b/yesod-form/Yesod/Form/Functions.hs
index f762b621..84e96dc8 100644
--- a/yesod-form/Yesod/Form/Functions.hs
+++ b/yesod-form/Yesod/Form/Functions.hs
@@ -4,7 +4,7 @@
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE FlexibleContexts #-}
 module Yesod.Form.Functions
-    ( -- * Running in Form monad
+    ( -- * Running in MForm monad
       newFormIdent
     , askParams
     , askFiles
@@ -62,7 +62,7 @@ import qualified Data.ByteString.Lazy as L
 #endif
 
 -- | Get a unique identifier.
-newFormIdent :: Form sub master Text
+newFormIdent :: MForm sub master Text
 newFormIdent = do
     i <- get
     let i' = incrInts i
@@ -72,12 +72,12 @@ newFormIdent = do
     incrInts (IntSingle i) = IntSingle $ i + 1
     incrInts (IntCons i is) = (i + 1) `IntCons` is
 
-formToAForm :: Form sub master (FormResult a, FieldView sub master) -> AForm sub master a
+formToAForm :: MForm sub master (FormResult a, FieldView sub master) -> AForm sub master a
 formToAForm form = AForm $ \(master, langs) env ints -> do
     ((a, xml), ints', enc) <- runRWST form (env, master, langs) ints
     return (a, (:) xml, ints', enc)
 
-aFormToForm :: AForm sub master a -> Form sub master (FormResult a, [FieldView sub master] -> [FieldView sub master])
+aFormToForm :: AForm sub master a -> MForm sub master (FormResult a, [FieldView sub master] -> [FieldView sub master])
 aFormToForm (AForm aform) = do
     ints <- get
     (env, master, langs) <- ask
@@ -86,24 +86,24 @@ aFormToForm (AForm aform) = do
     tell enc
     return (a, xml)
 
-askParams :: Form sub master (Maybe Env)
+askParams :: MForm sub master (Maybe Env)
 askParams = do
     (x, _, _) <- ask
     return $ liftM fst x
 
-askFiles :: Form sub master (Maybe FileEnv)
+askFiles :: MForm sub master (Maybe FileEnv)
 askFiles = do
     (x, _, _) <- ask
     return $ liftM snd x
 
 mreq :: (RenderMessage master msg, RenderMessage master FormMessage)
      => Field sub master a -> FieldSettings msg -> Maybe a
-     -> Form sub master (FormResult a, FieldView sub master)
+     -> MForm sub master (FormResult a, FieldView sub master)
 mreq field fs mdef = mhelper field fs mdef (\m l -> FormFailure [renderMessage m l MsgValueRequired]) FormSuccess True
 
 mopt :: RenderMessage master msg
      => Field sub master a -> FieldSettings msg -> Maybe (Maybe a)
-     -> Form sub master (FormResult (Maybe a), FieldView sub master)
+     -> MForm sub master (FormResult (Maybe a), FieldView sub master)
 mopt field fs mdef = mhelper field fs (join mdef) (const $ const $ FormSuccess Nothing) (FormSuccess . Just) False
 
 mhelper :: RenderMessage master msg
@@ -113,7 +113,7 @@ mhelper :: RenderMessage master msg
         -> (master -> [Text] -> FormResult b) -- ^ on missing
         -> (a -> FormResult b) -- ^ on success
         -> Bool -- ^ is it required?
-        -> Form sub master (FormResult b, FieldView sub master)
+        -> MForm sub master (FormResult b, FieldView sub master)
 
 mhelper Field {..} FieldSettings {..} mdef onMissing onFound isReq = do
     mp <- askParams
@@ -157,7 +157,7 @@ aopt :: RenderMessage master msg
      -> AForm sub master (Maybe a)
 aopt a b = formToAForm . mopt a b
 
-runFormGeneric :: MonadIO m => Form sub master a -> master -> [Text] -> Maybe (Env, FileEnv) -> GGHandler sub master m (a, Enctype)
+runFormGeneric :: MonadIO m => MForm sub master a -> master -> [Text] -> Maybe (Env, FileEnv) -> GGHandler sub master m (a, Enctype)
 runFormGeneric form master langs env = liftIOHandler $ evalRWST form (env, master, langs) (IntSingle 1)
 
 -- | This function is used to both initially render a form and to later extract
@@ -170,14 +170,14 @@ runFormGeneric form master langs env = liftIOHandler $ evalRWST form (env, maste
 -- the form submit to a POST page. In such a case, both the GET and POST
 -- handlers should use 'runFormPost'.
 runFormPost :: RenderMessage master FormMessage
-            => (Html -> Form sub master (FormResult a, xml))
+            => (Html -> MForm sub master (FormResult a, xml))
             -> GHandler sub master ((FormResult a, xml), Enctype)
 runFormPost form = do
     env <- postEnv
     postHelper form env
 
 postHelper  :: RenderMessage master FormMessage
-            => (Html -> Form sub master (FormResult a, xml))
+            => (Html -> MForm sub master (FormResult a, xml))
             -> Maybe (Env, FileEnv)
             -> GHandler sub master ((FormResult a, xml), Enctype)
 postHelper form env = do
@@ -204,7 +204,7 @@ postHelper form env = do
 -- general usage, you can stick with @runFormPost@.
 generateFormPost
     :: RenderMessage master FormMessage
-    => (Html -> Form sub master (FormResult a, xml))
+    => (Html -> MForm sub master (FormResult a, xml))
     -> GHandler sub master ((FormResult a, xml), Enctype)
 generateFormPost form = postHelper form Nothing
 
@@ -220,14 +220,14 @@ postEnv = do
   where
     notEmpty = not . L.null . fileContent
 
-runFormPostNoNonce :: (Html -> Form sub master (FormResult a, xml)) -> GHandler sub master ((FormResult a, xml), Enctype)
+runFormPostNoNonce :: (Html -> MForm sub master (FormResult a, xml)) -> GHandler sub master ((FormResult a, xml), Enctype)
 runFormPostNoNonce form = do
     langs <- languages
     m <- getYesod
     env <- postEnv
     runFormGeneric (form mempty) m langs env
 
-runFormGet :: (Html -> Form sub master a) -> GHandler sub master (a, Enctype)
+runFormGet :: (Html -> MForm sub master a) -> GHandler sub master (a, Enctype)
 runFormGet form = do
     gets <- liftM reqGetParams getRequest
     let env =
@@ -236,13 +236,13 @@ runFormGet form = do
                 Just _ -> Just (Map.unionsWith (++) $ map (\(x, y) -> Map.singleton x [y]) gets, Map.empty)
     getHelper form env
 
-generateFormGet :: (Html -> Form sub master a) -> GHandler sub master (a, Enctype)
+generateFormGet :: (Html -> MForm sub master a) -> GHandler sub master (a, Enctype)
 generateFormGet form = getHelper form Nothing
 
 getKey :: Text
 getKey = "_hasdata"
 
-getHelper :: (Html -> Form sub master a) -> Maybe (Env, FileEnv) -> GHandler sub master (a, Enctype)
+getHelper :: (Html -> MForm sub master a) -> Maybe (Env, FileEnv) -> GHandler sub master (a, Enctype)
 getHelper form env = do
     let fragment = [HTML|<input type=hidden name=#{getKey}>|]
     langs <- languages
@@ -252,7 +252,7 @@ getHelper form env = do
 type FormRender sub master a =
        AForm sub master a
     -> Html
-    -> Form sub master (FormResult a, GWidget sub master ())
+    -> MForm sub master (FormResult a, GWidget sub master ())
 
 renderTable, renderDivs :: FormRender sub master a
 renderTable aform fragment = do
diff --git a/yesod-form/Yesod/Form/MassInput.hs b/yesod-form/Yesod/Form/MassInput.hs
index 3a3eae40..a07fd7fe 100644
--- a/yesod-form/Yesod/Form/MassInput.hs
+++ b/yesod-form/Yesod/Form/MassInput.hs
@@ -35,7 +35,7 @@ import Data.Maybe (listToMaybe)
 #define WHAMLET $whamlet
 #endif
 
-down :: Int -> Form sub master ()
+down :: Int -> MForm sub master ()
 down 0 = return ()
 down i | i < 0 = error "called down with a negative number"
 down i = do
@@ -43,7 +43,7 @@ down i = do
     put $ IntCons 0 is
     down $ i - 1
 
-up :: Int -> Form sub master ()
+up :: Int -> MForm sub master ()
 up 0 = return ()
 up i | i < 0 = error "called down with a negative number"
 up i = do
@@ -98,7 +98,7 @@ inputList label fixXml single mdef = formToAForm $ do
 
 withDelete :: (xml ~ GWidget sub master (), RenderMessage master FormMessage)
            => AForm sub master a
-           -> Form sub master (Either xml (FormResult a, [FieldView sub master]))
+           -> MForm sub master (Either xml (FormResult a, [FieldView sub master]))
 withDelete af = do
     down 1
     deleteName <- newFormIdent

From 236d55f00b9a3e6481fc17df59e01ab50db0446e Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Sat, 26 Nov 2011 10:44:56 -0600
Subject: [PATCH 122/189] fix yesod mega

---
 test/en.msg                                   |  1 +
 test/main.hs                                  |  5 +++
 test/yesod-core                               |  1 +
 yesod-core/test.hs                            |  4 ++
 yesod-core/test/YesodCoreTest.hs              | 24 +++++++++++
 .../test/{Test => YesodCoreTest}/CleanPath.hs |  2 +-
 .../{Test => YesodCoreTest}/ErrorHandling.hs  |  2 +-
 .../{Test => YesodCoreTest}/Exceptions.hs     |  2 +-
 .../InternalRequest.hs                        |  2 +-
 .../test/{Test => YesodCoreTest}/Links.hs     |  2 +-
 .../test/{Test => YesodCoreTest}/Media.hs     |  2 +-
 .../NoOverloadedStrings.hs                    |  2 +-
 .../test/{Test => YesodCoreTest}/Widget.hs    |  2 +-
 yesod-core/test/main.hs                       | 22 ----------
 yesod-core/yesod-core.cabal                   |  8 ++--
 yesod-mega.cabal                              | 40 +++++++++++++++++--
 yesod/yesod.cabal                             |  2 +-
 17 files changed, 85 insertions(+), 38 deletions(-)
 create mode 120000 test/en.msg
 create mode 100644 test/main.hs
 create mode 120000 test/yesod-core
 create mode 100644 yesod-core/test.hs
 create mode 100644 yesod-core/test/YesodCoreTest.hs
 rename yesod-core/test/{Test => YesodCoreTest}/CleanPath.hs (98%)
 rename yesod-core/test/{Test => YesodCoreTest}/ErrorHandling.hs (98%)
 rename yesod-core/test/{Test => YesodCoreTest}/Exceptions.hs (93%)
 rename yesod-core/test/{Test => YesodCoreTest}/InternalRequest.hs (98%)
 rename yesod-core/test/{Test => YesodCoreTest}/Links.hs (94%)
 rename yesod-core/test/{Test => YesodCoreTest}/Media.hs (97%)
 rename yesod-core/test/{Test => YesodCoreTest}/NoOverloadedStrings.hs (93%)
 rename yesod-core/test/{Test => YesodCoreTest}/Widget.hs (98%)
 delete mode 100644 yesod-core/test/main.hs

diff --git a/test/en.msg b/test/en.msg
new file mode 120000
index 00000000..f6159dee
--- /dev/null
+++ b/test/en.msg
@@ -0,0 +1 @@
+yesod-core/en.msg
\ No newline at end of file
diff --git a/test/main.hs b/test/main.hs
new file mode 100644
index 00000000..b04ec7db
--- /dev/null
+++ b/test/main.hs
@@ -0,0 +1,5 @@
+import Test.Hspec
+import qualified YesodCoreTest
+
+main :: IO ()
+main = hspecX $ descriptions $ YesodCoreTest.specs
diff --git a/test/yesod-core b/test/yesod-core
new file mode 120000
index 00000000..aaa0236b
--- /dev/null
+++ b/test/yesod-core
@@ -0,0 +1 @@
+../yesod-core/test
\ No newline at end of file
diff --git a/yesod-core/test.hs b/yesod-core/test.hs
new file mode 100644
index 00000000..7a8397c2
--- /dev/null
+++ b/yesod-core/test.hs
@@ -0,0 +1,4 @@
+import Test.Hspec
+import qualified YesodCoreTest
+
+main = hspecX $ descriptions $ YesodCoreTest.specs
diff --git a/yesod-core/test/YesodCoreTest.hs b/yesod-core/test/YesodCoreTest.hs
new file mode 100644
index 00000000..5f70039f
--- /dev/null
+++ b/yesod-core/test/YesodCoreTest.hs
@@ -0,0 +1,24 @@
+module YesodCoreTest (specs) where 
+
+import YesodCoreTest.CleanPath
+import YesodCoreTest.Exceptions
+import YesodCoreTest.Widget
+import YesodCoreTest.Media
+import YesodCoreTest.Links
+import YesodCoreTest.NoOverloadedStrings
+import YesodCoreTest.InternalRequest
+import YesodCoreTest.ErrorHandling
+
+import Test.Hspec
+
+specs :: [Specs]
+specs = -- concat
+    [ cleanPathTest
+    , exceptionsTest
+    , widgetTest
+    , mediaTest
+    , linksTest
+    , noOverloadedTest
+    , internalRequestTest
+    , errorHandlingTest
+    ]
diff --git a/yesod-core/test/Test/CleanPath.hs b/yesod-core/test/YesodCoreTest/CleanPath.hs
similarity index 98%
rename from yesod-core/test/Test/CleanPath.hs
rename to yesod-core/test/YesodCoreTest/CleanPath.hs
index 656da813..b07464ea 100644
--- a/yesod-core/test/Test/CleanPath.hs
+++ b/yesod-core/test/YesodCoreTest/CleanPath.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell, MultiParamTypeClasses #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE FlexibleInstances #-}
-module Test.CleanPath (cleanPathTest, Widget) where
+module YesodCoreTest.CleanPath (cleanPathTest, Widget) where
 
 import Test.Hspec
 import Test.Hspec.HUnit()
diff --git a/yesod-core/test/Test/ErrorHandling.hs b/yesod-core/test/YesodCoreTest/ErrorHandling.hs
similarity index 98%
rename from yesod-core/test/Test/ErrorHandling.hs
rename to yesod-core/test/YesodCoreTest/ErrorHandling.hs
index 51dd8c67..271469d7 100644
--- a/yesod-core/test/Test/ErrorHandling.hs
+++ b/yesod-core/test/YesodCoreTest/ErrorHandling.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE TypeFamilies, QuasiQuotes, TemplateHaskell, MultiParamTypeClasses, OverloadedStrings #-}
-module Test.ErrorHandling
+module YesodCoreTest.ErrorHandling
     ( errorHandlingTest
     , Widget
     ) where
diff --git a/yesod-core/test/Test/Exceptions.hs b/yesod-core/test/YesodCoreTest/Exceptions.hs
similarity index 93%
rename from yesod-core/test/Test/Exceptions.hs
rename to yesod-core/test/YesodCoreTest/Exceptions.hs
index 61bab779..a65a6c28 100644
--- a/yesod-core/test/Test/Exceptions.hs
+++ b/yesod-core/test/YesodCoreTest/Exceptions.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell, MultiParamTypeClasses #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE FlexibleInstances #-}
-module Test.Exceptions (exceptionsTest, Widget) where
+module YesodCoreTest.Exceptions (exceptionsTest, Widget) where
 
 import Test.Hspec
 import Test.Hspec.HUnit ()
diff --git a/yesod-core/test/Test/InternalRequest.hs b/yesod-core/test/YesodCoreTest/InternalRequest.hs
similarity index 98%
rename from yesod-core/test/Test/InternalRequest.hs
rename to yesod-core/test/YesodCoreTest/InternalRequest.hs
index 97e90b98..6615ddd1 100644
--- a/yesod-core/test/Test/InternalRequest.hs
+++ b/yesod-core/test/YesodCoreTest/InternalRequest.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE OverloadedStrings #-}
-module Test.InternalRequest (internalRequestTest) where
+module YesodCoreTest.InternalRequest (internalRequestTest) where
 
 import Data.List (nub)
 import System.Random (StdGen, mkStdGen)
diff --git a/yesod-core/test/Test/Links.hs b/yesod-core/test/YesodCoreTest/Links.hs
similarity index 94%
rename from yesod-core/test/Test/Links.hs
rename to yesod-core/test/YesodCoreTest/Links.hs
index 69679625..6df9ab62 100644
--- a/yesod-core/test/Test/Links.hs
+++ b/yesod-core/test/YesodCoreTest/Links.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell, MultiParamTypeClasses #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE FlexibleInstances #-}
-module Test.Links (linksTest, Widget) where
+module YesodCoreTest.Links (linksTest, Widget) where
 
 import Test.Hspec
 import Test.Hspec.HUnit ()
diff --git a/yesod-core/test/Test/Media.hs b/yesod-core/test/YesodCoreTest/Media.hs
similarity index 97%
rename from yesod-core/test/Test/Media.hs
rename to yesod-core/test/YesodCoreTest/Media.hs
index 4e863db9..43033785 100644
--- a/yesod-core/test/Test/Media.hs
+++ b/yesod-core/test/YesodCoreTest/Media.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell, MultiParamTypeClasses #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE FlexibleInstances #-}
-module Test.Media (mediaTest, Widget) where
+module YesodCoreTest.Media (mediaTest, Widget) where
 
 import Test.Hspec
 import Test.Hspec.HUnit ()
diff --git a/yesod-core/test/Test/NoOverloadedStrings.hs b/yesod-core/test/YesodCoreTest/NoOverloadedStrings.hs
similarity index 93%
rename from yesod-core/test/Test/NoOverloadedStrings.hs
rename to yesod-core/test/YesodCoreTest/NoOverloadedStrings.hs
index f162d7f2..24f9d75f 100644
--- a/yesod-core/test/Test/NoOverloadedStrings.hs
+++ b/yesod-core/test/YesodCoreTest/NoOverloadedStrings.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell, MultiParamTypeClasses #-}
 {-# LANGUAGE FlexibleInstances #-}
-module Test.NoOverloadedStrings (noOverloadedTest, Widget) where
+module YesodCoreTest.NoOverloadedStrings (noOverloadedTest, Widget) where
 
 import Test.Hspec
 import Test.Hspec.HUnit ()
diff --git a/yesod-core/test/Test/Widget.hs b/yesod-core/test/YesodCoreTest/Widget.hs
similarity index 98%
rename from yesod-core/test/Test/Widget.hs
rename to yesod-core/test/YesodCoreTest/Widget.hs
index 8de0b268..acd86a1b 100644
--- a/yesod-core/test/Test/Widget.hs
+++ b/yesod-core/test/YesodCoreTest/Widget.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell, MultiParamTypeClasses #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE FlexibleInstances #-}
-module Test.Widget (widgetTest) where
+module YesodCoreTest.Widget (widgetTest) where
 
 import Test.Hspec
 import Test.Hspec.HUnit ()
diff --git a/yesod-core/test/main.hs b/yesod-core/test/main.hs
deleted file mode 100644
index 2afdda64..00000000
--- a/yesod-core/test/main.hs
+++ /dev/null
@@ -1,22 +0,0 @@
-import Test.Hspec
-
-import Test.CleanPath
-import Test.Exceptions
-import Test.Widget
-import Test.Media
-import Test.Links
-import Test.NoOverloadedStrings
-import Test.InternalRequest
-import Test.ErrorHandling
-
-main :: IO ()
-main = hspecX $ descriptions $
-    [ cleanPathTest
-    , exceptionsTest
-    , widgetTest
-    , mediaTest
-    , linksTest
-    , noOverloadedTest
-    , internalRequestTest
-    , errorHandlingTest
-    ]
diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index d28212ab..ed378df9 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -93,20 +93,20 @@ library
     if flag(test)
         Buildable: False
 
-test-suite runtests
+test-suite tests
     type: exitcode-stdio-1.0
-    main-is: main.hs
+    main-is: ../test.hs
     hs-source-dirs: test
 
     if flag(ghc7)
         type: exitcode-stdio-1.0
         build-depends:   base                      >= 4.3      && < 5
         cpp-options:     -DGHC7
-        main-is:         main.hs
+        main-is:         test.hs
     else
         type: exitcode-stdio-1.0
         build-depends:   base                      >= 4        && < 4.3
-        main-is:         main.hs
+        main-is:         test.hs
     cpp-options:   -DTEST
     build-depends: hspec >= 0.8 && < 0.10
                   ,wai-test >= 0.1.2 && < 0.2
diff --git a/yesod-mega.cabal b/yesod-mega.cabal
index 11714eef..175c643e 100644
--- a/yesod-mega.cabal
+++ b/yesod-mega.cabal
@@ -10,7 +10,7 @@ description:
 
 category:        Web, Yesod
 stability:       Stable
-cabal-version:   >= 1.6
+cabal-version:   >= 1.8
 build-type:      Simple
 homepage:        http://www.yesodweb.com/
 
@@ -84,7 +84,9 @@ library
                      Yesod.RssFeed
                      Yesod.Feed
 
-    other-modules: 
+    other-modules:
+                     -- yesod-newsfeed
+                     Yesod.FeedTypes
                      -- yesod-core
                      Yesod.Internal
                      Yesod.Internal.Core
@@ -117,9 +119,9 @@ library
                    -- yesod
                      Cabal              >= 1.8          && < 1.13
                    , shakespeare-text   >= 0.10     && < 0.11
-                   , attoparsec-text    >= 0.8.5        && < 0.9
                    , filepath           >= 1.1          && < 1.3
                    , process
+                   , attoparsec-text    >= 0.8.5        && < 0.8.5.2
                    -- yesod-sitemap
                    -- empty
 
@@ -185,6 +187,38 @@ library
                    , aeson-native          >= 0.3.3.1  && < 0.4
     ghc-options:     -Wall
 
+test-suite tests
+    type: exitcode-stdio-1.0
+    main-is: main.hs
+    hs-source-dirs: 
+                    test
+                    yesod-core/test
+
+    if flag(ghc7)
+        type: exitcode-stdio-1.0
+        build-depends:   base                      >= 4.3      && < 5
+        cpp-options:     -DGHC7
+        main-is:         test.hs
+    else
+        type: exitcode-stdio-1.0
+        build-depends:   base                      >= 4        && < 4.3
+        main-is:         test.hs
+    cpp-options:   -DTEST
+    build-depends: yesod-mega
+                  ,hspec >= 0.8 && < 0.10
+                  ,wai-test >= 0.1.2 && < 0.2
+                  ,wai
+                  ,bytestring
+                  ,hamlet
+                  ,shakespeare-css
+                  ,shakespeare-js
+                  ,text
+                  ,http-types
+                  , random
+                  ,HUnit
+                  ,QuickCheck >= 2 && < 3
+                  , enumerator
+    ghc-options:     -Wall
 
 source-repository head
   type:     git
diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index 349e038a..c5fd7c71 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -104,7 +104,7 @@ executable             yesod
                      , Cabal              >= 1.8          && < 1.13
                      , unix-compat        >= 0.2          && < 0.4
                      , containers         >= 0.2          && < 0.5
-                     , attoparsec-text    >= 0.8.5        && < 0.9
+                     , attoparsec-text    >= 0.8.5        && < 0.8.5.2
                      , http-types         >= 0.6.1        && < 0.7
                      , blaze-builder      >= 0.2.1.4      && < 0.4
                      , filepath           >= 1.1          && < 1.3

From fa5e8555481d6da9df64a92a9f9fca9a491e898a Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Tue, 22 Nov 2011 06:30:47 -0600
Subject: [PATCH 123/189] install instructions

---
 README.md | 129 ++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 106 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index 93f517bf..00346eef 100644
--- a/README.md
+++ b/README.md
@@ -19,38 +19,121 @@ featuring:
     yesod init
 
 
+## Using cabal-dev
+
+cabal-dev creates a sandboxed environment for an individual cabal package.
+Your application is a cabal package and you should use cabal-dev with your Yesod application.
+Instead of using the `cabal` command, use the `cabal-dev` command.
+Use `yesod-devel --dev` when developing your application.
+
 ## Installing the latest development version from github
 
-Currently there is a very annoying issue that aeson, a Yesod dependency requires deepseq < 1.2
-A new version of aeson should be released fairly soon.
-This means that before installing Yesod you should
+Yesod is broken up into 4 separate code repositories each built upon many smaller packages.
 
-~~~
-cabal install deepseq-1.1.0.2
+Install conflicts are unfortunately common in Haskell development.
+However, we can prevent most of them by using some extra tools.
+This will require a little up-front reading and learning, but save you from a lot of misery in the long-run.
+See the above explanation of cabal-dev, and below of virthualenv.
+
+Please note that cabal-dev will not work in a virthualenv shell - you can't use both at the same time.
+
+### virthualenv
+
+To just install Yesod from github, we only need cabal-dev. However, cabal-dev may be more hassle than it is worth when hacking on Yesod.
+
+We recommend using [virthualenv](http://hackage.haskell.org/package/virthualenv) when hacking on Yesod.
+This is optional, but prevents your custom build of Yesod from interfering with your currently installed cabal packages.
+virthualenv creates an isolated environment like cabal-dev.
+cabal-dev isolates a single cabal package, but virthualenv isolates multiple packages together.
+
+virthualenv works at the shell level, so every shell must activate the virthualenv.
+
+### Building Yesod
+
+~~~ { .bash }
+# update your package database if you haven't recently
+cabal update
+# latest version of cabal-dev is required
+cabal install Cabal cabal-install cabal-dev virthualenv
+
+# finally build Yesod. Note: this is a completely sandboxed, except it installs the latest vesion of cabal-dev
+git clone http://github.com/yesodweb/install yesodweb && cd yesodweb
+cd install && cabal-dev install && dist/build/install/install && cd ..
 ~~~
 
-To ensure that cabal prefers this package you need to first start from a clean slate.
-The easiest way to do that is to use [virthualenv](http://hackage.haskell.org/package/virthualenv), which will prevent any conflicts with presently installed packages by creating an isolated install environment.
+### Hacking on Yesod
 
-~~~
-cabal install virthualenv
-mkdir yesodweb
-cd yesodweb
-virthualenv --name=yesod
-~~~
+To prevent Yesod from conflicting with your other installs, you should use virthualenv, although it is optional.
 
-Yesod is broken up into 4 separate repos and built upon many smaller packages.
-All of them can be installed with the below command.
+#### virthualenv
 
 ~~~ { .bash }
 cabal update
+cabal install virthualenv
+virthualenv --name=yesod
+./virthualenv/bin/activate
 
-for repo in hamlet persistent wai yesod; do
-  git clone http://github.com/yesodweb/$repo
-  (
-    cd $repo
-    git submodule update --init
-    ./scripts/install
-  )
-done
+# from the yesodweb directory, install the mega-mega repo to align all your dependencies
+cabal install deepseq-1.1.0.2
+cabal install
+~~~
+
+#### aeson deepseq
+
+Currently there is a very annoying issue that aeson, a Yesod dependency requires deepseq < 1.2
+A new version of aeson should be released fairly soon.
+This means that before installing Yesod you should install deepseq from a clean slate (using virthualenv)
+
+~~~ { .bash }
+cabal install deepseq-1.1.0.2
+~~~
+
+#### Mega repos
+
+Yesod consists of four mega repos: yesod, wai, persistent, and hamlet
+Each mega repo contains multiple cabal packages, and a mega cabal package.
+You will likely find development much easier if you compile and test with the mega repo.
+Installing a mega repo helps cabal align all the dependencies correctly.
+The yesodweb folder is also a mega-mega repo that will compile all four mega repos at once.
+
+~~~ { .bash }
+# Move to which one of the four repos you are working on.
+cd hamlet
+
+# build and test the mega repo
+cabal install --enable-tests
+cabal build
+cabal test
+~~~
+
+#### individual cabal packages
+
+If you first install the mega repo, then it should be easier to work on an individual package rather than the mega.
+
+~~~ { .bash }
+# build all packages individually
+./scripts/install
+
+# move to the individual package you are working on
+cd shakespeare-text
+
+# build and test the individual package
+cabal configure --enable-tests
+cabal build
+cabal test
+~~~
+
+#### cabal-dev
+
+cabal-dev works very well if you are working on a single package, but it can be very cumbersome to work on multiple packages at once.
+
+### Use your development version of Yesod in your application
+
+Note that we have told you to instal Yesod into a sandboxed virthualenv or cabal-dev environment.
+This means it is not available through your user/global cabal database for your application.
+Instead you should use `cabal-dev add-source-list` to retrieve these packages.
+cd to your application directory, and the reference the source list.
+
+~~~ { .bash }
+cabal-dev add-source-list /path/to/yesodweb/sources.txt
 ~~~

From be16db1454fa492d43c3533e1876ebedb37a6d3f Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sat, 26 Nov 2011 22:28:43 +0200
Subject: [PATCH 124/189] Don't use JSON-P middleware by default

---
 yesod-core/Yesod/Dispatch.hs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/yesod-core/Yesod/Dispatch.hs b/yesod-core/Yesod/Dispatch.hs
index 91147cb8..2c56e785 100644
--- a/yesod-core/Yesod/Dispatch.hs
+++ b/yesod-core/Yesod/Dispatch.hs
@@ -34,7 +34,6 @@ import Yesod.Internal.RouteParsing (THResource, Pieces (..), createRoutes, creat
 import Language.Haskell.TH.Syntax
 
 import qualified Network.Wai as W
-import Network.Wai.Middleware.Jsonp
 import Network.Wai.Middleware.Gzip
 import Network.Wai.Middleware.Autohead
 
@@ -172,11 +171,11 @@ thResourceFromResource (Resource n _ _) =
     error $ "Invalid attributes for resource: " ++ n
 
 -- | Convert the given argument into a WAI application, executable with any WAI
--- handler. This is the same as 'toWaiAppPlain', except it includes three
--- middlewares: GZIP compression, JSON-P and autohead. This is the
+-- handler. This is the same as 'toWaiAppPlain', except it includes two
+-- middlewares: GZIP compression and autohead. This is the
 -- recommended approach for most users.
 toWaiApp :: (Yesod y, YesodDispatch y y) => y -> IO W.Application
-toWaiApp y = gzip (gzipCompressFiles y) . jsonp . autohead <$> toWaiAppPlain y
+toWaiApp y = gzip (gzipCompressFiles y) . autohead <$> toWaiAppPlain y
 
 -- | Convert the given argument into a WAI application, executable with any WAI
 -- handler. This differs from 'toWaiApp' in that it uses no middlewares.

From e7388b1a89abe1ba5558415fc4581bdf99693ed3 Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Sat, 26 Nov 2011 19:15:09 -0600
Subject: [PATCH 125/189] fix README typos

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 00346eef..bbea829d 100644
--- a/README.md
+++ b/README.md
@@ -90,7 +90,7 @@ cabal install deepseq-1.1.0.2
 
 #### Mega repos
 
-Yesod consists of four mega repos: yesod, wai, persistent, and hamlet
+Yesod consists of four mega repos: yesod, wai, persistent, and hamlet.
 Each mega repo contains multiple cabal packages, and a mega cabal package.
 You will likely find development much easier if you compile and test with the mega repo.
 Installing a mega repo helps cabal align all the dependencies correctly.
@@ -129,7 +129,7 @@ cabal-dev works very well if you are working on a single package, but it can be
 
 ### Use your development version of Yesod in your application
 
-Note that we have told you to instal Yesod into a sandboxed virthualenv or cabal-dev environment.
+Note that we have told you to install Yesod into a sandboxed virthualenv or cabal-dev environment.
 This means it is not available through your user/global cabal database for your application.
 Instead you should use `cabal-dev add-source-list` to retrieve these packages.
 cd to your application directory, and the reference the source list.

From 1bf032d17653f093304229a024dddd34bf2a1c15 Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Sat, 26 Nov 2011 21:01:28 -0600
Subject: [PATCH 126/189] README clarifications

---
 README.md | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index bbea829d..51bd542b 100644
--- a/README.md
+++ b/README.md
@@ -53,10 +53,11 @@ virthualenv works at the shell level, so every shell must activate the virthuale
 ~~~ { .bash }
 # update your package database if you haven't recently
 cabal update
-# latest version of cabal-dev is required
+# install required libraries
 cabal install Cabal cabal-install cabal-dev virthualenv
 
-# finally build Yesod. Note: this is a completely sandboxed, except it installs the latest vesion of cabal-dev
+# finally build Yesod.
+# this is completely sandboxed, except that it installs an unreleased vesion of cabal-dev
 git clone http://github.com/yesodweb/install yesodweb && cd yesodweb
 cd install && cabal-dev install && dist/build/install/install && cd ..
 ~~~
@@ -70,11 +71,13 @@ To prevent Yesod from conflicting with your other installs, you should use virth
 ~~~ { .bash }
 cabal update
 cabal install virthualenv
+cd yesodweb
 virthualenv --name=yesod
 ./virthualenv/bin/activate
 
-# from the yesodweb directory, install the mega-mega repo to align all your dependencies
+# prevent dependency issue
 cabal install deepseq-1.1.0.2
+# from the yesodweb directory, install the mega-mega repo to align all your dependencies
 cabal install
 ~~~
 
@@ -92,9 +95,9 @@ cabal install deepseq-1.1.0.2
 
 Yesod consists of four mega repos: yesod, wai, persistent, and hamlet.
 Each mega repo contains multiple cabal packages, and a mega cabal package.
-You will likely find development much easier if you compile and test with the mega repo.
-Installing a mega repo helps cabal align all the dependencies correctly.
 The yesodweb folder is also a mega-mega repo that will compile all four mega repos at once.
+You may find development easier if you compile and test with a mega repo.
+Installing a mega repo helps cabal align all the dependencies correctly.
 
 ~~~ { .bash }
 # Move to which one of the four repos you are working on.

From 1ff5bf083f5322436cf6e0985f25c5ef9ceb004e Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Sat, 26 Nov 2011 21:15:14 -0600
Subject: [PATCH 127/189] expose parseRoutesNoCheck & parseRoutesFileNoCheck

related to #174
---
 yesod-core/Yesod/Dispatch.hs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/yesod-core/Yesod/Dispatch.hs b/yesod-core/Yesod/Dispatch.hs
index 2c56e785..abe49064 100644
--- a/yesod-core/Yesod/Dispatch.hs
+++ b/yesod-core/Yesod/Dispatch.hs
@@ -4,7 +4,9 @@
 module Yesod.Dispatch
     ( -- * Quasi-quoted routing
       parseRoutes
+    , parseRoutesNoCheck
     , parseRoutesFile
+    , parseRoutesFileNoCheck
     , mkYesod
     , mkYesodSub
       -- ** More fine-grained
@@ -30,7 +32,7 @@ import Yesod.Internal.Dispatch
 import Yesod.Widget (GWidget)
 
 import Web.PathPieces (SinglePiece (..), MultiPiece (..))
-import Yesod.Internal.RouteParsing (THResource, Pieces (..), createRoutes, createRender, Resource (..), parseRoutes, parseRoutesFile)
+import Yesod.Internal.RouteParsing (THResource, Pieces (..), createRoutes, createRender, Resource (..), parseRoutes, parseRoutesNoCheck, parseRoutesFile, parseRoutesFileNoCheck)
 import Language.Haskell.TH.Syntax
 
 import qualified Network.Wai as W

From f4593214987ecc895c37adfb456625946b611e93 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sun, 27 Nov 2011 15:44:47 +0200
Subject: [PATCH 128/189] aeson-native => aeson

---
 yesod-auth/yesod-auth.cabal | 2 +-
 yesod-core/yesod-core.cabal | 2 +-
 yesod-json/yesod-json.cabal | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal
index a9fc0e07..80a6288a 100644
--- a/yesod-auth/yesod-auth.cabal
+++ b/yesod-auth/yesod-auth.cabal
@@ -43,7 +43,7 @@ library
                    , persistent-template     >= 0.6       && < 0.7
                    , SHA                     >= 1.4.1.3   && < 1.6
                    , http-enumerator         >= 0.6       && < 0.8
-                   , aeson-native            >= 0.3.3.1   && < 0.4
+                   , aeson                   >= 0.3
                    , pwstore-fast            >= 2.2       && < 3
 
     exposed-modules: Yesod.Auth
diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index ed378df9..0f81af3e 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -70,7 +70,7 @@ library
                    -- for logger. Probably logger should be a separate package
                    , strict-concurrency    >= 0.2.4    && < 0.2.5
                    , vector                >= 0.9      && < 0.10
-                   , aeson-native          >= 0.3.3.1  && < 0.4
+                   , aeson                 >= 0.3
 
     exposed-modules: Yesod.Content
                      Yesod.Core
diff --git a/yesod-json/yesod-json.cabal b/yesod-json/yesod-json.cabal
index 7f4b919c..ac7baa4f 100644
--- a/yesod-json/yesod-json.cabal
+++ b/yesod-json/yesod-json.cabal
@@ -15,7 +15,7 @@ description:     Generate content for Yesod using the aeson package.
 library
     build-depends:   base                 >= 4        && < 5
                    , yesod-core           >= 0.9      && < 0.10
-                   , aeson-native         >= 0.3.3.1  && < 0.4
+                   , aeson                >= 0.3
                    , text                 >= 0.8      && < 0.12
                    , shakespeare-js       >= 0.10     && < 0.11
                    , vector               >= 0.9

From 1d4f1948af6f728e3b4dbb716fef6bf5a529c9c5 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sun, 27 Nov 2011 15:50:02 +0200
Subject: [PATCH 129/189] Relaxed upper bounds

---
 yesod-core/yesod-core.cabal         | 4 ++--
 yesod-form/yesod-form.cabal         | 2 +-
 yesod-newsfeed/yesod-newsfeed.cabal | 2 +-
 yesod-sitemap/yesod-sitemap.cabal   | 2 +-
 yesod/yesod.cabal                   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index 0f81af3e..ca4cb911 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -38,7 +38,7 @@ library
         cpp-options:     -DGHC7
     else
         build-depends:   base              >= 4        && < 4.3
-    build-depends:   time                  >= 1.1.4    && < 1.3
+    build-depends:   time                  >= 1.1.4
                    , wai                   >= 0.4      && < 0.5
                    , wai-extra             >= 0.4.1    && < 0.5
                    , bytestring            >= 0.9.1.4  && < 0.10
@@ -62,7 +62,7 @@ library
                    , cookie                >= 0.3      && < 0.4
                    , blaze-html            >= 0.4.1.3  && < 0.5
                    , http-types            >= 0.6.5    && < 0.7
-                   , case-insensitive      >= 0.2      && < 0.4
+                   , case-insensitive      >= 0.2
                    , parsec                >= 2        && < 3.2
                    , directory             >= 1        && < 1.2
                    , data-object           >= 0.3      && < 0.4
diff --git a/yesod-form/yesod-form.cabal b/yesod-form/yesod-form.cabal
index 8c806e93..9fdf5706 100644
--- a/yesod-form/yesod-form.cabal
+++ b/yesod-form/yesod-form.cabal
@@ -16,7 +16,7 @@ library
     build-depends:   base                  >= 4        && < 5
                    , yesod-core            >= 0.9      && < 0.10
                    , yesod-persistent      >= 0.2      && < 0.3
-                   , time                  >= 1.1.4    && < 1.3
+                   , time                  >= 1.1.4
                    , hamlet                >= 0.10     && < 0.11
                    , shakespeare-css       >= 0.10     && < 0.11
                    , shakespeare-js        >= 0.10     && < 0.11
diff --git a/yesod-newsfeed/yesod-newsfeed.cabal b/yesod-newsfeed/yesod-newsfeed.cabal
index 8a6cf819..e0b2db4c 100644
--- a/yesod-newsfeed/yesod-newsfeed.cabal
+++ b/yesod-newsfeed/yesod-newsfeed.cabal
@@ -15,7 +15,7 @@ description:     Helper functions and data types for producing News feeds.
 library
     build-depends:   base                 >= 4        && < 5
                    , yesod-core           >= 0.9      && < 0.10
-                   , time                 >= 1.1.4    && < 1.3
+                   , time                 >= 1.1.4
                    , hamlet               >= 0.10     && < 0.11
                    , bytestring           >= 0.9.1.4  && < 0.10
                    , text                 >= 0.9      && < 0.12
diff --git a/yesod-sitemap/yesod-sitemap.cabal b/yesod-sitemap/yesod-sitemap.cabal
index 013175e2..20d9fb03 100644
--- a/yesod-sitemap/yesod-sitemap.cabal
+++ b/yesod-sitemap/yesod-sitemap.cabal
@@ -15,7 +15,7 @@ description:     Generate XML sitemaps.
 library
     build-depends:   base                      >= 4        && < 5
                    , yesod-core                >= 0.9      && < 0.10
-                   , time                      >= 1.1.4    && < 1.3
+                   , time                      >= 1.1.4
                    , hamlet                    >= 0.10     && < 0.11
     exposed-modules: Yesod.Sitemap
     ghc-options:     -Wall
diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index c5fd7c71..3149ecfb 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -98,7 +98,7 @@ executable             yesod
                      , text               >= 0.11         && < 0.12
                      , shakespeare-text   >= 0.10         && < 0.11
                      , bytestring         >= 0.9.1.4  && < 0.10
-                     , time               >= 1.1.4        && < 1.3
+                     , time               >= 1.1.4
                      , template-haskell
                      , directory          >= 1.0          && < 1.2
                      , Cabal              >= 1.8          && < 1.13

From 9737ad70dab636e845d9e69bb265bcdcd8823c26 Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Sun, 27 Nov 2011 08:10:23 -0600
Subject: [PATCH 130/189] latests scripts

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 806eed3c..bc893388 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 806eed3cd050d2d49e86499be977684e5c0b1cbf
+Subproject commit bc893388ed0eb0d7003041381626366d207d18cf

From 11ac3a00dd92808b6dbacfa77f98ce0d8c8ef904 Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Sun, 27 Nov 2011 08:10:35 -0600
Subject: [PATCH 131/189] get yesod-static tests running again

---
 README.md                                      |   4 ++--
 test/en.msg                                    |   2 +-
 test/fs                                        |   1 +
 test/main.hs                                   |   6 +++++-
 test/yesod-core                                |   1 -
 yesod-core/test/YesodCoreTest.hs               |   2 +-
 yesod-core/yesod-core.cabal                    |   2 --
 yesod-mega.cabal                               |  10 +++++++++-
 yesod-static/Yesod/Static.hs                   |   3 +++
 yesod-static/test/YesodStaticTest.hs           |  16 ++++++++++++++++
 yesod-static/{tests/data => test/fs}/.ignored  |   0
 yesod-static/{tests/data => test/fs}/bar/baz   |   0
 yesod-static/{tests/data => test/fs}/foo       |   0
 .../{tests/data => test/fs}/tmp/ignored        |   0
 yesod-static/{tests => test}/unicode/LICENSE   |   0
 yesod-static/{tests => test}/unicode/README    |   0
 yesod-static/{tests => test}/unicode/Setup.lhs |   0
 yesod-static/{tests => test}/unicode/TODO      |   0
 yesod-static/{tests => test}/unicode/app.hs    |   0
 .../{tests => test}/unicode/embedded-sample.hs |   0
 .../{tests => test}/unicode/folder.png         | Bin
 .../{tests => test}/unicode/folder.svg         |   0
 .../{tests => test}/unicode/haskell.png        | Bin
 yesod-static/{tests => test}/unicode/sample.hs |   0
 yesod-static/{tests => test}/unicode/test.hs   |   0
 yesod-static/{tests => test}/unicode/tests/a/b |   0
 .../{tests => test}/unicode/tests/runtests.hs  |   0
 .../{tests => test}/unicode/unicode.hs         |   0
 .../unicode/wai-app-static.cabal               |   0
 yesod-static/{tests => test}/unicode/warp.hs   |   0
 .../{tests => test}/unicode/קרררר.html         |   0
 yesod-static/{tests => test}/unicode/שלום      |   0
 .../{tests => test}/unicode/ששש/DUMMY.txt      |   0
 yesod-static/tests.hs                          |   7 +++++++
 yesod-static/tests/runtests.hs                 |  17 -----------------
 yesod-static/yesod-static.cabal                |  12 +++++++-----
 36 files changed, 52 insertions(+), 31 deletions(-)
 create mode 120000 test/fs
 delete mode 120000 test/yesod-core
 create mode 100644 yesod-static/test/YesodStaticTest.hs
 rename yesod-static/{tests/data => test/fs}/.ignored (100%)
 rename yesod-static/{tests/data => test/fs}/bar/baz (100%)
 rename yesod-static/{tests/data => test/fs}/foo (100%)
 rename yesod-static/{tests/data => test/fs}/tmp/ignored (100%)
 rename yesod-static/{tests => test}/unicode/LICENSE (100%)
 rename yesod-static/{tests => test}/unicode/README (100%)
 rename yesod-static/{tests => test}/unicode/Setup.lhs (100%)
 rename yesod-static/{tests => test}/unicode/TODO (100%)
 rename yesod-static/{tests => test}/unicode/app.hs (100%)
 rename yesod-static/{tests => test}/unicode/embedded-sample.hs (100%)
 rename yesod-static/{tests => test}/unicode/folder.png (100%)
 rename yesod-static/{tests => test}/unicode/folder.svg (100%)
 rename yesod-static/{tests => test}/unicode/haskell.png (100%)
 rename yesod-static/{tests => test}/unicode/sample.hs (100%)
 rename yesod-static/{tests => test}/unicode/test.hs (100%)
 rename yesod-static/{tests => test}/unicode/tests/a/b (100%)
 rename yesod-static/{tests => test}/unicode/tests/runtests.hs (100%)
 rename yesod-static/{tests => test}/unicode/unicode.hs (100%)
 rename yesod-static/{tests => test}/unicode/wai-app-static.cabal (100%)
 rename yesod-static/{tests => test}/unicode/warp.hs (100%)
 rename yesod-static/{tests => test}/unicode/קרררר.html (100%)
 rename yesod-static/{tests => test}/unicode/שלום (100%)
 rename yesod-static/{tests => test}/unicode/ששש/DUMMY.txt (100%)
 create mode 100644 yesod-static/tests.hs
 delete mode 100644 yesod-static/tests/runtests.hs

diff --git a/README.md b/README.md
index 51bd542b..d9f25ed2 100644
--- a/README.md
+++ b/README.md
@@ -104,7 +104,7 @@ Installing a mega repo helps cabal align all the dependencies correctly.
 cd hamlet
 
 # build and test the mega repo
-cabal install --enable-tests
+cabal configure -ftest --enable-tests
 cabal build
 cabal test
 ~~~
@@ -121,7 +121,7 @@ If you first install the mega repo, then it should be easier to work on an indiv
 cd shakespeare-text
 
 # build and test the individual package
-cabal configure --enable-tests
+cabal configure -ftest --enable-tests
 cabal build
 cabal test
 ~~~
diff --git a/test/en.msg b/test/en.msg
index f6159dee..e4db7367 120000
--- a/test/en.msg
+++ b/test/en.msg
@@ -1 +1 @@
-yesod-core/en.msg
\ No newline at end of file
+../yesod-core/test/en.msg
\ No newline at end of file
diff --git a/test/fs b/test/fs
new file mode 120000
index 00000000..034a0f64
--- /dev/null
+++ b/test/fs
@@ -0,0 +1 @@
+../yesod-static/test/fs
\ No newline at end of file
diff --git a/test/main.hs b/test/main.hs
index b04ec7db..6eecda86 100644
--- a/test/main.hs
+++ b/test/main.hs
@@ -1,5 +1,9 @@
 import Test.Hspec
 import qualified YesodCoreTest
+import qualified YesodStaticTest
 
 main :: IO ()
-main = hspecX $ descriptions $ YesodCoreTest.specs
+main = hspecX $ descriptions [
+    concat YesodCoreTest.specs
+  , concat YesodStaticTest.specs
+  ]
diff --git a/test/yesod-core b/test/yesod-core
deleted file mode 120000
index aaa0236b..00000000
--- a/test/yesod-core
+++ /dev/null
@@ -1 +0,0 @@
-../yesod-core/test
\ No newline at end of file
diff --git a/yesod-core/test/YesodCoreTest.hs b/yesod-core/test/YesodCoreTest.hs
index 5f70039f..ded94770 100644
--- a/yesod-core/test/YesodCoreTest.hs
+++ b/yesod-core/test/YesodCoreTest.hs
@@ -12,7 +12,7 @@ import YesodCoreTest.ErrorHandling
 import Test.Hspec
 
 specs :: [Specs]
-specs = -- concat
+specs = 
     [ cleanPathTest
     , exceptionsTest
     , widgetTest
diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index ca4cb911..440e21ba 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -90,8 +90,6 @@ library
                      Yesod.Internal.RouteParsing
                      Paths_yesod_core
     ghc-options:     -Wall
-    if flag(test)
-        Buildable: False
 
 test-suite tests
     type: exitcode-stdio-1.0
diff --git a/yesod-mega.cabal b/yesod-mega.cabal
index 175c643e..e7ea3ca4 100644
--- a/yesod-mega.cabal
+++ b/yesod-mega.cabal
@@ -20,6 +20,10 @@ flag threaded
     default: True
     description: Build with support for multithreaded execution
 
+flag test
+  description: Build for use with running tests
+  default: False
+
 library
     hs-source-dirs: yesod, yesod-auth, yesod-core, yesod-default, yesod-examples, yesod-form, yesod-json, yesod-newsfeed, yesod-persistent, yesod-sitemap, yesod-static
 
@@ -115,6 +119,9 @@ library
     if !os(windows)
          build-depends: unix
 
+    if flag(test)
+      cpp-options:   -DTEST
+
     build-depends:
                    -- yesod
                      Cabal              >= 1.8          && < 1.13
@@ -158,7 +165,7 @@ library
                    , warp                  >= 0.4      && < 0.5
                    , wai                   >= 0.4      && < 0.5
                    , wai-extra             >= 0.4.1    && < 0.5
-                   , time                  >= 1.1.4    && < 1.3
+                   , time                  >= 1.1.4
                    , bytestring            >= 0.9.1.4  && < 0.12
                    , text                  >= 0.9      && < 0.12
                    , template-haskell
@@ -193,6 +200,7 @@ test-suite tests
     hs-source-dirs: 
                     test
                     yesod-core/test
+                    yesod-static/test
 
     if flag(ghc7)
         type: exitcode-stdio-1.0
diff --git a/yesod-static/Yesod/Static.hs b/yesod-static/Yesod/Static.hs
index 77c3a438..7186b60e 100644
--- a/yesod-static/Yesod/Static.hs
+++ b/yesod-static/Yesod/Static.hs
@@ -33,6 +33,9 @@ module Yesod.Static
     , publicFiles
       -- * Hashing
     , base64md5
+#ifdef TEST
+    , getFileListPieces 
+#endif
     ) where
 
 import Prelude hiding (FilePath)
diff --git a/yesod-static/test/YesodStaticTest.hs b/yesod-static/test/YesodStaticTest.hs
new file mode 100644
index 00000000..ec31dc57
--- /dev/null
+++ b/yesod-static/test/YesodStaticTest.hs
@@ -0,0 +1,16 @@
+module YesodStaticTest (specs) where
+
+import Test.Hspec
+import Test.HUnit ( (@?=) )
+import Test.Hspec.HUnit ( )
+
+import Yesod.Static (getFileListPieces)
+
+specs :: [Specs]
+specs = [
+    describe "get file list" [
+      it "pieces" $ do
+        x <- getFileListPieces "test/fs"
+        x @?= [["foo"], ["bar", "baz"]]
+    ]
+  ]
diff --git a/yesod-static/tests/data/.ignored b/yesod-static/test/fs/.ignored
similarity index 100%
rename from yesod-static/tests/data/.ignored
rename to yesod-static/test/fs/.ignored
diff --git a/yesod-static/tests/data/bar/baz b/yesod-static/test/fs/bar/baz
similarity index 100%
rename from yesod-static/tests/data/bar/baz
rename to yesod-static/test/fs/bar/baz
diff --git a/yesod-static/tests/data/foo b/yesod-static/test/fs/foo
similarity index 100%
rename from yesod-static/tests/data/foo
rename to yesod-static/test/fs/foo
diff --git a/yesod-static/tests/data/tmp/ignored b/yesod-static/test/fs/tmp/ignored
similarity index 100%
rename from yesod-static/tests/data/tmp/ignored
rename to yesod-static/test/fs/tmp/ignored
diff --git a/yesod-static/tests/unicode/LICENSE b/yesod-static/test/unicode/LICENSE
similarity index 100%
rename from yesod-static/tests/unicode/LICENSE
rename to yesod-static/test/unicode/LICENSE
diff --git a/yesod-static/tests/unicode/README b/yesod-static/test/unicode/README
similarity index 100%
rename from yesod-static/tests/unicode/README
rename to yesod-static/test/unicode/README
diff --git a/yesod-static/tests/unicode/Setup.lhs b/yesod-static/test/unicode/Setup.lhs
similarity index 100%
rename from yesod-static/tests/unicode/Setup.lhs
rename to yesod-static/test/unicode/Setup.lhs
diff --git a/yesod-static/tests/unicode/TODO b/yesod-static/test/unicode/TODO
similarity index 100%
rename from yesod-static/tests/unicode/TODO
rename to yesod-static/test/unicode/TODO
diff --git a/yesod-static/tests/unicode/app.hs b/yesod-static/test/unicode/app.hs
similarity index 100%
rename from yesod-static/tests/unicode/app.hs
rename to yesod-static/test/unicode/app.hs
diff --git a/yesod-static/tests/unicode/embedded-sample.hs b/yesod-static/test/unicode/embedded-sample.hs
similarity index 100%
rename from yesod-static/tests/unicode/embedded-sample.hs
rename to yesod-static/test/unicode/embedded-sample.hs
diff --git a/yesod-static/tests/unicode/folder.png b/yesod-static/test/unicode/folder.png
similarity index 100%
rename from yesod-static/tests/unicode/folder.png
rename to yesod-static/test/unicode/folder.png
diff --git a/yesod-static/tests/unicode/folder.svg b/yesod-static/test/unicode/folder.svg
similarity index 100%
rename from yesod-static/tests/unicode/folder.svg
rename to yesod-static/test/unicode/folder.svg
diff --git a/yesod-static/tests/unicode/haskell.png b/yesod-static/test/unicode/haskell.png
similarity index 100%
rename from yesod-static/tests/unicode/haskell.png
rename to yesod-static/test/unicode/haskell.png
diff --git a/yesod-static/tests/unicode/sample.hs b/yesod-static/test/unicode/sample.hs
similarity index 100%
rename from yesod-static/tests/unicode/sample.hs
rename to yesod-static/test/unicode/sample.hs
diff --git a/yesod-static/tests/unicode/test.hs b/yesod-static/test/unicode/test.hs
similarity index 100%
rename from yesod-static/tests/unicode/test.hs
rename to yesod-static/test/unicode/test.hs
diff --git a/yesod-static/tests/unicode/tests/a/b b/yesod-static/test/unicode/tests/a/b
similarity index 100%
rename from yesod-static/tests/unicode/tests/a/b
rename to yesod-static/test/unicode/tests/a/b
diff --git a/yesod-static/tests/unicode/tests/runtests.hs b/yesod-static/test/unicode/tests/runtests.hs
similarity index 100%
rename from yesod-static/tests/unicode/tests/runtests.hs
rename to yesod-static/test/unicode/tests/runtests.hs
diff --git a/yesod-static/tests/unicode/unicode.hs b/yesod-static/test/unicode/unicode.hs
similarity index 100%
rename from yesod-static/tests/unicode/unicode.hs
rename to yesod-static/test/unicode/unicode.hs
diff --git a/yesod-static/tests/unicode/wai-app-static.cabal b/yesod-static/test/unicode/wai-app-static.cabal
similarity index 100%
rename from yesod-static/tests/unicode/wai-app-static.cabal
rename to yesod-static/test/unicode/wai-app-static.cabal
diff --git a/yesod-static/tests/unicode/warp.hs b/yesod-static/test/unicode/warp.hs
similarity index 100%
rename from yesod-static/tests/unicode/warp.hs
rename to yesod-static/test/unicode/warp.hs
diff --git a/yesod-static/tests/unicode/קרררר.html b/yesod-static/test/unicode/קרררר.html
similarity index 100%
rename from yesod-static/tests/unicode/קרררר.html
rename to yesod-static/test/unicode/קרררר.html
diff --git a/yesod-static/tests/unicode/שלום b/yesod-static/test/unicode/שלום
similarity index 100%
rename from yesod-static/tests/unicode/שלום
rename to yesod-static/test/unicode/שלום
diff --git a/yesod-static/tests/unicode/ששש/DUMMY.txt b/yesod-static/test/unicode/ששש/DUMMY.txt
similarity index 100%
rename from yesod-static/tests/unicode/ששש/DUMMY.txt
rename to yesod-static/test/unicode/ששש/DUMMY.txt
diff --git a/yesod-static/tests.hs b/yesod-static/tests.hs
new file mode 100644
index 00000000..1176f6d9
--- /dev/null
+++ b/yesod-static/tests.hs
@@ -0,0 +1,7 @@
+{-# LANGUAGE OverloadedStrings #-}
+
+import Test.Hspec
+import YesodStaticTest (specs)
+
+main :: IO ()
+main = hspecX $ descriptions specs
diff --git a/yesod-static/tests/runtests.hs b/yesod-static/tests/runtests.hs
deleted file mode 100644
index 20ce829a..00000000
--- a/yesod-static/tests/runtests.hs
+++ /dev/null
@@ -1,17 +0,0 @@
-{-# LANGUAGE OverloadedStrings #-}
-import Yesod.Static ()
-
-import Test.Hspec
-import Test.Hspec.HUnit ()
--- import Test.Hspec.QuickCheck (prop)
-
-main :: IO ()
-main = return () -- hspecX $ return []
-{- FIXME specs
-
-specs :: IO [Spec]
-specs = runSpecM $ do
-  context "get file list" $ do
-    ti "pieces" $ do
-      x <- getFileListPieces "tests/data"
-      x @?= [["foo"], ["bar", "baz"]]-}
diff --git a/yesod-static/yesod-static.cabal b/yesod-static/yesod-static.cabal
index 8c0bfe7d..832c7171 100644
--- a/yesod-static/yesod-static.cabal
+++ b/yesod-static/yesod-static.cabal
@@ -15,10 +15,13 @@ extra-source-files:
   tests/runtests.hs
 
 flag test
-  description: Build the executable to run unit tests
+  description: Build for use with running tests
   default: False
 
 library
+    if flag(test)
+      cpp-options:   -DTEST
+
     build-depends:   base                  >= 4        && < 5
                    , containers            >= 0.2      && < 0.5
                    , old-time              >= 1.0
@@ -40,9 +43,9 @@ library
     exposed-modules: Yesod.Static
     ghc-options:     -Wall
 
-test-suite runtests
-    hs-source-dirs: tests
-    main-is: runtests.hs
+test-suite tests
+    hs-source-dirs: test
+    main-is: ../tests.hs
     type: exitcode-stdio-1.0
     cpp-options:   -DTEST
     build-depends:   yesod-static
@@ -50,7 +53,6 @@ test-suite runtests
                    , hspec >= 0.8   && < 0.10
                    , HUnit
     ghc-options:     -Wall
-    main-is:         runtests.hs
 
 source-repository head
   type:     git

From e514f9375c34d45fa4ce83b8934493c16f8f9a43 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 28 Nov 2011 06:27:40 +0200
Subject: [PATCH 132/189] Fix a broken cabal file

---
 yesod-core/yesod-core.cabal | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index ca4cb911..4a67d5e5 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -16,15 +16,15 @@ build-type:      Simple
 homepage:        http://www.yesodweb.com/
 extra-source-files:
   test/en.msg
-  test/Test/NoOverloadedStrings.hs
-  test/Test/Media.hs
-  test/Test/Exceptions.hs
-  test/Test/Widget.hs
-  test/Test/CleanPath.hs
-  test/Test/Links.hs
-  test/Test/InternalRequest.hs
-  test/Test/ErrorHandling.hs
-  test/main.hs
+  test/YesodCoreTest/NoOverloadedStrings.hs
+  test/YesodCoreTest/Media.hs
+  test/YesodCoreTest/Exceptions.hs
+  test/YesodCoreTest/Widget.hs
+  test/YesodCoreTest/CleanPath.hs
+  test/YesodCoreTest/Links.hs
+  test/YesodCoreTest/InternalRequest.hs
+  test/YesodCoreTest/ErrorHandling.hs
+  test.hs
 
 flag test
   description: Build the executable to run unit tests

From dabd9842f8c7a62414dea57d84b56d899b4093e1 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 28 Nov 2011 06:32:34 +0200
Subject: [PATCH 133/189] Fix a broken cabal file

---
 yesod-examples/yesod-examples.cabal | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/yesod-examples/yesod-examples.cabal b/yesod-examples/yesod-examples.cabal
index b60a6cbd..de164278 100644
--- a/yesod-examples/yesod-examples.cabal
+++ b/yesod-examples/yesod-examples.cabal
@@ -30,8 +30,7 @@ Executable yesod-ajax
 
 Executable yesod-file-echo
   Main-is:             src/file-echo.lhs
-  Build-depends:     
-                       text              >= 0.9   && < 0.12
+  Build-depends:       text              >= 0.9   && < 0.12,
                        yesod >= 0.9
 
 Executable yesod-pretty-yaml
@@ -62,8 +61,8 @@ Executable yesod-form
 Executable yesod-persistent-synopsis
   Main-is:             synopsis/persistent.lhs
   Build-depends:       transformers >= 0.2.2 && < 0.3,
-                       persistent-sqlite   >= 0.6, && < 0.7
-                       persistent-template >= 0.6, && < 0.7
+                       persistent-sqlite   >= 0.6 && < 0.7,
+                       persistent-template >= 0.6 && < 0.7
 
 Executable yesod-hamlet-synopsis
   Main-is:             synopsis/hamlet.lhs

From 390a3694b3efd27df0e0e102b320a79b5c2b895d Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 28 Nov 2011 10:32:38 +0200
Subject: [PATCH 134/189] scripts

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 806eed3c..b626b414 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 806eed3cd050d2d49e86499be977684e5c0b1cbf
+Subproject commit b626b414228dd4b948bb27e255a26b2f395a93a4

From b61578eaa58920f3a2902e8ba97c7786f2f73671 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 28 Nov 2011 11:37:45 +0200
Subject: [PATCH 135/189] Force newer authenticate to ditch aeson-native

---
 yesod-auth/yesod-auth.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal
index 80a6288a..89fb01ce 100644
--- a/yesod-auth/yesod-auth.cabal
+++ b/yesod-auth/yesod-auth.cabal
@@ -21,7 +21,7 @@ library
         cpp-options:     -DGHC7
     else
         build-depends:   base                >= 4        && < 4.3
-    build-depends:   authenticate            >= 0.10      && < 0.11
+    build-depends:   authenticate            >= 0.10.3    && < 0.11
                    , bytestring              >= 0.9.1.4   && < 0.10
                    , yesod-core              >= 0.9       && < 0.10
                    , wai                     >= 0.4       && < 0.5

From 30a16e6ebef8b36efe0e23511e87d932106001b5 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 28 Nov 2011 12:08:38 +0200
Subject: [PATCH 136/189] Relaxed upper bounds

---
 yesod-default/yesod-default.cabal | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/yesod-default/yesod-default.cabal b/yesod-default/yesod-default.cabal
index 0d361f58..cb1e6044 100644
--- a/yesod-default/yesod-default.cabal
+++ b/yesod-default/yesod-default.cabal
@@ -19,14 +19,14 @@ library
 
     build-depends:   base                  >= 4     && < 5
                    , yesod-core            >= 0.9   && < 0.10
-                   , cmdargs               >= 0.8   && < 0.9
+                   , cmdargs               >= 0.8
                    , warp                  >= 0.4   && < 0.5
                    , wai                   >= 0.4   && < 0.5
                    , wai-extra             >= 0.4.4 && < 0.5
-                   , bytestring            >= 0.9.1.4  && < 0.10
+                   , bytestring            >= 0.9.1.4
                    , transformers          >= 0.2.2 && < 0.3
-                   , text                  >= 0.9      && < 0.12
-                   , directory             >= 1.0   && < 1.2
+                   , text                  >= 0.9
+                   , directory             >= 1.0
                    , shakespeare-css       >= 0.10  && < 0.11
                    , shakespeare-js        >= 0.10  && < 0.11
                    , template-haskell

From 08f4496327aabed67da27798fa2551fb1f1f4899 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 28 Nov 2011 12:09:16 +0200
Subject: [PATCH 137/189] Force wai-test to be installed

---
 yesod-core/yesod-core.cabal | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index d18c6835..14e7cfa8 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -38,6 +38,12 @@ library
         cpp-options:     -DGHC7
     else
         build-depends:   base              >= 4        && < 4.3
+
+    -- Work around a bug in cabal. Without this, wai-test doesn't get built and
+    -- we have a missing dependency during --enable-tests builds.
+    if flag(test)
+        build-depends: wai-test
+
     build-depends:   time                  >= 1.1.4
                    , wai                   >= 0.4      && < 0.5
                    , wai-extra             >= 0.4.1    && < 0.5

From f48fbc0f7945fb8003799048a3e24f328a757e76 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 28 Nov 2011 12:09:38 +0200
Subject: [PATCH 138/189] Fix broken cabal file

---
 yesod-static/yesod-static.cabal | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/yesod-static/yesod-static.cabal b/yesod-static/yesod-static.cabal
index 832c7171..b5ef9411 100644
--- a/yesod-static/yesod-static.cabal
+++ b/yesod-static/yesod-static.cabal
@@ -12,7 +12,8 @@ build-type:      Simple
 homepage:        http://www.yesodweb.com/
 description:     Static file serving subsite for Yesod Web Framework.
 extra-source-files:
-  tests/runtests.hs
+  test/YesodStaticTest.hs
+  tests.hs
 
 flag test
   description: Build for use with running tests

From ecd1fa5f6f3a0e1a432e13bdd723a9d1e56e2b71 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 28 Nov 2011 12:49:05 +0200
Subject: [PATCH 139/189] Version bump

---
 yesod-auth/yesod-auth.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal
index 89fb01ce..c163ef61 100644
--- a/yesod-auth/yesod-auth.cabal
+++ b/yesod-auth/yesod-auth.cabal
@@ -1,5 +1,5 @@
 name:            yesod-auth
-version:         0.7.4
+version:         0.7.5
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman, Patrick Brisbin

From 3c3e8502c5e593bbb12bf3931c9389c423878cc4 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 28 Nov 2011 12:49:26 +0200
Subject: [PATCH 140/189] Relax upper bounds on unix-compat

---
 yesod-static/yesod-static.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yesod-static/yesod-static.cabal b/yesod-static/yesod-static.cabal
index b5ef9411..9a9f13e4 100644
--- a/yesod-static/yesod-static.cabal
+++ b/yesod-static/yesod-static.cabal
@@ -39,7 +39,7 @@ library
                    , text                  >= 0.9      && < 0.12
                    , file-embed            >= 0.0.4.1  && < 0.5
                    , http-types            >= 0.6.5    && < 0.7
-                   , unix-compat           >= 0.2      && < 0.3
+                   , unix-compat           >= 0.2
                    , enumerator            >= 0.4.8    && < 0.5
     exposed-modules: Yesod.Static
     ghc-options:     -Wall

From 298c0f25cd4d4a00755f64e635ca5c1bda1c81fa Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 28 Nov 2011 14:58:56 +0200
Subject: [PATCH 141/189] Version bumps

---
 yesod-auth/yesod-auth.cabal             | 2 +-
 yesod-core/yesod-core.cabal             | 2 +-
 yesod-default/yesod-default.cabal       | 2 +-
 yesod-json/yesod-json.cabal             | 2 +-
 yesod-newsfeed/yesod-newsfeed.cabal     | 2 +-
 yesod-persistent/yesod-persistent.cabal | 2 +-
 yesod-sitemap/yesod-sitemap.cabal       | 2 +-
 yesod-static/yesod-static.cabal         | 2 +-
 yesod/yesod.cabal                       | 6 +++---
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal
index c163ef61..bd3b2c35 100644
--- a/yesod-auth/yesod-auth.cabal
+++ b/yesod-auth/yesod-auth.cabal
@@ -1,5 +1,5 @@
 name:            yesod-auth
-version:         0.7.5
+version:         0.7.6
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman, Patrick Brisbin
diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index 14e7cfa8..4131f27a 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -1,5 +1,5 @@
 name:            yesod-core
-version:         0.9.3.2
+version:         0.9.3.4
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
diff --git a/yesod-default/yesod-default.cabal b/yesod-default/yesod-default.cabal
index cb1e6044..90370c50 100644
--- a/yesod-default/yesod-default.cabal
+++ b/yesod-default/yesod-default.cabal
@@ -1,5 +1,5 @@
 name:            yesod-default
-version:         0.4.0
+version:         0.4.1
 license:         BSD3
 license-file:    LICENSE
 author:          Patrick Brisbin
diff --git a/yesod-json/yesod-json.cabal b/yesod-json/yesod-json.cabal
index ac7baa4f..2a52c5b4 100644
--- a/yesod-json/yesod-json.cabal
+++ b/yesod-json/yesod-json.cabal
@@ -1,5 +1,5 @@
 name:            yesod-json
-version:         0.2.1
+version:         0.2.2
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
diff --git a/yesod-newsfeed/yesod-newsfeed.cabal b/yesod-newsfeed/yesod-newsfeed.cabal
index e0b2db4c..780363ca 100644
--- a/yesod-newsfeed/yesod-newsfeed.cabal
+++ b/yesod-newsfeed/yesod-newsfeed.cabal
@@ -1,5 +1,5 @@
 name:            yesod-newsfeed
-version:         0.3.1
+version:         0.3.2
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman, Patrick Brisbin
diff --git a/yesod-persistent/yesod-persistent.cabal b/yesod-persistent/yesod-persistent.cabal
index a5340252..00e3c8b8 100644
--- a/yesod-persistent/yesod-persistent.cabal
+++ b/yesod-persistent/yesod-persistent.cabal
@@ -1,5 +1,5 @@
 name:            yesod-persistent
-version:         0.2.1
+version:         0.2.2
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
diff --git a/yesod-sitemap/yesod-sitemap.cabal b/yesod-sitemap/yesod-sitemap.cabal
index 20d9fb03..a500824d 100644
--- a/yesod-sitemap/yesod-sitemap.cabal
+++ b/yesod-sitemap/yesod-sitemap.cabal
@@ -1,5 +1,5 @@
 name:            yesod-sitemap
-version:         0.2.1
+version:         0.2.2
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
diff --git a/yesod-static/yesod-static.cabal b/yesod-static/yesod-static.cabal
index 9a9f13e4..5d137d0d 100644
--- a/yesod-static/yesod-static.cabal
+++ b/yesod-static/yesod-static.cabal
@@ -1,5 +1,5 @@
 name:            yesod-static
-version:         0.3.1.2
+version:         0.3.2
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index 3149ecfb..b01665d7 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -1,5 +1,5 @@
 name:            yesod
-version:         0.9.3
+version:         0.9.3.2
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
@@ -69,9 +69,9 @@ library
         cpp-options:     -DGHC7
     else
         build-depends:   base                  >= 4        && < 4.3
-    build-depends:   yesod-core                >= 0.9.1.1  && < 0.10
+    build-depends:   yesod-core                >= 0.9.3.4  && < 0.10
                    , yesod-auth                >= 0.7      && < 0.8
-                   , yesod-json                >= 0.2      && < 0.3
+                   , yesod-json                >= 0.2.2    && < 0.3
                    , yesod-persistent          >= 0.2      && < 0.3
                    , yesod-form                >= 0.3      && < 0.4
                    , monad-control             >= 0.2      && < 0.3

From 6fe7991fa1407e547de92fb52f8771c5f4d9f3ab Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Mon, 28 Nov 2011 07:22:53 -0600
Subject: [PATCH 142/189] improve overviews

---
 README.md         | 3 +--
 yesod/yesod.cabal | 6 ++++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index d9f25ed2..4065726a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,4 @@
-A next generation web framework using the Haskell programming language, 
-featuring:
+An advanced web framework using the Haskell programming language. Featuring:
 
   * safety & security guaranteed at compile time
   * performance
diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index b01665d7..be76e1e9 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -6,9 +6,11 @@ author:          Michael Snoyman <michael@snoyman.com>
 maintainer:      Michael Snoyman <michael@snoyman.com>
 synopsis:        Creation of type-safe, RESTful web applications.
 description:
-    Yesod is a framework designed to foster creation of RESTful web application that have strong compile-time guarantees of correctness. It also affords space efficient code and portability to many deployment backends, from CGI to stand-alone serving.
+    A RESTful web framework with strong compile-time guarantees of correctness. It also affords space efficient code, highly concurrent loads, and portability to many deployment backends (via the wai package), from CGI to stand-alone serving.
     .
-    The Yesod documentation site <http://docs.yesodweb.com/> has much more information, tutorials and information on some of the supporting packages, like Hamlet and web-routes-quasi.
+    Yesod also focuses on developer productivity. Yesod integrates well with tools for all your basic web development (wai, persistent, and shakespeare/hamlet)
+    .
+    The Yesod documentation site <http://www.yesodweb.com/> has much more information, including on the supporting packages mentioned above.
 category:        Web, Yesod
 stability:       Stable
 cabal-version:   >= 1.6

From 67ea3494b0f1429c78f45f6f421782e676f3a3aa Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Mon, 28 Nov 2011 08:46:09 -0600
Subject: [PATCH 143/189] add cabal-src to README

---
 README.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4065726a..a2d1dec7 100644
--- a/README.md
+++ b/README.md
@@ -47,13 +47,18 @@ cabal-dev isolates a single cabal package, but virthualenv isolates multiple pac
 
 virthualenv works at the shell level, so every shell must activate the virthualenv.
 
+### cabal-src
+
+Michael just released the cabal-src tool. Whenever you would use `cabal install` for a local package, use `cabal-src-install` instead.
+Our installer script now uses cabal-src-install when it is available.
+
 ### Building Yesod
 
 ~~~ { .bash }
 # update your package database if you haven't recently
 cabal update
 # install required libraries
-cabal install Cabal cabal-install cabal-dev virthualenv
+cabal install Cabal cabal-install cabal-dev cabal-src virthualenv
 
 # finally build Yesod.
 # this is completely sandboxed, except that it installs an unreleased vesion of cabal-dev

From d405ef9e702679067014b0d311780cebbb59cfb7 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 28 Nov 2011 19:03:17 +0200
Subject: [PATCH 144/189] mime-mail upper bounds relaxing

---
 yesod-auth/yesod-auth.cabal | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal
index bd3b2c35..15cab177 100644
--- a/yesod-auth/yesod-auth.cabal
+++ b/yesod-auth/yesod-auth.cabal
@@ -1,5 +1,5 @@
 name:            yesod-auth
-version:         0.7.6
+version:         0.7.6.1
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman, Patrick Brisbin
@@ -30,7 +30,7 @@ library
                    , random                  >= 1.0.0.2  && < 1.1
                    , control-monad-attempt   >= 0.3.0     && < 0.4
                    , text                    >= 0.7       && < 0.12
-                   , mime-mail               >= 0.3       && < 0.4
+                   , mime-mail               >= 0.3       && < 0.5
                    , blaze-html              >= 0.4.1.3   && < 0.5
                    , yesod-persistent        >= 0.2       && < 0.3
                    , hamlet                  >= 0.10      && < 0.11

From 3aa567a631f974c10367493a3d3c1f1e4126c3cc Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 28 Nov 2011 23:55:30 +0200
Subject: [PATCH 145/189] Handler is now RWS

---
 yesod-core/Yesod/Handler.hs         | 134 +++++++++++++---------------
 yesod-examples/yesod-examples.cabal |   2 +-
 yesod/yesod.cabal                   |   4 +-
 3 files changed, 63 insertions(+), 77 deletions(-)

diff --git a/yesod-core/Yesod/Handler.hs b/yesod-core/Yesod/Handler.hs
index 23e9a08f..a0eddfa1 100644
--- a/yesod-core/Yesod/Handler.hs
+++ b/yesod-core/Yesod/Handler.hs
@@ -125,9 +125,7 @@ import Control.Monad (liftM, join, MonadPlus)
 
 import Control.Monad.IO.Class
 import Control.Monad.Trans.Class
-import Control.Monad.Trans.Writer
-import Control.Monad.Trans.Reader
-import Control.Monad.Trans.State
+import Control.Monad.Trans.RWS
 import Control.Monad.Trans.Error (throwError, ErrorT (..), Error (..))
 
 import System.IO
@@ -153,7 +151,7 @@ import Network.Wai.Parse (parseHttpAccept)
 import Yesod.Content
 import Data.Maybe (fromMaybe)
 import Web.Cookie (SetCookie (..), renderSetCookie)
-import Control.Arrow (second, (***))
+import Control.Arrow ((***))
 import qualified Network.Wai.Parse as NWP
 import Data.Monoid (mappend, mempty, Endo (..))
 import qualified Data.ByteString.Char8 as S8
@@ -198,6 +196,11 @@ handlerSubDataMaybe tm ts route hd = hd
     , handlerRoute = route
     }
 
+withReaderT :: (HandlerData s m -> HandlerData s' m)
+            -> GGHandler s' m mo a
+            -> GGHandler s m mo a
+withReaderT f (GHandler (ErrorT m)) = GHandler $ ErrorT $ withRWST (\r s -> (f r, s)) m
+
 -- | Used internally for promoting subsite handler functions to master site
 -- handler functions. Should not be needed by users.
 toMasterHandler :: (Route sub -> Route master)
@@ -205,8 +208,7 @@ toMasterHandler :: (Route sub -> Route master)
                 -> Route sub
                 -> GGHandler sub master mo a
                 -> GGHandler sub' master mo a
-toMasterHandler tm ts route (GHandler h) =
-    GHandler $ withReaderT (handlerSubData tm ts route) h
+toMasterHandler tm ts route = withReaderT (handlerSubData tm ts route)
 
 toMasterHandlerDyn :: Monad mo
                    => (Route sub -> Route master)
@@ -214,9 +216,9 @@ toMasterHandlerDyn :: Monad mo
                    -> Route sub
                    -> GGHandler sub master mo a
                    -> GGHandler sub' master mo a
-toMasterHandlerDyn tm getSub route (GHandler h) = do
+toMasterHandlerDyn tm getSub route h = do
     sub <- getSub
-    GHandler $ withReaderT (handlerSubData tm (const sub) route) h
+    withReaderT (handlerSubData tm (const sub) route) h
 
 class SubsiteGetter g m s | g -> s where
   runSubsiteGetter :: g -> m s
@@ -235,8 +237,7 @@ toMasterHandlerMaybe :: (Route sub -> Route master)
                      -> Maybe (Route sub)
                      -> GGHandler sub master mo a
                      -> GGHandler sub' master mo a
-toMasterHandlerMaybe tm ts route (GHandler h) =
-    GHandler $ withReaderT (handlerSubDataMaybe tm ts route) h
+toMasterHandlerMaybe tm ts route = withReaderT (handlerSubDataMaybe tm ts route)
 
 -- | A generic handler monad, which can have a different subsite and master
 -- site. This monad is a combination of 'ReaderT' for basic arguments, a
@@ -250,7 +251,7 @@ newtype GGHandler sub master m a =
     deriving (Functor, Applicative, Monad, MonadIO, MonadControlIO, MonadPlus)
 
 instance MonadTrans (GGHandler s m) where
-    lift = GHandler . lift . lift . lift . lift
+    lift = GHandler . lift . lift
 
 type GHandler sub master = GGHandler sub master (Iteratee ByteString IO)
 
@@ -260,13 +261,11 @@ data GHState = GHState
     , ghsIdent :: Int
     }
 
-type GHInner s m monad = -- FIXME collapse the stack
-    ReaderT (HandlerData s m) (
+type GHInner s m monad =
     ErrorT HandlerContents (
-    WriterT (Endo [Header]) (
-    StateT GHState (
+    RWST (HandlerData s m) (Endo [Header]) GHState
     monad
-    ))))
+    )
 
 type SessionMap = Map.Map Text Text
 
@@ -298,20 +297,20 @@ instance Error HandlerContents where
     strMsg = HCError . InternalError . T.pack
 
 getRequest :: Monad mo => GGHandler s m mo Request
-getRequest = handlerRequest `liftM` GHandler ask
+getRequest = handlerRequest `liftM` gask
 
 instance Monad monad => Failure ErrorResponse (GGHandler sub master monad) where
-    failure = GHandler . lift . throwError . HCError
+    failure = GHandler . throwError . HCError
 
 runRequestBody :: GHandler s m RequestBodyContents
 runRequestBody = do
-    x <- GHandler $ lift $ lift $ lift get
+    x <- GHandler $ lift get
     case ghsRBC x of
         Just rbc -> return rbc
         Nothing -> do
             rr <- waiRequest
             rbc <- lift $ rbHelper rr
-            GHandler $ lift $ lift $ lift $ put x { ghsRBC = Just rbc }
+            GHandler $ lift $ put x { ghsRBC = Just rbc }
             return rbc
 
 rbHelper :: W.Request -> Iteratee ByteString IO RequestBodyContents
@@ -326,33 +325,36 @@ rbHelper req =
 
 -- | Get the sub application argument.
 getYesodSub :: Monad m => GGHandler sub master m sub
-getYesodSub = handlerSub `liftM` GHandler ask
+getYesodSub = handlerSub `liftM` gask
 
 -- | Get the master site appliation argument.
 getYesod :: Monad m => GGHandler sub master m master
-getYesod = handlerMaster `liftM` GHandler ask
+getYesod = handlerMaster `liftM` gask
 
 -- | Get the URL rendering function.
 getUrlRender :: Monad m => GGHandler sub master m (Route master -> Text)
 getUrlRender = do
-    x <- handlerRender `liftM` GHandler ask
+    x <- handlerRender `liftM` gask
     return $ flip x []
 
+gask :: Monad m => GGHandler sub master m (HandlerData sub master)
+gask = GHandler (lift ask)
+
 -- | The URL rendering function with query-string parameters.
 getUrlRenderParams
     :: Monad m
     => GGHandler sub master m (Route master -> [(Text, Text)] -> Text)
-getUrlRenderParams = handlerRender `liftM` GHandler ask
+getUrlRenderParams = handlerRender `liftM` gask
 
 -- | Get the route requested by the user. If this is a 404 response- where the
 -- user requested an invalid route- this function will return 'Nothing'.
 getCurrentRoute :: Monad m => GGHandler sub master m (Maybe (Route sub))
-getCurrentRoute = handlerRoute `liftM` GHandler ask
+getCurrentRoute = handlerRoute `liftM` gask
 
 -- | Get the function to promote a route for a subsite to a route for the
 -- master site.
 getRouteToMaster :: Monad m => GGHandler sub master m (Route sub -> Route master)
-getRouteToMaster = handlerToMaster `liftM` GHandler ask
+getRouteToMaster = handlerToMaster `liftM` gask
 
 -- | Function used internally by Yesod in the process of converting a
 -- 'GHandler' into an 'W.Application'. Should not be needed by users.
@@ -379,14 +381,12 @@ runHandler handler mrender sroute tomr ma sa =
             , handlerToMaster = tomr
             }
     let initSession' = GHState initSession Nothing 1
-    ((contents', headers), finalSession) <- catchIter (
-        fmap (second ghsSession)
-      $ flip runStateT initSession'
-      $ runWriterT
+    (contents', finalSession, headers) <- catchIter (
+        fmap (\(a, b, c) -> (a, ghsSession b, c))
+      $ (\m -> runRWST m hd initSession')
       $ runErrorT
-      $ flip runReaderT hd
       $ unGHandler handler
-        ) (\e -> return ((Left $ HCError $ toErrorHandler e, mempty), initSession))
+        ) (\e -> return (Left $ HCError $ toErrorHandler e, initSession, mempty))
     let contents = either id (HCContent H.status200 . chooseRep) contents'
     let handleError e = do
             yar <- unYesodApp (eh e) safeEh rr cts finalSession
@@ -444,7 +444,7 @@ redirectParams rt url params = do
 
 -- | Redirect to the given URL.
 redirectString, redirectText :: Monad mo => RedirectType -> Text -> GGHandler sub master mo a
-redirectText rt = GHandler . lift . throwError . HCRedirect rt
+redirectText rt = GHandler . throwError . HCRedirect rt
 redirectString = redirectText
 {-# DEPRECATED redirectString "Use redirectText instead" #-}
 
@@ -479,7 +479,7 @@ setUltDest' = do
         Nothing -> return ()
         Just r -> do
             tm <- getRouteToMaster
-            gets' <- reqGetParams `liftM` handlerRequest `liftM` GHandler ask
+            gets' <- reqGetParams `liftM` handlerRequest `liftM` gask
             render <- getUrlRenderParams
             setUltDestString $ render (tm r) gets'
 
@@ -545,7 +545,7 @@ getMessage = do
 -- For some backends, this is more efficient than reading in the file to
 -- memory, since they can optimize file sending via a system call to sendfile.
 sendFile :: Monad mo => ContentType -> FilePath -> GGHandler sub master mo a
-sendFile ct fp = GHandler . lift . throwError $ HCSendFile ct fp Nothing
+sendFile ct fp = GHandler . throwError $ HCSendFile ct fp Nothing
 
 -- | Same as 'sendFile', but only sends part of a file.
 sendFilePart :: Monad mo
@@ -555,18 +555,18 @@ sendFilePart :: Monad mo
              -> Integer -- ^ count
              -> GGHandler sub master mo a
 sendFilePart ct fp off count =
-    GHandler . lift . throwError $ HCSendFile ct fp $ Just $ W.FilePart off count
+    GHandler . throwError $ HCSendFile ct fp $ Just $ W.FilePart off count
 
 -- | Bypass remaining handler code and output the given content with a 200
 -- status code.
 sendResponse :: (Monad mo, HasReps c) => c -> GGHandler sub master mo a
-sendResponse = GHandler . lift . throwError . HCContent H.status200
+sendResponse = GHandler . throwError . HCContent H.status200
              . chooseRep
 
 -- | Bypass remaining handler code and output the given content with the given
 -- status code.
 sendResponseStatus :: (Monad mo, HasReps c) => H.Status -> c -> GGHandler s m mo a
-sendResponseStatus s = GHandler . lift . throwError . HCContent s
+sendResponseStatus s = GHandler . throwError . HCContent s
                      . chooseRep
 
 -- | Send a 201 "Created" response with the given route as the Location
@@ -574,7 +574,7 @@ sendResponseStatus s = GHandler . lift . throwError . HCContent s
 sendResponseCreated :: Monad mo => Route m -> GGHandler s m mo a
 sendResponseCreated url = do
     r <- getUrlRender
-    GHandler $ lift $ throwError $ HCCreated $ r url
+    GHandler $ throwError $ HCCreated $ r url
 
 -- | Send a 'W.Response'. Please note: this function is rarely
 -- necessary, and will /disregard/ any changes to response headers and session
@@ -582,7 +582,7 @@ sendResponseCreated url = do
 -- considered only for very specific needs. If you are not sure if you need it,
 -- you don't.
 sendWaiResponse :: Monad mo => W.Response -> GGHandler s m mo b
-sendWaiResponse = GHandler . lift . throwError . HCWai
+sendWaiResponse = GHandler . throwError . HCWai
 
 -- | Return a 404 not found page. Also denotes no handler available.
 notFound :: Failure ErrorResponse m => m a
@@ -669,18 +669,18 @@ setSession :: Monad mo
            => Text -- ^ key
            -> Text -- ^ value
            -> GGHandler sub master mo ()
-setSession k = GHandler . lift . lift . lift . modify . modSession . Map.insert k
+setSession k = GHandler . lift . modify . modSession . Map.insert k
 
 -- | Unsets a session variable. See 'setSession'.
 deleteSession :: Monad mo => Text -> GGHandler sub master mo ()
-deleteSession = GHandler . lift . lift . lift . modify . modSession . Map.delete
+deleteSession = GHandler . lift . modify . modSession . Map.delete
 
 modSession :: (SessionMap -> SessionMap) -> GHState -> GHState
 modSession f x = x { ghsSession = f $ ghsSession x }
 
 -- | Internal use only, not to be confused with 'setHeader'.
 addHeader :: Monad mo => Header -> GGHandler sub master mo ()
-addHeader = GHandler . lift . lift . tell . Endo . (:)
+addHeader = GHandler . lift . tell . Endo . (:)
 
 getStatus :: ErrorResponse -> H.Status
 getStatus NotFound = H.status404
@@ -702,17 +702,17 @@ data RedirectType = RedirectPermanent
 
 localNoCurrent :: Monad mo => GGHandler s m mo a -> GGHandler s m mo a
 localNoCurrent =
-    GHandler . local (\hd -> hd { handlerRoute = Nothing }) . unGHandler
+    GHandler . ErrorT . local (\hd -> hd { handlerRoute = Nothing }) . runErrorT . unGHandler
 
 -- | Lookup for session data.
 lookupSession :: Monad mo => Text -> GGHandler s m mo (Maybe Text)
 lookupSession n = GHandler $ do
-    m <- liftM ghsSession $ lift $ lift $ lift get
+    m <- liftM ghsSession $ lift get
     return $ Map.lookup n m
 
 -- | Get all session variables.
 getSession :: Monad mo => GGHandler s m mo SessionMap
-getSession = liftM ghsSession $ GHandler $ lift $ lift $ lift get
+getSession = liftM ghsSession $ GHandler $ lift get
 
 handlerToYAR :: (HasReps a, HasReps b)
              => m -- ^ master site foundation
@@ -803,7 +803,7 @@ headerToPair _ _ (Header key value) = (key, value)
 
 -- | Get a unique identifier.
 newIdent :: Monad mo => GGHandler sub master mo String -- FIXME use Text
-newIdent = GHandler $ lift $ lift $ lift $ do
+newIdent = GHandler $ lift $ do
     x <- get
     let i' = ghsIdent x + 1
     put x { ghsIdent = i' }
@@ -813,41 +813,27 @@ liftIOHandler :: MonadIO mo
               => GGHandler sub master IO a
               -> GGHandler sub master mo a
 liftIOHandler m = GHandler $
-                   ReaderT $ \r ->
-                     ErrorT $
-                       WriterT $
-                         StateT $ \s ->
-                           liftIO $ runGGHandler m r s
+                   ErrorT $
+                     RWST $ \r s ->
+                       liftIO (runGGHandler m r s)
 
 runGGHandler :: GGHandler sub master m a
             -> HandlerData sub master
             -> GHState
-            -> m ( ( Either HandlerContents a
-                   , Endo [Header]
-                   )
-                 , GHState
-                 )
-runGGHandler m r s = runStateT
-                      (runWriterT
-                        (runErrorT
-                          (runReaderT
-                            (unGHandler m) r))) s
+            -> m (Either HandlerContents a, GHState, Endo [Header])
+runGGHandler (GHandler (ErrorT m)) r s = runRWST m r s
 
 instance MonadTransControl (GGHandler s m) where
     liftControl f =
       GHandler $
-        liftControl $ \runRdr ->
-          liftControl $ \runErr ->
-            liftControl $ \runWrt ->
-              liftControl $ \runSt ->
-                f ( liftM ( GHandler
-                          . join . lift
-                          . join . lift
-                          . join . lift
-                          )
-                  . runSt . runWrt . runErr . runRdr
-                  . unGHandler
-                  )
+        liftControl $ \runErr ->
+          liftControl $ \runRws ->
+            f ( liftM ( GHandler
+                      . join . lift
+                      )
+              . runRws . runErr
+              . unGHandler
+              )
 
 -- | Redirect to a POST resource.
 --
diff --git a/yesod-examples/yesod-examples.cabal b/yesod-examples/yesod-examples.cabal
index de164278..0f0bc0b6 100644
--- a/yesod-examples/yesod-examples.cabal
+++ b/yesod-examples/yesod-examples.cabal
@@ -1,5 +1,5 @@
 Name:                yesod-examples
-Version:             0.8.0.3
+Version:             0.9.0
 Synopsis:            Example programs using the Yesod Web Framework.
 Description:         These are the same examples and tutorials found on the documentation site.
 Homepage:            http://www.yesodweb.com/
diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index be76e1e9..f72f884e 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -1,5 +1,5 @@
 name:            yesod
-version:         0.9.3.2
+version:         0.9.3.3
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
@@ -106,7 +106,7 @@ executable             yesod
                      , Cabal              >= 1.8          && < 1.13
                      , unix-compat        >= 0.2          && < 0.4
                      , containers         >= 0.2          && < 0.5
-                     , attoparsec-text    >= 0.8.5        && < 0.8.5.2
+                     , attoparsec         >= 0.10
                      , http-types         >= 0.6.1        && < 0.7
                      , blaze-builder      >= 0.2.1.4      && < 0.4
                      , filepath           >= 1.1          && < 1.3

From 49df96319618087c98f6d6026441445f64976500 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Tue, 29 Nov 2011 00:14:50 +0200
Subject: [PATCH 146/189] Per-request caching

---
 yesod-core/Yesod/Handler.hs      | 25 ++++++++++++++++++++++++-
 yesod-core/test/YesodCoreTest.hs |  2 ++
 yesod-core/yesod-core.cabal      |  2 ++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/yesod-core/Yesod/Handler.hs b/yesod-core/Yesod/Handler.hs
index a0eddfa1..09b815c6 100644
--- a/yesod-core/Yesod/Handler.hs
+++ b/yesod-core/Yesod/Handler.hs
@@ -97,6 +97,12 @@ module Yesod.Handler
     , liftIOHandler
       -- * i18n
     , getMessageRender
+      -- * Per-request caching
+    , CacheKey
+    , mkCacheKey
+    , cacheLookup
+    , cacheInsert
+    , cacheDelete
       -- * Internal Yesod
     , runHandler
     , YesodApp (..)
@@ -163,6 +169,9 @@ import Yesod.Message (RenderMessage (..))
 import Text.Blaze (toHtml, preEscapedText)
 import Yesod.Internal.TestApi (catchIter)
 
+import qualified Yesod.Internal.Cache as Cache
+import Yesod.Internal.Cache (mkCacheKey, CacheKey)
+
 -- | The type-safe URLs associated with a site argument.
 type family Route a
 
@@ -259,6 +268,7 @@ data GHState = GHState
     { ghsSession :: SessionMap
     , ghsRBC :: Maybe RequestBodyContents
     , ghsIdent :: Int
+    , ghsCache :: Cache.Cache
     }
 
 type GHInner s m monad =
@@ -380,7 +390,7 @@ runHandler handler mrender sroute tomr ma sa =
             , handlerRender = mrender
             , handlerToMaster = tomr
             }
-    let initSession' = GHState initSession Nothing 1
+    let initSession' = GHState initSession Nothing 1 mempty
     (contents', finalSession, headers) <- catchIter (
         fmap (\(a, b, c) -> (a, ghsSession b, c))
       $ (\m -> runRWST m hd initSession')
@@ -882,3 +892,16 @@ getMessageRender = do
     m <- getYesod
     l <- reqLangs `liftM` getRequest
     return $ renderMessage m l
+
+cacheLookup :: Monad mo => CacheKey a -> GGHandler sub master mo (Maybe a)
+cacheLookup k = do
+    gs <- GHandler $ lift get
+    return $ Cache.lookup k $ ghsCache gs
+
+cacheInsert :: Monad mo => CacheKey a -> a -> GGHandler sub master mo ()
+cacheInsert k v = GHandler $ lift $ modify $ \gs ->
+    gs { ghsCache = Cache.insert k v $ ghsCache gs }
+
+cacheDelete :: Monad mo => CacheKey a -> GGHandler sub master mo ()
+cacheDelete k = GHandler $ lift $ modify $ \gs ->
+    gs { ghsCache = Cache.delete k $ ghsCache gs }
diff --git a/yesod-core/test/YesodCoreTest.hs b/yesod-core/test/YesodCoreTest.hs
index ded94770..6602ce4a 100644
--- a/yesod-core/test/YesodCoreTest.hs
+++ b/yesod-core/test/YesodCoreTest.hs
@@ -8,6 +8,7 @@ import YesodCoreTest.Links
 import YesodCoreTest.NoOverloadedStrings
 import YesodCoreTest.InternalRequest
 import YesodCoreTest.ErrorHandling
+import YesodCoreTest.Cache
 
 import Test.Hspec
 
@@ -21,4 +22,5 @@ specs =
     , noOverloadedTest
     , internalRequestTest
     , errorHandlingTest
+    , cacheTest
     ]
diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index 4131f27a..a79c4099 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -24,6 +24,7 @@ extra-source-files:
   test/YesodCoreTest/Links.hs
   test/YesodCoreTest/InternalRequest.hs
   test/YesodCoreTest/ErrorHandling.hs
+  test/YesodCoreTest/Cache.hs
   test.hs
 
 flag test
@@ -89,6 +90,7 @@ library
                      Yesod.Config
                      Yesod.Internal.TestApi
     other-modules:   Yesod.Internal
+                     Yesod.Internal.Cache
                      Yesod.Internal.Core
                      Yesod.Internal.Session
                      Yesod.Internal.Request

From 09d41c8e360a143e3dcc5b251d2cab5f72b5912f Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Tue, 29 Nov 2011 00:19:22 +0200
Subject: [PATCH 147/189] Test -> Testing in YAML config files

---
 yesod/scaffold/config/mongoDB.yml.cg    | 2 +-
 yesod/scaffold/config/postgresql.yml.cg | 2 +-
 yesod/scaffold/config/settings.yml.cg   | 2 +-
 yesod/scaffold/config/sqlite.yml.cg     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/yesod/scaffold/config/mongoDB.yml.cg b/yesod/scaffold/config/mongoDB.yml.cg
index b97d7dfa..a7ba4064 100644
--- a/yesod/scaffold/config/mongoDB.yml.cg
+++ b/yesod/scaffold/config/mongoDB.yml.cg
@@ -9,7 +9,7 @@ Default: &defaults
 Development:
   <<: *defaults
 
-Test:
+Testing:
   database: ~project~_test
   <<: *defaults
 
diff --git a/yesod/scaffold/config/postgresql.yml.cg b/yesod/scaffold/config/postgresql.yml.cg
index aceae393..56b718f5 100644
--- a/yesod/scaffold/config/postgresql.yml.cg
+++ b/yesod/scaffold/config/postgresql.yml.cg
@@ -9,7 +9,7 @@ Default: &defaults
 Development:
   <<: *defaults
 
-Test:
+Testing:
   database: ~project~_test
   <<: *defaults
 
diff --git a/yesod/scaffold/config/settings.yml.cg b/yesod/scaffold/config/settings.yml.cg
index 816a2db6..86d8d29a 100644
--- a/yesod/scaffold/config/settings.yml.cg
+++ b/yesod/scaffold/config/settings.yml.cg
@@ -5,7 +5,7 @@ Default: &defaults
 Development:
   <<: *defaults
 
-Test:
+Testing:
   <<: *defaults
 
 Staging:
diff --git a/yesod/scaffold/config/sqlite.yml.cg b/yesod/scaffold/config/sqlite.yml.cg
index ebee1fa8..499afd76 100644
--- a/yesod/scaffold/config/sqlite.yml.cg
+++ b/yesod/scaffold/config/sqlite.yml.cg
@@ -5,7 +5,7 @@ Default: &defaults
 Development:
   <<: *defaults
 
-Test:
+Testing:
   database: ~project~_test.sqlite3
   <<: *defaults
 

From ae4a3dbe9c26f9d5f77b177766f915359615a085 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Tue, 29 Nov 2011 08:09:53 +0200
Subject: [PATCH 148/189] attoparsec 0.10 fix

---
 yesod/Build.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yesod/Build.hs b/yesod/Build.hs
index 51ff311c..3527bf8d 100644
--- a/yesod/Build.hs
+++ b/yesod/Build.hs
@@ -10,7 +10,7 @@ module Build
 -- FIXME there's a bug when getFileStatus applies to a file
 -- temporary deleted (e.g., Vim saving a file)
 
-import           Control.Applicative ((<|>))
+import           Control.Applicative ((<|>), many)
 import           Control.Exception (SomeException, try)
 import           Control.Monad (when, filterM, forM, forM_)
 
@@ -120,7 +120,7 @@ data TempType = Hamlet | Verbatim | Messages FilePath | StaticFiles FilePath
 determineHamletDeps :: FilePath -> IO [FilePath]
 determineHamletDeps x = do
     y <- TIO.readFile x -- FIXME catch IO exceptions
-    let z = A.parse (A.many $ (parser <|> (A.anyChar >> return Nothing))) y
+    let z = A.parse (many $ (parser <|> (A.anyChar >> return Nothing))) y
     case z of
         A.Fail{} -> return []
         A.Done _ r -> mapM go r >>= filterM doesFileExist . concat

From 3ed230de2cc738f0986c4f283ad78c581239cae0 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Tue, 29 Nov 2011 16:11:43 +0200
Subject: [PATCH 149/189] Add missing file

---
 yesod-core/test/YesodCoreTest/Cache.hs | 50 ++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 yesod-core/test/YesodCoreTest/Cache.hs

diff --git a/yesod-core/test/YesodCoreTest/Cache.hs b/yesod-core/test/YesodCoreTest/Cache.hs
new file mode 100644
index 00000000..c87118a7
--- /dev/null
+++ b/yesod-core/test/YesodCoreTest/Cache.hs
@@ -0,0 +1,50 @@
+{-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell, MultiParamTypeClasses #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE FlexibleInstances #-}
+module YesodCoreTest.Cache (cacheTest, Widget) where
+
+import Test.Hspec
+import Test.Hspec.HUnit()
+
+import Network.Wai
+import Network.Wai.Test
+
+import Yesod.Core
+
+data C = C
+
+key :: CacheKey Int
+key = $(mkCacheKey)
+
+key2 :: CacheKey Int
+key2 = $(mkCacheKey)
+
+mkYesod "C" [parseRoutes|/ RootR GET|]
+
+instance Yesod C where approot _ = ""
+
+getRootR :: Handler ()
+getRootR = do
+    Nothing <- cacheLookup key
+    cacheInsert key 5
+    Just 5 <- cacheLookup key
+    cacheInsert key 7
+    Just 7 <- cacheLookup key
+    Nothing <- cacheLookup key2
+    cacheDelete key
+    Nothing <- cacheLookup key
+    return ()
+
+cacheTest :: [Spec]
+cacheTest =
+  describe "Test.Cache"
+    [ it "works" works
+    ]
+
+runner :: Session () -> IO ()
+runner f = toWaiApp C >>= runSession f
+
+works :: IO ()
+works = runner $ do
+    res <- request defaultRequest { pathInfo = [] }
+    assertStatus 200 res

From e571a1aefe8597c623afad8099e8a6b63f815efa Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 30 Nov 2011 08:20:15 +0200
Subject: [PATCH 150/189] yesod-examples updated (finally)

---
 yesod-examples/src/ajax.lhs               | 28 ++++++------
 yesod-examples/src/blog.lhs               |  5 +++
 yesod-examples/src/chat.hs                | 30 ++++++-------
 yesod-examples/src/file-echo.lhs          | 20 ++++++---
 yesod-examples/src/form.lhs               | 10 +++--
 yesod-examples/src/generalized-hamlet.lhs | 52 -----------------------
 yesod-examples/src/i18n.lhs               | 16 +++----
 yesod-examples/src/pretty-yaml.lhs        | 13 +++---
 yesod-examples/src/session.lhs            |  6 ++-
 yesod-examples/synopsis/hamlet.lhs        |  7 ++-
 yesod-examples/synopsis/persistent.lhs    |  3 ++
 yesod-examples/yesod-examples.cabal       |  4 +-
 12 files changed, 80 insertions(+), 114 deletions(-)
 delete mode 100644 yesod-examples/src/generalized-hamlet.lhs

diff --git a/yesod-examples/src/ajax.lhs b/yesod-examples/src/ajax.lhs
index 3618204f..9396aef1 100644
--- a/yesod-examples/src/ajax.lhs
+++ b/yesod-examples/src/ajax.lhs
@@ -5,15 +5,14 @@
 > {-# LANGUAGE TypeFamilies, QuasiQuotes, TemplateHaskell, MultiParamTypeClasses, OverloadedStrings #-}
 > import Yesod
 > import Yesod.Static
-> import Data.Monoid (mempty)
-> import Text.Blaze (string)
+> import Data.Text (Text, unpack)
 
 Like the blog example, we'll define some data first.
 
 > data Page = Page
->   { pageName :: String
->   , pageSlug :: String
->   , pageContent :: String
+>   { pageName :: Text
+>   , pageSlug :: Text
+>   , pageContent :: Text
 >   }
 
 > loadPages :: IO [Page]
@@ -36,7 +35,7 @@ Now the routes; we'll have a homepage, a pattern for the pages, and use a static
 
 > mkYesod "Ajax" [parseRoutes|
 > /                  HomeR   GET
-> /page/#String      PageR   GET
+> /page/#Text        PageR   GET
 > /static            StaticR Static ajaxStatic
 > |]
 
@@ -49,7 +48,7 @@ Now the routes; we'll have a homepage, a pattern for the pages, and use a static
 >   defaultLayout widget = do
 >   Ajax pages _ <- getYesod
 >   content <- widgetToPageContent widget
->   hamletToRepHtml [$hamlet|
+>   hamletToRepHtml [hamlet|
 > \<!DOCTYPE html>
 > 
 > <html>
@@ -80,23 +79,23 @@ Now the routes; we'll have a homepage, a pattern for the pages, and use a static
 
 And now the cool part: a handler that returns either HTML or JSON data, depending on the request headers.
 
-> getPageR :: String -> Handler RepHtmlJson
+> getPageR :: Text -> Handler RepHtmlJson
 > getPageR slug = do
 >   Ajax pages _ <- getYesod
 >   case filter (\e -> pageSlug e == slug) pages of
 >       [] -> notFound
 >       page:_ -> defaultLayoutJson (do
->           setTitle $ string $ pageName page
+>           setTitle $ toHtml $ pageName page
 >           addHamlet $ html page
 >           ) (json page)
 >  where
->   html page = [$hamlet|
+>   html page = [hamlet|
 > <h1>#{pageName page}
 > <article>#{pageContent page}
 > |]
 >   json page = jsonMap
->       [ ("name", jsonScalar $ pageName page)
->       , ("content", jsonScalar $ pageContent page)
+>       [ ("name", jsonScalar $ unpack $ pageName page)
+>       , ("content", jsonScalar $ unpack $ pageContent page)
 >       ]
 
 <p>We first try and find the appropriate Page, returning a 404 if it's not there. We then use the applyLayoutJson function, which is really the heart of this example. It allows you an easy way to create responses that will be either HTML or JSON, and which use the default layout in the HTML responses. It takes four arguments: 1) the title of the HTML page, 2) some value, 3) a function from that value to a Hamlet value, and 4) a function from that value to a Json value.</p>
@@ -110,3 +109,8 @@ And now the cool part: a handler that returns either HTML or JSON data, dependin
 >   pages <- loadPages
 >   s <- static "static/yesod/ajax"
 >   warpDebug 3000 $ Ajax pages s
+
+And just to avoid some warnings...
+
+> _ignored :: Widget
+> _ignored = undefined ajaxPages
diff --git a/yesod-examples/src/blog.lhs b/yesod-examples/src/blog.lhs
index 65fd2bdd..8e59cdd9 100644
--- a/yesod-examples/src/blog.lhs
+++ b/yesod-examples/src/blog.lhs
@@ -113,3 +113,8 @@ All that's left now is the main function. Yesod is built on top of WAI, so you c
 > main = do
 >   entries <- loadEntries
 >   warpDebug 3000 $ Blog entries
+
+And this is just to avoid some warnings...
+
+> _ignored :: Widget
+> _ignored = undefined blogEntries
diff --git a/yesod-examples/src/chat.hs b/yesod-examples/src/chat.hs
index d0551238..eb138906 100644
--- a/yesod-examples/src/chat.hs
+++ b/yesod-examples/src/chat.hs
@@ -9,8 +9,6 @@ import Yesod
 import Yesod.Static
 
 import Control.Concurrent.STM
-import Control.Concurrent.STM.TChan
-import Control.Concurrent.STM.TVar
 
 import Control.Arrow ((***))
 import Data.Text (Text, unpack)
@@ -27,7 +25,7 @@ data Chat = Chat
 
 staticFiles "static"
 
-mkYesod "Chat" [$parseRoutes|
+mkYesod "Chat" [parseRoutes|
 /          HomeR   GET
 /check     CheckR  GET
 /post      PostR   GET
@@ -38,18 +36,17 @@ instance Yesod Chat where
   approot _ = ""
   defaultLayout widget = do
     content <- widgetToPageContent widget
-    hamletToRepHtml [$hamlet|\
-    \<!DOCTYPE html>
+    hamletToRepHtml [hamlet|
+!!!
 
-    <html>
-        <head>
-            <title>#{pageTitle content}
-            <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js">
-            <script src="@{StaticR chat_js}">
-            \^{pageHead content}
-        <body>
-            \^{pageBody content}
-    \
+<html>
+    <head>
+        <title>#{pageTitle content}
+        <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js">
+        <script src="@{StaticR chat_js}">
+        ^{pageHead content}
+    <body>
+        ^{pageBody content}
 |]
 
 getHomeR :: Handler RepHtml
@@ -66,8 +63,8 @@ getHomeR = do
     return c
   defaultLayout $ do
     setTitle "Chat Page"
-    toWidget [$hamlet|\
-\<!DOCTYPE html>
+    toWidget [hamlet|
+!!!
 
 <h1>Chat Example
 <form>
@@ -97,6 +94,7 @@ getCheckR = do
   let Message s c = first
   jsonToRepJson $ zipJson ["sender", "content"] [s,c]
 
+zipJson :: [Text] -> [Text] -> Json
 zipJson x y = jsonMap $ map (unpack *** jsonScalar . unpack) $ zip x y
 
 getPostR :: Handler RepJson
diff --git a/yesod-examples/src/file-echo.lhs b/yesod-examples/src/file-echo.lhs
index fc490f83..ed86a365 100644
--- a/yesod-examples/src/file-echo.lhs
+++ b/yesod-examples/src/file-echo.lhs
@@ -1,10 +1,8 @@
 > {-# LANGUAGE TypeFamilies, QuasiQuotes, TemplateHaskell, MultiParamTypeClasses, OverloadedStrings #-}
 
 > import Yesod
-> import Data.Monoid (mempty)
 > import qualified Data.ByteString.Char8 as S8
 > import qualified Data.Text as T
-> import Text.Blaze (string)
 
 > data Echo = Echo
 
@@ -14,18 +12,26 @@
 
 > instance Yesod Echo where approot _ = ""
 
+> getHomepage :: Handler RepHtml
 > getHomepage = defaultLayout $ do
->   setTitle $ string "Upload a file"
->   addHamlet [$hamlet|
-> %form!method=post!action=.!enctype=multipart/form-data
+>   setTitle "Upload a file"
+>   addHamlet [hamlet|
+> <form method=post action=. enctype=multipart/form-data>
 >   File name:
->   %input!type=file!name=file
->   %input!type=submit
+>   <input type=file name=file
+>   <input type=submit
 > |]
 
+> postHomepage :: Handler [(ContentType, Content)]
 > postHomepage = do
 >   (_, files) <- runRequestBody
 >   fi <- maybe notFound return $ lookup "file" files
 >   return [(S8.pack $ T.unpack $ fileContentType fi, toContent $ fileContent fi)]
 
+> main :: IO ()
 > main = warpDebug 3000 Echo
+
+To avoid warnings
+
+> _ignored :: Widget
+> _ignored = undefined
diff --git a/yesod-examples/src/form.lhs b/yesod-examples/src/form.lhs
index 57855e51..927fb6fa 100644
--- a/yesod-examples/src/form.lhs
+++ b/yesod-examples/src/form.lhs
@@ -2,7 +2,7 @@
 
 
 > {-# LANGUAGE TypeFamilies, QuasiQuotes, OverloadedStrings, MultiParamTypeClasses, TemplateHaskell #-}
-> import Yesod
+> import Yesod hiding (Form)
 > import Control.Applicative
 > import Data.Text (Text)
 
@@ -10,6 +10,8 @@
 > mkYesod "FormExample" [parseRoutes|
 > / RootR GET
 > |]
+> type Form a = Html -> MForm FormExample FormExample (FormResult a, Widget)
+> type Formlet a = Maybe a -> Form a
 > instance Yesod FormExample where approot _ = ""
 > instance RenderMessage FormExample FormMessage where
 >    renderMessage _ _ = defaultFormMessage
@@ -18,6 +20,7 @@ Next, we'll declare a Person datatype with a name and age. After that, we'll cre
 
 > data Person = Person { name :: Text, age :: Int }
 >     deriving Show
+> personFormlet :: Formlet Person
 > personFormlet p = renderTable $ Person
 >     <$> areq textField "Name" (fmap name p)
 >     <*> areq intField "Age" (fmap age p)
@@ -38,14 +41,15 @@ We use an applicative approach and stay mostly declarative. The "fmap name p" bi
 
 <p>extractBody returns the HTML of a widget and "passes" all of the other declarations (the CSS, Javascript, etc) up to the parent widget. The rest of this is just standard Hamlet code and our main function.</p>
 
->         addHamlet [$hamlet|
+>         addHamlet [hamlet|
 > <p>Last result: #{show res}
 > <form enctype="#{enctype}">
 >     <table>
->         \^{form}
+>         ^{form}
 >         <tr>
 >             <td colspan="2">
 >                 <input type="submit">
 > |]
 > 
+> main :: IO ()
 > main = warpDebug 3000 FormExample
diff --git a/yesod-examples/src/generalized-hamlet.lhs b/yesod-examples/src/generalized-hamlet.lhs
deleted file mode 100644
index 01d7dc78..00000000
--- a/yesod-examples/src/generalized-hamlet.lhs
+++ /dev/null
@@ -1,52 +0,0 @@
-This example shows how generalized hamlet templates allow the creation of
-different types of values. The key component here is the HamletValue typeclass.
-Yesod has instances for:
-
-* Html
-
-* HtmlUrl (= (url -> [(String, String)] -> String) -> Html)
-
-* GWidget s m ()
-
-This example uses all three. You are of course free in your own code to make
-your own instances.
-
-> {-# LANGUAGE QuasiQuotes, TypeFamilies, MultiParamTypeClasses, OverloadedStrings, TemplateHaskell #-}
-> import Yesod
-> import Text.Hamlet (shamlet)
-> data NewHamlet = NewHamlet
-> mkYesod "NewHamlet" [$parseRoutes|/ RootR GET|]
-> instance Yesod NewHamlet where approot _ = ""
-> 
-> myHtml :: Html
-> myHtml = [shamlet|<p>Just don't use any URLs in here!|]
->
-> myInnerWidget :: Widget
-> myInnerWidget = do
->     addHamlet [$hamlet|
->   <div #inner>Inner widget
->   #{myHtml}
-> |]
->     addCassius [$cassius|
->#inner
->     color: red|]
-> 
-> myPlainTemplate :: HtmlUrl NewHamletRoute
-> myPlainTemplate = [hamlet|
-> <p
->     <a href=@{RootR}>Link to home
-> |]
-> 
-> myWidget :: Widget
-> myWidget = [whamlet|
->     <h1>Embed another widget
->     \^{myInnerWidget}
->     <h1>Embed a Hamlet
->     \^{addHamlet myPlainTemplate}
-> |]
-> 
-> getRootR :: GHandler NewHamlet NewHamlet RepHtml
-> getRootR = defaultLayout myWidget
-> 
-> main :: IO ()
-> main = warpDebug 3000 NewHamlet
diff --git a/yesod-examples/src/i18n.lhs b/yesod-examples/src/i18n.lhs
index 12bd0f52..99eb47a6 100644
--- a/yesod-examples/src/i18n.lhs
+++ b/yesod-examples/src/i18n.lhs
@@ -6,20 +6,11 @@
 > {-# LANGUAGE CPP #-}
 
 > import Yesod
-> import Data.Monoid (mempty)
 > import Data.Text (Text)
 
-To work on both ghc6 and ghc7
-
-#if GHC7
-# define QQ(x) x
-#else
-# define QQ(x) $x
-#endif
-
 > data I18N = I18N
 
-> mkYesod "I18N" [QQ(parseRoutes)|
+> mkYesod "I18N" [parseRoutes|
 > /            HomepageR GET
 > /set/#Text SetLangR  GET
 > |]
@@ -38,7 +29,7 @@ To work on both ghc6 and ghc7
 >             ]
 >     defaultLayout $ do
 >       setTitle "I18N Homepage"
->       addHamlet [QQ(hamlet)|
+>       addHamlet [hamlet|
 > <h1>#{hello}
 > <p>In other languages:
 > <ul>
@@ -60,3 +51,6 @@ To work on both ghc6 and ghc7
 
 > main :: IO ()
 > main = warpDebug 3000 I18N
+
+> _ignored :: Widget
+> _ignored = undefined
diff --git a/yesod-examples/src/pretty-yaml.lhs b/yesod-examples/src/pretty-yaml.lhs
index c8d8bbcf..f8786553 100644
--- a/yesod-examples/src/pretty-yaml.lhs
+++ b/yesod-examples/src/pretty-yaml.lhs
@@ -10,14 +10,14 @@
 
 > data PY = PY
 
-> mkYesod "PY" [$parseRoutes|
+> mkYesod "PY" [parseRoutes|
 > / Homepage GET POST
 > |]
 
 > instance Yesod PY where approot _ = ""
 
 > template :: Maybe (HtmlUrl url) -> HtmlUrl url
-> template myaml = [$hamlet|
+> template myaml = [hamlet|
 > !!!
 > 
 > <html>
@@ -46,13 +46,13 @@
 >     hamletToRepHtml $ template $ Just $ objToHamlet so
 
 > objToHamlet :: StringObject -> HtmlUrl url
-> objToHamlet (Scalar s) = [$hamlet|#{s}|]
-> objToHamlet (Sequence list) = [$hamlet|
+> objToHamlet (Scalar s) = [hamlet|#{s}|]
+> objToHamlet (Sequence list) = [hamlet|
 > <ul
 >     $forall o <- list
 >         <li>^{objToHamlet o}
 > |]
-> objToHamlet (Mapping pairs) = [$hamlet|
+> objToHamlet (Mapping pairs) = [hamlet|
 > <dl
 >     $forall pair <- pairs
 >         <dt>#{fst pair}
@@ -61,3 +61,6 @@
 
 > main :: IO ()
 > main = warpDebug 3000 PY
+
+> _ignored :: Widget
+> _ignored = undefined
diff --git a/yesod-examples/src/session.lhs b/yesod-examples/src/session.lhs
index 0de63ed5..083783c7 100644
--- a/yesod-examples/src/session.lhs
+++ b/yesod-examples/src/session.lhs
@@ -17,7 +17,7 @@
 > getRoot :: Handler RepHtml
 > getRoot = do
 >     sess <- getSession
->     hamletToRepHtml [$hamlet|
+>     hamletToRepHtml [hamlet|
 > <form method=post
 >     <input type=text name=key
 >     <input type=text name=val
@@ -32,4 +32,8 @@
 >       liftIO $ print (key, val)
 >       redirect RedirectTemporary Root
 >
+> main :: IO ()
 > main = warpDebug 3000 Session
+
+> _ignored :: Widget
+> _ignored = undefined
diff --git a/yesod-examples/synopsis/hamlet.lhs b/yesod-examples/synopsis/hamlet.lhs
index a700a1ec..c885ccbc 100644
--- a/yesod-examples/synopsis/hamlet.lhs
+++ b/yesod-examples/synopsis/hamlet.lhs
@@ -2,7 +2,6 @@
 {-# LANGUAGE QuasiQuotes, OverloadedStrings #-}
 
 import Text.Hamlet
-import Yesod.Widget
 import Data.Text (Text, cons)
 import qualified Data.Text.Lazy.IO as L
 import Text.Blaze.Renderer.Text (renderHtml)
@@ -19,15 +18,15 @@ data PersonUrls = Homepage | PersonPage Text
 
 renderUrls :: PersonUrls -> [(Text, Text)] -> Text
 renderUrls Homepage _ = "/"
-renderUrls (PersonPage name) _ = '/' `cons` name
+renderUrls (PersonPage name') _ = '/' `cons` name'
 
 footer :: HtmlUrl url
-footer = [$hamlet|\
+footer = [hamlet|
 <div id="footer">Thank you, come again
 |]
 
 template :: Person -> HtmlUrl PersonUrls
-template person = [$hamlet|
+template person = [hamlet|
 !!!
 
 <html>
diff --git a/yesod-examples/synopsis/persistent.lhs b/yesod-examples/synopsis/persistent.lhs
index 1737a81b..095a01c6 100644
--- a/yesod-examples/synopsis/persistent.lhs
+++ b/yesod-examples/synopsis/persistent.lhs
@@ -37,3 +37,6 @@ Just (Person {personName = "Michael", personAge = 25})
 Just (Person {personName = "Michael", personAge = 26})
 [(PersonId 1,Person {personName = "Michael", personAge = 26})]
 []</pre></code>
+
+> _ignored :: PersonId
+> _ignored = undefined personName personAge
diff --git a/yesod-examples/yesod-examples.cabal b/yesod-examples/yesod-examples.cabal
index 0f0bc0b6..8b6c3a0c 100644
--- a/yesod-examples/yesod-examples.cabal
+++ b/yesod-examples/yesod-examples.cabal
@@ -52,9 +52,6 @@ Executable yesod-session
 --  Main-is:             src/widgets.lhs
 --  Build-depends:       yesod-form
 
-Executable yesod-generalized-hamlet
-  Main-is:             src/generalized-hamlet.lhs
-
 Executable yesod-form
   Main-is:             src/form.lhs
 
@@ -63,6 +60,7 @@ Executable yesod-persistent-synopsis
   Build-depends:       transformers >= 0.2.2 && < 0.3,
                        persistent-sqlite   >= 0.6 && < 0.7,
                        persistent-template >= 0.6 && < 0.7
+  extra-libraries:     sqlite3
 
 Executable yesod-hamlet-synopsis
   Main-is:             synopsis/hamlet.lhs

From 9a195e5087d08f7b11b947165b3cd6d69b41d828 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 30 Nov 2011 18:37:25 +0200
Subject: [PATCH 151/189] Add (another) missing file

---
 yesod-core/Yesod/Internal/Cache.hs | 38 ++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 yesod-core/Yesod/Internal/Cache.hs

diff --git a/yesod-core/Yesod/Internal/Cache.hs b/yesod-core/Yesod/Internal/Cache.hs
new file mode 100644
index 00000000..4aec0d29
--- /dev/null
+++ b/yesod-core/Yesod/Internal/Cache.hs
@@ -0,0 +1,38 @@
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE TemplateHaskell #-}
+module Yesod.Internal.Cache
+    ( Cache
+    , CacheKey
+    , mkCacheKey
+    , lookup
+    , insert
+    , delete
+    ) where
+
+import Prelude hiding (lookup)
+import qualified Data.IntMap as Map
+import Language.Haskell.TH.Syntax (Q, Exp, runIO, Exp (LitE), Lit (IntegerL))
+import Language.Haskell.TH (appE)
+import Data.Unique (hashUnique, newUnique)
+import GHC.Exts (Any)
+import Unsafe.Coerce (unsafeCoerce)
+import Data.Monoid (Monoid)
+import Control.Applicative ((<$>))
+
+newtype Cache = Cache (Map.IntMap Any)
+    deriving Monoid
+
+newtype CacheKey a = CacheKey Int
+
+-- | Generate a new 'CacheKey'. Be sure to give a full type signature.
+mkCacheKey :: Q Exp
+mkCacheKey = [|CacheKey|] `appE` (LitE . IntegerL . fromIntegral . hashUnique <$> runIO newUnique)
+
+lookup :: CacheKey a -> Cache -> Maybe a
+lookup (CacheKey i) (Cache m) = unsafeCoerce <$> Map.lookup i m
+
+insert :: CacheKey a -> a -> Cache -> Cache
+insert (CacheKey k) v (Cache m) = Cache (Map.insert k (unsafeCoerce v) m)
+
+delete :: CacheKey a -> Cache -> Cache
+delete (CacheKey k) (Cache m) = Cache (Map.delete k m)

From a990b9cac68b756533b786baa1477a657ec43182 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 1 Dec 2011 12:49:28 +0200
Subject: [PATCH 152/189] aeson 0.4

---
 yesod-auth/Yesod/Auth.hs    | 4 ++++
 yesod-auth/yesod-auth.cabal | 5 +++--
 yesod-json/Yesod/Json.hs    | 5 +++++
 yesod-json/yesod-json.cabal | 3 ++-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/yesod-auth/Yesod/Auth.hs b/yesod-auth/Yesod/Auth.hs
index 07b9ed86..d662e87d 100644
--- a/yesod-auth/Yesod/Auth.hs
+++ b/yesod-auth/Yesod/Auth.hs
@@ -34,7 +34,11 @@ import Data.Text.Encoding (decodeUtf8With)
 import Data.Text.Encoding.Error (lenientDecode)
 import           Data.Text (Text)
 import qualified Data.Text as T
+#if MIN_VERSION_aeson(0, 4, 0)
+import qualified Data.HashMap.Lazy as Map
+#else
 import qualified Data.Map as Map
+#endif
 
 import Language.Haskell.TH.Syntax hiding (lift)
 
diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal
index 15cab177..72881010 100644
--- a/yesod-auth/yesod-auth.cabal
+++ b/yesod-auth/yesod-auth.cabal
@@ -1,5 +1,5 @@
 name:            yesod-auth
-version:         0.7.6.1
+version:         0.7.6.2
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman, Patrick Brisbin
@@ -36,7 +36,8 @@ library
                    , hamlet                  >= 0.10      && < 0.11
                    , shakespeare-css         >= 0.10      && < 0.11
                    , yesod-json              >= 0.2       && < 0.3
-                   , containers              >= 0.2       && < 0.5
+                   , containers
+                   , unordered-containers
                    , yesod-form              >= 0.3       && < 0.4
                    , transformers            >= 0.2.2     && < 0.3
                    , persistent              >= 0.6       && < 0.7
diff --git a/yesod-json/Yesod/Json.hs b/yesod-json/Yesod/Json.hs
index bdc8ccc1..9a3537e8 100644
--- a/yesod-json/Yesod/Json.hs
+++ b/yesod-json/Yesod/Json.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE TypeSynonymInstances #-}
+{-# LANGUAGE CPP #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 module Yesod.Json
     ( -- * Convert from a JSON value
@@ -23,7 +24,11 @@ import qualified Data.Aeson.Encode as JE
 import Data.Aeson.Encode (fromValue)
 import Data.Text (pack)
 import Control.Arrow (first)
+#if MIN_VERSION_aeson(0, 4, 0)
+import Data.HashMap.Strict (fromList)
+#else
 import Data.Map (fromList)
+#endif
 import qualified Data.Vector as V
 import Text.Julius (ToJavascript (..))
 import Data.Text.Lazy.Builder (fromLazyText)
diff --git a/yesod-json/yesod-json.cabal b/yesod-json/yesod-json.cabal
index 2a52c5b4..9f41ea1e 100644
--- a/yesod-json/yesod-json.cabal
+++ b/yesod-json/yesod-json.cabal
@@ -1,5 +1,5 @@
 name:            yesod-json
-version:         0.2.2
+version:         0.2.2.1
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
@@ -20,6 +20,7 @@ library
                    , shakespeare-js       >= 0.10     && < 0.11
                    , vector               >= 0.9
                    , containers           >= 0.2      && < 0.5
+                   , unordered-containers
     exposed-modules: Yesod.Json
     ghc-options:     -Wall
 

From c8f1d01c13a83585db7c77ea7161c3a4099f6949 Mon Sep 17 00:00:00 2001
From: Rian Hunter <rian@alum.mit.edu>
Date: Sat, 3 Dec 2011 20:22:10 -0800
Subject: [PATCH 153/189] fix inconsistent / conflicting attoparsec dependency

---
 yesod-mega.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yesod-mega.cabal b/yesod-mega.cabal
index e7ea3ca4..6bd9b9ea 100644
--- a/yesod-mega.cabal
+++ b/yesod-mega.cabal
@@ -128,7 +128,7 @@ library
                    , shakespeare-text   >= 0.10     && < 0.11
                    , filepath           >= 1.1          && < 1.3
                    , process
-                   , attoparsec-text    >= 0.8.5        && < 0.8.5.2
+                   , attoparsec         >= 0.10
                    -- yesod-sitemap
                    -- empty
 

From ee91c66d13756fcff186851673f87cc8e62a4228 Mon Sep 17 00:00:00 2001
From: Rian Hunter <rian@alum.mit.edu>
Date: Sat, 3 Dec 2011 21:04:16 -0800
Subject: [PATCH 154/189] fix old aeson-native reference in yesod-mega.cabal

---
 yesod-mega.cabal | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/yesod-mega.cabal b/yesod-mega.cabal
index 6bd9b9ea..7711da07 100644
--- a/yesod-mega.cabal
+++ b/yesod-mega.cabal
@@ -191,7 +191,8 @@ library
                    , data-object-yaml      >= 0.3      && < 0.4
                    , strict-concurrency    >= 0.2.4    && < 0.2.5
                    , vector                >= 0.9      && < 0.10
-                   , aeson-native          >= 0.3.3.1  && < 0.4
+                   , aeson                 >= 0.3
+
     ghc-options:     -Wall
 
 test-suite tests

From 2e1aa2d26151ed1217419b284c9691fa3d99b122 Mon Sep 17 00:00:00 2001
From: Arash Rouhani <miffoljud@gmail.com>
Date: Sun, 4 Dec 2011 22:49:36 +0100
Subject: [PATCH 155/189] Update `isAuthorized` documentation

---
 yesod-core/Yesod/Internal/Core.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yesod-core/Yesod/Internal/Core.hs b/yesod-core/Yesod/Internal/Core.hs
index 150cc46c..e21580d2 100644
--- a/yesod-core/Yesod/Internal/Core.hs
+++ b/yesod-core/Yesod/Internal/Core.hs
@@ -170,9 +170,9 @@ class RenderRoute (Route a) => Yesod a where
 
     -- | Determine if a request is authorized or not.
     --
-    -- Return 'Nothing' is the request is authorized, 'Just' a message if
-    -- unauthorized. If authentication is required, you should use a redirect;
-    -- the Auth helper provides this functionality automatically.
+    -- Return 'Authorized' if the request is authorized,
+    -- 'Unauthorized' a message if unauthorized.
+    -- If authentication is required, return 'AuthenticationRequired'.
     isAuthorized :: Route a
                  -> Bool -- ^ is this a write request?
                  -> GHandler s a AuthResult

From 2a42abcaa83a6276ebb2063c165be29c21986170 Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Sun, 4 Dec 2011 19:43:14 -0500
Subject: [PATCH 156/189] remove megas from README

---
 README.md | 32 +-------------------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

diff --git a/README.md b/README.md
index a2d1dec7..7faeca90 100644
--- a/README.md
+++ b/README.md
@@ -79,40 +79,10 @@ cd yesodweb
 virthualenv --name=yesod
 ./virthualenv/bin/activate
 
-# prevent dependency issue
-cabal install deepseq-1.1.0.2
 # from the yesodweb directory, install the mega-mega repo to align all your dependencies
 cabal install
 ~~~
 
-#### aeson deepseq
-
-Currently there is a very annoying issue that aeson, a Yesod dependency requires deepseq < 1.2
-A new version of aeson should be released fairly soon.
-This means that before installing Yesod you should install deepseq from a clean slate (using virthualenv)
-
-~~~ { .bash }
-cabal install deepseq-1.1.0.2
-~~~
-
-#### Mega repos
-
-Yesod consists of four mega repos: yesod, wai, persistent, and hamlet.
-Each mega repo contains multiple cabal packages, and a mega cabal package.
-The yesodweb folder is also a mega-mega repo that will compile all four mega repos at once.
-You may find development easier if you compile and test with a mega repo.
-Installing a mega repo helps cabal align all the dependencies correctly.
-
-~~~ { .bash }
-# Move to which one of the four repos you are working on.
-cd hamlet
-
-# build and test the mega repo
-cabal configure -ftest --enable-tests
-cabal build
-cabal test
-~~~
-
 #### individual cabal packages
 
 If you first install the mega repo, then it should be easier to work on an individual package rather than the mega.
@@ -142,5 +112,5 @@ Instead you should use `cabal-dev add-source-list` to retrieve these packages.
 cd to your application directory, and the reference the source list.
 
 ~~~ { .bash }
-cabal-dev add-source-list /path/to/yesodweb/sources.txt
+cabal-dev install /path/to/yesodweb/yesod/*(/)
 ~~~

From ce31a9c8abf18dacbdef455fea87bdd4a8acdad4 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 5 Dec 2011 09:50:26 +0200
Subject: [PATCH 157/189] Removed ErrorT from Handler

---
 yesod-core/Yesod/Handler.hs | 157 ++++++++++++++----------------------
 1 file changed, 62 insertions(+), 95 deletions(-)

diff --git a/yesod-core/Yesod/Handler.hs b/yesod-core/Yesod/Handler.hs
index 09b815c6..d8a75d84 100644
--- a/yesod-core/Yesod/Handler.hs
+++ b/yesod-core/Yesod/Handler.hs
@@ -8,6 +8,7 @@
 {-# LANGUAGE FunctionalDependencies #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE QuasiQuotes #-}
+{-# LANGUAGE DeriveDataTypeable #-}
 ---------------------------------------------------------
 --
 -- Module        : Yesod.Handler
@@ -127,12 +128,11 @@ import Data.Time (UTCTime)
 import Control.Exception hiding (Handler, catch, finally)
 import Control.Applicative
 
-import Control.Monad (liftM, join, MonadPlus)
+import Control.Monad (liftM)
 
 import Control.Monad.IO.Class
 import Control.Monad.Trans.Class
 import Control.Monad.Trans.RWS
-import Control.Monad.Trans.Error (throwError, ErrorT (..), Error (..))
 
 import System.IO
 import qualified Network.Wai as W
@@ -146,8 +146,6 @@ import Data.Text.Encoding (encodeUtf8, decodeUtf8With)
 import Data.Text.Encoding.Error (lenientDecode)
 import qualified Data.Text.Lazy as TL
 
-import Control.Monad.IO.Control (MonadControlIO)
-import Control.Monad.Trans.Control (MonadTransControl, liftControl)
 import qualified Data.Map as Map
 import qualified Data.ByteString as S
 import Data.ByteString (ByteString)
@@ -171,6 +169,7 @@ import Yesod.Internal.TestApi (catchIter)
 
 import qualified Yesod.Internal.Cache as Cache
 import Yesod.Internal.Cache (mkCacheKey, CacheKey)
+import Data.Typeable (Typeable)
 
 -- | The type-safe URLs associated with a site argument.
 type family Route a
@@ -208,7 +207,7 @@ handlerSubDataMaybe tm ts route hd = hd
 withReaderT :: (HandlerData s m -> HandlerData s' m)
             -> GGHandler s' m mo a
             -> GGHandler s m mo a
-withReaderT f (GHandler (ErrorT m)) = GHandler $ ErrorT $ withRWST (\r s -> (f r, s)) m
+withReaderT f = withRWST (\r s -> (f r, s))
 
 -- | Used internally for promoting subsite handler functions to master site
 -- handler functions. Should not be needed by users.
@@ -253,14 +252,7 @@ toMasterHandlerMaybe tm ts route = withReaderT (handlerSubDataMaybe tm ts route)
 -- 'WriterT' for headers and session, and an 'MEitherT' monad for handling
 -- special responses. It is declared as a newtype to make compiler errors more
 -- readable.
-newtype GGHandler sub master m a =
-    GHandler
-        { unGHandler :: GHInner sub master m a
-        }
-    deriving (Functor, Applicative, Monad, MonadIO, MonadControlIO, MonadPlus)
-
-instance MonadTrans (GGHandler s m) where
-    lift = GHandler . lift . lift
+type GGHandler sub master = RWST (HandlerData sub master) (Endo [Header]) GHState
 
 type GHandler sub master = GGHandler sub master (Iteratee ByteString IO)
 
@@ -271,12 +263,6 @@ data GHState = GHState
     , ghsCache :: Cache.Cache
     }
 
-type GHInner s m monad =
-    ErrorT HandlerContents (
-    RWST (HandlerData s m) (Endo [Header]) GHState
-    monad
-    )
-
 type SessionMap = Map.Map Text Text
 
 -- | An extension of the basic WAI 'W.Application' datatype to provide extra
@@ -302,25 +288,27 @@ data HandlerContents =
     | HCRedirect RedirectType Text
     | HCCreated Text
     | HCWai W.Response
+    deriving Typeable
 
-instance Error HandlerContents where
-    strMsg = HCError . InternalError . T.pack
+instance Show HandlerContents where
+    show _ = "Cannot show a HandlerContents"
+instance Exception HandlerContents
 
 getRequest :: Monad mo => GGHandler s m mo Request
-getRequest = handlerRequest `liftM` gask
+getRequest = handlerRequest `liftM` ask
 
-instance Monad monad => Failure ErrorResponse (GGHandler sub master monad) where
-    failure = GHandler . throwError . HCError
+instance MonadIO monad => Failure ErrorResponse (GGHandler sub master monad) where
+    failure = liftIO . throwIO . HCError
 
 runRequestBody :: GHandler s m RequestBodyContents
 runRequestBody = do
-    x <- GHandler $ lift get
+    x <- get
     case ghsRBC x of
         Just rbc -> return rbc
         Nothing -> do
             rr <- waiRequest
             rbc <- lift $ rbHelper rr
-            GHandler $ lift $ put x { ghsRBC = Just rbc }
+            put x { ghsRBC = Just rbc }
             return rbc
 
 rbHelper :: W.Request -> Iteratee ByteString IO RequestBodyContents
@@ -335,36 +323,33 @@ rbHelper req =
 
 -- | Get the sub application argument.
 getYesodSub :: Monad m => GGHandler sub master m sub
-getYesodSub = handlerSub `liftM` gask
+getYesodSub = handlerSub `liftM` ask
 
 -- | Get the master site appliation argument.
 getYesod :: Monad m => GGHandler sub master m master
-getYesod = handlerMaster `liftM` gask
+getYesod = handlerMaster `liftM` ask
 
 -- | Get the URL rendering function.
 getUrlRender :: Monad m => GGHandler sub master m (Route master -> Text)
 getUrlRender = do
-    x <- handlerRender `liftM` gask
+    x <- handlerRender `liftM` ask
     return $ flip x []
 
-gask :: Monad m => GGHandler sub master m (HandlerData sub master)
-gask = GHandler (lift ask)
-
 -- | The URL rendering function with query-string parameters.
 getUrlRenderParams
     :: Monad m
     => GGHandler sub master m (Route master -> [(Text, Text)] -> Text)
-getUrlRenderParams = handlerRender `liftM` gask
+getUrlRenderParams = handlerRender `liftM` ask
 
 -- | Get the route requested by the user. If this is a 404 response- where the
 -- user requested an invalid route- this function will return 'Nothing'.
 getCurrentRoute :: Monad m => GGHandler sub master m (Maybe (Route sub))
-getCurrentRoute = handlerRoute `liftM` gask
+getCurrentRoute = handlerRoute `liftM` ask
 
 -- | Get the function to promote a route for a subsite to a route for the
 -- master site.
 getRouteToMaster :: Monad m => GGHandler sub master m (Route sub -> Route master)
-getRouteToMaster = handlerToMaster `liftM` gask
+getRouteToMaster = handlerToMaster `liftM` ask
 
 -- | Function used internally by Yesod in the process of converting a
 -- 'GHandler' into an 'W.Application'. Should not be needed by users.
@@ -392,11 +377,13 @@ runHandler handler mrender sroute tomr ma sa =
             }
     let initSession' = GHState initSession Nothing 1 mempty
     (contents', finalSession, headers) <- catchIter (
-        fmap (\(a, b, c) -> (a, ghsSession b, c))
-      $ (\m -> runRWST m hd initSession')
-      $ runErrorT
-      $ unGHandler handler
-        ) (\e -> return (Left $ HCError $ toErrorHandler e, initSession, mempty))
+        fmap (\(a, b, c) -> (Right a, ghsSession b, c))
+      $ runRWST handler hd initSession'
+        ) (\e -> return (
+                case fromException e of
+                    Just x -> Left x
+                    Nothing -> Left $ HCError $ toErrorHandler e
+                , initSession, mempty))
     let contents = either id (HCContent H.status200 . chooseRep) contents'
     let handleError e = do
             yar <- unYesodApp (eh e) safeEh rr cts finalSession
@@ -441,11 +428,11 @@ safeEh er = YesodApp $ \_ _ _ session -> do
         session
 
 -- | Redirect to the given route.
-redirect :: Monad mo => RedirectType -> Route master -> GGHandler sub master mo a
+redirect :: MonadIO mo => RedirectType -> Route master -> GGHandler sub master mo a
 redirect rt url = redirectParams rt url []
 
 -- | Redirects to the given route with the associated query-string parameters.
-redirectParams :: Monad mo
+redirectParams :: MonadIO mo
                => RedirectType -> Route master -> [(Text, Text)]
                -> GGHandler sub master mo a
 redirectParams rt url params = do
@@ -453,8 +440,8 @@ redirectParams rt url params = do
     redirectString rt $ r url params
 
 -- | Redirect to the given URL.
-redirectString, redirectText :: Monad mo => RedirectType -> Text -> GGHandler sub master mo a
-redirectText rt = GHandler . throwError . HCRedirect rt
+redirectString, redirectText :: MonadIO mo => RedirectType -> Text -> GGHandler sub master mo a
+redirectText rt = liftIO . throwIO . HCRedirect rt
 redirectString = redirectText
 {-# DEPRECATED redirectString "Use redirectText instead" #-}
 
@@ -489,7 +476,7 @@ setUltDest' = do
         Nothing -> return ()
         Just r -> do
             tm <- getRouteToMaster
-            gets' <- reqGetParams `liftM` handlerRequest `liftM` gask
+            gets' <- reqGetParams `liftM` handlerRequest `liftM` ask
             render <- getUrlRenderParams
             setUltDestString $ render (tm r) gets'
 
@@ -510,7 +497,7 @@ setUltDestReferer = do
 -- value from the session.
 --
 -- The ultimate destination is set with 'setUltDest'.
-redirectUltDest :: Monad mo
+redirectUltDest :: MonadIO mo
                 => RedirectType
                 -> Route master -- ^ default destination if nothing in session
                 -> GGHandler sub master mo a
@@ -554,52 +541,52 @@ getMessage = do
 --
 -- For some backends, this is more efficient than reading in the file to
 -- memory, since they can optimize file sending via a system call to sendfile.
-sendFile :: Monad mo => ContentType -> FilePath -> GGHandler sub master mo a
-sendFile ct fp = GHandler . throwError $ HCSendFile ct fp Nothing
+sendFile :: MonadIO mo => ContentType -> FilePath -> GGHandler sub master mo a
+sendFile ct fp = liftIO . throwIO $ HCSendFile ct fp Nothing
 
 -- | Same as 'sendFile', but only sends part of a file.
-sendFilePart :: Monad mo
+sendFilePart :: MonadIO mo
              => ContentType
              -> FilePath
              -> Integer -- ^ offset
              -> Integer -- ^ count
              -> GGHandler sub master mo a
 sendFilePart ct fp off count =
-    GHandler . throwError $ HCSendFile ct fp $ Just $ W.FilePart off count
+    liftIO . throwIO $ HCSendFile ct fp $ Just $ W.FilePart off count
 
 -- | Bypass remaining handler code and output the given content with a 200
 -- status code.
-sendResponse :: (Monad mo, HasReps c) => c -> GGHandler sub master mo a
-sendResponse = GHandler . throwError . HCContent H.status200
+sendResponse :: (MonadIO mo, HasReps c) => c -> GGHandler sub master mo a
+sendResponse = liftIO . throwIO . HCContent H.status200
              . chooseRep
 
 -- | Bypass remaining handler code and output the given content with the given
 -- status code.
-sendResponseStatus :: (Monad mo, HasReps c) => H.Status -> c -> GGHandler s m mo a
-sendResponseStatus s = GHandler . throwError . HCContent s
+sendResponseStatus :: (MonadIO mo, HasReps c) => H.Status -> c -> GGHandler s m mo a
+sendResponseStatus s = liftIO . throwIO . HCContent s
                      . chooseRep
 
 -- | Send a 201 "Created" response with the given route as the Location
 -- response header.
-sendResponseCreated :: Monad mo => Route m -> GGHandler s m mo a
+sendResponseCreated :: MonadIO mo => Route m -> GGHandler s m mo a
 sendResponseCreated url = do
     r <- getUrlRender
-    GHandler $ throwError $ HCCreated $ r url
+    liftIO . throwIO $ HCCreated $ r url
 
 -- | Send a 'W.Response'. Please note: this function is rarely
 -- necessary, and will /disregard/ any changes to response headers and session
 -- that you have already specified. This function short-circuits. It should be
 -- considered only for very specific needs. If you are not sure if you need it,
 -- you don't.
-sendWaiResponse :: Monad mo => W.Response -> GGHandler s m mo b
-sendWaiResponse = GHandler . throwError . HCWai
+sendWaiResponse :: MonadIO mo => W.Response -> GGHandler s m mo b
+sendWaiResponse = liftIO . throwIO . HCWai
 
 -- | Return a 404 not found page. Also denotes no handler available.
 notFound :: Failure ErrorResponse m => m a
 notFound = failure NotFound
 
 -- | Return a 405 method not supported page.
-badMethod :: Monad mo => GGHandler s m mo a
+badMethod :: MonadIO mo => GGHandler s m mo a
 badMethod = do
     w <- waiRequest
     failure $ BadMethod $ W.requestMethod w
@@ -609,7 +596,7 @@ permissionDenied :: Failure ErrorResponse m => Text -> m a
 permissionDenied = failure . PermissionDenied
 
 -- | Return a 403 permission denied page.
-permissionDeniedI :: (RenderMessage y msg, Monad mo) => msg -> GGHandler s y mo a
+permissionDeniedI :: (RenderMessage y msg, MonadIO mo) => msg -> GGHandler s y mo a
 permissionDeniedI msg = do
     mr <- getMessageRender
     permissionDenied $ mr msg
@@ -619,7 +606,7 @@ invalidArgs :: Failure ErrorResponse m => [Text] -> m a
 invalidArgs = failure . InvalidArgs
 
 -- | Return a 400 invalid arguments page.
-invalidArgsI :: (RenderMessage y msg, Monad mo) => [msg] -> GGHandler s y mo a
+invalidArgsI :: (RenderMessage y msg, MonadIO mo) => [msg] -> GGHandler s y mo a
 invalidArgsI msg = do
     mr <- getMessageRender
     invalidArgs $ map mr msg
@@ -679,18 +666,18 @@ setSession :: Monad mo
            => Text -- ^ key
            -> Text -- ^ value
            -> GGHandler sub master mo ()
-setSession k = GHandler . lift . modify . modSession . Map.insert k
+setSession k = modify . modSession . Map.insert k
 
 -- | Unsets a session variable. See 'setSession'.
 deleteSession :: Monad mo => Text -> GGHandler sub master mo ()
-deleteSession = GHandler . lift . modify . modSession . Map.delete
+deleteSession = modify . modSession . Map.delete
 
 modSession :: (SessionMap -> SessionMap) -> GHState -> GHState
 modSession f x = x { ghsSession = f $ ghsSession x }
 
 -- | Internal use only, not to be confused with 'setHeader'.
 addHeader :: Monad mo => Header -> GGHandler sub master mo ()
-addHeader = GHandler . lift . tell . Endo . (:)
+addHeader = tell . Endo . (:)
 
 getStatus :: ErrorResponse -> H.Status
 getStatus NotFound = H.status404
@@ -712,17 +699,17 @@ data RedirectType = RedirectPermanent
 
 localNoCurrent :: Monad mo => GGHandler s m mo a -> GGHandler s m mo a
 localNoCurrent =
-    GHandler . ErrorT . local (\hd -> hd { handlerRoute = Nothing }) . runErrorT . unGHandler
+    local (\hd -> hd { handlerRoute = Nothing })
 
 -- | Lookup for session data.
 lookupSession :: Monad mo => Text -> GGHandler s m mo (Maybe Text)
-lookupSession n = GHandler $ do
-    m <- liftM ghsSession $ lift get
+lookupSession n = do
+    m <- liftM ghsSession get
     return $ Map.lookup n m
 
 -- | Get all session variables.
 getSession :: Monad mo => GGHandler s m mo SessionMap
-getSession = liftM ghsSession $ GHandler $ lift get
+getSession = liftM ghsSession get
 
 handlerToYAR :: (HasReps a, HasReps b)
              => m -- ^ master site foundation
@@ -813,7 +800,7 @@ headerToPair _ _ (Header key value) = (key, value)
 
 -- | Get a unique identifier.
 newIdent :: Monad mo => GGHandler sub master mo String -- FIXME use Text
-newIdent = GHandler $ lift $ do
+newIdent = do
     x <- get
     let i' = ghsIdent x + 1
     put x { ghsIdent = i' }
@@ -822,28 +809,8 @@ newIdent = GHandler $ lift $ do
 liftIOHandler :: MonadIO mo
               => GGHandler sub master IO a
               -> GGHandler sub master mo a
-liftIOHandler m = GHandler $
-                   ErrorT $
-                     RWST $ \r s ->
-                       liftIO (runGGHandler m r s)
-
-runGGHandler :: GGHandler sub master m a
-            -> HandlerData sub master
-            -> GHState
-            -> m (Either HandlerContents a, GHState, Endo [Header])
-runGGHandler (GHandler (ErrorT m)) r s = runRWST m r s
-
-instance MonadTransControl (GGHandler s m) where
-    liftControl f =
-      GHandler $
-        liftControl $ \runErr ->
-          liftControl $ \runRws ->
-            f ( liftM ( GHandler
-                      . join . lift
-                      )
-              . runRws . runErr
-              . unGHandler
-              )
+liftIOHandler (RWST m) = RWST $ \r s ->
+                    liftIO (m r s)
 
 -- | Redirect to a POST resource.
 --
@@ -851,7 +818,7 @@ instance MonadTransControl (GGHandler s m) where
 -- POST form, and some Javascript to automatically submit the form. This can be
 -- useful when you need to post a plain link somewhere that needs to cause
 -- changes on the server.
-redirectToPost :: Monad mo => Route master -> GGHandler sub master mo a
+redirectToPost :: MonadIO mo => Route master -> GGHandler sub master mo a
 redirectToPost dest = hamletToRepHtml
 #if GHC7
             [hamlet|
@@ -895,13 +862,13 @@ getMessageRender = do
 
 cacheLookup :: Monad mo => CacheKey a -> GGHandler sub master mo (Maybe a)
 cacheLookup k = do
-    gs <- GHandler $ lift get
+    gs <- get
     return $ Cache.lookup k $ ghsCache gs
 
 cacheInsert :: Monad mo => CacheKey a -> a -> GGHandler sub master mo ()
-cacheInsert k v = GHandler $ lift $ modify $ \gs ->
+cacheInsert k v = modify $ \gs ->
     gs { ghsCache = Cache.insert k v $ ghsCache gs }
 
 cacheDelete :: Monad mo => CacheKey a -> GGHandler sub master mo ()
-cacheDelete k = GHandler $ lift $ modify $ \gs ->
+cacheDelete k = modify $ \gs ->
     gs { ghsCache = Cache.delete k $ ghsCache gs }

From 7619e4e9dd88c152d1e00b6fea073c3d52dc797f Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 5 Dec 2011 10:04:33 +0200
Subject: [PATCH 158/189] monad-control 0.3

---
 yesod-core/Yesod/Widget.hs  | 28 +++++++++++++++++++++++++++-
 yesod-core/yesod-core.cabal |  3 ++-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/yesod-core/Yesod/Widget.hs b/yesod-core/Yesod/Widget.hs
index ead6e285..a47d58cd 100644
--- a/yesod-core/Yesod/Widget.hs
+++ b/yesod-core/Yesod/Widget.hs
@@ -5,6 +5,7 @@
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE TypeSynonymInstances #-}
 {-# LANGUAGE UndecidableInstances #-}
+{-# LANGUAGE CPP #-}
 -- | Widgets combine HTML with JS and CSS dependencies with a unique identifier
 -- generator, allowing you to create truly modular HTML components.
 module Yesod.Widget
@@ -78,16 +79,41 @@ import qualified Data.Map as Map
 import Language.Haskell.TH.Quote (QuasiQuoter)
 import Language.Haskell.TH.Syntax (Q, Exp (InfixE, VarE, LamE), Pat (VarP), newName)
 
+#if MIN_VERSION_monad_control(0, 3, 0)
+import Control.Monad.Trans.Control (MonadTransControl (..), MonadBaseControl (..), defaultLiftBaseWith, defaultRestoreM, ComposeSt)
+#else
 import Control.Monad.IO.Control (MonadControlIO)
+#endif
 import qualified Text.Hamlet as NP
 import Data.Text.Lazy.Builder (fromLazyText)
 import Text.Blaze (toHtml, preEscapedLazyText)
+import Control.Monad.Base (MonadBase (liftBase))
 
 -- | A generic widget, allowing specification of both the subsite and master
 -- site datatypes. This is basically a large 'WriterT' stack keeping track of
 -- dependencies along with a 'StateT' to track unique identifiers.
 newtype GGWidget m monad a = GWidget { unGWidget :: GWInner m monad a }
-    deriving (Functor, Applicative, Monad, MonadIO, MonadControlIO)
+    deriving (Functor, Applicative, Monad, MonadIO
+#if !MIN_VERSION_monad_control(0, 3, 0)
+    , MonadControlIO
+#endif
+    )
+
+instance MonadBase b m => MonadBase b (GGWidget master m) where
+    liftBase = lift . liftBase
+#if MIN_VERSION_monad_control(0, 3, 0)
+instance MonadTransControl (GGWidget master) where
+    newtype StT (GGWidget master) a = StRWS {unStRWS :: (a, Int, GWData (Route master))}
+    liftWith f = GWidget $ RWST $ \r s -> liftM (\x -> (x, s, mempty))
+                                     (f $ \t -> liftM StRWS $ runRWST (unGWidget t) r s)
+    restoreT mSt = GWidget $ RWST $ \_ _ -> liftM unStRWS mSt
+    {-# INLINE liftWith #-}
+    {-# INLINE restoreT #-}
+instance MonadBaseControl b m => MonadBaseControl b (GGWidget master m) where
+     newtype StM (GGWidget master m) a = StMT {unStMT :: ComposeSt (GGWidget master) m a}
+     liftBaseWith = defaultLiftBaseWith StMT
+     restoreM     = defaultRestoreM   unStMT
+#endif
 
 instance MonadTrans (GGWidget m) where
     lift = GWidget . lift
diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index a79c4099..d42b5a9a 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -64,7 +64,8 @@ library
                    , old-locale            >= 1.0.0.2  && < 1.1
                    , failure               >= 0.1      && < 0.2
                    , containers            >= 0.2      && < 0.5
-                   , monad-control         >= 0.2      && < 0.3
+                   , monad-control         >= 0.2      && < 0.4
+                   , transformers-base     >= 0.4
                    , enumerator            >= 0.4.8    && < 0.5
                    , cookie                >= 0.3      && < 0.4
                    , blaze-html            >= 0.4.1.3  && < 0.5

From 37ab6737eeb7d45676f7cefdb120436adab52ba8 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 5 Dec 2011 11:18:14 +0200
Subject: [PATCH 159/189] monad-control 0.3 for yesod package

---
 yesod-core/yesod-core.cabal          | 2 +-
 yesod/Yesod.hs                       | 8 ++++++++
 yesod/scaffold/project.cabal.cg      | 5 ++++-
 yesod/scaffold/tiny/project.cabal.cg | 1 +
 yesod/yesod.cabal                    | 4 ++--
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index d42b5a9a..7a0ae43b 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -1,5 +1,5 @@
 name:            yesod-core
-version:         0.9.3.4
+version:         0.9.3.5
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
diff --git a/yesod/Yesod.hs b/yesod/Yesod.hs
index 7724a345..bdee5aeb 100644
--- a/yesod/Yesod.hs
+++ b/yesod/Yesod.hs
@@ -15,7 +15,11 @@ module Yesod
     , Application
     , lift
     , liftIO
+#if MIN_VERSION_monad_control(0, 3, 0)
+    , MonadBaseControl
+#else
     , MonadControlIO
+#endif
       -- * Utilities
     , showIntegral
     , readIntegral
@@ -50,7 +54,11 @@ import Network.Wai (Application)
 import Network.Wai.Middleware.Debug
 import Control.Monad.Trans.Class (lift)
 import Control.Monad.IO.Class (liftIO)
+#if MIN_VERSION_monad_control(0, 3, 0)
+import Control.Monad.Trans.Control (MonadBaseControl)
+#else
 import Control.Monad.IO.Control (MonadControlIO)
+#endif
 
 import Network.Wai.Handler.Warp (run)
 import System.IO (stderr, hPutStrLn)
diff --git a/yesod/scaffold/project.cabal.cg b/yesod/scaffold/project.cabal.cg
index 63e25d8a..0963ab21 100644
--- a/yesod/scaffold/project.cabal.cg
+++ b/yesod/scaffold/project.cabal.cg
@@ -46,6 +46,7 @@ library
                 TypeFamilies
                 GADTs
                 GeneralizedNewtypeDeriving
+                FlexibleContexts
 
 executable         ~project~
     if flag(devel)
@@ -69,9 +70,10 @@ executable         ~project~
                 TypeFamilies
                 GADTs
                 GeneralizedNewtypeDeriving
+                FlexibleContexts
 
     build-depends: base                          >= 4          && < 5
-                 , yesod                         >= 0.9        && < 0.10
+                 , yesod                         >= 0.9.3.4    && < 0.10
                  , yesod-core                    >= 0.9.3      && < 0.10
                  , yesod-auth                    >= 0.7.3      && < 0.8
                  , yesod-static                  >= 0.3.1      && < 0.4
@@ -89,3 +91,4 @@ executable         ~project~
                  , shakespeare-js                >= 0.10       && < 0.11
                  , shakespeare-text              >= 0.10       && < 0.11
                  , hjsmin                        >= 0.0.14     && < 0.1
+                 , monad-control                 >= 0.3        && < 0.4
diff --git a/yesod/scaffold/tiny/project.cabal.cg b/yesod/scaffold/tiny/project.cabal.cg
index 72fe6f2b..ab1855c0 100644
--- a/yesod/scaffold/tiny/project.cabal.cg
+++ b/yesod/scaffold/tiny/project.cabal.cg
@@ -76,4 +76,5 @@ executable         ~project~
                  , shakespeare-text              >= 0.10       && < 0.11
                  , wai                           >= 0.4.2      && < 0.5
                  , transformers                  >= 0.2        && < 0.3
+                 , monad-control                 >= 0.3        && < 0.4
 
diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index f72f884e..390457d1 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -1,5 +1,5 @@
 name:            yesod
-version:         0.9.3.3
+version:         0.9.3.4
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
@@ -76,7 +76,7 @@ library
                    , yesod-json                >= 0.2.2    && < 0.3
                    , yesod-persistent          >= 0.2      && < 0.3
                    , yesod-form                >= 0.3      && < 0.4
-                   , monad-control             >= 0.2      && < 0.3
+                   , monad-control             >= 0.2      && < 0.4
                    , transformers              >= 0.2.2    && < 0.3
                    , wai                       >= 0.4      && < 0.5
                    , wai-extra                 >= 0.4.1    && < 0.5

From f74956e5829ba0ab045cae8c7a704d2655f6479c Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 5 Dec 2011 13:24:40 +0200
Subject: [PATCH 160/189] Use monad-control 0.2 for MongoDB

---
 yesod/Scaffolding/Scaffolder.hs | 5 +++++
 yesod/scaffold/project.cabal.cg | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/yesod/Scaffolding/Scaffolder.hs b/yesod/Scaffolding/Scaffolder.hs
index 1fa68016..679285a6 100644
--- a/yesod/Scaffolding/Scaffolder.hs
+++ b/yesod/Scaffolding/Scaffolder.hs
@@ -118,6 +118,11 @@ scaffold = do
             then "                 , persistent-mongoDB >= 0.6.1 && < 0.7\n                 , mongoDB >= 1.1\n                 , bson >= 0.1.5\n"
             else "                 , persistent-" ++ backendLower ++ " >= 0.6 && < 0.7"
 
+        monadControlVersion =
+          if backend == MongoDB
+              then "== 0.2.*"
+              else "== 0.3.*"
+
 
     let fst3 (x, _, _) = x
     year <- show . fst3 . toGregorian . utctDay <$> getCurrentTime
diff --git a/yesod/scaffold/project.cabal.cg b/yesod/scaffold/project.cabal.cg
index 0963ab21..1b16d206 100644
--- a/yesod/scaffold/project.cabal.cg
+++ b/yesod/scaffold/project.cabal.cg
@@ -91,4 +91,4 @@ executable         ~project~
                  , shakespeare-js                >= 0.10       && < 0.11
                  , shakespeare-text              >= 0.10       && < 0.11
                  , hjsmin                        >= 0.0.14     && < 0.1
-                 , monad-control                 >= 0.3        && < 0.4
+                 , monad-control                 ~monadControlVersion~

From c6294148d4a3171e59f2b5ecec89840b535d767a Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 5 Dec 2011 16:18:32 +0200
Subject: [PATCH 161/189] GoogleEmail added to yesod-auth

---
 yesod-auth/Yesod/Auth/GoogleEmail.hs | 99 ++++++++++++++++++++++++++++
 yesod-auth/yesod-auth.cabal          |  3 +-
 2 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 yesod-auth/Yesod/Auth/GoogleEmail.hs

diff --git a/yesod-auth/Yesod/Auth/GoogleEmail.hs b/yesod-auth/Yesod/Auth/GoogleEmail.hs
new file mode 100644
index 00000000..f1e5075d
--- /dev/null
+++ b/yesod-auth/Yesod/Auth/GoogleEmail.hs
@@ -0,0 +1,99 @@
+{-# LANGUAGE QuasiQuotes #-}
+{-# LANGUAGE CPP #-}
+{-# LANGUAGE OverloadedStrings #-}
+-- | Use an email address as an identifier via Google's OpenID login system.
+--
+-- This backend will not use the OpenID identifier at all. It only uses OpenID
+-- as a login system. By using this plugin, you are trusting Google to validate
+-- an email address, and requiring users to have a Google account. On the plus
+-- side, you get to use email addresses as the identifier, many users have
+-- existing Google accounts, the login system has been long tested (as opposed
+-- to BrowserID), and it requires no credential managing or setup (as opposed
+-- to Email).
+module Yesod.Auth.GoogleEmail
+    ( authGoogleEmail
+    , forwardUrl
+    ) where
+
+import Yesod.Auth
+import qualified Web.Authenticate.OpenId as OpenId
+import Control.Monad.Attempt
+
+import Yesod.Form
+import Yesod.Handler
+import Yesod.Widget
+import Yesod.Request
+import Text.Blaze (toHtml)
+import Data.Text (Text)
+import qualified Yesod.Auth.Message as Msg
+import qualified Data.Text as T
+
+forwardUrl :: AuthRoute
+forwardUrl = PluginR "googleemail" ["forward"]
+
+authGoogleEmail :: YesodAuth m => AuthPlugin m
+authGoogleEmail =
+    AuthPlugin "googleemail" dispatch login
+  where
+    complete = PluginR "googleemail" ["complete"]
+    name = "openid_identifier"
+    login tm = do
+        [whamlet|
+<form method=get action=@{tm forwardUrl}>
+    <input type=hidden name=openid_identifier value=https://www.google.com/accounts/o8/id>
+    <input type=submit value=_{Msg.LoginTitle}>
+|]
+    dispatch "GET" ["forward"] = do
+        roid <- runInputGet $ iopt textField name
+        case roid of
+            Just oid -> do
+                render <- getUrlRender
+                toMaster <- getRouteToMaster
+                let complete' = render $ toMaster complete
+                res <- runAttemptT $ OpenId.getForwardUrl oid complete' Nothing
+                    [ ("openid.ax.type.email", "http://schema.openid.net/contact/email")
+                    , ("openid.ns.ax", "http://openid.net/srv/ax/1.0")
+                    , ("openid.ns.ax.required", "email")
+                    , ("openid.ax.mode", "fetch_request")
+                    , ("openid.ax.required", "email")
+                    , ("openid.ui.icon", "true")
+                    ]
+                attempt
+                  (\err -> do
+                        setMessage $ toHtml $ show err
+                        redirect RedirectTemporary $ toMaster LoginR
+                        )
+                  (redirectText RedirectTemporary)
+                  res
+            Nothing -> do
+                toMaster <- getRouteToMaster
+                setMessageI Msg.NoOpenID
+                redirect RedirectTemporary $ toMaster LoginR
+    dispatch "GET" ["complete", ""] = dispatch "GET" ["complete"] -- compatibility issues
+    dispatch "GET" ["complete"] = do
+        rr <- getRequest
+        completeHelper $ reqGetParams rr
+    dispatch "POST" ["complete", ""] = dispatch "POST" ["complete"] -- compatibility issues
+    dispatch "POST" ["complete"] = do
+        (posts, _) <- runRequestBody
+        completeHelper posts
+    dispatch _ _ = notFound
+
+completeHelper :: YesodAuth m => [(Text, Text)] -> GHandler Auth m ()
+completeHelper gets' = do
+        res <- runAttemptT $ OpenId.authenticate gets'
+        toMaster <- getRouteToMaster
+        let onFailure err = do
+            setMessage $ toHtml $ show err
+            redirect RedirectTemporary $ toMaster LoginR
+        let onSuccess (OpenId.Identifier ident, _) = do
+                memail <- lookupGetParam "openid.ext1.value.email"
+                case (memail, "https://www.google.com/accounts/o8/id" `T.isPrefixOf` ident) of
+                    (Just email, True) -> setCreds True $ Creds "openid" email []
+                    (_, False) -> do
+                        setMessage "Only Google login is supported"
+                        redirect RedirectTemporary $ toMaster LoginR
+                    (Nothing, _) -> do
+                        setMessage "No email address provided"
+                        redirect RedirectTemporary $ toMaster LoginR
+        attempt onFailure onSuccess res
diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal
index 72881010..86123675 100644
--- a/yesod-auth/yesod-auth.cabal
+++ b/yesod-auth/yesod-auth.cabal
@@ -1,5 +1,5 @@
 name:            yesod-auth
-version:         0.7.6.2
+version:         0.7.7
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman, Patrick Brisbin
@@ -58,6 +58,7 @@ library
                      Yesod.Auth.HashDB
                      Yesod.Auth.Message
                      Yesod.Auth.Kerberos
+                     Yesod.Auth.GoogleEmail
     ghc-options:     -Wall
     include-dirs: include
 

From e372e126b46a94a17486d8d6407b96bd6db62b23 Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Tue, 6 Dec 2011 08:30:12 -0300
Subject: [PATCH 162/189] fix test.hs reference

---
 yesod-core/test/test.hs     | 1 +
 yesod-core/yesod-core.cabal | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 120000 yesod-core/test/test.hs

diff --git a/yesod-core/test/test.hs b/yesod-core/test/test.hs
new file mode 120000
index 00000000..a2dc0374
--- /dev/null
+++ b/yesod-core/test/test.hs
@@ -0,0 +1 @@
+../test.hs
\ No newline at end of file
diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index 7a0ae43b..aff36b73 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -102,7 +102,7 @@ library
 
 test-suite tests
     type: exitcode-stdio-1.0
-    main-is: ../test.hs
+    main-is: test.hs
     hs-source-dirs: test
 
     if flag(ghc7)

From 09d26f8099a1f8de2e5a00679eba2776fb0fdd64 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Tue, 6 Dec 2011 12:53:21 +0200
Subject: [PATCH 163/189] Adding failing test case: headers after redirect

---
 yesod-core/test/YesodCoreTest/Exceptions.hs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/yesod-core/test/YesodCoreTest/Exceptions.hs b/yesod-core/test/YesodCoreTest/Exceptions.hs
index a65a6c28..0ebda270 100644
--- a/yesod-core/test/YesodCoreTest/Exceptions.hs
+++ b/yesod-core/test/YesodCoreTest/Exceptions.hs
@@ -7,11 +7,13 @@ import Test.Hspec
 import Test.Hspec.HUnit ()
 
 import Yesod.Core hiding (Request)
+import Network.Wai
 import Network.Wai.Test
 
 data Y = Y
 mkYesod "Y" [parseRoutes|
 / RootR GET
+/redirect RedirR GET
 |]
 
 instance Yesod Y where
@@ -22,9 +24,15 @@ instance Yesod Y where
 getRootR :: Handler ()
 getRootR = error "FOOBAR" >> return ()
 
+getRedirR :: Handler ()
+getRedirR = do
+    setHeader "foo" "bar"
+    redirect RedirectPermanent RootR
+
 exceptionsTest :: [Spec]
 exceptionsTest = describe "Test.Exceptions"
     [ it "500" case500
+    , it "redirect keeps headers" caseRedirect
     ]
 
 runner :: Session () -> IO ()
@@ -35,3 +43,9 @@ case500 = runner $ do
     res <- request defaultRequest
     assertStatus 500 res
     assertBody "FOOBAR" res
+
+caseRedirect :: IO ()
+caseRedirect = runner $ do
+    res <- request defaultRequest { pathInfo = ["redirect"] }
+    assertStatus 301 res
+    assertHeader "foo" "bar" res

From 168e301fee70f83d7e8041112b8f7eea4566d7d8 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Tue, 6 Dec 2011 13:42:02 +0200
Subject: [PATCH 164/189] Handler: RWS -> Reader, use an IORef for mutable
 state

---
 yesod-core/Yesod/Handler.hs | 106 +++++++++++++++++++++---------------
 1 file changed, 63 insertions(+), 43 deletions(-)

diff --git a/yesod-core/Yesod/Handler.hs b/yesod-core/Yesod/Handler.hs
index d8a75d84..ad410a97 100644
--- a/yesod-core/Yesod/Handler.hs
+++ b/yesod-core/Yesod/Handler.hs
@@ -132,7 +132,7 @@ import Control.Monad (liftM)
 
 import Control.Monad.IO.Class
 import Control.Monad.Trans.Class
-import Control.Monad.Trans.RWS
+import Control.Monad.Trans.Reader
 
 import System.IO
 import qualified Network.Wai as W
@@ -170,6 +170,7 @@ import Yesod.Internal.TestApi (catchIter)
 import qualified Yesod.Internal.Cache as Cache
 import Yesod.Internal.Cache (mkCacheKey, CacheKey)
 import Data.Typeable (Typeable)
+import qualified Data.IORef as I
 
 -- | The type-safe URLs associated with a site argument.
 type family Route a
@@ -184,6 +185,7 @@ data HandlerData sub master = HandlerData
     , handlerRoute    :: Maybe (Route sub)
     , handlerRender   :: Route master -> [(Text, Text)] -> Text
     , handlerToMaster :: Route sub -> Route master
+    , handlerState    :: I.IORef GHState
     }
 
 handlerSubData :: (Route sub -> Route master)
@@ -204,10 +206,23 @@ handlerSubDataMaybe tm ts route hd = hd
     , handlerRoute = route
     }
 
-withReaderT :: (HandlerData s m -> HandlerData s' m)
-            -> GGHandler s' m mo a
-            -> GGHandler s m mo a
-withReaderT f = withRWST (\r s -> (f r, s))
+get :: MonadIO monad => GGHandler sub master monad GHState
+get = do
+    hd <- ask
+    liftIO $ I.readIORef $ handlerState hd
+
+put :: MonadIO monad => GHState -> GGHandler sub master monad ()
+put g = do
+    hd <- ask
+    liftIO $ I.writeIORef (handlerState hd) g
+
+modify :: MonadIO monad => (GHState -> GHState) -> GGHandler sub master monad ()
+modify f = do
+    hd <- ask
+    liftIO $ I.atomicModifyIORef (handlerState hd) $ \g -> (f g, ())
+
+tell :: MonadIO monad => Endo [Header] -> GGHandler sub master monad ()
+tell hs = modify $ \g -> g { ghsHeaders = ghsHeaders g `mappend` hs }
 
 -- | Used internally for promoting subsite handler functions to master site
 -- handler functions. Should not be needed by users.
@@ -252,7 +267,7 @@ toMasterHandlerMaybe tm ts route = withReaderT (handlerSubDataMaybe tm ts route)
 -- 'WriterT' for headers and session, and an 'MEitherT' monad for handling
 -- special responses. It is declared as a newtype to make compiler errors more
 -- readable.
-type GGHandler sub master = RWST (HandlerData sub master) (Endo [Header]) GHState
+type GGHandler sub master = ReaderT (HandlerData sub master)
 
 type GHandler sub master = GGHandler sub master (Iteratee ByteString IO)
 
@@ -261,6 +276,7 @@ data GHState = GHState
     , ghsRBC :: Maybe RequestBodyContents
     , ghsIdent :: Int
     , ghsCache :: Cache.Cache
+    , ghsHeaders :: Endo [Header]
     }
 
 type SessionMap = Map.Map Text Text
@@ -367,6 +383,13 @@ runHandler handler mrender sroute tomr ma sa =
             case fromException e of
                 Just x -> x
                 Nothing -> InternalError $ T.pack $ show e
+    istate <- liftIO $ I.newIORef GHState
+        { ghsSession = initSession
+        , ghsRBC = Nothing
+        , ghsIdent = 1
+        , ghsCache = mempty
+        , ghsHeaders = mempty
+        }
     let hd = HandlerData
             { handlerRequest = rr
             , handlerSub = sa
@@ -374,16 +397,14 @@ runHandler handler mrender sroute tomr ma sa =
             , handlerRoute = sroute
             , handlerRender = mrender
             , handlerToMaster = tomr
+            , handlerState = istate
             }
-    let initSession' = GHState initSession Nothing 1 mempty
-    (contents', finalSession, headers) <- catchIter (
-        fmap (\(a, b, c) -> (Right a, ghsSession b, c))
-      $ runRWST handler hd initSession'
-        ) (\e -> return (
-                case fromException e of
-                    Just x -> Left x
-                    Nothing -> Left $ HCError $ toErrorHandler e
-                , initSession, mempty))
+    contents' <- catchIter (fmap Right $ runReaderT handler hd)
+        (\e -> return $ Left $ maybe (HCError $ toErrorHandler e) id
+                      $ fromException e)
+    state <- liftIO $ I.readIORef istate
+    let finalSession = ghsSession state
+    let headers = ghsHeaders state
     let contents = either id (HCContent H.status200 . chooseRep) contents'
     let handleError e = do
             yar <- unYesodApp (eh e) safeEh rr cts finalSession
@@ -452,16 +473,16 @@ ultDestKey = "_ULT"
 --
 -- An ultimate destination is stored in the user session and can be loaded
 -- later by 'redirectUltDest'.
-setUltDest :: Monad mo => Route master -> GGHandler sub master mo ()
+setUltDest :: MonadIO mo => Route master -> GGHandler sub master mo ()
 setUltDest dest = do
     render <- getUrlRender
     setUltDestString $ render dest
 
 -- | Same as 'setUltDest', but use the given string.
-setUltDestText :: Monad mo => Text -> GGHandler sub master mo ()
+setUltDestText :: MonadIO mo => Text -> GGHandler sub master mo ()
 setUltDestText = setSession ultDestKey
 
-setUltDestString :: Monad mo => Text -> GGHandler sub master mo ()
+setUltDestString :: MonadIO mo => Text -> GGHandler sub master mo ()
 setUltDestString = setSession ultDestKey
 {-# DEPRECATED setUltDestString "Use setUltDestText instead" #-}
 
@@ -469,7 +490,7 @@ setUltDestString = setSession ultDestKey
 --
 -- If this is a 404 handler, there is no current page, and then this call does
 -- nothing.
-setUltDest' :: Monad mo => GGHandler sub master mo ()
+setUltDest' :: MonadIO mo => GGHandler sub master mo ()
 setUltDest' = do
     route <- getCurrentRoute
     case route of
@@ -483,7 +504,7 @@ setUltDest' = do
 -- | Sets the ultimate destination to the referer request header, if present.
 --
 -- This function will not overwrite an existing ultdest.
-setUltDestReferer :: Monad mo => GGHandler sub master mo ()
+setUltDestReferer :: MonadIO mo => GGHandler sub master mo ()
 setUltDestReferer = do
     mdest <- lookupSession ultDestKey
     maybe
@@ -507,7 +528,7 @@ redirectUltDest rt def = do
     maybe (redirect rt def) (redirectText rt) mdest
 
 -- | Remove a previously set ultimate destination. See 'setUltDest'.
-clearUltDest :: Monad mo => GGHandler sub master mo ()
+clearUltDest :: MonadIO mo => GGHandler sub master mo ()
 clearUltDest = deleteSession ultDestKey
 
 msgKey :: Text
@@ -516,13 +537,13 @@ msgKey = "_MSG"
 -- | Sets a message in the user's session.
 --
 -- See 'getMessage'.
-setMessage :: Monad mo => Html -> GGHandler sub master mo ()
+setMessage :: MonadIO mo => Html -> GGHandler sub master mo ()
 setMessage = setSession msgKey . T.concat . TL.toChunks . Text.Blaze.Renderer.Text.renderHtml
 
 -- | Sets a message in the user's session.
 --
 -- See 'getMessage'.
-setMessageI :: (RenderMessage y msg, Monad mo) => msg -> GGHandler sub y mo ()
+setMessageI :: (RenderMessage y msg, MonadIO mo) => msg -> GGHandler sub y mo ()
 setMessageI msg = do
     mr <- getMessageRender
     setMessage $ toHtml $ mr msg
@@ -531,7 +552,7 @@ setMessageI msg = do
 -- variable.
 --
 -- See 'setMessage'.
-getMessage :: Monad mo => GGHandler sub master mo (Maybe Html)
+getMessage :: MonadIO mo => GGHandler sub master mo (Maybe Html)
 getMessage = do
     mmsg <- liftM (fmap preEscapedText) $ lookupSession msgKey
     deleteSession msgKey
@@ -613,7 +634,7 @@ invalidArgsI msg = do
 
 ------- Headers
 -- | Set the cookie on the client.
-setCookie :: Monad mo
+setCookie :: MonadIO mo
           => Int -- ^ minutes to timeout
           -> H.Ascii -- ^ key
           -> H.Ascii -- ^ value
@@ -621,22 +642,22 @@ setCookie :: Monad mo
 setCookie a b = addHeader . AddCookie a b
 
 -- | Unset the cookie on the client.
-deleteCookie :: Monad mo => H.Ascii -> GGHandler sub master mo ()
+deleteCookie :: MonadIO mo => H.Ascii -> GGHandler sub master mo ()
 deleteCookie = addHeader . DeleteCookie
 
 -- | Set the language in the user session. Will show up in 'languages' on the
 -- next request.
-setLanguage :: Monad mo => Text -> GGHandler sub master mo ()
+setLanguage :: MonadIO mo => Text -> GGHandler sub master mo ()
 setLanguage = setSession langKey
 
 -- | Set an arbitrary response header.
-setHeader :: Monad mo
+setHeader :: MonadIO mo
           => CI H.Ascii -> H.Ascii -> GGHandler sub master mo ()
 setHeader a = addHeader . Header a
 
 -- | Set the Cache-Control header to indicate this response should be cached
 -- for the given number of seconds.
-cacheSeconds :: Monad mo => Int -> GGHandler s m mo ()
+cacheSeconds :: MonadIO mo => Int -> GGHandler s m mo ()
 cacheSeconds i = setHeader "Cache-Control" $ S8.pack $ concat
     [ "max-age="
     , show i
@@ -645,16 +666,16 @@ cacheSeconds i = setHeader "Cache-Control" $ S8.pack $ concat
 
 -- | Set the Expires header to some date in 2037. In other words, this content
 -- is never (realistically) expired.
-neverExpires :: Monad mo => GGHandler s m mo ()
+neverExpires :: MonadIO mo => GGHandler s m mo ()
 neverExpires = setHeader "Expires" "Thu, 31 Dec 2037 23:55:55 GMT"
 
 -- | Set an Expires header in the past, meaning this content should not be
 -- cached.
-alreadyExpired :: Monad mo => GGHandler s m mo ()
+alreadyExpired :: MonadIO mo => GGHandler s m mo ()
 alreadyExpired = setHeader "Expires" "Thu, 01 Jan 1970 05:05:05 GMT"
 
 -- | Set an Expires header to the given date.
-expiresAt :: Monad mo => UTCTime -> GGHandler s m mo ()
+expiresAt :: MonadIO mo => UTCTime -> GGHandler s m mo ()
 expiresAt = setHeader "Expires" . encodeUtf8 . formatRFC1123
 
 -- | Set a variable in the user's session.
@@ -662,21 +683,21 @@ expiresAt = setHeader "Expires" . encodeUtf8 . formatRFC1123
 -- The session is handled by the clientsession package: it sets an encrypted
 -- and hashed cookie on the client. This ensures that all data is secure and
 -- not tampered with.
-setSession :: Monad mo
+setSession :: MonadIO mo
            => Text -- ^ key
            -> Text -- ^ value
            -> GGHandler sub master mo ()
 setSession k = modify . modSession . Map.insert k
 
 -- | Unsets a session variable. See 'setSession'.
-deleteSession :: Monad mo => Text -> GGHandler sub master mo ()
+deleteSession :: MonadIO mo => Text -> GGHandler sub master mo ()
 deleteSession = modify . modSession . Map.delete
 
 modSession :: (SessionMap -> SessionMap) -> GHState -> GHState
 modSession f x = x { ghsSession = f $ ghsSession x }
 
 -- | Internal use only, not to be confused with 'setHeader'.
-addHeader :: Monad mo => Header -> GGHandler sub master mo ()
+addHeader :: MonadIO mo => Header -> GGHandler sub master mo ()
 addHeader = tell . Endo . (:)
 
 getStatus :: ErrorResponse -> H.Status
@@ -702,13 +723,13 @@ localNoCurrent =
     local (\hd -> hd { handlerRoute = Nothing })
 
 -- | Lookup for session data.
-lookupSession :: Monad mo => Text -> GGHandler s m mo (Maybe Text)
+lookupSession :: MonadIO mo => Text -> GGHandler s m mo (Maybe Text)
 lookupSession n = do
     m <- liftM ghsSession get
     return $ Map.lookup n m
 
 -- | Get all session variables.
-getSession :: Monad mo => GGHandler s m mo SessionMap
+getSession :: MonadIO mo => GGHandler s m mo SessionMap
 getSession = liftM ghsSession get
 
 handlerToYAR :: (HasReps a, HasReps b)
@@ -799,7 +820,7 @@ headerToPair cp _ (DeleteCookie key) =
 headerToPair _ _ (Header key value) = (key, value)
 
 -- | Get a unique identifier.
-newIdent :: Monad mo => GGHandler sub master mo String -- FIXME use Text
+newIdent :: MonadIO mo => GGHandler sub master mo String -- FIXME use Text
 newIdent = do
     x <- get
     let i' = ghsIdent x + 1
@@ -809,8 +830,7 @@ newIdent = do
 liftIOHandler :: MonadIO mo
               => GGHandler sub master IO a
               -> GGHandler sub master mo a
-liftIOHandler (RWST m) = RWST $ \r s ->
-                    liftIO (m r s)
+liftIOHandler (ReaderT m) = ReaderT $ \r -> liftIO $ m r
 
 -- | Redirect to a POST resource.
 --
@@ -860,15 +880,15 @@ getMessageRender = do
     l <- reqLangs `liftM` getRequest
     return $ renderMessage m l
 
-cacheLookup :: Monad mo => CacheKey a -> GGHandler sub master mo (Maybe a)
+cacheLookup :: MonadIO mo => CacheKey a -> GGHandler sub master mo (Maybe a)
 cacheLookup k = do
     gs <- get
     return $ Cache.lookup k $ ghsCache gs
 
-cacheInsert :: Monad mo => CacheKey a -> a -> GGHandler sub master mo ()
+cacheInsert :: MonadIO mo => CacheKey a -> a -> GGHandler sub master mo ()
 cacheInsert k v = modify $ \gs ->
     gs { ghsCache = Cache.insert k v $ ghsCache gs }
 
-cacheDelete :: Monad mo => CacheKey a -> GGHandler sub master mo ()
+cacheDelete :: MonadIO mo => CacheKey a -> GGHandler sub master mo ()
 cacheDelete k = modify $ \gs ->
     gs { ghsCache = Cache.delete k $ ghsCache gs }

From 17d03183ed40ed0118e7e146463ba3cf20a49688 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Tue, 6 Dec 2011 13:45:47 +0200
Subject: [PATCH 165/189] yesod-core version bump

---
 yesod-core/yesod-core.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index aff36b73..e03a95b7 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -1,5 +1,5 @@
 name:            yesod-core
-version:         0.9.3.5
+version:         0.9.3.6
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>

From d39e0d9bfd06cf9f45b0db25b1801be53de97c7a Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Tue, 6 Dec 2011 13:58:41 +0200
Subject: [PATCH 166/189] Widget is a Writer

---
 yesod-core/Yesod/Internal/Core.hs |  4 ++--
 yesod-core/Yesod/Widget.hs        | 21 ++++++++++-----------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/yesod-core/Yesod/Internal/Core.hs b/yesod-core/Yesod/Internal/Core.hs
index e21580d2..29e1355a 100644
--- a/yesod-core/Yesod/Internal/Core.hs
+++ b/yesod-core/Yesod/Internal/Core.hs
@@ -46,7 +46,7 @@ import qualified Web.ClientSession as CS
 import qualified Data.ByteString.Char8 as S8
 import qualified Data.ByteString.Lazy as L
 import Data.Monoid
-import Control.Monad.Trans.RWS
+import Control.Monad.Trans.Writer (runWriterT)
 import Text.Hamlet
 import Text.Julius
 import Text.Blaze ((!), customAttribute, textTag, toValue, unsafeLazyByteString)
@@ -501,7 +501,7 @@ widgetToPageContent :: (Eq (Route master), Yesod master)
                     -> GHandler sub master (PageContent (Route master))
 widgetToPageContent (GWidget w) = do
     master <- getYesod
-    ((), _, GWData (Body body) (Last mTitle) scripts' stylesheets' style jscript (Head head')) <- runRWST w () 0
+    ((), GWData (Body body) (Last mTitle) scripts' stylesheets' style jscript (Head head')) <- runWriterT w
     let title = maybe mempty unTitle mTitle
     let scripts = runUniqueList scripts'
     let stylesheets = runUniqueList stylesheets'
diff --git a/yesod-core/Yesod/Widget.hs b/yesod-core/Yesod/Widget.hs
index a47d58cd..24918358 100644
--- a/yesod-core/Yesod/Widget.hs
+++ b/yesod-core/Yesod/Widget.hs
@@ -57,7 +57,7 @@ module Yesod.Widget
     ) where
 
 import Data.Monoid
-import Control.Monad.Trans.RWS
+import Control.Monad.Trans.Writer
 import qualified Text.Blaze.Html5 as H
 import Text.Hamlet
 import Text.Cassius
@@ -103,10 +103,11 @@ instance MonadBase b m => MonadBase b (GGWidget master m) where
     liftBase = lift . liftBase
 #if MIN_VERSION_monad_control(0, 3, 0)
 instance MonadTransControl (GGWidget master) where
-    newtype StT (GGWidget master) a = StRWS {unStRWS :: (a, Int, GWData (Route master))}
-    liftWith f = GWidget $ RWST $ \r s -> liftM (\x -> (x, s, mempty))
-                                     (f $ \t -> liftM StRWS $ runRWST (unGWidget t) r s)
-    restoreT mSt = GWidget $ RWST $ \_ _ -> liftM unStRWS mSt
+    newtype StT (GGWidget master) a =
+       StWidget {unStWidget :: StT (GWInner master) a}
+    liftWith f = GWidget $ liftWith $ \run ->
+                  f $ liftM StWidget . run . unGWidget
+    restoreT = GWidget . restoreT . liftM unStWidget
     {-# INLINE liftWith #-}
     {-# INLINE restoreT #-}
 instance MonadBaseControl b m => MonadBaseControl b (GGWidget master m) where
@@ -119,7 +120,7 @@ instance MonadTrans (GGWidget m) where
     lift = GWidget . lift
 
 type GWidget s m = GGWidget m (GHandler s m)
-type GWInner master = RWST () (GWData (Route master)) Int
+type GWInner master = WriterT (GWData (Route master))
 
 instance (Monad monad, a ~ ()) => Monoid (GGWidget master monad a) where
     mempty = return ()
@@ -129,9 +130,7 @@ addSubWidget :: (YesodSubRoute sub master) => sub -> GWidget sub master a -> GWi
 addSubWidget sub (GWidget w) = do
     master <- lift getYesod
     let sr = fromSubRoute sub master
-    s <- GWidget get
-    (a, s', w') <- lift $ toMasterHandlerMaybe sr (const sub) Nothing $ runRWST w () s
-    GWidget $ put s'
+    (a, w') <- lift $ toMasterHandlerMaybe sr (const sub) Nothing $ runWriterT w
     GWidget $ tell w'
     return a
 
@@ -299,9 +298,9 @@ addCoffeeBody c = do
 -- manipulations. It can be easier to use this sometimes than 'wrapWidget'.
 extractBody :: Monad mo => GGWidget m mo () -> GGWidget m mo (HtmlUrl (Route m))
 extractBody (GWidget w) =
-    GWidget $ mapRWST (liftM go) w
+    GWidget $ mapWriterT (liftM go) w
   where
-    go ((), s, GWData (Body h) b c d e f g) = (h, s, GWData (Body mempty) b c d e f g)
+    go ((), GWData (Body h) b c d e f g) = (h, GWData (Body mempty) b c d e f g)
 
 -- | Content for a web page. By providing this datatype, we can easily create
 -- generic site templates, which would have the type signature:

From 07509c08408ef94fa547346e6e718e33650baf10 Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Tue, 6 Dec 2011 09:22:40 -0300
Subject: [PATCH 167/189] fix yesod-static test configuration

https://github.com/yesodweb/yesod/issues/180
When the flag configuration is changed (-ftest and --enable-tests) for
testing, it doesn't get automatically recompiled. I added
'.' to hs-source-dirs for the test suite and the test used the code
directly instead of referencing the package.
---
 yesod-static/yesod-static.cabal | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/yesod-static/yesod-static.cabal b/yesod-static/yesod-static.cabal
index 5d137d0d..0e8e306c 100644
--- a/yesod-static/yesod-static.cabal
+++ b/yesod-static/yesod-static.cabal
@@ -45,14 +45,33 @@ library
     ghc-options:     -Wall
 
 test-suite tests
-    hs-source-dirs: test
-    main-is: ../tests.hs
+    hs-source-dirs: ., test
+    main-is: tests.hs
     type: exitcode-stdio-1.0
     cpp-options:   -DTEST
-    build-depends:   yesod-static
-                   , base >= 4 && < 5
-                   , hspec >= 0.8   && < 0.10
+    build-depends:
+                     hspec >= 0.8   && < 0.10
                    , HUnit
+                   -- copy from above
+                   , base                  >= 4        && < 5
+                   , containers            >= 0.2      && < 0.5
+                   , old-time              >= 1.0
+                   , yesod-core            >= 0.9      && < 0.10
+                   , base64-bytestring     >= 0.1.0.1  && < 0.2
+                   , pureMD5               >= 2.1.0.3  && < 2.2
+                   , cereal                >= 0.3      && < 0.4
+                   , bytestring            >= 0.9.1.4  && < 0.10
+                   , template-haskell
+                   , directory             >= 1.0      && < 1.2
+                   , transformers          >= 0.2.2    && < 0.3
+                   , wai-app-static        >= 0.3.2.1  && < 0.4
+                   , wai                   >= 0.4      && < 0.5
+                   , text                  >= 0.9      && < 0.12
+                   , file-embed            >= 0.0.4.1  && < 0.5
+                   , http-types            >= 0.6.5    && < 0.7
+                   , unix-compat           >= 0.2
+                   , enumerator            >= 0.4.8    && < 0.5
+
     ghc-options:     -Wall
 
 source-repository head

From 3fd51055365c3cd73908f787a3039e2b2b582399 Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Tue, 6 Dec 2011 09:28:37 -0300
Subject: [PATCH 168/189] bump authenticate in mega

---
 yesod-mega.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yesod-mega.cabal b/yesod-mega.cabal
index 7711da07..6418edaa 100644
--- a/yesod-mega.cabal
+++ b/yesod-mega.cabal
@@ -139,7 +139,7 @@ library
                    , cmdargs           >= 0.8   && < 0.9
 
                    -- yesod-auth
-                   , authenticate          >= 0.10      && < 0.11
+                   , authenticate          >= 0.10.3    && < 0.11
                    , control-monad-attempt >= 0.3.0     && < 0.4
                    , mime-mail             >= 0.3       && < 0.4
                    , SHA                   >= 1.4.1.3   && < 1.6

From fa520744dd07b10d3374a70b8f640aaaf3e558ea Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Wed, 7 Dec 2011 23:18:02 -0300
Subject: [PATCH 169/189] update install script

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index b626b414..cb3d0459 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit b626b414228dd4b948bb27e255a26b2f395a93a4
+Subproject commit cb3d04593fb5fcebf3f8eb1cd7b2a7af98efde8f

From 16167e7e6a1b3050ce23e691702e186f55d6882b Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Thu, 8 Dec 2011 08:44:28 -0300
Subject: [PATCH 170/189] fix shadow warning

---
 yesod-auth/Yesod/Auth.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yesod-auth/Yesod/Auth.hs b/yesod-auth/Yesod/Auth.hs
index d662e87d..0034ae5d 100644
--- a/yesod-auth/Yesod/Auth.hs
+++ b/yesod-auth/Yesod/Auth.hs
@@ -143,7 +143,7 @@ getCheckR = do
     creds <- maybeAuthId
     defaultLayoutJson (do
         setTitle "Authentication Status"
-        addHtml $ html' creds) (json' creds)
+        addHtml $ html' creds) (jsonCreds creds)
   where
     html' creds =
         [QQ(shamlet)|
@@ -153,7 +153,7 @@ $maybe _ <- creds
 $nothing
     <p>Not logged in.
 |]
-    json' creds =
+    jsonCreds creds =
         Object $ Map.fromList
             [ (T.pack "logged_in", Bool $ maybe False (const True) creds)
             ]

From 6d2b408b47d5d50a6b1eb0b6596b9f5e5e856be4 Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Thu, 8 Dec 2011 08:45:35 -0300
Subject: [PATCH 171/189] update install script

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index cb3d0459..5c174c61 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit cb3d04593fb5fcebf3f8eb1cd7b2a7af98efde8f
+Subproject commit 5c174c61daeca7430e75a3d32da2bf783eac7776

From 797f363623d9fd01525254ce41d61f32dae5f7fd Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Thu, 8 Dec 2011 09:52:26 -0300
Subject: [PATCH 172/189] cleanup README

---
 README.md | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 7faeca90..a3d1691b 100644
--- a/README.md
+++ b/README.md
@@ -54,16 +54,30 @@ Our installer script now uses cabal-src-install when it is available.
 
 ### Building Yesod
 
+#### guided installer
+~~~ { .bash }
+git clone http://github.com/yesodweb/install yesodweb && cd yesodweb
+cd install && cabal install --only-dependencies && cabal build && cd .. && install/dist/build/install/yesodweb-install
+~~~
+
+#### manual install
+
 ~~~ { .bash }
 # update your package database if you haven't recently
 cabal update
 # install required libraries
-cabal install Cabal cabal-install cabal-dev cabal-src virthualenv
+cabal install Cabal cabal-install cabal-src virthualenv
 
-# finally build Yesod.
-# this is completely sandboxed, except that it installs an unreleased vesion of cabal-dev
-git clone http://github.com/yesodweb/install yesodweb && cd yesodweb
-cd install && cabal-dev install && dist/build/install/install && cd ..
+# clone and install all repos
+# see below about first using virthualenv before running ./scripts/install
+for repo in hamlet persistent wai yesod; do
+  git clone http://github.com/yesodweb/$repo
+  (
+    cd $repo
+    git submodule update --init
+    ./scripts/install
+  )
+done
 ~~~
 
 ### Hacking on Yesod
@@ -78,17 +92,12 @@ cabal install virthualenv
 cd yesodweb
 virthualenv --name=yesod
 ./virthualenv/bin/activate
-
-# from the yesodweb directory, install the mega-mega repo to align all your dependencies
-cabal install
 ~~~
 
 #### individual cabal packages
 
-If you first install the mega repo, then it should be easier to work on an individual package rather than the mega.
-
 ~~~ { .bash }
-# build all packages individually
+# install and test all packages
 ./scripts/install
 
 # move to the individual package you are working on
@@ -106,9 +115,9 @@ cabal-dev works very well if you are working on a single package, but it can be
 
 ### Use your development version of Yesod in your application
 
-Note that we have told you to install Yesod into a sandboxed virthualenv or cabal-dev environment.
+Note that we have told you to install Yesod into a sandboxed virthualenv environment.
 This means it is not available through your user/global cabal database for your application.
-Instead you should use `cabal-dev add-source-list` to retrieve these packages.
+Instead you should use `cabal-dev install` to retrieve these packages.
 cd to your application directory, and the reference the source list.
 
 ~~~ { .bash }

From b5b5c54135665f06828a16e8e75beec2edbde973 Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Thu, 8 Dec 2011 09:52:52 -0300
Subject: [PATCH 173/189] remove installer reference

---
 README.md | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/README.md b/README.md
index a3d1691b..fb60373a 100644
--- a/README.md
+++ b/README.md
@@ -54,14 +54,6 @@ Our installer script now uses cabal-src-install when it is available.
 
 ### Building Yesod
 
-#### guided installer
-~~~ { .bash }
-git clone http://github.com/yesodweb/install yesodweb && cd yesodweb
-cd install && cabal install --only-dependencies && cabal build && cd .. && install/dist/build/install/yesodweb-install
-~~~
-
-#### manual install
-
 ~~~ { .bash }
 # update your package database if you haven't recently
 cabal update

From 0bca582b0121dd21984de53dbb7d6f346ed59ab3 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 12 Dec 2011 07:18:21 +0200
Subject: [PATCH 174/189] Fix Facebook

---
 yesod-auth/Yesod/Auth/Facebook.hs | 4 ++--
 yesod-auth/facebook.hs            | 1 -
 yesod-auth/yesod-auth.cabal       | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/yesod-auth/Yesod/Auth/Facebook.hs b/yesod-auth/Yesod/Auth/Facebook.hs
index f8715e63..3928eb07 100644
--- a/yesod-auth/Yesod/Auth/Facebook.hs
+++ b/yesod-auth/Yesod/Auth/Facebook.hs
@@ -67,8 +67,8 @@ parseCreds :: Text -> Value -> Data.Aeson.Types.Parser (Creds m)
 parseCreds at' (Object m) = do
     id' <- m .: "id"
     let id'' = "http://graph.facebook.com/" `mappend` id'
-    name <- m .: "name"
-    email <- m .: "email"
+    name <- m .:? "name"
+    email <- m .:? "email"
     return
         $ Creds "facebook" id''
         $ maybe id (\x -> (:) ("verifiedEmail", x)) email
diff --git a/yesod-auth/facebook.hs b/yesod-auth/facebook.hs
index c55e87b0..772570e8 100644
--- a/yesod-auth/facebook.hs
+++ b/yesod-auth/facebook.hs
@@ -10,7 +10,6 @@ import Web.Authenticate.Facebook
 import Yesod.Form
 
 data FB = FB Facebook
-type Handler = GHandler FB FB
 
 fb :: FB
 fb = FB Facebook
diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal
index 86123675..9ec0d42e 100644
--- a/yesod-auth/yesod-auth.cabal
+++ b/yesod-auth/yesod-auth.cabal
@@ -1,5 +1,5 @@
 name:            yesod-auth
-version:         0.7.7
+version:         0.7.7.1
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman, Patrick Brisbin

From 107062422b1048f806a71915fe76f32f0115689a Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Tue, 13 Dec 2011 16:48:37 +0200
Subject: [PATCH 175/189] Email backend: fix broken login redirects

---
 scripts                        | 2 +-
 yesod-auth/Yesod/Auth/Email.hs | 4 ++--
 yesod-auth/yesod-auth.cabal    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts b/scripts
index 5c174c61..b626b414 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 5c174c61daeca7430e75a3d32da2bf783eac7776
+Subproject commit b626b414228dd4b948bb27e255a26b2f395a93a4
diff --git a/yesod-auth/Yesod/Auth/Email.hs b/yesod-auth/Yesod/Auth/Email.hs
index 243af776..d6ae02a8 100644
--- a/yesod-auth/Yesod/Auth/Email.hs
+++ b/yesod-auth/Yesod/Auth/Email.hs
@@ -203,7 +203,7 @@ getPasswordR = do
         Just _ -> return ()
         Nothing -> do
             setMessageI Msg.BadSetPass
-            redirect RedirectTemporary $ toMaster loginR
+            redirect RedirectTemporary $ toMaster LoginR
     defaultLayout $ do
         setTitleI Msg.SetPassTitle
         addWidget
@@ -238,7 +238,7 @@ postPasswordR = do
     aid <- case maid of
             Nothing -> do
                 setMessageI Msg.BadSetPass
-                redirect RedirectTemporary $ toMaster loginR
+                redirect RedirectTemporary $ toMaster LoginR
             Just aid -> return aid
     salted <- liftIO $ saltPass new
     setPassword aid salted
diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal
index 9ec0d42e..782dddd4 100644
--- a/yesod-auth/yesod-auth.cabal
+++ b/yesod-auth/yesod-auth.cabal
@@ -1,5 +1,5 @@
 name:            yesod-auth
-version:         0.7.7.1
+version:         0.7.7.2
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman, Patrick Brisbin

From 569b6d86ed4fb140753a6b542e27f55d08bff958 Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Tue, 13 Dec 2011 15:54:45 -0300
Subject: [PATCH 176/189] update README

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index fb60373a..079d03a3 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,7 @@ An advanced web framework using the Haskell programming language. Featuring:
 cabal-dev creates a sandboxed environment for an individual cabal package.
 Your application is a cabal package and you should use cabal-dev with your Yesod application.
 Instead of using the `cabal` command, use the `cabal-dev` command.
+
 Use `yesod-devel --dev` when developing your application.
 
 ## Installing the latest development version from github

From 7dfc1b44ecfc378340e446f32c015de0cf160494 Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Tue, 13 Dec 2011 15:56:12 -0300
Subject: [PATCH 177/189] update scripts

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index b626b414..5c174c61 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit b626b414228dd4b948bb27e255a26b2f395a93a4
+Subproject commit 5c174c61daeca7430e75a3d32da2bf783eac7776

From 49f2da73ee3fbddd6eb180a2d718b4f236a0f1ec Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 14 Dec 2011 08:26:44 +0200
Subject: [PATCH 178/189] Deprecate Yesod.Config; more configurable config in
 yesod-default

---
 yesod-core/Yesod/Config.hs            |   1 +
 yesod-core/yesod-core.cabal           |   2 +-
 yesod-default/Yesod/Default/Config.hs | 186 ++++++++++++++++++++++++--
 yesod-default/Yesod/Default/Main.hs   |  15 ++-
 yesod-default/yesod-default.cabal     |   6 +-
 yesod/scaffold/Application.hs.cg      |   2 +-
 yesod/scaffold/Foundation.hs.cg       |   4 +-
 yesod/scaffold/Settings.hs.cg         |   2 +-
 yesod/scaffold/project.cabal.cg       |   4 +-
 yesod/scaffold/tiny/Application.hs.cg |   2 +-
 yesod/scaffold/tiny/Foundation.hs.cg  |   4 +-
 yesod/scaffold/tiny/Settings.hs.cg    |   2 +-
 yesod/scaffold/tiny/project.cabal.cg  |   2 +-
 yesod/yesod.cabal                     |   2 +-
 14 files changed, 199 insertions(+), 35 deletions(-)

diff --git a/yesod-core/Yesod/Config.hs b/yesod-core/Yesod/Config.hs
index 750893fe..e7bd4a11 100644
--- a/yesod-core/Yesod/Config.hs
+++ b/yesod-core/Yesod/Config.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 module Yesod.Config
+    {-# DEPRECATED "This code has been moved to yesod-default. This module will be removed in the next major version bump." #-}
     ( AppConfig(..)
     , loadConfig
     , withYamlEnvironment
diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index e03a95b7..723b5e71 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -1,5 +1,5 @@
 name:            yesod-core
-version:         0.9.3.6
+version:         0.9.4
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
diff --git a/yesod-default/Yesod/Default/Config.hs b/yesod-default/Yesod/Default/Config.hs
index 742967bb..4eef26b5 100644
--- a/yesod-default/Yesod/Default/Config.hs
+++ b/yesod-default/Yesod/Default/Config.hs
@@ -1,19 +1,27 @@
 {-# LANGUAGE DeriveDataTypeable #-}
+{-# LANGUAGE OverloadedStrings #-}
 module Yesod.Default.Config
-    ( DefaultEnv(..)
-    , ArgConfig(..)
-    , defaultArgConfig
+    ( DefaultEnv (..)
     , fromArgs
-    , fromArgsWith
+    , fromArgsExtra
     , loadDevelopmentConfig
 
     -- reexport
-    , module Yesod.Config
+    , AppConfig (..)
+    , ConfigSettings (..)
+    , configSettings
+    , loadConfig
+    , withYamlEnvironment
     ) where
 
-import Yesod.Config
 import Data.Char (toUpper, toLower)
 import System.Console.CmdArgs hiding (args)
+import Data.Text (Text)
+import qualified Data.Text as T
+import Control.Monad (join)
+import Data.Object
+import Data.Object.Yaml
+import Data.Maybe (fromMaybe)
 
 -- | A yesod-provided @'AppEnv'@, allows for Development, Testing, and
 --   Production environments
@@ -32,7 +40,8 @@ data ArgConfig = ArgConfig
 defaultArgConfig :: ArgConfig
 defaultArgConfig =
     ArgConfig
-        { environment = "development"
+        { environment = def
+            &= argPos 0
             &= help ("application environment, one of: " ++ environments)
             &= typ   "ENVIRONMENT"
         , port = def
@@ -48,11 +57,20 @@ defaultArgConfig =
 
 -- | Load an @'AppConfig'@ using the @'DefaultEnv'@ environments from
 --   commandline arguments.
-fromArgs :: IO (AppConfig DefaultEnv)
-fromArgs = fromArgsWith defaultArgConfig
+fromArgs :: IO (AppConfig DefaultEnv ())
+fromArgs = fromArgsExtra (const $ const $ return ())
 
-fromArgsWith :: (Read e, Show e) => ArgConfig -> IO (AppConfig e)
-fromArgsWith argConfig = do
+-- | Same as 'fromArgs', but allows you to specify how to parse the 'appExtra'
+-- record.
+fromArgsExtra :: (DefaultEnv -> TextObject -> IO extra)
+              -> IO (AppConfig DefaultEnv extra)
+fromArgsExtra = fromArgsWith defaultArgConfig
+
+fromArgsWith :: (Read env, Show env)
+             => ArgConfig
+             -> (env -> TextObject -> IO extra)
+             -> IO (AppConfig env extra)
+fromArgsWith argConfig getExtra = do
     args   <- cmdArgs argConfig
 
     env <-
@@ -60,7 +78,10 @@ fromArgsWith argConfig = do
             (e, _):_ -> return e
             [] -> error $ "Invalid environment: " ++ environment args
 
-    config <- loadConfig env
+    let cs = (configSettings env)
+                { csLoadExtra = getExtra
+                }
+    config <- loadConfig cs
 
     return $ if port args /= 0
                 then config { appPort = port args }
@@ -71,5 +92,142 @@ fromArgsWith argConfig = do
         capitalize (x:xs) = toUpper x : map toLower xs
 
 -- | Load your development config (when using @'DefaultEnv'@)
-loadDevelopmentConfig :: IO (AppConfig DefaultEnv)
-loadDevelopmentConfig = loadConfig Development
+loadDevelopmentConfig :: IO (AppConfig DefaultEnv ())
+loadDevelopmentConfig = loadConfig $ configSettings Development
+
+-- | Dynamic per-environment configuration which can be loaded at
+--   run-time negating the need to recompile between environments.
+data AppConfig environment extra = AppConfig
+    { appEnv   :: environment
+    , appPort  :: Int
+    , appRoot  :: Text
+    , appExtra :: extra
+    } deriving (Show)
+
+data ConfigSettings environment extra = ConfigSettings
+    {
+    -- | An arbitrary value, used below, to indicate the current running
+    -- environment. Usually, you will use 'DefaultEnv' for this type.
+       csEnv :: environment
+    -- | Load any extra data, to be used by the application.
+    , csLoadExtra :: environment -> TextObject -> IO extra
+    -- | Return the path to the YAML config file.
+    , csFile :: environment -> IO FilePath
+    -- | Get the sub-object (if relevant) from the given YAML source which
+    -- contains the specific settings for the current environment.
+    , csGetObject :: environment -> TextObject -> IO TextObject
+    }
+
+-- | Default config settings.
+configSettings :: Show env => env -> ConfigSettings env ()
+configSettings env0 = ConfigSettings
+    { csEnv = env0
+    , csLoadExtra = \_ _ -> return ()
+    , csFile = \_ -> return "config/settings.yml"
+    , csGetObject = \env obj -> do
+        envs <- fromMapping obj
+        let senv = show env
+            tenv = T.pack senv
+        maybe
+            (error $ "Could not find environment: " ++ senv)
+            return
+            (lookup tenv envs)
+    }
+
+-- | Load an @'AppConfig'@.
+--
+--   Some examples:
+--
+--   > -- typical local development
+--   > Development:
+--   >   host: localhost
+--   >   port: 3000
+--   >
+--   >   -- ssl: will default false
+--   >   -- approot: will default to "http://localhost:3000"
+--
+--   > -- typical outward-facing production box
+--   > Production:
+--   >   host: www.example.com
+--   >
+--   >   -- ssl: will default false
+--   >   -- port: will default 80
+--   >   -- approot: will default "http://www.example.com"
+--
+--   > -- maybe you're reverse proxying connections to the running app
+--   > -- on some other port
+--   > Production:
+--   >   port: 8080
+--   >   approot: "http://example.com"
+--   >
+--   > -- approot is specified so that the non-80 port is not appended
+--   > -- automatically.
+--
+loadConfig :: ConfigSettings environment extra
+           -> IO (AppConfig environment extra)
+loadConfig (ConfigSettings env loadExtra getFile getObject) = do
+    fp <- getFile env
+    topObj <- join $ decodeFile fp
+    obj <- getObject env topObj
+
+    m <- maybe (fail "Expected map") return $ fromMapping obj
+    let mssl     = lookupScalar "ssl"     m
+    let mhost    = lookupScalar "host"    m
+    let mport    = lookupScalar "port"    m
+    let mapproot = lookupScalar "approot" m
+
+    extra <- loadExtra env obj
+
+    -- set some default arguments
+    let ssl = maybe False toBool mssl
+    port' <- safeRead "port" $ fromMaybe (if ssl then "443" else "80") mport
+
+    approot <- case (mhost, mapproot) of
+        (_        , Just ar) -> return ar
+        (Just host, _      ) -> return $ T.concat
+            [ if ssl then "https://" else "http://"
+            , host
+            , addPort ssl port'
+            ]
+        _ -> fail "You must supply either a host or approot"
+
+    return $ AppConfig
+        { appEnv   = env
+        , appPort  = port'
+        , appRoot  = approot
+        , appExtra = extra
+        }
+
+    where
+        toBool :: Text -> Bool
+        toBool = (`elem` ["true", "TRUE", "yes", "YES", "Y", "1"])
+
+        addPort :: Bool -> Int -> Text
+        addPort True  443 = ""
+        addPort False 80  = ""
+        addPort _     p   = T.pack $ ':' : show p
+
+-- | Returns 'fail' if read fails
+safeRead :: Monad m => String -> Text -> m Int
+safeRead name' t = case reads s of
+    (i, _):_ -> return i
+    []       -> fail $ concat ["Invalid value for ", name', ": ", s]
+  where
+    s = T.unpack t
+
+-- | Loads the configuration block in the passed file named by the
+--   passed environment, yeilds to the passed function as a mapping.
+--
+--   Errors in the case of a bad load or if your function returns
+--   @Nothing@.
+withYamlEnvironment :: Show e
+                    => FilePath -- ^ the yaml file
+                    -> e        -- ^ the environment you want to load
+                    -> (TextObject -> IO a) -- ^ what to do with the mapping
+                    -> IO a
+withYamlEnvironment fp env f = do
+    obj <- join $ decodeFile fp
+    envs <- fromMapping obj
+    conf <- maybe (fail $ "Could not find environment: " ++ show env) return
+          $ lookup (T.pack $ show env) envs
+    f conf
diff --git a/yesod-default/Yesod/Default/Main.hs b/yesod-default/Yesod/Default/Main.hs
index 22d4bbcd..b4013077 100644
--- a/yesod-default/Yesod/Default/Main.hs
+++ b/yesod-default/Yesod/Default/Main.hs
@@ -7,7 +7,7 @@ module Yesod.Default.Main
     , defaultDevelAppWith
     ) where
 
-import Yesod.Core
+import Yesod.Core hiding (AppConfig (..))
 import Yesod.Default.Config
 import Yesod.Logger (Logger, makeLogger, logString, logLazyText, flushLogger)
 import Network.Wai (Application)
@@ -39,7 +39,10 @@ import Control.Concurrent.MVar (newEmptyMVar, putMVar, takeMVar)
 --   > main :: IO ()
 --   > main = defaultMain (fromArgsWith customArgConfig) withMySite
 --
-defaultMain :: (Show e, Read e) => IO (AppConfig e) -> (AppConfig e -> Logger -> (Application -> IO ()) -> IO ()) -> IO ()
+defaultMain :: (Show env, Read env)
+            => IO (AppConfig env extra)
+            -> (AppConfig env extra -> Logger -> (Application -> IO ()) -> IO ())
+            -> IO ()
 defaultMain load withSite = do
     config <- load
     logger <- makeLogger
@@ -85,7 +88,7 @@ defaultRunner f h = do
 --   > withDevelAppPort :: Dynamic
 --   > withDevelAppPort = toDyn $ defaultDevelApp withMySite
 --
-defaultDevelApp :: (AppConfig DefaultEnv -> Logger -> (Application -> IO ()) -> IO ())
+defaultDevelApp :: (AppConfig DefaultEnv () -> Logger -> (Application -> IO ()) -> IO ())
                 -> ((Int, Application) -> IO ())
                 -> IO ()
 defaultDevelApp = defaultDevelAppWith loadDevelopmentConfig
@@ -96,9 +99,9 @@ defaultDevelApp = defaultDevelAppWith loadDevelopmentConfig
 --   > withDevelAppPort :: Dynamic
 --   > withDevelAppPort = toDyn $ (defaultDevelAppWith customLoadAppConfig) withMySite
 --
-defaultDevelAppWith :: (Show e, Read e)
-                    => IO (AppConfig e) -- ^ A means to load your development @'AppConfig'@
-                    -> (AppConfig e -> Logger -> (Application -> IO ()) -> IO ()) -- ^ Your @withMySite@ function
+defaultDevelAppWith :: (Show env, Read env)
+                    => IO (AppConfig env extra) -- ^ A means to load your development @'AppConfig'@
+                    -> (AppConfig env extra -> Logger -> (Application -> IO ()) -> IO ()) -- ^ Your @withMySite@ function
                     -> ((Int, Application) -> IO ()) -> IO ()
 defaultDevelAppWith load withSite f = do
         conf   <- load
diff --git a/yesod-default/yesod-default.cabal b/yesod-default/yesod-default.cabal
index 90370c50..d0956de2 100644
--- a/yesod-default/yesod-default.cabal
+++ b/yesod-default/yesod-default.cabal
@@ -1,5 +1,5 @@
 name:            yesod-default
-version:         0.4.1
+version:         0.5.0
 license:         BSD3
 license-file:    LICENSE
 author:          Patrick Brisbin
@@ -18,7 +18,7 @@ library
         cpp-options: -DWINDOWS
 
     build-depends:   base                  >= 4     && < 5
-                   , yesod-core            >= 0.9   && < 0.10
+                   , yesod-core            >= 0.9.4 && < 0.10
                    , cmdargs               >= 0.8
                    , warp                  >= 0.4   && < 0.5
                    , wai                   >= 0.4   && < 0.5
@@ -30,6 +30,8 @@ library
                    , shakespeare-css       >= 0.10  && < 0.11
                    , shakespeare-js        >= 0.10  && < 0.11
                    , template-haskell
+                   , data-object           >= 0.3      && < 0.4
+                   , data-object-yaml      >= 0.3      && < 0.4
 
     if !os(windows)
          build-depends: unix
diff --git a/yesod/scaffold/Application.hs.cg b/yesod/scaffold/Application.hs.cg
index 5914c84c..a371a13e 100644
--- a/yesod/scaffold/Application.hs.cg
+++ b/yesod/scaffold/Application.hs.cg
@@ -27,7 +27,7 @@ mkYesodDispatch "~sitearg~" resources~sitearg~
 -- performs initialization and creates a WAI application. This is also the
 -- place to put your migrate statements to have automatic database
 -- migrations handled by Yesod.
-with~sitearg~ :: AppConfig DefaultEnv -> Logger -> (Application -> IO ()) -> IO ()
+with~sitearg~ :: AppConfig DefaultEnv () -> Logger -> (Application -> IO ()) -> IO ()
 with~sitearg~ conf logger f = do
 #ifdef PRODUCTION
     s <- static Settings.staticDir
diff --git a/yesod/scaffold/Foundation.hs.cg b/yesod/scaffold/Foundation.hs.cg
index a6ff5173..5ab6f4f5 100644
--- a/yesod/scaffold/Foundation.hs.cg
+++ b/yesod/scaffold/Foundation.hs.cg
@@ -16,7 +16,7 @@ module Foundation
     ) where
 
 import Prelude
-import Yesod hiding (Form)
+import Yesod hiding (Form, AppConfig (..), withYamlEnvironment)
 import Yesod.Static (Static, base64md5, StaticRoute(..))
 import Settings.StaticFiles
 import Yesod.Auth
@@ -44,7 +44,7 @@ import qualified Data.Text.Lazy.Encoding
 -- starts running, such as database connections. Every handler will have
 -- access to the data present here.
 data ~sitearg~ = ~sitearg~
-    { settings :: AppConfig DefaultEnv
+    { settings :: AppConfig DefaultEnv ()
     , getLogger :: Logger
     , getStatic :: Static -- ^ Settings for static file serving.
     , connPool :: Database.Persist.Base.PersistConfigPool Settings.PersistConfig -- ^ Database connection pool.
diff --git a/yesod/scaffold/Settings.hs.cg b/yesod/scaffold/Settings.hs.cg
index ad7edac5..00e19213 100644
--- a/yesod/scaffold/Settings.hs.cg
+++ b/yesod/scaffold/Settings.hs.cg
@@ -41,7 +41,7 @@ staticDir = "static"
 -- have to make a corresponding change here.
 --
 -- To see how this value is used, see urlRenderOverride in Foundation.hs
-staticRoot :: AppConfig DefaultEnv ->  Text
+staticRoot :: AppConfig DefaultEnv x ->  Text
 staticRoot conf = [~qq~st|#{appRoot conf}/static|]
 
 
diff --git a/yesod/scaffold/project.cabal.cg b/yesod/scaffold/project.cabal.cg
index 1b16d206..27eb73a4 100644
--- a/yesod/scaffold/project.cabal.cg
+++ b/yesod/scaffold/project.cabal.cg
@@ -77,9 +77,9 @@ executable         ~project~
                  , yesod-core                    >= 0.9.3      && < 0.10
                  , yesod-auth                    >= 0.7.3      && < 0.8
                  , yesod-static                  >= 0.3.1      && < 0.4
-                 , yesod-default                 >= 0.4        && < 0.5
+                 , yesod-default                 >= 0.5        && < 0.6
                  , yesod-form                    >= 0.3.4      && < 0.4
-                 , mime-mail                     >= 0.3.0.3    && < 0.4
+                 , mime-mail                     >= 0.3.0.3    && < 0.5
                  , clientsession                 >= 0.7.3      && < 0.8
                  , bytestring                    >= 0.9        && < 0.10
                  , text                          >= 0.11       && < 0.12
diff --git a/yesod/scaffold/tiny/Application.hs.cg b/yesod/scaffold/tiny/Application.hs.cg
index 47ce7469..21911c76 100644
--- a/yesod/scaffold/tiny/Application.hs.cg
+++ b/yesod/scaffold/tiny/Application.hs.cg
@@ -26,7 +26,7 @@ mkYesodDispatch "~sitearg~" resources~sitearg~
 -- performs initialization and creates a WAI application. This is also the
 -- place to put your migrate statements to have automatic database
 -- migrations handled by Yesod.
-with~sitearg~ :: AppConfig DefaultEnv -> Logger -> (Application -> IO ()) -> IO ()
+with~sitearg~ :: AppConfig DefaultEnv () -> Logger -> (Application -> IO ()) -> IO ()
 with~sitearg~ conf logger f = do
 #ifdef PRODUCTION
     s <- static Settings.staticDir
diff --git a/yesod/scaffold/tiny/Foundation.hs.cg b/yesod/scaffold/tiny/Foundation.hs.cg
index 868d8fcd..17326b0b 100644
--- a/yesod/scaffold/tiny/Foundation.hs.cg
+++ b/yesod/scaffold/tiny/Foundation.hs.cg
@@ -13,7 +13,7 @@ module Foundation
     ) where
 
 import Prelude
-import Yesod.Core
+import Yesod.Core hiding (AppConfig (..))
 import Yesod.Default.Config
 import Yesod.Default.Util (addStaticContentExternal)
 import Yesod.Static (Static, base64md5, StaticRoute(..))
@@ -31,7 +31,7 @@ import Text.Hamlet (hamletFile)
 -- starts running, such as database connections. Every handler will have
 -- access to the data present here.
 data ~sitearg~ = ~sitearg~
-    { settings :: AppConfig DefaultEnv
+    { settings :: AppConfig DefaultEnv ()
     , getLogger :: Logger
     , getStatic :: Static -- ^ Settings for static file serving.
     }
diff --git a/yesod/scaffold/tiny/Settings.hs.cg b/yesod/scaffold/tiny/Settings.hs.cg
index 5deb3cc7..8d21e88f 100644
--- a/yesod/scaffold/tiny/Settings.hs.cg
+++ b/yesod/scaffold/tiny/Settings.hs.cg
@@ -34,7 +34,7 @@ staticDir = "static"
 -- have to make a corresponding change here.
 --
 -- To see how this value is used, see urlRenderOverride in ~project~.hs
-staticRoot :: AppConfig DefaultEnv ->  Text
+staticRoot :: AppConfig DefaultEnv a ->  Text
 staticRoot conf = [~qq~st|#{appRoot conf}/static|]
 
 widgetFile :: String -> Q Exp
diff --git a/yesod/scaffold/tiny/project.cabal.cg b/yesod/scaffold/tiny/project.cabal.cg
index ab1855c0..057f367e 100644
--- a/yesod/scaffold/tiny/project.cabal.cg
+++ b/yesod/scaffold/tiny/project.cabal.cg
@@ -67,7 +67,7 @@ executable         ~project~
     build-depends: base                          >= 4          && < 5
                  , yesod-core                    >= 0.9.3      && < 0.10
                  , yesod-static                  >= 0.3.1      && < 0.4
-                 , yesod-default                 >= 0.4        && < 0.5
+                 , yesod-default                 >= 0.5        && < 0.6
                  , clientsession                 >= 0.7.3      && < 0.8
                  , bytestring                    >= 0.9        && < 0.10
                  , text                          >= 0.11       && < 0.12
diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index 390457d1..1eda612a 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -1,5 +1,5 @@
 name:            yesod
-version:         0.9.3.4
+version:         0.9.4
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>

From a1dc16b364e8e18578b8784cc1c0297f5fbd3864 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 14 Dec 2011 08:30:43 +0200
Subject: [PATCH 179/189] Hide a deprecation warning

---
 yesod-core/Yesod/Core.hs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/yesod-core/Yesod/Core.hs b/yesod-core/Yesod/Core.hs
index 2e395856..4a78bec7 100644
--- a/yesod-core/Yesod/Core.hs
+++ b/yesod-core/Yesod/Core.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE TemplateHaskell #-}
+{-# OPTIONS_GHC -fno-warn-warnings-deprecations #-}
 module Yesod.Core
     ( -- * Type classes
       Yesod (..)

From 7e643d68484153ebe03cb455bb5f80f5ca2dec27 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 14 Dec 2011 08:30:57 +0200
Subject: [PATCH 180/189] Yesod.Message moved to shakespeare-i18n

---
 yesod-core/Yesod/Message.hs | 258 +-----------------------------------
 yesod-core/yesod-core.cabal |   1 +
 2 files changed, 3 insertions(+), 256 deletions(-)

diff --git a/yesod-core/Yesod/Message.hs b/yesod-core/Yesod/Message.hs
index b84f3e86..aa4fb749 100644
--- a/yesod-core/Yesod/Message.hs
+++ b/yesod-core/Yesod/Message.hs
@@ -1,259 +1,5 @@
-{-# LANGUAGE TemplateHaskell #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
-{-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE TypeSynonymInstances #-}
-{-# LANGUAGE ExistentialQuantification #-}
 module Yesod.Message
-    ( mkMessage
-    , RenderMessage (..)
-    , ToMessage (..)
-    , SomeMessage (..)
+    ( module Text.Shakespeare.I18N
     ) where
 
-import Language.Haskell.TH.Syntax
-import Data.Text (Text, pack, unpack)
-import System.Directory
-import Data.Maybe (catMaybes)
-import Data.List (isSuffixOf, sortBy, foldl')
-import qualified Data.ByteString as S
-import Data.Text.Encoding (decodeUtf8)
-import Data.Char (isSpace, toLower, toUpper)
-import Data.Ord (comparing)
-import Text.Shakespeare.Base (Deref (..), Ident (..), parseHash, derefToExp)
-import Text.ParserCombinators.Parsec (parse, many, eof, many1, noneOf, (<|>))
-import Control.Arrow ((***))
-import Data.Monoid (mempty, mappend)
-import qualified Data.Text as T
-import Data.String (IsString (fromString))
-
-class ToMessage a where
-    toMessage :: a -> Text
-instance ToMessage Text where
-    toMessage = id
-instance ToMessage String where
-    toMessage = Data.Text.pack
-
-class RenderMessage master message where
-    renderMessage :: master
-                  -> [Text] -- ^ languages
-                  -> message
-                  -> Text
-
-instance RenderMessage master Text where
-    renderMessage _ _ = id
-
-type Lang = Text
-
-mkMessage :: String
-          -> FilePath
-          -> Lang
-          -> Q [Dec]
-mkMessage dt folder lang = do
-    files <- qRunIO $ getDirectoryContents folder
-    contents <- qRunIO $ fmap catMaybes $ mapM (loadLang folder) files
-    sdef <-
-        case lookup lang contents of
-            Nothing -> error $ "Did not find main language file: " ++ unpack lang
-            Just def -> toSDefs def
-    mapM_ (checkDef sdef) $ map snd contents
-    let dt' = ConT $ mkName dt
-    let mname = mkName $ dt ++ "Message"
-    c1 <- fmap concat $ mapM (toClauses dt) contents
-    c2 <- mapM (sToClause dt) sdef
-    c3 <- defClause
-    return
-        [ DataD [] mname [] (map (toCon dt) sdef) []
-        , InstanceD
-            []
-            (ConT ''RenderMessage `AppT` dt' `AppT` ConT mname)
-            [ FunD (mkName "renderMessage") $ c1 ++ c2 ++ [c3]
-            ]
-        ]
-
-toClauses :: String -> (Lang, [Def]) -> Q [Clause]
-toClauses dt (lang, defs) =
-    mapM go defs
-  where
-    go def = do
-        a <- newName "lang"
-        (pat, bod) <- mkBody dt (constr def) (map fst $ vars def) (content def)
-        guard <- fmap NormalG [|$(return $ VarE a) == pack $(lift $ unpack lang)|]
-        return $ Clause
-            [WildP, ConP (mkName ":") [VarP a, WildP], pat]
-            (GuardedB [(guard, bod)])
-            []
-
-mkBody :: String -- ^ datatype
-       -> String -- ^ constructor
-       -> [String] -- ^ variable names
-       -> [Content]
-       -> Q (Pat, Exp)
-mkBody dt cs vs ct = do
-    vp <- mapM go vs
-    let pat = RecP (mkName $ "Msg" ++ cs) (map (varName dt *** VarP) vp)
-    let ct' = map (fixVars vp) ct
-    pack' <- [|Data.Text.pack|]
-    tomsg <- [|toMessage|]
-    let ct'' = map (toH pack' tomsg) ct'
-    mapp <- [|mappend|]
-    let app a b = InfixE (Just a) mapp (Just b)
-    e <-
-        case ct'' of
-            [] -> [|mempty|]
-            [x] -> return x
-            (x:xs) -> return $ foldl' app x xs
-    return (pat, e)
-  where
-    toH pack' _ (Raw s) = pack' `AppE` SigE (LitE (StringL s)) (ConT ''String)
-    toH _ tomsg (Var d) = tomsg `AppE` derefToExp [] d
-    go x = do
-        let y = mkName $ '_' : x
-        return (x, y)
-    fixVars vp (Var d) = Var $ fixDeref vp d
-    fixVars _ (Raw s) = Raw s
-    fixDeref vp (DerefIdent (Ident i)) = DerefIdent $ Ident $ fixIdent vp i
-    fixDeref vp (DerefBranch a b) = DerefBranch (fixDeref vp a) (fixDeref vp b)
-    fixDeref _ d = d
-    fixIdent vp i =
-        case lookup i vp of
-            Nothing -> i
-            Just y -> nameBase y
-
-sToClause :: String -> SDef -> Q Clause
-sToClause dt sdef = do
-    (pat, bod) <- mkBody dt (sconstr sdef) (map fst $ svars sdef) (scontent sdef)
-    return $ Clause
-        [WildP, ConP (mkName "[]") [], pat]
-        (NormalB bod)
-        []
-
-defClause :: Q Clause
-defClause = do
-    a <- newName "sub"
-    c <- newName "langs"
-    d <- newName "msg"
-    rm <- [|renderMessage|]
-    return $ Clause
-        [VarP a, ConP (mkName ":") [WildP, VarP c], VarP d]
-        (NormalB $ rm `AppE` VarE a `AppE` VarE c `AppE` VarE d)
-        []
-
-toCon :: String -> SDef -> Con
-toCon dt (SDef c vs _) =
-    RecC (mkName $ "Msg" ++ c) $ map go vs
-  where
-    go (n, t) = (varName dt n, NotStrict, ConT $ mkName t)
-
-varName :: String -> String -> Name
-varName a y =
-    mkName $ concat [lower a, "Message", upper y]
-  where
-    lower (x:xs) = toLower x : xs
-    lower [] = []
-    upper (x:xs) = toUpper x : xs
-    upper [] = []
-
-checkDef :: [SDef] -> [Def] -> Q ()
-checkDef x y =
-    go (sortBy (comparing sconstr) x) (sortBy (comparing constr) y)
-  where
-    go _ [] = return ()
-    go [] (b:_) = error $ "Extra message constructor: " ++ constr b
-    go (a:as) (b:bs)
-        | sconstr a < constr b = go as (b:bs)
-        | sconstr a > constr b = error $ "Extra message constructor: " ++ constr b
-        | otherwise = do
-            go' (svars a) (vars b)
-            go as bs
-    go' ((an, at):as) ((bn, mbt):bs)
-        | an /= bn = error "Mismatched variable names"
-        | otherwise =
-            case mbt of
-                Nothing -> go' as bs
-                Just bt
-                    | at == bt -> go' as bs
-                    | otherwise -> error "Mismatched variable types"
-    go' [] [] = return ()
-    go' _ _ = error "Mistmached variable count"
-
-toSDefs :: [Def] -> Q [SDef]
-toSDefs = mapM toSDef
-
-toSDef :: Def -> Q SDef
-toSDef d = do
-    vars' <- mapM go $ vars d
-    return $ SDef (constr d) vars' (content d)
-  where
-    go (a, Just b) = return (a, b)
-    go (a, Nothing) = error $ "Main language missing type for " ++ show (constr d, a)
-
-data SDef = SDef
-    { sconstr :: String
-    , svars :: [(String, String)]
-    , scontent :: [Content]
-    }
-
-data Def = Def
-    { constr :: String
-    , vars :: [(String, Maybe String)]
-    , content :: [Content]
-    }
-
-loadLang :: FilePath -> FilePath -> IO (Maybe (Lang, [Def]))
-loadLang folder file = do
-    let file' = folder ++ '/' : file
-    e <- doesFileExist file'
-    if e && ".msg" `isSuffixOf` file
-        then do
-            let lang = pack $ reverse $ drop 4 $ reverse file
-            bs <- S.readFile file'
-            let s = unpack $ decodeUtf8 bs
-            defs <- fmap catMaybes $ mapM parseDef $ lines s
-            return $ Just (lang, defs)
-        else return Nothing
-
-parseDef :: String -> IO (Maybe Def)
-parseDef "" = return Nothing
-parseDef ('#':_) = return Nothing
-parseDef s =
-    case end of
-        ':':end' -> do
-            content' <- fmap compress $ parseContent $ dropWhile isSpace end'
-            case words begin of
-                [] -> error $ "Missing constructor: " ++ s
-                (w:ws) -> return $ Just Def
-                            { constr = w
-                            , vars = map parseVar ws
-                            , content = content'
-                            }
-        _ -> error $ "Missing colon: " ++ s
-  where
-    (begin, end) = break (== ':') s
-
-data Content = Var Deref | Raw String
-
-compress :: [Content] -> [Content]
-compress [] = []
-compress (Raw a:Raw b:rest) = compress $ Raw (a ++ b) : rest
-compress (x:y) = x : compress y
-
-parseContent :: String -> IO [Content]
-parseContent s =
-    either (error . show) return $ parse go s s
-  where
-    go = do
-        x <- many go'
-        eof
-        return x
-    go' = (Raw `fmap` many1 (noneOf "#")) <|> (fmap (either Raw Var) parseHash)
-
-parseVar :: String -> (String, Maybe String)
-parseVar s =
-    case break (== '@') s of
-        (x, '@':y) -> (x, Just y)
-        _ -> (s, Nothing)
-
-data SomeMessage master = forall msg. RenderMessage master msg => SomeMessage msg
-
-instance IsString (SomeMessage master) where
-    fromString = SomeMessage . T.pack
+import Text.Shakespeare.I18N
diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index 723b5e71..f50af8bc 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -56,6 +56,7 @@ library
                    , shakespeare           >= 0.10     && < 0.11
                    , shakespeare-js        >= 0.10     && < 0.11
                    , shakespeare-css       >= 0.10     && < 0.11
+                   , shakespeare-i18n      >= 0.0      && < 0.1
                    , blaze-builder         >= 0.2.1.4  && < 0.4
                    , transformers          >= 0.2.2    && < 0.3
                    , clientsession         >= 0.7.3.1  && < 0.8

From 4ed96e82aca1ad1d5bdba0ea5958739a619468ad Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 14 Dec 2011 08:52:07 +0200
Subject: [PATCH 181/189] production -> dev, devel -> library-only, debug ->
 reload

---
 yesod-core/yesod-core.cabal           |  4 ++--
 yesod-default/Yesod/Default/Util.hs   | 24 ++++++++++++------------
 yesod-default/yesod-default.cabal     |  4 ++--
 yesod/Devel.hs                        | 14 ++++++++++++--
 yesod/scaffold/Application.hs.cg      |  6 +++---
 yesod/scaffold/Foundation.hs.cg       | 12 ++++++------
 yesod/scaffold/Settings.hs.cg         |  6 +++---
 yesod/scaffold/deploy/Procfile.cg     |  4 ++--
 yesod/scaffold/project.cabal.cg       | 13 +++++++------
 yesod/scaffold/tiny/Application.hs.cg |  6 +++---
 yesod/scaffold/tiny/Settings.hs.cg    |  6 +++---
 yesod/scaffold/tiny/project.cabal.cg  | 19 ++++++++++---------
 12 files changed, 65 insertions(+), 53 deletions(-)
 mode change 100755 => 100644 yesod/Devel.hs

diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index f50af8bc..38963689 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -54,8 +54,8 @@ library
                    , path-pieces           >= 0.0      && < 0.1
                    , hamlet                >= 0.10     && < 0.11
                    , shakespeare           >= 0.10     && < 0.11
-                   , shakespeare-js        >= 0.10     && < 0.11
-                   , shakespeare-css       >= 0.10     && < 0.11
+                   , shakespeare-js        >= 0.10.4   && < 0.11
+                   , shakespeare-css       >= 0.10.5   && < 0.11
                    , shakespeare-i18n      >= 0.0      && < 0.1
                    , blaze-builder         >= 0.2.1.4  && < 0.4
                    , transformers          >= 0.2.2    && < 0.3
diff --git a/yesod-default/Yesod/Default/Util.hs b/yesod-default/Yesod/Default/Util.hs
index 1e3a5418..fd3c4614 100644
--- a/yesod-default/Yesod/Default/Util.hs
+++ b/yesod-default/Yesod/Default/Util.hs
@@ -5,8 +5,8 @@
 module Yesod.Default.Util
     ( addStaticContentExternal
     , globFile
-    , widgetFileProduction
-    , widgetFileDebug
+    , widgetFileNoReload
+    , widgetFileReload
     ) where
 
 import Control.Monad.IO.Class (liftIO)
@@ -16,9 +16,9 @@ import Yesod.Core -- purposely using complete import so that Haddock will see ad
 import Control.Monad (unless)
 import System.Directory (doesFileExist, createDirectoryIfMissing)
 import Language.Haskell.TH.Syntax
-import Text.Lucius (luciusFile, luciusFileDebug)
-import Text.Julius (juliusFile, juliusFileDebug)
-import Text.Cassius (cassiusFile, cassiusFileDebug)
+import Text.Lucius (luciusFile, luciusFileReload)
+import Text.Julius (juliusFile, juliusFileReload)
+import Text.Cassius (cassiusFile, cassiusFileReload)
 import Data.Monoid (mempty)
 
 -- | An implementation of 'addStaticContent' which stores the contents in an
@@ -56,20 +56,20 @@ addStaticContentExternal minify hash staticDir toRoute ext' _ content = do
 globFile :: String -> String -> FilePath
 globFile kind x = "templates/" ++ x ++ "." ++ kind
 
-widgetFileProduction :: FilePath -> Q Exp
-widgetFileProduction x = do
+widgetFileNoReload :: FilePath -> Q Exp
+widgetFileNoReload x = do
     let h = whenExists x "hamlet"  whamletFile
     let c = whenExists x "cassius" cassiusFile
     let j = whenExists x "julius"  juliusFile
     let l = whenExists x "lucius"  luciusFile
     [|$h >> addCassius $c >> addJulius $j >> addLucius $l|]
 
-widgetFileDebug :: FilePath -> Q Exp
-widgetFileDebug x = do
+widgetFileReload :: FilePath -> Q Exp
+widgetFileReload x = do
     let h = whenExists x "hamlet"  whamletFile
-    let c = whenExists x "cassius" cassiusFileDebug
-    let j = whenExists x "julius"  juliusFileDebug
-    let l = whenExists x "lucius"  luciusFileDebug
+    let c = whenExists x "cassius" cassiusFileReload
+    let j = whenExists x "julius"  juliusFileReload
+    let l = whenExists x "lucius"  luciusFileReload
     [|$h >> addCassius $c >> addJulius $j >> addLucius $l|]
 
 whenExists :: String -> String -> (FilePath -> Q Exp) -> Q Exp
diff --git a/yesod-default/yesod-default.cabal b/yesod-default/yesod-default.cabal
index d0956de2..ca3cd30f 100644
--- a/yesod-default/yesod-default.cabal
+++ b/yesod-default/yesod-default.cabal
@@ -27,8 +27,8 @@ library
                    , transformers          >= 0.2.2 && < 0.3
                    , text                  >= 0.9
                    , directory             >= 1.0
-                   , shakespeare-css       >= 0.10  && < 0.11
-                   , shakespeare-js        >= 0.10  && < 0.11
+                   , shakespeare-css       >= 0.10.5 && < 0.11
+                   , shakespeare-js        >= 0.10.4 && < 0.11
                    , template-haskell
                    , data-object           >= 0.3      && < 0.4
                    , data-object-yaml      >= 0.3      && < 0.4
diff --git a/yesod/Devel.hs b/yesod/Devel.hs
old mode 100755
new mode 100644
index 09ce09aa..7dabf331
--- a/yesod/Devel.hs
+++ b/yesod/Devel.hs
@@ -66,8 +66,18 @@ devel isDevel = do
       checkCabalFile gpd
 
       _ <- if isDevel
-        then rawSystem "cabal-dev" ["configure", "--cabal-install-arg=-fdevel", "--disable-library-profiling"]
-        else rawSystem "cabal"     ["configure", "-fdevel", "--disable-library-profiling"]
+        then rawSystem "cabal-dev"
+            [ "configure"
+            , "--cabal-install-arg=-fdevel" -- legacy
+            , "--cabal-install-arg=-flibrary-only"
+            , "--disable-library-profiling"
+            ]
+        else rawSystem "cabal"
+            [ "configure"
+            , "-fdevel" -- legacy
+            , "-flibrary-only"
+            , "--disable-library-profiling"
+            ]
 
       T.writeFile "dist/devel.hs" (develFile pid)
 
diff --git a/yesod/scaffold/Application.hs.cg b/yesod/scaffold/Application.hs.cg
index a371a13e..6da71d8f 100644
--- a/yesod/scaffold/Application.hs.cg
+++ b/yesod/scaffold/Application.hs.cg
@@ -29,10 +29,10 @@ mkYesodDispatch "~sitearg~" resources~sitearg~
 -- migrations handled by Yesod.
 with~sitearg~ :: AppConfig DefaultEnv () -> Logger -> (Application -> IO ()) -> IO ()
 with~sitearg~ conf logger f = do
-#ifdef PRODUCTION
-    s <- static Settings.staticDir
-#else
+#ifdef DEV
     s <- staticDevel Settings.staticDir
+#else
+    s <- static Settings.staticDir
 #endif
     dbconf <- withYamlEnvironment "config/~dbConfigFile~.yml" (appEnv conf)
             $ either error return . Database.Persist.Base.loadConfig
diff --git a/yesod/scaffold/Foundation.hs.cg b/yesod/scaffold/Foundation.hs.cg
index 5ab6f4f5..5c51cf38 100644
--- a/yesod/scaffold/Foundation.hs.cg
+++ b/yesod/scaffold/Foundation.hs.cg
@@ -33,10 +33,10 @@ import Model
 import Text.Jasmine (minifym)
 import Web.ClientSession (getKey)
 import Text.Hamlet (hamletFile)
-#if PRODUCTION
-import Network.Mail.Mime (sendmail)
-#else
+#if DEV
 import qualified Data.Text.Lazy.Encoding
+#else
+import Network.Mail.Mime (sendmail)
 #endif
 
 -- | The site argument for your application. This can be a good place to
@@ -145,10 +145,10 @@ instance YesodAuth ~sitearg~ where
 
 -- Sends off your mail. Requires sendmail in production!
 deliver :: ~sitearg~ -> L.ByteString -> IO ()
-#ifdef PRODUCTION
-deliver _ = sendmail
-#else
+#ifdef DEV
 deliver y = logLazyText (getLogger y) . Data.Text.Lazy.Encoding.decodeUtf8
+#else
+deliver _ = sendmail
 #endif
 
 -- This instance is required to use forms. You can modify renderMessage to
diff --git a/yesod/scaffold/Settings.hs.cg b/yesod/scaffold/Settings.hs.cg
index 00e19213..982d1e2e 100644
--- a/yesod/scaffold/Settings.hs.cg
+++ b/yesod/scaffold/Settings.hs.cg
@@ -49,8 +49,8 @@ staticRoot conf = [~qq~st|#{appRoot conf}/static|]
 -- user.
 
 widgetFile :: String -> Q Exp
-#if PRODUCTION
-widgetFile = Yesod.Default.Util.widgetFileProduction
+#if DEV
+widgetFile = Yesod.Default.Util.widgetFileReload
 #else
-widgetFile = Yesod.Default.Util.widgetFileDebug
+widgetFile = Yesod.Default.Util.widgetFileNoReload
 #endif
diff --git a/yesod/scaffold/deploy/Procfile.cg b/yesod/scaffold/deploy/Procfile.cg
index 69506c21..e4fab22f 100644
--- a/yesod/scaffold/deploy/Procfile.cg
+++ b/yesod/scaffold/deploy/Procfile.cg
@@ -27,12 +27,12 @@
 #     
 # * add code in Settings.hs to turn that url into connection parameters. The below works for Postgresql.
 #
-#     #ifdef PRODUCTION
+#     #ifdef !DEV
 #     import qualified Web.Heroku
 #     #endif
 #
 #     dbConnParams :: AppEnvironment -> IO [(Text, Text)]
-#     #ifdef PRODUCTION
+#     #ifdef !DEV
 #     dbConnParams _ = Web.Heroku.dbConnParams
 #     #else
 #     dbConnParams env = do
diff --git a/yesod/scaffold/project.cabal.cg b/yesod/scaffold/project.cabal.cg
index 27eb73a4..b7ffa518 100644
--- a/yesod/scaffold/project.cabal.cg
+++ b/yesod/scaffold/project.cabal.cg
@@ -21,7 +21,7 @@ Flag devel
     Default:       False
 
 library
-    if flag(devel)
+    if flag(library-only)
         Buildable: True
     else
         Buildable: False
@@ -35,6 +35,7 @@ library
                      Handler.Root
 
     ghc-options:   -Wall -threaded -O0
+    cpp-options:   -DDEV
 
     extensions: TemplateHaskell
                 QuasiQuotes
@@ -49,14 +50,14 @@ library
                 FlexibleContexts
 
 executable         ~project~
-    if flag(devel)
+    if flag(library-only)
         Buildable: False
 
-    if flag(production)
-        cpp-options:   -DPRODUCTION
-        ghc-options:   -Wall -threaded -O2
-    else
+    if flag(dev)
+        cpp-options:   -DDEV
         ghc-options:   -Wall -threaded -O0
+    else
+        ghc-options:   -Wall -threaded
 
     main-is:       main.hs
 
diff --git a/yesod/scaffold/tiny/Application.hs.cg b/yesod/scaffold/tiny/Application.hs.cg
index 21911c76..61e46664 100644
--- a/yesod/scaffold/tiny/Application.hs.cg
+++ b/yesod/scaffold/tiny/Application.hs.cg
@@ -28,10 +28,10 @@ mkYesodDispatch "~sitearg~" resources~sitearg~
 -- migrations handled by Yesod.
 with~sitearg~ :: AppConfig DefaultEnv () -> Logger -> (Application -> IO ()) -> IO ()
 with~sitearg~ conf logger f = do
-#ifdef PRODUCTION
-    s <- static Settings.staticDir
-#else
+#ifdef DEV
     s <- staticDevel Settings.staticDir
+#else
+    s <- static Settings.staticDir
 #endif
     let h = ~sitearg~ conf logger s
     defaultRunner f h
diff --git a/yesod/scaffold/tiny/Settings.hs.cg b/yesod/scaffold/tiny/Settings.hs.cg
index 8d21e88f..b81780aa 100644
--- a/yesod/scaffold/tiny/Settings.hs.cg
+++ b/yesod/scaffold/tiny/Settings.hs.cg
@@ -38,8 +38,8 @@ staticRoot :: AppConfig DefaultEnv a ->  Text
 staticRoot conf = [~qq~st|#{appRoot conf}/static|]
 
 widgetFile :: String -> Q Exp
-#if PRODUCTION
-widgetFile = Yesod.Default.Util.widgetFileProduction
+#if DEV
+widgetFile = Yesod.Default.Util.widgetFileReload
 #else
-widgetFile = Yesod.Default.Util.widgetFileDebug
+widgetFile = Yesod.Default.Util.widgetFileNoReload
 #endif
diff --git a/yesod/scaffold/tiny/project.cabal.cg b/yesod/scaffold/tiny/project.cabal.cg
index 057f367e..b57a46b1 100644
--- a/yesod/scaffold/tiny/project.cabal.cg
+++ b/yesod/scaffold/tiny/project.cabal.cg
@@ -12,16 +12,16 @@ cabal-version:     >= 1.6
 build-type:        Simple
 homepage:          http://~project~.yesodweb.com/
 
-Flag production
-    Description:   Build the production executable.
+Flag dev
+    Description:   Turn on development settings, like auto-reload templates.
     Default:       False
 
-Flag devel
+Flag library-only
     Description:   Build for use with "yesod devel"
     Default:       False
 
 library
-    if flag(devel)
+    if flag(library-only)
         Buildable: True
     else
         Buildable: False
@@ -33,6 +33,7 @@ library
                      Handler.Root
 
     ghc-options:   -Wall -threaded -O0
+    cpp-options:   -DDEV
 
     extensions: TemplateHaskell
                 QuasiQuotes
@@ -44,14 +45,14 @@ library
                 TypeFamilies
 
 executable         ~project~
-    if flag(devel)
+    if flag(library-only)
         Buildable: False
 
-    if flag(production)
-        cpp-options:   -DPRODUCTION
-        ghc-options:   -Wall -threaded -O2
-    else
+    if flag(dev)
+        cpp-options:   -DDEV
         ghc-options:   -Wall -threaded -O0
+    else
+        ghc-options:   -Wall -threaded
 
     main-is:       main.hs
 

From a7077992ae0f63f01b4f6b8e14d4bef8bfd3a908 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 14 Dec 2011 08:56:23 +0200
Subject: [PATCH 182/189] Fix for cmdargs

---
 yesod-default/Yesod/Default/Config.hs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/yesod-default/Yesod/Default/Config.hs b/yesod-default/Yesod/Default/Config.hs
index 4eef26b5..0d6b86b3 100644
--- a/yesod-default/Yesod/Default/Config.hs
+++ b/yesod-default/Yesod/Default/Config.hs
@@ -42,7 +42,6 @@ defaultArgConfig =
     ArgConfig
         { environment = def
             &= argPos 0
-            &= help ("application environment, one of: " ++ environments)
             &= typ   "ENVIRONMENT"
         , port = def
             &= help "the port to listen on"

From 5a52d3bbdd8c737981e0d77c7d650fb525dde128 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 14 Dec 2011 09:39:51 +0200
Subject: [PATCH 183/189] package-list.sh

---
 package-list.sh | 12 ++++++++++++
 scripts         |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 package-list.sh

diff --git a/package-list.sh b/package-list.sh
new file mode 100644
index 00000000..2205ad1d
--- /dev/null
+++ b/package-list.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+pkgs=(      ./yesod-core
+            ./yesod-json
+            ./yesod-static
+            ./yesod-persistent
+            ./yesod-newsfeed
+            ./yesod-form
+            ./yesod-auth
+            ./yesod-sitemap
+            ./yesod-default
+            ./yesod                 )
diff --git a/scripts b/scripts
index 5c174c61..713588bc 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 5c174c61daeca7430e75a3d32da2bf783eac7776
+Subproject commit 713588bcf3526aad8a809215fb34c314334a5ffd

From 0f72117e535465e3bf8382faf0ee4429b1870c86 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 14 Dec 2011 09:39:59 +0200
Subject: [PATCH 184/189] Fix a warning

---
 yesod-default/Yesod/Default/Config.hs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/yesod-default/Yesod/Default/Config.hs b/yesod-default/Yesod/Default/Config.hs
index 0d6b86b3..4a35c090 100644
--- a/yesod-default/Yesod/Default/Config.hs
+++ b/yesod-default/Yesod/Default/Config.hs
@@ -48,12 +48,6 @@ defaultArgConfig =
             &= typ  "PORT"
         }
 
-    where
-        environments :: String
-        environments = foldl1 (\a b -> a ++ ", " ++ b)
-                     . map ((map toLower) . show)
-                     $ ([minBound..maxBound] :: [DefaultEnv])
-
 -- | Load an @'AppConfig'@ using the @'DefaultEnv'@ environments from
 --   commandline arguments.
 fromArgs :: IO (AppConfig DefaultEnv ())

From 157d098da2ce3281dd9a29a2b9d39f1c26538fd4 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 14 Dec 2011 19:01:54 +0200
Subject: [PATCH 185/189] DEV -> DEVELOPMENT

---
 yesod/scaffold/Application.hs.cg      | 2 +-
 yesod/scaffold/Foundation.hs.cg       | 4 ++--
 yesod/scaffold/Settings.hs.cg         | 2 +-
 yesod/scaffold/deploy/Procfile.cg     | 4 ++--
 yesod/scaffold/project.cabal.cg       | 4 ++--
 yesod/scaffold/tiny/Application.hs.cg | 2 +-
 yesod/scaffold/tiny/Settings.hs.cg    | 2 +-
 yesod/scaffold/tiny/project.cabal.cg  | 4 ++--
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/yesod/scaffold/Application.hs.cg b/yesod/scaffold/Application.hs.cg
index 6da71d8f..0fb3f48d 100644
--- a/yesod/scaffold/Application.hs.cg
+++ b/yesod/scaffold/Application.hs.cg
@@ -29,7 +29,7 @@ mkYesodDispatch "~sitearg~" resources~sitearg~
 -- migrations handled by Yesod.
 with~sitearg~ :: AppConfig DefaultEnv () -> Logger -> (Application -> IO ()) -> IO ()
 with~sitearg~ conf logger f = do
-#ifdef DEV
+#ifdef DEVELOPMENT
     s <- staticDevel Settings.staticDir
 #else
     s <- static Settings.staticDir
diff --git a/yesod/scaffold/Foundation.hs.cg b/yesod/scaffold/Foundation.hs.cg
index 5c51cf38..a92fb5c9 100644
--- a/yesod/scaffold/Foundation.hs.cg
+++ b/yesod/scaffold/Foundation.hs.cg
@@ -33,7 +33,7 @@ import Model
 import Text.Jasmine (minifym)
 import Web.ClientSession (getKey)
 import Text.Hamlet (hamletFile)
-#if DEV
+#if DEVELOPMENT
 import qualified Data.Text.Lazy.Encoding
 #else
 import Network.Mail.Mime (sendmail)
@@ -145,7 +145,7 @@ instance YesodAuth ~sitearg~ where
 
 -- Sends off your mail. Requires sendmail in production!
 deliver :: ~sitearg~ -> L.ByteString -> IO ()
-#ifdef DEV
+#ifdef DEVELOPMENT
 deliver y = logLazyText (getLogger y) . Data.Text.Lazy.Encoding.decodeUtf8
 #else
 deliver _ = sendmail
diff --git a/yesod/scaffold/Settings.hs.cg b/yesod/scaffold/Settings.hs.cg
index 982d1e2e..51c6d93e 100644
--- a/yesod/scaffold/Settings.hs.cg
+++ b/yesod/scaffold/Settings.hs.cg
@@ -49,7 +49,7 @@ staticRoot conf = [~qq~st|#{appRoot conf}/static|]
 -- user.
 
 widgetFile :: String -> Q Exp
-#if DEV
+#if DEVELOPMENT
 widgetFile = Yesod.Default.Util.widgetFileReload
 #else
 widgetFile = Yesod.Default.Util.widgetFileNoReload
diff --git a/yesod/scaffold/deploy/Procfile.cg b/yesod/scaffold/deploy/Procfile.cg
index e4fab22f..a63a9bf9 100644
--- a/yesod/scaffold/deploy/Procfile.cg
+++ b/yesod/scaffold/deploy/Procfile.cg
@@ -27,12 +27,12 @@
 #     
 # * add code in Settings.hs to turn that url into connection parameters. The below works for Postgresql.
 #
-#     #ifdef !DEV
+#     #ifdef !DEVELOPMENT
 #     import qualified Web.Heroku
 #     #endif
 #
 #     dbConnParams :: AppEnvironment -> IO [(Text, Text)]
-#     #ifdef !DEV
+#     #ifdef !DEVELOPMENT
 #     dbConnParams _ = Web.Heroku.dbConnParams
 #     #else
 #     dbConnParams env = do
diff --git a/yesod/scaffold/project.cabal.cg b/yesod/scaffold/project.cabal.cg
index b7ffa518..09e37439 100644
--- a/yesod/scaffold/project.cabal.cg
+++ b/yesod/scaffold/project.cabal.cg
@@ -35,7 +35,7 @@ library
                      Handler.Root
 
     ghc-options:   -Wall -threaded -O0
-    cpp-options:   -DDEV
+    cpp-options:   -DDEVELOPMENT
 
     extensions: TemplateHaskell
                 QuasiQuotes
@@ -54,7 +54,7 @@ executable         ~project~
         Buildable: False
 
     if flag(dev)
-        cpp-options:   -DDEV
+        cpp-options:   -DDEVELOPMENT
         ghc-options:   -Wall -threaded -O0
     else
         ghc-options:   -Wall -threaded
diff --git a/yesod/scaffold/tiny/Application.hs.cg b/yesod/scaffold/tiny/Application.hs.cg
index 61e46664..55da0704 100644
--- a/yesod/scaffold/tiny/Application.hs.cg
+++ b/yesod/scaffold/tiny/Application.hs.cg
@@ -28,7 +28,7 @@ mkYesodDispatch "~sitearg~" resources~sitearg~
 -- migrations handled by Yesod.
 with~sitearg~ :: AppConfig DefaultEnv () -> Logger -> (Application -> IO ()) -> IO ()
 with~sitearg~ conf logger f = do
-#ifdef DEV
+#ifdef DEVELOPMENT
     s <- staticDevel Settings.staticDir
 #else
     s <- static Settings.staticDir
diff --git a/yesod/scaffold/tiny/Settings.hs.cg b/yesod/scaffold/tiny/Settings.hs.cg
index b81780aa..9c4fc748 100644
--- a/yesod/scaffold/tiny/Settings.hs.cg
+++ b/yesod/scaffold/tiny/Settings.hs.cg
@@ -38,7 +38,7 @@ staticRoot :: AppConfig DefaultEnv a ->  Text
 staticRoot conf = [~qq~st|#{appRoot conf}/static|]
 
 widgetFile :: String -> Q Exp
-#if DEV
+#if DEVELOPMENT
 widgetFile = Yesod.Default.Util.widgetFileReload
 #else
 widgetFile = Yesod.Default.Util.widgetFileNoReload
diff --git a/yesod/scaffold/tiny/project.cabal.cg b/yesod/scaffold/tiny/project.cabal.cg
index b57a46b1..4e4ec5fc 100644
--- a/yesod/scaffold/tiny/project.cabal.cg
+++ b/yesod/scaffold/tiny/project.cabal.cg
@@ -33,7 +33,7 @@ library
                      Handler.Root
 
     ghc-options:   -Wall -threaded -O0
-    cpp-options:   -DDEV
+    cpp-options:   -DDEVELOPMENT
 
     extensions: TemplateHaskell
                 QuasiQuotes
@@ -49,7 +49,7 @@ executable         ~project~
         Buildable: False
 
     if flag(dev)
-        cpp-options:   -DDEV
+        cpp-options:   -DDEVELOPMENT
         ghc-options:   -Wall -threaded -O0
     else
         ghc-options:   -Wall -threaded

From 8250a4c0016a8078d0268e1d5a2afc42a1f36dcd Mon Sep 17 00:00:00 2001
From: Arash Rouhani <miffoljud@gmail.com>
Date: Wed, 14 Dec 2011 21:48:50 +0100
Subject: [PATCH 186/189] Corrected command to activate virthualenv

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 079d03a3..5d16687f 100644
--- a/README.md
+++ b/README.md
@@ -84,7 +84,7 @@ cabal update
 cabal install virthualenv
 cd yesodweb
 virthualenv --name=yesod
-./virthualenv/bin/activate
+. .virthualenv/bin/activate
 ~~~
 
 #### individual cabal packages

From 558068374da5b55d257e732046840ca827a706ba Mon Sep 17 00:00:00 2001
From: Felipe Lessa <felipe.lessa@gmail.com>
Date: Mon, 19 Dec 2011 08:42:51 -0200
Subject: [PATCH 187/189] Fix yesod-auth's source repository location.

---
 yesod-auth/yesod-auth.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal
index 782dddd4..f9f6e820 100644
--- a/yesod-auth/yesod-auth.cabal
+++ b/yesod-auth/yesod-auth.cabal
@@ -64,4 +64,4 @@ library
 
 source-repository head
   type:     git
-  location: git://github.com/snoyberg/yesod-auth.git
+  location: git://github.com/yesodweb/yesod.git

From 15495d621328ca2deaa245e1960218cc69401e01 Mon Sep 17 00:00:00 2001
From: Felipe Lessa <felipe.lessa@gmail.com>
Date: Mon, 19 Dec 2011 09:50:02 -0200
Subject: [PATCH 188/189] Facebook logout support and access token.

This patch renames "facebookUrl" to "facebookLogin" and adds
"facebookLogout".  The latter logs out the user from Facebook as
well to comply with Facebook's policies.

As a bonus, we also save the user's access token into their
session and export "getFacebookAccessToken".  Besides being
useful for the application, this is necessary for the new logout
action.

This patch also bumps the version to 0.8 since we have renamed
"facebookUrl".
---
 yesod-auth/Yesod/Auth/Facebook.hs | 52 ++++++++++++++++++++++++++-----
 yesod-auth/yesod-auth.cabal       |  6 ++--
 2 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/yesod-auth/Yesod/Auth/Facebook.hs b/yesod-auth/Yesod/Auth/Facebook.hs
index 3928eb07..62737374 100644
--- a/yesod-auth/Yesod/Auth/Facebook.hs
+++ b/yesod-auth/Yesod/Auth/Facebook.hs
@@ -3,7 +3,9 @@
 {-# LANGUAGE OverloadedStrings #-}
 module Yesod.Auth.Facebook
     ( authFacebook
-    , facebookUrl
+    , facebookLogin
+    , facebookLogout
+    , getFacebookAccessToken
     ) where
 
 #include "qq.h"
@@ -17,20 +19,42 @@ import Data.Maybe (fromMaybe)
 import Yesod.Form
 import Yesod.Handler
 import Yesod.Widget
-import Control.Monad.IO.Class (liftIO)
+import Control.Monad.IO.Class (MonadIO, liftIO)
 import Control.Monad.Trans.Class (lift)
 import Data.Text (Text)
-import Control.Monad (mzero)
+import Control.Monad (liftM, mzero, when)
 import Data.Monoid (mappend)
 import qualified Data.Aeson.Types
 import qualified Yesod.Auth.Message as Msg
 
-facebookUrl :: AuthRoute
-facebookUrl = PluginR "facebook" ["forward"]
+-- | Route for login using this authentication plugin.
+facebookLogin :: AuthRoute
+facebookLogin = PluginR "facebook" ["forward"]
 
+-- | Route for logout using this authentication plugin.  Per
+-- Facebook's policies
+-- (<https://developers.facebook.com/policy/>), the user needs to
+-- logout from Facebook itself as well.
+facebookLogout :: AuthRoute
+facebookLogout = PluginR "facebook" ["logout"]
+
+-- | Get Facebook's access token from the session.  Returns
+-- @Nothing@ if it's not found (probably because the user is not
+-- logged in via Facebook).  Note that the returned access token
+-- may have expired.
+getFacebookAccessToken :: MonadIO mo => GGHandler sub master mo (Maybe Facebook.AccessToken)
+getFacebookAccessToken =
+    liftM (fmap Facebook.AccessToken) (lookupSession facebookAccessTokenKey)
+
+-- | Key used to store Facebook's access token in the client
+-- session.
+facebookAccessTokenKey :: Text
+facebookAccessTokenKey = "_FB"
+
+-- | Authentication plugin using Facebook.
 authFacebook :: YesodAuth m
-             => Text -- ^ Application ID
-             -> Text -- ^ Application secret
+             => Text   -- ^ Application ID
+             -> Text   -- ^ Application secret
              -> [Text] -- ^ Requested permissions
              -> AuthPlugin m
 authFacebook cid secret perms =
@@ -49,10 +73,24 @@ authFacebook cid secret perms =
         code <- runInputGet $ ireq textField "code"
         at <- liftIO $ Facebook.getAccessToken fb code
         let Facebook.AccessToken at' = at
+        setSession facebookAccessTokenKey at'
         so <- liftIO $ Facebook.getGraphData at "me"
         let c = fromMaybe (error "Invalid response from Facebook")
                 $ parseMaybe (parseCreds at') $ either error id so
         setCreds True c
+    dispatch "GET" ["logout"] = do
+        m <- getYesod
+        tm <- getRouteToMaster
+        mtoken <- getFacebookAccessToken
+        when (redirectToReferer m) setUltDestReferer
+        case mtoken of
+          Nothing -> do
+            -- Well... then just logout from our app.
+            redirect RedirectTemporary (tm LogoutR)
+          Just at -> do
+            render <- getUrlRender
+            let logout = Facebook.getLogoutUrl at (render $ tm LogoutR)
+            redirectText RedirectTemporary logout
     dispatch _ _ = notFound
     login tm = do
         render <- lift getUrlRender
diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal
index f9f6e820..b8bdcf88 100644
--- a/yesod-auth/yesod-auth.cabal
+++ b/yesod-auth/yesod-auth.cabal
@@ -1,5 +1,5 @@
 name:            yesod-auth
-version:         0.7.7.2
+version:         0.8
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman, Patrick Brisbin
@@ -21,9 +21,9 @@ library
         cpp-options:     -DGHC7
     else
         build-depends:   base                >= 4        && < 4.3
-    build-depends:   authenticate            >= 0.10.3    && < 0.11
+    build-depends:   authenticate            >= 0.10.4    && < 0.11
                    , bytestring              >= 0.9.1.4   && < 0.10
-                   , yesod-core              >= 0.9       && < 0.10
+                   , yesod-core              >= 0.9.3.4   && < 0.10
                    , wai                     >= 0.4       && < 0.5
                    , template-haskell
                    , pureMD5                 >= 2.0       && < 2.2

From 9a9d063d3e2b992b733098a0b9f4009cbba8a8da Mon Sep 17 00:00:00 2001
From: Felipe Lessa <felipe.lessa@gmail.com>
Date: Mon, 19 Dec 2011 14:04:51 -0200
Subject: [PATCH 189/189] Re-export facebookLogin as facebookUrl in
 yesod-auth's Facebook.

Now facebookUrl is deprecated and provided only for backwards
compatibility.  This also allows us to bump yesod-auth's version
back to 0.7.*.
---
 yesod-auth/Yesod/Auth/Facebook.hs | 7 +++++++
 yesod-auth/yesod-auth.cabal       | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/yesod-auth/Yesod/Auth/Facebook.hs b/yesod-auth/Yesod/Auth/Facebook.hs
index 62737374..c4dbd1c0 100644
--- a/yesod-auth/Yesod/Auth/Facebook.hs
+++ b/yesod-auth/Yesod/Auth/Facebook.hs
@@ -4,6 +4,7 @@
 module Yesod.Auth.Facebook
     ( authFacebook
     , facebookLogin
+    , facebookUrl
     , facebookLogout
     , getFacebookAccessToken
     ) where
@@ -31,6 +32,12 @@ import qualified Yesod.Auth.Message as Msg
 facebookLogin :: AuthRoute
 facebookLogin = PluginR "facebook" ["forward"]
 
+-- | This is just a synonym of 'facebookLogin'.  Deprecated since
+-- @yesod-auth 0.7.8@, please use 'facebookLogin' instead.
+facebookUrl :: AuthRoute
+facebookUrl = facebookLogin
+{-# DEPRECATED facebookUrl "Please use facebookLogin instead." #-}
+
 -- | Route for logout using this authentication plugin.  Per
 -- Facebook's policies
 -- (<https://developers.facebook.com/policy/>), the user needs to
diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal
index b8bdcf88..8f3d1e67 100644
--- a/yesod-auth/yesod-auth.cabal
+++ b/yesod-auth/yesod-auth.cabal
@@ -1,5 +1,5 @@
 name:            yesod-auth
-version:         0.8
+version:         0.7.8
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman, Patrick Brisbin