summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkoral <>2016-02-23 19:27:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2016-02-23 19:27:00 (GMT)
commitd192433f87a48195593b4ef9aedc26e143875924 (patch)
tree00c8b615196afc715fd2925c509a60627e078c1a
parent96104c4a05e2395822a30464d95230208dd6c21b (diff)
version 0.5.0.00.5.0.0
-rw-r--r--Text/OPML/Conduit/Render.hs2
-rw-r--r--opml-conduit.cabal4
-rw-r--r--test/Arbitrary.hs3
-rw-r--r--test/Main.hs2
4 files changed, 6 insertions, 5 deletions
diff --git a/Text/OPML/Conduit/Render.hs b/Text/OPML/Conduit/Render.hs
index 715f713..0c6fd45 100644
--- a/Text/OPML/Conduit/Render.hs
+++ b/Text/OPML/Conduit/Render.hs
@@ -57,7 +57,7 @@ formatBool :: Bool -> Text
formatBool = toLower . tshow
formatURI :: URI -> Text
-formatURI = decodeUtf8 . serializeURI'
+formatURI = decodeUtf8 . serializeURIRef'
-- | Render the @\<head\>@ section.
renderOpmlHead :: (Monad m) => OpmlHead -> Source m Event
diff --git a/opml-conduit.cabal b/opml-conduit.cabal
index 3302952..f7e5992 100644
--- a/opml-conduit.cabal
+++ b/opml-conduit.cabal
@@ -1,5 +1,5 @@
name: opml-conduit
-version: 0.4.0.1
+version: 0.5.0.0
synopsis: Streaming parser/renderer for the OPML 2.0 format.
description:
This library implements the OPML 2.0 standard (<http://dev.opml.org/spec2.html>) as a 'conduit' parser/renderer.
@@ -46,7 +46,7 @@ library
, text
, time >= 1.5
, timerep >= 2.0.0
- , uri-bytestring >= 0.1.9
+ , uri-bytestring >= 0.2
, xml-conduit >= 1.3
, xml-conduit-parse >= 0.2.0.0
, xml-types
diff --git a/test/Arbitrary.hs b/test/Arbitrary.hs
index 1a3d73d..74c6d11 100644
--- a/test/Arbitrary.hs
+++ b/test/Arbitrary.hs
@@ -1,6 +1,7 @@
{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE GADTs #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE StandaloneDeriving #-}
-- | External 'Arbitrary' instances used by OPML types.
@@ -41,7 +42,7 @@ instance Arbitrary Version where
-- | Reasonable enough 'URI' generator.
instance Arbitrary URI where
arbitrary = URI <$> arbitrary <*> arbitrary <*> genPath <*> arbitrary <*> (Just <$> genFragment)
- shrink = genericShrink
+ shrink (URI a b c d e) = URI <$> shrink a <*> shrink b <*> shrink c <*> shrink d <*> shrink e
-- | Reasonable enough 'Authority' generator.
instance Arbitrary Authority where
diff --git a/test/Main.hs b/test/Main.hs
index 08d8573..fbd0ed4 100644
--- a/test/Main.hs
+++ b/test/Main.hs
@@ -105,7 +105,7 @@ placesCase = testCase "Parse places list" $ do
show (result ^. opmlHeadL . opmlCreatedL) @?= "Just 2006-02-27 12:09:48 UTC"
show (result ^. opmlHeadL . modifiedL) @?= "Just 2006-02-27 12:11:44 UTC"
(result ^. opmlHeadL . ownerNameL) @?= "Dave Winer"
- fmap (decodeUtf8 . serializeURI') (result ^. opmlHeadL . ownerIdL) @?= Just "http://www.opml.org/profiles/sendMail?usernum=1"
+ fmap (decodeUtf8 . serializeURIRef') (result ^. opmlHeadL . ownerIdL) @?= Just "http://www.opml.org/profiles/sendMail?usernum=1"
(result ^.. opmlHeadL . expansionStateL) @?= [1,2,5,10,13,15]
(result ^. opmlHeadL . vertScrollStateL) @?= Just 1
(result ^. opmlHeadL . windowBottomL) @?= Just 665