faa86b3 · typeable/swagger2

git.iko.soy/typeable/swagger2

Merge branch 'master' into master

commitfaa86b38c6fd22f7b45c71b9f8290bcbc4e9b615 authorBen Weitzman <benweitzman@gmail.com> dateMon 29 Oct 2018, 19:02 (8 years ago) parent9c11bed 24c29c3

9 files changed+102−41

compare with master

unifiedsplit

.travis.yml+14−12 CHANGELOG.md+5 stack.yaml+3−4 swagger2.cabal+31−21 test/Data/Aeson/QQ/Simple.hs+45 test/Data/Swagger/CommonTestTypes.hs+1−1 test/Data/Swagger/ParamSchemaSpec.hs+1−1 test/Data/Swagger/SchemaSpec.hs+1−1 test/Data/SwaggerSpec.hs+1−1

.travis.yml+14−12

@@ -2,7 +2,7 @@

22#

33# runghc make_travis_yml_2.hs '--branch' 'master' '--output' '.travis.yml' 'swagger2.cabal' '--env=8.2.2:HADDOCK=false' '--env=8.0.2:HADDOCK=false' '--env=7.10.3:HADDOCK=false' '--env=7.8.4:HADDOCK=false'

44#

5−# For more information, see https://github.com/hvr/multi-ghc-travis

5+# For more information, see https://github.com/haskell-CI/haskell-ci

66#

77language: c

88sudo: false

@@ -32,21 +32,24 @@ before_cache:

3232

3333matrix:

3434 include:

35− - compiler: "ghc-8.4.3"

35+ - compiler: "ghc-8.6.1"

3636 # env: TEST=--disable-tests BENCH=--disable-benchmarks

37− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}

37+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.1], sources: [hvr-ghc]}}

38+ - compiler: "ghc-8.4.4"

39+ # env: TEST=--disable-tests BENCH=--disable-benchmarks

40+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}}

3841 - compiler: "ghc-8.2.2"

3942 env: HADDOCK=false

40− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.2.2], sources: [hvr-ghc]}}

43+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}}

4144 - compiler: "ghc-8.0.2"

4245 env: HADDOCK=false

43− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.0.2], sources: [hvr-ghc]}}

46+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.0.2], sources: [hvr-ghc]}}

4447 - compiler: "ghc-7.10.3"

4548 env: HADDOCK=false

46− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.10.3], sources: [hvr-ghc]}}

49+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.10.3], sources: [hvr-ghc]}}

4750 - compiler: "ghc-7.8.4"

4851 env: HADDOCK=false

49− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.8.4], sources: [hvr-ghc]}}

52+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.8.4], sources: [hvr-ghc]}}

5053

5154before_install:

5255 - HC=${CC}

@@ -73,7 +76,7 @@ install:

7376 - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'

7477 - "printf 'packages: \".\"\\n' > cabal.project"

7578 - touch cabal.project.local

76− - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"

79+ - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- swagger2 | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"

7780 - cat cabal.project || true

7881 - cat cabal.project.local || true

7982 - if [ -f "./configure.ac" ]; then

@@ -89,13 +92,13 @@ install:

8992# any command which exits with a non-zero exit code causes the build to fail.

9093script:

9194 # test that source-distributions can be generated

92− - (cd "." && cabal sdist)

93− - mv "."/dist/swagger2-*.tar.gz ${DISTDIR}/

95+ - cabal new-sdist all

96+ - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/

9497 - cd ${DISTDIR} || false

9598 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;

9699 - "printf 'packages: swagger2-*/*.cabal\\n' > cabal.project"

97100 - touch cabal.project.local

98− - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"

101+ - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- swagger2 | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"

99102 - cat cabal.project || true

100103 - cat cabal.project.local || true

101104 # this builds all libraries and executables (without tests/benchmarks)

@@ -109,7 +112,6 @@ script:

109112 - (cd swagger2-* && cabal check)

110113

111114 # haddock

112− - rm -rf ./dist-newstyle

113115 - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi

114116

115117 # Build without installed constraints for packages in global-db

CHANGELOG.md+5

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

1+2.3.0.1

2+-------

4+- Support GHC-8.6

162.3

27---

stack.yaml+3−4

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

1−resolver: lts-11.14

1+resolver: lts-12.10

22packages:

33- '.'

44extra-deps:

5−- aeson-1.3.1.0

6−- base-compat-0.10.1

7−- base-compat-batteries-0.10.1

5+- base-compat-batteries-0.10.4

6+- contravariant-1.5

swagger2.cabal+31−21

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

11cabal-version: >=1.10

22name: swagger2

3−version: 2.3

3+version: 2.3.0.1

4+x-revision: 2

56synopsis: Swagger 2.0 data model

7+category: Web, Swagger

68description:

79 This library is inteded to be used for decoding and encoding Swagger 2.0 API

810 specifications as well as manipulating them.

@@ -16,14 +18,19 @@ license-file: LICENSE

1618author: Nickolay Kudasov

1719maintainer: nickolay@getshoptv.com

19−category: Web, Swagger

2021build-type: Custom

2122extra-source-files:

2223 README.md

2324 , CHANGELOG.md

2425 , examples/*.hs

2526 , include/overlapping-compat.h

26−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3

27+tested-with:

28+ GHC ==7.8.4

29+ || ==7.10.3

30+ || ==8.0.2

31+ || ==8.2.2

32+ || ==8.4.4

33+ || ==8.6.1

2734

2835custom-setup

2936 setup-depends:

@@ -54,12 +61,12 @@ library

5461

5562 -- GHC boot libraries

5663 build-depends:

57− base >=4.7 && <4.12

58− , bytestring >=0.10.4 && <0.11

59− , containers >=0.5.5.1 && <0.6

60− , template-haskell >=2.9.0.0 && <2.14

61− , time >=1.4.2 && <1.9

62− , transformers >=0.3.0.0 && <0.6

64+ base >=4.7 && <4.13

65+ , bytestring >=0.10.4.0 && <0.11

66+ , containers >=0.5.5.1 && <0.7

67+ , template-haskell >=2.9.0.0 && <2.15

68+ , time >=1.4.2 && <1.9

69+ , transformers >=0.3.0.0 && <0.6

6370

6471 build-depends:

6572 mtl >=2.1 && <2.3

@@ -67,18 +74,18 @@ library

6774

6875 -- other dependencies

6976 build-depends:

70− base-compat-batteries >=0.10.1 && <0.11

71− , aeson >=1.0.0.0 && <1.5

72− , generics-sop >=0.3.2.0 && <0.4

77+ base-compat-batteries >=0.10.4 && <0.11

78+ , aeson >=1.3.1.1 && <1.5

79+ , generics-sop >=0.3.2.0 && <0.5

7380 , hashable >=1.2.7.0 && <1.3

7481 , http-media >=0.7.1.2 && <0.8

75− , insert-ordered-containers >=0.1.0.0 && <0.3

82+ , insert-ordered-containers >=0.2.1.0 && <0.3

7683 , lens >=4.16.1 && <4.18

77− , network >=2.6.3.5 && <2.8

78− , scientific >=0.3.5.3 && <0.4

84+ , network >=2.6.3.5 && <2.9

85+ , scientific >=0.3.6.2 && <0.4

7986 , transformers-compat >=0.3 && <0.7

8087 , unordered-containers >=0.2.9.0 && <0.3

81− , uuid-types >=1.0.2 && <1.1

88+ , uuid-types >=1.0.3 && <1.1

8289 , vector >=0.12.0.1 && <0.13

8390 , QuickCheck >=2.10.1 && <2.12

8491

@@ -102,6 +109,7 @@ test-suite spec

102109 , insert-ordered-containers

103110 , lens

104111 , mtl

112+ , template-haskell

105113 , text

106114 , time

107115 , unordered-containers

@@ -109,15 +117,15 @@ test-suite spec

109117

110118 -- test-suite only dependencies

111119 build-depends:

112− aeson-qq >=0.8.2 && <0.9

113− , hspec >=2.4.8 && <2.6

120+ hspec >=2.5.5 && <2.6

114121 , HUnit >=1.6.0.0 && <1.7

115− , QuickCheck >=2.10.1 && <2.12

116− , quickcheck-instances >=0.3.18 && <0.14

122+ , QuickCheck >=2.11.3 && <2.13

123+ , quickcheck-instances >=0.3.19 && <0.14

124+ , utf8-string >=1.0.1.1 && <1.1

117125

118126 -- https://github.com/haskell/cabal/issues/3708

119127 build-tool-depends:

120− hspec-discover:hspec-discover >=2.4.8 && <2.6

128+ hspec-discover:hspec-discover >=2.5.5 && <2.6

121129

122130 other-modules:

123131 SpecCommon

@@ -127,6 +135,8 @@ test-suite spec

127135 Data.Swagger.SchemaSpec

128136 Data.Swagger.Schema.ValidationSpec

129137 Data.Swagger.Schema.GeneratorSpec

138+

139+ Data.Aeson.QQ.Simple

130140 default-language: Haskell2010

131141

132142test-suite doctests

test/Data/Aeson/QQ/Simple.hsnew file+45

@@ -0,0 +1,45 @@

1+{-# LANGUAGE TemplateHaskell #-}

2+-- | Like "Data.Aeson.QQ" but without interpolation.

3+module Data.Aeson.QQ.Simple where

5+import Data.Aeson

6+import Data.ByteString.Lazy.UTF8 as UTF8

7+import qualified Data.HashMap.Strict as HM

8+import qualified Data.Text as T

9+import qualified Data.Vector as V

10+import Language.Haskell.TH

11+import Language.Haskell.TH.Quote

12+import Language.Haskell.TH.Syntax (Lift (..))

13+import Prelude ()

14+import Prelude.Compat

15+

16+aesonQQ :: QuasiQuoter

17+aesonQQ = QuasiQuoter

18+ { quoteExp = aesonExp

19+ , quotePat = const $ error "No quotePat defined for jsonQQ"

20+ , quoteType = const $ error "No quoteType defined for jsonQQ"

21+ , quoteDec = const $ error "No quoteDec defined for jsonQQ"

22+ }

23+

24+aesonExp :: String -> ExpQ

25+aesonExp txt =

26+ case eitherDecode $ UTF8.fromString txt of

27+ Left err -> error $ "Error in aesonExp: " ++ show err

28+ Right val -> liftValue val

29+

30+liftValue :: Value -> ExpQ

31+liftValue (String str) = [| String $(liftText str) |]

32+liftValue Null = [| Null |]

33+liftValue (Number n) = [| Number (fromRational $(return $ LitE $ RationalL (toRational n))) |]

34+liftValue (Bool b) = [| Bool b |]

35+liftValue (Array arr) = [| Array $ V.fromList $(ListE <$> traverse liftValue (V.toList arr)) |]

36+liftValue (Object obj) = [| object $jsList |]

37+ where

38+ jsList :: ExpQ

39+ jsList = ListE <$> traverse objs2list (HM.toList obj)

40+

41+ objs2list :: (T.Text, Value) -> ExpQ

42+ objs2list (key, value) = [| ($(liftText key), $(liftValue value)) |]

43+

44+liftText :: T.Text -> ExpQ

45+liftText t = [| T.pack $(lift $ T.unpack t) |]

test/Data/Swagger/CommonTestTypes.hs+1−1

@@ -8,7 +8,7 @@ import Prelude ()

88import Prelude.Compat

1010import Data.Aeson (ToJSON (..), ToJSONKey (..), Value)

11−import Data.Aeson.QQ

11+import Data.Aeson.QQ.Simple

1212import Data.Aeson.Types (toJSONKeyText)

1313import Data.Char

1414import Data.Map (Map)

test/Data/Swagger/ParamSchemaSpec.hs+1−1

@@ -6,7 +6,7 @@

66module Data.Swagger.ParamSchemaSpec where

88import Data.Aeson (Value)

9−import Data.Aeson.QQ

9+import Data.Aeson.QQ.Simple

1010import Data.Char

1111import Data.Proxy

1212import GHC.Generics

test/Data/Swagger/SchemaSpec.hs+1−1

@@ -10,7 +10,7 @@ import Prelude.Compat

1010import Control.Lens ((^.))

1111import Data.Aeson (Value, ToJSON(..), ToJSONKey(..))

1212import Data.Aeson.Types (toJSONKeyText)

13−import Data.Aeson.QQ

13+import Data.Aeson.QQ.Simple

1414import Data.Char

1515import qualified Data.HashMap.Strict.InsOrd as InsOrdHashMap

1616import Data.Proxy

test/Data/SwaggerSpec.hs+1−1

@@ -10,7 +10,7 @@ import Prelude.Compat

1010import Control.Lens

1111

1212import Data.Aeson

13−import Data.Aeson.QQ

13+import Data.Aeson.QQ.Simple

1414import Data.HashMap.Strict (HashMap)

1515import qualified Data.Set as Set

1616import Data.Text (Text)