soap 0.2.3.4 → 0.2.3.5

raw patch · 3 files changed

+22/−16 lines, 3 filesdep ~basedep ~bytestringdep ~conduit

Dependency ranges changed: base, bytestring, conduit, configurator, data-default, exceptions, http-client, http-types, iconv, mtl, resourcet, text, unordered-containers, xml-conduit, xml-conduit-writer, xml-types

Files

• changelog +4/−0
• soap.cabal +1/−1
• test/Main.hs +17/−15

@@ -1,3 +1,7 @@+0.2.3.5:++    * Fix tests+ 0.2.3.4:      * Prepare for xml-conduit-1.5 series.

@@ -1,5 +1,5 @@ name:                soap-version:             0.2.3.4+version:             0.2.3.5 synopsis:            SOAP client tools description:   Tools to build SOAP clients using xml-conduit.

@@ -57,17 +57,18 @@                                               , ("eggs","2")                                               ]         describe "StreamParser" $ do-            it "extracts stuff" $ do-                let recipeParser = do-                    ings <- Parse.force "no salad" . Parse.tagNoAttr "salad" . Parse.many $ #if MIN_VERSION_xml_conduit(1,5,0)-                        Parse.tag Parse.anyName pure $ \name -> do+            let parseAnyName = Parse.anyName #else-                        Parse.tag Just return $ \name -> do+            let parseAnyName = Just #endif-                            quantity <- Parse.content-                            return $ RecipeEntry (nameLocalName name) quantity-                    return $ Recipe ings+            it "extracts stuff" $ do+                let recipeParser = do+                        Parse.force "no salad" . Parse.tagNoAttr "salad" $ do+                            ings <- Parse.many $ Parse.tag parseAnyName pure $ \name -> do+                                quantity <- Parse.content+                                pure $ RecipeEntry (nameLocalName name) quantity+                            pure $ Recipe ings                  t <- spamTransport                 result <- invokeWS t "spam" () () $ StreamParser recipeParser@@ -75,13 +76,14 @@              it "extracts using lax helpers" $ do                 let recipeParser = flaxTag "salad" $ do-                    s <- flaxContent "sausage"-                    b <- laxContent "bacon"-                    e <- readTag "eggs"-                    return $ Recipe [ RecipeEntry "sausage" s-                                    , RecipeEntry "bacon" $ maybe "" id b-                                    , RecipeEntry "eggs" . T.pack $ show (e :: Int)-                                    ]+                      s <- flaxContent "sausage"+                      b <- laxContent "bacon"+                      e <- readTag "eggs"+                      return $ Recipe+                          [ RecipeEntry "sausage" s+                          , RecipeEntry "bacon" $ maybe "" id b+                          , RecipeEntry "eggs" . T.pack $ show (e :: Int)+                          ]                 result <- invokeSpam $ StreamParser recipeParser                 result `shouldBe` saladRecipe