Changeset 1956

Timestamp:

09/12/07 19:02:32 (8 months ago)

Author:

nahi

Message:

• soap4r's XML namespace handler did not handle xmlns="" correctly. it means 'no default namespace'. closes #421.
  

Files:

• trunk/lib/xsd/ns.rb (modified) (1 diff)
• trunk/lib/xsd/xmlparser.rb (modified) (1 diff)
• trunk/test/xsd/test_ns.rb (modified) (1 diff)

trunk/lib/xsd/ns.rb

@@ -58 +58 @@
-  def assign(ns, tag = nil)
-    if tag == ''
-
+
+
+
+
+
-      tag
-    else

trunk/lib/xsd/xmlparser.rb

@@ -29 +29 @@
-    newattrs = {}
-    attrs.each do |key, value|
-(NSParseRegexp =~ key)
+NSParseRegexp =~ key
-        unless ns_updated
-          ns = ns.clone_ns
-          ns_updated = true
-        end
-
+
+
-        tag = $1 || ''
-        ns.assign(value, tag)

trunk/test/xsd/test_ns.rb

@@ -15 +15 @@
-    assert_equal("EN", lang)
-  end
+
+  def test_no_default_namespace
+    env = SOAP::Processor.unmarshal(NO_DEFAULT_NAMESPACE)
+    array = env.body.root_node["array"]
+    item = array["item"]
+    assert_equal("urn:ns", array.elename.namespace)
+    assert_equal(nil, item.elename.namespace)
+  end
+
+NO_DEFAULT_NAMESPACE = <<__XML__
+<?xml version="1.0" encoding="utf-8"?>
+<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/">
+  <env:Body>
+    <response xmlns="urn:ns">
+      <array>
+        <item attr="1" xmlns=""/>
+      </array>
+    </response>
+  </env:Body>
+</env:Envelope>
+__XML__
-end
-