soybean 2.2.2 → 2.3.0

data/VERSION

@@ -1 +1 @@
-2.2.2
+2.3.0

data/lib/soybean/cli.rb

@@ -10,7 +10,6 @@ class Soybean::CLI < Thor
 
 
   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]
@@ -22,27 +21,43 @@ class Soybean::CLI < Thor
   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
+    opts = options
+    raise 'PATH_TO_WSDL should be a exists wsdl file or directory with wsdl`s' unless File.exists? wsdl
+    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
+      generate_service(full_path, dir, opts)
     end
   end
 
   desc "version", "Show current version"
-
   def version
     puts Soybean::VERSION
   end
 
   no_tasks do
+    def generate_service(wsdl, dir, options)
+      Soybean::Generators::ServiceGenerator.new(dir, wsdl, spec_dir(dir)).generate do |filename, content, generator|
+        opts = options
+        if generator.is_a? Soybean::Generators::ModelGenerator
+          opts = opts.merge(:skip => true, :force => false)
+        end
+        if opts[:remove]
+          remove_file filename, opts
+        else
+          create_file filename, content, opts
+        end
+      end
+    end
+
     def spec_dir(dir)
-      default_spec_dir = "spec/#{dir}/models"
-      if options[:force]
+      default_spec_dir = "spec/#{dir}"
+      if options[:force] || File.exists?(default_spec_dir)
         default_spec_dir
       else
         ask("Spec directory: '#{default_spec_dir}'? ").presence || default_spec_dir

data/lib/soybean/complex_type.rb

@@ -7,6 +7,13 @@ module Soybean
       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
     end
 

data/lib/soybean/generators/service_generator.rb

@@ -16,7 +16,7 @@ module Soybean
 
       def generate
         (schemes + mappings + interface + model + specs + middleware).map do |generator|
-          yield generator.fullpath(path), generator.generate
+          yield generator.fullpath(path), generator.generate, generator
         end
       end
 

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

@@ -1,5 +1,5 @@
 module Middlewares
-  class <%= class_name %> < Soap4r::Middleware::Base
+  class <%= class_name %> < Soybean::Middleware
     setup do
       self.endpoint = %r(^/<%= model_class_name %>)
       service = <%= model_class_name %>.new

data/lib/soybean/middleware.rb

@@ -0,0 +1,181 @@
+require 'soap/rpc/router'
+
+module Soybean
+  class Middleware
+    include SOAP
+
+    module ClassMethods
+      def setup
+        @router = ::SOAP::RPC::Router.new(self.class.name)
+        yield self
+      end
+
+      def router
+        @router
+      end
+
+      def endpoint=(regex)
+        @endpoint = regex
+      end
+
+      def endpoint
+        @endpoint
+      end
+
+      # SOAP interface
+
+      def mapping_registry
+        router.mapping_registry
+      end
+
+      def mapping_registry=(mapping_registry)
+        router.mapping_registry = mapping_registry
+      end
+
+      def literal_mapping_registry
+        router.literal_mapping_registry
+      end
+
+      def literal_mapping_registry=(literal_mapping_registry)
+        router.literal_mapping_registry = literal_mapping_registry
+      end
+
+      def generate_explicit_type
+        router.generate_explicit_type
+      end
+
+      def generate_explicit_type=(generate_explicit_type)
+        router.generate_explicit_type = generate_explicit_type
+      end
+
+      # servant entry interface
+
+      def add_rpc_servant(obj, namespace = self.default_namespace)
+        router.add_rpc_servant(obj, namespace)
+      end
+
+      alias add_servant add_rpc_servant
+
+      def add_headerhandler(obj)
+        router.add_headerhandler(obj)
+      end
+
+      alias add_rpc_headerhandler add_headerhandler
+
+      def filterchain
+        router.filterchain
+      end
+
+      # method entry interface
+
+      def add_rpc_method(obj, name, *param)
+        add_rpc_method_with_namespace_as(default_namespace, obj, name, name, *param)
+      end
+
+      alias add_method add_rpc_method
+
+      def add_rpc_method_as(obj, name, name_as, *param)
+        add_rpc_method_with_namespace_as(default_namespace, obj, name, name_as, *param)
+      end
+
+      alias add_method_as add_rpc_method_as
+
+      def add_rpc_method_with_namespace(namespace, obj, name, *param)
+        add_rpc_method_with_namespace_as(namespace, obj, name, name, *param)
+      end
+
+      alias add_method_with_namespace add_rpc_method_with_namespace
+
+      def add_rpc_method_with_namespace_as(namespace, obj, name, name_as, *param)
+        qname = XSD::QName.new(namespace, name_as)
+        soapaction = nil
+        param_def = SOAPMethod.derive_rpc_param_def(obj, name, *param)
+        router.add_rpc_operation(obj, qname, soapaction, name, param_def)
+      end
+
+      alias add_method_with_namespace_as add_rpc_method_with_namespace_as
+
+      def add_rpc_operation(receiver, qname, soapaction, name, param_def, opt = {})
+        router.add_rpc_operation(receiver, qname, soapaction, name, param_def, opt)
+      end
+
+      def add_document_operation(receiver, soapaction, name, param_def, opt = {})
+        router.add_document_operation(receiver, soapaction, name, param_def, opt)
+      end
+    end
+
+    extend ClassMethods
+
+    def initialize(app = nil)
+      @app = app
+    end
+
+    def call(env)
+      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) :
+            (return 404, {"Content-Type" => "text/plain"}, ["404 - Not Found"])
+      end
+    end
+
+    def handle(env)
+      # yeah, all soap calls are over POST
+      if env['REQUEST_METHOD'] != 'POST'
+        return 405, {
+            'Allow' => 'POST',
+            'Content-Type' => 'text/plain'}, ["405 - Method Not Allowed"]
+      end
+
+      conn_data = ::SOAP::StreamHandler::ConnectionData.new
+      setup_request(conn_data, env)
+      conn_data = self.class.router.route(conn_data)
+      status, headers, body = setup_response(conn_data, env)
+      [status, headers, body]
+    rescue
+      raise # TODO -- do we 500 right here, or let the exception bubble up?
+    end
+
+    def setup_request(conn_data, env)
+      # TODO: we're reading the whole input here, which kind of stinks if rack is
+      # reading from the client on demand. We can't just pass in the rack input
+      # object, since REXML needs an IO that responds to :eof? -- we'd need a
+      # wrapper IO-like object.
+      conn_data.receive_string = env['rack.input'].read
+      conn_data.receive_contenttype = env['CONTENT_TYPE']
+      conn_data.soapaction = parse_soapaction(env['HTTP_SOAPAction'])
+    end
+
+    def setup_response(conn_data, env)
+      status = 200
+      headers = {}
+      body = []
+      headers['content-type'] = conn_data.send_contenttype
+      # TODO: cookies?
+      if conn_data.is_nocontent
+        status = 202 # ACCEPTED
+      elsif conn_data.is_fault
+        # rather than sending the 500 here, let's bubble up the exception so the
+        # parent application can do with it what it will. The only downside is
+        # soap4r has already converted the exception into a soap response body at
+        # this point, which isn't what we want at all.
+        # maybe someday i'll re-parse the response or something. but not today.
+        raise conn_data.send_string
+      else
+        body << conn_data.send_string
+      end
+      return status, headers, body
+    end
+
+    def parse_soapaction(soapaction)
+      if !soapaction.nil? and !soapaction.empty?
+        if /\A"(.+)"\z/ =~ soapaction
+          return $1
+        end
+      end
+      nil
+    end
+  end
+end

data/soybean.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{soybean}
-  s.version = "2.2.2"
+  s.version = "2.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Anton Sozontov"]
@@ -46,6 +46,7 @@ Gem::Specification.new do |s|
     "lib/soybean/interface.rb",
     "lib/soybean/interface_builder.rb",
     "lib/soybean/literal_mapping_registry_creator.rb",
+    "lib/soybean/middleware.rb",
     "soybean.gemspec",
     "spec/soybean_spec.rb",
     "spec/spec_helper.rb",

data/vendor/soap4r/soap/attachment.rb

@@ -7,7 +7,7 @@
 # either the dual license version in 2003, or any later version.
 
 
-require 'soap/baseData'
+require 'soap/base_data'
 require 'soap/mapping'
 
 

data/vendor/soap4r/soap/element.rb

@@ -8,7 +8,7 @@
 
 
 require 'xsd/qname'
-require 'soap/baseData'
+require 'soap/base_data'
 
 
 module SOAP

data/vendor/soap4r/soap/encodingstyle/handler.rb

@@ -8,7 +8,7 @@
 
 
 require 'soap/soap'
-require 'soap/baseData'
+require 'soap/base_data'
 require 'soap/element'
 
 

data/vendor/soap4r/soap/generator.rb

@@ -9,7 +9,7 @@
 
 require 'soap/soap'
 require 'soap/ns'
-require 'soap/baseData'
+require 'soap/base_data'
 require 'soap/encodingstyle/handler'
 require 'xsd/codegen/gensupport'
 

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

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

data/vendor/soap4r/soap/parser.rb

@@ -10,7 +10,7 @@
 require 'xsd/xmlparser'
 require 'soap/soap'
 require 'soap/ns'
-require 'soap/baseData'
+require 'soap/base_data'
 require 'soap/encodingstyle/handler'
 
 

data/vendor/soap4r/soap/processor.rb

@@ -12,9 +12,9 @@ require 'soap/soap'
 require 'soap/element'
 require 'soap/parser'
 require 'soap/generator'
-require 'soap/encodingstyle/soapHandler'
-require 'soap/encodingstyle/literalHandler'
-require 'soap/encodingstyle/aspDotNetHandler'
+require 'soap/encodingstyle/soap_handler'
+require 'soap/encodingstyle/literal_handler'
+require 'soap/encodingstyle/asp_dot_net_handler'
 
 
 module SOAP

data/vendor/soap4r/soap/rpc/router.rb

@@ -15,7 +15,7 @@ require 'soap/rpc/rpc'
 require 'soap/rpc/element'
 require 'soap/header/handlerset'
 require 'soap/filter'
-require 'soap/streamHandler'
+require 'soap/stream_handler'
 require 'soap/mimemessage'
 require 'soap/header/handlerset'
 

data/vendor/soap4r/soap/stream_handler.rb

@@ -106,7 +106,7 @@ class HTTPStreamHandler < StreamHandler
       RETRYABLE = true
     rescue LoadError
       warn("Loading http-access2 failed.  Net/http is used.") if $DEBUG
-      require 'soap/netHttpClient'
+      require 'soap/net_http_client'
       Client = SOAP::NetHttpClient
       RETRYABLE = false
     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,
+        varname.dump.underscore,
         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.2.2
+  version: 2.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable: soybean
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &10262720 !ruby/object:Gem::Requirement
+  requirement: &4642340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10262720
+  version_requirements: *4642340
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &10260220 !ruby/object:Gem::Requirement
+  requirement: &4641260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *10260220
+  version_requirements: *4641260
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &10258480 !ruby/object:Gem::Requirement
+  requirement: &4639600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10258480
+  version_requirements: *4639600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &10256820 !ruby/object:Gem::Requirement
+  requirement: &4638200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *10256820
+  version_requirements: *4638200
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &10254460 !ruby/object:Gem::Requirement
+  requirement: &4637120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *10254460
+  version_requirements: *4637120
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &10253320 !ruby/object:Gem::Requirement
+  requirement: &4635500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *10253320
+  version_requirements: *4635500
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &10252000 !ruby/object:Gem::Requirement
+  requirement: &4634520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *10252000
+  version_requirements: *4634520
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &10250280 !ruby/object:Gem::Requirement
+  requirement: &4633360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,7 +99,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10250280
+  version_requirements: *4633360
 description: ! 'Generate soap web-services from you wsdl. Generate: all classes from
   xsd, and other.'
 email: a.sozontov@gmail.com
@@ -137,6 +137,7 @@ files:
 - lib/soybean/interface.rb
 - lib/soybean/interface_builder.rb
 - lib/soybean/literal_mapping_registry_creator.rb
+- lib/soybean/middleware.rb
 - soybean.gemspec
 - spec/soybean_spec.rb
 - spec/spec_helper.rb
@@ -315,7 +316,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -214234621149744458
+      hash: -1409596823364250190
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: