e8c7d07 · typeable/http-api-data

git.iko.soy/typeable/http-api-data

on master help sign in

Add UUID instances

e8c7d07Oleg Grenrus10 years ago

CHANGELOG.md+6

compare with master

unifiedsplit

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

1+0.3.1

2+---

4+* Minor changes

5+ * Add instances for `Data.UUID`

10.3

70.3

2---

8---

3* Major changes:

9* Major changes:

http-api-data.cabal+3−1

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

1name: http-api-data

2−version: 0.3

2+version: 0.3.1

3license: BSD3

4license-file: LICENSE

5author: Nickolay Kudasov <nickolay.kudasov@gmail.com>

@@ -33,6 +33,7 @@ library

33 , time-locale-compat >=0.1.1.0 && <0.2

34 , unordered-containers

35 , uri-bytestring

36+ , uuid >= 1.3.11 && <1.4

36 if flag(use-text-show)

37 if flag(use-text-show)

37 cpp-options: -DUSE_TEXT_SHOW

38 cpp-options: -DUSE_TEXT_SHOW

38 build-depends: text-show >= 2

39 build-depends: text-show >= 2

@@ -64,6 +65,7 @@ test-suite spec

64 , text

65 , text

65 , time

66 , time

66 , bytestring

67 , bytestring

68+ , uuid

68test-suite doctest

70test-suite doctest

69 ghc-options: -Wall

71 ghc-options: -Wall

src/Web/Internal/HttpApiData.hs+9

@@ -46,6 +46,8 @@ import Text.ParserCombinators.ReadP (readP_to_S)

46import TextShow (TextShow, showt)

47#endif

49+import qualified Data.UUID as UUID

50+

49-- $setup

51-- $setup

50-- >>> data BasicAuthToken = BasicAuthToken Text deriving (Show)

52-- >>> data BasicAuthToken = BasicAuthToken Text deriving (Show)

51-- >>> instance FromHttpApiData BasicAuthToken where parseHeader h = BasicAuthToken <$> parseHeaderWithPrefix "Basic " h; parseQueryParam p = BasicAuthToken <$> parseQueryParam p

53-- >>> instance FromHttpApiData BasicAuthToken where parseHeader h = BasicAuthToken <$> parseHeaderWithPrefix "Basic " h; parseQueryParam p = BasicAuthToken <$> parseQueryParam p

@@ -577,3 +579,10 @@ instance (FromHttpApiData a, FromHttpApiData b) => FromHttpApiData (Either a b)

577 Left _ <!> y = y

579 Left _ <!> y = y

578 x <!> _ = x

580 x <!> _ = x

579

581

582+instance ToHttpApiData UUID.UUID where

583+ toUrlPiece = UUID.toText

584+ toHeader = UUID.toASCIIBytes

585+

586+instance FromHttpApiData UUID.UUID where

587+ parseUrlPiece = maybe (Left "invalid UUID") Right . UUID.fromText

588+ parseHeader = maybe (Left "invalid UUID") Right . UUID.fromASCIIBytes

test/Web/Internal/HttpApiDataSpec.hs+10

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

2{-# LANGUAGE ScopedTypeVariables #-}

3module Web.Internal.HttpApiDataSpec (spec) where

5+import Control.Applicative

5import Data.Int

6import Data.Int

6import Data.Word

7import Data.Word

7import Data.Time

8import Data.Time

@@ -9,6 +10,7 @@ import qualified Data.Text as T

9import qualified Data.Text.Lazy as L

10import qualified Data.Text.Lazy as L

10import qualified Data.ByteString as BS

11import qualified Data.ByteString as BS

11import Data.Version

12import Data.Version

13+import qualified Data.UUID as UUID

13import Data.Proxy

15import Data.Proxy

@@ -30,6 +32,10 @@ import Web.Internal.TestInstances

30checkUrlPiece :: forall a. (Eq a, ToHttpApiData a, FromHttpApiData a, Show a, Arbitrary a) => Proxy a -> String -> Spec

32checkUrlPiece :: forall a. (Eq a, ToHttpApiData a, FromHttpApiData a, Show a, Arbitrary a) => Proxy a -> String -> Spec

31checkUrlPiece _ name = prop name (toUrlPiece <=> parseUrlPiece :: a -> Bool)

33checkUrlPiece _ name = prop name (toUrlPiece <=> parseUrlPiece :: a -> Bool)

35+-- | Check with given generator

36+checkUrlPiece' :: forall a. (Eq a, ToHttpApiData a, FromHttpApiData a, Show a) => Gen a -> String -> Spec

37+checkUrlPiece' gen name = prop name $ forAll gen (toUrlPiece <=> parseUrlPiece)

38+

33-- | Check case insensitivity for @parseUrlPiece@.

39-- | Check case insensitivity for @parseUrlPiece@.

34checkUrlPieceI :: forall a. (Eq a, ToHttpApiData a, FromHttpApiData a, Arbitrary a) => Proxy a -> String -> Spec

40checkUrlPieceI :: forall a. (Eq a, ToHttpApiData a, FromHttpApiData a, Arbitrary a) => Proxy a -> String -> Spec

35checkUrlPieceI _ = checkUrlPiece (Proxy :: Proxy (RandomCase a))

41checkUrlPieceI _ = checkUrlPiece (Proxy :: Proxy (RandomCase a))

@@ -61,6 +67,7 @@ spec = do

61 checkUrlPiece (Proxy :: Proxy UTCTime) "UTCTime"

67 checkUrlPiece (Proxy :: Proxy UTCTime) "UTCTime"

62 checkUrlPiece (Proxy :: Proxy NominalDiffTime) "NominalDiffTime"

68 checkUrlPiece (Proxy :: Proxy NominalDiffTime) "NominalDiffTime"

63 checkUrlPiece (Proxy :: Proxy Version) "Version"

69 checkUrlPiece (Proxy :: Proxy Version) "Version"

70+ checkUrlPiece' uuidGen "UUID"

65 checkUrlPiece (Proxy :: Proxy (Maybe String)) "Maybe String"

72 checkUrlPiece (Proxy :: Proxy (Maybe String)) "Maybe String"

66 checkUrlPieceI (Proxy :: Proxy (Maybe Integer)) "Maybe Integer"

73 checkUrlPieceI (Proxy :: Proxy (Maybe Integer)) "Maybe Integer"

@@ -80,3 +87,6 @@ spec = do

81 it "invalid utf8 is handled" $ do

88 it "invalid utf8 is handled" $ do

82 parseHeaderMaybe (BS.pack [128]) `shouldBe` (Nothing :: Maybe T.Text)

89 parseHeaderMaybe (BS.pack [128]) `shouldBe` (Nothing :: Maybe T.Text)

90+

91+uuidGen :: Gen UUID.UUID

92+uuidGen = UUID.fromWords <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary