soybean 2.4.3 → 2.5.0

data/Gemfile

@@ -3,6 +3,10 @@ source "http://rubygems.org"
 gem 'thor'
 gem 'activesupport', '~> 3.1'
 gem 'i18n'
+gem 'nokogiri'
+gem 'rack'
+gem 'rack-mount'
+
 #gem "soap4r-middleware-192", "~> 0.8.2", :require => "soap4r-middleware"
 
 # Add dependencies to develop your gem here.
@@ -12,5 +16,4 @@ group :development do
   gem "yard", "~> 0.6.0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
 end

data/Gemfile.lock

@@ -11,8 +11,11 @@ GEM
       git (>= 1.2.5)
       rake
     multi_json (1.0.3)
+    nokogiri (1.5.0)
+    rack (1.3.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
     rake (0.9.2)
-    rcov (0.9.10)
     rspec (2.3.0)
       rspec-core (~> 2.3.0)
       rspec-expectations (~> 2.3.0)
@@ -32,7 +35,9 @@ DEPENDENCIES
   bundler (~> 1.0.0)
   i18n
   jeweler (~> 1.6.4)
-  rcov
+  nokogiri
+  rack
+  rack-mount
   rspec (~> 2.3.0)
   thor
   yard (~> 0.6.0)

data/VERSION

@@ -1 +1 @@
-2.4.3
+2.5.0

data/config.ru

@@ -0,0 +1,8 @@
+$:.unshift './lib'
+
+require 'soybean'
+
+
+run Soybean::Application.new(File.expand_path('../app/services', __FILE__)) {
+  logger Logger.new('soybean.log')
+}

data/lib/soybean.rb

@@ -6,8 +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'
+require 'active_support/core_ext/module/attribute_accessors'
+require 'logger'
 
 $:.unshift File.absolute_path(File.join(File.dirname(__FILE__), '..', 'vendor/soap4r'))
 
@@ -16,5 +16,16 @@ ActiveSupport::Dependencies.autoload_paths << File.absolute_path(File.join(File.
 
 module Soybean
   extend ActiveSupport::Autoload
+
   VERSION = File.read(File.expand_path('../../VERSION', __FILE__))
+
+  mattr_accessor :engines
+  self.engines = []
+
+  mattr_accessor :services
+  self.services = []
+
+  mattr_accessor :logger
+  self.logger = Logger.new(STDOUT)
+
 end

data/lib/soybean/application.rb

@@ -0,0 +1,59 @@
+require 'rack/builder'
+require 'active_support/configurable'
+
+module Soybean
+  class Application
+
+    attr_reader :services
+
+    def initialize(services, &block)
+      load!(services)
+      configure(&block)
+
+      logger.info "SOAP Services: START"
+      at_exit{ logger.info "SOAP Services: STOP" }
+
+      @app = Rack::Builder.new do
+        Soybean.engines.each do |engine|
+          engine.logger.info "Service found: #{engine.service.endpoint} route to /#{engine.service.class.name}" if engine.logger
+          map "/#{engine.service.endpoint}" do
+            run engine.new
+          end
+        end
+
+        Soybean.engines.last.logger.info ""
+      end.to_app
+    end
+
+    def call(env)
+      @app.call(env)
+    end
+
+    def logger(new_logger=nil)
+      @logger = new_logger unless new_logger.nil?
+      @logger || Soybean.logger
+    end
+
+    protected
+
+    def configure(&block)
+      instance_eval &block
+
+      logger.datetime_format = "%Y-%m-%d %H:%M:%S"
+      logger.formatter = proc { |severity, datetime, progname, msg|
+        "#{msg}\n"
+      }
+
+      Soybean.engines.each do |engine|
+        engine.logger = logger
+      end
+    end
+
+    def load!(path)
+      $:.unshift path
+      ActiveSupport::Dependencies.autoload_paths << path
+      Dir["#{path}/engines/*"].each { |f| require f }
+    end
+
+  end
+end

data/lib/soybean/{middleware.rb → engine.rb}

@@ -1,8 +1,16 @@
 require 'soap/rpc/router'
 
 module Soybean
-  class Middleware
+
+  class Engine
     include SOAP
+    class_attribute :service, :instance_reader => false, :instance_writer => false
+    class_attribute :logger, :instance_reader => true, :instance_writer => false
+    self.logger = Soybean.logger
+
+    def self.inherited(subclass)
+      Soybean.engines << subclass
+    end
 
     module ClassMethods
       def setup
@@ -103,22 +111,75 @@ module Soybean
         router.add_document_operation(receiver, soapaction, name, param_def, opt)
       end
     end
-
     extend ClassMethods
 
     def initialize(app = nil)
       @app = app
+      setup!(self.class.service)
+    end
+
+    def setup!(service)
+      self.class.setup {}
+      service.class::Methods.each do |definitions|
+        opt = definitions.last
+        if opt[:request_style] == :document
+          self.class.router.add_document_operation(service, *definitions)
+        else
+          self.class.router.add_rpc_operation(service, *definitions)
+        end
+      end
+      self.class.mapping_registry = Mappings::EncodedRegistry
+      self.class.literal_mapping_registry = Mappings::LiteralRegistry
     end
 
     def call(env)
-      if env['PATH_INFO'].match(self.class.endpoint)
+      s, h, b = with_logging(env, logger) do
         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
+      return s, h, b
+    rescue => e
+      [200, {'Allow' => 'POST',
+             'Content-Type' => 'text/plain'}, [e.message,
+                                               e.backtrace.join("\n")]]
+    end
+
+    def with_logging(env, logger)
+      #Started GET "/" for 127.0.0.1 at 2011-09-28 14:21:28 +0400
+      # Processing by DashboardController#index as HTML
+      # User Load (0.3ms)  SELECT `users`.* FROM `users` WHERE `users`.`id` = 100 LIMIT 1
+      # Role Load (0.3ms)  SELECT `roles`.* FROM `roles` INNER JOIN `assignments` ON `roles`.`id` = `assignments`.`role_id` WHERE `assignments`.`user_id` = 100
+      #Redirected to http://localhost:3000/municipal_services
+      #Completed 302 Found in 89ms
+
+      request = Rack::Request.new(env)
+      input_params = request.body.read
+      request.body.rewind
+
+      logger.info "Started %s \"%s\" for %s at %s. caller %s" % [request.request_method,
+                                                                 URI(env['REQUEST_URI']).path,
+                                                                 request.ip,
+                                                                 Time.now.strftime(logger.datetime_format),
+                                                                 request.referer] if logger
+
+      logger.info "  Processing by %s" % [self.class.service.class.name] if logger
+      logger.debug "  Headers: %s" % [request.header.inspect] if logger
+      logger.debug "  Parameters: " if logger
+
+      logger.debug pretty_xml(input_params, '    ') if logger
+
+      s, h, b = yield
+
+      logger.debug "Response:" % [h.inspect] if logger
+      logger.debug "  Headers: %s" % [h.inspect] if logger
+      logger.debug "  Body: " if logger
+
+      logger.debug pretty_xml(b.join, '    ') if logger
+
+      return s, h, b
+
+    rescue => e
+      logger.error "\tERROR: \n%s" % [e.message] if logger
+      raise e
     end
 
     def handle(env)
@@ -177,5 +238,14 @@ module Soybean
       end
       nil
     end
+
+    protected
+    def pretty_xml(string, ident='  ')
+      Nokogiri.XML(string) { |config| config.default_xml.noblanks }.to_xml(ident: 2).each_line.map do |line|
+        "#{ident}#{line}"
+      end.join
+    rescue
+      string
+    end
   end
 end

data/lib/soybean/generators/class_generator.rb

@@ -81,8 +81,8 @@ module Soybean
       end
 
       def accessors
-        @attrdef.map do |attrname, *|
-          format("soap_attribute #{attrname.to_sym.inspect}\n", 2)
+        @attrdef.map do |attrname, writeable, varname|
+          format("soap_attribute #{varname.underscore.to_sym.inspect}\n", 2)
         end.join
       end
 

data/lib/soybean/generators/{middleware_generator.rb → engine_generator.rb}

@@ -1,6 +1,6 @@
 module Soybean
   module Generators
-    class MiddlewareGenerator
+    class EngineGenerator
       include BaseGenerator
 
       attr_reader :name, :model
@@ -10,15 +10,15 @@ module Soybean
 
       def initialize(model)
         @model = model
-        @name = (wsdl.name.name.underscore.gsub(/service$/, '') rescue 'base') + 'middleware'
+        @name = (wsdl.name.name.underscore.gsub(/service$/, '') rescue 'base') + 'engine'
       end
 
       def dir
-        'middlewares'
+        'engines'
       end
 
       def generate
-        source = File.expand_path("../templates/middleware.rb", __FILE__)
+        source = File.expand_path("../templates/engine.rb", __FILE__)
         context = instance_eval('binding')
         content = ERB.new(::File.binread(source), nil, '-').result(context)
         content

data/lib/soybean/generators/service_generator.rb

@@ -15,7 +15,7 @@ module Soybean
       end
 
       def generate
-        (schemes + mappings + interface + model + specs + middleware).map do |generator|
+        (schemes + mappings + interface + model + specs + engines).map do |generator|
           yield generator.fullpath(path), generator.generate, generator
         end
       end
@@ -32,8 +32,12 @@ module Soybean
         @model ||= [ModelGenerator.new(@wsdl)]
       end
 
-      def middleware
-        @middleware ||= model.map { |m| MiddlewareGenerator.new(m) }
+      def static
+        @static ||= [StaticGenerator.new(@wsdl)]
+      end
+
+      def engines
+        @engines ||= model.map { |m| EngineGenerator.new(m) }
       end
 
       def specs

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

@@ -0,0 +1,6 @@
+module Engines
+  class <%= class_name %> < Soybean::Engine
+    self.service = <%= model_class_name %>.new
+    self.endpoint = %r(^/<%= model_class_name %>)
+  end
+end

data/lib/soybean/generators/wsdl_generator.rb

@@ -0,0 +1,34 @@
+module Soybean
+  module Generators
+    class WsdlGenerator
+      include BaseGenerator
+
+      attr_reader :name
+
+      def initialize(wsdl)
+        @wsdl = wsdl
+        @name = wsdl.name.name
+      end
+
+      def dir
+        'wsdl'
+      end
+
+      def filename
+        "#{name}.wsdl"
+      end
+
+      def generate
+        if block_given?
+          yield File.join(dir, filename), dump
+        else
+          dump
+        end
+      end
+
+      def dump
+        @wsdl.to_s
+      end
+    end
+  end
+end

data/lib/soybean/interface.rb

@@ -5,10 +5,23 @@ module Soybean
     def self.inherited(subclass)
       self.interfaces ||= []
       self.interfaces << subclass if subclass.superclass == Soybean::Interface
+      Soybean.services << subclass if subclass.superclass < Soybean::Interface
     end
 
     def self.actions
       self.instance_methods - Object.instance_methods
     end
+
+
+    attr_reader :logger
+
+    def initialize(logger=Soybean.logger)
+      @logger = logger
+    end
+
+    def endpoint
+      self.class.name
+    end
+
   end
 end

data/soybean.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{soybean}
-  s.version = "2.4.3"
+  s.version = "2.5.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-10}
+  s.date = %q{2011-10-17}
   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,27 +28,31 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "bin/soybean",
-    "lib/core_ext/module.rb",
+    "config.ru",
     "lib/soybean.rb",
+    "lib/soybean/application.rb",
     "lib/soybean/cli.rb",
     "lib/soybean/complex_type.rb",
     "lib/soybean/encoded_mapping_registry_creator.rb",
+    "lib/soybean/engine.rb",
     "lib/soybean/generators/base_generator.rb",
     "lib/soybean/generators/class_generator.rb",
+    "lib/soybean/generators/engine_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/engine.rb",
     "lib/soybean/generators/templates/model_spec.rb",
     "lib/soybean/generators/types_generator.rb",
+    "lib/soybean/generators/wsdl_generator.rb",
     "lib/soybean/interface.rb",
     "lib/soybean/interface_builder.rb",
     "lib/soybean/literal_mapping_registry_creator.rb",
-    "lib/soybean/middleware.rb",
+    "lib/soybean/soap_attribute.rb",
     "soybean.gemspec",
+    "soybean.log",
     "spec/soybean_spec.rb",
     "spec/spec_helper.rb",
     "vendor/soap4r/soap/attachment.rb",
@@ -224,30 +228,36 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<thor>, [">= 0"])
       s.add_runtime_dependency(%q<activesupport>, ["~> 3.1"])
       s.add_runtime_dependency(%q<i18n>, [">= 0"])
+      s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
+      s.add_runtime_dependency(%q<rack>, [">= 0"])
+      s.add_runtime_dependency(%q<rack-mount>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<thor>, [">= 0"])
       s.add_dependency(%q<activesupport>, ["~> 3.1"])
       s.add_dependency(%q<i18n>, [">= 0"])
+      s.add_dependency(%q<nokogiri>, [">= 0"])
+      s.add_dependency(%q<rack>, [">= 0"])
+      s.add_dependency(%q<rack-mount>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
     s.add_dependency(%q<thor>, [">= 0"])
     s.add_dependency(%q<activesupport>, ["~> 3.1"])
     s.add_dependency(%q<i18n>, [">= 0"])
+    s.add_dependency(%q<nokogiri>, [">= 0"])
+    s.add_dependency(%q<rack>, [">= 0"])
+    s.add_dependency(%q<rack-mount>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<yard>, ["~> 0.6.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
   end
 end