simple 0.11.0 → 0.11.1

raw patch · 4 files changed

+29/−9 lines, 4 filesdep +hspec-contribdep −HUnitdep ~monad-controldep ~wai

Dependencies added: hspec-contrib

Dependencies removed: HUnit

Dependency ranges changed: monad-control, wai

Files

• CHANGELOG.md +4/−0
• simple.cabal +22/−6
• src/Web/Frank.hs +2/−2
• test/Spec.hs +1/−1

@@ -1,3 +1,7 @@+# Version 0.11.1 (2016-01-11)++* Fixes test dependencies that precluded tests from compiling+ # Version 0.11.0.0 (2015-11-23)  * Minimize methods in `HasTemplates` and extract everything else into functions

@@ -1,5 +1,5 @@ name:                simple-version:             0.11.0+version:             0.11.1 synopsis: A minimalist web framework for the WAI server interface description: @@ -41,6 +41,7 @@   hs-source-dirs: src   Main-Is: smpl.hs   ghc-options: -Wall -fno-warn-unused-do-bind+  default-language: Haskell2010   build-depends:       base < 6     , aeson@@ -97,16 +98,31 @@  test-suite test-simple   type: exitcode-stdio-1.0-  hs-source-dirs: test+  hs-source-dirs: test, src   main-is: Spec.hs+  default-language: Haskell2010   build-depends:       base < 6-    , hspec-    , HUnit-    , monad-control < 0.4+    , aeson+    , base64-bytestring+    , blaze-builder+    , bytestring+    , directory+    , filepath+    , mime-types+    , monad-control >= 1.0.0.0     , mtl+    , simple-templates >= 0.7.0+    , wai >= 3.0+    , wai-extra+    , http-types+    , hspec+    , hspec-contrib+    , text     , transformers-    , wai+    , transformers-base+    , unordered-containers+    , vector  source-repository head   type: git

@@ -11,11 +11,11 @@   main = run 3000 $ controllerApp () $ do     get \"\/\" $ do       req <- request-      return $ okHtml $ fromString $+      respond $ okHtml $ fromString $         \"Welcome Home \" ++ (show $ serverName req)     get \"\/user\/:id\" $ do       userId \<- queryParam \"id\" >>= fromMaybe \"\"-      return $ ok \"text/json\" $ fromString $+      respond $ ok \"text/json\" $ fromString $         \"{\\\"myid\\\": \" ++ (show userId) ++ \"}\"     put \"\/user\/:id\" $ do       ...

@@ -6,7 +6,7 @@ import Control.Monad.Trans import Control.Monad.Trans.Control import Test.Hspec-import Test.Hspec.HUnit+import Test.Hspec.Contrib.HUnit import Network.Wai import Web.Simple.Controller.Trans import Web.Simple.Responses