Changeset 1784

Timestamp:

05/19/07 12:47:46 (2 years ago)

Author:

nahi

Message:

• added CDATA support with rexml/xmlscan as an XML parser. closes #332.
  

Files:

• trunk/lib/xsd/xmlparser/rexmlparser.rb (modified) (1 diff)
• trunk/lib/xsd/xmlparser/xmlscanner.rb (modified) (1 diff)
• trunk/test/soap/test_response_as_xml.rb (modified) (3 diffs)

trunk/lib/xsd/xmlparser/rexmlparser.rb

@@ -43 +43 @@
-  end
-
+  def cdata(content)
+    characters(content)
+  end
+
-  def xmldecl(version, encoding, standalone)
-    # Version should be checked.

trunk/lib/xsd/xmlparser/xmlscanner.rb

@@ -83 +83 @@
-  end
-
-
+
+
+
-
-  def on_etag(name)

trunk/test/soap/test_response_as_xml.rb

@@ -42 +42 @@
-    @client.wiredump_dev = STDERR if $DEBUG
-    @client.add_method('hello', 'name')
+    @client.add_document_method('hellodoc', Namespace, XSD::QName.new(Namespace, 'helloRequest'), XSD::QName.new(Namespace, 'helloResponse'))
-  end
-
@@ -94 +95 @@
-<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
-  <env:Body>
-getHealthSummaryResponse xmlns:gno='http://some.url
+helloResponse xmlns:gno='urn:example.com:hello
-      <gno:htmlContent>
-        <![CDATA[<span>some html</span>]]>
-      </gno:htmlContent>
-getHealthSummary
+hello
-  </env:Body>
-</env:Envelope>
-__XML__
-  def test_cdata
+    @client.return_response_as_xml = false
+    @client.test_loopback_response << RESPONSE_CDATA
+    ret = @client.hellodoc(nil)
+    assert_equal("\n        <span>some html</span>\n      ", ret.htmlContent)
+    #
-    @client.return_response_as_xml = true
-    @client.test_loopback_response << RESPONSE_CDATA
@@ -111 +117 @@
-    assert_equal("<span>some html</span>",
-      REXML::XPath.match(doc, "//*[name()='gno:htmlContent']")[0][1].value)
+    #
-  end
-end