washout_builder 1.7.4 → 2.0.4

data/spec/support/complex_types/test_type.rb

@@ -2,9 +2,8 @@ module Api
   class TestType < WashOut::Type
     map project: {
       name: :string,
-      description: :string,
+      title: :string,
       users: [{ mail: :string }],
-      #  'dada'                                    => [Project]
     }
   end
 end

data/washout_builder.gemspec

@@ -22,12 +22,13 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'wash_out', '>= 0.9.1', '>= 0.9.1'
   s.add_runtime_dependency 'activesupport', '>= 4.0', '>= 4.0'
 
-  s.add_development_dependency 'wasabi', '~> 3.5', '>= 3.5'
+  # wasabi >= 3.6.0 does not work well with savon
+  s.add_development_dependency 'wasabi', '< 3.6.0'
   s.add_development_dependency 'savon', '~> 2.11', '>= 2.11'
   s.add_development_dependency 'httpi', '~> 2.4', '>= 2.4'
   s.add_development_dependency 'nokogiri', '~> 1.7', '>= 1.7'
 
-  s.add_development_dependency 'rspec-rails','4.0.0.beta3'
+  s.add_development_dependency 'rspec-rails','4.0.2'
   s.add_development_dependency 'appraisal', '~> 2.1', '>= 2.1'
   s.add_development_dependency 'simplecov', '~> 0.12', '>= 0.12'
   s.add_development_dependency 'simplecov-summary', '~> 0.0.5', '>= 0.0.5'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: washout_builder
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 2.0.4
 platform: ruby
 authors:
 - bogdanRada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-30 00:00:00.000000000 Z
+date: 2021-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wash_out
@@ -42,80 +42,74 @@ dependencies:
   name: wasabi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.5'
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.5'
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.11'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.11'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.11'
 - !ruby/object:Gem::Dependency
   name: httpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.4'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
@@ -124,112 +118,112 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta3
+        version: 4.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta3
+        version: 4.0.2
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.12'
 - !ruby/object:Gem::Dependency
   name: simplecov-summary
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.5
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.5
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
@@ -256,60 +250,60 @@ dependencies:
   name: yard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.4'
 - !ruby/object:Gem::Dependency
   name: github-markup
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
@@ -350,6 +344,7 @@ files:
 - app/helpers/washout_builder_method_arguments_helper.rb
 - app/helpers/washout_builder_method_list_helper.rb
 - app/helpers/washout_builder_method_return_type_helper.rb
+- app/helpers/washout_builder_shared_helper.rb
 - app/views/wash_with_html/_complex_type.builder
 - app/views/wash_with_html/_fault_type.builder
 - app/views/wash_with_html/_public_method.builder
@@ -370,6 +365,7 @@ files:
 - gemfiles/rails_5.2.4.gemfile
 - gemfiles/rails_6.0.0.gemfile
 - gemfiles/rails_6.0.1.gemfile
+- gemfiles/rails_6.1.3.gemfile
 - gemfiles/rails_api_4.2.7.gemfile
 - init.rb
 - install-travis-bundler.sh
@@ -380,7 +376,6 @@ files:
 - lib/washout_builder/document/shared_complex_type.rb
 - lib/washout_builder/engine.rb
 - lib/washout_builder/env_checker.rb
-- lib/washout_builder/param.rb
 - lib/washout_builder/router.rb
 - lib/washout_builder/soap.rb
 - lib/washout_builder/type.rb
@@ -446,7 +441,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: WashOut Soap Service HTML-Documentation generator (extends WashOut https://github.com/inossidabile/wash_out/)

data/lib/washout_builder/param.rb

@@ -1,50 +0,0 @@
-module WashoutBuilder
-  # module that extends the base WashoutParam to allow parsing of definitions for building documentation
-  module Param
-    extend ActiveSupport::Concern
-
-    # Method that receives the arguments for a soap action (input or output) and tries to parse the definition (@see WashOutParam#parse_def)
-    #
-    # the following lines was removed from original method because when generating the documentation
-    #  the "source_class" attrtibute of the object was not the name of the class of the complex tyoe
-    # but instead was the name given in the hash
-    #
-    # if definition.is_a?(Class) && definition.ancestors.include?(WashOut::Type)
-    #        definition = definition.wash_out_param_map
-    #    end
-    #
-    # @example Given the class ProjectType as a "definition" argument, the complex type name should be  ProjectType and not "project"
-    #  class ProjectType < WashOut::Type
-    #  map :project => {
-    # :name                                    => :string,
-    #  :description                           => :string,
-    #  :users                                    => [{:mail => :string }],
-    #  }
-    # end
-    #
-    #
-    # @see WashoutBuilder::SOAP#soap_action
-    # @see WashOutParam#initialize
-    #
-    # @param [WasOut::SoapConfig] soap_config Holds the soap configuration for the entire web service
-    # @param [Object] definition  Any type of object ( this is passed from the soap action)
-    #
-    # @return [Type] description of returned object
-    def parse_builder_def(soap_config, definition)
-      raise '[] should not be used in your params. Use nil if you want to mark empty set.' if definition == []
-      return [] if definition.blank?
-
-      definition = { value: definition } unless definition.is_a?(Hash) # for arrays and symbols
-
-      definition.map do |name, opt|
-        if opt.is_a? self
-          opt
-        elsif opt.is_a? Array
-          new(soap_config, name, opt[0], true)
-        else
-          new(soap_config, name, opt)
-        end
-      end
-    end
-  end
-end