av/haskell-cron-matcher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Swap arguments

Browse Source
This commit is contained in:
Anton Vakhrushev 2017-11-11 10:30:57 +03:00
parent 44dd3aad0a
commit 8199c1bd57
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Lib.hs
View File

@ -1,5 +1,5 @@
module Lib module Lib
( check ( match
) where ) where
import Data.Bool import Data.Bool
@ -13,8 +13,8 @@ data CronItemPattern = CronItemPattern Range Step
data CronPattern = CronPattern [CronItemPattern] data CronPattern = CronPattern [CronItemPattern]
check :: DateTime -> String -> Bool match :: String -> DateTime -> Bool
check d s = checkPattern d (parseCronPattern s) match s d = matchPattern (parseCronPattern s) d
parseCronPattern :: String -> CronPattern parseCronPattern :: String -> CronPattern
parseCronPattern s = CronPattern $ map parseCronItemPattern $ words s parseCronPattern s = CronPattern $ map parseCronItemPattern $ words s
@ -22,8 +22,8 @@ parseCronPattern s = CronPattern $ map parseCronItemPattern $ words s
parseCronItemPattern :: String -> CronItemPattern parseCronItemPattern :: String -> CronItemPattern
parseCronItemPattern "*" = CronItemPattern Any All parseCronItemPattern "*" = CronItemPattern Any All
checkPattern :: DateTime -> CronPattern -> Bool matchPattern :: CronPattern -> DateTime -> Bool
checkPattern d (CronPattern (x:xs)) = checkItemPattern (year d) x matchPattern (CronPattern (x:xs)) d = matchItemPattern x (year d)
checkItemPattern :: Int -> CronItemPattern -> Bool matchItemPattern :: CronItemPattern -> Int -> Bool
checkItemPattern n (CronItemPattern Any All) = True matchItemPattern (CronItemPattern Any All) _ = True

4
test/Spec.hs
View File

@ -3,11 +3,11 @@ import Test.QuickCheck
import Control.Exception (evaluate) import Control.Exception (evaluate)
import Data.Dates import Data.Dates
import Lib (check) import Lib (match)
main :: IO () main :: IO ()
main = hspec $ do main = hspec $ do
describe "Cron ckecker" $ do describe "Cron ckecker" $ do
it "matches asterisks" $ do it "matches asterisks" $ do
check (DateTime 2017 10 11 0 0 0) "* * * * *" `shouldBe` (True :: Bool) match "* * * * *" (DateTime 2017 10 11 0 0 0) `shouldBe` (True :: Bool)