1e7b2c1 · typeable/hjsonschema

git.iko.soy/typeable/hjsonschema

1.4.0.0.

+ Rename `Data.JsonSchema.*` modules to `JSONSchema.*`. + Rename `Data.Validator.*` modules to `JSONSchema.Validator.*`.

commit1e7b2c1e925318736fd4f2c0cd834ec04857ac3a authorIan Grant Jeffries <ian@housejeffries.com> dateSun 8 Jan 2017, 21:30 (10 years ago) parent5800046

26 files changed+195−190

compare with master

unifiedsplit

changelog.md+5

@@ -1,3 +1,8 @@

1+# 1.4.0.0

3++ Rename `Data.JsonSchema.*` modules to `JSONSchema.*`.

4++ Rename `Data.Validator.*` modules to `JSONSchema.Validator.*`.

16# 1.3.0.1

38+ Bump `vector`.

examples/AlternateSchema.hs+20−20

@@ -1,8 +1,8 @@

11-- | An implementation of JSON Schema Draft 4 based on 'HashMap Text Value'

2−-- instead of a custom record type like 'Data.JsonSchema.Draft4'.

2+-- instead of a custom record type like 'JSONSchema.Draft4'.

33--

44-- If you're writing code for a new schema specification you probably want

5−-- to copy this module instead of the 'Data.JsonSchema.Draft4'. While it's

5+-- to copy this module instead of the 'JSONSchema.Draft4'. While it's

66-- less convenient to write schemas in Haskell without a record type, you

77-- can get the implementation finished with far fewer lines of code.

@@ -10,23 +10,23 @@ module AlternateSchema where

1010

1111import Protolude

1212

13−import Data.Aeson (FromJSON(..), Value(..),

14− decode)

15−import qualified Data.Aeson as AE

16−import qualified Data.ByteString.Lazy as LBS

17−import qualified Data.HashMap.Strict as HM

18−import Data.Maybe (fromMaybe)

19−import Data.Profunctor (Profunctor (..))

20−

21−import Data.JsonSchema.Draft4 (ValidatorFailure(..),

22− metaSchemaBytes)

23−import Data.JsonSchema.Fetch (ReferencedSchemas(..),

24− SchemaWithURI(..))

25−import qualified Data.JsonSchema.Fetch as FE

26−import Data.JsonSchema.Types (Schema(..), Spec(..))

27−import qualified Data.JsonSchema.Types as JT

28−import qualified Data.Validator.Draft4 as D4

29−import Data.Validator.Reference (updateResolutionScope)

13+import Data.Aeson (FromJSON(..), Value(..),

14+ decode)

15+import qualified Data.Aeson as AE

16+import qualified Data.ByteString.Lazy as LBS

17+import qualified Data.HashMap.Strict as HM

18+import Data.Maybe (fromMaybe)

19+import Data.Profunctor (Profunctor (..))

20+

21+import JSONSchema.Draft4 (ValidatorFailure(..),

22+ metaSchemaBytes)

23+import JSONSchema.Fetch (ReferencedSchemas(..),

24+ SchemaWithURI(..))

25+import qualified JSONSchema.Fetch as FE

26+import JSONSchema.Types (Schema(..), Spec(..))

27+import qualified JSONSchema.Types as JT

28+import qualified JSONSchema.Validator.Draft4 as D4

29+import JSONSchema.Validator.Reference (updateResolutionScope)

3030

3131--------------------------------------------------

3232-- * Basic fetching tools

@@ -107,7 +107,7 @@ d4Spec

107107 -> Maybe Text

108108 -> Spec Schema ValidatorFailure

109109 -- ^ Here we reuses 'ValidatorFailure' from

110− -- 'Data.JsonSchema.Draft4.Failure'. If your validators have different

110+ -- 'JSONSchema.Draft4.Failure'. If your validators have different

111111 -- failure possibilities you'll need to create your own validator

112112 -- failure type.

113113d4Spec referenced visited scope =

examples/Simple.hs+5−5

@@ -3,12 +3,12 @@ module Simple where

44import Protolude

6−import Data.Aeson (Value(..), decode, toJSON)

7−import qualified Data.ByteString.Lazy as LBS

8−import qualified Data.List.NonEmpty as NE

9−import Data.Maybe (fromMaybe)

6+import Data.Aeson (Value(..), decode, toJSON)

7+import qualified Data.ByteString.Lazy as LBS

8+import qualified Data.List.NonEmpty as NE

9+import Data.Maybe (fromMaybe)

1010

11−import qualified Data.JsonSchema.Draft4 as D4

11+import qualified JSONSchema.Draft4 as D4

1212

1313badData :: Value

1414badData = toJSON [True, True]

examples/TwoStep.hs+4−4

@@ -15,11 +15,11 @@ module TwoStep where

1515

1616import Protolude

1717

18−import Data.Aeson (Value (..), toJSON)

19−import qualified Data.List.NonEmpty as NE

18+import Data.Aeson (Value (..), toJSON)

19+import qualified Data.List.NonEmpty as NE

2020

21−import qualified Data.JsonSchema.Draft4 as D4

22−import qualified Data.Validator.Draft4 as VAL

21+import qualified JSONSchema.Draft4 as D4

22+import qualified JSONSchema.Validator.Draft4 as VAL

2323

2424schema :: D4.Schema

2525schema = D4.emptySchema { D4._schemaRef = Just "./unique.json" }

hjsonschema.cabal+17−17

@@ -1,5 +1,5 @@

11name: hjsonschema

2−version: 1.3.0.1

2+version: 1.4.0.0

33synopsis: JSON Schema library

44homepage: https://github.com/seagreen/hjsonschema

55license: MIT

@@ -38,23 +38,23 @@ library

3838 ghc-options:

3939 -Wall

4040 exposed-modules:

41− Data.JsonSchema.Draft4

42− , Data.JsonSchema.Draft4.Failure

43− , Data.JsonSchema.Draft4.Schema

44− , Data.JsonSchema.Draft4.Spec

45− , Data.JsonSchema.Fetch

46− , Data.JsonSchema.Types

47− , Data.Validator.Draft4

48− , Data.Validator.Draft4.Any

49− , Data.Validator.Draft4.Array

50− , Data.Validator.Draft4.Number

51− , Data.Validator.Draft4.Object

52− , Data.Validator.Draft4.String

53− , Data.Validator.Reference

54− , Data.Validator.Types

55− , Data.Validator.Utils

41+ JSONSchema.Draft4

42+ , JSONSchema.Draft4.Failure

43+ , JSONSchema.Draft4.Schema

44+ , JSONSchema.Draft4.Spec

45+ , JSONSchema.Fetch

46+ , JSONSchema.Types

47+ , JSONSchema.Validator.Draft4

48+ , JSONSchema.Validator.Draft4.Any

49+ , JSONSchema.Validator.Draft4.Array

50+ , JSONSchema.Validator.Draft4.Number

51+ , JSONSchema.Validator.Draft4.Object

52+ , JSONSchema.Validator.Draft4.String

53+ , JSONSchema.Validator.Reference

54+ , JSONSchema.Validator.Types

55+ , JSONSchema.Validator.Utils

5656 other-modules:

57− Data.Validator.Draft4.Object.Properties

57+ JSONSchema.Validator.Draft4.Object.Properties

5858 , Import

5959 build-depends:

6060 base >= 4.7 && < 4.10

src/Data/JsonSchema/Draft4.hs → src/JSONSchema/Draft4.hsrenamed+19−19

@@ -1,6 +1,6 @@

11{-# LANGUAGE TemplateHaskell #-}

3−module Data.JsonSchema.Draft4

3+module JSONSchema.Draft4

44 ( -- * Draft 4 Schema

55 SchemaWithURI(..)

66 , Schema(..)

@@ -38,23 +38,23 @@ module Data.JsonSchema.Draft4

3838

3939import Import

4040

41−import Control.Arrow (left)

42−import qualified Data.ByteString as BS

43−import Data.FileEmbed (embedFile,

44− makeRelativeToProject)

45−import qualified Data.HashMap.Strict as HM

46−import qualified Data.List.NonEmpty as NE

47−import Data.Maybe (fromMaybe)

48−

49−import Data.JsonSchema.Draft4.Failure (Invalid(..),

50− SchemaInvalid(..),

51− ValidatorFailure(..))

52−import Data.JsonSchema.Draft4.Schema (Schema)

53−import qualified Data.JsonSchema.Draft4.Schema as SC

54−import qualified Data.JsonSchema.Draft4.Spec as Spec

55−import Data.JsonSchema.Fetch (ReferencedSchemas(..),

56− SchemaWithURI(..))

57−import qualified Data.JsonSchema.Fetch as FE

41+import Control.Arrow (left)

42+import qualified Data.ByteString as BS

43+import Data.FileEmbed (embedFile,

44+ makeRelativeToProject)

45+import qualified Data.HashMap.Strict as HM

46+import qualified Data.List.NonEmpty as NE

47+import Data.Maybe (fromMaybe)

48+

49+import JSONSchema.Draft4.Failure (Invalid(..),

50+ SchemaInvalid(..),

51+ ValidatorFailure(..))

52+import JSONSchema.Draft4.Schema (Schema)

53+import qualified JSONSchema.Draft4.Schema as SC

54+import qualified JSONSchema.Draft4.Spec as Spec

55+import JSONSchema.Fetch (ReferencedSchemas(..),

56+ SchemaWithURI(..))

57+import qualified JSONSchema.Fetch as FE

5858

5959data HTTPValidationFailure

6060 = HVRequest FE.HTTPFailure

@@ -115,7 +115,7 @@ fetchFilesystemAndValidate sw v = do

115115 , _invalidFailures = invalid

116116 })

117117

118−-- | An instance of 'Data.JsonSchema.Fetch.FetchInfo' specialized for

118+-- | An instance of 'JSONSchema.Fetch.FetchInfo' specialized for

119119-- JSON Schema Draft 4.

120120draft4FetchInfo :: FE.FetchInfo Schema

121121draft4FetchInfo = FE.FetchInfo Spec.embedded SC._schemaId SC._schemaRef

src/Data/JsonSchema/Draft4/Failure.hs → src/JSONSchema/Draft4/Failure.hsrenamed+3−3

@@ -1,10 +1,10 @@

2−module Data.JsonSchema.Draft4.Failure where

2+module JSONSchema.Draft4.Failure where

44import Import

6−import Data.JsonSchema.Draft4.Schema (Schema)

7−import qualified Data.Validator.Draft4 as D4

6+import JSONSchema.Draft4.Schema (Schema)

7+import qualified JSONSchema.Validator.Draft4 as D4

99-- | Used to report an entire instance being invalidated, as opposed

1010-- to the failure of a single validator.

src/Data/JsonSchema/Draft4/Schema.hs → src/JSONSchema/Draft4/Schema.hsrenamed+9−9

@@ -1,17 +1,17 @@

2−module Data.JsonSchema.Draft4.Schema where

2+module JSONSchema.Draft4.Schema where

4−import Import hiding (mapMaybe)

4+import Import hiding (mapMaybe)

6−import qualified Data.HashMap.Strict as HM

7−import Data.List.NonEmpty (NonEmpty)

8−import Data.Maybe (fromJust, isJust)

6+import qualified Data.HashMap.Strict as HM

7+import Data.List.NonEmpty (NonEmpty)

8+import Data.Maybe (fromJust, isJust)

99import Data.Scientific

10−import qualified Data.Set as Set

11−import qualified Data.Text as T

10+import qualified Data.Set as Set

11+import qualified Data.Text as T

1212

13−import qualified Data.Validator.Draft4 as D4

14−import Data.Validator.Utils

13+import qualified JSONSchema.Validator.Draft4 as D4

14+import JSONSchema.Validator.Utils

1515

1616data Schema = Schema

1717 { _schemaVersion :: Maybe Text

src/Data/JsonSchema/Draft4/Spec.hs → src/JSONSchema/Draft4/Spec.hsrenamed+9−9

@@ -1,20 +1,20 @@

2−module Data.JsonSchema.Draft4.Spec where

2+module JSONSchema.Draft4.Spec where

44import Import

66import Data.Maybe (fromMaybe)

77import Data.Profunctor (Profunctor(..))

9−import Data.JsonSchema.Draft4.Failure

10−import Data.JsonSchema.Draft4.Schema (Schema(..))

11−import Data.JsonSchema.Fetch (ReferencedSchemas(..),

9+import JSONSchema.Draft4.Failure

10+import JSONSchema.Draft4.Schema (Schema(..))

11+import JSONSchema.Fetch (ReferencedSchemas(..),

1212 SchemaWithURI(..))

13−import qualified Data.JsonSchema.Fetch as FE

14−import Data.JsonSchema.Types (Spec(..))

15−import qualified Data.JsonSchema.Types as JT

16−import Data.Validator.Draft4

17−import Data.Validator.Reference (updateResolutionScope)

13+import qualified JSONSchema.Fetch as FE

14+import JSONSchema.Types (Spec(..))

15+import qualified JSONSchema.Types as JT

16+import JSONSchema.Validator.Draft4

17+import JSONSchema.Validator.Reference (updateResolutionScope)

1818

1919embedded :: Schema -> ([Schema], [Schema])

2020embedded s = JT.embedded (d4Spec (ReferencedSchemas s mempty) mempty Nothing) s

src/Data/JsonSchema/Fetch.hs → src/JSONSchema/Fetch.hsrenamed+12−12

@@ -1,19 +1,19 @@

2−module Data.JsonSchema.Fetch where

2+module JSONSchema.Fetch where

44import Import

6−import Control.Arrow (left)

7−import Control.Exception (IOException, catch)

8−import Control.Monad (foldM)

9−import qualified Data.ByteString as BS

10−import qualified Data.ByteString.Lazy as LBS

11−import qualified Data.HashMap.Strict as HM

12−import qualified Data.Text as T

13−import qualified Network.HTTP.Client as NC

14−

15−import Data.Validator.Reference (resolveReference,

16− updateResolutionScope)

6+import Control.Arrow (left)

7+import Control.Exception (IOException, catch)

8+import Control.Monad (foldM)

9+import qualified Data.ByteString as BS

10+import qualified Data.ByteString.Lazy as LBS

11+import qualified Data.HashMap.Strict as HM

12+import qualified Data.Text as T

13+import qualified Network.HTTP.Client as NC

14+

15+import JSONSchema.Validator.Reference (resolveReference,

16+ updateResolutionScope)

1717

1818--------------------------------------------------

1919-- * Types

src/Data/JsonSchema/Types.hs → src/JSONSchema/Types.hsrenamed+5−5

@@ -1,9 +1,9 @@

2−module Data.JsonSchema.Types where

2+module JSONSchema.Types where

44import Import

6−import Data.Validator.Types (Validator(..))

6+import JSONSchema.Validator.Types (Validator(..))

88newtype Spec schema err

99 = Spec { _unSpec :: [Validator schema schema err] }

@@ -12,7 +12,7 @@ newtype Spec schema err

1212--

1313-- The first list is subschemas validating the same level of the document,

1414-- the second list is subschemas validating lower levels (see

15−-- 'Data.Validator.Types.Fail' for a full explanation).

15+-- 'JSONSchema.Validator.Types.Fail' for a full explanation).

1616embedded :: Spec schema a -> schema -> ([schema], [schema])

1717embedded spec schema =

1818 let embeds = (\val -> _embedded val schema) <$> _unSpec spec

@@ -28,8 +28,8 @@ validate spec schema v =

2828

2929-- | A basic schema type that doesn't impose much structure.

3030--

31−-- 'Data.JsonSchema.Draft4' doesn't use this, but instead uses the one

32−-- defined in 'Data.JsonSchema.Draft4.Schema' to make it easier to write

31+-- 'JSONSchema.Draft4' doesn't use this, but instead uses the record based

32+-- one defined in 'JSONSchema.Draft4.Schema' to make it easier to write

3333-- draft 4 schemas in Haskell.

3434newtype Schema

3535 = Schema { _unSchema :: HashMap Text Value }

src/Data/Validator/Draft4.hs → src/JSONSchema/Validator/Draft4.hsrenamed+14−14

@@ -1,24 +1,24 @@

11-- | Turn the validation functions into actual 'Validator's.

3−module Data.Validator.Draft4

4− ( module Data.Validator.Draft4

3+module JSONSchema.Validator.Draft4

4+ ( module JSONSchema.Validator.Draft4

55 , module Export

66 ) where

88import Import

10−import qualified Data.HashMap.Strict as HM

11−import qualified Data.List.NonEmpty as NE

12−import Data.Maybe (catMaybes, maybe, maybeToList)

13−import Data.Text (Text)

14−

15−import Data.Validator.Draft4.Any as Export

16−import Data.Validator.Draft4.Array as Export

17−import Data.Validator.Draft4.Number as Export

18−import Data.Validator.Draft4.Object as Export

19−import Data.Validator.Draft4.String as Export

20−import Data.Validator.Types (Validator(..))

21−import Data.Validator.Utils (fromJSONEither)

10+import qualified Data.HashMap.Strict as HM

11+import qualified Data.List.NonEmpty as NE

12+import Data.Maybe (catMaybes, maybe, maybeToList)

13+import Data.Text (Text)

14+

15+import JSONSchema.Validator.Draft4.Any as Export

16+import JSONSchema.Validator.Draft4.Array as Export

17+import JSONSchema.Validator.Draft4.Number as Export

18+import JSONSchema.Validator.Draft4.Object as Export

19+import JSONSchema.Validator.Draft4.String as Export

20+import JSONSchema.Validator.Types (Validator(..))

21+import JSONSchema.Validator.Utils (fromJSONEither)

2222

2323-- | For internal use.

2424--

src/Data/Validator/Draft4/Any.hs → src/JSONSchema/Validator/Draft4/Any.hsrenamed+13−12

@@ -1,19 +1,20 @@

2−module Data.Validator.Draft4.Any where

2+module JSONSchema.Validator.Draft4.Any where

44import Import

6−import Data.List.NonEmpty (NonEmpty((:|)))

7−import qualified Data.List.NonEmpty as NE

8−import qualified Data.Scientific as SCI

9−import Data.Semigroup (Semigroup) -- for older GHCs

10−import Data.Set (Set)

11−import qualified Data.Set as S

12−import qualified JSONPointer as JP

6+import Data.List.NonEmpty (NonEmpty((:|)))

7+import qualified Data.List.NonEmpty as NE

8+import qualified Data.Scientific as SCI

9+import Data.Semigroup (Semigroup) -- for older GHCs

10+import Data.Set (Set)

11+import qualified Data.Set as S

12+import qualified JSONPointer as JP

1313

14−import qualified Data.Validator.Utils as UT

15−import Data.Validator.Reference (URIBaseAndFragment,

16− resolveFragment, resolveReference)

14+import qualified JSONSchema.Validator.Utils as UT

15+import JSONSchema.Validator.Reference (URIBaseAndFragment,

16+ resolveFragment,

17+ resolveReference)

1718

1819--------------------------------------------------

1920-- * $ref

@@ -125,7 +126,7 @@ enumVal a@(EnumValidator vs) x

125126--------------------------------------------------

126127

127128-- | This is separate from 'TypeValidator' so that 'TypeValidator' can

128−-- be used to write 'Data.JsonSchema.Draft4.Schema.Schema' without

129+-- be used to write 'JSONSchema.Draft4.Schema.Schema' without

129130-- messing up the 'FromJSON' instance of that data type.

130131newtype TypeContext

131132 = TypeContext { _unTypeContext :: TypeValidator }

src/Data/Validator/Draft4/Array.hs → src/JSONSchema/Validator/Draft4/Array.hsrenamed+5−5

@@ -1,13 +1,13 @@

2−module Data.Validator.Draft4.Array where

2+module JSONSchema.Validator.Draft4.Array where

44import Import

6−import qualified Data.List.NonEmpty as NE

7−import qualified Data.Vector as V

8−import qualified JSONPointer as JP

6+import qualified Data.List.NonEmpty as NE

7+import qualified Data.Vector as V

8+import qualified JSONPointer as JP

10−import Data.Validator.Utils (allUniqueValues)

10+import JSONSchema.Validator.Utils (allUniqueValues)

1111

1212--------------------------------------------------

1313-- * maxItems

src/Data/Validator/Draft4/Number.hs → src/JSONSchema/Validator/Draft4/Number.hsrenamed+1−1

@@ -1,5 +1,5 @@

2−module Data.Validator.Draft4.Number where

2+module JSONSchema.Validator.Draft4.Number where

44import Import

src/Data/Validator/Draft4/Object.hs → src/JSONSchema/Validator/Draft4/Object.hsrenamed+10−10

@@ -1,19 +1,19 @@

2−module Data.Validator.Draft4.Object

3− ( module Data.Validator.Draft4.Object

4− , module Data.Validator.Draft4.Object.Properties

2+module JSONSchema.Validator.Draft4.Object

3+ ( module JSONSchema.Validator.Draft4.Object

4+ , module JSONSchema.Validator.Draft4.Object.Properties

55 ) where

77import Import

9−import qualified Data.HashMap.Strict as HM

10−import qualified Data.List.NonEmpty as NE

11−import Data.Set (Set)

12−import qualified Data.Set as S

13−import qualified Data.Text as T

9+import qualified Data.HashMap.Strict as HM

10+import qualified Data.List.NonEmpty as NE

11+import Data.Set (Set)

12+import qualified Data.Set as S

13+import qualified Data.Text as T

1414

15−import Data.Validator.Draft4.Object.Properties

16−import Data.Validator.Utils

15+import JSONSchema.Validator.Draft4.Object.Properties

16+import JSONSchema.Validator.Utils

1717

1818--------------------------------------------------

1919-- * maxProperties

src/Data/Validator/Draft4/Object/Properties.hs → src/JSONSchema/Validator/Draft4/Object/Properties.hsrenamed+1−1

@@ -1,5 +1,5 @@

2−module Data.Validator.Draft4.Object.Properties where

2+module JSONSchema.Validator.Draft4.Object.Properties where

44import Import

src/Data/Validator/Draft4/String.hs → src/JSONSchema/Validator/Draft4/String.hsrenamed+1−1

@@ -1,5 +1,5 @@

2−module Data.Validator.Draft4.String where

2+module JSONSchema.Validator.Draft4.String where

44import Import

src/Data/Validator/Reference.hs → src/JSONSchema/Validator/Reference.hsrenamed+1−1

@@ -4,7 +4,7 @@

44-- And is extended for JSON Schema here:

55-- <http://json-schema.org/latest/json-schema-core.html#anchor26>

7−module Data.Validator.Reference where

7+module JSONSchema.Validator.Reference where

99import Import

1010

src/Data/Validator/Types.hs → src/JSONSchema/Validator/Types.hsrenamed+1−1

@@ -1,5 +1,5 @@

2−module Data.Validator.Types where

2+module JSONSchema.Validator.Types where

44import Import

src/Data/Validator/Utils.hs → src/JSONSchema/Validator/Utils.hsrenamed+9−9

@@ -1,16 +1,16 @@

2−module Data.Validator.Utils where

2+module JSONSchema.Validator.Utils where

44import Import

6−import Control.Monad (fail)

7−import qualified Data.HashMap.Strict as HM

8−import qualified Data.List.NonEmpty as NE

9−import Data.Scientific (Scientific, fromFloatDigits)

10−import Data.Set (Set)

11−import qualified Data.Set as S

12−import qualified Data.Text as T

13−import qualified Data.Vector as V

6+import Control.Monad (fail)

7+import qualified Data.HashMap.Strict as HM

8+import qualified Data.List.NonEmpty as NE

9+import Data.Scientific (Scientific, fromFloatDigits)

10+import Data.Set (Set)

11+import qualified Data.Set as S

12+import qualified Data.Text as T

13+import qualified Data.Vector as V

1414

1515--------------------------------------------------

1616-- * QuickCheck

test/Local.hs+8−8

@@ -4,15 +4,15 @@ module Main where

44import Protolude

66import Data.Aeson

7−import qualified Data.List.NonEmpty as NE

8−import qualified System.Timeout as TO

7+import qualified Data.List.NonEmpty as NE

8+import qualified System.Timeout as TO

99import Test.Hspec

10−import Test.QuickCheck (property)

10+import Test.QuickCheck (property)

1111

12−import qualified Data.JsonSchema.Draft4 as D4

13−import Data.JsonSchema.Fetch (ReferencedSchemas(..),

14− URISchemaMap(..))

15−import qualified Data.JsonSchema.Types as JT

12+import qualified JSONSchema.Draft4 as D4

13+import JSONSchema.Fetch (ReferencedSchemas(..),

14+ URISchemaMap(..))

15+import qualified JSONSchema.Types as JT

1616import qualified Local.Failure

1717import qualified Local.Validation

1818import qualified Local.Reference

@@ -46,7 +46,7 @@ main = do

4646 describe "Examples" exampleTests

4747 describe "QuickCheck" quickCheckTests

4848 describe "Failure" Local.Failure.spec

49− describe "Data.Validator.Reference" Local.Reference.spec

49+ describe "JSONSchema.Validator.Reference" Local.Reference.spec

5050 describe "Supplementary validation tests written in Haskell"

5151 Local.Validation.spec

5252

test/Local/Failure.hs+11−11

@@ -8,9 +8,9 @@ import Test.Hspec

88import qualified Data.Vector as V

99import qualified JSONPointer as JP

1010

11−import Data.JsonSchema.Draft4

12−import qualified Data.JsonSchema.Draft4.Spec as Spec

13−import qualified Data.Validator.Draft4 as D4

11+import JSONSchema.Draft4

12+import qualified JSONSchema.Draft4.Spec as Spec

13+import qualified JSONSchema.Validator.Draft4 as VAL

1414

1515spec :: Spec

1616spec = do

@@ -21,9 +21,9 @@ spec = do

2121itemsArray :: Expectation

2222itemsArray =

2323 failures `shouldBe`

24− [ FailureItems (D4.ItemsArrayInvalid (

24+ [ FailureItems (VAL.ItemsArrayInvalid (

2525 pure ( JP.Index 0

26− , pure (FailureUniqueItems (D4.UniqueItemsInvalid

26+ , pure (FailureUniqueItems (VAL.UniqueItemsInvalid

2727 (V.fromList [Null, Null])

2828 ))

2929 )

@@ -35,7 +35,7 @@ itemsArray =

3535

3636 schema :: Schema

3737 schema = emptySchema

38− { _schemaItems = Just $ D4.ItemsArray

38+ { _schemaItems = Just $ VAL.ItemsArray

3939 [emptySchema { _schemaUniqueItems = Just True }]

4040 }

4141

@@ -51,9 +51,9 @@ itemsArray =

5151itemsObject :: Expectation

5252itemsObject =

5353 failures `shouldBe`

54− [ FailureItems (D4.ItemsObjectInvalid (

54+ [ FailureItems (VAL.ItemsObjectInvalid (

5555 pure ( JP.Index 1

56− , pure (FailureUniqueItems (D4.UniqueItemsInvalid

56+ , pure (FailureUniqueItems (VAL.UniqueItemsInvalid

5757 (V.fromList [Null, Null])

5858 ))

5959 )

@@ -65,7 +65,7 @@ itemsObject =

6565

6666 schema :: Schema

6767 schema = emptySchema

68− { _schemaItems = Just $ D4.ItemsObject

68+ { _schemaItems = Just $ VAL.ItemsObject

6969 (emptySchema { _schemaUniqueItems = Just True })

7070 }

7171

@@ -81,9 +81,9 @@ itemsObject =

8181loopRef :: Expectation

8282loopRef =

8383 failures `shouldBe`

84− [ FailureRef (D4.RefLoop

84+ [ FailureRef (VAL.RefLoop

8585 "#"

86− (D4.VisitedSchemas [(Nothing, Nothing)])

86+ (VAL.VisitedSchemas [(Nothing, Nothing)])

8787 (Nothing, Nothing)

8888 )

8989 ]

test/Local/Reference.hs+1−1

@@ -5,7 +5,7 @@ import Protolude

66import Test.Hspec

8−import Data.Validator.Reference

8+import JSONSchema.Validator.Reference

1010spec :: Spec

1111spec = do

test/Local/Validation.hs+7−8

@@ -1,18 +1,17 @@

22module Local.Validation where

4−import Protolude hiding (msg)

4+import Protolude hiding (msg)

66import Data.Aeson

7−import qualified Data.Aeson as AE

8−import qualified Data.HashMap.Strict as HM

9−import Data.String (String)

7+import qualified Data.Aeson as AE

8+import qualified Data.HashMap.Strict as HM

9+import Data.String (String)

1010import Test.Hspec

1111

12−import Data.JsonSchema.Draft4

13−import qualified Data.JsonSchema.Types as JT

14−

15−import qualified AlternateSchema as AS

12+import JSONSchema.Draft4

13+import qualified JSONSchema.Types as JT

14+import qualified AlternateSchema as AS

1615

1716spec :: Spec

1817spec = do

test/Remote.hs+4−4

@@ -10,10 +10,10 @@ import Network.Wai.Application.Static (defaultFileServerSettings,

1010import Network.Wai.Handler.Warp (run)

1111import Test.Hspec

1212

13−import qualified Data.JsonSchema.Draft4 as D4

14−import Data.JsonSchema.Fetch (ReferencedSchemas(..),

15− URISchemaMap(..))

16−import qualified Data.JsonSchema.Types as JT

13+import qualified JSONSchema.Draft4 as D4

14+import JSONSchema.Fetch (ReferencedSchemas(..),

15+ URISchemaMap(..))

16+import qualified JSONSchema.Types as JT

1717import Shared

1818

1919-- Examples