a2f95f0 · typeable/servant

servant.cabal+1

compare with master

unifiedsplit

@@ -89,6 +89,7 @@ test-suite spec

89 , bytestring

90 , hspec == 2.*

91 , QuickCheck

92+ , quickcheck-instances

92 , parsec

93 , parsec

93 , servant

94 , servant

94 , string-conversions

95 , string-conversions

src/Servant/Common/Text.hs+5−1

@@ -13,10 +13,14 @@ import Data.Text.Read ( rational, signed, decimal, Reader )

13import Data.Word ( Word, Word8, Word16, Word32, Word64 )

14

15-- | For getting values from url captures and query string parameters

16+-- Instances should obey:

17+-- > fromText (toText a) == Just a

16class FromText a where

18class FromText a where

17 fromText :: Text -> Maybe a

19 fromText :: Text -> Maybe a

18

20

19-- | For putting values in paths and query string parameters

21-- | For putting values in paths and query string parameters

22+-- Instances should obey:

23+-- > fromText (toText a) == Just a

20class ToText a where

24class ToText a where

21 toText :: a -> Text

25 toText :: a -> Text

22

26

@@ -109,7 +113,7 @@ instance ToText Word64 where

109 toText = cs . show

113 toText = cs . show

110

114

111instance FromText Integer where

115instance FromText Integer where

112− fromText = runReader decimal

116+ fromText = runReader (signed decimal)

113

117

114instance ToText Integer where

118instance ToText Integer where

115 toText = cs . show

119 toText = cs . show

test/Servant/API/ContentTypesSpec.hs+1−12

@@ -21,6 +21,7 @@ import qualified Data.Text.Lazy as TextL

21import GHC.Generics

22import Test.Hspec

23import Test.QuickCheck

24+import Test.QuickCheck.Instances ()

24

25

25import Servant.API.ContentTypes

26import Servant.API.ContentTypes

26

27

@@ -145,12 +146,6 @@ instance ToJSON SomeData

145instance Arbitrary SomeData where

146instance Arbitrary SomeData where

146 arbitrary = SomeData <$> arbitrary <*> arbitrary

147 arbitrary = SomeData <$> arbitrary <*> arbitrary

147

148

148−instance Arbitrary TextL.Text where

149− arbitrary = TextL.pack <$> arbitrary

150−

151−instance Arbitrary TextS.Text where

152− arbitrary = TextS.pack <$> arbitrary

153−

154instance Arbitrary ZeroToOne where

149instance Arbitrary ZeroToOne where

155 arbitrary = ZeroToOne <$> elements [ x / 10 | x <- [1..10]]

150 arbitrary = ZeroToOne <$> elements [ x / 10 | x <- [1..10]]

156

151

@@ -169,12 +164,6 @@ instance ToJSON ByteString where

169instance IsString AcceptHeader where

164instance IsString AcceptHeader where

170 fromString = AcceptHeader . fromString

165 fromString = AcceptHeader . fromString

171

166

172−instance Arbitrary BSL.ByteString where

173− arbitrary = cs <$> (arbitrary :: Gen String)

174−

175−instance Arbitrary ByteString where

176− arbitrary = cs <$> (arbitrary :: Gen String)

177−

178addToAccept :: Accept a => Proxy a -> ZeroToOne -> AcceptHeader -> AcceptHeader

167addToAccept :: Accept a => Proxy a -> ZeroToOne -> AcceptHeader -> AcceptHeader

179addToAccept p (ZeroToOne f) (AcceptHeader h) = AcceptHeader (cont h)

168addToAccept p (ZeroToOne f) (AcceptHeader h) = AcceptHeader (cont h)

180 where new = cs (show $ contentType p) `append` "; q=" `append` pack (show f)

169 where new = cs (show $ contentType p) `append` "; q=" `append` pack (show f)

test/Servant/Common/TextSpec.hsnew file+65

@@ -0,0 +1,65 @@

1+module Servant.Common.TextSpec where

2+

3+import Servant.Common.Text

4+import Test.Hspec

5+import Test.QuickCheck

6+import Test.QuickCheck.Instances ()

7+import Data.Int ( Int8, Int16, Int32, Int64 )

8+import Data.Text ( Text )

9+import Data.Word ( Word, Word8, Word16, Word32, Word64 )

10+

11+spec :: Spec

12+spec = describe "Servant.Common.Text" $ do

13+

14+ context "FromText and ToText laws" $ do

15+

16+ it "holds for Text" $

17+ property $ \x -> textLaw (x :: Text)

18+

19+ it "holds for String" $

20+ property $ \x -> textLaw (x :: String)

21+

22+ it "holds for Bool" $

23+ property $ \x -> textLaw (x :: Bool)

24+

25+ it "holds for Int" $

26+ property $ \x -> textLaw (x :: Int)

27+

28+ it "holds for Int8" $

29+ property $ \x -> textLaw (x :: Int8)

30+

31+ it "holds for Int16" $

32+ property $ \x -> textLaw (x :: Int16)

33+

34+ it "holds for Int32" $

35+ property $ \x -> textLaw (x :: Int32)

36+

37+ it "holds for Int64" $

38+ property $ \x -> textLaw (x :: Int64)

39+

40+ it "holds for Word" $

41+ property $ \x -> textLaw (x :: Word)

42+

43+ it "holds for Word8" $

44+ property $ \x -> textLaw (x :: Word8)

45+

46+ it "holds for Word16" $

47+ property $ \x -> textLaw (x :: Word16)

48+

49+ it "holds for Word32" $

50+ property $ \x -> textLaw (x :: Word32)

51+

52+ it "holds for Word64" $

53+ property $ \x -> textLaw (x :: Word64)

54+

55+ it "holds for Integer" $

56+ property $ \x -> textLaw (x :: Integer)

57+

58+ it "holds for Double" $

59+ property $ \x -> textLaw (x :: Double)

60+

61+ it "holds for Float" $

62+ property $ \x -> textLaw (x :: Float)

63+

64+textLaw :: (FromText a, ToText a, Eq a) => a -> Bool

65+textLaw a = fromText (toText a) == Just a