git.iko.soy/typeable/dom-parser
on master help sign in
Merge branch 'release/2.0.0' into production
commit2cbf2acdef787e00331def228fd87d9876efa259 authorAleksey Uimanov <s9gf4ult@gmail.com> dateSun 8 Jan 2017, 21:36 (10 years ago) parent9636ea033f618e
13 files changed+677−331
.travis.yml+30 CHANGELOG.md+17−1 dom-parser.cabal+9−3 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+57−169 src/Text/XML/DOM/Parser/Content.hs+128 src/Text/XML/DOM/Parser/FromAttribute.hs+112 src/Text/XML/DOM/Parser/Class.hs → src/Text/XML/DOM/Parser/FromDom.hs+68−82 src/Text/XML/DOM/Parser/Types.hs+145−63 stack.yaml+1−1 test/Main.hs+10−10
.travis.ymlnew file+30
@@ -0,0 +1,30 @@
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+# Caching so the next build will be fast too.
8+cache:
9+ directories:
10+ - $HOME/.stack
11+
12+# Ensure necessary system libraries are present
13+addons:
14+ apt:
15+ packages:
16+ - libgmp-dev
17+
18+before_install:
19+# Download and unpack the stack executable
20+- mkdir -p ~/.local/bin
21+- export PATH=$HOME/.local/bin:$PATH
22+- travis_retry curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
23+
24+install:
25+# Build dependencies
26+- stack --no-terminal --install-ghc build --only-dependencies
27+
28+script:
29+# Build the package, its tests, and its docs and run the tests
30+- stack --no-terminal test --haddock --no-haddock-deps
CHANGELOG.md+17−1
@@ -1,10 +1,26 @@
11# CHANGELOG
22
3+## 2.0.0
4+
5+### Added
6+
7+* `NameMatcher` and `ElemMatcher` as more flexible mechanisms for
8+ matching names and elements instead of just matching by name.
9+* Class `FromAttribute` and some default instances
10+
11+### Changed
12+
13+* `DomTraversable` renamed to `Buildable`
14+* Combinators use `NameMatcher` and `ElemMatcher`
15+* Documentation improved
16+
317## 1.0.0
18+
419* Added support for parsing attributes
520* Changed public interface for 'parseContent'
6−* Added usefull functions
21+* Added useful functions
722* Dropped unnecessary dependency from shakespeare
823
924## 0.1.0
25+
1026* Public release
dom-parser.cabal+9−3
@@ -1,5 +1,5 @@
11name: dom-parser
2−version: 1.0.0
2+version: 2.0.0
33synopsis: Simple monadic DOM parser
44license: MIT
55license-file: LICENSE
@@ -44,10 +44,12 @@ library
4444 , TypeOperators
4545 , UndecidableInstances
4646 build-depends: base >= 4.7 && < 5
47+ , case-insensitive
4748 , containers
4849 , lens
4950 , mtl
50− , open-union
51+ , open-union >= 0.2
52+ , scientific
5153 , semigroups
5254 , text
5355 , transformers
@@ -55,8 +57,12 @@ library
5557 , xml-conduit
5658 , xml-lens
5759 exposed-modules: Text.XML.DOM.Parser
58− , Text.XML.DOM.Parser.Class
60+ , Text.XML.DOM.Parser.Attributes
61+ , Text.XML.DOM.Parser.Buildable
5962 , Text.XML.DOM.Parser.Combinators
63+ , Text.XML.DOM.Parser.Content
64+ , Text.XML.DOM.Parser.FromAttribute
65+ , Text.XML.DOM.Parser.FromDom
6066 , Text.XML.DOM.Parser.Types
6167
6268test-suite test
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+57−169
@@ -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,116 +15,107 @@ 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
47−
48−
49−-- | Generic function to traverse arbitrary inner cursors.
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.Monoid
26+import Data.Text as T
27+import Data.Traversable
28+import Text.XML
29+import Text.XML.DOM.Parser.Buildable
30+import Text.XML.DOM.Parser.Types
31+import Text.XML.Lens
32+
33+
34+-- | Generic function to traverse arbitrary inner elements.
5035traverseElems
5136 :: (Monad m, Foldable g, Traversable f)
5237 => ([Element] -> DomParserT g m (f (DomPath, Element)))
5338 -- ^ Takes list of current elements and returns container with
54− -- pairs of subpath (relatively to current element) and element
39+ -- pairs of subpath (relatively to current elements) and element
5540 -- to run parser in
5641 -> DomParserT Identity m a
57− -- ^ Parser will be runned for each element found in traversable
42+ -- ^ Parser to run for each element found in traversable 'f'
5843 -> DomParserT g m (f a)
5944traverseElems trav parser = do
6045 pd <- ask
6146 inner <- trav $ pd ^.. pdElements . folded
6247 for inner $ \(subpath, e) -> do
63− let newpd = ParserData
64− { _pdElements = Identity e
65− , _pdPath = pd ^. pdPath <> subpath }
66− magnify (to $ const newpd) parser -- type of reader is changed, so
67− -- local does not work
48+ let
49+ newpd = ParserData
50+ { _pdElements = Identity e
51+ , _pdPath = pd ^. pdPath <> subpath }
52+ lift $ runReaderT parser newpd
6853
69−-- | Takes function filtering
54+-- | Traverses elements located in same path using filtering function
7055inFilteredTrav
71− :: (Monad m, Foldable g, DomTraversable f)
56+ :: (Monad m, Foldable g, Buildable f)
7257 => ([Element] -> (DomPath, [Element]))
73− -- ^ Function returning some filtered elements with path suffixes which will
74− -- be appended to parser's state
58+ -- ^ Takes list of current elements and returns some descendants
59+ -- subset and path this descendants located at. Path is should be
60+ -- same for all descendants and required for error message
7561 -> DomParserT Identity m a
7662 -> DomParserT g m (f a)
7763inFilteredTrav deeper = traverseElems trav
7864 where
7965 trav e = do
8066 let (path, elems) = deeper e
81− case buildDomTraversable elems of
67+ case build elems of
8268 Nothing -> throwParserError $ PENotFound . (<> path)
8369 Just tr -> return $ fmap (path,) tr
8470
71+-- | Runs parser arbitrary times, depending on 'Buildable' instance of
72+-- 'f'. For example if 'f' becomes 'NonEmpty' then 'inElemTrav' finds
73+-- @one or more@ elements matched by given 'ElemMatcher' and run
74+-- parser in each found element, then returns @NonEmpty a@ of results.
8575inElemTrav
86− :: (Monad m, Foldable g, DomTraversable f)
87− => Text
76+ :: (Monad m, Foldable g, Buildable f)
77+ => ElemMatcher -- ^ Tag(s) matcher to traverse in
8878 -> DomParserT Identity m a
8979 -> DomParserT g m (f a)
9080inElemTrav n = inFilteredTrav deeper
9181 where
92− deeper = ([n],) . toListOf (folded . nodes . folded . _Element . ell n)
82+ elemsFold = folded . nodes . folded . _Element . elMatch n
83+ deeper = (DomPath [_emShow n],) . toListOf elemsFold
9384
94−-- | Runs parser inside first children element with given name
85+-- | Runs parser inside first children element matched by macher
9586inElem
9687 :: (Monad m, Foldable g)
97− => Text
88+ => ElemMatcher
9889 -> DomParserT Identity m a
9990 -> DomParserT g m a
10091inElem n = fmap runIdentity . inElemTrav n
10192
10293inElemAll
10394 :: (Monad m, Foldable g)
104− => Text
95+ => ElemMatcher
10596 -> DomParserT Identity m a
10697 -> DomParserT g m [a]
10798inElemAll = inElemTrav
10899
109100inElemMay
110101 :: (Monad m, Foldable g)
111− => Text
102+ => ElemMatcher
112103 -> DomParserT Identity m a
113104 -> DomParserT g m (Maybe a)
114105inElemMay = inElemTrav
115106
116107inElemNe
117108 :: (Monad m, Foldable g)
118− => Text
109+ => ElemMatcher
119110 -> DomParserT Identity m a
120111 -> DomParserT g m (NonEmpty a)
121112inElemNe = inElemTrav
122113
123114{- | Dive given parser's current tags set into the given path. The @divePath
124−["a", "b"]@ differs from @inElem "a" . inElem "b"@. Namely the first variant
115+["a", "b"]@ differs from @inElem "a" $ inElem "b"@. Namely the first variant
125116will not fail if occured tag "a" which does not contains tag "b". This
126117behaviour is desireable when you dont want to parse whole XML and just want
127−to pull tags in some path. The other difference is in traversing inner
118+to pull tags located in some path. The other difference is in traversing inner
128119elements. Consider this code
129120
130121@
@@ -142,26 +133,31 @@ which translates like: @a > b > c > fromDom@
142133As you can see, inElem always takes first element and runs inner parser in this
143134single element, unlike 'divePath' which runs inner parser @in all@ descendants
144135in given path.
136+
137+Note also that 'divePath' takes parser parameterized by @[]@ not by
138+'Identity'. This because when you dive using some path you will get a
139+list of found elements and all these elements will be @current@ for
140+parser.
145141-}
146142
147143divePath
148144 :: forall m g a
149145 . (Monad m, Foldable g)
150− => [Text]
146+ => [ElemMatcher]
151147 -> DomParserT [] m a
152148 -> DomParserT g m a
153149divePath path = magnify $ to modElems
154150 where
155151 modElems
156152 = over pdElements (toListOf $ folded . diver)
157− . over pdPath (<> path)
153+ . over pdPath (<> DomPath (L.map _emShow path))
158154 diver :: Fold Element Element
159− diver = foldr (.) id $ map toDive path
160− toDive n = nodes . folded . _Element . ell n
155+ diver = F.foldr (.) id $ L.map toDive path
156+ toDive n = nodes . folded . _Element . elMatch n
161157
162158diveElem
163159 :: (Monad m, Foldable g)
164− => Text
160+ => ElemMatcher
165161 -> DomParserT [] m a
166162 -> DomParserT g m a
167163diveElem p = divePath [p]
@@ -179,7 +175,7 @@ ignoreElem test parser = do
179175 if ign then pure Nothing else Just <$> parser
180176
181177-- | If current element has no children nodes does not run parser and returns
182−-- Nothing. Otherwise runs parser inside current element. Usefull when you got
178+-- Nothing. Otherwise runs parser inside current element. Useful when you got
183179-- XML with strange empty elements which must be just ignored, but `inElem` runs
184180-- parser inside of this elements which causes to parser error.
185181ignoreEmpty
@@ -188,7 +184,7 @@ ignoreEmpty
188184 -> DomParserT Identity m (Maybe a)
189185ignoreEmpty = ignoreElem test
190186 where
191− test e = null $ e ^. nodes
187+ test e = L.null $ e ^. nodes
192188
193189-- | If all current elements contains blank content, or contains nothing at all
194190-- , then returns Nothing, else runs parser.
@@ -202,114 +198,6 @@ ignoreBlank = ignoreElem test
202198 let
203199 elems = e ^.. nodes . folded . _Element
204200 cont = mconcat $ e ^.. nodes . folded . _Content
205− in if | not $ null elems -> False
201+ in if | not $ L.null elems -> False
206202 | T.null $ T.strip cont -> True
207203 | otherwise -> False
208−
209−-- | Returns name of current element.
210−--
211−-- @since 1.0.0
212−getCurrentName :: (Monad m) => DomParserT Identity m Text
213−getCurrentName = view $ pdElements . to runIdentity . localName
214−
215−-- | If name of current tag differs from first argument throws 'PENotFound' with
216−-- tag name replaced in last path's segment. Usefull for checking root
217−-- document's element name.
218−checkCurrentName
219− :: (Monad m)
220− => Text
221− -> DomParserT Identity m ()
222−checkCurrentName n = do
223− cn <- getCurrentName
224− unless (cn == n) $ do
225− p <- view pdPath
226− let pinit = if null p then [] else init p
227− throwError $ ParserErrors [PENotFound $ pinit ++ [n]]
228− return ()
229−
230−-- | Get current content. If current element contains no content or
231−-- have inner elements then Nothing returned
232−--
233−-- @since 1.0.0
234−getCurrentContent :: (Monad m) => DomParserT Identity m (Maybe Text)
235−getCurrentContent = do
236− nds <- view $ pdElements . to runIdentity . nodes
237− let
238− els :: [Element]
239− els = nds ^.. folded . _Element
240− conts :: [Text]
241− conts = nds ^.. folded . _Content
242− return $ if
243− | not $ null els -> Nothing
244− | null conts -> Nothing
245− | otherwise -> Just $ mconcat conts
246−
247−-- | Parses content inside current tag. It expects current element set
248−-- consists of exactly ONE element. If current element does not
249−-- contains content or have other elements as childs then throws error
250−parseContent
251− :: (Monad m)
252− => (Text -> Either Text a)
253− -- ^ Content parser, return error msg if value is not parsed
254− -> DomParserT Identity m a
255−parseContent parse = getCurrentContent >>= \case
256− Nothing -> throwParserError PEContentNotFound
257− Just c -> case parse c of
258− Left e -> throwParserError $ PEWrongFormat e
259− Right a -> return a
260−
261−-- | If reader returns 'Nothing' then resulting function returns 'Left
262−-- "error message"'
263−--
264−-- @since 1.0.0
265−maybeReadContent
266− :: forall a
267− . (Typeable a)
268− => (Text -> Maybe a)
269− -- ^ Content or attribute reader
270− -> Text
271− -- ^ Content or attribute value
272− -> Either Text a
273−maybeReadContent f t = maybe (Left msg) Right $ f t
274− where
275− msg = "Not readable " <> n <> ": " <> t
276− n = T.pack $ show $ typeRep (Proxy :: Proxy a)
277−
278−-- | Tries to read given text to value using 'Read'. Usefull to use
279−-- with 'parseContent' and 'parseAttribute'
280−readContent
281− :: (Read a, Typeable a)
282− => Text
283− -> Either Text a
284−readContent = maybeReadContent $ readMaybe . T.unpack . T.strip
285−
286−-- | Retuns map of attributes of current element
287−--
288−-- @since 1.0.0
289−getCurrentAttributes :: (Monad m) => DomParserT Identity m (M.Map Name Text)
290−getCurrentAttributes = view $ pdElements . to runIdentity . attrs
291−
292−-- | Returns element with given name or 'Nothing'
293−--
294−-- @since 1.0.0
295−getCurrentAttribute :: (Monad m) => Text -> DomParserT Identity m (Maybe Text)
296−getCurrentAttribute attrName'
297− = preview $ pdElements . to runIdentity . attr attrName
298− where
299− attrName = Name attrName' Nothing Nothing
300−
301−-- | Parses attribute with given name, throws error if attribute is not found.
302−--
303−-- @since 1.0.0
304−parseAttribute
305− :: (Monad m)
306− => Text
307− -- ^ Attribute name
308− -> (Text -> Either Text a)
309− -- ^ Attribute content parser
310− -> DomParserT Identity m a
311−parseAttribute attrName parser = getCurrentAttribute attrName >>= \case
312− Nothing -> throwParserError $ PEAttributeNotFound attrName
313− Just aval -> case parser aval of
314− Left err -> throwParserError $ PEAttributeWrongFormat attrName err
315− Right a -> return a
src/Text/XML/DOM/Parser/Content.hsnew file+128
@@ -0,0 +1,128 @@
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 Text.Read
24+import Text.XML.DOM.Parser.Types
25+import Text.XML.Lens
26+
27+
28+-- | Parses content inside current tag. It expects current element set
29+-- consists of exactly ONE element.
30+parseContent
31+ :: (Monad m)
32+ => (Text -> Either Text a)
33+ -- ^ Content parser, return error msg if value is not parsed
34+ -> DomParserT Identity m a
35+parseContent parse = getCurrentContent >>= \case
36+ Nothing -> throwParserError PEContentNotFound
37+ Just c -> case parse c of
38+ Left e -> throwParserError $ PEContentWrongFormat e
39+ Right a -> return a
40+
41+
42+-- | Returns name of current element.
43+--
44+-- @since 1.0.0
45+getCurrentName :: (Monad m) => DomParserT Identity m Name
46+getCurrentName = view $ pdElements . to runIdentity . name
47+
48+-- | If name of current tag differs from first argument throws 'PENotFound' with
49+-- tag name replaced in last path's segment. Useful for checking root
50+-- document's element name.
51+checkCurrentName
52+ :: (Monad m)
53+ => NameMatcher
54+ -> DomParserT Identity m ()
55+checkCurrentName n = do
56+ cn <- getCurrentName
57+ unless ((n ^. nmMatch) cn) $ do
58+ p <- view pdPath
59+ let pinit = if L.null (unDomPath p) then [] else L.init $ unDomPath p
60+ throwError $ ParserErrors [PENotFound $ DomPath $ pinit ++ [_nmShow n]]
61+ return ()
62+
63+-- | Get current content. If current element contains no content or
64+-- have inner elements then Nothing returned
65+--
66+-- @since 1.0.0
67+getCurrentContent :: (Monad m) => DomParserT Identity m (Maybe Text)
68+getCurrentContent = do
69+ nds <- view $ pdElements . to runIdentity . nodes
70+ let
71+ els :: [Element]
72+ els = nds ^.. folded . _Element
73+ conts :: [Text]
74+ conts = nds ^.. folded . _Content
75+ return $ if
76+ | not $ L.null els -> Nothing
77+ | L.null conts -> Nothing
78+ | otherwise -> Just $ mconcat conts
79+
80+-- | If reader returns 'Nothing' then resulting function returns 'Left
81+-- "error message"'. 'Typeable' is used for generating usefull error
82+-- message.
83+--
84+-- @since 1.0.0
85+maybeReadContent
86+ :: forall a
87+ . (Typeable a)
88+ => (Text -> Maybe a)
89+ -- ^ Content or attribute reader
90+ -> Text
91+ -- ^ Content or attribute value
92+ -> Either Text a
93+maybeReadContent f t = maybe (Left msg) Right $ f t
94+ where
95+ msg = "Not readable " <> n <> ": " <> t
96+ n = T.pack $ show $ typeRep (Proxy :: Proxy a)
97+
98+
99+-- | Tries to read given text to value using 'Read'. Useful to use
100+-- with 'parseContent' and 'parseAttribute'. Content is stripped
101+-- before reading.
102+readContent
103+ :: (Read a, Typeable a)
104+ => Text
105+ -> Either Text a
106+readContent = maybeReadContent $ readMaybe . T.unpack . T.strip
107+
108+
109+-- | @since 1.0.0
110+readBool :: Text -> Either Text Bool
111+readBool t =
112+ let
113+ lowt = T.toLower $ T.strip t
114+ tvals = ["y", "yes", "t", "true", "1"]
115+ fvals = ["n", "no", "f", "false", "0"]
116+ in if
117+ | lowt `elem` tvals -> Right True
118+ | lowt `elem` fvals -> Right False
119+ | otherwise ->
120+ Left $ "Could not read " <> t <> " as Bool"
121+
122+-- | Expects text to be single character
123+--
124+-- @since 1.0.0
125+readChar :: Text -> Either Text Char
126+readChar t = case T.unpack $ T.strip t of
127+ [c] -> Right c
128+ _ -> 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+68−82
@@ -1,4 +1,4 @@
1−module Text.XML.DOM.Parser.Class
1+module Text.XML.DOM.Parser.FromDom
22 ( -- * FromDom
33 FromDom(..)
44 , proxyFromDom
@@ -8,30 +8,28 @@ module Text.XML.DOM.Parser.Class
88 , textFromDom
99 , stringFromDom
1010 , charFromDom
11− , readChar
1211 , intFromDom
1312 , integerFromDom
1413 , doubleFromDom
1514 , fixedFromDom
1615 , boolFromDom
17− , readBool
1816 , unitFromDom
1917 , voidFromDom
18+ , scientificFromDom
2019 ) where
2120
22−import Control.Applicative
23−import Control.Lens
24−import Data.Fixed
25−import Data.Monoid
26−import Data.OpenUnion
27−import Data.Text (Text)
28−import qualified Data.Text as T
29−import Data.Typeable
30−import Data.Void
31−import Text.XML
32−import Text.XML.DOM.Parser.Combinators
33−import Text.XML.DOM.Parser.Types
34−import TypeFun.Data.List hiding (Union)
21+import Control.Applicative
22+import Control.Lens
23+import Data.Fixed
24+import Data.OpenUnion
25+import Data.Scientific
26+import Data.Text as T hiding (empty)
27+import Data.Typeable
28+import Data.Void
29+import Text.XML
30+import Text.XML.DOM.Parser.Content
31+import Text.XML.DOM.Parser.Types
32+import TypeFun.Data.List hiding (Union)
3533
3634proxyFromDom
3735 :: forall proxy m a
@@ -40,55 +38,94 @@ proxyFromDom
4038 -> DomParserT Identity m a
4139proxyFromDom _ = fromDom
4240
43−-- | Class of types which can be parsed from single XML element.
41+-- | Class of types which can be parsed from single XML element. The
42+-- method 'fromDom' is convenient default to use with 'inElem'
4443class FromDom a where
4544 fromDom :: (Monad m) => DomParserT Identity m a
4645
4746instance FromDom () where
4847 fromDom = unitFromDom
4948
49+-- | Always successfully parses any DOM to @()@
50+unitFromDom :: (Monad m) => DomParserT Identity m ()
51+unitFromDom = pure ()
52+
5053instance FromDom Void where
5154 fromDom = voidFromDom
5255
56+-- | Never parses successfully. It is just 'empty'
57+voidFromDom :: (Monad m) => DomParserT Identity m Void
58+voidFromDom = empty
59+
5360instance FromDom Text where
5461 fromDom = textFromDom
5562
63+textFromDom :: (Monad m) => DomParserT Identity m Text
64+textFromDom = parseContent Right
65+
5666instance FromDom String where
5767 fromDom = stringFromDom
5868
69+stringFromDom :: (Monad m) => DomParserT Identity m String
70+stringFromDom = parseContent $ Right . T.unpack
71+
5972instance FromDom Char where
6073 fromDom = charFromDom
6174
75+charFromDom :: (Monad m) => DomParserT Identity m Char
76+charFromDom = parseContent readChar
77+
6278instance FromDom Int where
6379 fromDom = intFromDom
6480
81+intFromDom :: (Monad m) => DomParserT Identity m Int
82+intFromDom = parseContent readContent
83+
6584instance FromDom Integer where
6685 fromDom = integerFromDom
6786
87+integerFromDom :: (Monad m) => DomParserT Identity m Integer
88+integerFromDom = parseContent readContent
89+
6890instance FromDom Double where
6991 fromDom = doubleFromDom
7092
93+doubleFromDom :: (Monad m) => DomParserT Identity m Double
94+doubleFromDom = parseContent readContent
95+
7196instance (HasResolution a, Typeable a) => FromDom (Fixed a) where
7297 fromDom = fixedFromDom
7398
99+fixedFromDom
100+ :: (Monad m, Typeable a, HasResolution a)
101+ => DomParserT Identity m (Fixed a)
102+fixedFromDom = parseContent readContent
103+
104+instance FromDom Scientific where
105+ fromDom = scientificFromDom
106+
107+scientificFromDom :: Monad m => DomParserT Identity m Scientific
108+scientificFromDom = parseContent readContent
109+
74110instance FromDom Bool where
75111 fromDom = boolFromDom
76112
113+-- | Expects content to be y, yes, t, true or 1 for True Values n, no,
114+-- f, false or 0 for False. Case is not significant, blank characters
115+-- are striped.
116+boolFromDom :: (Monad m) => DomParserT Identity m Bool
117+boolFromDom = parseContent readBool
118+
77119instance FromDom (Union '[]) where
78120 fromDom = empty
79121
80−instance ( Typeable a, FromDom a, FromDom (Union as)
81− , SubList as (a ': as) )
82− => FromDom (Union (a ': as)) where
122+instance
123+ ( Typeable a, FromDom a, FromDom (Union as)
124+ , SubList as (a ': as) )
125+ => FromDom (Union (a ': as)) where
83126 -- fromDom :: forall m. (DomParserMonad m) => m a
84127 fromDom = (liftUnion <$> (proxyFromDom (Proxy :: Proxy a)))
85− <|> (reUnion <$> (proxyFromDom (Proxy :: Proxy (Union as))))
86−
87−instance FromDom Element where
88− fromDom = elementFromDom
89−
90−elementFromDom :: (Monad m) => DomParserT Identity m Element
91−elementFromDom = view $ pdElements . to runIdentity
128+ <|> (reUnion <$> (proxyFromDom (Proxy :: Proxy (Union as))))
92129
93130unionFromDom
94131 :: (Monad m, FromDom (Union as))
@@ -96,59 +133,8 @@ unionFromDom
96133 -> DomParserT Identity m (Union as)
97134unionFromDom _ = fromDom
98135
99−textFromDom :: (Monad m) => DomParserT Identity m Text
100−textFromDom = parseContent Right
101−
102−stringFromDom :: (Monad m) => DomParserT Identity m String
103−stringFromDom = parseContent $ Right . T.unpack
104−
105−charFromDom :: (Monad m) => DomParserT Identity m Char
106−charFromDom = parseContent readChar
107−
108−-- | Expects text to be single character
109−--
110−-- @since 1.0.0
111−readChar :: Text -> Either Text Char
112−readChar t = case T.unpack $ T.strip t of
113− [c] -> Right c
114− _ -> Left "Should have exactly one non-blank character"
115−
116−intFromDom :: (Monad m) => DomParserT Identity m Int
117−intFromDom = parseContent readContent
118−
119−integerFromDom :: (Monad m) => DomParserT Identity m Integer
120−integerFromDom = parseContent readContent
121−
122−doubleFromDom :: (Monad m) => DomParserT Identity m Double
123−doubleFromDom = parseContent readContent
124−
125−fixedFromDom
126− :: (Monad m, Typeable a, HasResolution a)
127− => DomParserT Identity m (Fixed a)
128−fixedFromDom = parseContent readContent
129−
130−-- | Expects content to be y, yes, t, true or 1 for True value. n, no,
131−-- f, false or 0 for False value. Case is not significant, blank
132−-- characters are striped.
133−boolFromDom :: (Monad m) => DomParserT Identity m Bool
134−boolFromDom = parseContent readBool
135−
136−-- | @since 1.0.0
137−readBool :: Text -> Either Text Bool
138−readBool t =
139− let
140− lowt = T.toLower $ T.strip t
141− tvals = ["y", "yes", "t", "true", "1"]
142− fvals = ["n", "no", "f", "false", "0"]
143− in if | lowt `elem` tvals -> Right True
144− | lowt `elem` fvals -> Right False
145− | otherwise ->
146− Left $ "Could not read " <> t <> " as Bool"
147−
148−-- | Always successfully parses any DOM to @()@
149−unitFromDom :: (Monad m) => DomParserT Identity m ()
150−unitFromDom = pure ()
136+instance FromDom Element where
137+ fromDom = elementFromDom
151138
152−-- | Never parses successfully. It is just 'mzero'
153−voidFromDom :: (Monad m) => DomParserT Identity m Void
154−voidFromDom = empty
139+elementFromDom :: (Monad m) => DomParserT Identity m Element
140+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+makeLenses ''NameMatcher
92+
93+-- | Instance use 'matchCILocalName' as most general and liberal
94+-- matching strategy (while XML is often malformed).
95+--
96+-- @since 2.0.0
97+instance IsString NameMatcher where
98+ fromString = matchCILocalName . T.pack
99+
100+instance Show NameMatcher where
101+ show = T.unpack . _nmShow
102+
103+-- | Makes matcher which matches only local part of name igoring
104+-- namespace and prefix. Local name matching is case sensitive.
105+--
106+-- @since 2.0.0
107+matchLocalName :: Text -> NameMatcher
108+matchLocalName tname = NameMatcher
109+ { _nmMatch = \n -> nameLocalName n == tname
110+ , _nmShow = tname
111+ }
112+
113+-- | Makes matcher which matches only local part of name igoring
114+-- namespace and prefix. Local name matching is case insensitive. This
115+-- is the most common case.
116+--
117+-- @since 2.0.0
118+matchCILocalName :: Text -> NameMatcher
119+matchCILocalName tname = NameMatcher
120+ { _nmMatch = \n -> CI.mk (nameLocalName n) == CI.mk tname
121+ , _nmShow = tname
122+ }
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, 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, 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]
stack.yaml+1−1
@@ -3,4 +3,4 @@ packages:
33extra-deps:
44 - open-union-0.2.0.0
55 - type-fun-0.1.1
6−resolver: lts-5.18
6+resolver: lts-6.25
test/Main.hs+10−10
@@ -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
@@ -156,7 +156,7 @@ specParser
156156 :: String -- ^ Name of spec
157157 -> Document -- ^ Document to parse
158158 -> (a -> Maybe String) -- ^ Value checker, Nothing if all ok
159− -> DomParser Identity a -- ^ Parser itself
159+ -> DomParser Identity a -- ^ Parser itself
160160 -> Spec
161161specParser name doc check parser = it name $ do
162162 result <- either throwIO return $ runDomParser doc parser
@@ -166,9 +166,9 @@ specParser name doc check parser = it name $ do
166166
167167specParserEq
168168 :: (Eq a, Show a)
169− => String -- ^ Name of spec
170− -> Document -- ^ Document to parse
171− -> a -- ^ Value parser should return
169+ => String -- ^ Name of spec
170+ -> Document -- ^ Document to parse
171+ -> a -- ^ Value parser should return
172172 -> DomParser Identity a -- ^ Parser itself
173173 -> Spec
174174specParserEq name doc a parser = specParser name doc check parser
@@ -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