master..6280caa · typeable/dom-parser

.travis.yml+5−7

since splitsnapshots

unifiedsplit

@@ -4,12 +4,6 @@ sudo: false

4# Do not choose a language; we provide our own build tools.

5language: 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.

7# Caching so the next build will be fast too.

14cache:

8cache:

15 directories:

9 directories:

@@ -27,6 +21,10 @@ before_install:

27- export PATH=$HOME/.local/bin:$PATH

21- 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'

22- travis_retry curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'

29

23

24+install:

25+# Build dependencies

26+- stack --no-terminal --install-ghc build --only-dependencies

27+

30script:

28script:

31# Build the package, its tests, and its docs and run the tests

29# Build the package, its tests, and its docs and run the tests

32−- stack --no-terminal --install-ghc test --haddock --no-haddock-deps

30+- stack --no-terminal test --haddock --no-haddock-deps

CHANGELOG.md−28

@@ -1,33 +1,5 @@

1# CHANGELOG

2

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

3## 2.0.0

32

4

33### Added

5### Added

dom-parser.cabal+10−10

@@ -1,5 +1,5 @@

1name: dom-parser

2−version: 3.2.0

2+version: 2.0.0

3synopsis: Simple monadic DOM parser

4license: MIT

5license-file: LICENSE

@@ -7,13 +7,12 @@ author: Typeable.io contributors

7maintainer: makeit@typeable.io

8category: XML

9build-type: Simple

10+extra-source-files: CHANGELOG.md

10cabal-version: >=1.10

11cabal-version: >=1.10

12+

13+extra-source-files: CHANGELOG.md

14+

11homepage: https://github.com/typeable/dom-parser

15homepage: 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

17

16

18source-repository head

17source-repository head

19 type: git

18 type: git

@@ -44,16 +43,18 @@ library

44 , TypeFamilies

43 , TypeFamilies

45 , TypeOperators

44 , TypeOperators

46 , UndecidableInstances

45 , UndecidableInstances

47− build-depends: base >= 4.11 && < 5

46+ build-depends: base >= 4.7 && < 5

48 , case-insensitive

47 , case-insensitive

49 , containers

48 , containers

50 , lens

49 , lens

51− , mtl < 2.3 || > 2.3

50+ , mtl

51+ , open-union >= 0.2

52 , scientific

53+ , semigroups

53 , text

54 , text

54 , transformers

55 , transformers

56+ , type-fun

55 , xml-conduit

57 , xml-conduit

56− , xml-conduit-writer

57 , xml-lens

58 , xml-lens

58 exposed-modules: Text.XML.DOM.Parser

59 exposed-modules: Text.XML.DOM.Parser

59 , Text.XML.DOM.Parser.Attributes

60 , Text.XML.DOM.Parser.Attributes

@@ -63,7 +64,6 @@ library

63 , Text.XML.DOM.Parser.FromAttribute

64 , Text.XML.DOM.Parser.FromAttribute

64 , Text.XML.DOM.Parser.FromDom

65 , Text.XML.DOM.Parser.FromDom

65 , Text.XML.DOM.Parser.Types

66 , Text.XML.DOM.Parser.Types

66− , Text.XML.Soap

67

68test-suite test

69 type: exitcode-stdio-1.0

ghc-963.yamldeleted−7

@@ -1,7 +0,0 @@

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/Combinators.hs+1

@@ -22,6 +22,7 @@ import Control.Monad.Reader

22import Data.Foldable as F

23import Data.List as L

24import Data.List.NonEmpty (NonEmpty(..))

25+import Data.Monoid

25import Data.Text as T

26import Data.Text as T

26import Data.Traversable

27import Data.Traversable

27import Text.XML

28import Text.XML

src/Text/XML/DOM/Parser/Content.hs+3−4

@@ -20,7 +20,6 @@ import Data.List as L

20import Data.Monoid

21import Data.Text as T

22import Data.Typeable

23−import Prelude as P

24import Text.Read

23import Text.Read

25import Text.XML.DOM.Parser.Types

24import Text.XML.DOM.Parser.Types

26import Text.XML.Lens

25import Text.XML.Lens

@@ -94,7 +93,7 @@ maybeReadContent

94maybeReadContent f t = maybe (Left msg) Right $ f t

93maybeReadContent f t = maybe (Left msg) Right $ f t

95 where

94 where

96 msg = "Not readable " <> n <> ": " <> t

95 msg = "Not readable " <> n <> ": " <> t

97− n = T.pack $ P.show $ typeRep (Proxy :: Proxy a)

96+ n = T.pack $ show $ typeRep (Proxy :: Proxy a)

98

97

99

98

100-- | Tries to read given text to value using 'Read'. Useful to use

99-- | Tries to read given text to value using 'Read'. Useful to use

@@ -115,8 +114,8 @@ readBool t =

115 tvals = ["y", "yes", "t", "true", "1"]

114 tvals = ["y", "yes", "t", "true", "1"]

116 fvals = ["n", "no", "f", "false", "0"]

115 fvals = ["n", "no", "f", "false", "0"]

117 in if

116 in if

118− | lowt `L.elem` tvals -> Right True

117+ | lowt `elem` tvals -> Right True

119− | lowt `L.elem` fvals -> Right False

118+ | lowt `elem` fvals -> Right False

120 | otherwise ->

119 | otherwise ->

121 Left $ "Could not read " <> t <> " as Bool"

120 Left $ "Could not read " <> t <> " as Bool"

122

121

src/Text/XML/DOM/Parser/FromDom.hs+20

@@ -4,6 +4,7 @@ module Text.XML.DOM.Parser.FromDom

4 , proxyFromDom

5 -- * Explicit methods for convenience

6 , elementFromDom

7+ , unionFromDom

7 , textFromDom

8 , textFromDom

8 , stringFromDom

9 , stringFromDom

9 , charFromDom

10 , charFromDom

@@ -20,6 +21,7 @@ module Text.XML.DOM.Parser.FromDom

20import Control.Applicative

21import Control.Applicative

21import Control.Lens

22import Control.Lens

22import Data.Fixed

23import Data.Fixed

24+import Data.OpenUnion

23import Data.Scientific

25import Data.Scientific

24import Data.Text as T hiding (empty)

26import Data.Text as T hiding (empty)

25import Data.Typeable

27import Data.Typeable

@@ -27,6 +29,7 @@ import Data.Void

27import Text.XML

29import Text.XML

28import Text.XML.DOM.Parser.Content

30import Text.XML.DOM.Parser.Content

29import Text.XML.DOM.Parser.Types

31import Text.XML.DOM.Parser.Types

32+import TypeFun.Data.List hiding (Union)

30

33

31proxyFromDom

34proxyFromDom

32 :: forall proxy m a

35 :: forall proxy m a

@@ -113,6 +116,23 @@ instance FromDom Bool where

113boolFromDom :: (Monad m) => DomParserT Identity m Bool

116boolFromDom :: (Monad m) => DomParserT Identity m Bool

114boolFromDom = parseContent readBool

117boolFromDom = parseContent readBool

115

118

119+instance FromDom (Union '[]) where

120+ fromDom = empty

121+

122+instance

123+ ( Typeable a, FromDom a, FromDom (Union as)

124+ , SubList as (a ': as) )

125+ => FromDom (Union (a ': as)) where

126+ -- fromDom :: forall m. (DomParserMonad m) => m a

127+ fromDom = (liftUnion <$> (proxyFromDom (Proxy :: Proxy a)))

128+ <|> (reUnion <$> (proxyFromDom (Proxy :: Proxy (Union as))))

129+

130+unionFromDom

131+ :: (Monad m, FromDom (Union as))

132+ => proxy as

133+ -> DomParserT Identity m (Union as)

134+unionFromDom _ = fromDom

135+

116instance FromDom Element where

136instance FromDom Element where

117 fromDom = elementFromDom

137 fromDom = elementFromDom

118

138

src/Text/XML/DOM/Parser/Types.hs+4−4

@@ -88,6 +88,8 @@ data NameMatcher = NameMatcher

88 -- ^ Field for 'Show' instance and bulding usefull errors

89 }

90

91+makeLenses ''NameMatcher

92+

91-- | Instance use 'matchCILocalName' as most general and liberal

93-- | Instance use 'matchCILocalName' as most general and liberal

92-- matching strategy (while XML is often malformed).

94-- matching strategy (while XML is often malformed).

93--

95--

@@ -119,8 +121,6 @@ matchCILocalName tname = NameMatcher

119 , _nmShow = tname

121 , _nmShow = tname

120 }

122 }

121

123

122−makeLenses ''NameMatcher

123−

124-- | Makes matcher which match name by 'Eq' with given

125--

126-- @since 2.0.0

@@ -134,7 +134,7 @@ matchName n = NameMatcher

134-- element of the document. Errors are much more usefull with path.

135newtype DomPath = DomPath

136 { unDomPath :: [Text]

137− } deriving (Eq, Ord, Show, Semigroup, Monoid)

137+ } deriving (Eq, Ord, Show, Monoid)

138

139-- | DOM parser error description.

140data ParserError

@@ -184,7 +184,7 @@ instance Exception ParserError

184

185newtype ParserErrors = ParserErrors

186 { unParserErrors :: [ParserError]

187− } deriving (Show, Semigroup, Monoid, Generic)

187+ } deriving (Show, Monoid, Generic)

188

189makePrisms ''ParserErrors

190

src/Text/XML/Soap.hsdeleted−46

@@ -1,46 +0,0 @@

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 120000 → 100644+6−1

@@ -1 +0,0 @@

1−ghc-963.yaml

@@ -0,0 +1,6 @@

1+packages:

2+ - .

3+extra-deps:

4+ - open-union-0.2.0.0

5+ - type-fun-0.1.1

6+resolver: lts-6.25