Changeset 1975

Timestamp:

09/19/07 11:29:44 (10 months ago)

Author:

nahi

Message:

• XML attribute must not be affected by default namespace. closes #430.
  

Files:

• trunk/lib/soap/encodingstyle/handler.rb (modified) (1 diff)
• trunk/lib/soap/encodingstyle/literalHandler.rb (modified) (1 diff)
• trunk/lib/soap/encodingstyle/soapHandler.rb (modified) (1 diff)
• trunk/lib/soap/generator.rb (modified) (5 diffs)
• trunk/lib/soap/rpc/proxy.rb (modified) (3 diffs)
• trunk/lib/soap/wsdlDriver.rb (modified) (1 diff)
• trunk/lib/xsd/ns.rb (modified) (3 diffs)
• trunk/test/soap/test_custom_ns.rb (modified) (2 diffs)

trunk/lib/soap/encodingstyle/handler.rb

@@ -95 +95 @@
-  end
-
+  def encode_attr_key(attrs, ns, qname)
+    if qname.namespace.nil?
+      qname.name
+    else
+      unless ns.assigned_as_tagged?(qname.namespace)
+        Generator.assign_ns!(attrs, ns, qname.namespace)
+      end
+      ns.name_attr(qname)
+    end
+  end
+
-  def encode_qname(attrs, ns, qname)
-
+
+
+
-      Generator.assign_ns(attrs, ns, qname.namespace)
-      ns.name(qname)
-    else
-      qname.name
-    end
-  end

trunk/lib/soap/encodingstyle/literalHandler.rb

@@ -32 +32 @@
-    data.extraattr.each do |key, value|
-      next if !@generate_explicit_type and key == XSD::AttrTypeName
-      # ToDo: check generator.attributeformdefault here
-      keytag = key
-      if key.is_a?(XSD::QName)
-qname
+attr_key
-      end
-      if value.is_a?(XSD::QName)

trunk/lib/soap/encodingstyle/soapHandler.rb

@@ -302 +302 @@
-      keytag = key
-      if key.is_a?(XSD::QName)
-qname
+attr_key
-      end
-      if value.is_a?(XSD::QName)

trunk/lib/soap/generator.rb

@@ -41 +41 @@
-    @generate_explicit_type =
-      opt.key?(:generate_explicit_type) ? opt[:generate_explicit_type] : true
-    # ':elementformdefault' is for backward compatibility
-    @use_default_namespace = opt[:use_default_namespace]
-    @attributeformdefault = opt[:attributeformdefault]
@@ -54 +53 @@
-    @buf = io || ''
-    @indent = ''
-
-
-
+
-
-    prologue
@@ -213 +210 @@
-  end
-
+  def encode_string(str)
+    @buf << get_encoded(str)
+  end
+
+  def element_local?(element)
+    element.elename.namespace.nil?
+  end
+
+  def self.assign_ns(attrs, ns, namespace, tag = nil)
+    if namespace.nil?
+      raise FormatEncodeError.new("empty namespace")
+    end
+    override_default_ns = (tag == '' and namespace != ns.default_namespace)
+    if override_default_ns or !ns.assigned?(namespace)
+      assign_ns!(attrs, ns, namespace, tag)
+    end
+  end
+
+  def self.assign_ns!(attrs, ns, namespace, tag = nil)
+    tag = ns.assign(namespace, tag)
+    if tag == ''
+      attr = 'xmlns'
+    else
+      attr = "xmlns:#{tag}"
+    end
+    attrs[attr] = namespace
+  end
+
+private
+
+  def prologue
+  end
+
+  def epilogue
+  end
+
-  ENCODE_CHAR_REGEXP = {}
-
@@ -223 +256 @@
-    "\r" => '&#xd;'
-  }
-
-  def encode_string(str)
-    @buf << get_encoded(str)
-  end
-
-  def get_encoded(str)
@@ -243 +272 @@
-  end
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-  end
-

trunk/lib/soap/rpc/proxy.rb

@@ -132 +132 @@
-      :default_encodingstyle =>
-        @default_encodingstyle || op_info.request_default_encodingstyle,
-
-
-
+
+
-    )
-    resopt = create_encoding_opt(
-      :envelopenamespace => @options["soap.envelope.responsenamespace"],
-      :default_encodingstyle =>
-
-
-
-
+
-    )
-    env = route(req_header, req_body, reqopt, resopt)
@@ -355 +351 @@
-    attr_reader :request_use
-    attr_reader :response_use
-
-
+
-
-    def initialize(soapaction, param_def, opt)
@@ -364 +359 @@
-      @request_use = opt[:request_use]
-      @response_use = opt[:response_use]
-
-
-
+
+
+
+
+
-      check_style(@request_style)
-      check_style(@response_style)

trunk/lib/soap/wsdlDriver.rb

@@ -128 +128 @@
-        :response_style => op_bind.soapoperation_style,
-        :request_use => op_bind.soapbody_use_input,
-
-
-
+
-      }
-      if op_bind.soapoperation_style == :rpc

trunk/lib/xsd/ns.rb

@@ -25 +25 @@
-
-    def initialize(known_tag)
-
+.dup
-      @count = 0
-    end
@@ -77 +77 @@
-  end
-
+  def assigned_as_tagged?(ns)
+    @ns2tag.key?(ns)
+  end
+
-  def assigned_tag?(tag)
-    @tag2ns.key?(tag)
@@ -88 +92 @@
-  end
-
-
-(name.namespace == @default_namespace)
-
-
-
+q
+qname.namespace == @default_namespace
+q
+q
+q
-    else
-
+
+
+
+
+
+
+
+
+
+
-    end
-  end

trunk/test/soap/test_custom_ns.rb

@@ -39 +39 @@
-__XML__
-
+  XML_WITH_DEFAULT_NS = <<__XML__.chomp
+<?xml version="1.0" encoding="utf-8" ?>
+<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <env:Header>
+      <headeritem xmlns="my:foo">hi</headeritem>
+  </env:Header>
+  <env:Body>
+    <test xmlns:n1="my:bar"
+        xmlns:n2="my:foo"
+        n1:baz="qux"
+        n2:quxx="quxxx"
+        xmlns="my:foo">bi</test>
+  </env:Body>
+</env:Envelope>
+__XML__
+
-  def test_custom_ns
-    # create test env
@@ -65 +83 @@
-    assert_equal(CUSTOM_NS_XML, result)
-  end
+
+  def test_default_namespace
+    # create test env
+    header = SOAP::SOAPHeader.new()
+    hi = SOAP::SOAPElement.new(XSD::QName.new("my:foo", "headeritem"), 'hi')
+    header.add("test", hi)
+    body = SOAP::SOAPBody.new()
+    bi = SOAP::SOAPElement.new(XSD::QName.new("my:foo", "bodyitem"), 'bi')
+    bi.extraattr[XSD::QName.new('my:bar', 'baz')] = 'qux'
+    bi.extraattr[XSD::QName.new('my:foo', 'quxx')] = 'quxxx'
+    body.add("test", bi)
+    env = SOAP::SOAPEnvelope.new(header, body)
+    # normal
+    opt = {:use_default_namespace => true}
+    result = SOAP::Processor.marshal(env, opt)
+    assert_equal(XML_WITH_DEFAULT_NS, result)
+  end
-end
-