MFlow 0.4.5.1 → 0.4.5.2

raw patch · 4 files changed

+56/−52 lines, 4 filesdep −acid-statedep ~warp

Dependencies removed: acid-state

Dependency ranges changed: warp

Files

• Demos/AcidState.hs +47/−44
• Demos/demos-blaze.hs +2/−2
• MFlow.cabal +3/−3
• src/MFlow/Wai/Blaze/Html/All.hs +4/−3

@@ -3,10 +3,10 @@ {-# LANGUAGE TypeFamilies, DeriveDataTypeable, TemplateHaskell #-} {-# OPTIONS -XCPP #-} module AcidState (-acidState, initAcid+acidState ) where -import Data.Acid+--import Data.Acid  import Control.Monad.State                   ( get, put ) import Control.Monad.Reader                  ( ask )@@ -18,7 +18,7 @@ import MFlow.Wai.Blaze.Html.All  main = do-  db <- initAcid+--  db <- initAcid   runNavigation "" . step $ acidState db  #else@@ -29,50 +29,53 @@ #endif  --type Message = String-data Database = Database [Message]---initAcid= openLocalStateFrom "dist/db/" (Database [])--addMessage :: Message -> Update Database ()-addMessage msg = do-  Database messages <- get-  put $ Database (msg:messages)--viewMessages :: Int -> Query Database [Message]-viewMessages limit = do-  Database messages <- Control.Monad.Reader.ask-  return $ take limit messages--$(deriveSafeCopy 0 'Data.SafeCopy.base ''Database)-$(makeAcidic ''Database ['addMessage, 'viewMessages])---getLast10 :: AcidState (EventState AddMessage) -> IO String-getLast10 database = do-  messages <- query database (ViewMessages 10)-  return $ concat [ message ++ "  " | message <- messages ]--addMsg :: AcidState (EventState AddMessage) -> Message -> IO ()-addMsg database msg = update database (AddMessage msg)-+--+--type Message = String+--data Database = Database [Message]   +--initAcid= openLocalStateFrom "dist/db/" (Database [])+--+--addMessage :: Message -> Update Database ()+--addMessage msg = do+--  Database messages <- get+--  put $ Database (msg:messages)+--+--viewMessages :: Int -> Query Database [Message]+--viewMessages limit = do+--  Database messages <- Control.Monad.Reader.ask+--  return $ take limit messages+--+-- $(deriveSafeCopy 0 'Data.SafeCopy.base ''Database)+-- $(makeAcidic ''Database ['addMessage, 'viewMessages])+--+--+--getLast10 :: AcidState (EventState AddMessage) -> IO String+--getLast10 database = do+--  messages <- query database (ViewMessages 10)+--  return $ concat [ message ++ "  " | message <- messages ]+--+--addMsg :: AcidState (EventState AddMessage) -> Message -> IO ()+--addMsg database msg = update database (AddMessage msg)+--+--+--+-- acidState db= do-  r <- page $ h3 << "Persistent message demo."-          ++> getString Nothing-          <** submitButton "OK"--  liftIO $ addMsg db r--  last10 <- liftIO $ getLast10 db+    page $ wlink () << p << "disabled for compatibility with stackage. uncomment it to run it"+--    r <- page $ h3 << "Persistent message demo "+--          ++> getString Nothing+--          <** submitButton "OK" -  page $ b-    << ("You typed: "++ r ++ ", it has been added to the acid state db.")-    ++> p << ("Here are the last 10 things in the db: " ++ last10)-    ++> wlink () << p << "next"-  acidState db+--+--  liftIO $ addMsg db r+--+--  last10 <- liftIO $ getLast10 db+--+--  page $ b+--    << ("You typed: "++ r ++ ", it has been added to the acid state db.")+--    ++> p << ("Here are the last 10 things in the db: " ++ last10)+--    ++> wlink () << p << "next"+--  acidState db 

@@ -68,7 +68,7 @@    userRegister edadmin edadmin    userRegister "edituser" "edituser"
    syncWrite  $ Asyncronous 120 defaultCheck  1000-   db <- initAcid                             -- for the AcidState example
+
    setFilesPath "Demos/"    addMessageFlows[        -- Web Services --@@ -123,7 +123,7 @@              MCounter    ->   mcounter                           `showSource`  "MCounter.hs"              MFlowPersist ->  transientNav mFlowPersistent       `showSource`  "MFlowPersistent.hs"              RuntimeTemplates -> transientNav runtimeTemplates   `showSource`  "RuntimeTemplates.hs"-             AcidState        -> transientNav (acidState db)     `showSource`  "AcidState.hs"+             AcidState        -> transientNav (acidState undefined)     `showSource`  "AcidState.hs"              InitialConfig -> initialConfig                      `showSource`  "InitialConfig.hs"              SearchCart    -> searchCart                         `showSource`  "SearchCart.hs"              GenerateForm  -> transientNav genForm

@@ -1,5 +1,5 @@ name: MFlow-version: 0.4.5.1+version: 0.4.5.2 cabal-version: >=1.8 build-type: Simple license: BSD3@@ -107,7 +107,7 @@                    bytestring , containers , RefSerialize , TCache ,                    stm >2, time, old-time , vector , directory ,                    utf8-string , wai , case-insensitive ,-                   http-types , conduit  ,conduit-extra, text , parsec , warp ,+                   http-types , conduit  ,conduit-extra, text , parsec , warp == 2.0.3.4 ,                    warp-tls , random , blaze-html , blaze-markup ,                    monadloc, clientsession     exposed-modules: MFlow MFlow.Wai.Blaze.Html.All MFlow.Forms@@ -129,7 +129,7 @@                    hamlet , shakespeare, monadloc , aws , network , hscolour ,                    persistent-template , persistent-sqlite , persistent ,                    conduit ,  http-conduit , monad-logger , safecopy ,-                   acid-state , time+                   time     main-is: demos-blaze.hs     buildable: True     hs-source-dirs: Demos

@@ -40,7 +40,7 @@ import Text.Blaze.Html5 hiding (map)
 import Text.Blaze.Html5.Attributes  hiding (label,span,style,cite,title,summary,step,form)
 import Network.Wai
-import Network.Wai.Handler.Warp(run,defaultSettings,Settings,setPort)
+import Network.Wai.Handler.Warp --  hiding (getPort) --(run,defaultSettings,Settings ,setPort)
 import Data.TCache
 import Text.Blaze.Internal(text)
 
@@ -92,5 +92,6 @@     unless (null n) $ setNoScript n
     addMessageFlows[(n, runFlow f)]
     porti <- getPort
-    let s' = setPort porti s
-    wait $ TLS.runTLS t s' waiMessageFlow
+--    let s' = setPort porti s
+--    wait $ TLS.runTLS t s' waiMessageFlow+    wait $ TLS.runTLS t s{settingsPort = porti} waiMessageFlow