xml-conduit 1.7.0 → 1.7.0.1

raw patch · 3 files changed

+15/−6 lines, 3 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• Text/XML/Stream/Parse.hs +2/−1
• Text/XML/Unresolved.hs +12/−4
• xml-conduit.cabal +1/−1

@@ -27,9 +27,10 @@ -- -- > {-# LANGUAGE OverloadedStrings #-} -- > import Control.Monad.Trans.Resource--- > import Data.Conduit (($$))+-- > import Data.Conduit (Consumer, Sink, ($$)) -- > import Data.Text (Text, unpack) -- > import Text.XML.Stream.Parse+-- > import Data.XML.Types (Event) -- > -- > data Person = Person Int Text -- >     deriving Show

@@ -58,6 +58,8 @@ import qualified Data.Conduit.Binary          as CB import           Data.Conduit.Lazy            (lazyConsume) import qualified Data.Conduit.List            as CL+import           Data.Maybe                   (isJust, mapMaybe)+import           Data.Monoid                  (mconcat) import           Data.Text                    (Text) import qualified Data.Text                    as T import qualified Data.Text.Lazy               as TL@@ -268,10 +270,16 @@     goN' (NodeComment t)     = (EventComment t :)  compressNodes :: [Node] -> [Node]-compressNodes [] = []-compressNodes [x] = [x]-compressNodes (NodeContent (ContentText x) : NodeContent (ContentText y) : z) =-    compressNodes $ NodeContent (ContentText $ x `T.append` y) : z+compressNodes []     = []+compressNodes [x]    = [x]+compressNodes (x@(NodeContent (ContentText _)) : y@(NodeContent (ContentText _)) : z) =+    let (textNodes, remainder) = span (isJust . unContent) (x:y:z)+        texts = mapMaybe unContent textNodes+    in+        compressNodes $ NodeContent (ContentText $ mconcat texts) : remainder+    where+        unContent (NodeContent (ContentText text)) = Just text+        unContent _                                = Nothing compressNodes (x:xs) = x : compressNodes xs  parseText :: ParseSettings -> TL.Text -> Either SomeException Document

@@ -1,5 +1,5 @@ name:            xml-conduit-version:         1.7.0+version:         1.7.0.1 license:         MIT license-file:    LICENSE author:          Michael Snoyman <michael@snoyman.com>, Aristid Breitkreuz <aristidb@googlemail.com>