washout_builder 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e702f0e9e4f763b5deffe0314155a86ddd682d6
-  data.tar.gz: 3f8af9a0673595dfda19fb26c8c13f2127fe15aa
+  metadata.gz: 52f353a8aecf1b5a98c0917150ac3b5b8d276796
+  data.tar.gz: d180c28ca71d56fc95355e6cbc136ddff20f4a48
 SHA512:
-  metadata.gz: db067847f80138433cc00bb80d6fd47d59792bb7823041f9ebe4f059e5ec5442bafd904eccbff80f7b7984bd3f9496932ed8e0527f19333a817c88c672d4a691
-  data.tar.gz: 7d5ac46444d9e033e4a5c15a01f60e8e553f42dfbffb54bbcecb18217f9d4d0885bde9825b7bb130c91436a206bddb9b093e04b7ff0a6856c5bd933b13048927
+  metadata.gz: 729370b6e96ec3bea73fcea7b0647a2b2301cab068be5d962a11c9e46327d132a94568a1bb5578ab95e9dc69b4a537d04a491a5c6ceaf57014f90db6b705b3ae
+  data.tar.gz: 3d6b3026e25a81c53c4f03f38da6f82838b2cc1e5d4ee99bcf0cd4f3f74f103768b189ceea917fbaa1af847dc7e3de2650828b215a78eb31a09463e083b0f06a

data/app/helpers/washout_builder_complex_type_helper.rb

@@ -13,14 +13,15 @@ module WashoutBuilderComplexTypeHelper
   #
   # @api public
   def create_element_type_html(pre, element, element_description)
+    element_description = element_description.blank? ? nil : element_description.fetch(element.name.to_s.downcase, '')
     element.type = 'string' if element.type == 'text'
     element.type = 'integer' if element.type == 'int'
     if WashoutBuilder::Type::BASIC_TYPES.include?(element.type)
       pre << "<span class='blue'>#{element.type}</span>&nbsp;<span class='bold'>#{element.name}</span>"
-      pre << "&#8194;<span>#{element_description}</span>" unless element_description.nil?
+      pre << "&#8194;<span>#{element_description}</span>" unless element_description.blank?
       pre
     else
-      create_complex_element_type_html(pre, element)
+      create_complex_element_type_html(pre, element, element_description)
     end
   end
 
@@ -35,10 +36,12 @@ module WashoutBuilderComplexTypeHelper
   # @return [void]
   #
   # @api public
-  def create_complex_element_type_html(pre, element)
+  def create_complex_element_type_html(pre, element, element_description)
     complex_class = element.find_complex_class_name
     return if complex_class.nil?
     complex_class_content = element.multiplied == false ? "#{complex_class}" : "Array of #{complex_class}"
     pre << "<a href='##{complex_class}'><span class='lightBlue'>#{complex_class_content}</span></a>&nbsp;<span class='bold'>#{element.name}</span>"
+    pre << "&#8194;<span>#{element_description}</span>" unless element_description.blank?
+    pre
   end
 end

data/app/views/wash_with_html/_public_method.builder

@@ -13,7 +13,7 @@ xml.p "#{description}" unless description.blank?
     xml.ul {
       input.each do |element|
         xml.li("class" => "pre") { |pre|
-          create_element_type_html(pre, element, args_description.nil? ? nil : args_description[element.name.to_sym])
+          create_element_type_html(pre, element, args_description)
         }
       end
     }

data/app/views/wash_with_html/doc.builder

@@ -53,15 +53,15 @@ xml.html( "xmlns" => "http://www.w3.org/1999/xhtml" ) {
       @fault_types = @document.fault_types
       unless @complex_types.blank?
         xml.p  "Complex Types: "
-      
+
         xml.ul do
           @complex_types.each do |hash|
             xml.li { |y| y << "<a href='##{hash[:class]}'><span class='pre'>#{hash[:class]}</span></a>" }
           end
         end
-      
+
       end
-      
+
       unless @fault_types.blank?
         xml.p  "Fault Types: "
 
@@ -87,13 +87,13 @@ xml.html( "xmlns" => "http://www.w3.org/1999/xhtml" ) {
 
     unless @complex_types.blank?
       xml.h2 "Complex types:"
-      @complex_types.each  { |hash|            
+      @complex_types.each  { |hash|
         xml <<    render(:partial => "wash_with_html/complex_type", :locals => { :object => hash[:obj], :class_name =>  hash[:class], :ancestors => hash[:ancestors]})
       }
     end
     unless @fault_types.blank?
       xml.h2 "Fault types:"
-      @fault_types.each  { |hash|            
+      @fault_types.each  { |hash|
         xml <<    render(:partial => "wash_with_html/fault_type", :locals => { :object => hash[:fault], :structure =>  hash[:structure], :ancestors => hash[:ancestors]})
       }
     end
@@ -101,7 +101,7 @@ xml.html( "xmlns" => "http://www.w3.org/1999/xhtml" ) {
       xml.h2 "Public methods:"
       @map =  @document.sorted_operations
       unless @map.blank?
-        @map.each {  |operation, formats| 
+        @map.each {  |operation, formats|
           xml <<    render(:partial => "wash_with_html/public_method", :locals => {
               :operation => operation,
               :input =>  formats[:in],
@@ -112,14 +112,14 @@ xml.html( "xmlns" => "http://www.w3.org/1999/xhtml" ) {
           })
         }
       end
-      
+
     end
-    
+
     if @complex_types.blank? && @fault_types.blank? &&  @methods.blank?
       xml.p "There are no soap actions defined yet for this service. Please add some actions and try again!"
     end
-    
-    
+
+
   }
 
 }

data/lib/washout_builder.rb

@@ -43,9 +43,8 @@ WashoutBuilder::Type.all_soap_config_classes.each do |controller|
     end
 
     def self.config
-      original_config.merge(description: nil, args_description: nil)
+      original_config.merge(description: nil)
     end
   end
   controller.soap_accessor(:description)
-  controller.soap_accessor(:args_description)
 end

data/lib/washout_builder/document/generator.rb

@@ -70,14 +70,6 @@ module WashoutBuilder
         config.respond_to?(:description) ? config.description : nil
       end
 
-      # Returns the service arguments description if the service can respond to args_description method
-      #
-      # @return [String] Returns the service arguments description if the service can respond to args_description method
-      # @api public
-      def service_args_description
-        config.respond_to?(:args_description) ? config.args_description : nil
-      end
-
       #  returns a collection of all operation that the service responds to
       #
       # @return [Array<String>]  returns a collection of all operation that the service responds to

data/lib/washout_builder/soap.rb

@@ -28,12 +28,19 @@ module WashoutBuilder
             action = action.to_s.camelize
           end
         end
+        builder_soap_action(action, options)
+      end
+
+      private
 
+      def builder_soap_action(action, options = {})
         current_action = soap_actions[action]
         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])
+        current_action[:args_description] = options[:args_description].present? && options[:args_description].is_a?(Hash) ? options[:args_description].stringify_keys : {}
+        current_action
       end
     end
   end

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 = 6
+    TINY = 7
     # if the version should be a e
     PRE = nil
 

data/spec/app/helpers/washout_builder_complex_type_helper_spec.rb

@@ -20,7 +20,7 @@ describe WashoutBuilderComplexTypeHelper, type: :helper do
 
     def expect_excluded_type_result(pre, element)
       WashoutBuilder::Type::BASIC_TYPES.expects(:include?).with(element.type).returns(false)
-      helper.expects(:create_complex_element_type_html).with(pre, element)
+      helper.expects(:create_complex_element_type_html).with(pre, element, nil)
       helper.create_element_type_html(pre, element, nil)
     end
 
@@ -59,19 +59,19 @@ describe WashoutBuilderComplexTypeHelper, type: :helper do
     end
 
     it 'returna simple type element description' do
-      result = helper.create_complex_element_type_html(pre, element)
+      result = helper.create_complex_element_type_html(pre, element, nil)
       expect(result).to eq(["<a href='##{complex_class}'><span class='lightBlue'>#{complex_class}</span></a>&nbsp;<span class='bold'>#{element.name}</span>"])
     end
 
     it 'returns an array type element description' do
       element.stubs(:multiplied).returns(true)
-      result = helper.create_complex_element_type_html(pre, element)
+      result = helper.create_complex_element_type_html(pre, element, nil)
       expect(result).to eq(["<a href='##{complex_class}'><span class='lightBlue'>Array of #{complex_class}</span></a>&nbsp;<span class='bold'>#{element.name}</span>"])
     end
 
     it 'returns empty if no complex class' do
       element.stubs(:find_complex_class_name).returns(nil)
-      result = helper.create_complex_element_type_html(pre, element)
+      result = helper.create_complex_element_type_html(pre, element, nil)
       expect(result).to eq(nil)
     end
   end

metadata

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