This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "snap".
The branch, master has been updated
via 28b7ec84cd44f71181fd7a9b20a27a6f74dc08ec (commit)
from 33616e467ed6617442dcb716a71582368f827e95 (commit)
Summary of changes:
project_template/default/src/Main.hs | 1 -
project_template/default/src/Site.hs | 2 +-
src/Snap/Extension.hs | 9 +++++----
3 files changed, 6 insertions(+), 6 deletions(-)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 28b7ec84cd44f71181fd7a9b20a27a6f74dc08ec
Author: Gregory Collins <[email protected]>
Date: Sun Dec 19 13:33:56 2010 +0100
A few tweaks to the haddocks and to the generated project
diff --git a/project_template/default/src/Main.hs
b/project_template/default/src/Main.hs
index 104da6c..18251ef 100644
--- a/project_template/default/src/Main.hs
+++ b/project_template/default/src/Main.hs
@@ -53,7 +53,6 @@ import Snap.Http.Server (quickHttpServe)
import Application
import Site
--- FIXME: re-prettify this
main :: IO ()
#ifdef PRODUCTION
main = quickHttpServe applicationInitializer site
diff --git a/project_template/default/src/Site.hs
b/project_template/default/src/Site.hs
index 65812fa..e60c894 100644
--- a/project_template/default/src/Site.hs
+++ b/project_template/default/src/Site.hs
@@ -44,7 +44,7 @@ echo = do
message <- decodedParam "stuff"
heistLocal (bindString "message" message) $ render "echo"
where
- decodedParam p = fromMaybe <*> urlDecode <$> fromMaybe "" <$> getParam p
+ decodedParam p = fromMaybe "" <$> getParam p
------------------------------------------------------------------------------
diff --git a/src/Snap/Extension.hs b/src/Snap/Extension.hs
index 397fc42..54fd841 100644
--- a/src/Snap/Extension.hs
+++ b/src/Snap/Extension.hs
@@ -363,7 +363,7 @@ runInitializer
-> Initializer s
-- ^ The Initializer value
-> SnapExtend s ()
- -- ^ An action in your application's monad
+ -- ^ A web handler in your application's monad
-> IO (Snap (), IO (), IO [(ByteString, Maybe ByteString)])
-- ^ Returns a 'Snap' handler, a cleanup action, and a reload action. The
-- list returned by the reload action is for error reporting. There is one
@@ -379,15 +379,16 @@ runInitializer v (Initializer r) (SnapExtend m) =
------------------------------------------------------------------------------
--- | Serves the same purpose as 'runInitializer', but can be used with Hint.
--- This is explained in the README.
+-- | Serves the same purpose as 'runInitializer', but combines the
+-- application's web handler with a user-supplied action to be run to reload
+-- the application's state.
runInitializerWithReloadAction
:: Bool
-- ^ Verbosity; info is printed to 'stderr' when this is 'True'
-> Initializer s
-- ^ The Initializer value
-> SnapExtend s ()
- -- ^ An action in your application's monad.
+ -- ^ A web handler in your application's monad.
-> (IO [(ByteString, Maybe ByteString)] -> SnapExtend s ())
-- ^ Your desired \"reload\" handler; it gets passed the reload
-- action. This handler is always run, so you have to guard the path
-----------------------------------------------------------------------
hooks/post-receive
--
snap
_______________________________________________
Snap mailing list
[email protected]
http://mailman-mail5.webfaction.com/listinfo/snap
