soybean 2.0.1 → 2.1.0

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.1.0

data/bin/soybean

@@ -9,22 +9,32 @@ require 'soybean'
 
 class Soybean::CLI < Thor
   include Thor::Actions
+  class_options :quiet => :boolean, :force => :boolean, :pretend => :boolean
 
-  desc "types file_path.xsd", "Generate Ruby classes for xsd-schema from file_path.xsd"
-  method_options :quiet => :boolean, :force => :boolean
+  desc "types [PATH_TO_XSD]", "Generate Ruby classes for xsd-schema from file_path.xsd"
   def types(location, destination = '.')
     Soybean::Generators::TypesGenerator.new(URI.parse(location)).generate do |filename, content|
       create_file File.join(destination, filename), content, options
     end
   end
 
-  desc "service [PATH_TO_WSDL] [DESTINATION_DIR]", "Generate Ruby classes from WSDL"
-  method_options :quiet => :boolean, :force => :boolean
-  def service(wsdl, destination_dir)
-    Soybean::Generators::ServiceGenerator.new(destination_dir, wsdl).generate do |filename, content|
+  desc "service [PATH_TO_WSDL] [DESTINATION_DIR]", "Generate classes for WebService from WSDL"
+  def service(wsdl, dir)
+    Soybean::Generators::ServiceGenerator.new(dir, wsdl, spec_dir(dir)).generate do |filename, content|
       create_file filename, content, options
     end
   end
+
+  no_tasks do
+    def spec_dir(dir)
+      default_spec_dir = "spec/#{dir}/models"
+      if options[:force]
+        default_spec_dir
+      else
+        ask("Spec directory: '#{default_spec_dir}'? ").presence || default_spec_dir
+      end
+    end
+  end
 end
 
 Soybean::CLI.start

data/lib/soybean/generators/base_generator.rb

@@ -2,6 +2,10 @@ module Soybean
   module Generators
     module BaseGenerator
 
+      def fullpath(basedir)
+        File.join(basedir, dir, filename)
+      end
+
       def filename
         "#{name}.rb"
       end

data/lib/soybean/generators/interface_generator.rb

@@ -3,12 +3,6 @@ require 'wsdl/soap/servant_skelton_creator'
 module Soybean
   module Generators
     class InterfaceGenerator
-      class InterfaceCreator < WSDL::SOAP::ServantSkeltonCreator
-        def mapped_class_basename(*)
-          (@definitions.name.name.gsub(/Service$/, 'Interface') rescue 'BaseInterface')
-        end
-      end
-
       include BaseGenerator
 
       attr_reader :name
@@ -23,7 +17,7 @@ module Soybean
       end
 
       def generate
-        InterfaceCreator.new(@wsdl, WSDL::SOAP::ClassNameCreator.new).dump
+        InterfaceBuilder.new(@wsdl, WSDL::SOAP::ClassNameCreator.new).dump
       end
 
     end

data/lib/soybean/generators/model_generator.rb

@@ -15,9 +15,16 @@ module Soybean
       end
 
       def generate
-        "class %s < %sInterface\nend" % [@name.camelize, @name.camelize.gsub(/Service$/,'')]
+        "class #{class_name} < #{interface_name}\nend"
       end
 
+      def class_name
+        @name.camelize
+      end
+
+      def interface_name
+        @name.camelize.gsub(/Service$/,'Interface')
+      end
     end
   end
 end

data/lib/soybean/generators/model_spec_generator.rb

@@ -0,0 +1,39 @@
+module Soybean
+  module Generators
+    class ModelSpecGenerator
+      include BaseGenerator
+
+      attr_reader :name
+
+      # @param model [ModelGenerator]
+      def initialize(model, spec_dir)
+        @model, @spec_dir = model, spec_dir
+        @name = model.name
+      end
+
+      def fullpath(basedir)
+        File.join(dir, filename)
+      end
+
+      def dir
+        @spec_dir
+      end
+
+      def generate
+        source = File.expand_path("../templates/model_spec.rb", __FILE__)
+        context = instance_eval('binding')
+        content = ERB.new(::File.binread(source), nil, '-').result(context)
+        content
+      end
+
+      def class_name
+        @model.class_name
+      end
+
+      def interface_name
+        @model.interface_name
+      end
+
+    end
+  end
+end

data/lib/soybean/generators/service_generator.rb

@@ -3,9 +3,10 @@ module Soybean
     class ServiceGenerator
       attr_reader :path, :wsdl_location, :wsdl
 
-      def initialize(path, wsdl)
-        @path, @wsdl_location = Pathname.new(path), wsdl
+      def initialize(path, wsdl, spec_dir)
+        @path, @wsdl_location = path, wsdl
         @wsdl = import_wsdl
+        @spec_dir = spec_dir
         @schemes = @wsdl.importedschema.keys
       end
 
@@ -14,21 +15,25 @@ module Soybean
       end
 
       def generate
-        (schemes + mappings + interface + model).map do |generator|
-          yield path.join(generator.dir, generator.filename), generator.generate
+        (schemes + mappings + interface + model + specs).map do |generator|
+          yield generator.fullpath(path), generator.generate
         end
       end
 
       def mappings
-        schemes.map { |gen| MappingGenerator.new(gen.xsd) }
+        @mappings ||= schemes.map { |gen| MappingGenerator.new(gen.xsd) }
       end
 
       def interface
-        [InterfaceGenerator.new(@wsdl)]
+        @interface ||= [InterfaceGenerator.new(@wsdl)]
       end
 
       def model
-        [ModelGenerator.new(@wsdl)]
+        @model ||= [ModelGenerator.new(@wsdl)]
+      end
+
+      def specs
+        @specs ||= model.map { |m| ModelSpecGenerator.new(m, @spec_dir) }
       end
 
       protected

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

@@ -0,0 +1,14 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe <%= class_name %> do
+
+  it 'should be subclass of <%= interface_name %>' do
+    <%= class_name %>.should < <%= interface_name %>
+  end
+
+  it 'should overload all interface methods (actions)' do
+    <%= class_name %>.actions.should eql <%= interface_name %>.actions
+  end
+
+end

data/lib/soybean/interface.rb

@@ -0,0 +1,14 @@
+module Soybean
+  class Interface
+    class_attribute :interfaces, :instance_reader => false, :instance_writer => false
+
+    def self.inherited(subclass)
+      self.interfaces ||= []
+      self.interfaces << subclass if subclass.superclass == Soybean::Interface
+    end
+
+    def self.actions
+      self.instance_methods - Object.instance_methods
+    end
+  end
+end

data/lib/soybean/interface_builder.rb

@@ -0,0 +1,74 @@
+module Soybean
+  class InterfaceBuilder
+    include WSDL::SOAP::ClassDefCreatorSupport
+    include XSD::CodeGen::GenSupport
+
+    attr_reader :definitions
+
+    def initialize(definitions, name_creator, modulepath = nil)
+      @definitions = definitions
+      @name_creator = name_creator
+      @modulepath = modulepath
+    end
+
+    def dump(porttype = nil)
+      result = ""
+      if @modulepath
+        result << "\n"
+        modulepath = @modulepath.respond_to?(:lines) ? @modulepath.lines : @modulepath # RubyJedi: compatible with Ruby 1.8.6 and above
+        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
+      if @modulepath
+        result << "\n\n"
+        modulepath = @modulepath.respond_to?(:lines) ? @modulepath.lines : @modulepath # RubyJedi: compatible with Ruby 1.8.6 and above
+        result << modulepath.collect { |ele| "end" }.join("; ")
+        result << "\n"
+      end
+      result
+    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')
+      element_definitions = @definitions.collect_elements
+      binding = porttype.find_binding
+      if binding
+        binding.operations.each do |op_bind|
+          operation = op_bind.find_operation
+          if operation.nil?
+            warn("operation not found for binding: #{op_bind}")
+            next
+          end
+          name = assigned_method[op_bind.boundid] || operation.name
+          methodname = safemethodname(name)
+          input = operation.input
+          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)
+        end
+      end
+      c.dump
+    end
+
+  end
+end

data/soybean.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{soybean}
-  s.version = "2.0.1"
+  s.version = "2.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Anton Sozontov"]
-  s.date = %q{2011-09-29}
+  s.date = %q{2011-09-30}
   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}
@@ -36,17 +36,16 @@ Gem::Specification.new do |s|
     "lib/soybean/generators/interface_generator.rb",
     "lib/soybean/generators/mapping_generator.rb",
     "lib/soybean/generators/model_generator.rb",
+    "lib/soybean/generators/model_spec_generator.rb",
     "lib/soybean/generators/service_generator.rb",
+    "lib/soybean/generators/templates/model_spec.rb",
     "lib/soybean/generators/types_generator.rb",
+    "lib/soybean/interface.rb",
+    "lib/soybean/interface_builder.rb",
     "lib/soybean/literal_mapping_registry_creator.rb",
     "soybean.gemspec",
-    "spec/services/interfaces/get_registrars_interface.rb",
-    "spec/services/mappings/base.rb",
-    "spec/services/mappings/get_registrars.rb",
-    "spec/services/models/get_registrars_service.rb",
-    "spec/services/types/get_registrars.rb",
-    "spec/services/types/type.rb",
     "spec/soybean_spec.rb",
+    "spec/spec/services/models/get_registrars_service.rb",
     "spec/spec_helper.rb",
     "vendor/soap4r/soap/attachment.rb",
     "vendor/soap4r/soap/attrproxy.rb",

data/spec/spec/services/models/get_registrars_service.rb

@@ -0,0 +1,14 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe GetRegistrarsService do
+
+  it 'should be subclass of GetRegistrarsInterface' do
+    GetRegistrarsService.should < GetRegistrarsInterface
+  end
+
+  it 'should overload all interface methods (actions)' do
+    GetRegistrarsService.actions.should eql GetRegistrarsInterface.actions
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soybean
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-29 00:00:00.000000000 +04:00
+date: 2011-09-30 00:00:00.000000000 +04:00
 default_executable: soybean
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &18303280 !ruby/object:Gem::Requirement
+  requirement: &12517640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18303280
+  version_requirements: *12517640
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &18295660 !ruby/object:Gem::Requirement
+  requirement: &12516520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *18295660
+  version_requirements: *12516520
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &18241960 !ruby/object:Gem::Requirement
+  requirement: &12514240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18241960
+  version_requirements: *12514240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &18238220 !ruby/object:Gem::Requirement
+  requirement: &12512980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *18238220
+  version_requirements: *12512980
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &18227840 !ruby/object:Gem::Requirement
+  requirement: &12511420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *18227840
+  version_requirements: *12511420
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &18226600 !ruby/object:Gem::Requirement
+  requirement: &12510600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *18226600
+  version_requirements: *12510600
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &18223680 !ruby/object:Gem::Requirement
+  requirement: &12509700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *18223680
+  version_requirements: *12509700
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &18221380 !ruby/object:Gem::Requirement
+  requirement: &12508820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,7 +99,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18221380
+  version_requirements: *12508820
 description: ! 'Generate soap web-services from you wsdl. Generate: all classes from
   xsd, and other.'
 email: a.sozontov@gmail.com
@@ -127,17 +127,16 @@ files:
 - lib/soybean/generators/interface_generator.rb
 - lib/soybean/generators/mapping_generator.rb
 - lib/soybean/generators/model_generator.rb
+- lib/soybean/generators/model_spec_generator.rb
 - lib/soybean/generators/service_generator.rb
+- lib/soybean/generators/templates/model_spec.rb
 - lib/soybean/generators/types_generator.rb
+- lib/soybean/interface.rb
+- lib/soybean/interface_builder.rb
 - lib/soybean/literal_mapping_registry_creator.rb
 - soybean.gemspec
-- spec/services/interfaces/get_registrars_interface.rb
-- spec/services/mappings/base.rb
-- spec/services/mappings/get_registrars.rb
-- spec/services/models/get_registrars_service.rb
-- spec/services/types/get_registrars.rb
-- spec/services/types/type.rb
 - spec/soybean_spec.rb
+- spec/spec/services/models/get_registrars_service.rb
 - spec/spec_helper.rb
 - vendor/soap4r/soap/attachment.rb
 - vendor/soap4r/soap/attrproxy.rb
@@ -314,7 +313,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4352177832362837691
+      hash: -1435385047002182519
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: