git.iko.soy/typeable/dom-parser
on master help sign in
16 files changed+743−343
since splitsnapshots
unifiedsplit
.travis.yml+32 CHANGELOG.md+44 README.md+5 dom-parser.cabal+16−11 ghc-963.yaml+7 src/Text/XML/DOM/Parser.hs+10−2 src/Text/XML/DOM/Parser/Attributes.hs+64 src/Text/XML/DOM/Parser/Buildable.hs+26 src/Text/XML/DOM/Parser/Combinators.hs+49−163 src/Text/XML/DOM/Parser/Content.hs+129 src/Text/XML/DOM/Parser/FromAttribute.hs+112 src/Text/XML/DOM/Parser/Class.hs → src/Text/XML/DOM/Parser/FromDom.hs+51−92 src/Text/XML/DOM/Parser/Types.hs+145−63 src/Text/XML/Soap.hs+46 stack.yaml+1−6 test/Main.hs+6−6
.travis.ymlnew file+32
@@ -0,0 +1,32 @@
1+# Use new container infrastructure to enable caching
2+sudo: false
3+
4+# Do not choose a language; we provide our own build tools.
5+language: generic
6+
7+env:
8+ - STACK_YAML=stack.yaml
9+ - STACK_YAML=ghc-802.yaml
10+ - STACK_YAML=ghc-822.yaml
11+ - STACK_YAML=ghc-841.yaml
12+
13+# Caching so the next build will be fast too.
14+cache:
15+ directories:
16+ - $HOME/.stack
17+
18+# Ensure necessary system libraries are present
19+addons:
20+ apt:
21+ packages:
22+ - libgmp-dev
23+
24+before_install:
25+# Download and unpack the stack executable
26+- mkdir -p ~/.local/bin
27+- export PATH=$HOME/.local/bin:$PATH
28+- travis_retry curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
29+
30+script:
31+# Build the package, its tests, and its docs and run the tests
32+- stack --no-terminal --install-ghc test --haddock --no-haddock-deps
CHANGELOG.md+44
@@ -1,10 +1,54 @@
11# CHANGELOG
22
3+## HEAD
4+
5+## 3.2.0
6+
7+### Added
8+
9+* Text.XML.Soap module with XmlEnvelope stuff in it.
10+* GHC 9 compatibility.
11+
12+### Removed
13+
14+* Old stackage files.
15+
16+## 3.1.0
17+
18+### Added
19+
20+* Additional builds with GHC 8.0.2 and 8.2.1
21+* Compatibility with GHC 8.4.1
22+
23+## 3.0.0
24+
25+* GHC 8 compatible release
26+
27+### Removed
28+
29+* `open-union` dependency
30+
31+## 2.0.0
32+
33+### Added
34+
35+* `NameMatcher` and `ElemMatcher` as more flexible mechanisms for
36+ matching names and elements instead of just matching by name.
37+* Class `FromAttribute` and some default instances
38+
39+### Changed
40+
41+* `DomTraversable` renamed to `Buildable`
42+* Combinators use `NameMatcher` and `ElemMatcher`
43+* Documentation improved
44+
345## 1.0.0
46+
447* Added support for parsing attributes
548* Changed public interface for 'parseContent'
649* Added useful functions
750* Dropped unnecessary dependency from shakespeare
851
952## 0.1.0
53+
1054* Public release
README.mdnew file+5
@@ -0,0 +1,5 @@
1+# dom-parser
2+
3+[![Build Status](https://travis-ci.org/typeable/dom-parser.svg?branch=master)](https://travis-ci.org/typeable/dom-parser)
4+
5+Simple monadic DOM parser
dom-parser.cabal+16−11
@@ -1,5 +1,5 @@
11name: dom-parser
2−version: 1.0.0
2+version: 3.2.0
33synopsis: Simple monadic DOM parser
44license: MIT
55license-file: LICENSE
@@ -7,12 +7,13 @@ author: Typeable.io contributors
77maintainer: makeit@typeable.io
88category: XML
99build-type: Simple
10−extra-source-files: CHANGELOG.md
1110cabal-version: >=1.10
12−
13−extra-source-files: CHANGELOG.md
14−
1511homepage: https://github.com/typeable/dom-parser
12+tested-with: GHC == 9.2.7
13+ , GHC == 9.4.8
14+ , GHC == 9.6.3
15+extra-source-files: CHANGELOG.md
16+ , README.md
1617
1718source-repository head
1819 type: git
@@ -43,22 +44,26 @@ library
4344 , TypeFamilies
4445 , TypeOperators
4546 , UndecidableInstances
46− build-depends: base >= 4.7 && < 5
47+ build-depends: base >= 4.11 && < 5
48+ , case-insensitive
4749 , containers
4850 , lens
49− , mtl
50− , open-union >= 0.2
51+ , mtl < 2.3 || > 2.3
5152 , scientific
52− , semigroups
5353 , text
5454 , transformers
55− , type-fun
5655 , xml-conduit
56+ , xml-conduit-writer
5757 , xml-lens
5858 exposed-modules: Text.XML.DOM.Parser
59− , Text.XML.DOM.Parser.Class
59+ , Text.XML.DOM.Parser.Attributes
60+ , Text.XML.DOM.Parser.Buildable
6061 , Text.XML.DOM.Parser.Combinators
62+ , Text.XML.DOM.Parser.Content
63+ , Text.XML.DOM.Parser.FromAttribute
64+ , Text.XML.DOM.Parser.FromDom
6165 , Text.XML.DOM.Parser.Types
66+ , Text.XML.Soap
6267
6368test-suite test
6469 type: exitcode-stdio-1.0
ghc-963.yamlnew file+7
@@ -0,0 +1,7 @@
1+resolver: lts-22.6
2+
3+extra-deps:
4+ - xml-conduit-writer-0.1.1.5
5+
6+nix:
7+ packages: [zlib]
src/Text/XML/DOM/Parser.hs+10−2
@@ -1,9 +1,17 @@
11module Text.XML.DOM.Parser
2− ( module Text.XML.DOM.Parser.Class
2+ ( module Text.XML.DOM.Parser.Attributes
3+ , module Text.XML.DOM.Parser.Buildable
34 , module Text.XML.DOM.Parser.Combinators
5+ , module Text.XML.DOM.Parser.Content
6+ , module Text.XML.DOM.Parser.FromAttribute
7+ , module Text.XML.DOM.Parser.FromDom
48 , module Text.XML.DOM.Parser.Types
59 ) where
610
7−import Text.XML.DOM.Parser.Class
11+import Text.XML.DOM.Parser.Attributes
12+import Text.XML.DOM.Parser.Buildable
813import Text.XML.DOM.Parser.Combinators
14+import Text.XML.DOM.Parser.Content
15+import Text.XML.DOM.Parser.FromAttribute
16+import Text.XML.DOM.Parser.FromDom
917import Text.XML.DOM.Parser.Types
src/Text/XML/DOM/Parser/Attributes.hsnew file+64
@@ -0,0 +1,64 @@
1+module Text.XML.DOM.Parser.Attributes
2+ ( parseAttribute
3+ , parseAttributeMaybe
4+ , getCurrentAttributes
5+ , getCurrentAttribute
6+ ) where
7+
8+import Control.Lens
9+import Data.Map.Strict as M
10+import Data.Text as T
11+import Text.XML.DOM.Parser.Types
12+import Text.XML.Lens
13+
14+-- | Parses attribute with given name, throws error if attribute is not found.
15+--
16+-- @since 1.0.0
17+parseAttribute
18+ :: (Monad m)
19+ => NameMatcher
20+ -- ^ Attribute name
21+ -> (Text -> Either Text a)
22+ -- ^ Attribute content parser
23+ -> DomParserT Identity m a
24+parseAttribute attrName parser =
25+ parseAttributeMaybe attrName parser >>= \case
26+ Nothing -> throwParserError $ PEAttributeNotFound attrName
27+ Just a -> return a
28+
29+-- | Parses attribute with given name. Returns Nothing if attribute is
30+-- not found.
31+--
32+-- @since 1.0.0
33+parseAttributeMaybe
34+ :: (Monad m)
35+ => NameMatcher
36+ -- ^ Attribute name
37+ -> (Text -> Either Text a)
38+ -- ^ Attribute content parser
39+ -> DomParserT Identity m (Maybe a)
40+parseAttributeMaybe attrName parser =
41+ getCurrentAttribute attrName >>= \case
42+ Nothing -> return Nothing
43+ Just aval -> case parser aval of
44+ Left err -> throwParserError $ PEAttributeWrongFormat attrName err
45+ Right a -> return $ Just a
46+
47+-- | Retuns map of attributes of current element
48+--
49+-- @since 1.0.0
50+getCurrentAttributes
51+ :: (Monad m)
52+ => DomParserT Identity m (M.Map Name Text)
53+getCurrentAttributes = view $ pdElements . to runIdentity . attrs
54+
55+-- | Returns element with given name or 'Nothing'
56+--
57+-- @since 1.0.0
58+getCurrentAttribute
59+ :: (Monad m)
60+ => NameMatcher
61+ -> DomParserT Identity m (Maybe Text)
62+getCurrentAttribute attrName
63+ = preview $ pdElements . to runIdentity . attrs . to M.toList
64+ . traversed . filtered (views _1 (attrName ^. nmMatch)) . _2
src/Text/XML/DOM/Parser/Buildable.hsnew file+26
@@ -0,0 +1,26 @@
1+module Text.XML.DOM.Parser.Buildable
2+ ( Buildable(..)
3+ ) where
4+
5+import Data.Functor.Identity
6+import Data.List.NonEmpty as NE
7+import Data.Maybe
8+
9+-- | Class of traversable functors which may be constructed from list
10+class Traversable f => Buildable f where
11+ -- | If method return Nothing this means we can not build
12+ -- traversable from given list. In this case 'inFilteredTrav' should
13+ -- fail traversing.
14+ build :: [a] -> Maybe (f a)
15+
16+instance Buildable Identity where
17+ build = fmap Identity . listToMaybe
18+
19+instance Buildable [] where
20+ build = Just
21+
22+instance Buildable Maybe where
23+ build = Just . listToMaybe
24+
25+instance Buildable NonEmpty where
26+ build = NE.nonEmpty
src/Text/XML/DOM/Parser/Combinators.hs+49−163
@@ -2,7 +2,7 @@ module Text.XML.DOM.Parser.Combinators
22 ( -- * Generic combinators to traverse descendants
33 traverseElems
44 , inFilteredTrav
5− -- * Using 'DomTraversable'
5+ -- * Using 'Buildable'
66 , inElemTrav
77 , inElem
88 , inElemAll
@@ -15,46 +15,30 @@ module Text.XML.DOM.Parser.Combinators
1515 , ignoreElem
1616 , ignoreEmpty
1717 , ignoreBlank
18− -- * Getting current element's properties
19− , getCurrentName
20− , getCurrentContent
21− , getCurrentAttributes
22− , getCurrentAttribute
23− -- * Current element's checks
24− , checkCurrentName
25− -- * Parsing element's content
26− , parseContent
27− , readContent
28− , maybeReadContent
29− -- * Parsing attributes
30− , parseAttribute
3118 ) where
3219
33−import Control.Lens
34−import Control.Monad.Except
35−import Control.Monad.Reader
36−import Data.List.NonEmpty (NonEmpty(..))
37−import qualified Data.Map.Strict as M
38−import Data.Monoid
39−import Data.Text (Text)
40−import qualified Data.Text as T
41−import Data.Traversable
42−import Data.Typeable
43−import Text.Read
44−import Text.XML
45−import Text.XML.DOM.Parser.Types
46−import Text.XML.Lens
20+import Control.Lens
21+import Control.Monad.Reader
22+import Data.Foldable as F
23+import Data.List as L
24+import Data.List.NonEmpty (NonEmpty(..))
25+import Data.Text as T
26+import Data.Traversable
27+import Text.XML
28+import Text.XML.DOM.Parser.Buildable
29+import Text.XML.DOM.Parser.Types
30+import Text.XML.Lens
4731
4832
49−-- | Generic function to traverse arbitrary inner cursors.
33+-- | Generic function to traverse arbitrary inner elements.
5034traverseElems
5135 :: (Monad m, Foldable g, Traversable f)
5236 => ([Element] -> DomParserT g m (f (DomPath, Element)))
5337 -- ^ Takes list of current elements and returns container with
54− -- pairs of subpath (relatively to current element) and element
38+ -- pairs of subpath (relatively to current elements) and element
5539 -- to run parser in
5640 -> DomParserT Identity m a
57− -- ^ Parser will be runned for each element found in traversable
41+ -- ^ Parser to run for each element found in traversable 'f'
5842 -> DomParserT g m (f a)
5943traverseElems trav parser = do
6044 pd <- ask
@@ -64,68 +48,73 @@ traverseElems trav parser = do
6448 newpd = ParserData
6549 { _pdElements = Identity e
6650 , _pdPath = pd ^. pdPath <> subpath }
67− -- type of reader has been changed, local won't work here
68− magnify (to $ const newpd) parser
51+ lift $ runReaderT parser newpd
6952
70−-- | Takes function filtering
53+-- | Traverses elements located in same path using filtering function
7154inFilteredTrav
72− :: (Monad m, Foldable g, DomTraversable f)
55+ :: (Monad m, Foldable g, Buildable f)
7356 => ([Element] -> (DomPath, [Element]))
74− -- ^ Function returning some filtered elements with path suffixes which will
75− -- be appended to parser's state
57+ -- ^ Takes list of current elements and returns some descendants
58+ -- subset and path this descendants located at. Path is should be
59+ -- same for all descendants and required for error message
7660 -> DomParserT Identity m a
7761 -> DomParserT g m (f a)
7862inFilteredTrav deeper = traverseElems trav
7963 where
8064 trav e = do
8165 let (path, elems) = deeper e
82− case buildDomTraversable elems of
66+ case build elems of
8367 Nothing -> throwParserError $ PENotFound . (<> path)
8468 Just tr -> return $ fmap (path,) tr
8569
70+-- | Runs parser arbitrary times, depending on 'Buildable' instance of
71+-- 'f'. For example if 'f' becomes 'NonEmpty' then 'inElemTrav' finds
72+-- @one or more@ elements matched by given 'ElemMatcher' and run
73+-- parser in each found element, then returns @NonEmpty a@ of results.
8674inElemTrav
87− :: (Monad m, Foldable g, DomTraversable f)
88− => Text
75+ :: (Monad m, Foldable g, Buildable f)
76+ => ElemMatcher -- ^ Tag(s) matcher to traverse in
8977 -> DomParserT Identity m a
9078 -> DomParserT g m (f a)
9179inElemTrav n = inFilteredTrav deeper
9280 where
93− deeper = ([n],) . toListOf (folded . nodes . folded . _Element . ell n)
81+ elemsFold = folded . nodes . folded . _Element . elMatch n
82+ deeper = (DomPath [_emShow n],) . toListOf elemsFold
9483
95−-- | Runs parser inside first children element with given name
84+-- | Runs parser inside first children element matched by macher
9685inElem
9786 :: (Monad m, Foldable g)
98− => Text
87+ => ElemMatcher
9988 -> DomParserT Identity m a
10089 -> DomParserT g m a
10190inElem n = fmap runIdentity . inElemTrav n
10291
10392inElemAll
10493 :: (Monad m, Foldable g)
105− => Text
94+ => ElemMatcher
10695 -> DomParserT Identity m a
10796 -> DomParserT g m [a]
10897inElemAll = inElemTrav
10998
11099inElemMay
111100 :: (Monad m, Foldable g)
112− => Text
101+ => ElemMatcher
113102 -> DomParserT Identity m a
114103 -> DomParserT g m (Maybe a)
115104inElemMay = inElemTrav
116105
117106inElemNe
118107 :: (Monad m, Foldable g)
119− => Text
108+ => ElemMatcher
120109 -> DomParserT Identity m a
121110 -> DomParserT g m (NonEmpty a)
122111inElemNe = inElemTrav
123112
124113{- | Dive given parser's current tags set into the given path. The @divePath
125−["a", "b"]@ differs from @inElem "a" . inElem "b"@. Namely the first variant
114+["a", "b"]@ differs from @inElem "a" $ inElem "b"@. Namely the first variant
126115will not fail if occured tag "a" which does not contains tag "b". This
127116behaviour is desireable when you dont want to parse whole XML and just want
128−to pull tags in some path. The other difference is in traversing inner
117+to pull tags located in some path. The other difference is in traversing inner
129118elements. Consider this code
130119
131120@
@@ -143,26 +132,31 @@ which translates like: @a > b > c > fromDom@
143132As you can see, inElem always takes first element and runs inner parser in this
144133single element, unlike 'divePath' which runs inner parser @in all@ descendants
145134in given path.
135+
136+Note also that 'divePath' takes parser parameterized by @[]@ not by
137+'Identity'. This because when you dive using some path you will get a
138+list of found elements and all these elements will be @current@ for
139+parser.
146140-}
147141
148142divePath
149143 :: forall m g a
150144 . (Monad m, Foldable g)
151− => [Text]
145+ => [ElemMatcher]
152146 -> DomParserT [] m a
153147 -> DomParserT g m a
154148divePath path = magnify $ to modElems
155149 where
156150 modElems
157151 = over pdElements (toListOf $ folded . diver)
158− . over pdPath (<> path)
152+ . over pdPath (<> DomPath (L.map _emShow path))
159153 diver :: Fold Element Element
160− diver = foldr (.) id $ map toDive path
161− toDive n = nodes . folded . _Element . ell n
154+ diver = F.foldr (.) id $ L.map toDive path
155+ toDive n = nodes . folded . _Element . elMatch n
162156
163157diveElem
164158 :: (Monad m, Foldable g)
165− => Text
159+ => ElemMatcher
166160 -> DomParserT [] m a
167161 -> DomParserT g m a
168162diveElem p = divePath [p]
@@ -189,7 +183,7 @@ ignoreEmpty
189183 -> DomParserT Identity m (Maybe a)
190184ignoreEmpty = ignoreElem test
191185 where
192− test e = null $ e ^. nodes
186+ test e = L.null $ e ^. nodes
193187
194188-- | If all current elements contains blank content, or contains nothing at all
195189-- , then returns Nothing, else runs parser.
@@ -203,114 +197,6 @@ ignoreBlank = ignoreElem test
203197 let
204198 elems = e ^.. nodes . folded . _Element
205199 cont = mconcat $ e ^.. nodes . folded . _Content
206− in if | not $ null elems -> False
200+ in if | not $ L.null elems -> False
207201 | T.null $ T.strip cont -> True
208202 | otherwise -> False
209−
210−-- | Returns name of current element.
211−--
212−-- @since 1.0.0
213−getCurrentName :: (Monad m) => DomParserT Identity m Text
214−getCurrentName = view $ pdElements . to runIdentity . localName
215−
216−-- | If name of current tag differs from first argument throws 'PENotFound' with
217−-- tag name replaced in last path's segment. Useful for checking root
218−-- document's element name.
219−checkCurrentName
220− :: (Monad m)
221− => Text
222− -> DomParserT Identity m ()
223−checkCurrentName n = do
224− cn <- getCurrentName
225− unless (cn == n) $ do
226− p <- view pdPath
227− let pinit = if null p then [] else init p
228− throwError $ ParserErrors [PENotFound $ pinit ++ [n]]
229− return ()
230−
231−-- | Get current content. If current element contains no content or
232−-- have inner elements then Nothing returned
233−--
234−-- @since 1.0.0
235−getCurrentContent :: (Monad m) => DomParserT Identity m (Maybe Text)
236−getCurrentContent = do
237− nds <- view $ pdElements . to runIdentity . nodes
238− let
239− els :: [Element]
240− els = nds ^.. folded . _Element
241− conts :: [Text]
242− conts = nds ^.. folded . _Content
243− return $ if
244− | not $ null els -> Nothing
245− | null conts -> Nothing
246− | otherwise -> Just $ mconcat conts
247−
248−-- | Parses content inside current tag. It expects current element set
249−-- consists of exactly ONE element. If current element does not
250−-- contains content or have other elements as childs then throws error
251−parseContent
252− :: (Monad m)
253− => (Text -> Either Text a)
254− -- ^ Content parser, return error msg if value is not parsed
255− -> DomParserT Identity m a
256−parseContent parse = getCurrentContent >>= \case
257− Nothing -> throwParserError PEContentNotFound
258− Just c -> case parse c of
259− Left e -> throwParserError $ PEWrongFormat e
260− Right a -> return a
261−
262−-- | If reader returns 'Nothing' then resulting function returns 'Left
263−-- "error message"'
264−--
265−-- @since 1.0.0
266−maybeReadContent
267− :: forall a
268− . (Typeable a)
269− => (Text -> Maybe a)
270− -- ^ Content or attribute reader
271− -> Text
272− -- ^ Content or attribute value
273− -> Either Text a
274−maybeReadContent f t = maybe (Left msg) Right $ f t
275− where
276− msg = "Not readable " <> n <> ": " <> t
277− n = T.pack $ show $ typeRep (Proxy :: Proxy a)
278−
279−-- | Tries to read given text to value using 'Read'. Useful to use
280−-- with 'parseContent' and 'parseAttribute'
281−readContent
282− :: (Read a, Typeable a)
283− => Text
284− -> Either Text a
285−readContent = maybeReadContent $ readMaybe . T.unpack . T.strip
286−
287−-- | Retuns map of attributes of current element
288−--
289−-- @since 1.0.0
290−getCurrentAttributes :: (Monad m) => DomParserT Identity m (M.Map Name Text)
291−getCurrentAttributes = view $ pdElements . to runIdentity . attrs
292−
293−-- | Returns element with given name or 'Nothing'
294−--
295−-- @since 1.0.0
296−getCurrentAttribute :: (Monad m) => Text -> DomParserT Identity m (Maybe Text)
297−getCurrentAttribute attrName'
298− = preview $ pdElements . to runIdentity . attr attrName
299− where
300− attrName = Name attrName' Nothing Nothing
301−
302−-- | Parses attribute with given name, throws error if attribute is not found.
303−--
304−-- @since 1.0.0
305−parseAttribute
306− :: (Monad m)
307− => Text
308− -- ^ Attribute name
309− -> (Text -> Either Text a)
310− -- ^ Attribute content parser
311− -> DomParserT Identity m a
312−parseAttribute attrName parser = getCurrentAttribute attrName >>= \case
313− Nothing -> throwParserError $ PEAttributeNotFound attrName
314− Just aval -> case parser aval of
315− Left err -> throwParserError $ PEAttributeWrongFormat attrName err
316− Right a -> return a
src/Text/XML/DOM/Parser/Content.hsnew file+129
@@ -0,0 +1,129 @@
1+module Text.XML.DOM.Parser.Content
2+ (
3+ -- * Parsing element's content
4+ parseContent
5+ -- * Getting current element's properties
6+ , getCurrentName
7+ , getCurrentContent
8+ , checkCurrentName
9+ -- * Internal
10+ , maybeReadContent
11+ , readContent
12+ , readBool
13+ , readChar
14+ ) where
15+
16+import Control.Lens
17+import Control.Monad
18+import Control.Monad.Except
19+import Data.List as L
20+import Data.Monoid
21+import Data.Text as T
22+import Data.Typeable
23+import Prelude as P
24+import Text.Read
25+import Text.XML.DOM.Parser.Types
26+import Text.XML.Lens
27+
28+
29+-- | Parses content inside current tag. It expects current element set
30+-- consists of exactly ONE element.
31+parseContent
32+ :: (Monad m)
33+ => (Text -> Either Text a)
34+ -- ^ Content parser, return error msg if value is not parsed
35+ -> DomParserT Identity m a
36+parseContent parse = getCurrentContent >>= \case
37+ Nothing -> throwParserError PEContentNotFound
38+ Just c -> case parse c of
39+ Left e -> throwParserError $ PEContentWrongFormat e
40+ Right a -> return a
41+
42+
43+-- | Returns name of current element.
44+--
45+-- @since 1.0.0
46+getCurrentName :: (Monad m) => DomParserT Identity m Name
47+getCurrentName = view $ pdElements . to runIdentity . name
48+
49+-- | If name of current tag differs from first argument throws 'PENotFound' with
50+-- tag name replaced in last path's segment. Useful for checking root
51+-- document's element name.
52+checkCurrentName
53+ :: (Monad m)
54+ => NameMatcher
55+ -> DomParserT Identity m ()
56+checkCurrentName n = do
57+ cn <- getCurrentName
58+ unless ((n ^. nmMatch) cn) $ do
59+ p <- view pdPath
60+ let pinit = if L.null (unDomPath p) then [] else L.init $ unDomPath p
61+ throwError $ ParserErrors [PENotFound $ DomPath $ pinit ++ [_nmShow n]]
62+ return ()
63+
64+-- | Get current content. If current element contains no content or
65+-- have inner elements then Nothing returned
66+--
67+-- @since 1.0.0
68+getCurrentContent :: (Monad m) => DomParserT Identity m (Maybe Text)
69+getCurrentContent = do
70+ nds <- view $ pdElements . to runIdentity . nodes
71+ let
72+ els :: [Element]
73+ els = nds ^.. folded . _Element
74+ conts :: [Text]
75+ conts = nds ^.. folded . _Content
76+ return $ if
77+ | not $ L.null els -> Nothing
78+ | L.null conts -> Nothing
79+ | otherwise -> Just $ mconcat conts
80+
81+-- | If reader returns 'Nothing' then resulting function returns 'Left
82+-- "error message"'. 'Typeable' is used for generating usefull error
83+-- message.
84+--
85+-- @since 1.0.0
86+maybeReadContent
87+ :: forall a
88+ . (Typeable a)
89+ => (Text -> Maybe a)
90+ -- ^ Content or attribute reader
91+ -> Text
92+ -- ^ Content or attribute value
93+ -> Either Text a
94+maybeReadContent f t = maybe (Left msg) Right $ f t
95+ where
96+ msg = "Not readable " <> n <> ": " <> t
97+ n = T.pack $ P.show $ typeRep (Proxy :: Proxy a)
98+
99+
100+-- | Tries to read given text to value using 'Read'. Useful to use
101+-- with 'parseContent' and 'parseAttribute'. Content is stripped
102+-- before reading.
103+readContent
104+ :: (Read a, Typeable a)
105+ => Text
106+ -> Either Text a
107+readContent = maybeReadContent $ readMaybe . T.unpack . T.strip
108+
109+
110+-- | @since 1.0.0
111+readBool :: Text -> Either Text Bool
112+readBool t =
113+ let
114+ lowt = T.toLower $ T.strip t
115+ tvals = ["y", "yes", "t", "true", "1"]
116+ fvals = ["n", "no", "f", "false", "0"]
117+ in if
118+ | lowt `L.elem` tvals -> Right True
119+ | lowt `L.elem` fvals -> Right False
120+ | otherwise ->
121+ Left $ "Could not read " <> t <> " as Bool"
122+
123+-- | Expects text to be single character
124+--
125+-- @since 1.0.0
126+readChar :: Text -> Either Text Char
127+readChar t = case T.unpack $ T.strip t of
128+ [c] -> Right c
129+ _ -> Left "Should have exactly one non-blank character"
src/Text/XML/DOM/Parser/FromAttribute.hsnew file+112
@@ -0,0 +1,112 @@
1+module Text.XML.DOM.Parser.FromAttribute
2+ ( -- * FromAttribute
3+ FromAttribute(..)
4+ , proxyFromAttribute
5+ -- * Explicit methods
6+ , textFromAttribute
7+ , stringFromAttribute
8+ , charFromAttribute
9+ , intFromAttribute
10+ , integerFromAttribute
11+ , doubleFromAttribute
12+ , fixedFromAttribute
13+ , boolFromAttribute
14+ , unitFromAttribute
15+ , voidFromAttribute
16+ , scientificFromAttribute
17+ ) where
18+
19+import Data.Fixed
20+import Data.Scientific
21+import Data.Text as T
22+import Data.Typeable
23+import Data.Void
24+import Text.XML.DOM.Parser.Content
25+
26+-- | Class of types which can be get from attribute value. Method
27+-- 'fromAttribute' is a convenient default parameter for
28+-- 'parseAttribute'
29+--
30+-- @since 2.0.0
31+class FromAttribute a where
32+ fromAttribute
33+ :: Text
34+ -- ^ Attribute contents to parse
35+ -> Either Text a
36+ -- ^ Either error message or result
37+
38+proxyFromAttribute
39+ :: FromAttribute a
40+ => Proxy a
41+ -> Text
42+ -> Either Text a
43+proxyFromAttribute _ = fromAttribute
44+
45+instance FromAttribute () where
46+ fromAttribute = unitFromAttribute
47+
48+unitFromAttribute :: Text -> Either Text ()
49+unitFromAttribute _ = Right ()
50+
51+instance FromAttribute Void where
52+ fromAttribute = voidFromAttribute
53+
54+voidFromAttribute :: Text -> Either Text Void
55+voidFromAttribute _ = Left "Void has been parsed"
56+
57+instance FromAttribute Text where
58+ fromAttribute = textFromAttribute
59+
60+textFromAttribute :: Text -> Either Text Text
61+textFromAttribute = Right
62+
63+instance FromAttribute String where
64+ fromAttribute = stringFromAttribute
65+
66+stringFromAttribute :: Text -> Either Text String
67+stringFromAttribute = Right . T.unpack
68+
69+instance FromAttribute Char where
70+ fromAttribute = charFromAttribute
71+
72+charFromAttribute :: Text -> Either Text Char
73+charFromAttribute = readChar
74+
75+instance FromAttribute Int where
76+ fromAttribute = intFromAttribute
77+
78+intFromAttribute :: Text -> Either Text Int
79+intFromAttribute = readContent
80+
81+instance FromAttribute Integer where
82+ fromAttribute = integerFromAttribute
83+
84+integerFromAttribute :: Text -> Either Text Integer
85+integerFromAttribute = readContent
86+
87+instance FromAttribute Double where
88+ fromAttribute = doubleFromAttribute
89+
90+doubleFromAttribute :: Text -> Either Text Double
91+doubleFromAttribute = readContent
92+
93+instance (Typeable a, HasResolution a) => FromAttribute (Fixed a) where
94+ fromAttribute = fixedFromAttribute
95+
96+fixedFromAttribute
97+ :: (HasResolution a, Typeable a)
98+ => Text
99+ -> Either Text (Fixed a)
100+fixedFromAttribute = readContent
101+
102+instance FromAttribute Bool where
103+ fromAttribute = boolFromAttribute
104+
105+boolFromAttribute :: Text -> Either Text Bool
106+boolFromAttribute = readBool
107+
108+instance FromAttribute Scientific where
109+ fromAttribute = scientificFromAttribute
110+
111+scientificFromAttribute :: Text -> Either Text Scientific
112+scientificFromAttribute = readContent
src/Text/XML/DOM/Parser/Class.hs → src/Text/XML/DOM/Parser/FromDom.hsrenamed+51−92
@@ -1,39 +1,32 @@
1−module Text.XML.DOM.Parser.Class
1+module Text.XML.DOM.Parser.FromDom
22 ( -- * FromDom
33 FromDom(..)
44 , proxyFromDom
55 -- * Explicit methods for convenience
66 , elementFromDom
7− , unionFromDom
87 , textFromDom
98 , stringFromDom
109 , charFromDom
11− , readChar
1210 , intFromDom
1311 , integerFromDom
1412 , doubleFromDom
1513 , fixedFromDom
1614 , boolFromDom
17− , readBool
1815 , unitFromDom
1916 , voidFromDom
2017 , scientificFromDom
2118 ) where
2219
23−import Control.Applicative
24−import Control.Lens
25−import Data.Fixed
26−import Data.Monoid
27−import Data.OpenUnion
28−import Data.Scientific
29−import Data.Text (Text)
30−import qualified Data.Text as T
31−import Data.Typeable
32−import Data.Void
33−import Text.XML
34−import Text.XML.DOM.Parser.Combinators
35−import Text.XML.DOM.Parser.Types
36−import TypeFun.Data.List hiding (Union)
20+import Control.Applicative
21+import Control.Lens
22+import Data.Fixed
23+import Data.Scientific
24+import Data.Text as T hiding (empty)
25+import Data.Typeable
26+import Data.Void
27+import Text.XML
28+import Text.XML.DOM.Parser.Content
29+import Text.XML.DOM.Parser.Types
3730
3831proxyFromDom
3932 :: forall proxy m a
@@ -42,120 +35,86 @@ proxyFromDom
4235 -> DomParserT Identity m a
4336proxyFromDom _ = fromDom
4437
45−-- | Class of types which can be parsed from single XML element.
38+-- | Class of types which can be parsed from single XML element. The
39+-- method 'fromDom' is convenient default to use with 'inElem'
4640class FromDom a where
4741 fromDom :: (Monad m) => DomParserT Identity m a
4842
4943instance FromDom () where
5044 fromDom = unitFromDom
5145
46+-- | Always successfully parses any DOM to @()@
47+unitFromDom :: (Monad m) => DomParserT Identity m ()
48+unitFromDom = pure ()
49+
5250instance FromDom Void where
5351 fromDom = voidFromDom
5452
53+-- | Never parses successfully. It is just 'empty'
54+voidFromDom :: (Monad m) => DomParserT Identity m Void
55+voidFromDom = empty
56+
5557instance FromDom Text where
5658 fromDom = textFromDom
5759
58−instance FromDom String where
59− fromDom = stringFromDom
60−
61−instance FromDom Char where
62− fromDom = charFromDom
63−
64−instance FromDom Int where
65− fromDom = intFromDom
66−
67−instance FromDom Integer where
68− fromDom = integerFromDom
69−
70−instance FromDom Double where
71− fromDom = doubleFromDom
72−
73−instance (HasResolution a, Typeable a) => FromDom (Fixed a) where
74− fromDom = fixedFromDom
75−
76−instance FromDom Bool where
77− fromDom = boolFromDom
78−
79−instance FromDom (Union '[]) where
80− fromDom = empty
81−
82−instance
83− ( Typeable a, FromDom a, FromDom (Union as)
84− , SubList as (a ': as) )
85− => FromDom (Union (a ': as)) where
86− -- fromDom :: forall m. (DomParserMonad m) => m a
87− fromDom = (liftUnion <$> (proxyFromDom (Proxy :: Proxy a)))
88− <|> (reUnion <$> (proxyFromDom (Proxy :: Proxy (Union as))))
89−
90−instance FromDom Element where
91− fromDom = elementFromDom
92−
93−elementFromDom :: (Monad m) => DomParserT Identity m Element
94−elementFromDom = view $ pdElements . to runIdentity
95−
96−unionFromDom
97− :: (Monad m, FromDom (Union as))
98− => proxy as
99− -> DomParserT Identity m (Union as)
100−unionFromDom _ = fromDom
101−
10260textFromDom :: (Monad m) => DomParserT Identity m Text
10361textFromDom = parseContent Right
10462
63+instance FromDom String where
64+ fromDom = stringFromDom
65+
10566stringFromDom :: (Monad m) => DomParserT Identity m String
10667stringFromDom = parseContent $ Right . T.unpack
10768
69+instance FromDom Char where
70+ fromDom = charFromDom
71+
10872charFromDom :: (Monad m) => DomParserT Identity m Char
10973charFromDom = parseContent readChar
11074
111−-- | Expects text to be single character
112−--
113−-- @since 1.0.0
114−readChar :: Text -> Either Text Char
115−readChar t = case T.unpack $ T.strip t of
116− [c] -> Right c
117− _ -> Left "Should have exactly one non-blank character"
75+instance FromDom Int where
76+ fromDom = intFromDom
11877
11978intFromDom :: (Monad m) => DomParserT Identity m Int
12079intFromDom = parseContent readContent
12180
81+instance FromDom Integer where
82+ fromDom = integerFromDom
83+
12284integerFromDom :: (Monad m) => DomParserT Identity m Integer
12385integerFromDom = parseContent readContent
12486
87+instance FromDom Double where
88+ fromDom = doubleFromDom
89+
12590doubleFromDom :: (Monad m) => DomParserT Identity m Double
12691doubleFromDom = parseContent readContent
12792
93+instance (HasResolution a, Typeable a) => FromDom (Fixed a) where
94+ fromDom = fixedFromDom
95+
12896fixedFromDom
12997 :: (Monad m, Typeable a, HasResolution a)
13098 => DomParserT Identity m (Fixed a)
13199fixedFromDom = parseContent readContent
132100
101+instance FromDom Scientific where
102+ fromDom = scientificFromDom
103+
133104scientificFromDom :: Monad m => DomParserT Identity m Scientific
134105scientificFromDom = parseContent readContent
135106
136−-- | Expects content to be y, yes, t, true or 1 for True value. n, no,
137−-- f, false or 0 for False value. Case is not significant, blank
138−-- characters are striped.
107+instance FromDom Bool where
108+ fromDom = boolFromDom
109+
110+-- | Expects content to be y, yes, t, true or 1 for True Values n, no,
111+-- f, false or 0 for False. Case is not significant, blank characters
112+-- are striped.
139113boolFromDom :: (Monad m) => DomParserT Identity m Bool
140114boolFromDom = parseContent readBool
141115
142−-- | @since 1.0.0
143−readBool :: Text -> Either Text Bool
144−readBool t =
145− let
146− lowt = T.toLower $ T.strip t
147− tvals = ["y", "yes", "t", "true", "1"]
148− fvals = ["n", "no", "f", "false", "0"]
149− in if
150− | lowt `elem` tvals -> Right True
151− | lowt `elem` fvals -> Right False
152− | otherwise ->
153− Left $ "Could not read " <> t <> " as Bool"
154−
155−-- | Always successfully parses any DOM to @()@
156−unitFromDom :: (Monad m) => DomParserT Identity m ()
157−unitFromDom = pure ()
116+instance FromDom Element where
117+ fromDom = elementFromDom
158118
159−-- | Never parses successfully. It is just 'mzero'
160−voidFromDom :: (Monad m) => DomParserT Identity m Void
161−voidFromDom = empty
119+elementFromDom :: (Monad m) => DomParserT Identity m Element
120+elementFromDom = view $ pdElements . to runIdentity
src/Text/XML/DOM/Parser/Types.hs+145−63
@@ -1,6 +1,19 @@
11module Text.XML.DOM.Parser.Types
2− ( -- * Parser internals
3− DomPath
2+ (-- * Element matching
3+ ElemMatcher(..)
4+ , emMatch
5+ , emShow
6+ , matchElemName
7+ , elMatch
8+ -- * Name matching
9+ , NameMatcher(..)
10+ , nmMatch
11+ , nmShow
12+ , matchName
13+ , matchLocalName
14+ , matchCILocalName
15+ -- * Parser internals
16+ , DomPath(..)
417 , ParserError(..)
518 , pePath
619 , peDetails
@@ -10,47 +23,140 @@ module Text.XML.DOM.Parser.Types
1023 , ParserData(..)
1124 , pdElements
1225 , pdPath
13− -- * Parser type
1426 , DomParserT
1527 , DomParser
1628 , runDomParserT
1729 , runDomParser
1830 -- * Auxiliary
19− , DomTraversable(..)
2031 , throwParserError
21− , throwWrongFormat
2232 ) where
2333
24−import Control.Exception
25−import Control.Lens
26−import Control.Monad.Except
27−import Control.Monad.Reader
28−import Data.List.NonEmpty (NonEmpty(..))
29−import qualified Data.List.NonEmpty as NE
30−import Data.Maybe
31−import Data.Text (Text)
32−import GHC.Generics (Generic)
33−import Text.XML
34−import Text.XML.Lens
35−
36−type DomPath = [Text]
34+import Control.Exception
35+import Control.Lens
36+import Control.Monad.Except
37+import Control.Monad.Reader
38+import Data.CaseInsensitive as CI
39+import Data.String
40+import Data.Text as T
41+import GHC.Generics (Generic)
42+import Text.XML
43+import Text.XML.Lens
44+
45+-- | Arbitrary element matcher
46+--
47+-- @since 2.0.0
48+data ElemMatcher = ElemMatcher
49+ { _emMatch :: Element -> Bool
50+ , _emShow :: Text
51+ -- ^ Field for 'Show' instance and bulding usefull errors
52+ }
53+
54+makeLenses ''ElemMatcher
55+
56+-- | Instance using instance of 'NameMatcher'
57+instance IsString ElemMatcher where
58+ fromString = matchElemName . fromString
59+
60+instance Show ElemMatcher where
61+ show = T.unpack . _emShow
62+
63+-- | Match element by name
64+--
65+-- @since 2.0.0
66+matchElemName :: NameMatcher -> ElemMatcher
67+matchElemName (NameMatcher matchName showName) = ElemMatcher
68+ { _emMatch = views name matchName
69+ , _emShow = showName
70+ }
71+
72+-- | Match over elements
73+--
74+-- @since 2.0.0
75+elMatch :: ElemMatcher -> Traversal' Element Element
76+elMatch (ElemMatcher match _) = filtered match
77+
78+-- | Arbitrary name matcher. Match name any way you want, but
79+-- considered to be used as comparator with some name with some rules
80+--
81+-- @since 2.0.0
82+data NameMatcher = NameMatcher
83+ { _nmMatch :: Name -> Bool
84+ -- ^ Name matching function, usually should be simple comparsion
85+ -- function takin in account only local name or other components
86+ -- of 'Name'
87+ , _nmShow :: Text
88+ -- ^ Field for 'Show' instance and bulding usefull errors
89+ }
90+
91+-- | Instance use 'matchCILocalName' as most general and liberal
92+-- matching strategy (while XML is often malformed).
93+--
94+-- @since 2.0.0
95+instance IsString NameMatcher where
96+ fromString = matchCILocalName . T.pack
97+
98+instance Show NameMatcher where
99+ show = T.unpack . _nmShow
100+
101+-- | Makes matcher which matches only local part of name igoring
102+-- namespace and prefix. Local name matching is case sensitive.
103+--
104+-- @since 2.0.0
105+matchLocalName :: Text -> NameMatcher
106+matchLocalName tname = NameMatcher
107+ { _nmMatch = \n -> nameLocalName n == tname
108+ , _nmShow = tname
109+ }
110+
111+-- | Makes matcher which matches only local part of name igoring
112+-- namespace and prefix. Local name matching is case insensitive. This
113+-- is the most common case.
114+--
115+-- @since 2.0.0
116+matchCILocalName :: Text -> NameMatcher
117+matchCILocalName tname = NameMatcher
118+ { _nmMatch = \n -> CI.mk (nameLocalName n) == CI.mk tname
119+ , _nmShow = tname
120+ }
121+
122+makeLenses ''NameMatcher
123+
124+-- | Makes matcher which match name by 'Eq' with given
125+--
126+-- @since 2.0.0
127+matchName :: Name -> NameMatcher
128+matchName n = NameMatcher
129+ { _nmMatch = (== n)
130+ , _nmShow = nameLocalName n
131+ }
132+
133+-- | Path some element should be found at. Path starts from the root
134+-- element of the document. Errors are much more usefull with path.
135+newtype DomPath = DomPath
136+ { unDomPath :: [Text]
137+ } deriving (Eq, Ord, Show, Semigroup, Monoid)
37138
38139-- | DOM parser error description.
39140data ParserError
40141 -- | Tag not found which should be.
41142 = PENotFound
42143 { _pePath :: DomPath
144+ -- ^ Path of element error occured in
43145 }
44146
45− -- | Tag contents has wrong format, (could not read text to value)
46− | PEWrongFormat
47− { _peDetails :: Text
48− , _pePath :: DomPath -- ^ path of element
147+ -- | Expected attribute but not found
148+ --
149+ -- @since 1.0.0
150+ | PEAttributeNotFound
151+ { _peAttributeName :: NameMatcher
152+ , _pePath :: DomPath
49153 }
50154
51155 -- | Could not parse attribute
156+ --
157+ -- @since 1.0.0
52158 | PEAttributeWrongFormat
53− { _peAttributeName :: Text
159+ { _peAttributeName :: NameMatcher
54160 , _peDetails :: Text
55161 , _pePath :: DomPath
56162 }
@@ -60,17 +166,17 @@ data ParserError
60166 { _pePath :: DomPath
61167 }
62168
63− -- | Expected attribute but not found
64− | PEAttributeNotFound
65− { _peAttributeName :: Text
66− , _pePath :: DomPath
169+ -- | Tag contents has wrong format, (could not read text to value)
170+ | PEContentWrongFormat
171+ { _peDetails :: Text
172+ , _pePath :: DomPath
67173 }
68174
69175 -- | Some other error
70176 | PEOther
71177 { _peDetails :: Text
72178 , _pePath :: DomPath
73− } deriving (Eq, Ord, Show, Generic)
179+ } deriving (Show, Generic)
74180
75181makeLenses ''ParserError
76182
@@ -78,15 +184,16 @@ instance Exception ParserError
78184
79185newtype ParserErrors = ParserErrors
80186 { unParserErrors :: [ParserError]
81− } deriving (Ord, Eq, Show, Monoid, Generic)
187+ } deriving (Show, Semigroup, Monoid, Generic)
82188
83189makePrisms ''ParserErrors
84190
85191instance Exception ParserErrors
86192
87193
88−{- | Parser scope parser runs in. Functor argument is usually @Identity@ or
89−@[]@.
194+{- | Parser scope.
195+
196+Functor argument is usually @Identity@ or @[]@.
90197
91198If functor is @Identity@ then parser expects exactly ONE current element. This
92199is common behavior for content parsers, or parsers expecting strict XML
@@ -119,10 +226,11 @@ runDomParserT
119226 -> DomParserT Identity m a
120227 -> m (Either ParserErrors a)
121228runDomParserT doc par =
122− let pd = ParserData
123− { _pdElements = doc ^. root . to pure
124− , _pdPath = [doc ^. root . localName]
125− }
229+ let
230+ pd = ParserData
231+ { _pdElements = doc ^. root . to pure
232+ , _pdPath = DomPath [doc ^. root . name . to nameLocalName]
233+ }
126234 in runExceptT $ runReaderT par pd
127235
128236runDomParser
@@ -131,36 +239,10 @@ runDomParser
131239 -> Either ParserErrors a
132240runDomParser doc par = runIdentity $ runDomParserT doc par
133241
134−-- | Class of traversable functors which may be constructed from list. Or may
135−-- not.
136−class Traversable f => DomTraversable f where
137− -- | If method return Nothing this means we can not build traversable from
138− -- given list. In this case combinator should fail traversing.
139− buildDomTraversable :: [a] -> Maybe (f a)
140−
141−instance DomTraversable Identity where
142− buildDomTraversable = fmap Identity . listToMaybe
143−
144−instance DomTraversable [] where
145− buildDomTraversable = Just
146−
147−instance DomTraversable Maybe where
148− buildDomTraversable = Just . listToMaybe
149−
150−instance DomTraversable NonEmpty where
151− buildDomTraversable = NE.nonEmpty
152−
153242throwParserError
154243 :: (MonadError ParserErrors m, MonadReader (ParserData f) m)
155− => ([Text] -> ParserError)
244+ => (DomPath -> ParserError)
156245 -> m a
157246throwParserError mkerr = do
158247 path <- view pdPath
159− throwError $ ParserErrors [mkerr path]
160−
161−-- | Throw 'PEWrongFormat' as very common case
162−throwWrongFormat
163− :: (MonadError ParserErrors m, MonadReader (ParserData f) m)
164− => Text
165− -> m a
166−throwWrongFormat err = throwParserError $ PEWrongFormat err
248+ throwError $ ParserErrors $ [mkerr path]
src/Text/XML/Soap.hsnew file+46
@@ -0,0 +1,46 @@
1+module Text.XML.Soap where
2+
3+import Control.Lens
4+import Data.String
5+import Text.XML
6+import Text.XML.DOM.Parser
7+import Text.XML.Writer
8+
9+data XmlEnvelope h b = XmlEnvelope
10+ { _xeHeader :: !(Maybe h)
11+ , _xeBody :: !(Maybe b)
12+ } deriving (Eq, Show)
13+
14+makeLenses ''XmlEnvelope
15+
16+xmlEnvelopeToDocument :: (ToXML h, ToXML b) => XmlEnvelope h b -> Document
17+xmlEnvelopeToDocument xe = doc
18+ where
19+ sname n = fromString $ "{http://schemas.xmlsoap.org/soap/envelope/}" <> n
20+ doc =
21+ Document
22+ { documentPrologue = Prologue [] Nothing []
23+ , documentRoot =
24+ Element
25+ { elementName = sname "Envelope"
26+ , elementAttributes = mempty
27+ , elementNodes = [NodeElement header, NodeElement body]
28+ }
29+ , documentEpilogue = []
30+ }
31+ header =
32+ Element
33+ { elementName = sname "Header"
34+ , elementAttributes = mempty
35+ , elementNodes = render . toXML $ xe ^. xeHeader
36+ }
37+ body =
38+ Element
39+ { elementName = sname "Body"
40+ , elementAttributes = mempty
41+ , elementNodes = render . toXML $ xe ^. xeBody
42+ }
43+
44+instance (FromDom h, FromDom b) => FromDom (XmlEnvelope h b) where
45+ fromDom = XmlEnvelope <$> inElemMay "Header" fromDom
46+ <*> inElemMay "Body" fromDom
stack.yamlmode 100644 → 120000+1−6
@@ -1,6 +0,0 @@
1−packages:
2− - .
3−extra-deps:
4− - open-union-0.2.0.0
5− - type-fun-0.1.1
6−resolver: lts-5.18
@@ -0,0 +1 @@
1+ghc-963.yaml
test/Main.hs+6−6
@@ -33,7 +33,7 @@ testStructureAttributes = do
3333 int <- parseAttribute "int" readContent
3434 bool <- parseAttribute "bool" readBool
3535 return $ TestStructure
36− { tsName = name
36+ { tsName = nameLocalName name
3737 , tsInts = [int]
3838 , tsBools = pure bool }
3939
@@ -193,7 +193,7 @@ specParserFailedPath
193193 :: (Show a)
194194 => String -- ^ Name of spec
195195 -> Document
196− -> [Text] -- ^ Expteced path in error
196+ -> DomPath -- ^ Expteced path in error
197197 -> DomParser Identity a
198198 -> Spec
199199specParserFailedPath name doc path parser = it name $ example $ do
@@ -226,7 +226,7 @@ combinationsSpec = do
226226 describe "deep" $ do
227227 let parser = inElem "a" $ inElem "b" textFromDom
228228 specParserFailedPath "docDeepMultiple2" docDeepMultiple2
229− ["root", "a", "b"] parser
229+ (DomPath ["root", "a", "b"]) parser
230230 -- should fail here because first tag "a" does not contains
231231 -- tag "b" which is expected by parser @inElem "b"@
232232
@@ -276,7 +276,7 @@ combinationsSpec = do
276276 specParserEq "docDeepMultiple1" docDeepMultiple1 "content1" parser
277277 specParserEq "docDeepMultiple2" docDeepMultiple2 "content1" parser
278278 describe "fails" $ do
279− specParserFailedPath "docSimple" docSimple ["root", "a", "b"] parser
279+ specParserFailedPath "docSimple" docSimple (DomPath ["root", "a", "b"]) parser
280280 describe "multiple elements" $ do
281281 let
282282 parser = diveElem "a" $ inElemAll "b" textFromDom
@@ -311,9 +311,9 @@ combinationsSpec = do
311311 inElem "a" $ do
312312 checkCurrentName "a"
313313 describe "fails" $ do
314− specParserFailedPath "root element" docSimple ["toor"] $ do
314+ specParserFailedPath "root element" docSimple (DomPath ["toor"]) $ do
315315 checkCurrentName "toor"
316− specParserFailedPath "inner element" docSimple ["root", "b"] $ do
316+ specParserFailedPath "inner element" docSimple (DomPath ["root", "b"]) $ do
317317 inElem "a" $ checkCurrentName "b"
318318
319319contentSpec :: Spec