git.iko.soy/typeable/hjsonschema
on master help sign in
Rename schemaForSchemas to metaSchema.
commitfe2bfde3c8eb1f399af970d489068d72ea870553 authorIan Grant Jeffries <ian@housejeffries.com> dateTue 12 Jul 2016, 13:43 (10 years ago) parentf2f38f9
3 files changed+19−17
compare with master
unifiedsplit
changelog.txt+2 examples/AlternateSchema.hs+7−7 src/Data/JsonSchema/Draft4.hs+10−10
changelog.txt+2
@@ -1,3 +1,5 @@
1++ Rename `schemaForSchemas` to `metaSchema`.
2+
13# 1.0.0.0
24
35## Bug fixes:
examples/AlternateSchema.hs+7−7
@@ -23,7 +23,7 @@ import Data.Monoid
2323import Data.Profunctor (Profunctor (..))
2424import Data.Text (Text)
2525
26−import Data.JsonSchema.Draft4 (schemaForSchemasBytes)
26+import Data.JsonSchema.Draft4 (metaSchemaBytes)
2727import Data.JsonSchema.Draft4.Failure
2828import Data.JsonSchema.Fetch (ReferencedSchemas(..),
2929 SchemaWithURI(..))
@@ -68,21 +68,21 @@ validate rs = continueValidating rs (AN.VisitedSchemas [(Nothing, Nothing)])
6868
6969-- A schema for schemas themselves, using @src/draft4.json@ which is loaded
7070-- at compile time.
71−schemaForSchemas :: Schema
72−schemaForSchemas =
71+metaSchema :: Schema
72+metaSchema =
7373 fromMaybe (error "Schema decode failed (this should never happen)")
7474 . decode
7575 . LBS.fromStrict
76− $ schemaForSchemasBytes
76+ $ metaSchemaBytes
7777
7878checkSchema :: Schema -> [Failure]
79−checkSchema = validate referenced Nothing schemaForSchemas . Object . _unSchema
79+checkSchema = validate referenced Nothing metaSchema . Object . _unSchema
8080 where
8181 referenced :: ReferencedSchemas Schema
8282 referenced = ReferencedSchemas
83− schemaForSchemas
83+ metaSchema
8484 (HM.singleton "http://json-schema.org/draft-04/schema"
85− schemaForSchemas)
85+ metaSchema)
8686
8787--------------------------------------------------
8888-- * Spec
src/Data/JsonSchema/Draft4.hs+10−10
@@ -29,8 +29,8 @@ module Data.JsonSchema.Draft4
2929 , referencesViaFilesystem
3030
3131 -- * Other Draft 4 things exported just in case
32− , schemaForSchemas
33− , schemaForSchemasBytes
32+ , metaSchema
33+ , metaSchemaBytes
3434 , schemaValidity
3535 , referencesValidity
3636 , checkSchema
@@ -147,28 +147,28 @@ checkSchema sm sw =
147147 failures = ((\v -> (Nothing, v)) <$> schemaValidity (_swSchema sw))
148148 <> (first Just <$> referencesValidity sm)
149149
150−schemaForSchemas :: Schema
151−schemaForSchemas =
150+metaSchema :: Schema
151+metaSchema =
152152 fromMaybe (error "Schema decode failed (this should never happen)")
153153 . decode
154154 . LBS.fromStrict
155− $ schemaForSchemasBytes
155+ $ metaSchemaBytes
156156
157−schemaForSchemasBytes :: BS.ByteString
158−schemaForSchemasBytes =
157+metaSchemaBytes :: BS.ByteString
158+metaSchemaBytes =
159159 $(makeRelativeToProject "src/draft4.json" >>= embedFile)
160160
161161-- | Check that a schema itself is valid
162162-- (if so the returned list will be empty).
163163schemaValidity :: Schema -> [Failure]
164164schemaValidity =
165− Spec.validate referenced (SchemaWithURI schemaForSchemas Nothing) . toJSON
165+ Spec.validate referenced (SchemaWithURI metaSchema Nothing) . toJSON
166166 where
167167 referenced :: ReferencedSchemas Schema
168168 referenced = ReferencedSchemas
169− schemaForSchemas
169+ metaSchema
170170 (HM.singleton "http://json-schema.org/draft-04/schema"
171− schemaForSchemas)
171+ metaSchema)
172172
173173-- | Check that a set of referenced schemas are valid
174174-- (if so the returned list will be empty).