Merge pull request #31 from menelaos/match-int

Add support for matching integer path components

Author: garyb

bower.json

@@ -37,7 +37,8 @@
     "purescript-validation": "^2.0.0",
     "purescript-aff": "^2.0.0",
     "purescript-control": "^2.0.0",
-    "purescript-console": "^2.0.0"
+    "purescript-console": "^2.0.0",
+    "purescript-integers": "^2.1.0"
   },
   "devDependencies": {
     "purescript-console": "^2.0.0"

src/Routing/Match.purs

@@ -8,6 +8,7 @@ import Control.Plus (class Plus)
 
 import Data.Either (Either(..))
 import Data.Foldable (foldl)
+import Data.Int (fromString)
 import Data.List (List(..), reverse)
 import Data.Map as M
 import Data.Maybe (Maybe(..))
@@ -50,6 +51,14 @@ instance matchMatchClass :: MatchClass Match where
       _ ->
         invalid $ free ExpectedNumber
 
+  int = Match \route ->
+    case route of
+      Cons (Path input) rs -> case fromString input of
+        Nothing -> invalid $ free ExpectedInt
+        Just res -> pure $ Tuple rs res
+      _ ->
+        invalid $ free ExpectedInt
+
   bool = Match \route ->
     case route of
       Cons (Path input) rs | input == "true" ->

src/Routing/Match/Class.purs

@@ -26,6 +26,9 @@ class (Alternative f) <= MatchClass f where
   -- | `num` matches any numerical path component.
   num :: f Number
 
+  -- | `int` matches any integer path component.
+  int :: f Int
+
   -- | `bool` matches any boolean path component.
   bool :: f Boolean
 

src/Routing/Match/Error.purs

@@ -9,6 +9,8 @@ data MatchError
   | ExpectedBoolean
     -- expected numeric literal
   | ExpectedNumber
+    -- expected integer literal
+  | ExpectedInt
     -- expected string literal (found query probably or eol) 
   | ExpectedString
     -- expected query found path part or eol
@@ -27,6 +29,7 @@ showMatchError err =
     KeyNotFound str -> "key: " <> str <> " has not found in query part"
     ExpectedQuery -> "expected query - found path"
     ExpectedNumber -> "expected number"
+    ExpectedInt -> "expected int"
     ExpectedBoolean -> "expected boolean"
     ExpectedString -> "expected string var"
     ExpectedPathPart -> "expected path part, found query"

test/Test/Main.purs

@@ -1,6 +1,6 @@
 module Test.Main where
 
-import Prelude (class Show, Unit, show, ($), (<$>), (*>), (<*>), (<>))
+import Prelude (class Show, Unit, bind, show, ($), (<$>), (*>), (<*>), (<>))
 import Control.Monad.Eff (Eff)
 import Control.Monad.Eff.Console (CONSOLE(), logShow)
 import Control.Alt ((<|>))
@@ -10,25 +10,32 @@ import Data.Map as M
 
 import Routing (matchHash)
 import Routing.Match (Match, list)
-import Routing.Match.Class (num, param, bool, lit, params)
+import Routing.Match.Class (num, int, param, bool, lit, params)
 
-data FooBar = Foo Number (M.Map String String) | Bar Boolean String | Baz (List Number)
+data FooBar
+  = Foo Number (M.Map String String)
+  | Bar Boolean String
+  | Baz (List Number)
+  | Quux Int
 
 instance showFooBar :: Show FooBar where
   show (Foo num q) = "(Foo " <> show num <> " " <> show q <> ")"
   show (Bar bool str) = "(Bar " <> show bool <> " " <> show str <> ")"
   show (Baz lst) = "(Baz " <> show lst <> ")"
+  show (Quux i) = "(Quux " <> show i <> ")"
 
 routing :: Match FooBar
 routing =
   Foo <$> (lit "foo" *> num) <*> params
     <|> Bar <$> (lit "bar" *> bool) <*> (param "baz")
+    <|> Quux <$> (lit "" *> lit "quux" *> int)
     <|> Baz <$> (list num)
 
 
 main :: Eff (console :: CONSOLE) Unit
 main = do
   logShow $ matchHash routing "foo/12/?welp='hi'&b=false"
+  logShow $ matchHash routing "/quux/42"
 
   -- (minimal test for browser)