Merge pull request #33 from menelaos/rename-matchhash

Rename `matchHash` and `matchHash'`

Author: cryogenian

src/Routing.purs

@@ -3,8 +3,8 @@ module Routing (
   hashes,
   matches,
   matches',
-  matchHash,
-  matchHash',
+  match,
+  matchWith,
   matchesAff,
   matchesAff'
   ) where
@@ -46,7 +46,7 @@ matches = matches' decodeURIComponent
 matches' :: forall e a. (String -> String) ->
             Match a -> (Maybe a -> a -> Eff e Unit) -> Eff e Unit
 matches' decoder routing cb = hashes $ \old new ->
-  let mr = matchHash' decoder routing
+  let mr = matchWith decoder routing
       fst = either (const Nothing) Just $ mr old
   in either (const $ pure unit) (cb fst) $ mr new
 
@@ -61,8 +61,8 @@ matchesAff :: forall e a. Match a -> Aff e (Tuple (Maybe a) a)
 matchesAff = matchesAff' decodeURIComponent
 
 
-matchHash :: forall a. Match a -> String -> Either String a
-matchHash = matchHash' decodeURIComponent
+match :: forall a. Match a -> String -> Either String a
+match = matchWith decodeURIComponent
 
-matchHash' :: forall a. (String -> String) -> Match a -> String -> Either String a
-matchHash' decoder matcher hash = runMatch matcher $ parse decoder hash
+matchWith :: forall a. (String -> String) -> Match a -> String -> Either String a
+matchWith decoder matcher hash = runMatch matcher $ parse decoder hash

test/Test/Main.purs

@@ -8,7 +8,7 @@ import Data.List (List)
 import Data.Map as M
 
 
-import Routing (matchHash)
+import Routing (match)
 import Routing.Match (Match, list)
 import Routing.Match.Class (num, int, param, bool, lit, params)
 
@@ -34,8 +34,8 @@ routing =
 
 main :: Eff (console :: CONSOLE) Unit
 main = do
-  logShow $ matchHash routing "foo/12/?welp='hi'&b=false"
-  logShow $ matchHash routing "/quux/42"
+  logShow $ match routing "foo/12/?welp='hi'&b=false"
+  logShow $ match routing "/quux/42"
 
   -- (minimal test for browser)