9ef99bf...master · typeable/dom-parser

.travis.yml+2−1

since splitsnapshots

unifiedsplit

@@ -7,7 +7,8 @@ language: generic

7env:

8 - STACK_YAML=stack.yaml

9 - STACK_YAML=ghc-802.yaml

10− - STACK_YAML=ghc-821.yaml

10+ - STACK_YAML=ghc-822.yaml

11+ - STACK_YAML=ghc-841.yaml

11

12

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

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

13cache:

14cache:

CHANGELOG.md+14

@@ -2,9 +2,23 @@

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+

5### Added

18### Added

6

19

7* Additional builds with GHC 8.0.2 and 8.2.1

20* Additional builds with GHC 8.0.2 and 8.2.1

21+* Compatibility with GHC 8.4.1

8

22

9## 3.0.0

23## 3.0.0

10

24

dom-parser.cabal+8−7

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

1name: dom-parser

2−version: 3.0.0

2+version: 3.2.0

3synopsis: Simple monadic DOM parser

4license: MIT

5license-file: LICENSE

@@ -9,9 +9,9 @@ category: XML

9build-type: Simple

10cabal-version: >=1.10

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

12−tested-with: GHC == 7.10.3

12+tested-with: GHC == 9.2.7

13− , GHC == 8.0.2

13+ , GHC == 9.4.8

14− , GHC == 8.2.1

14+ , GHC == 9.6.3

15extra-source-files: CHANGELOG.md

16 , README.md

17

@@ -44,16 +44,16 @@ library

44 , TypeFamilies

45 , TypeOperators

46 , UndecidableInstances

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

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

48 , case-insensitive

49 , containers

50 , lens

51− , mtl

51+ , mtl < 2.3 || > 2.3

52 , scientific

53− , semigroups

54 , text

53 , text

55 , transformers

54 , transformers

56 , xml-conduit

55 , xml-conduit

56+ , xml-conduit-writer

57 , xml-lens

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

59 , Text.XML.DOM.Parser.Attributes

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

63 , Text.XML.DOM.Parser.FromAttribute

64 , Text.XML.DOM.Parser.FromDom

65 , Text.XML.DOM.Parser.Types

66+ , Text.XML.Soap

66

67

67test-suite test

68test-suite test

68 type: exitcode-stdio-1.0

69 type: exitcode-stdio-1.0

ghc-802.yamldeleted−3

@@ -1,3 +0,0 @@

1−resolver: lts-9.0

2−packages:

3− - .

ghc-821.yamldeleted−3

@@ -1,3 +0,0 @@

1−resolver: nightly-2017-09-14

2−packages:

3− - .

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

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

22import Data.Foldable as F

23import Data.List as L

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

25−import Data.Monoid

26import Data.Text as T

25import Data.Text as T

27import Data.Traversable

26import Data.Traversable

28import Text.XML

27import Text.XML

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

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

20import Data.Monoid

21import Data.Text as T

22import Data.Typeable

23+import Prelude as P

23import Text.Read

24import Text.Read

24import Text.XML.DOM.Parser.Types

25import Text.XML.DOM.Parser.Types

25import Text.XML.Lens

26import Text.XML.Lens

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

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

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

94 where

95 where

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

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

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

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

97

98

99

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

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

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

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

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

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

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

116 in if

117 in if

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

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

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

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

119 | otherwise ->

120 | otherwise ->

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

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

121

122

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

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

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

89 }

90

91−makeLenses ''NameMatcher

92−

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

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

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

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

95--

93--

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

121 , _nmShow = tname

119 , _nmShow = tname

122 }

120 }

123

121

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, Monoid)

137+ } deriving (Eq, Ord, Show, Semigroup, 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, Monoid, Generic)

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

188

189makePrisms ''ParserErrors

190

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−3

@@ -1,3 +0,0 @@

1−resolver: lts-6.35

2−packages:

3− - .

@@ -0,0 +1 @@

1+ghc-963.yaml