washout_builder 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce93207677248ea25aec7558a3266667c7e1ee45
-  data.tar.gz: 71325291f14d1069c7754c4ba5add1f367cd3335
+  metadata.gz: 90cecf99023dfa0b735e1089ba1cb4eb5b077b26
+  data.tar.gz: 900363bc936101a18329bd7f3763c379307b76d3
 SHA512:
-  metadata.gz: f6ab9c9c591e68539ffd4f7052f723765a42adfc5401d53866578122771f36b61bfcb9ffb162f5e2b31a00cf15cf564f6cdee853b823f3cef80add358ba109c6
-  data.tar.gz: 70785954e5697320a6c42948f302205120df5632482be8420e38fe8a6b644c093321c0e89402fee3221920857e25d150ab7cd02500cd54b0204e76da8d294cd7
+  metadata.gz: 3bd47a0cea30d670da9337b8f9dc500363503845350e3fbee7063506511c63a9ea138588ba71d360293a174cbde1bcaba7a878a27f32e79983468def29865271
+  data.tar.gz: f7de742d4af8d318ab18029986788eb8610340aa1f987243940ca85d0af7f81860283005401bdc645dfb4bb4710a6ffd27123ae1c09b5c8df064ec2e6377262e

data/lib/washout_builder/document/complex_type.rb

@@ -81,17 +81,27 @@ module WashoutBuilder
       # @return [void]
       # @api public
       def fix_descendant_wash_out_type(config, complex_class)
-        param_class = begin
-          complex_class.is_a?(Class) ? complex_class : complex_class.constantize
-        rescue
-          nil
-        end
-        return unless param_class.present? && param_class.ancestors.include?(WashOut::Type) && map[0].present?
-        descendant = WashOut::Param.parse_builder_def(config, param_class.wash_out_param_map)[0]
+        param_class = find_class_from_string(complex_class)
+        base_param_class = WashoutBuilder::Type.base_param_class
+        base_type_class =  WashoutBuilder::Type.base_type_class
+        return if base_param_class.blank? || base_type_class.blank?
+        return unless param_class.present? && param_class.ancestors.include?(base_type_class) && map[0].present?
+        descendant = base_param_class.parse_builder_def(config, param_class.wash_out_param_map)[0]
         self.name = descendant.name
         self.map = descendant.map
       end
 
+      # Description of method
+      #
+      # @param [String] complex_class A string that contains the name of a class
+      # @return [Class, nil] returns the class if it is defined otherwise nil
+      # @api public
+      def find_class_from_string(complex_class)
+        complex_class.is_a?(Class) ? complex_class : complex_class.constantize
+      rescue
+        nil
+      end
+
       # Method that is used to check if the current object has exactly same structure as one of his ancestors
       # if it is true, will return true, otherwise will first remove the inheritated elements from his ancestor and then return false
       # @see #find_param_structure
@@ -120,15 +130,14 @@ module WashoutBuilder
       #  'ActiveRecord::Base', 'Object', 'BasicObject', 'WashOut::Type'
       # @api public
       def get_ancestors(class_name)
-        param_class = begin
-          class_name.is_a?(Class) ? class_name : class_name.constantize
-        rescue
-          nil
-        end
+        param_class = find_class_from_string(class_name)
         if param_class.nil?
           return nil
         else
-          get_complex_type_ancestors(param_class, ['ActiveRecord::Base', 'Object', 'BasicObject', 'WashOut::Type'])
+          base_type_class =  WashoutBuilder::Type.base_type_class
+          filtered_classes = ['ActiveRecord::Base', 'Object', 'BasicObject']
+          filtered_classes << base_type_class.to_s if base_type_class.present?
+          get_complex_type_ancestors(param_class, filtered_classes)
         end
       end
 
@@ -210,7 +219,9 @@ module WashoutBuilder
       def get_class_ancestors(config, class_name, defined)
         ancestors = get_ancestors(class_name)
         return if ancestors.blank?
-        ancestor_object = WashOut::Param.parse_def(config, ancestor_structure(ancestors))[0]
+        base_param_class = WashoutBuilder::Type.base_param_class
+        return if base_param_class.blank?
+        ancestor_object = base_param_class.parse_def(config, ancestor_structure(ancestors))[0]
         bool_the_same = same_structure_as_ancestor?(ancestor_object)
         unless bool_the_same
           top_ancestors = get_class_ancestors(config, ancestors[0], defined)

data/lib/washout_builder/soap.rb

@@ -30,8 +30,10 @@ module WashoutBuilder
         end
 
         current_action = soap_actions[action]
-        current_action[:builder_in] = WashOut::Param.parse_builder_def(soap_config, options[:args])
-        current_action[:builder_out] = WashOut::Param.parse_builder_def(soap_config, options[:return])
+        base_param_class = WashoutBuilder::Type.base_param_class
+        return if base_param_class.blank?
+        current_action[:builder_in] = base_param_class.parse_builder_def(soap_config, options[:args])
+        current_action[:builder_out] = base_param_class.parse_builder_def(soap_config, options[:return])
       end
     end
   end

data/lib/washout_builder/type.rb

@@ -35,6 +35,13 @@ module WashoutBuilder
       defined?(WashOut::Param) ? WashOut::Param : nil
     end
 
+    # returns the base class that is used for WashOut types
+    #
+    # @return [Class] returns the base class that is used for WashOut types
+    # @api public
+    def self.base_type_class
+      defined?(WashOut::Type) ? WashOut::Type : nil
+    end
     # returns all the soap config classss that should be overriden to allow description of web service also besides namespace and endpoint
     #
     # @return [Array<Class>] returns all the soap config classss that should be overriden to allow description of web service also besides namespace and endpoint

data/lib/washout_builder/version.rb

@@ -12,7 +12,7 @@ module WashoutBuilder
     # the minor version of the gem
     MINOR = 0
     # the tiny version of the gem
-    TINY = 2
+    TINY = 4
     # if the version should be a e
     PRE = nil
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: washout_builder
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - bogdanRada