From d4422b656b11a273fa5c0aa7e6eebadf1708d7e9 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 27 Mar 2013 08:51:03 +0200
Subject: [PATCH] LiteApp uses a Writer monad

---
 demo/lite/lite.hs                          |  6 ++--
 yesod-core/Yesod/Core/Internal/LiteApp.hs  | 32 ++++++++++++----------
 yesod-core/test/YesodCoreTest/LiteApp.hs   |  9 +++---
 yesod-core/test/YesodCoreTest/Streaming.hs |  2 +-
 4 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/demo/lite/lite.hs b/demo/lite/lite.hs
index 6c32d0e6..4c9e2fa6 100644
--- a/demo/lite/lite.hs
+++ b/demo/lite/lite.hs
@@ -7,9 +7,9 @@ import Data.Text (Text, pack)
 people :: [(Text, Int)]
 people = [("Alice", 25), ("Bob", 43), ("Charlie", 37)]
 
-main = warp 3000 $
-    onStatic "people" (dispatchTo getPeople) <>
-    onStatic "person" (withDynamic $ dispatchTo . getPerson)
+main = warp 3000 $ liteApp $ do
+    onStatic "people" $ dispatchTo getPeople
+    onStatic "person" $ withDynamic $ dispatchTo . getPerson
 
 getPeople = return $ toJSON $ map fst people
 
diff --git a/yesod-core/Yesod/Core/Internal/LiteApp.hs b/yesod-core/Yesod/Core/Internal/LiteApp.hs
index c9dd4887..790f09a8 100644
--- a/yesod-core/Yesod/Core/Internal/LiteApp.hs
+++ b/yesod-core/Yesod/Core/Internal/LiteApp.hs
@@ -16,6 +16,7 @@ import Yesod.Core.Internal.Run
 import Network.HTTP.Types (Method)
 import Data.Maybe (fromMaybe)
 import Control.Applicative ((<|>))
+import Control.Monad.Trans.Writer
 
 newtype LiteApp = LiteApp
     { unLiteApp :: Method -> [Text] -> Maybe (LiteHandler TypedContent)
@@ -47,32 +48,35 @@ instance Monoid LiteApp where
 type LiteHandler = HandlerT LiteApp IO
 type LiteWidget = WidgetT LiteApp IO
 
-dispatchTo :: ToTypedContent a => LiteHandler a -> LiteApp
-dispatchTo handler = LiteApp $ \_ ps ->
+liteApp :: Writer LiteApp () -> LiteApp
+liteApp = execWriter
+
+dispatchTo :: ToTypedContent a => LiteHandler a -> Writer LiteApp ()
+dispatchTo handler = tell $ LiteApp $ \_ ps ->
     if null ps
         then Just $ fmap toTypedContent handler
         else Nothing
 
-onMethod :: Method -> LiteApp -> LiteApp
-onMethod method (LiteApp f) = LiteApp $ \m ps ->
+onMethod :: Method -> Writer LiteApp () -> Writer LiteApp ()
+onMethod method f = tell $ LiteApp $ \m ps ->
     if method == m
-        then f m ps
+        then unLiteApp (liteApp f) m ps
         else Nothing
 
-onStatic :: Text -> LiteApp -> LiteApp
-onStatic p0 (LiteApp f) = LiteApp $ \m ps0 ->
+onStatic :: Text -> Writer LiteApp () -> Writer LiteApp ()
+onStatic p0 f = tell $ LiteApp $ \m ps0 ->
     case ps0 of
-        p:ps | p == p0 -> f m ps
+        p:ps | p == p0 -> unLiteApp (liteApp f) m ps
         _ -> Nothing
 
-withDynamic :: PathPiece p => (p -> LiteApp) -> LiteApp
-withDynamic f = LiteApp $ \m ps0 ->
+withDynamic :: PathPiece p => (p -> Writer LiteApp ()) -> Writer LiteApp ()
+withDynamic f = tell $ LiteApp $ \m ps0 ->
     case ps0 of
-        p:ps | Just v <- fromPathPiece p -> unLiteApp (f v) m ps
+        p:ps | Just v <- fromPathPiece p -> unLiteApp (liteApp $ f v) m ps
         _ -> Nothing
 
-withDynamicMulti :: PathMultiPiece ps => (ps -> LiteApp) -> LiteApp
-withDynamicMulti f = LiteApp $ \m ps ->
+withDynamicMulti :: PathMultiPiece ps => (ps -> Writer LiteApp ()) -> Writer LiteApp ()
+withDynamicMulti f = tell $ LiteApp $ \m ps ->
     case fromPathMultiPiece ps of
         Nothing -> Nothing
-        Just v -> unLiteApp (f v) m []
+        Just v -> unLiteApp (liteApp $ f v) m []
diff --git a/yesod-core/test/YesodCoreTest/LiteApp.hs b/yesod-core/test/YesodCoreTest/LiteApp.hs
index 386de5b9..60de5095 100644
--- a/yesod-core/test/YesodCoreTest/LiteApp.hs
+++ b/yesod-core/test/YesodCoreTest/LiteApp.hs
@@ -6,14 +6,13 @@ import Network.Wai.Test
 import Network.Wai
 import qualified Data.ByteString.Char8 as S8
 import qualified Data.Text as T
-import Data.Monoid
 import qualified Data.ByteString.Lazy.Char8 as L8
 
 iapp :: IO Application
-iapp = toWaiApp $
-    onMethod (S8.pack "GET") (dispatchTo $ return "GetHomepage") <>
-    onMethod (S8.pack "POST") (dispatchTo $ return "PostHomepage") <>
-    onStatic (T.pack "string") (withDynamic (\t -> dispatchTo $ return (t :: T.Text))) <>
+iapp = toWaiApp $ liteApp $ do
+    onMethod (S8.pack "GET") (dispatchTo $ return "GetHomepage")
+    onMethod (S8.pack "POST") (dispatchTo $ return "PostHomepage")
+    onStatic (T.pack "string") (withDynamic (\t -> dispatchTo $ return (t :: T.Text)))
     onStatic (T.pack "multi") (withDynamicMulti (\[_, y] -> dispatchTo $ return (y :: T.Text)))
 
 test :: String -- ^ method
diff --git a/yesod-core/test/YesodCoreTest/Streaming.hs b/yesod-core/test/YesodCoreTest/Streaming.hs
index fa7d82d8..1b2fde72 100644
--- a/yesod-core/test/YesodCoreTest/Streaming.hs
+++ b/yesod-core/test/YesodCoreTest/Streaming.hs
@@ -8,7 +8,7 @@ import Data.Text (Text)
 import Data.ByteString (ByteString)
 
 app :: LiteApp
-app = dispatchTo $ respondSource typeHtml $ do
+app = liteApp $ dispatchTo $ respondSource typeHtml $ do
     sendChunk ("Hello " :: String)
     sendChunk ("World" :: ByteString)
     sendChunk ("!\n" :: Text)