web-routes-quasi 0.6.0.1 → 0.6.1

raw patch · 2 files changed

+11/−16 lines, 2 filesdep ~template-haskellPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: template-haskell

API changes (from Hackage documentation)

Files

• Web/Routes/Quasi/Parse.hs +9/−14
• web-routes-quasi.cabal +2/−2

@@ -18,11 +18,7 @@ -- overlapping routes, failing if present; use 'parseRoutesNoCheck' to skip the -- checking. See documentation site for details on syntax. parseRoutes :: QuasiQuoter-parseRoutes = QuasiQuoter-    { quoteExp = x-    , quotePat = y-    }-  where+parseRoutes = QuasiQuoter x y where     x s = do         let res = resourcesFromString s         case findOverlaps res of@@ -32,11 +28,7 @@  -- | Same as 'parseRoutes', but performs no overlap checking. parseRoutesNoCheck :: QuasiQuoter-parseRoutesNoCheck = QuasiQuoter-    { quoteExp = x-    , quotePat = y-    }-  where+parseRoutesNoCheck = QuasiQuoter x y where     x = lift . resourcesFromString     y = dataToPatQ (const Nothing) . resourcesFromString @@ -80,15 +72,18 @@         return $ c `AppE` s'  -- | Convert a multi-line string to a set of resources. See documentation for--- the format of this string. This is a partial function which calls error on+-- the format of this string. This is a partial function which calls 'error' on -- invalid input. resourcesFromString :: String -> [Resource]-resourcesFromString = map go . filter (not . null) . map trim . lines where+resourcesFromString =+    mapMaybe go . lines+  where     go s =-        case words s of+        case takeWhile (/= "--") $ words s of             (pattern:constr:rest) ->                 let pieces = piecesFromString $ drop1Slash pattern-                 in Resource constr pieces rest+                 in Just $ Resource constr pieces rest+            [] -> Nothing             _ -> error $ "Invalid resource line: " ++ s  -- | Drop leading whitespace.

@@ -1,5 +1,5 @@ name:            web-routes-quasi-version:         0.6.0.1+version:         0.6.1 license:         BSD3 license-file:    LICENSE author:          Michael Snoyman <michael@snoyman.com>@@ -16,7 +16,7 @@   default: False  library-    build-depends:   base >= 4 && < 5, template-haskell >= 2.4 && < 2.6+    build-depends:   base >= 4 && < 5, template-haskell >= 2.4 && < 2.5     exposed-modules: Web.Routes.Quasi                      Web.Routes.Quasi.Classes                      Web.Routes.Quasi.Parse