Update digestive-functors-snap, cabal files

digestive-functors-blaze/digestive-functors-blaze.cabal

@@ -1,8 +1,7 @@
 Name:          digestive-functors-blaze
 Version:       0.3.0.0
 Synopsis:      Blaze frontend for the digestive-functors library
-Description:   This is a blaze frontend for the digestive-functors library.
-
+Description:   Blaze frontend for the digestive-functors library
 Homepage:      http://github.com/jaspervdj/digestive-functors
 License:       BSD3
 License-file:  LICENSE
@@ -13,14 +12,12 @@ Build-type:    Simple
 Cabal-version: >= 1.6
 
 Library
-  Hs-source-dirs: src
-  GHC-options:    -Wall -fwarn-tabs
-
-  Exposed-modules:
-    Text.Digestive.Blaze.Html5
+  Hs-source-dirs:  src
+  GHC-options:     -Wall -fwarn-tabs
+  Exposed-modules: Text.Digestive.Blaze.Html5
 
   Build-depends:
-    base               >= 4     && < 5,
-    digestive-functors >= 0.3   && < 0.4,
-    blaze-html         >= 0.4   && < 0.6,
-    text               >= 0.11  && < 0.12
+    base               >= 4    && < 5,
+    digestive-functors >= 0.3  && < 0.4,
+    blaze-html         >= 0.4  && < 0.6,
+    text               >= 0.11 && < 0.12

digestive-functors-happstack/.ghci

@@ -0,0 +1 @@
+:set -isrc -i../digestive-functors/src

digestive-functors-happstack/digestive-functors-happstack.cabal

@@ -1,9 +1,7 @@
 Name:          digestive-functors-happstack
 Version:       0.3.0.0
 Synopsis:      Happstack backend for the digestive-functors library
-Description:   This is a happstack backend for the digestive-functors
-    library.
-
+Description:   Happstack backend for the digestive-functors library
 Homepage:      http://github.com/jaspervdj/digestive-functors
 License:       BSD3
 License-file:  LICENSE
@@ -16,6 +14,7 @@ Cabal-version: >= 1.6
 
 Library
   Hs-source-dirs:  src
+  GHC-options:     -Wall -fwarn-tabs
   Exposed-modules: Text.Digestive.Happstack
 
   Build-depends:

digestive-functors-happstack/src/Text/Digestive/Happstack.hs

@@ -32,5 +32,5 @@ runForm :: (Happstack.HasRqData m, Monad m, Happstack.ServerMonad m)
         -> m (View v, Maybe a)  -- ^ Result
 runForm name form = Happstack.askRq >>= \rq ->
     case Happstack.rqMethod rq of
-        Happstack.GET -> return $ (getForm name form, Nothing)
+        Happstack.GET -> return (getForm name form, Nothing)
         _             -> postForm name form happstackEnv

digestive-functors-snap/digestive-functors-snap.cabal

@@ -1,24 +1,24 @@
-Name:                digestive-functors-snap
-Version:             0.1.2.0
-Synopsis:            Snap backend for the digestive-functors library
-Description:         This is a snap backend for the digestive-functors library.
-
-Homepage:            http://github.com/jaspervdj/digestive-functors
-License:             BSD3
-License-file:        LICENSE
-Author:              Jasper Van der Jeugt
-Maintainer:          jaspervdj@gmail.com
-Category:            Web
-Build-type:          Simple
-Cabal-version:       >=1.6
-
+Name:          digestive-functors-snap
+Version:       0.3.0.0
+Synopsis:      Snap backend for the digestive-functors library
+Description:   Snap backend for the digestive-functors library
+Homepage:      http://github.com/jaspervdj/digestive-functors
+License:       BSD3
+License-file:  LICENSE
+Author:        Jasper Van der Jeugt <m@jaspervdj.be>
+Maintainer:    Jasper Van der Jeugt <m@jaspervdj.be>
+Category:      Web
+Build-type:    Simple
+Cabal-version: >= 1.6
 
 Library
-  Hs-source-dirs:    src
-  Exposed-modules:   Text.Digestive.Forms.Snap
+  Hs-source-dirs:  src
+  GHC-options:     -Wall -fwarn-tabs
+  Exposed-modules: Text.Digestive.Snap
+
   Build-depends:
-    base               >= 4   && < 5,
-    bytestring         >= 0.9 && < 0.10,
-    digestive-functors >= 0.1 && < 0.3,
-    snap-core          >= 0.5 && < 0.8,
-    utf8-string        >= 0.3 && < 0.4
+    base               >= 4    && < 5,
+    containers         >= 0.3  && < 0.5,
+    digestive-functors >= 0.3  && < 0.4,
+    snap-core          >= 0.7  && < 0.9,
+    text               >= 0.11 && < 0.12

digestive-functors-snap/src/Text/Digestive/Snap.hs

@@ -0,0 +1,36 @@
+-- | Module providing a Snap backend for the digestive-functors library
+module Text.Digestive.Snap
+    ( runForm
+    ) where
+
+import Control.Applicative ((<$>))
+import Data.Maybe (fromMaybe)
+import qualified Data.Map as M
+
+import Data.Text (Text)
+import qualified Data.Text.Encoding as T
+import qualified Snap.Core as Snap
+
+import Text.Digestive.Form
+import Text.Digestive.Types
+import Text.Digestive.View
+
+snapEnv :: Snap.MonadSnap m => Env m
+snapEnv path =
+    map (TextInput . T.decodeUtf8) . findParams <$> Snap.getPostParams
+  where
+    findParams = fromMaybe [] . M.lookup name 
+    name       = T.encodeUtf8 $ fromPath path
+
+-- | Runs a form with the HTTP input provided by Happstack.
+--
+-- Automatically picks between 'getForm' and 'postForm' based on the request
+-- method.
+runForm :: Snap.MonadSnap m
+        => Text                 -- ^ Name for the form
+        -> Form v m a           -- ^ Form to run
+        -> m (View v, Maybe a)  -- ^ Result
+runForm name form = Snap.getRequest >>= \rq ->
+    case Snap.rqMethod rq of
+        Snap.GET -> return (getForm name form, Nothing)
+        _        -> postForm name form snapEnv

digestive-functors/digestive-functors.cabal

@@ -43,7 +43,7 @@ Cabal-version: >= 1.6
 
 Library
   Hs-source-dirs: src
-  Ghc-options:    -Wall
+  Ghc-options:    -Wall -fwarn-tabs
 
   Exposed-modules:     
     Text.Digestive,