soap4r 1.5.7 → 1.5.8

data/lib/soap/encodingstyle/soapHandler.rb

@@ -7,6 +7,7 @@
 
 
 require 'soap/encodingstyle/handler'
+require 'soap/mapping/registry'
 
 
 module SOAP
@@ -150,8 +151,8 @@ class SOAPHandler < Handler
 
   def decode_tag(ns, elename, attrs, parent)
     @textbuf.clear
-    is_nil, type, arytype, root, offset, position, href, id, extraattr =
-      decode_attrs(ns, attrs)
+    is_nil, type, arytype, root, offset, position, href, id =
+      extract_attrs(ns, attrs)
     o = nil
     if is_nil
       o = SOAPNil.decode(elename)
@@ -159,9 +160,9 @@ class SOAPHandler < Handler
       o = SOAPReference.decode(elename, href)
       @refpool << o
     elsif @decode_typemap
-      o = decode_tag_by_wsdl(ns, elename, type, parent.node, arytype, extraattr)
+      o = decode_tag_by_wsdl(ns, elename, type, parent.node, arytype, attrs)
     else
-      o = decode_tag_by_type(ns, elename, type, parent.node, arytype, extraattr)
+      o = decode_tag_by_type(ns, elename, type, parent.node, arytype, attrs)
     end
 
     if o.is_a?(SOAPArray)
@@ -268,7 +269,7 @@ private
 
     if !parent || parent.encodingstyle != EncodingNamespace
       if @generate_explicit_type
-        SOAPGenerator.assign_ns(attrs, ns, EnvelopeNamespace)
+        Generator.assign_ns(attrs, ns, EnvelopeNamespace)
         attrs[ns.name(AttrEncodingStyleName)] = EncodingNamespace
       end
       data.encodingstyle = EncodingNamespace
@@ -278,13 +279,13 @@ private
       attrs[ns.name(XSD::AttrNilName)] = XSD::NilValue
     elsif @generate_explicit_type
       if data.type.namespace
-        SOAPGenerator.assign_ns(attrs, ns, data.type.namespace)
+        Generator.assign_ns(attrs, ns, data.type.namespace)
       end
       if data.is_a?(SOAPArray)
 	if data.arytype.namespace
-          SOAPGenerator.assign_ns(attrs, ns, data.arytype.namespace)
+          Generator.assign_ns(attrs, ns, data.arytype.namespace)
    	end
-	SOAPGenerator.assign_ns(attrs, ns, EncodingNamespace)
+	Generator.assign_ns(attrs, ns, EncodingNamespace)
 	attrs[ns.name(AttrArrayTypeName)] = ns.name(create_arytype(ns, data))
 	if data.type.name
 	  attrs[ns.name(XSD::AttrTypeName)] = ns.name(data.type)
@@ -300,7 +301,7 @@ private
     data.extraattr.each do |key, value|
       keytag = key
       if key.is_a?(XSD::QName)
-        keytag = encode_qname(attrs, ns, key)
+        keytag = encode_attr_key(attrs, ns, key)
       end
       if value.is_a?(XSD::QName)
         value = encode_qname(attrs, ns, value)
@@ -326,7 +327,7 @@ private
     end
   end
 
-  def decode_tag_by_wsdl(ns, elename, typestr, parent, arytypestr, extraattr)
+  def decode_tag_by_wsdl(ns, elename, typestr, parent, arytypestr, attrs)
     o = nil
     if parent.class == SOAPBody
       # root element: should branch by root attribute?
@@ -350,29 +351,25 @@ private
           return decode_definedtype(elename, typename, typedef, arytypestr)
 	end
       end
-      return decode_tag_by_type(ns, elename, typestr, parent, arytypestr,
-	extraattr)
+      return decode_tag_by_type(ns, elename, typestr, parent, arytypestr, attrs)
     end
 
     if parent.type == XSD::AnyTypeName
-      return decode_tag_by_type(ns, elename, typestr, parent, arytypestr,
-	extraattr)
+      return decode_tag_by_type(ns, elename, typestr, parent, arytypestr, attrs)
     end
 
     # parent.definedtype == nil means the parent is SOAPUnknown.  SOAPUnknown
     # is generated by decode_tag_by_type when its type is anyType.
     parenttype = parent.definedtype || @decode_typemap[parent.type]
     unless parenttype
-      return decode_tag_by_type(ns, elename, typestr, parent, arytypestr,
-	extraattr)
+      return decode_tag_by_type(ns, elename, typestr, parent, arytypestr, attrs)
     end
 
     definedtype_name = parenttype.child_type(elename)
     if definedtype_name and (klass = TypeMap[definedtype_name])
       return decode_basetype(klass, elename)
     elsif definedtype_name == XSD::AnyTypeName
-      return decode_tag_by_type(ns, elename, typestr, parent, arytypestr,
-	extraattr)
+      return decode_tag_by_type(ns, elename, typestr, parent, arytypestr, attrs)
     end
 
     if definedtype_name
@@ -438,11 +435,11 @@ private
     nil
   end
 
-  def decode_tag_by_type(ns, elename, typestr, parent, arytypestr, extraattr)
+  def decode_tag_by_type(ns, elename, typestr, parent, arytypestr, attrs)
     if arytypestr
       type = typestr ? ns.parse(typestr) : ValueArrayName
       node = SOAPArray.decode(elename, type, ns.parse(arytypestr))
-      node.extraattr.update(extraattr)
+      node.extraattr.update(attrs)
       return node
     end
 
@@ -461,12 +458,12 @@ private
 
     if klass = TypeMap[type]
       node = decode_basetype(klass, elename)
-      node.extraattr.update(extraattr)
+      node.extraattr.update(attrs)
       return node
     end
 
     # Unknown type... Struct or String
-    SOAPUnknown.new(self, elename, type, extraattr)
+    SOAPUnknown.new(self, elename, type, attrs)
   end
 
   def decode_textbuf(node, textbufstr)
@@ -500,63 +497,23 @@ private
     '1' => 1,
     '0' => 0
   }
-  def decode_attrs(ns, attrs)
-    is_nil = false
-    type = nil
-    arytype = nil
-    root = nil
-    offset = nil
-    position = nil
-    href = nil
-    id = nil
-    extraattr = {}
-
-    attrs.each do |key, value|
-      qname = ns.parse(key)
-      case qname.namespace
-      when XSD::InstanceNamespace
-        case qname.name
-        when XSD::NilLiteral
-          is_nil = NilLiteralMap[value] or
-            raise EncodingStyleError.new("cannot accept attribute value: #{value} as the value of xsi:#{XSD::NilLiteral} (expected 'true', 'false', '1', or '0')")
-          next
-        when XSD::AttrType
-          type = value
-          next
-        end
-      when EncodingNamespace
-        case qname.name
-        when AttrArrayType
-          arytype = value
-          next
-        when AttrRoot
-          root = RootLiteralMap[value] or
-            raise EncodingStyleError.new(
-	      "illegal root attribute value: #{value}")
-          next
-        when AttrOffset
-          offset = value
-          next
-        when AttrPosition
-          position = value
-          next
-        end
-      end
-      if key == 'href'
-        href = value
-        next
-      elsif key == 'id'
-        id = value
-        next
-      end
-      qname = ns.parse_local(key)
-      extraattr[qname] = decode_attr_value(ns, qname, value)
-    end
-
-    return is_nil, type, arytype, root, offset, position, href, id, extraattr
+  def extract_attrs(ns, attrs)
+    is_nil = NilLiteralMap[attrs[XSD::AttrNilName]]
+    type = attrs[XSD::AttrTypeName]
+    arytype = attrs[AttrArrayTypeName]
+    root = attrs[AttrRootName]
+    offset = attrs[AttrOffsetName]
+    position = attrs[AttrPositionName]
+    href = attrs[AttrHrefName]
+    id = attrs[AttrIdName]
+    if attrs.key?(Mapping::RubyIVarName)
+      attrs[Mapping::RubyIVarName] =
+        decode_ref_value(ns, attrs[Mapping::RubyIVarName])
+    end
+    return is_nil, type, arytype, root, offset, position, href, id
   end
 
-  def decode_attr_value(ns, qname, value)
+  def decode_ref_value(ns, value)
     if /\A#/ =~ value
       o = SOAPReference.decode(nil, value)
       @refpool << o

data/lib/soap/generator.rb

@@ -6,8 +6,8 @@
 # either the dual license version in 2003, or any later version.
 
 
-require 'xsd/ns'
 require 'soap/soap'
+require 'soap/ns'
 require 'soap/baseData'
 require 'soap/encodingstyle/handler'
 require 'xsd/codegen/gensupport'
@@ -19,7 +19,7 @@ module SOAP
 ###
 ## CAUTION: MT-unsafe
 #
-class SOAPGenerator
+class Generator
   include SOAP
   include XSD::CodeGen::GenSupport
 
@@ -31,6 +31,7 @@ public
   attr_accessor :default_encodingstyle
   attr_accessor :generate_explicit_type
   attr_accessor :use_numeric_character_reference
+  attr_accessor :use_default_namespace
 
   def initialize(opt = {})
     @reftarget = nil
@@ -39,29 +40,34 @@ public
     @default_encodingstyle = opt[:default_encodingstyle] || EncodingNamespace
     @generate_explicit_type =
       opt.key?(:generate_explicit_type) ? opt[:generate_explicit_type] : true
-    # elementformdefault is for default namespace usage controll
-    # TODO: should be renamed
-    @elementformdefault = opt[:elementformdefault]
+    @use_default_namespace = opt[:use_default_namespace]
     @attributeformdefault = opt[:attributeformdefault]
     @use_numeric_character_reference = opt[:use_numeric_character_reference]
     @indentstr = opt[:no_indent] ? '' : '  '
     @buf = @indent = @curr = nil
     @default_ns = opt[:default_ns]
+    @default_ns_tag = opt[:default_ns_tag]
   end
 
   def generate(obj, io = nil)
     @buf = io || ''
     @indent = ''
+    @encode_char_regexp = get_encode_char_regexp()
 
     prologue
     @handlers.each do |uri, handler|
       handler.encode_prologue
     end
 
-    ns = XSD::NS.new
+    ns = SOAP::NS.new
     if @default_ns
       @default_ns.each_ns do |default_ns, default_tag|
-        SOAPGenerator.assign_ns(obj.extraattr, ns, default_ns, default_tag)
+        Generator.assign_ns(obj.extraattr, ns, default_ns, default_tag)
+      end
+    end
+    if @default_ns_tag
+      @default_ns_tag.each_ns do |default_ns, default_tag|
+        ns.known_tag[default_ns] = default_tag
       end
     end
     @buf << xmldecl
@@ -124,7 +130,7 @@ public
   end
 
   def encode_element(ns, obj, parent)
-    attrs = obj.extraattr.dup
+    attrs = obj.extraattr
     if obj.is_a?(SOAPBody)
       @reftarget = obj
       obj.encode(self, ns, attrs) do |child|
@@ -136,10 +142,9 @@ public
     else
       if obj.is_a?(SOAPEnvelope)
         # xsi:nil="true" can appear even if dumping without explicit type.
-        SOAPGenerator.assign_ns(attrs, ns,
-	  XSD::InstanceNamespace, XSINamespaceTag)
+        Generator.assign_ns(attrs, ns, XSD::InstanceNamespace)
         if @generate_explicit_type
-          SOAPGenerator.assign_ns(attrs, ns, XSD::Namespace, XSDNamespaceTag)
+          Generator.assign_ns(attrs, ns, XSD::Namespace)
         end
       end
       obj.encode(self, ns, attrs) do |child|
@@ -154,10 +159,10 @@ public
     if element_local?(data)
       data.elename.name
     else
-      if @elementformdefault
-        SOAPGenerator.assign_ns(attrs, ns, data.elename.namespace, '')
+      if @use_default_namespace
+        Generator.assign_ns(attrs, ns, data.elename.namespace, '')
       else
-        SOAPGenerator.assign_ns(attrs, ns, data.elename.namespace)
+        Generator.assign_ns(attrs, ns, data.elename.namespace)
       end
       ns.name(data.elename)
     end
@@ -178,7 +183,7 @@ public
     end
     ary = []
     attrs.each do |key, value|
-      ary << %Q[#{ key }="#{ value }"] unless value.nil?
+      ary << %Q[#{ key }="#{ get_encoded(value.to_s) }"]
     end
     case ary.size
     when 0
@@ -204,28 +209,8 @@ public
     @buf << str
   end
 
-  EncodeMap = {
-    '&' => '&amp;',
-    '<' => '&lt;',
-    '>' => '&gt;',
-    '"' => '&quot;',
-    '\'' => '&apos;',
-    "\r" => '&#xd;'
-  }
-  EncodeCharRegexp = Regexp.new("[#{EncodeMap.keys.join}]")
   def encode_string(str)
-    if @use_numeric_character_reference and !XSD::Charset.is_us_ascii(str)
-      str.gsub!(EncodeCharRegexp) { |c| EncodeMap[c] }
-      @buf << str.unpack("U*").collect { |c|
-        if c == 0x9 or c == 0xa or c == 0xd or (c >= 0x20 and c <= 0x7f)
-          c.chr
-        else
-          sprintf("&#x%x;", c)
-        end
-      }.join
-    else
-      @buf << str.gsub(EncodeCharRegexp) { |c| EncodeMap[c] }
-    end
+    @buf << get_encoded(str)
   end
 
   def element_local?(element)
@@ -236,15 +221,20 @@ public
     if namespace.nil?
       raise FormatEncodeError.new("empty namespace")
     end
-    unless ns.assigned?(namespace)
-      tag = ns.assign(namespace, tag)
-      if tag == ''
-        attr = 'xmlns'
-      else
-        attr = "xmlns:#{tag}"
-      end
-      attrs[attr] = namespace
+    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
@@ -255,12 +245,46 @@ private
   def epilogue
   end
 
+  ENCODE_CHAR_REGEXP = {}
+
+  EncodeMap = {
+    '&' => '&amp;',
+    '<' => '&lt;',
+    '>' => '&gt;',
+    '"' => '&quot;',
+    '\'' => '&apos;',
+    "\r" => '&#xd;'
+  }
+
+  def get_encoded(str)
+    if @use_numeric_character_reference and !XSD::Charset.is_us_ascii(str)
+      str.gsub!(@encode_char_regexp) { |c| EncodeMap[c] }
+      str.unpack("U*").collect { |c|
+        if c == 0x9 or c == 0xa or c == 0xd or (c >= 0x20 and c <= 0x7f)
+          c.chr
+        else
+          sprintf("&#x%x;", c)
+        end
+      }.join
+    else
+      str.gsub(@encode_char_regexp) { |c| EncodeMap[c] }
+    end
+  end
+
+  def get_encode_char_regexp
+    ENCODE_CHAR_REGEXP[XSD::Charset.encoding] ||=
+      Regexp.new("[#{EncodeMap.keys.join}]", nil, XSD::Charset.encoding)
+  end
+
   def find_handler(encodingstyle)
     unless @handlers.key?(encodingstyle)
-      handler = SOAP::EncodingStyle::Handler.handler(encodingstyle).new(@charset)
-      handler.generate_explicit_type = @generate_explicit_type
-      handler.encode_prologue
-      @handlers[encodingstyle] = handler
+      factory = SOAP::EncodingStyle::Handler.handler(encodingstyle)
+      if factory
+        handler = factory.new(@charset)
+        handler.generate_explicit_type = @generate_explicit_type
+        handler.encode_prologue
+        @handlers[encodingstyle] = handler
+      end
     end
     @handlers[encodingstyle]
   end
@@ -274,5 +298,7 @@ private
   end
 end
 
+SOAPGenerator = Generator       # for backward compatibility
+
 
 end

data/lib/soap/header/handler.rb

@@ -15,7 +15,7 @@ module Header
 
 class Handler
   attr_reader :elename
-  attr_reader :mustunderstand
+  attr_accessor :mustunderstand
   attr_reader :encodingstyle
   attr_reader :target_actor
 

data/lib/soap/header/mappinghandler.rb

@@ -0,0 +1,47 @@
+# SOAP4R - SOAP Mapping header item handler
+# Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/header/handler'
+require 'soap/mapping/mapping'
+
+
+module SOAP
+module Header
+
+
+class MappingHandler < SOAP::Header::Handler
+  attr_accessor :registry
+
+  def initialize(elename, registry = nil)
+    super(elename)
+    @registry = registry
+  end
+
+  # Should return an Object for mapping
+  def on_mapping_outbound
+    nil
+  end
+
+  # Given header is a mapped Object
+  def on_mapping_inbound(obj, mustunderstand)
+  end
+
+  def on_outbound
+    obj = on_mapping_outbound
+    obj ? SOAP::Mapping.obj2soap(obj, @registry, @elename) : nil
+  end
+
+  def on_inbound(header, mustunderstand)
+    obj = SOAP::Mapping.soap2obj(header, @registry)
+    on_mapping_inbound(obj, mustunderstand)
+  end
+end
+
+
+end
+end