0777fd3 · typeable/servant-swagger-ui

git.iko.soy/typeable/servant-swagger-ui

swagger update

commit0777fd36300a5110fd407a55c6a22bf4ec51f177 authorOleg Grenrus <oleg.grenrus@iki.fi> dateSat 6 Feb 2016, 18:00 (11 years ago) parenta922892

5 files changed+52−52

compare with master

unifiedsplit

example/Main.hs+9−21 package.yaml+10−10 servant-swagger-ui.cabal+20−20 stack-lts-2.yaml+10 stack-lts-5.yaml+3−1

example/Main.hs+9−21

@@ -41,26 +41,14 @@ newtype CatName = CatName Text

4141 deriving (Eq, Show, Generic, FromText)

4242

4343instance ToJSON CatName where

44− toJSON (CatName name) = toJSON name

44+ toJSON (CatName n) = toJSON n

4545

4646instance IsString CatName where

4747 fromString = CatName . fromString

4848

4949instance ToParamSchema CatName

50−

51−instance ToSchema Cat where

52− declareNamedSchema proxy = do

53− (name, schema) <- genericDeclareNamedSchema defaultSchemaOptions proxy

54− return (name, schema

55− & schemaDescription ?~ "This is some cat"

56− & schemaExample ?~ toJSON (Cat "Felix" True))

57−

58−instance ToSchema CatName where

59− declareNamedSchema proxy = do

60− (name, schema) <- genericDeclareNamedSchema defaultSchemaOptions proxy

61− return (name, schema

62− & schemaDescription ?~ "This is some cat name"

63− & schemaExample ?~ toJSON (CatName "Felix"))

50+instance ToSchema Cat

51+instance ToSchema CatName

6452

6553---

6654

@@ -87,15 +75,15 @@ server =

8775 :<|> pure swaggerDoc

8876 :<|> swaggerUIServer

8977 where

90− catEndpoint name = pure $ Cat name False

78+ catEndpoint n = pure $ Cat n False

9179

9280-- Boilerplate

9381

9482swaggerDoc :: Swagger

9583swaggerDoc = toSwagger (Proxy :: Proxy BasicAPI)

96− & info.infoTitle .~ "Cats API"

97− & info.infoVersion .~ "2016.1.31"

98− & info.infoDescription ?~ "This is an API that tests servant-swagger support "

84+ & info.title .~ "Cats API"

85+ & info.version .~ "2016.2.6"

86+ & info.description ?~ "This is an API that tests servant-swagger support "

9987

10088api :: Proxy API

10189api = Proxy

@@ -108,6 +96,6 @@ main = do

10896 args <- getArgs

10997 case args of

11098 ("run":_) -> do

111− port <- fromMaybe 8000 . (>>= readMaybe) <$> lookupEnv "PORT"

112− Warp.run port app

99+ p <- fromMaybe 8000 . (>>= readMaybe) <$> lookupEnv "PORT"

100+ Warp.run p app

113101 _ -> putStrLn "To run, pass 'run' argument"

package.yaml+10−10

@@ -17,19 +17,19 @@ ghc-options: -Wall

1717

1818dependencies:

1919 - base >=4.7 && <4.9

20− - blaze-markup >=0.7.0.3 && <0.8

20+ - blaze-markup >=0.7.0.2 && <0.8

2121 - bytestring >=0.10.4.0 && <0.11

22− - directory >=1.2.2.0 && <1.3

23− - file-embed >=0.0.9 && <0.1

24− - filepath >=1.4.0.0 && <1.5

22+ - directory >=1.2.1.0 && <1.3

23+ - file-embed >=0.0.8.2 && <0.1

24+ - filepath >=1.3.0.2 && <1.5

2525 - http-media >=0.6.2 && <0.7

2626 - servant >=0.4.4.5 && <0.5

2727 - servant-blaze >=0.4.4.5 && <0.5

2828 - servant-server >=0.4.4.5 && <0.5

29− - servant-swagger >=0.1.2 && <0.2

30− - swagger2 >=1.2.1 && <1.3

31− - template-haskell >=2.10 && <2.11

32− - text >=1.2.2 && <1.3

29+ - servant-swagger >=1.0.1 && <1.1

30+ - swagger2 >=2.0.1 && <2.1

31+ - template-haskell >=2.9 && <2.11

32+ - text >=1.2.0.6 && <1.3

3333 - wai-app-static >=3.0.1.1 && <3.2

3434

3535library:

@@ -42,8 +42,8 @@ tests:

4242 dependencies:

4343 - servant-swagger-ui

4444 - servant-server >=0.4.4.5 && <0.5

45− - aeson >=0.9 && <0.11

45+ - aeson >=0.8.0.2 && <0.11

4646 - base-compat >=0.6.0 && <0.10

47− - lens >=4.13 && <4.14

47+ - lens >=4.7.0.1 && <4.14

4848 - wai >=3.0.3.0 && <3.3

4949 - warp >=3.0.13.1 && <3.3

servant-swagger-ui.cabal+20−20

@@ -75,19 +75,19 @@ library

7575 ghc-options: -Wall

7676 build-depends:

7777 base >=4.7 && <4.9

78− , blaze-markup >=0.7.0.3 && <0.8

78+ , blaze-markup >=0.7.0.2 && <0.8

7979 , bytestring >=0.10.4.0 && <0.11

80− , directory >=1.2.2.0 && <1.3

81− , file-embed >=0.0.9 && <0.1

82− , filepath >=1.4.0.0 && <1.5

80+ , directory >=1.2.1.0 && <1.3

81+ , file-embed >=0.0.8.2 && <0.1

82+ , filepath >=1.3.0.2 && <1.5

8383 , http-media >=0.6.2 && <0.7

8484 , servant >=0.4.4.5 && <0.5

85− , servant-blaze >=0.4.4.6 && <0.5

85+ , servant-blaze >=0.4.4.5 && <0.5

8686 , servant-server >=0.4.4.5 && <0.5

87− , servant-swagger >=0.1.2 && <0.2

88− , swagger2 >=1.2.1 && <1.3

89− , template-haskell >=2.10 && <2.11

90− , text >=1.2.2 && <1.3

87+ , servant-swagger >=1.0.1 && <1.1

88+ , swagger2 >=2.0.1 && <2.1

89+ , template-haskell >=2.9 && <2.11

90+ , text >=1.2.0.6 && <1.3

9191 , wai-app-static >=3.0.1.1 && <3.2

9292 exposed-modules:

9393 Servant.Swagger.UI

@@ -102,25 +102,25 @@ test-suite example

102102 ghc-options: -Wall

103103 build-depends:

104104 base >=4.7 && <4.9

105− , blaze-markup >=0.7.0.3 && <0.8

105+ , blaze-markup >=0.7.0.2 && <0.8

106106 , bytestring >=0.10.4.0 && <0.11

107− , directory >=1.2.2.0 && <1.3

108− , file-embed >=0.0.9 && <0.1

109− , filepath >=1.4.0.0 && <1.5

107+ , directory >=1.2.1.0 && <1.3

108+ , file-embed >=0.0.8.2 && <0.1

109+ , filepath >=1.3.0.2 && <1.5

110110 , http-media >=0.6.2 && <0.7

111111 , servant >=0.4.4.5 && <0.5

112− , servant-blaze >=0.4.4.6 && <0.5

112+ , servant-blaze >=0.4.4.5 && <0.5

113113 , servant-server >=0.4.4.5 && <0.5

114− , servant-swagger >=0.1.2 && <0.2

115− , swagger2 >=1.2.1 && <1.3

116− , template-haskell >=2.10 && <2.11

117− , text >=1.2.2 && <1.3

114+ , servant-swagger >=1.0.1 && <1.1

115+ , swagger2 >=2.0.1 && <2.1

116+ , template-haskell >=2.9 && <2.11

117+ , text >=1.2.0.6 && <1.3

118118 , wai-app-static >=3.0.1.1 && <3.2

119119 , servant-swagger-ui

120120 , servant-server >=0.4.4.5 && <0.5

121− , aeson >=0.9 && <0.11

121+ , aeson >=0.8.0.2 && <0.11

122122 , base-compat >=0.6.0 && <0.10

123− , lens >=4.13 && <4.14

123+ , lens >=4.7.0.1 && <4.14

124124 , wai >=3.0.3.0 && <3.3

125125 , warp >=3.0.13.1 && <3.3

126126 default-language: Haskell2010

stack-lts-2.yamlnew file+10

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

1+resolver: lts-2.22

2+packages:

3+- '.'

4+extra-deps:

5+- servant-blaze-0.4.4.6

6+- servant-0.4.4.6

7+- servant-server-0.4.4.6

8+- swagger2-2.0.1

9+- servant-swagger-1.0.1

10+flags: {}

stack-lts-5.yaml+3−1

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

11resolver: lts-5.1

22packages:

33- '.'

4−extra-deps: []

4+extra-deps:

5+- swagger2-2.0.1

6+- servant-swagger-1.0.1

57flags: {}