eeva/servant
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Janitoring

Browse source
This commit is contained in:
Julian K. Arni 2015-09-23 18:26:05 +02:00
parent b50e9128c1
commit 965063171b
12 changed files with 38 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
servant-docs/servant-docs.cabal
View file

@ -65,6 +65,7 @@ executable greet-docs
test-suite spec
type: exitcode-stdio-1.0
main-is: Spec.hs
other-modules: Servant.DocsSpec
hs-source-dirs: test
ghc-options: -Wall
build-depends:

18
servant-docs/src/Servant/Docs/Internal.hs
View file

@ -23,19 +23,21 @@ module Servant.Docs.Internal where
import Control.Applicative
import Control.Arrow (second)
import Control.Lens hiding (List, to, from)
import Control.Lens (makeLenses, over, traversed, (%~),
(&), (.~), (<>~), (^.), _1, _2,
_last, (|>))
import qualified Control.Monad.Omega as Omega
import Data.ByteString.Conversion (ToByteString, toByteString)
import Data.ByteString.Lazy.Char8 (ByteString)
import qualified Data.CaseInsensitive as CI
import Data.Hashable
import Data.Hashable (Hashable)
import Data.HashMap.Strict (HashMap)
import Data.List
import Data.Maybe
import Data.Monoid
import Data.Ord (comparing)
import Data.Proxy
import Data.String.Conversions
import Data.Proxy (Proxy(Proxy))
import Data.String.Conversions (cs)
import Data.Text (Text, pack, unpack)
import GHC.Exts (Constraint)
import GHC.Generics
@ -494,9 +496,9 @@ sampleByteStrings
-> Proxy a
-> [(Text, M.MediaType, ByteString)]
sampleByteStrings ctypes@Proxy Proxy =
let samples = toSamples (Proxy :: Proxy a)
let samples' = toSamples (Proxy :: Proxy a)
enc (t, s) = uncurry (t,,) <$> allMimeRender ctypes s
in concatMap enc samples
in concatMap enc samples'
-- | Generate a list of 'MediaType' values describing the content types
-- accepted by an API component.
@ -640,10 +642,10 @@ markdown api = unlines $
rqbodyStr :: [M.MediaType] -> [(M.MediaType, ByteString)]-> [String]
rqbodyStr [] [] = []
rqbodyStr types samples =
rqbodyStr types s =
["#### Request:", ""]
<> formatTypes types
<> concatMap formatBody samples
<> concatMap formatBody s
formatTypes [] = []
formatTypes ts = ["- Supported content types are:", ""]

1
servant-examples/auth-combinator/auth-combinator.hs
View file

@ -5,6 +5,7 @@
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE TypeOperators #-}
{-# OPTIONS_GHC -fno-warn-unused-binds #-}
import Data.Aeson
import Data.ByteString (ByteString)
import Data.Text (Text)

2
servant-examples/hackage/hackage.hs
View file

@ -2,6 +2,8 @@
{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE TypeOperators #-}
{-# OPTIONS_GHC -fno-warn-unused-binds #-}
{-# OPTIONS_GHC -fno-warn-unused-imports #-}
import Control.Applicative
import Control.Monad
import Control.Monad.IO.Class

4
servant-examples/servant-examples.cabal
View file

@ -20,6 +20,7 @@ source-repository head
executable tutorial
main-is: tutorial.hs
other-modules: T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
ghc-options: -Wall -fno-warn-unused-binds -fno-warn-name-shadowing
build-depends:
aeson >= 0.8
, base >= 4.7 && < 5
@ -45,8 +46,10 @@ executable tutorial
executable t8-main
main-is: t8-main.hs
other-modules: T3, T8
hs-source-dirs: tutorial
default-language: Haskell2010
ghc-options: -Wall -fno-warn-unused-binds -fno-warn-name-shadowing
build-depends:
aeson
, base >= 4.7 && < 5
@ -101,6 +104,7 @@ executable auth-combinator
executable socket-io-chat
main-is: socket-io-chat.hs
other-modules: Chat
build-depends:
aeson >= 0.8
, base >= 4.7 && < 5

1
servant-examples/tutorial/T3.hs
View file

@ -2,6 +2,7 @@
{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE TypeOperators #-}
{-# OPTIONS_GHC -fno-warn-unused-binds #-}
module T3 where
import Control.Monad.Trans.Except

3
servant-js/servant-js.cabal
View file

@ -77,6 +77,9 @@ test-suite spec
hs-source-dirs: test
ghc-options: -Wall
main-is: Spec.hs
other-modules:
Servant.JSSpec
Servant.JSSpec.CustomHeaders
build-depends: base
, hspec >= 2.1.8
, hspec-expectations

3
servant-js/src/Servant/JS/Internal.hs
View file

@ -1,3 +1,4 @@
<<<<<<< HEAD
module Servant.JS.Internal
( JavaScriptGenerator
, CommonGeneratorOptions(..)
@ -29,7 +30,7 @@ module Servant.JS.Internal
, Get
, Raw
, Header
) where
) where
import Control.Lens hiding (List)
import qualified Data.CharSet as Set

3
servant-mock/src/Servant/Mock.hs
View file

@ -5,6 +5,7 @@
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE TypeOperators #-}
{-# OPTIONS_GHC -fno-warn-orphans #-}
-- |
-- Module : Servant.Mock
-- Copyright : 2015 Alp Mestanogullari
@ -165,7 +166,7 @@ instance (Arbitrary a, AllCTRender ctypes a) => HasMock (Put ctypes a) where
mock _ = mockArbitrary
instance HasMock Raw where
mock _ = \req respond -> do
mock _ = \_req respond -> do
bdy <- genBody
respond $ responseLBS status200 [] bdy

5
servant-server/servant-server.cabal
View file

@ -91,6 +91,11 @@ test-suite spec
default-language: Haskell2010
hs-source-dirs: test
main-is: Spec.hs
other-modules:
Servant.Server.ErrorSpec
Servant.Server.Internal.EnterSpec
Servant.ServerSpec
Servant.Utils.StaticFilesSpec
build-depends:
base == 4.*
, aeson

5
servant/servant.cabal
View file

@ -90,6 +90,11 @@ test-suite spec
default-language: Haskell2010
hs-source-dirs: test
main-is: Spec.hs
other-modules:
Servant.API.ContentTypesSpec
Servant.API.ResponseHeadersSpec
Servant.Common.TextSpec
Servant.Utils.LinksSpec
build-depends:
base == 4.*
, aeson

2
stack.yaml
View file

@ -1,6 +1,8 @@
flags:
servant-js:
example: false
ghc-options:
"*": -Wall
packages:
- servant/
- servant-blaze/