soybean 2.5.3 → 2.5.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.1.0)
+    activesupport (3.1.3)
       multi_json (~> 1.0)
     diff-lcs (1.1.3)
     git (1.2.5)
@@ -12,10 +12,10 @@ GEM
       rake
     multi_json (1.0.3)
     nokogiri (1.5.0)
-    rack (1.3.4)
+    rack (1.3.5)
     rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rake (0.9.2)
+    rake (0.9.2.2)
     rspec (2.3.0)
       rspec-core (~> 2.3.0)
       rspec-expectations (~> 2.3.0)

data/VERSION

@@ -1 +1 @@
-2.5.3
+2.5.4

data/lib/soybean.rb

@@ -28,4 +28,7 @@ module Soybean
   mattr_accessor :logger
   self.logger = Logger.new(STDOUT)
 
+  mattr_accessor :cache
+  self.cache = Hash.new { |hash, key| hash[key] = { } }
+
 end

data/lib/soybean/cli.rb

@@ -27,7 +27,6 @@ class Soybean::CLI < Thor
     full_path = File.expand_path wsdl, FileUtils.pwd
     if File.directory? full_path
       Dir["#{full_path}/*.wsdl"].each do |file|
-        puts file.inspect
         generate_service(file, dir, opts)
       end
     else
@@ -42,6 +41,7 @@ class Soybean::CLI < Thor
 
   no_tasks do
     def generate_service(wsdl, dir, options)
+      Soybean.cache.clear
       Soybean::Generators::ServiceGenerator.new(dir, wsdl, spec_dir(dir)).generate do |filename, content, generator|
         opts = options
         if generator.is_a? Soybean::Generators::ModelGenerator

data/lib/soybean/complex_type.rb

@@ -30,7 +30,7 @@ module Soybean
       def init_from_array(arry)
         check_arguments_number! arry
         attributes.each_with_index do |key, i|
-          self.send "#{key}=".to_sym, arry.at(i)
+          self.send :"#{key}=", arry.at(i)
         end
       end
 

data/lib/soybean/generators/model_generator.rb

@@ -18,7 +18,9 @@ module Soybean
         @wsdl.importedschema.map do |uri, schema|
           "require 'mappings/#{URI.parse(schema.targetnamespace).path[1..-2].underscore}'\n"
         end.join +
-        "class #{class_name} < #{interface_name}\nend"
+        "class #{class_name} < #{interface_name}" +
+            "include #{URI.parse(@wsdl.importedschema.values.last.targetnamespace).path[1..-2].camelize}"
+        "end"
       end
 
       def class_name

data/lib/soybean/generators/types_generator.rb

@@ -2,7 +2,7 @@ module Soybean
   module Generators
     class TypesGenerator < WSDL::SOAP::ClassDefCreator
       class_attribute :classes_cache, :instance_reader => true, :instance_writer => true
-      self.classes_cache = {}
+      self.classes_cache = Soybean.cache[:classes]
       include BaseGenerator
 
       attr_reader :name
@@ -51,7 +51,7 @@ module Soybean
 
       def with_cache
         result = yield
-        if !classes_cache.key?(result.name) && result
+        if result && !classes_cache.key?(result.name)
           classes_cache[result.name] = true
           result.dump
         end

data/lib/soybean/interface.rb

@@ -1,5 +1,8 @@
 module Soybean
   class Interface
+    include ActiveSupport::Callbacks
+    NO_ACTIONS = [:endpoint]
+
     class_attribute :interfaces, :instance_reader => false, :instance_writer => false
 
     def self.inherited(subclass)
@@ -8,11 +11,14 @@ module Soybean
       Soybean.services << subclass if subclass.superclass < Soybean::Interface
     end
 
-    def self.actions
-      self.instance_methods - Object.instance_methods
+    def self.actions(implemented=true)
+      if implemented
+        self.public_instance_methods(false) - NO_ACTIONS
+      else
+        self::Methods.map(&:second).map(&:to_sym)
+      end
     end
 
-
     attr_reader :logger
 
     def initialize(logger=Soybean.logger)

data/lib/soybean/literal_mapping_registry_creator.rb

@@ -9,24 +9,19 @@ module Soybean
     private
 
     def dump_entry(regname, var)
-      if @cache.key?(var[:class])
-        ''
-      else
-        @cache[var[:class]] = true
-        "#{regname}.register(\n  " +
-            [
-                dump_entry_item(var, :class),
-                dump_entry_item(var, :soap_class),
-                dump_entry_item(var, :schema_name, :qname),
-                dump_entry_item(var, :schema_type, :qname),
-                dump_entry_item(var, :is_anonymous),
-                dump_entry_item(var, :schema_basetype, :qname),
-                dump_entry_item(var, :schema_qualified),
-                dump_entry_item(var, :schema_element),
-                dump_entry_item(var, :schema_attribute)
-            ].compact.join(",\n  ") +
-            "\n)\n"
-      end
+      "#{regname}.register(\n  " +
+          [
+              dump_entry_item(var, :class),
+              dump_entry_item(var, :soap_class),
+              dump_entry_item(var, :schema_name, :qname),
+              dump_entry_item(var, :schema_type, :qname),
+              dump_entry_item(var, :is_anonymous),
+              dump_entry_item(var, :schema_basetype, :qname),
+              dump_entry_item(var, :schema_qualified),
+              dump_entry_item(var, :schema_element),
+              dump_entry_item(var, :schema_attribute)
+          ].compact.join(",\n  ") +
+          "\n)\n"
     end
   end
 end

data/soybean.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{soybean}
-  s.version = "2.5.3"
+  s.version = "2.5.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Anton Sozontov"]
-  s.date = %q{2011-10-27}
+  s.date = %q{2011-11-21}
   s.default_executable = %q{soybean}
   s.description = %q{Generate soap web-services from you wsdl. Generate: all classes from xsd, and other.}
   s.email = %q{a.sozontov@gmail.com}

data/vendor/soap4r/soap/mapping/literalregistry.rb

@@ -15,353 +15,353 @@ require 'xsd/namedelements'
 
 
 module SOAP
-module Mapping
+  module Mapping
 
 
-class LiteralRegistry
-  include RegistrySupport
+    class LiteralRegistry
+      include RegistrySupport
 
-  attr_accessor :excn_handler_obj2soap
-  attr_accessor :excn_handler_soap2obj
+      attr_accessor :excn_handler_obj2soap
+      attr_accessor :excn_handler_soap2obj
 
-  def initialize
-    super()
-    @excn_handler_obj2soap = nil
-    @excn_handler_soap2obj = nil
-  end
-
-  def obj2soap(obj, qname, obj_class = nil)
-    soap_obj = nil
-    if obj.is_a?(SOAPElement)
-      soap_obj = obj
-    else
-      soap_obj = any2soap(obj, qname, obj_class)
-    end
-    return soap_obj if soap_obj
-    if @excn_handler_obj2soap
-      soap_obj = @excn_handler_obj2soap.call(obj) { |yield_obj|
-        Mapping.obj2soap(yield_obj, nil, nil, MAPPING_OPT)
-      }
-      return soap_obj if soap_obj
-    end
-    raise MappingError.new("cannot map #{obj.class.name} as #{qname}")
-  end
-
-  # node should be a SOAPElement
-  def soap2obj(node, obj_class = nil)
-    cause = nil
-    begin
-      return any2obj(node, obj_class)
-    rescue MappingError
-      cause = $!
-    end
-    if @excn_handler_soap2obj
-      begin
-        return @excn_handler_soap2obj.call(node) { |yield_node|
-	    Mapping.soap2obj(yield_node, nil, nil, MAPPING_OPT)
-	  }
-      rescue Exception
+      def initialize
+        super()
+        @excn_handler_obj2soap = nil
+        @excn_handler_soap2obj = nil
       end
-    end
-    raise MappingError.new("cannot map #{node.elename.name}/#{node.type.name} to Ruby object", cause)
-  end
 
-private
+      def obj2soap(obj, qname, obj_class = nil)
+        soap_obj = nil
+        if obj.is_a?(SOAPElement)
+          soap_obj = obj
+        else
+          soap_obj = any2soap(obj, qname, obj_class)
+        end
+        return soap_obj if soap_obj
+        if @excn_handler_obj2soap
+          soap_obj = @excn_handler_obj2soap.call(obj) { |yield_obj|
+            Mapping.obj2soap(yield_obj, nil, nil, MAPPING_OPT)
+          }
+          return soap_obj if soap_obj
+        end
+        raise MappingError.new("cannot map #{obj.class.name} as #{qname}")
+      end
 
-  MAPPING_OPT = { :no_reference => true }
+      # node should be a SOAPElement
+      def soap2obj(node, obj_class = nil)
+        cause = nil
+        begin
+          return any2obj(node, obj_class)
+        rescue MappingError
+          cause = $!
+        end
+        if @excn_handler_soap2obj
+          begin
+            return @excn_handler_soap2obj.call(node) { |yield_node|
+              Mapping.soap2obj(yield_node, nil, nil, MAPPING_OPT)
+            }
+          rescue Exception
+          end
+        end
+        raise MappingError.new("cannot map #{node.elename.name}/#{node.type.name} to Ruby object", cause)
+      end
 
-  def definedobj2soap(obj, definition)
-    obj2soap(obj, definition.elename, definition.mapped_class)
-  end
+      private
 
-  def any2soap(obj, qname, obj_class)
-    ele = nil
-    if obj.is_a?(SOAP::Mapping::Object)
-      return mappingobj2soap(obj, qname)
-    end
-    class_definition = schema_definition_from_class(obj.class)
-    if class_definition.nil? and obj_class
-      class_definition = schema_definition_from_class(obj_class)
-    end
-    elename_definition = schema_definition_from_elename(qname)
-    if !class_definition and !elename_definition
-      # no definition found
-      return anyobj2soap(obj, qname)
-    end
-    if !class_definition or !elename_definition
-      # use found one
-      return stubobj2soap(obj, qname, class_definition || elename_definition)
-    end
-    # found both:
-    if class_definition.class_for == elename_definition.class_for
-      # if two definitions are for the same class, give qname a priority.
-      return stubobj2soap(obj, qname, elename_definition)
-    end
-    # it should be a derived class
-    return stubobj2soap(obj, qname, class_definition)
-  end
+      MAPPING_OPT = { :no_reference => true }
 
-  def anyobj2soap(obj, qname)
-    ele = nil
-    case obj
-    when Hash
-      ele = SOAPElement.from_obj(obj, nil)
-      ele.elename = qname
-    when Array
-      # treat as a list of simpletype
-      ele = SOAPElement.new(qname, obj.join(" "))
-    when XSD::QName
-      ele = SOAPElement.new(qname)
-      ele.text = obj
-    else
-      # expected to be a basetype or an anyType.
-      # SOAPStruct, etc. is used instead of SOAPElement.
-      begin
-        ele = Mapping.obj2soap(obj, nil, nil, MAPPING_OPT)
-        ele.elename = qname
-      rescue MappingError
-        ele = SOAPElement.new(qname, obj.to_s)
+      def definedobj2soap(obj, definition)
+        obj2soap(obj, definition.elename, definition.mapped_class)
       end
-    end
-    add_attributes2soap(obj, ele)
-    ele
-  end
 
-  def stubobj2soap(obj, qname, definition)
-    if obj.nil?
-      ele = SOAPNil.new
-      ele.elename = qname
-    elsif obj.is_a?(::String)
-      ele = SOAPElement.new(qname, obj)
-    else
-      ele = SOAPElement.new(qname)
-    end
-    ele.qualified = definition.qualified
-    if definition.type
-      ele.type = definition.type
-      if definition.basetype or Mapping.root_type_hint
-        Mapping.reset_root_type_hint
-        ele.force_typed = true
+      def any2soap(obj, qname, obj_class)
+        ele = nil
+        if obj.is_a?(SOAP::Mapping::Object)
+          return mappingobj2soap(obj, qname)
+        end
+        class_definition = schema_definition_from_class(obj.class)
+        if class_definition.nil? and obj_class
+          class_definition = schema_definition_from_class(obj_class)
+        end
+        elename_definition = schema_definition_from_elename(qname)
+        if !class_definition and !elename_definition
+          # no definition found
+          return anyobj2soap(obj, qname)
+        end
+        if !class_definition or !elename_definition
+          # use found one
+          return stubobj2soap(obj, qname, class_definition || elename_definition)
+        end
+        # found both:
+        if class_definition.class_for == elename_definition.class_for
+          # if two definitions are for the same class, give qname a priority.
+          return stubobj2soap(obj, qname, elename_definition)
+        end
+        # it should be a derived class
+        return stubobj2soap(obj, qname, class_definition)
       end
-    end
-    if qname.nil? and definition.elename
-      ele.elename = definition.elename
-    end
-    return ele if obj.nil?
-    stubobj2soap_elements(obj, ele, definition.elements)
-    add_definedattributes2soap(obj, ele, definition)
-    ele
-  end
 
-  def stubobj2soap_elements(obj, ele, definition, is_choice = false)
-    added = false
-    case definition
-    when SchemaSequenceDefinition, SchemaEmptyDefinition
-      definition.each do |eledef|
-        ele_added = stubobj2soap_elements(obj, ele, eledef, is_choice)
-        added = true if ele_added
-      end
-    when SchemaChoiceDefinition
-      definition.each do |eledef|
-        added = stubobj2soap_elements(obj, ele, eledef, true)
-        break if added
+      def anyobj2soap(obj, qname)
+        ele = nil
+        case obj
+          when Hash
+            ele         = SOAPElement.from_obj(obj, nil)
+            ele.elename = qname
+          when Array
+            # treat as a list of simpletype
+            ele = SOAPElement.new(qname, obj.join(" "))
+          when XSD::QName
+            ele      = SOAPElement.new(qname)
+            ele.text = obj
+          else
+            # expected to be a basetype or an anyType.
+            # SOAPStruct, etc. is used instead of SOAPElement.
+            begin
+              ele         = Mapping.obj2soap(obj, nil, nil, MAPPING_OPT)
+              ele.elename = qname
+            rescue MappingError
+              ele = SOAPElement.new(qname, obj.to_s)
+            end
+        end
+        add_attributes2soap(obj, ele)
+        ele
       end
-    else
-      added = true
-      if definition.as_any?
-        any = Mapping.get_attributes_for_any(obj)
-        SOAPElement.from_objs(any).each do |child|
-          ele.add(child)
-        end
-      elsif obj.respond_to?(:each) and definition.as_array?
-        obj.each do |item|
-          ele.add(definedobj2soap(item, definition))
-        end
-      else
-        child = Mapping.get_attribute(obj, definition.varname)
-        if child.nil? and (is_choice or definition.minoccurs == 0)
-          added = false
+
+      def stubobj2soap(obj, qname, definition)
+        if obj.nil?
+          ele         = SOAPNil.new
+          ele.elename = qname
+        elsif obj.is_a?(::String)
+          ele = SOAPElement.new(qname, obj)
         else
-          if child.respond_to?(:each) and definition.as_array?
-            if child.empty?
-              added = false
-            else
-              child.each do |item|
+          ele = SOAPElement.new(qname)
+        end
+        ele.qualified = definition.qualified
+        if definition.type
+          ele.type = definition.type
+          if definition.basetype or Mapping.root_type_hint
+            Mapping.reset_root_type_hint
+            ele.force_typed = true
+          end
+        end
+        if qname.nil? and definition.elename
+          ele.elename = definition.elename
+        end
+        return ele if obj.nil?
+        stubobj2soap_elements(obj, ele, definition.elements)
+        add_definedattributes2soap(obj, ele, definition)
+        ele
+      end
+
+      def stubobj2soap_elements(obj, ele, definition, is_choice = false)
+        added = false
+        case definition
+          when SchemaSequenceDefinition, SchemaEmptyDefinition
+            definition.each do |eledef|
+              ele_added = stubobj2soap_elements(obj, ele, eledef, is_choice)
+              added = true if ele_added
+            end
+          when SchemaChoiceDefinition
+            definition.each do |eledef|
+              added = stubobj2soap_elements(obj, ele, eledef, true)
+              break if added
+            end
+          else
+            added = true
+            if definition.as_any?
+              any = Mapping.get_attributes_for_any(obj)
+              SOAPElement.from_objs(any).each do |child|
+                ele.add(child)
+              end
+            elsif obj.respond_to?(:each) and definition.as_array?
+              obj.each do |item|
                 ele.add(definedobj2soap(item, definition))
               end
+            else
+              child = Mapping.get_attribute(obj, definition.varname)
+              if child.nil? and (is_choice or definition.minoccurs == 0)
+                added = false
+              else
+                if child.respond_to?(:each) and definition.as_array?
+                  if child.empty?
+                    added = false
+                  else
+                    child.each do |item|
+                      ele.add(definedobj2soap(item, definition))
+                    end
+                  end
+                else
+                  ele.add(definedobj2soap(child, definition))
+                end
+              end
+            end
+        end
+        added
+      end
+
+      def mappingobj2soap(obj, qname)
+        ele = SOAPElement.new(qname)
+        obj.__xmlele.each do |key, value|
+          if value.is_a?(::Array)
+            value.each do |item|
+              ele.add(obj2soap(item, key))
             end
           else
-            ele.add(definedobj2soap(child, definition))
+            ele.add(obj2soap(value, key))
           end
         end
+        obj.__xmlattr.each do |key, value|
+          ele.extraattr[key] = value
+        end
+        ele
       end
-    end
-    added
-  end
 
-  def mappingobj2soap(obj, qname)
-    ele = SOAPElement.new(qname)
-    obj.__xmlele.each do |key, value|
-      if value.is_a?(::Array)
-        value.each do |item|
-          ele.add(obj2soap(item, key))
+      def any2obj(node, obj_class = nil)
+        is_compound = node.is_a?(::SOAP::SOAPCompoundtype)
+        # trust xsi:type first
+        if is_compound and node.type
+          definition = schema_definition_from_type(node.type)
+        end
+        # element name next
+        definition ||= schema_definition_from_elename(node.elename)
+        # class defined in parent type last
+        if obj_class
+          definition ||= schema_definition_from_class(obj_class)
+        end
+        if definition
+          obj_class = definition.class_for
+        end
+        if is_compound
+          if definition
+            return elesoap2stubobj(node, obj_class, definition)
+          elsif node.is_a?(::SOAP::SOAPNameAccessible)
+            return elesoap2plainobj(node)
+          end
         end
-      else
-        ele.add(obj2soap(value, key))
+        obj = Mapping.soap2obj(node, nil, obj_class, MAPPING_OPT)
+        add_attributes2obj(node, obj)
+        obj
       end
-    end
-    obj.__xmlattr.each do |key, value|
-      ele.extraattr[key] = value
-    end
-    ele
-  end
 
-  def any2obj(node, obj_class = nil)
-    is_compound = node.is_a?(::SOAP::SOAPCompoundtype)
-    # trust xsi:type first
-    if is_compound and node.type
-      definition = schema_definition_from_type(node.type)
-    end
-    # element name next
-    definition ||= schema_definition_from_elename(node.elename)
-    # class defined in parent type last
-    if obj_class
-      definition ||= schema_definition_from_class(obj_class)
-    end
-    if definition
-      obj_class = definition.class_for
-    end
-    if is_compound
-      if definition
-        return elesoap2stubobj(node, obj_class, definition)
-      elsif node.is_a?(::SOAP::SOAPNameAccessible)
-        return elesoap2plainobj(node)
+      def elesoap2stubobj(node, obj_class, definition)
+        obj = nil
+        if obj_class == ::String
+          obj = node.text
+        elsif obj_class < ::String and node.respond_to?(:text)
+          obj = obj_class.new(node.text)
+        else
+          obj = Mapping.create_empty_object(obj_class)
+          add_elesoap2stubobj(node, obj, definition)
+        end
+        add_attributes2stubobj(node, obj, definition)
+        obj
       end
-    end
-    obj = Mapping.soap2obj(node, nil, obj_class, MAPPING_OPT)
-    add_attributes2obj(node, obj)
-    obj
-  end
-
-  def elesoap2stubobj(node, obj_class, definition)
-    obj = nil
-    if obj_class == ::String
-      obj = node.text
-    elsif obj_class < ::String and node.respond_to?(:text)
-      obj = obj_class.new(node.text)
-    else
-      obj = Mapping.create_empty_object(obj_class)
-      add_elesoap2stubobj(node, obj, definition)
-    end
-    add_attributes2stubobj(node, obj, definition)
-    obj
-  end
-
-  def elesoap2plainobj(node)
-    obj = nil
-    if !node.have_member
-      obj = base2obj(node, ::SOAP::SOAPString)
-    else
-      obj = anytype2obj(node)
-      add_elesoap2plainobj(node, obj)
-    end
-    add_attributes2obj(node, obj)
-    obj
-  end
 
-  def anytype2obj(node)
-    if node.is_a?(::SOAP::SOAPBasetype)
-      return node.data
-    end
-    ::SOAP::Mapping::Object.new
-  end
-
-  def add_elesoap2stubobj(node, obj, definition)
-    vars = {}
-    node.each do |name, value|
-      item = definition.elements.find_element(value.elename)
-      if item
-        child = elesoapchild2obj(value, item)
-      else
-        # unknown element is treated as anyType.
-        child = any2obj(value)
+      def elesoap2plainobj(node)
+        obj = nil
+        if !node.have_member
+          obj = base2obj(node, ::SOAP::SOAPString)
+        else
+          obj = anytype2obj(node)
+          add_elesoap2plainobj(node, obj)
+        end
+        add_attributes2obj(node, obj)
+        obj
       end
-      if item and item.as_array?
-        (vars[name] ||= []) << child
-      elsif vars.key?(name)
-        vars[name] = [vars[name], child].flatten
-      else
-        vars[name] = child
+
+      def anytype2obj(node)
+        if node.is_a?(::SOAP::SOAPBasetype)
+          return node.data
+        end
+        ::SOAP::Mapping::Object.new
       end
-    end
-    if obj.is_a?(::Array) and is_stubobj_elements_for_array(vars)
-      Array.instance_method(:replace).bind(obj).call(vars.values[0])
-    else
-      Mapping.set_attributes(obj, vars)
-    end
-  end
 
-  def elesoapchild2obj(value, eledef)
-    if eledef.mapped_class
-      if eledef.mapped_class.include?(::SOAP::SOAPBasetype)
-        base2obj(value, eledef.mapped_class)
-      else
-        any2obj(value, eledef.mapped_class)
+      def add_elesoap2stubobj(node, obj, definition)
+        vars = { }
+        node.each do |name, value|
+          item = definition.elements.find_element(value.elename)
+          if item
+            child = elesoapchild2obj(value, item)
+          else
+            # unknown element is treated as anyType.
+            child = any2obj(value)
+          end
+          if item and item.as_array?
+            (vars[name] ||= []) << child
+          elsif vars.key?(name)
+            vars[name] = [vars[name], child].flatten
+          else
+            vars[name] = child
+          end
+        end
+        if obj.is_a?(::Array) and is_stubobj_elements_for_array(vars)
+          Array.instance_method(:replace).bind(obj).call(vars.values[0])
+        else
+          Mapping.set_attributes(obj, vars)
+        end
       end
-    else
-      child_definition = schema_definition_from_elename(eledef.elename)
-      if child_definition
-        any2obj(value, child_definition.class_for)
-      else
-        # untyped element is treated as anyType.
-        any2obj(value)
+
+      def elesoapchild2obj(value, eledef)
+        if eledef.mapped_class
+          if eledef.mapped_class.include?(::SOAP::SOAPBasetype)
+            base2obj(value, eledef.mapped_class)
+          else
+            any2obj(value, eledef.mapped_class)
+          end
+        else
+          child_definition = schema_definition_from_elename(eledef.elename)
+          if child_definition
+            any2obj(value, child_definition.class_for)
+          else
+            # untyped element is treated as anyType.
+            any2obj(value)
+          end
+        end
       end
-    end
-  end
 
-  def add_attributes2stubobj(node, obj, definition)
-    return if obj.nil? or node.extraattr.empty?
-    if attributes = definition.attributes
-      define_xmlattr(obj)
-      attributes.each do |qname, class_name|
-        child = node.extraattr[qname]
-        next if child.nil?
-        if class_name
-          klass = Mapping.class_from_name(class_name)
-          if klass.include?(::SOAP::SOAPBasetype)
-            child = klass.to_data(child)
+      def add_attributes2stubobj(node, obj, definition)
+        return if obj.nil? or node.extraattr.empty?
+        if attributes = definition.attributes
+          define_xmlattr(obj)
+          attributes.each do |qname, class_name|
+            child = node.extraattr[qname]
+            next if child.nil?
+            if class_name
+              klass = Mapping.class_from_name(class_name)
+              if klass.include?(::SOAP::SOAPBasetype)
+                child = klass.to_data(child)
+              end
+            end
+            obj.__xmlattr[qname] = child
+            define_xmlattr_accessor(obj, qname)
           end
         end
-        obj.__xmlattr[qname] = child
-        define_xmlattr_accessor(obj, qname)
       end
-    end
-  end
 
-  def add_elesoap2plainobj(node, obj)
-    node.each do |name, value|
-      obj.__add_xmlele_value(value.elename, any2obj(value))
-    end
-  end
+      def add_elesoap2plainobj(node, obj)
+        node.each do |name, value|
+          obj.__add_xmlele_value(value.elename, any2obj(value))
+        end
+      end
 
-  def add_attributes2obj(node, obj)
-    return if obj.nil? or node.extraattr.empty?
-    define_xmlattr(obj)
-    node.extraattr.each do |qname, value|
-      obj.__xmlattr[qname] = value
-      define_xmlattr_accessor(obj, qname)
-    end
-  end
+      def add_attributes2obj(node, obj)
+        return if obj.nil? or node.extraattr.empty?
+        define_xmlattr(obj)
+        node.extraattr.each do |qname, value|
+          obj.__xmlattr[qname] = value
+          define_xmlattr_accessor(obj, qname)
+        end
+      end
 
-  # Mapping.define_attr_accessor calls define_method with proc and it exhausts
-  # much memory for each singleton Object.  just instance_eval instead of it.
-  def define_xmlattr_accessor(obj, qname)
-    # untaint depends GenSupport.safemethodname
-    name = Mapping.safemethodname('xmlattr_' + qname.name).untaint
-    unless obj.respond_to?(name)
-      # untaint depends QName#dump
-      qnamedump = qname.dump.untaint
-      obj.instance_eval <<-EOS
+      # Mapping.define_attr_accessor calls define_method with proc and it exhausts
+      # much memory for each singleton Object.  just instance_eval instead of it.
+      def define_xmlattr_accessor(obj, qname)
+        # untaint depends GenSupport.safemethodname
+        name = Mapping.safemethodname('xmlattr_' + qname.name).untaint
+        unless obj.respond_to?(name)
+          # untaint depends QName#dump
+          qnamedump = qname.dump.untaint
+          obj.instance_eval <<-EOS
         def #{name}
           @__xmlattr[#{qnamedump}]
         end
@@ -369,24 +369,24 @@ private
         def #{name}=(value)
           @__xmlattr[#{qnamedump}] = value
         end
-      EOS
-    end
-  end
+          EOS
+        end
+      end
 
-  # Mapping.define_attr_accessor calls define_method with proc and it exhausts
-  # much memory for each singleton Object.  just instance_eval instead of it.
-  def define_xmlattr(obj)
-    obj.instance_variable_set('@__xmlattr', {})
-    unless obj.respond_to?(:__xmlattr)
-      obj.instance_eval <<-EOS
+      # Mapping.define_attr_accessor calls define_method with proc and it exhausts
+      # much memory for each singleton Object.  just instance_eval instead of it.
+      def define_xmlattr(obj)
+        obj.instance_variable_set('@__xmlattr', { })
+        unless obj.respond_to?(:__xmlattr)
+          obj.instance_eval <<-EOS
         def __xmlattr
           @__xmlattr
         end
-      EOS
+          EOS
+        end
+      end
     end
-  end
-end
 
 
-end
+  end
 end

data/vendor/soap4r/wsdl/xml_schema/simple_restriction.rb

@@ -43,7 +43,7 @@ class SimpleRestriction < Info
     @fixed = {}
     @attributes = XSD::NamedElements.new
   end
-  
+
   def valid?(value)
     return false unless check_restriction(value)
     return false unless check_length(value)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soybean
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 2.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-27 00:00:00.000000000 +04:00
+date: 2011-11-21 00:00:00.000000000 +04:00
 default_executable: soybean
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &8481240 !ruby/object:Gem::Requirement
+  requirement: &12398920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8481240
+  version_requirements: *12398920
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &8475500 !ruby/object:Gem::Requirement
+  requirement: &12397860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *8475500
+  version_requirements: *12397860
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &8471340 !ruby/object:Gem::Requirement
+  requirement: &12397140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8471340
+  version_requirements: *12397140
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &8469360 !ruby/object:Gem::Requirement
+  requirement: &12370980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8469360
+  version_requirements: *12370980
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &8453180 !ruby/object:Gem::Requirement
+  requirement: &12367140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8453180
+  version_requirements: *12367140
 - !ruby/object:Gem::Dependency
   name: rack-mount
-  requirement: &8451880 !ruby/object:Gem::Requirement
+  requirement: &12364940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8451880
+  version_requirements: *12364940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &8450920 !ruby/object:Gem::Requirement
+  requirement: &12337740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *8450920
+  version_requirements: *12337740
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &8449660 !ruby/object:Gem::Requirement
+  requirement: &12336620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *8449660
+  version_requirements: *12336620
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &8448460 !ruby/object:Gem::Requirement
+  requirement: &12335580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *8448460
+  version_requirements: *12335580
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &8446940 !ruby/object:Gem::Requirement
+  requirement: &12334660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,7 +121,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *8446940
+  version_requirements: *12334660
 description: ! 'Generate soap web-services from you wsdl. Generate: all classes from
   xsd, and other.'
 email: a.sozontov@gmail.com
@@ -344,7 +344,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2457752307248948752
+      hash: -555538828332696193
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: