washout_builder 0.7.2 → 0.8.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjI1ZTU3Y2U2MGVhMDUyMzg1Mjc4ZGQ3MmQyN2UxOGUxOWY5NmVjOA==
+    Mjg4YjE1NTYzYmY5M2RiNjk5ZTMwNDNjNWIxZmMzMjMyMDA1ZmM0Mg==
   data.tar.gz: !binary |-
-    ZjliMmQ5NDA2OGQyNWFkM2VkNWNjMDYwNmI5NzA2YmNkYjNhNmM1Mw==
+    MjFmZGQzNWI1YWFmNjVjNmQ0ODIyODk5MWIzYWY1MzcxODEzODg1ZA==
 SHA512:
   metadata.gz: !binary |-
-    Zjk2YWEwOWY0MmVjOGFlODVjODY5NTkxOTAxYzQ0MGU4MjlkMzZmYzU5ODUw
-    YWFmMWEzZThmZGEyZjZhOGJlOTA3MDhlMjY1MDJmMjdjMjI2NGQ4YjZmNWQ5
-    ZDZiNjZjZGVlOTc5NTI1OGE2OWRjNTM4MDFkY2IzZTYxNzViMjg=
+    ZjE3MzQwMDJlNjRlZTJmM2FmMzIzOGIxOTQ4ZWU4YzcxYTY0ODE0OGNhYTZj
+    ZDU5MzViMjA4ZGY0MjM2YTE5NDE3MGU1NGY4NTM1OTc1YTllMmZmYjA1MjA4
+    ODQzNDA1MWQ1YWJmOTYzNDA3N2MwY2U0OWRiMjIzMWEzM2VhZjc=
   data.tar.gz: !binary |-
-    Y2NkZGFmYTYyYWM0MGI1OGI0NjNlODA0N2Y0Yjk3NmE4YjQzMGZiNDE0MjMw
-    ZjY4NTc3MTFiMTQ3NDQ0NDk5NjU5YzU3NDY3ZTFlY2NjYmFhMjllOTgwN2Jj
-    MjI4ODQ3MWI1NzhiMDY5ZTY5NTljODFmYzhkNDVmZDBmOGZmYjI=
+    NTM3N2IyNmJhNzFkZTc5YjQzZDhmZTlmMTAyOGE3YjExM2E0MzI1NmY4MWNm
+    YThlMDM0MTBjZGFhOWQyMGE2MmJjMTAyMjFmNjQ1MzYzZDUyMTM0ZmQ5ODA1
+    ZDBlNTNhMzY3Y2JlOGZhYmJmN2MxNzFjMjQzNzViYjBjZGJiZjk=

data/README.rdoc

@@ -20,7 +20,7 @@ The way WashOut is used is not modified, it just extends its functionality by ge
 
 1. {Ruby 1.9.x or Ruby 2.0.x}[http://www.ruby-lang.org]
 2. {Ruby on Rails}[http://rubyonrails.org].
-3. {WashOut Gem version >= 0.9.1}[https://github.com/inossidabile/wash_out]
+3. {WashOut Gem version >= 0.10.0.beta.1}[https://github.com/inossidabile/wash_out]
 4. {Nori Gem}[https://github.com/savonrb/nori]
 
 = Compatibility
@@ -63,7 +63,7 @@ You can still do everything that gem does .
 
 When specifying the <b>soap_action</b> you can also pass a <b>option for description</b> and a <b>list of exceptions(need to be instances as example)</b> that the method can raise at a certain moment.
 
-The exception classes used <b>must inherit</b> from  <tt>WashOut::Dispatcher::SOAPError</tt>, which has  by default  a error code and a message as attributes but you can extend it by adding more accessible_attributes to your own custom class. 
+The exception classes used <b>must inherit</b> from  <tt>WashOut::SOAPError</tt>, which has  by default  a error code and a message as attributes but you can extend it by adding more accessible_attributes to your own custom class. 
 
 <b> If your custom exception class doesn't  have any accesible_attributes, these attributes will not appear in the documentation!!!</b> 
 

data/app/helpers/washout_builder_helper.rb

@@ -58,15 +58,20 @@ module WashoutBuilderHelper
     ancestors unless  bool_the_same
   end
   
+  
+  def fix_descendant_wash_out_type(param, complex_class)
+    param_class = complex_class.is_a?(Class) ? complex_class : complex_class.constantize rescue nil
+    if !param_class.nil? && param_class.ancestors.include?(WashOut::Type) && !param.map[0].nil? 
+      descendant = WashOut::Param.parse_def(@soap_config, param_class.wash_out_param_map)[0]
+      param.name =  descendant.name 
+       param.map = descendant.map
+    end
+  end
 
   def get_nested_complex_types(param, defined)
     defined = [] if defined.blank?
     complex_class = get_complex_class_name(param, defined)
-    param_class = complex_class.is_a?(Class) ? complex_class : complex_class.constantize rescue nil
-    if !param_class.nil? && param_class.ancestors.include?(WashOut::Type)
-      param.name =  param.map[0].name
-      param.map =  param.map[0].map  
-    end
+     fix_descendant_wash_out_type(param, complex_class)
     defined << {:class =>complex_class, :obj => param, :ancestors => param.classified?  ?  get_class_ancestors(param, complex_class, defined) : nil } unless complex_class.nil?
     if param.struct?
       c_names = []
@@ -80,7 +85,7 @@ module WashoutBuilderHelper
   def get_complex_types(map)
     defined = []
     map.each do |operation, formats|
-      (formats[:input] + formats[:output]).each do |p|
+      (formats[:in] + formats[:out]).each do |p|
         defined.concat(get_nested_complex_types(p, defined))
       end
     end
@@ -182,35 +187,35 @@ module WashoutBuilderHelper
 
 
   def create_html_public_method(xml, operation, formats)
-    # raise YAML::dump(formats[:input])
+    # raise YAML::dump(formats[:in])
     xml.h3 "#{operation}"
     xml.a("name" => "#{operation}") {}
 
 
     xml.p("class" => "pre"){ |pre|
-      if !formats[:output].nil?
-        if WashoutBuilder::Type::BASIC_TYPES.include?(formats[:output][0].type)
-          xml.span("class" => "blue") { |y| y<<  "#{formats[:output][0].type}" }
+      if !formats[:out].nil?
+        if WashoutBuilder::Type::BASIC_TYPES.include?(formats[:out][0].type)
+          xml.span("class" => "blue") { |y| y<<  "#{formats[:out][0].type}" }
         else
-          xml.a("href" => "##{formats[:output][0].type}") { |xml| xml.span("class" => "lightBlue") { |y| y<<"#{formats[:output][0].type}" } }
+          xml.a("href" => "##{formats[:out][0].type}") { |xml| xml.span("class" => "lightBlue") { |y| y<<"#{formats[:out][0].type}" } }
         end
       else
         pre << "void"
       end
 
       xml.span("class" => "bold") {|y|  y << "#{operation} (" }
-      mlen = formats[:input].size
+      mlen = formats[:in].size
       xml.br if mlen > 1
       spacer = "&nbsp;&nbsp;&nbsp;&nbsp;"
       if mlen > 0
         j=0
         while j<mlen
-          param = formats[:input][j]
+          param = formats[:in][j]
+          complex_class = get_complex_class_name(param)  
           use_spacer =  mlen > 1 ? true : false
           if WashoutBuilder::Type::BASIC_TYPES.include?(param.type)
             pre << "#{use_spacer ? spacer: ''}<span class='blue'>#{param.type}</span>&nbsp;<span class='bold'>#{param.name}</span>"
           else
-            complex_class = get_complex_class_name(param)
             unless complex_class.nil?
               if  param.multiplied == false
                 pre << "#{use_spacer ? spacer: ''}<a href='##{complex_class}'><span class='lightBlue'>#{complex_class}</span></a>&nbsp;<span class='bold'>#{param.name}</span>"
@@ -241,14 +246,14 @@ module WashoutBuilderHelper
 
     xml.ul {
       j=0
-      mlen = formats[:input].size
+      mlen = formats[:in].size
       while j<mlen
-        param = formats[:input][j]
+        param = formats[:in][j]
+        complex_class = get_complex_class_name(param)  
         xml.li("class" => "pre") { |pre|
           if WashoutBuilder::Type::BASIC_TYPES.include?(param.type)
             pre << "<span class='blue'>#{param.type}</span>&nbsp;<span class='bold'>#{param.name}</span>"
           else
-            complex_class = get_complex_class_name(param)
             unless complex_class.nil?
               if  param.multiplied == false
                 pre << "<a href='##{complex_class}'><span class='lightBlue'>#{complex_class}</span></a>&nbsp;<span class='bold'>#{param.name}</span>"
@@ -266,12 +271,12 @@ module WashoutBuilderHelper
     xml.p "Return value:"
     xml.ul {
       xml.li {
-        if !formats[:output].nil?
+        if !formats[:out].nil?
 
-          if WashoutBuilder::Type::BASIC_TYPES.include?(formats[:output][0].type)
-            xml.span("class" => "pre") { |xml| xml.span("class" => "blue") { |sp| sp << "#{formats[:output][0].type}" } }
+          if WashoutBuilder::Type::BASIC_TYPES.include?(formats[:out][0].type)
+            xml.span("class" => "pre") { |xml| xml.span("class" => "blue") { |sp| sp << "#{formats[:out][0].type}" } }
           else
-            xml.span("class" => "pre") { xml.a("href" => "##{formats[:output][0].type}") { |xml| xml.span("class" => "lightBlue") { |y| y<<"#{formats[:output][0].type}" } } }
+            xml.span("class" => "pre") { xml.a("href" => "##{formats[:out][0].type}") { |xml| xml.span("class" => "lightBlue") { |y| y<<"#{formats[:out][0].type}" } } }
           end
         else
           xml.span("class" => "pre") { |sp| sp << "void" }

data/lib/washout_builder.rb

@@ -25,44 +25,9 @@ end
 
 
 
-WashOut::Dispatcher::SOAPError.send :include, ActiveModel::MassAssignmentSecurity if defined?(WashOut::Dispatcher)
-WashOut::SOAPError.send :include, ActiveModel::MassAssignmentSecurity if defined?(WashOut::SOAPError)
+WashOut::SOAPError.send :include, ActiveModel::MassAssignmentSecurity if defined?(WashOut::SOAPError) && defined?(ActiveModel::MassAssignmentSecurity)
 
 
-if defined?(WashOut::SOAP)
-  WashOut::SOAP::ClassMethods.class_eval do
-    alias_method :original_soap_action, :soap_action
-  end
-end
-
-if defined?(WashOut::Rails::Controller)
-  WashOut::Rails::Controller::ClassMethods.class_eval do
-    alias_method :original_soap_action, :soap_action
-  end
-end
-
-
-  WashOut::Param.class_eval do
-   
-    def self.parse_builder_def(soap_config, definition)
-      raise RuntimeError, "[] should not be used in your params. Use nil if you want to mark empty set." if definition == []
-      return [] if definition == nil
-
-      definition = { :value => definition } unless definition.is_a?(Hash)
-
-      definition.collect do |name, opt|
-        if opt.is_a? WashOut::Param
-          opt
-        elsif opt.is_a? Array
-          WashOut::Param.new(soap_config, name, opt[0], true)
-        else
-          WashOut::Param.new(soap_config, name, opt)
-        end
-      end
-    end
-  
-  end
-
 
 
 

data/lib/washout_builder/engine.rb

@@ -1,13 +1,11 @@
 module WashoutBuilder
   class Engine < ::Rails::Engine
-    config.wash_out = ActiveSupport::OrderedOptions.new
     initializer "wash_out.configuration" do |app|
       app.routes.append do
-          match "/washout"   => "washout_builder#all", :via => :get, :format => false
+        match "/washout"   => "washout_builder#all", :via => :get, :format => false
       end
       if app.config.wash_out[:catch_xml_errors]
-        app.config.middleware.insert_after 'ActionDispatch::ShowExceptions',  WashOut::Middleware  if defined?(WashOut::Middleware)
-        app.config.middleware.insert_after 'ActionDispatch::ShowExceptions',  WashOut::Middlewares::Catcher  if defined?(WashOut::Middlewares::Catcher)
+        app.config.middleware.insert_after 'ActionDispatch::ShowExceptions', WashOut::Middlewares::Catcher
       end
     end
   end

data/lib/washout_builder/soap.rb

@@ -3,35 +3,13 @@ require 'active_support/concern'
 module WashoutBuilder
   module SOAP
     extend ActiveSupport::Concern
-    include WashOut::SOAP if defined?(WashOut::SOAP)
-    include WashOut::Rails::Controller if defined?(WashOut::Rails::Controller)
-  
+    include WashOut::Rails::Controller 
     
-      module ClassMethods
-       
-      # Define a SOAP action +action+. The function has two required +options+:
-      # :args and :return. Each is a type +definition+ of format described in
-      # WashOut::Param#parse_def.
-      #
-      # An optional option :to can be passed to allow for names of SOAP actions
-      # which are not valid Ruby function names.
-      def soap_action(action, options={})
-          original_soap_action(action, options)
-          
-          current_action = self.soap_actions[action]
-        
-          current_action[:input] = WashOut::Param.parse_builder_def(soap_config, options[:args])
-          current_action[:output] = WashOut::Param.parse_builder_def(soap_config, options[:return])
-         
-      end
-    end
     
 
+
     included do
-      include WashOut::Configurable if defined?(WashOut::Configurable)
-      include  WashOut::Dispatcher if defined?(WashOut::Dispatcher)
       include WashoutBuilder::Dispatcher
-      self.soap_actions = {}
     end
   end
 end

data/lib/washout_builder/version.rb

@@ -1,3 +1,3 @@
 module WashoutBuilder
-  VERSION = "0.7.2"
+  VERSION = "0.8.7"
 end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 # Configure Rails Envinronment
 ENV["RAILS_ENV"] = "test"
 
+require 'active_support'
 require "simplecov"
 SimpleCov.start do
   add_filter 'spec'
@@ -13,8 +14,10 @@ end
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rails/test_help"
 require "rspec/rails"
+require 'rspec/autorun'
 require "pry"
 require "savon"
+require 'wash_out'
 
 Rails.backtrace_cleaner.remove_silencers!
 
@@ -27,7 +30,7 @@ RSpec.configure do |config|
 
   config.mock_with :rspec
   config.before(:all) do
-    WashOut::Engine.config.wash_out = {
+    WashoutBuilder::Engine.config.wash_out = {
       snakecase_input: false,
       camelize_wsdl: false,
       namespace: false

data/washout_builder.gemspec

@@ -16,5 +16,5 @@ Gem::Specification.new do |s|
   s.test_files = s.files.grep(/^(spec)/)
   s.require_paths = ["lib"]
   s.add_dependency("nori", ">= 2.0.0")
-  s.add_dependency("wash_out", ">= 0.9.1")
+  s.add_dependency("wash_out", ">= 0.10.0.beta.1")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: washout_builder
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.7
 platform: ruby
 authors:
 - bogdanRada
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.10.0.beta.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.10.0.beta.1
 description: ! 'WashOut Soap Service Documentation builder (extends WashOut https://github.com/inossidabile/wash_out/) '
 email: raoul_ice@yahoo.com
 executables: []