git.iko.soy/typeable/schematic
on master help sign in
Better ISO8601 regex
1da8887Denis Redozubov
src/Data/Schematic/Helpers.hs+6−3
compare with master
unifiedsplit
@@ -17,11 +17,14 @@ type IsUUID = '[UUIDRegex]
17-- ]
17-- ]
18
18
19-- components
19-- components
20−type ISO8601Date = "[1-9][0-9]{3}-(0[1-9]|1[0-2])-[0-3][0-9]"
20+type ISO8601Date = "[1-9][0-9]{3}-(0[1-9]|1[0-2])-([0-2][0-9]|3[0-1])"
21
21
22−type ISO8601Time = "(?:[0-2][0-9]:[0-2][0-9]:[0-6][0-9])?"
22+type ISO8601Time = "([0-1][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]"
23
23
24+type ISO8601DateTime =
25+ AppendSymbol
26+ ISO8601Date
24−type ISO8601DateTime = AppendSymbol ISO8601Date (AppendSymbol "T" ISO8601Time)
27+ (AppendSymbol "(T" (AppendSymbol ISO8601Time ")?"))
25
28
26type ISO8601UTC = "(Z|\\+00:00)"
29type ISO8601UTC = "(Z|\\+00:00)"
27
30
test/HelpersSpec.hs+29−4
@@ -32,6 +32,19 @@ iso8601dates = [ "1985-04-12" ]
32invalidIso8601dates :: [Text]
32invalidIso8601dates :: [Text]
33invalidIso8601dates = [ "1999-13-12" ]
33invalidIso8601dates = [ "1999-13-12" ]
34
34
35+type ISO8601TimeSchema = 'SchemaObject '[ '("time", 'SchemaText IsTime) ]
36+
37+iso8601times :: [Text]
38+iso8601times =
39+ [ "19:23:00"
40+ , "00:00:00"
41+ , "23:47:12" ]
42+
43+invalidIso8601times :: [Text]
44+invalidIso8601times =
45+ [ "00:60:00"
46+ , "24:01:02" ]
47+
35type ISO8601DateTimeSchema = 'SchemaObject '[ '("datetime", 'SchemaText IsDateTime) ]
48type ISO8601DateTimeSchema = 'SchemaObject '[ '("datetime", 'SchemaText IsDateTime) ]
36
49
37-- | Taken from ISO8601 RFC 3339
50-- | Taken from ISO8601 RFC 3339
@@ -47,11 +60,10 @@ iso8601datetimes =
47
60
48invalidIso8601datetimes :: [Text]
61invalidIso8601datetimes :: [Text]
49invalidIso8601datetimes =
62invalidIso8601datetimes =
50− [ "1985-04-29T23:20:50.52Z"
51− , "1996-12-129T16:39:57-08:00"
63+ [ "1996-13-129T16:39:57-08:00"
52 , "1990-2-31T23:59:60Z"
64 , "1990-2-31T23:59:60Z"
53− , "1990-12-31T15:59:70"
65+ , "1990-12-32T15:59:70"
54− , "1937-01-01T12:00:27.87+24:20"
66+ , "1937-01-1T12::27.87+24:20"
55 ]
67 ]
56
68
57spec :: Spec
69spec :: Spec
@@ -82,6 +94,19 @@ spec = do
82 (decodeAndValidateJson json :: ParseResult (JsonRepr ISO8601DateSchema))
94 (decodeAndValidateJson json :: ParseResult (JsonRepr ISO8601DateSchema))
83 `shouldSatisfy` isValidationError
95 `shouldSatisfy` isValidationError
84
96
97+ describe "ISO8601 time: " $ do
98+ for_ iso8601times $ \dt -> do
99+ it ("validates correct time - " <> dt ^. unpacked) $ do
100+ let json = "{\"time\": \"" <> (dt ^. unpacked . packedChars) <> "\" }"
101+ (decodeAndValidateJson json :: ParseResult (JsonRepr ISO8601TimeSchema))
102+ `shouldSatisfy` isValid
103+
104+ for_ invalidIso8601times $ \dt -> do
105+ it ("fails to validate incorrect time - " <> dt ^. unpacked) $ do
106+ let json = "{\"time\": \"" <> (dt ^. unpacked . packedChars) <> "\" }"
107+ (decodeAndValidateJson json :: ParseResult (JsonRepr ISO8601TimeSchema))
108+ `shouldSatisfy` isValidationError
109+
85 describe "ISO8601 datetime: " $ do
110 describe "ISO8601 datetime: " $ do
86 for_ iso8601datetimes $ \dt -> do
111 for_ iso8601datetimes $ \dt -> do
87 it ("validates correct datetime - " <> dt ^. unpacked) $ do
112 it ("validates correct datetime - " <> dt ^. unpacked) $ do