washout_builder 0.7.0 → 0.7.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTk5MWM5OTYxNzU3YmI1NjI2ZTZkYTYxZWNjODkxMjk0ZWQwN2UwZA==
+    YzRiMTIyODljY2ViMjJhYTllMjU4YTg3MWVmMDM0MzM2MjJhOTA0MA==
   data.tar.gz: !binary |-
-    ODU2MjM5ZjkxNmNkY2IxMGNkMzY3M2UyNmQ5OWFlMDhkMDU2MzAwZA==
+    M2E3NjEwZjNlZGE0ZWU5MDAwZDNjZDE0ZWE3NWQ5ZTJmMjk4ZTQ5YQ==
 SHA512:
   metadata.gz: !binary |-
-    MDQyMjdlMjc4NjFlYTUyMWNkMjY2ZTg3NzM1NDhkYTdlMDA0MTM2YzU3ZWIx
-    Y2FiM2M3NGE0ZTI1ZTZlYmJkZTkxNzI0NDNiNTAwYzZiZTMzOWFmODNiYTBi
-    ZDFjOTNmOGRhZTEzNGM5YzNkMjViNjMzZGEyZjJiYzdlYjRjYzM=
+    OWZiZGVmNjM3MmM0Y2IyNmMyMzQ2NDdjOWJjOGMwNDAxNzNmOTI0MTMxNzg3
+    YTE3NmQwMzkwZTM0ZjMyMmI5OTZkN2ZlM2QxM2Q4ZjYwZWJmYWFjYzU0OTY5
+    NmFiN2MyZDQ3YjUxZjk1ZjU0ZThjMDc5M2EwZmNiZTY3NGU3ZWM=
   data.tar.gz: !binary |-
-    YmE1NmI2NWUzYzYwNzU4MmVjZDc4NGYwMzY3ZDRhYTliNzFlZWNlMGNmNDI2
-    YjgxNWQ5NTMzYjdiZDBhY2JlNmJjMTU5ZDhkMjIwODQwNzkxYzdmNTVmNWRh
-    YjIyMWQwYWY2NGI2ZjhkNDg1MWY2ZGJiYTc0YTYyZTg5OTMyZWY=
+    ZTM2MDJiZmZkODVkZGZiZDQ3ZGQ5NDI3OTBkYzQwNmM4MDlkM2ExY2QxZTUx
+    NWY5NzNiMmViNTlkNTM1NDBkZjVmMzRkZTJkNGVmMmE2NmI2MzcxZDc0ZGNk
+    ZTljNTk5MTkzMjE1YzQwMGU0Nzk2MTg3MjhiMGEzMjk0MmIxYTY=

data/app/helpers/washout_builder_helper.rb

@@ -2,8 +2,9 @@ module WashoutBuilderHelper
   include WashOutHelper
 
   def get_complex_class_name(p, defined = [])
-    complex_class =  p.is_complex? ? p.basic_type.to_s.classify : nil 
-      
+    complex_class =  p.struct? ? p.basic_type : nil
+    complex_class =  complex_class.include?(".") ? complex_class.gsub(".","/").camelize : complex_class.to_s.classify    unless complex_class.nil?
+     
     unless complex_class.nil? || defined.blank?
      
       complex_obj_found = defined.detect {|hash|   hash[:class] == complex_class}
@@ -12,7 +13,7 @@ module WashoutBuilderHelper
         raise RuntimeError, "Duplicate use of `#{p.basic_type}` type name. Consider using classified types."
       end
     end
-
+   
     return complex_class
   end
 
@@ -47,7 +48,7 @@ module WashoutBuilderHelper
     ancestors  = (param_class.ancestors - param_class.included_modules).delete_if{ |x| x.to_s.downcase == class_name.to_s.downcase  ||  x.to_s == "ActiveRecord::Base" ||  x.to_s == "Object" || x.to_s =="BasicObject" || x.to_s == "WashOut::Type" }
     unless ancestors.blank?
       ancestor_structure =  { ancestors[0].to_s.downcase =>  ancestors[0].columns_hash.inject({}) {|h, (k,v)|  h["#{k}"]="#{v.type}".to_sym; h } }
-      ancestor_object =  WashoutBuilder::Param.parse_def(@soap_config,ancestor_structure)[0]
+      ancestor_object =  WashOut::Param.parse_def(@soap_config,ancestor_structure)[0]
       bool_the_same = same_structure_as_ancestor?(param, ancestor_object)
       unless bool_the_same
         top_ancestors = get_class_ancestors(ancestor_class, defined)
@@ -61,8 +62,13 @@ module WashoutBuilderHelper
   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
     defined << {:class =>complex_class, :obj => param, :ancestors => param.classified?  ?  get_class_ancestors(param, complex_class, defined) : nil } unless complex_class.nil?
-    if param.is_complex?
+    if param.struct?
       c_names = []
       param.map.each { |obj|   c_names.concat(get_nested_complex_types(obj, defined))  }        
       defined.concat(c_names)
@@ -102,7 +108,7 @@ module WashoutBuilderHelper
       xml.a( "name" => "#{class_name}")  { }
       xml.h3  { |pre| pre << "#{class_name} #{ancestors.blank? ? "" : "<small>(extends <a href='##{ancestors[0].to_s.classify}'>#{ancestors[0].to_s.classify}</a>)</small>" } " }
 
-      if param.is_a?(WashoutBuilder::Param)
+      if param.is_a?(WashOut::Param)
         xml.ul("class" => "pre") {
           
           param.map.each do |element|
@@ -140,7 +146,8 @@ module WashoutBuilderHelper
   end
 
   def create_html_fault_type(xml, param)
-    if param.class.ancestors.include?(WashOut::Dispatcher::SOAPError)
+    ancestor_class =  defined?(WashOut::Dispatcher::SOAPError) ? WashOut::Dispatcher::SOAPError  : Washout::SoapError
+    if param.class.ancestors.include?(ancestor_class) 
       xml.h3 "#{param.class}"
       xml.a("name" => "#{param.class}") {}
       xml.ul("class" => "pre") {

data/lib/washout_builder/soap.rb

@@ -20,8 +20,8 @@ module WashoutBuilder
           
           current_action = self.soap_actions[action]
         
-          current_action[:input] = WashoutBuilder::Param.parse_def(soap_config, options[:args])
-          current_action[:output] = WashoutBuilder::Param.parse_def(soap_config, options[:return])
+          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

data/lib/washout_builder/version.rb

@@ -1,3 +1,3 @@
 module WashoutBuilder
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/lib/washout_builder.rb

@@ -1,7 +1,6 @@
 require 'wash_out'
 
 require 'washout_builder/soap'
-require 'washout_builder/param'
 require 'washout_builder/engine'
 require 'washout_builder/dispatcher'
 require 'washout_builder/type'
@@ -34,7 +33,7 @@ WashOut::Dispatcher::SOAPError.send :include, ActiveModel::MassAssignmentSecurit
 WashOut::SOAPError.send :include, ActiveModel::MassAssignmentSecurity if defined?(WashOut::SOAPError)
 
 
-if defined?(WashOut::Soap)
+if defined?(WashOut::SOAP)
   WashOut::SOAP::ClassMethods.class_eval do
     alias_method :original_soap_action, :soap_action
   end
@@ -50,6 +49,30 @@ ActionController::Renderers.add :soap do |what, options|
   _render_soap(what, options)
 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
+
+
+
+
 ActionController::Base.class_eval do
 
   # Define a SOAP service. The function has no required +options+:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: washout_builder
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - bogdanRada
@@ -61,7 +61,6 @@ files:
 - lib/washout_builder.rb
 - lib/washout_builder/dispatcher.rb
 - lib/washout_builder/engine.rb
-- lib/washout_builder/param.rb
 - lib/washout_builder/soap.rb
 - lib/washout_builder/type.rb
 - lib/washout_builder/version.rb

data/lib/washout_builder/param.rb

@@ -1,51 +0,0 @@
-module WashoutBuilder
-  class Param < WashOut::Param
-   
-    attr_accessor :source_class_name
-    
-    def initialize(soap_config, name, type, class_name, multiplied = false)
-      @source_class_name = class_name
-       super(soap_config, name, type, multiplied )
-    end
-    
-    def self.parse_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_class_name = nil
-      if definition.is_a?(Class) && definition.ancestors.include?(WashOut::Type)
-        definition_class_name = definition.to_s.classify
-        definition = definition.wash_out_param_map
-      end
-
-      if [Array, Symbol].include?(definition.class)
-        definition = { :value => definition }
-      end
-
-      if definition.is_a? Hash
-        definition.map do |name, opt|
-          if opt.is_a? WashoutBuilder::Param
-             opt
-          elsif opt.is_a? Array
-           WashoutBuilder::Param.new(soap_config, name, opt[0],definition_class_name, true)
-          else
-            WashoutBuilder::Param.new(soap_config, name, opt, definition_class_name)
-          end
-        end
-      else
-        raise RuntimeError, "Wrong definition: #{definition.inspect}"
-      end
-    end
-    
-    def basic_type
-      return source_class_name unless source_class_name.nil?
-      super
-    end
-  
-    def is_complex?
-      !source_class_name.nil? || (struct? && classified? ) || struct?
-    end
-    
-    
-  end
-end