git.iko.soy/typeable/http-api-data
on master help sign in
Add instances for Either a b
46c925bNickolay Kudasov
Web/HttpApiData.hs+20
compare with master
unifiedsplit
@@ -180,6 +180,15 @@ instance ToHttpApiData a => ToHttpApiData (Maybe a) where
180 toUrlPiece (Just x) = "Just " <> toUrlPiece x
180 toUrlPiece (Just x) = "Just " <> toUrlPiece x
181 toUrlPiece Nothing = "Nothing"
181 toUrlPiece Nothing = "Nothing"
182
182
183+-- |
184+-- >>> toUrlPiece (Left "err" :: Either String Int)
185+-- "Left err"
186+-- >>> toUrlPiece (Right 3 :: Either String Int)
187+-- "Right 3"
188+instance (ToHttpApiData a, ToHttpApiData b) => ToHttpApiData (Either a b) where
189+ toUrlPiece (Left x) = "Left " <> toUrlPiece x
190+ toUrlPiece (Right x) = "Right " <> toUrlPiece x
191+
183-- |
192-- |
184-- >>> parseUrlPiece "_" :: Either Text ()
193-- >>> parseUrlPiece "_" :: Either Text ()
185-- Right ()
194-- Right ()
@@ -246,6 +255,17 @@ instance FromHttpApiData a => FromHttpApiData (Maybe a) where
246 Nothing -> defaultParseError s
255 Nothing -> defaultParseError s
247 Just x -> Just <$> parseUrlPiece x
256 Just x -> Just <$> parseUrlPiece x
248
257
258+-- |
259+-- >>> parseUrlPiece "Right 123" :: Either Text (Either String Int)
260+-- Right (Right 123)
261+instance (FromHttpApiData a, FromHttpApiData b) => FromHttpApiData (Either a b) where
262+ parseUrlPiece s =
263+ case T.stripPrefix "Right " s of
264+ Just r -> Right <$> parseUrlPiece r
265+ _ -> case T.stripPrefix "Left " s of
266+ Just l -> Left <$> parseUrlPiece l
267+ _ -> defaultParseError s
268+
249-- $examples
269-- $examples
250--
270--
251-- Booleans:
271-- Booleans:
Web/PathPieces.hs+10
@@ -98,6 +98,10 @@ instance PathPiece a => PathPiece (Maybe a) where
98 toPathPiece = unsafeToPathPiece1
98 toPathPiece = unsafeToPathPiece1
99 fromPathPiece = unsafeFromPathPiece1
99 fromPathPiece = unsafeFromPathPiece1
100
100
101+instance (PathPiece a, PathPiece b) => PathPiece (Either a b) where
102+ toPathPiece = unsafeToPathPiece2
103+ fromPathPiece = unsafeFromPathPiece2
104+
101-- | Wrapped @'PathPiece'@ value.
105-- | Wrapped @'PathPiece'@ value.
102newtype WrappedPathPiece a = WrappedPathPiece { unwrapPathPiece :: a }
106newtype WrappedPathPiece a = WrappedPathPiece { unwrapPathPiece :: a }
103
107
@@ -113,6 +117,12 @@ unsafeToPathPiece1 = toUrlPiece . (unsafeCoerce :: f a -> f (WrappedPathPiece a)
113unsafeFromPathPiece1 :: forall f a. (PathPiece a, FromHttpApiData (f (WrappedPathPiece a))) => S.Text -> Maybe (f a)
117unsafeFromPathPiece1 :: forall f a. (PathPiece a, FromHttpApiData (f (WrappedPathPiece a))) => S.Text -> Maybe (f a)
114unsafeFromPathPiece1 = either (const Nothing) (Just . (unsafeCoerce :: f (WrappedPathPiece a) -> f a)) . parseUrlPiece
118unsafeFromPathPiece1 = either (const Nothing) (Just . (unsafeCoerce :: f (WrappedPathPiece a) -> f a)) . parseUrlPiece
115
119
120+unsafeToPathPiece2 :: forall f a b. (PathPiece a, PathPiece b, ToHttpApiData (f (WrappedPathPiece a) (WrappedPathPiece b))) => f a b -> S.Text
121+unsafeToPathPiece2 = toUrlPiece . (unsafeCoerce :: f a b -> f (WrappedPathPiece a) (WrappedPathPiece b))
122+
123+unsafeFromPathPiece2 :: forall f a b. (PathPiece a, PathPiece b, FromHttpApiData (f (WrappedPathPiece a) (WrappedPathPiece b))) => S.Text -> Maybe (f a b)
124+unsafeFromPathPiece2 = either (const Nothing) (Just . (unsafeCoerce :: f (WrappedPathPiece a) (WrappedPathPiece b) -> f a b)) . parseUrlPiece
125+
116-- | Convert Haskell values to and from sequence of route pieces.
126-- | Convert Haskell values to and from sequence of route pieces.
117class PathMultiPiece s where
127class PathMultiPiece s where
118 -- | Convert from sequence of route pieces.
128 -- | Convert from sequence of route pieces.
test/main.hs+2−1
@@ -63,7 +63,8 @@ spec = do
63 prop "toPathPiece <=> fromPathPiece Day" $ \(p :: Day) -> (toPathPiece <=> fromPathPiece) p
63 prop "toPathPiece <=> fromPathPiece Day" $ \(p :: Day) -> (toPathPiece <=> fromPathPiece) p
64 prop "toPathPiece <=> fromPathPiece Version" $ \(p :: Version) -> (toPathPiece <=> fromPathPiece) p
64 prop "toPathPiece <=> fromPathPiece Version" $ \(p :: Version) -> (toPathPiece <=> fromPathPiece) p
65
65
66− prop "toPathPiece <=> fromPathPiece Maybe String" $ \(p::Maybe String) -> (toPathPiece <=> fromPathPiece) p
66+ prop "toPathPiece <=> fromPathPiece Maybe String" $ \(p::Maybe String) -> (toPathPiece <=> fromPathPiece) p
67+ prop "toPathPiece <=> fromPathPiece Either Integer Text" $ \(p::Either Integer T.Text) -> (toPathPiece <=> fromPathPiece) p
67
68
68 describe "PathMultiPiece" $ do
69 describe "PathMultiPiece" $ do
69 prop "toPathMultiPiece <=> fromPathMultiPiece String" $ \(p::[String]) -> (toPathMultiPiece <=> fromPathMultiPiece) p
70 prop "toPathMultiPiece <=> fromPathMultiPiece String" $ \(p::[String]) -> (toPathMultiPiece <=> fromPathMultiPiece) p