soybean 2.1.5 → 2.2.0

data/Gemfile

@@ -3,6 +3,7 @@ source "http://rubygems.org"
 gem 'thor'
 gem 'activesupport', '~> 3.1'
 gem 'i18n'
+#gem "soap4r-middleware-192", "~> 0.8.2", :require => "soap4r-middleware"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/VERSION

@@ -1 +1 @@
-2.1.5
+2.2.0

data/bin/soybean

@@ -1,54 +1,10 @@
 #!/usr/bin/env ruby
-$:.unshift File.expand_path('../vendor', File.dirname(__FILE__))
-$:.unshift File.expand_path('../vendor/soap4r', File.dirname(__FILE__))
-$:.unshift File.expand_path('../lib', File.dirname(__FILE__))
-require 'thor'
-require 'thor/actions'
-require 'soybean'
-
-
-class Soybean::CLI < Thor
-  include Thor::Actions
-  class_options :quiet => :boolean, :force => :boolean, :pretend => :boolean
-  class_option :remove, :type => :boolean, :aliases => [:undo]
-
-  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|
-      if options[:remove]
-        remove_file File.join(destination, filename), options
-      else
-        create_file File.join(destination, filename), content, options
-      end
-    end
-  end
 
-  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|
-      if options[:remove]
-        remove_file filename, options
-      else
-        create_file filename, content, options
-      end
-    end
-  end
-
-  desc "version", "Show current version"
-  def version
-    puts File.read File.expand_path('../../VERSION', __FILE__)
-  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
+if File.exists?(File.join(File.expand_path('../..', __FILE__), '.git'))
+  $:.unshift File.expand_path('../lib', File.dirname(__FILE__))
 end
 
+require 'soybean'
+require 'soybean/cli'
+
 Soybean::CLI.start

data/lib/soybean/cli.rb

@@ -0,0 +1,52 @@
+require 'thor'
+require 'thor/actions'
+
+class Soybean::CLI < Thor
+  include Thor::Actions
+  class_options :quiet => :boolean, :force => :boolean, :pretend => :boolean
+  class_option :remove, :type => :boolean, :aliases => [:undo]
+
+  map "-v" => :version
+
+
+  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|
+      if options[:remove]
+        remove_file File.join(destination, filename), options
+      else
+        create_file File.join(destination, filename), content, options
+      end
+    end
+  end
+
+  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|
+      if options[:remove]
+        remove_file filename, options
+      else
+        create_file filename, content, options
+      end
+    end
+  end
+
+  desc "version", "Show current version"
+
+  def version
+    puts Soybean::VERSION
+  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

data/lib/soybean/generators/mapping_generator.rb

@@ -9,9 +9,10 @@ module Soybean
 
       attr_reader :name
 
-      def initialize(schema)
+      def initialize(schema, wsdl)
         @schema = schema
-        @name = name_from_namespace(schema.targetnamespace)
+        @wsdl = wsdl
+        @name = namespace.underscore
         @name_creator = WSDL::SOAP::ClassNameCreator.new
         @defined_const = {}
       end
@@ -34,7 +35,13 @@ module Soybean
         end
 
         registry = ModuleDef.new("Mappings", [m])
-        registry.def_require("soap/mapping")
+
+        @schema.importedschema.values.map(&:targetnamespace).map do |ns|
+          registry.def_require('mappings/'+URI.parse(ns).path[1..-2].underscore)
+        end
+
+        registry.def_require(type_path)
+
         registry.def_code('EncodedRegistry ||= ::SOAP::Mapping::EncodedRegistry.new')
         registry.def_code('LiteralRegistry ||= ::SOAP::Mapping::LiteralRegistry.new')
 
@@ -46,11 +53,11 @@ module Soybean
       end
 
       def literal_creator
-        LiteralMappingRegistryCreator.new(@schema, @name_creator, 'Types', @defined_const, mapping_cache[:literal])
+        LiteralMappingRegistryCreator.new(@schema, @name_creator, module_name, @defined_const, mapping_cache[:literal])
       end
 
       def encoded_creator
-        EncodedMappingRegistryCreator.new(@schema, @name_creator, 'Types', @defined_const, mapping_cache[:encoded])
+        EncodedMappingRegistryCreator.new(@schema, @name_creator, module_name, @defined_const, mapping_cache[:encoded])
       end
 
       def name_from_namespace(ns)
@@ -58,6 +65,18 @@ module Soybean
         (name || 'base').underscore.gsub(/_service$/, '')
       end
 
+      def namespace
+        URI.parse(@schema.targetnamespace).path[1..-2]
+      end
+
+      def type_path
+        "types/" + namespace.underscore
+      end
+
+      def module_name
+        "::" + namespace.camelize
+      end
+
       class ModuleDef < XSD::CodeGen::ModuleDef
         def initialize(name, modules = [])
           super(name)
@@ -100,6 +119,40 @@ module Soybean
           buf.gsub(/^\s+$/, '')
         end
       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
 end

data/lib/soybean/generators/middleware_generator.rb

@@ -0,0 +1,37 @@
+module Soybean
+  module Generators
+    class MiddlewareGenerator
+      include BaseGenerator
+
+      attr_reader :name, :model
+
+      delegate :wsdl, :to => :model
+      delegate :class_name, :interface_name, :to => :model, :prefix => true
+
+      def initialize(model)
+        @model = model
+        @name = (wsdl.name.name.underscore.gsub(/service$/, '') rescue 'base') + 'middleware'
+      end
+
+      def dir
+        'middlewares'
+      end
+
+      def generate
+        source = File.expand_path("../templates/middleware.rb", __FILE__)
+        context = instance_eval('binding')
+        content = ERB.new(::File.binread(source), nil, '-').result(context)
+        content
+      end
+
+      def class_name
+        @name.camelize
+      end
+
+      def endpoint_path
+        model_class_name
+      end
+
+    end
+  end
+end

data/lib/soybean/generators/model_generator.rb

@@ -7,14 +7,17 @@ module Soybean
 
       def initialize(wsdl)
         @wsdl = wsdl
-        @name = (wsdl.name.name.underscore.gsub(/service$/,'') rescue 'base') + 'service'
+        @name = (wsdl.name.name.underscore.gsub(/service$/, '') rescue 'base') + 'service'
       end
 
       def dir
-        'models'
+        ''
       end
 
       def generate
+        @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"
       end
 
@@ -23,7 +26,7 @@ module Soybean
       end
 
       def interface_name
-        @name.camelize.gsub(/Service$/,'Interface')
+        @name.camelize.gsub(/Service$/, 'Interface')
       end
     end
   end

data/lib/soybean/generators/service_generator.rb

@@ -15,13 +15,13 @@ module Soybean
       end
 
       def generate
-        (schemes + mappings + interface + model + specs).map do |generator|
+        (schemes + mappings + interface + model + specs + middleware).map do |generator|
           yield generator.fullpath(path), generator.generate
         end
       end
 
       def mappings
-        @mappings ||= schemes.map { |gen| MappingGenerator.new(gen.xsd) }
+        @mappings ||= schemes.map { |gen| MappingGenerator.new(gen.xsd, @wsdl) }
       end
 
       def interface
@@ -32,6 +32,10 @@ module Soybean
         @model ||= [ModelGenerator.new(@wsdl)]
       end
 
+      def middleware
+        @middleware ||= model.map { |m| MiddlewareGenerator.new(m) }
+      end
+
       def specs
         @specs ||= model.map { |m| ModelSpecGenerator.new(m, @spec_dir) }
       end

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

@@ -0,0 +1,39 @@
+module Middlewares
+  class <%= class_name %> < Soap4r::Middleware::Base
+    setup do
+      self.endpoint = %r(^/<%= model_class_name %>)
+      service = <%= model_class_name %>.new
+      <%= model_interface_name %>::Methods.each do |definitions|
+        opt = definitions.last
+        if opt[:request_style] == :document
+          self.router.add_document_operation(service, *definitions)
+        else
+          self.router.add_rpc_operation(service, *definitions)
+        end
+      end
+      self.mapping_registry = Mappings::EncodedRegistry
+      self.literal_mapping_registry = Mappings::LiteralRegistry
+    end
+
+    def call(env)
+      begin
+        if env['PATH_INFO'].match(self.class.endpoint)
+          handle(env)
+        else
+          # we can act as both a middleware and an app
+          @app ?
+              @app.call(env) :
+              [404, {"Content-Type" => "text/plain"}, ["404 - Not Found"]]
+        end
+      rescue => e
+        puts e.message
+        xml = Nokogiri::XML(e.message)
+
+        #xml.search('faultactor, detail, ivars, item').each { |elem| elem.remove }
+
+        [200, {'Allow' => 'POST',
+               'Content-Type' => 'text/xml'}, [xml.to_s]]
+      end
+    end
+  end
+end

data/lib/soybean/generators/types_generator.rb

@@ -8,9 +8,9 @@ module Soybean
       attr_reader :name
 
       def initialize(url)
-        @name = xsd_name(url.path)
         @definitions = import_scheme(url)
-        super(@definitions, WSDL::SOAP::ClassNameCreator.new, 'Types')
+        @name = type_path
+        super(@definitions, WSDL::SOAP::ClassNameCreator.new, module_name)
       end
 
       def xsd
@@ -49,14 +49,6 @@ module Soybean
 
       protected
 
-      def import_scheme(url)
-        WSDL::XMLSchema::Importer.import(url.path)
-      end
-
-      def xsd_name(path)
-        Pathname.new(path).basename('.*').to_s.underscore.gsub(/_service$/, '')
-      end
-
       def with_cache
         result = yield
         if !classes_cache.key?(result.name) && result

data/lib/soybean/interface_builder.rb

@@ -62,8 +62,6 @@ module Soybean
     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|
@@ -77,6 +75,9 @@ module Soybean
         c.add_method(m)
       end
 
+      methoddef = MethodDefCreator.new(@definitions, @name_creator, @modulepath, {}).dump(@porttype.name)
+      c.def_code %Q{Methods = [\n#{methoddef.gsub(/^/, "  ")}\n]}
+
       c.dump
     end
 

data/lib/soybean.rb

@@ -5,10 +5,14 @@ require 'active_support/core_ext/array/grouping'
 require 'active_support/deprecation'
 require 'active_support/dependencies'
 require 'active_support/dependencies/autoload'
+require 'active_support/core_ext/module/delegation'
+
+$:.unshift File.absolute_path(File.join(File.dirname(__FILE__), '..', 'vendor/soap4r'))
 
 ActiveSupport::Dependencies.autoload_paths << File.absolute_path(File.join(File.dirname(__FILE__), '..', 'vendor/soap4r'))
 ActiveSupport::Dependencies.autoload_paths << File.absolute_path(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 module Soybean
   extend ActiveSupport::Autoload
+  VERSION = File.read(File.expand_path('../../VERSION', __FILE__))
 end

data/soybean.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{soybean}
-  s.version = "2.1.5"
+  s.version = "2.2.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-30}
+  s.date = %q{2011-10-07}
   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}
@@ -29,15 +29,18 @@ Gem::Specification.new do |s|
     "VERSION",
     "bin/soybean",
     "lib/soybean.rb",
+    "lib/soybean/cli.rb",
     "lib/soybean/complex_type.rb",
     "lib/soybean/encoded_mapping_registry_creator.rb",
     "lib/soybean/generators/base_generator.rb",
     "lib/soybean/generators/class_generator.rb",
     "lib/soybean/generators/interface_generator.rb",
     "lib/soybean/generators/mapping_generator.rb",
+    "lib/soybean/generators/middleware_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/middleware.rb",
     "lib/soybean/generators/templates/model_spec.rb",
     "lib/soybean/generators/types_generator.rb",
     "lib/soybean/interface.rb",

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

@@ -42,42 +42,76 @@ module WSDL
         @defined_const = {}
       end
 
+      def padding
+        @padding ||= "  " * modulepath_split(@modulepath).size
+      end
+
+      def require_imported_types
+        @definitions.importedschema.values.map(&:targetnamespace).map do |ns|
+          "require 'types/#{type_path(ns)}'\n"
+        end.join
+      end
+
+      def include_imported_types
+        @definitions.importedschema.values.map(&:targetnamespace).map do |ns|
+          "include ::#{module_name(ns)}\n"
+        end.join
+      end
+
+      def import_scheme(url)
+        WSDL::XMLSchema::Importer.import(url.path)
+      end
+
+      def namespace(ns=@definitions.targetnamespace)
+        URI.parse(ns).path[1..-2]
+      end
+
+      def type_path(ns=@definitions.targetnamespace)
+        namespace(ns).underscore
+      end
+
+      def module_name(ns=@definitions.targetnamespace)
+        namespace(ns).camelize
+      end
+
       def dump(type = nil)
         result = "require 'xsd/qname'\n"
+
         # cannot use @modulepath because of multiple classes
         if @modulepath
           result << "\n"
-          result << modulepath_split(@modulepath).collect { |ele| "module #{ele}" }.join("; ")
+          result << modulepath_split(@modulepath).each_with_index.collect { |ele, i| ("  " * i) + "module #{ele}" }.join("\n")
           result << "\n\n"
         end
+        result << padding + include_imported_types
         str = dump_group(type)
         unless str.empty?
           result << "\n" unless result.empty?
-          result << str
+          result << str.gsub("\n", "\n#{padding}")
         end
         str = dump_complextype(type)
         unless str.empty?
           result << "\n" unless result.empty?
-          result << str
+          result << padding + str.gsub("\n", "\n#{padding}")
         end
-        str = dump_simpletype(type)
+        str = dump_simpletype(type).gsub("\n", "\n#{padding}")
         unless str.empty?
           result << "\n" unless result.empty?
-          result << str
+          result << padding + str.gsub("\n", "\n#{padding}")
         end
-        str = dump_element(type)
+        str = dump_element(type).gsub("\n", "\n#{padding}")
         unless str.empty?
           result << "\n" unless result.empty?
-          result << str
+          result << padding + str.gsub("\n", "\n#{padding}")
         end
-        str = dump_attribute(type)
+        str = dump_attribute(type).gsub("\n", "\n#{padding}")
         unless str.empty?
           result << "\n" unless result.empty?
-          result << str
+          result << padding + str.gsub("\n", "\n#{padding}")
         end
         if @modulepath
           result << "\n\n"
-          result << modulepath_split(@modulepath).collect { |ele| "end" }.join("; ")
+          result << modulepath_split(@modulepath).each_with_index.collect { |ele, i| ("  " * i) + "end" }.reverse.join("\n")
           result << "\n"
         end
         result

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

@@ -90,7 +90,7 @@ private
         @web_client = HTTPAccess2::Client
       rescue LoadError
         warn("Loading http-access2 failed.  Net/http is used.") if $DEBUG
-        require 'soap/netHttpClient'
+        require 'soap/net_http_client'
         @web_client = ::SOAP::NetHttpClient
       end
     end

data/vendor/soap4r/xsd/codegen/moduledef.rb

@@ -13,173 +13,178 @@ require 'xsd/codegen/commentdef'
 
 
 module XSD
-module CodeGen
+  module CodeGen
 
 
-class ModuleDef
-  include GenSupport
-  include CommentDef
+    class ModuleDef
+      include GenSupport
+      include CommentDef
 
-  attr_reader :name
-  attr_reader :innermodule
+      attr_reader :name
+      attr_reader :innermodule
 
-  def initialize(name)
-    @name = name
-    @comment = nil
-    @const = []
-    @code = []
-    @requirepath = []
-    @methoddef = []
-    @innermodule = []
-  end
+      def initialize(name)
+        @name = name
+        @comment = nil
+        @const = []
+        @code = []
+        @requirepath = []
+        @methoddef = []
+        @innermodule = []
+      end
 
-  def def_require(path)
-    @requirepath << path
-  end
+      def def_require(path)
+        @requirepath << path
+      end
 
-  def def_const(const, value)
-    unless safeconstname?(const)
-      raise ArgumentError.new("#{const} seems to be unsafe")
-    end
-    @const << [const, value]
-  end
+      def def_const(const, value)
+        unless safeconstname?(const)
+          raise ArgumentError.new("#{const} seems to be unsafe")
+        end
+        @const << [const, value]
+      end
 
-  def def_code(code)
-    @code << code
-  end
+      def def_code(code)
+        @code << code
+      end
 
-  def def_method(name, *params)
-    add_method(MethodDef.new(name, *params) { yield if block_given? }, :public)
-  end
-  alias def_publicmethod def_method
+      def def_method(name, *params)
+        add_method(MethodDef.new(name, *params) { yield if block_given? }, :public)
+      end
 
-  def def_protectedmethod(name, *params)
-    add_method(MethodDef.new(name, *params) { yield if block_given? },
-      :protected)
-  end
+      alias def_publicmethod def_method
 
-  def def_privatemethod(name, *params)
-    add_method(MethodDef.new(name, *params) { yield if block_given? }, :private)
-  end
+      def def_protectedmethod(name, *params)
+        add_method(MethodDef.new(name, *params) { yield if block_given? },
+                   :protected)
+      end
 
-  def add_method(m, visibility = :public)
-    @methoddef << [visibility, m]
-  end
+      def def_privatemethod(name, *params)
+        add_method(MethodDef.new(name, *params) { yield if block_given? }, :private)
+      end
 
-  def dump
-    buf = ""
-    unless @requirepath.empty?
-      buf << dump_requirepath 
-    end
-    buf << dump_emptyline unless buf.empty?
-    package = @name.split(/::/)[0..-2]
-    buf << dump_package_def(package) unless package.empty?
-    buf << dump_comment if @comment
-    buf << dump_module_def
-    spacer = false
-    unless @const.empty?
-      buf << dump_emptyline if spacer
-      spacer = true
-      buf << dump_const
-    end
-    unless @innermodule.empty?
-      buf << dump_emptyline # always add 1 empty line
-      spacer = true
-      buf << dump_innermodule
-    end
-    unless @code.empty?
-      buf << dump_emptyline if spacer
-      spacer = true
-      buf << dump_code
-    end
-    unless @methoddef.empty?
-      buf << dump_emptyline if spacer
-      spacer = true
-      buf << dump_methods
-    end
-    buf << dump_module_def_end
-    buf << dump_package_def_end(package) unless package.empty?
-    buf.gsub(/^\s+$/, '')
-  end
+      def add_method(m, visibility = :public)
+        @methoddef << [visibility, m]
+      end
 
-private
+      def dump
+        buf = ""
+        unless @requirepath.empty?
+          buf << dump_requirepath
+        end
+        buf << dump_emptyline unless buf.empty?
+        package = @name.split(/::/)[0..-2]
+        buf << dump_package_def(package) unless package.empty?
+        buf << dump_comment if @comment
+        buf << dump_module_def
+        spacer = false
+        unless @const.empty?
+          buf << dump_emptyline if spacer
+          spacer = true
+          buf << dump_const
+        end
+        unless @innermodule.empty?
+          buf << dump_emptyline # always add 1 empty line
+          spacer = true
+          buf << dump_innermodule
+        end
+        unless @code.empty?
+          buf << dump_emptyline if spacer
+          spacer = true
+          buf << dump_code
+        end
+        unless @methoddef.empty?
+          buf << dump_emptyline if spacer
+          spacer = true
+          buf << dump_methods
+        end
+        buf << dump_module_def_end
+        buf << dump_package_def_end(package) unless package.empty?
+        buf.gsub(/^\s+$/, '')
+      end
 
-  def dump_requirepath
-    format(
-      @requirepath.collect { |path|
-        %Q(require '#{path}')
-      }.join("\n")
-    )
-  end
+      private
 
-  def dump_const
-    dump_static(
-      @const.sort.collect { |var, value|
-        %Q(#{var} = #{dump_value(value)})
-      }.join("\n")
-    )
-  end
+      def dump_requirepath
+        format(
+            @requirepath.collect { |path|
+              %Q(require '#{path}')
+            }.join("\n")
+        )
+      end
 
-  def dump_innermodule
-    dump_static(
-      @innermodule.collect { |moduledef|
-        moduledef.dump
-      }.join("\n")
-    )
-  end
+      def dump_const
+        dump_static(
+            @const.sort.collect { |var, value|
+              %Q(#{var} = #{dump_value(value)})
+            }.join("\n")
+        )
+      end
 
-  def dump_code
-    dump_static(@code.join("\n"))
-  end
+      def dump_innermodule
+        dump_static(
+            @innermodule.collect { |moduledef|
+              moduledef.dump
+            }.join("\n")
+        )
+      end
 
-  def dump_static(str)
-    format(str, 2)
-  end
+      def dump_code
+        dump_static(@code.join("\n"))
+      end
 
-  def dump_methods
-    methods = {}
-    @methoddef.each do |visibility, method|
-      (methods[visibility] ||= []) << method
-    end
-    str = ""
-    [:public, :protected, :private].each do |visibility|
-      if methods[visibility]
-        str << "\n" unless str.empty?
-        str << visibility.to_s << "\n\n" unless visibility == :public
-        str << methods[visibility].collect { |m| format(m.dump, 2) }.join("\n")
+      def dump_static(str)
+        format(str, 2)
       end
-    end
-    str
-  end
 
-  def dump_value(value)
-    if value.respond_to?(:to_src)
-      value.to_src
-    else
-      value
-    end
-  end
+      def dump_methods
+        methods = {}
+        @methoddef.each do |visibility, method|
+          (methods[visibility] ||= []) << method
+        end
+        str = ""
+        [:public, :protected, :private].each do |visibility|
+          if methods[visibility]
+            str << "\n" unless str.empty?
+            str << visibility.to_s << "\n\n" unless visibility == :public
+            str << methods[visibility].collect { |m| format(m.dump, 2) }.join("\n")
+          end
+        end
+        str
+      end
 
-  def dump_package_def(package)
-    format(package.collect { |ele| "module #{ele}" }.join("; ")) + "\n\n"
-  end
+      def dump_value(value)
+        if value.respond_to?(:to_src)
+          value.to_src
+        else
+          value
+        end
+      end
 
-  def dump_package_def_end(package)
-    "\n\n" + format(package.collect { |ele| "end" }.join("; "))
-  end
+      def padding(package)
+        @padding ||= "  " * package.size
+      end
 
-  def dump_module_def
-    name = @name.to_s.split(/::/)
-    format("module #{name.last}")
-  end
+      def dump_package_def(package)
+        format package.each_with_index.collect { |ele, i| ("  " * i) + "module #{ele}" }.join("\n")
+      end
 
-  def dump_module_def_end
-    format("end")
-  end
-end
+      def dump_package_def_end(package)
+        format package.each_with_index.collect { |_, i| ("  " * i) + "end" }.reverse.join("\n")
+      end
 
+      def dump_module_def
+        name = @name.to_s.split(/::/)
+        format("module #{name.last}")
+      end
 
-end
+      def dump_module_def_end
+        format("end")
+      end
+    end
+
+
+  end
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soybean
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-30 00:00:00.000000000 +04:00
+date: 2011-10-07 00:00:00.000000000 +04:00
 default_executable: soybean
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &19607540 !ruby/object:Gem::Requirement
+  requirement: &11455800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19607540
+  version_requirements: *11455800
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &19606400 !ruby/object:Gem::Requirement
+  requirement: &11454320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *19606400
+  version_requirements: *11454320
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &19604300 !ruby/object:Gem::Requirement
+  requirement: &11449680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19604300
+  version_requirements: *11449680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &19602840 !ruby/object:Gem::Requirement
+  requirement: &11448500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *19602840
+  version_requirements: *11448500
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &19601780 !ruby/object:Gem::Requirement
+  requirement: &11443520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *19601780
+  version_requirements: *11443520
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &19600900 !ruby/object:Gem::Requirement
+  requirement: &11442440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *19600900
+  version_requirements: *11442440
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &19599740 !ruby/object:Gem::Requirement
+  requirement: &11441320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *19599740
+  version_requirements: *11441320
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &19599100 !ruby/object:Gem::Requirement
+  requirement: &11440340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,7 +99,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19599100
+  version_requirements: *11440340
 description: ! 'Generate soap web-services from you wsdl. Generate: all classes from
   xsd, and other.'
 email: a.sozontov@gmail.com
@@ -120,15 +120,18 @@ files:
 - VERSION
 - bin/soybean
 - lib/soybean.rb
+- lib/soybean/cli.rb
 - lib/soybean/complex_type.rb
 - lib/soybean/encoded_mapping_registry_creator.rb
 - lib/soybean/generators/base_generator.rb
 - lib/soybean/generators/class_generator.rb
 - lib/soybean/generators/interface_generator.rb
 - lib/soybean/generators/mapping_generator.rb
+- lib/soybean/generators/middleware_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/middleware.rb
 - lib/soybean/generators/templates/model_spec.rb
 - lib/soybean/generators/types_generator.rb
 - lib/soybean/interface.rb
@@ -312,7 +315,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3755334220841527446
+      hash: -1482793293416004037
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: