soybean 2.3.0 → 2.4.0

data/VERSION

@@ -1 +1 @@
-2.3.0
+2.4.0

data/lib/core_ext/module.rb

@@ -0,0 +1,24 @@
+module Soybean
+  module SoapAttribute
+    extend ActiveSupport::Concern
+
+    included do
+      class_attribute :attributes, :instance_reader => true, :instance_writer => true
+      self.attributes = []
+    end
+
+    module ClassMethods
+      def soap_attribute(*attrs)
+        self.attributes += attrs
+        attr_accessor *attrs
+        attrs.each do |meth|
+          self.class_eval <<-RUBY
+            def #{meth.to_s.underscore}
+              #{meth}
+            end
+          RUBY
+        end
+      end
+    end
+  end
+end

data/lib/soybean/complex_type.rb

@@ -1,53 +1,45 @@
 module Soybean
-  class ComplexType
-    class_attribute :attributes, :instance_reader => true, :instance_writer => true
-    self.attributes = []
+  module ComplexType
+    extend ActiveSupport::Concern
 
-    class << self
-      def attr_accessor(*attrs)
-        self.attributes += attrs
-        super
-        attrs.each do |meth|
-          self.class_eval <<-RUBY
-            def #{meth}
-              @#{meth} || @#{meth.to_s.camelize(:lower)}
-            end
-          RUBY
-        end
-      end
+    included do
+      include Soybean::SoapAttribute
     end
 
-    def initialize(*args)
-      hash = args.extract_options!
-      if args.empty?
-        init_from_hash(hash)
-      else
-        init_from_array(args)
+    module InstanceMethods
+      def initialize(*args)
+        hash = args.extract_options!
+        if args.empty?
+          init_from_hash(hash)
+        else
+          init_from_array(args)
+        end
       end
-    end
 
-    private
+      private
 
-    # @param hash [Hash]
-    def init_from_hash(hash)
-      check_arguments_number!(hash)
-      hash.each do |key, val|
-        self.send key.to_sym, val
+      # @param hash [Hash]
+      def init_from_hash(hash)
+        check_arguments_number!(hash)
+        hash.each do |key, val|
+          self.send key.to_sym, val
+        end
       end
-    end
 
-    # @param arry [Array]
-    def init_from_array(arry)
-      check_arguments_number! arry
-      attributes.each_with_index do |key, i|
-        self.send "#{key}=".to_sym, arry.at(i)
+      # @param arry [Array]
+      def init_from_array(arry)
+        check_arguments_number! arry
+        attributes.each_with_index do |key, i|
+          self.send "#{key}=".to_sym, arry.at(i)
+        end
       end
-    end
 
-    def check_arguments_number!(args)
-      if args.size != attributes.size
-        raise ArgumentError, "wrong number of arguments(#{args.size} for #{attributes.size})"
+      def check_arguments_number!(args)
+        if args.size != attributes.size
+          raise ArgumentError, "wrong number of arguments(#{args.size} for #{attributes.size})"
+        end
       end
     end
+
   end
 end

data/lib/soybean/generators/class_generator.rb

@@ -6,7 +6,7 @@ module Soybean
         unless safevarname?(varname || attrname)
           raise ArgumentError.new("#{varname || attrname} seems to be unsafe")
         end
-        @attrdef << [attrname.underscore, writable, varname.underscore]
+        @attrdef << [attrname, writable, varname]
       end
 
       def def_classvar(var, value)
@@ -19,7 +19,7 @@ module Soybean
 
       def def_method(name, *params)
         return if name == 'initialize'
-        super name.underscore, *params.map(&:underscore)
+        super name, *params
       end
 
       def dump
@@ -75,13 +75,14 @@ module Soybean
         if @baseclass
           "class #{name.last} < #{@baseclass}\n"
         else
-          "class #{name.last} < Soybean::ComplexType\n"
+          "class #{name.last}\n" <<
+              "  include Soybean::ComplexType\n\n"
         end
       end
 
       def accessors
         @attrdef.map do |attrname, *|
-          format("attr_accessor #{attrname.to_sym.inspect}\n", 2)
+          format("soap_attribute #{attrname.to_sym.inspect}\n", 2)
         end.join
       end
 

data/lib/soybean.rb

@@ -6,6 +6,8 @@ require 'active_support/deprecation'
 require 'active_support/dependencies'
 require 'active_support/dependencies/autoload'
 require 'active_support/core_ext/module/delegation'
+require 'active_support/concern'
+require 'core_ext/module'
 
 $:.unshift File.absolute_path(File.join(File.dirname(__FILE__), '..', 'vendor/soap4r'))
 

data/soybean.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{soybean}
-  s.version = "2.3.0"
+  s.version = "2.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Anton Sozontov"]
-  s.date = %q{2011-10-07}
+  s.date = %q{2011-10-10}
   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}
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "bin/soybean",
+    "lib/core_ext/module.rb",
     "lib/soybean.rb",
     "lib/soybean/cli.rb",
     "lib/soybean/complex_type.rb",

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

@@ -517,7 +517,7 @@ module Mapping
         elename = XSD::QName.new(default_ns, varname)
       end
       SchemaElementDefinition.new(
-        varname.underscore, mapped_class, elename, minoccurs, maxoccurs, as_any, as_array)
+        varname, mapped_class, elename, minoccurs, maxoccurs, as_any, as_array)
     end
   end
 

data/vendor/soap4r/wsdl/soap/mapping_registry_creator_support.rb

@@ -97,7 +97,7 @@ module MappingRegistryCreatorSupport
     else
       varname, name, type, occurrence = definition
       '[' + [
-        varname.dump.underscore,
+        varname.dump,
         dump_type(name, type),
         dump_occurrence(occurrence)
       ].compact.join(', ') + ']'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soybean
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-07 00:00:00.000000000 +04:00
+date: 2011-10-10 00:00:00.000000000 +04:00
 default_executable: soybean
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &4642340 !ruby/object:Gem::Requirement
+  requirement: &18254220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *4642340
+  version_requirements: *18254220
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &4641260 !ruby/object:Gem::Requirement
+  requirement: &18205360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *4641260
+  version_requirements: *18205360
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &4639600 !ruby/object:Gem::Requirement
+  requirement: &18202440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *4639600
+  version_requirements: *18202440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &4638200 !ruby/object:Gem::Requirement
+  requirement: &18201240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *4638200
+  version_requirements: *18201240
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &4637120 !ruby/object:Gem::Requirement
+  requirement: &18198720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *4637120
+  version_requirements: *18198720
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &4635500 !ruby/object:Gem::Requirement
+  requirement: &18170680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *4635500
+  version_requirements: *18170680
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &4634520 !ruby/object:Gem::Requirement
+  requirement: &18168680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *4634520
+  version_requirements: *18168680
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &4633360 !ruby/object:Gem::Requirement
+  requirement: &18165660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,7 +99,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *4633360
+  version_requirements: *18165660
 description: ! 'Generate soap web-services from you wsdl. Generate: all classes from
   xsd, and other.'
 email: a.sozontov@gmail.com
@@ -119,6 +119,7 @@ files:
 - Rakefile
 - VERSION
 - bin/soybean
+- lib/core_ext/module.rb
 - lib/soybean.rb
 - lib/soybean/cli.rb
 - lib/soybean/complex_type.rb
@@ -316,7 +317,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1409596823364250190
+      hash: -2874083597917324875
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: