soybean 2.1.3 → 2.1.4

data/VERSION

@@ -1 +1 @@
-2.1.3
+2.1.4

data/lib/soybean/generators/model_generator.rb

@@ -3,7 +3,7 @@ module Soybean
     class ModelGenerator
       include BaseGenerator
 
-      attr_reader :name
+      attr_reader :name, :wsdl
 
       def initialize(wsdl)
         @wsdl = wsdl

data/lib/soybean/generators/model_spec_generator.rb

@@ -26,6 +26,10 @@ module Soybean
         content
       end
 
+      def actions
+        @actions ||= InterfaceBuilder.new(@model.wsdl, WSDL::SOAP::ClassNameCreator.new).actions
+      end
+
       def class_name
         @model.class_name
       end

data/lib/soybean/generators/templates/model_spec.rb

@@ -11,4 +11,12 @@ describe <%= class_name %> do
     <%= class_name %>.actions.should eql <%= interface_name %>.actions
   end
 
+  context 'actions' do
+    <% actions.each do |action, params| %>
+    it '#<%= action %> should not raise NotImplementedError' do
+      expect { subject.send action<%= params ? ', stub' * params.size : '' %> }.to_not raise_error(NotImplementedError)
+    end
+    <% end %>
+  end
+
 end

data/lib/soybean/interface_builder.rb

@@ -9,9 +9,10 @@ module Soybean
       @definitions = definitions
       @name_creator = name_creator
       @modulepath = modulepath
+      @porttype = @definitions.porttypes.first
     end
 
-    def dump(porttype = nil)
+    def dump
       result = ""
       if @modulepath
         result << "\n"
@@ -19,14 +20,7 @@ module Soybean
         result << modulepath.collect { |ele| "module #{ele}" }.join("; ")
         result << "\n\n"
       end
-      if porttype.nil?
-        @definitions.porttypes.each do |porttype|
-          result << dump_porttype(porttype)
-          result << "\n"
-        end
-      else
-        result << dump_porttype(porttype)
-      end
+      result << dump_porttype
       if @modulepath
         result << "\n\n"
         modulepath = @modulepath.respond_to?(:lines) ? @modulepath.lines : @modulepath # RubyJedi: compatible with Ruby 1.8.6 and above
@@ -40,19 +34,11 @@ module Soybean
       (@definitions.name.name.gsub(/Service$/, '') rescue 'Base') + 'Interface'
     end
 
-    private
-
-    def dump_porttype(porttype)
-      assigned_method = collect_assigned_method(@definitions, porttype.name, @modulepath)
-      class_name = mapped_class_basename(porttype.name, @modulepath)
-      c = XSD::CodeGen::ClassDef.new(class_name, 'Soybean::Interface')
-      methoddef = WSDL::SOAP::MethodDefCreator.new(@definitions, @name_creator, @modulepath, {}).dump(porttype.name)
-      c.def_code %Q{Methods = [\n#{methoddef.gsub(/^/, "  ")}\n]}
-
-      element_definitions = @definitions.collect_elements
-      binding = porttype.find_binding
+    def actions
+      assigned_method = collect_assigned_method(@definitions, @porttype.name, @modulepath)
+      binding = @porttype.find_binding
       if binding
-        binding.operations.each do |op_bind|
+        binding.operations.map do |op_bind|
           operation = op_bind.find_operation
           if operation.nil?
             warn("operation not found for binding: #{op_bind}")
@@ -64,18 +50,68 @@ module Soybean
           params = input.find_message.parts.collect { |part|
             safevarname(part.name)
           }
-          m = XSD::CodeGen::MethodDef.new(methodname, params) do
-            <<-EOD
-              p [#{params.join(", ")}]
-              raise NotImplementedError.new
-            EOD
-          end
-          m.comment = dump_method_signature(methodname, operation, element_definitions)
-          c.add_method(m)
+          [methodname.underscore, params, operation]
+        end
+      else
+        []
+      end
+    end
+
+    private
+
+    def dump_porttype
+      class_name = mapped_class_basename(@porttype.name, @modulepath)
+      c = XSD::CodeGen::ClassDef.new(class_name, 'Soybean::Interface')
+      methoddef = MethodDefCreator.new(@definitions, @name_creator, @modulepath, {}).dump(@porttype.name)
+      c.def_code %Q{Methods = [\n#{methoddef.gsub(/^/, "  ")}\n]}
+
+      element_definitions = @definitions.collect_elements
+      actions.each do |method_name, params, operation|
+        m = XSD::CodeGen::MethodDef.new(method_name, params) do
+          <<-EOD
+            p [#{params.join(", ")}]
+            raise NotImplementedError.new
+          EOD
         end
+        m.comment = dump_method_signature(method_name, operation, element_definitions)
+        c.add_method(m)
       end
+
       c.dump
     end
 
+    class MethodDefCreator < WSDL::SOAP::MethodDefCreator
+      private
+      def dump_method(mdef)
+        style = mdef.style
+        inputuse = mdef.inputuse
+        outputuse = mdef.outputuse
+        paramstr = param2str(mdef.parameters)
+        if paramstr.empty?
+          paramstr = '[]'
+        else
+          paramstr = "[ " << paramstr.split(/\r?\n/).join("\n    ") << " ]"
+        end
+        definitions = <<__EOD__
+#{ndq(mdef.soapaction)},
+  #{dq(mdef.name).underscore},
+  #{paramstr},
+  { :request_style =>  #{nsym(style)}, :request_use =>  #{nsym(inputuse)},
+    :response_style => #{nsym(style)}, :response_use => #{nsym(outputuse)},
+    :faults => #{mdef.faults.inspect} }
+__EOD__
+        if style == :rpc
+          assign_const(mdef.qname.namespace, 'Ns')
+          return <<__EOD__
+[ #{dqname(mdef.qname)},
+  #{definitions}]
+__EOD__
+        else
+          return <<__EOD__
+[ #{definitions}]
+__EOD__
+        end
+      end
+    end
   end
 end

data/soybean.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{soybean}
-  s.version = "2.1.3"
+  s.version = "2.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Anton Sozontov"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soybean
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable: soybean
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &18193120 !ruby/object:Gem::Requirement
+  requirement: &18250000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18193120
+  version_requirements: *18250000
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &18192460 !ruby/object:Gem::Requirement
+  requirement: &18248200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *18192460
+  version_requirements: *18248200
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &18191520 !ruby/object:Gem::Requirement
+  requirement: &18247640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18191520
+  version_requirements: *18247640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &18190800 !ruby/object:Gem::Requirement
+  requirement: &18246900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *18190800
+  version_requirements: *18246900
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &18190100 !ruby/object:Gem::Requirement
+  requirement: &18246020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *18190100
+  version_requirements: *18246020
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &18189280 !ruby/object:Gem::Requirement
+  requirement: &18230280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *18189280
+  version_requirements: *18230280
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &18188500 !ruby/object:Gem::Requirement
+  requirement: &18229440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *18188500
+  version_requirements: *18229440
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &18187740 !ruby/object:Gem::Requirement
+  requirement: &18228860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,7 +99,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18187740
+  version_requirements: *18228860
 description: ! 'Generate soap web-services from you wsdl. Generate: all classes from
   xsd, and other.'
 email: a.sozontov@gmail.com
@@ -312,7 +312,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3623905933430620017
+      hash: 1732627524973815179
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: