wai-routing 0.9.1 → 0.10

raw patch · 5 files changed

+30/−28 lines, 5 filesdep +bytestring-conversiondep −HUnitdep −QuickCheckdep −bytestring-fromdep ~blaze-builderdep ~criteriondep ~tasty-hunit

Dependencies added: bytestring-conversion

Dependencies removed: HUnit, QuickCheck, bytestring-from

Dependency ranges changed: blaze-builder, criterion, tasty-hunit, wai-predicates

Files

• CHANGELOG.md +5/−0
• bench/Bench.hs +2/−3
• src/Network/Wai/Routing/Predicate.hs +1/−1
• test/Tests/Wai/Route.hs +3/−3
• wai-routing.cabal +19/−21

@@ -1,3 +1,8 @@+0.10+-----------------------------------------------------------------------------+- Replace `bytestring-from` with `bytestring-conversion` and update test+  dependencies.+ 0.9.1 ----------------------------------------------------------------------------- - Bugfix release (benchmarks)

@@ -8,8 +8,8 @@  module Main (main) where +import Criterion import Criterion.Main-import Criterion.Config import Network.HTTP.Types hiding (ok200) import Network.Wai import Network.Wai.Internal (ResponseReceived (..))@@ -84,7 +84,7 @@ reqZOk = reqZBad { queryString = ("x8", Just "42") : queryString reqZBad }  main :: IO ()-main = defaultMainWith defaultConfig (return ())+main = defaultMain     [ bgroup "bench"         [ bench "a - ok"  (whnfIO $ f reqAOk)         , bench "a - bad" (whnfIO $ f reqABad)@@ -101,4 +101,3 @@   where     f rq = route (prepare sitemap) rq rs     rs   = const (return ResponseReceived)-

@@ -11,7 +11,7 @@  import Control.Monad (when) import Data.ByteString (ByteString)-import Data.ByteString.From+import Data.ByteString.Conversion import Network.Wai.Predicate import Network.Wai.Predicate.Request import Network.Wai.Predicate.Utility

@@ -9,6 +9,7 @@ module Tests.Wai.Route (tests) where  import Data.ByteString (ByteString)+import Data.ByteString.Conversion import Data.Monoid import Data.String import Network.HTTP.Types@@ -17,7 +18,6 @@ import Network.Wai.Predicate.Request import Network.Wai.Routing import Network.Wai.Routing.Request-import Test.HUnit hiding (Test) import Test.Tasty import Test.Tasty.HUnit import Tests.Wai.Util@@ -105,8 +105,8 @@ handlerE :: Int -> IO Response handlerE foo = writeText (fromString . show $ foo) -handlerF :: [Int] -> IO Response-handlerF foo = writeText (fromString . show . sum $ foo)+handlerF :: List Int -> IO Response+handlerF foo = writeText (fromString . show . sum . fromList $ foo)  handlerG :: () -> IO Response handlerG = const $ writeText "all good"

@@ -1,5 +1,5 @@ name:                wai-routing-version:             0.9.1+version:             0.10 synopsis:            Declarative routing for WAI. license:             OtherLicense license-file:        LICENSE@@ -76,17 +76,17 @@         Network.Wai.Routing.Predicate      build-depends:-        attoparsec       >= 0.10  && < 0.13-      , base             == 4.*-      , bytestring       >= 0.9   && < 0.11-      , bytestring-from  >= 0.2   && < 0.4-      , cookie           == 0.4.*-      , case-insensitive >= 1.1   && < 1.3-      , http-types       == 0.8.*-      , transformers     >= 0.3   && < 0.5-      , wai              == 3.0.*-      , wai-predicates   == 0.7.*-      , wai-route        == 0.2.*+        attoparsec            >= 0.10  && < 0.13+      , base                  == 4.*+      , bytestring            >= 0.9   && < 0.11+      , bytestring-conversion == 0.1.*+      , cookie                == 0.4.*+      , case-insensitive      >= 1.1   && < 1.3+      , http-types            == 0.8.*+      , transformers          >= 0.3   && < 0.5+      , wai                   == 3.0.*+      , wai-predicates        == 0.8.*+      , wai-route             == 0.2.*  test-suite wai-routing-tests     type:             exitcode-stdio-1.0@@ -101,16 +101,15 @@         Tests.Wai.Util      build-depends:-        base             == 4.*-      , blaze-builder    == 0.3.*+        base                  == 4.*+      , blaze-builder         >= 0.3       , bytestring+      , bytestring-conversion       , case-insensitive       , http-types-      , HUnit-      , QuickCheck-      , tasty            >= 0.8-      , tasty-hunit      >= 0.8-      , tasty-quickcheck >= 0.8+      , tasty                 >= 0.8+      , tasty-hunit           >= 0.9+      , tasty-quickcheck      >= 0.8       , wai       , wai-predicates       , wai-routing@@ -123,9 +122,8 @@     ghc-options:      -Wall -O2 -fwarn-tabs     build-depends:         base          == 4.*-      , criterion     == 0.8.*+      , criterion     >= 1.0.0.2 && < 1.1       , http-types       , wai       , wai-predicates       , wai-routing-