git.iko.soy/typeable/schematic
on master help sign in
Add decodeAndValidateVersionedWithPureMList, fix tests
5356a27Denis Redozubov
src/Data/Schematic.hs+9
compare with master
unifiedsplit
@@ -13,6 +13,7 @@ module Data.Schematic
13 , parseAndValidateTopVersionJson
13 , parseAndValidateTopVersionJson
14 , parseAndValidateWithMList
14 , parseAndValidateWithMList
15 , decodeAndValidateVersionedWithMList
15 , decodeAndValidateVersionedWithMList
16+ , decodeAndValidateVersionedWithPureMList
16 , isValid
17 , isValid
17 , isDecodingError
18 , isDecodingError
18 , isValidationError
19 , isValidationError
@@ -114,3 +115,11 @@ decodeAndValidateVersionedWithMList
114decodeAndValidateVersionedWithMList _ mlist bs = case decode bs of
115decodeAndValidateVersionedWithMList _ mlist bs = case decode bs of
115 Nothing -> pure $ DecodingError "malformed json"
116 Nothing -> pure $ DecodingError "malformed json"
116 Just x -> parseAndValidateWithMList mlist x
117 Just x -> parseAndValidateWithMList mlist x
118+
119+decodeAndValidateVersionedWithPureMList
120+ :: proxy versioned
121+ -> MList Identity (MapSnd (AllVersions versioned))
122+ -> BL.ByteString
123+ -> ParseResult (JsonRepr (Head (MapSnd (AllVersions versioned))))
124+decodeAndValidateVersionedWithPureMList a b c =
125+ runIdentity $ decodeAndValidateVersionedWithMList a b c
test/SchemaSpec.hs+9−14
@@ -2,8 +2,9 @@
2
2
3module SchemaSpec (spec, main) where
3module SchemaSpec (spec, main) where
4
4
5−import Data.ByteString.Lazy
6import Data.Aeson
5import Data.Aeson
6+import Data.ByteString.Lazy
7+import Data.Functor.Identity
7import Data.Proxy
8import Data.Proxy
8import Data.Schematic
9import Data.Schematic
9import Data.Vinyl
10import Data.Vinyl
@@ -44,14 +45,6 @@ topObject = ReprObject $
44 :& FieldRepr (ReprText "test")
45 :& FieldRepr (ReprText "test")
45 :& RNil
46 :& RNil
46
47
47−instance
48− MigrateSchema
49− SchemaExample
50− ('SchemaObject
51− '[ '("foo", 'SchemaNumber '[]), '("bar", 'SchemaText '[])])
52− where
53− migrate = const topObject
54−
55spec :: Spec
48spec :: Spec
56spec = do
49spec = do
57 -- it "show/read JsonRepr properly" $
50 -- it "show/read JsonRepr properly" $
@@ -67,13 +60,15 @@ spec = do
67 it "validates incorrect representation" $
60 it "validates incorrect representation" $
68 ((decodeAndValidateJson schemaJson2) :: ParseResult (JsonRepr SchemaExample))
61 ((decodeAndValidateJson schemaJson2) :: ParseResult (JsonRepr SchemaExample))
69 `shouldSatisfy` isValidationError
62 `shouldSatisfy` isValidationError
70− it "validates versioned json" $ do
63+ -- it "validates versioned json" $ do
71− decodeAndValidateVersionedJson (Proxy @VS) schemaJson
64+ -- decodeAndValidateVersionedJson (Proxy @VS) schemaJson
72− `shouldSatisfy` isValid
65+ -- `shouldSatisfy` isValid
73 it "validates versioned json with a migration list" $ do
66 it "validates versioned json with a migration list" $ do
74− decodeAndValidateVersionedWithMList
67+ decodeAndValidateVersionedWithPureMList
75 (Proxy @VS)
68 (Proxy @VS)
69+ ((:&&)
76− ((:&&) (Proxy @(SchemaByRevision "test_revision" VS)) (const topObject) MNil)
70+ (Proxy @(SchemaByRevision "test_revision" VS))
71+ (const $ Identity topObject) MNil)
77 schemaJson
72 schemaJson
78 `shouldSatisfy` isValid
73 `shouldSatisfy` isValid
79
74