soaspec 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d04d8069ff220fabc590725f88eb322d1346067c16efcdd007d235b55ac2d20
-  data.tar.gz: b7391039e8f3dd04845b49bba4fba4ca2d50dd444c088ceabc7f515907c2949c
+  metadata.gz: c9f6e35bf3fb8a025d3b6b3e7331686c6b1c2c6ab332fc46edf4c63e360e4b37
+  data.tar.gz: a1c11edd859c3b71a5f2384cef5437c41ec609a4104df144e6491d3081f588c6
 SHA512:
-  metadata.gz: b0ef8082d8e1e24576a0ea9bb9e477e33764a135b994d26e4a52a6a1366f57e8e3e89cb7d22f64914abbac27bce5c04ab21b6e1d9ee7703025539875b7187769
-  data.tar.gz: c984d69e28910e13171cd588ee98f363f0186b0d46b9ee8144a05964d7089054308f4017d4842ee7b064d25661b42c02d8a69fbf1c7a4c3e23106481819cdb61
+  metadata.gz: 74334ea904ce3ff6f131e43b1954945231bb0178aba8867564e7e9056b1f723a9506a500de582fa226d77dc872384a4944306b5dd35ae7766d1d1f0fd5c05af1
+  data.tar.gz: 8f9ff7688a0442663faa05a640912b8e4161317597ddd8ea6ad3e6cb7632800b50ed7441fb38caa080782e2f2b2d519d3e07ded33c552179c32514ceeeb21d35

data/.gitlab-ci.yml

@@ -39,11 +39,13 @@ ruby_2.6:
     - bundle exec rake
 
 cucumber:
+  image: samuelgarratt/soaspec
   stage: test
   script:
     - bundle exec cucumber
 
 doctest:
+  image: samuelgarratt/soaspec
   stage: test
   script:
     - bundle exec rake yard:doctest

data/.yardopts

@@ -0,0 +1 @@
+--plugin yard-doctest

data/ChangeLog

@@ -1,3 +1,10 @@
+Version 0.3.3
+* Enhancement
+  * Ability to specify multipart on Soaspec::OAuth2, not always assume it's value
+* Bug Fix
+  * SOAP error was calling undefined error
+  * SOAP 'format' for 'Exchange' was not being calculated as :xml
+
 Version 0.3.2
 * Enhancement
   * Handle 'html' format

data/Dockerfile

@@ -1,8 +1,10 @@
 FROM ruby:2.6
-MAINTAINER Samuel Garratt
+LABEL maintainer='Samuel Garratt'
+LABEL description='Dockerfile with soaspec gems preinstalled'
 LABEL url="https://gitlab.com/samuel-garratt/soaspec/blob/master/Dockerfile"
 # Simple Dockerfile with gems preinstalled
 RUN gem install bundler rake soaspec
+
 ENV LANG=en_US.UTF-8
 ENV LANGUAGE=en_US.UTF-8
 ENV LC_ALL=en_US.UTF-8

data/lib/soaspec/baseline.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'exe_helpers'
 
 module Soaspec
@@ -8,7 +10,7 @@ module Soaspec
     @folder = File.join('config', 'baseline')
 
     # @return [Array] List of allowed formats
-    ALLOWED_FORMATS = [:raw, :hash]
+    ALLOWED_FORMATS = %i[raw hash].freeze
 
     # @return [Exchange] Exchange object to save/assert baseline for
     attr_accessor :exchange
@@ -80,4 +82,4 @@ module Soaspec
       attr_accessor :folder
     end
   end
-end
+end

data/lib/soaspec/exchange_handlers/exchange_handler.rb

@@ -22,6 +22,8 @@ module Soaspec
 
     # @return [String] Name of the template file to be used in the API request
     attr_reader :template_name
+    # @return [Symbol] Option used to generate Request Body. Either :hash or :template
+    attr_accessor :request_option
 
     # Explicitly defined elements for which a path has been predefined
     def elements
@@ -33,7 +35,7 @@ module Soaspec
     # @param [Hash] _options Parameters defining handler. Used in descendants
     def initialize(name = self.class.to_s, _options = {})
       use
-      @request_option = :hash
+      self.request_option = :hash
       raise ArgumentError, 'Cannot define both template_name and default_hash' if respond_to?(:template_name_value) && respond_to?(:default_hash_value)
 
       @template_name = respond_to?(:template_name_value) ? template_name_value : ''
@@ -59,7 +61,7 @@ module Soaspec
     # This will set the @request_option instance variable too
     # @param [Hash] hash Hash to send in request body by default
     def default_hash=(hash)
-      @request_option = :hash
+      self.request_option = :hash
       @default_hash = Soaspec.always_use_keys? ? hash.transform_keys_to_symbols : hash
     end
 
@@ -67,7 +69,7 @@ module Soaspec
     # Erb is used to parse the template file, executing Ruby code in `<%= %>` blocks to work out the final request
     # @param [String] name Name of file inside 'template' folder excluding extension
     def template_name=(name)
-      @request_option = :template
+      self.request_option = :template
       @template_name = name
     end
 

data/lib/soaspec/exchange_handlers/request/rest_request.rb

@@ -24,14 +24,40 @@ module Soaspec
     # Headers. Keys that are `symbols` will be converted from `snake_case` to `Word-Word2`
     # @return [Hash] Headers sent as part of request
     attr_accessor :headers
+    # @return [Soaspec::RestHandler] RestHandler used for this request
+    attr_accessor :rest_handler
+
+    # Interpret REST parameters given provided parameters and adding defaults, making
+    # transformations
+    #
+    # @param [Hash] request_parameters Parameters used in making a request
+    # @return [Hash] Request parameters merged with default values
+    def interpret_parameters(request_parameters)
+      request_parameters = request_parameters.dup # Must duplicate hash as deletion occurring
+      request_parameters[:params] ||= {}
+      request_parameters[:method] ||= :post
+      suburl = request_parameters[:suburl]
+      if suburl
+        request_parameters[:suburl] = if suburl.is_a? Array
+                                        suburl.collect(&:to_s).join('/')
+                                      else
+                                        suburl.to_s
+                                      end
+      end
+      # Use q for query parameters. Nested :params is ugly, long and unclear
+      request_parameters[:params] = request_parameters.delete(:q) if request_parameters[:q]
+      request_parameters
+    end
 
     # @param [Hash] overall Overall parameters used in Request
     # @param [Hash] options Headers and basic auth options
-    # @param [String] body Body of Request to be sent
-    def initialize(overall, options, body)
-      overall_params = overall.dup # Must duplicate hash as deletion occurring
-      self.body = body
+    # @param [Soaspec::RestHandler] rest_handler RestHandler handling creation of this request
+    def initialize(overall, options, rest_handler)
+      self.rest_handler = rest_handler
+      overall_params = interpret_parameters(overall)
+      @overall_params = overall_params
       self.method = overall_params.delete(:method)
+      self.body = payload? ? post_data : nil #body
       self.suburl = overall_params.delete(:suburl)
       self.test_name = overall_params.delete(:name)
       self.other_params = overall_params
@@ -42,7 +68,7 @@ module Soaspec
 
     # @return [Hash] Query parameters for a REST Request
     def query
-      other_params[:q]
+      other_params[:params]
     end
 
     # @param [String, Symbol] value Message to send to object retrieving a value
@@ -65,13 +91,37 @@ module Soaspec
     def description
       suburl_desc = suburl.is_a?(Array) ? File.join(suburl) : suburl
       query_desc = ''
-      if query
-        query.each do |key, value|
-          query_desc = File.join(query_desc, "#{key}_#{value}")
-        end
+      query&.each do |key, value|
+        query_desc = File.join(query_desc, "#{key}_#{value}")
       end
       components = [method.to_s, suburl_desc, query_desc, 'response']
       File.join(*components.collect!(&:to_s))
     end
+
+    # @return [Boolean] Whether REST method should have a payload
+    def payload?
+      case method
+      when :post, :patch, :put
+        true
+      else
+        false
+      end
+    end
+
+    # TODO: Implement this for this object
+    # Work out data to send based upon payload, template_name, or body
+    # @return [String] Payload to send in REST request
+    def post_data
+      option = rest_handler.request_option
+      if option == :hash && !@overall_params[:payload]
+        @overall_params[:payload] = JSON.generate(rest_handler.hash_used_in_request(@overall_params[:body])).to_s
+      elsif option == :template
+        test_values = nil
+        test_values = @overall_params[:body].dup if @overall_params[:body]
+        Soaspec::TemplateReader.new.render_body(rest_handler.template_name, test_values || @overall_params)
+      else
+        @overall_params[:payload]
+      end
+    end
   end
 end

data/lib/soaspec/exchange_handlers/response_extractor.rb

@@ -16,9 +16,9 @@ module Soaspec
         return converted.transform_keys_to_symbols if converted.is_a? Hash
         return converted.map!(&:transform_keys_to_symbols) if converted.is_a? Array
 
-        raise 'Incorrect Type produced ' + converted.class
+        raise Soaspec::ResponseError, 'Incorrect Type produced ' + converted.class
       else
-        raise "Neither XML nor JSON detected. It is #{type}. Don't know how to parse It is #{response.body}"
+        raise Soaspec::ResponseError, "Neither XML nor JSON detected. It is #{type}. Don't know how to parse It is #{response.body}"
       end
     end
 

data/lib/soaspec/exchange_handlers/rest_handler.rb

@@ -38,49 +38,12 @@ module Soaspec
       super
       set_remove_keys(options, %i[api_username default_hash template_name])
       @init_options = options
-      init_merge_options # Call this to verify any issues with options on creating object
+      @merged_options ||= init_merge_options # Caches initial merge options
     end
 
-    # @return [Boolean] Whether REST method should have a payload
-    def payload?(overall_params)
-      case overall_params[:method]
-      when :post, :patch, :put
-        true
-      else
-        false
-      end
-    end
-
-    # @todo Use this in actually making the request
-    # At the moment this is just for one to manually view the parameters
-    # that will be used in making a request
-    # @return [RestRequest] Parameters used in making a request
+    # @return [Soaspec::RestRequest] Parameters used in making a request
     def request_parameters(override_parameters)
-      overall_params = interpret_parameters(override_parameters)
-      request = { overall: overall_params, options: init_merge_options }
-      request[:body] = post_data(overall_params) if payload?(overall_params)
-      RestRequest.new(overall_params, init_merge_options, payload?(overall_params) ? post_data(overall_params) : nil)
-    end
-
-    # Interpret REST parameters given provided parameters and adding defaults, making
-    # transformations
-    #
-    # @param [Hash] request_parameters Parameters used in making a request
-    # @return [Hash] Request parameters merged with default values
-    def interpret_parameters(request_parameters)
-      request_parameters[:params] ||= {}
-      request_parameters[:method] ||= :post
-      suburl = request_parameters[:suburl]
-      if suburl
-        if suburl.is_a? Array
-          request_parameters[:suburl] = suburl.collect(&:to_s).join('/')
-        else
-          request_parameters[:suburl] = suburl.to_s
-        end
-      end
-      # Use q for query parameters. Nested :params is ugly, long and unclear
-      request_parameters[:params][:params] = request_parameters[:q] if request_parameters[:q]
-      request_parameters
+      RestRequest.new(override_parameters, @merged_options, self)
     end
 
     # Override this with 'after_response' within class definition to perform an action
@@ -100,20 +63,19 @@ module Soaspec
     # @option override_parameters [String] :template_name Path to file to be read via ERB and passed in request body
     # @return [RestClient::Response] Response from making request
     def make_request(override_parameters)
-      @merged_options ||= init_merge_options # TODO: Is this var needed? Can method be passed to resource creation?
-      test_values = interpret_parameters override_parameters
+      req_params = request_parameters override_parameters
       # In order for ERB to be calculated at correct time, the first time request is made, the resource should be created
       @resource ||= RestClient::Resource.new(ERB.new(base_url_value).result(binding), @merged_options)
-      @resource_used = test_values[:suburl] ? @resource[test_values[:suburl]] : @resource
+      @resource_used = req_params.suburl ? @resource[req_params.suburl] : @resource
 
       self.exception = nil # Remove any previously stored exception
       begin
-        response = case test_values[:method]
+        response = case req_params.method
                    when :post, :patch, :put
-                     Soaspec::SpecLogger.info("request body: #{post_data(test_values)}")
-                     @resource_used.send(test_values[:method].to_s, post_data(test_values), test_values[:params])
+                     Soaspec::SpecLogger.info("request body: #{req_params.post_data}")
+                     @resource_used.send(req_params.method, req_params.post_data, req_params.other_params)
                    else # :get, :delete
-                     @resource_used.send(test_values[:method].to_s, test_values[:params])
+                     @resource_used.send(req_params.method, req_params.other_params )
                    end
       rescue RestClient::Exception => e
         self.exception = e
@@ -126,6 +88,17 @@ module Soaspec
       response
     end
 
+    # @param [Hash] override_hash Values to override default hash with
+    # @return [Hash] Hash used in REST request based on data conversion
+    def hash_used_in_request(override_hash)
+      request = override_hash ? @default_hash.merge(override_hash) : @default_hash
+      if pascal_keys?
+        request.map { |k, v| [convert_to_pascal_case(k.to_s), v] }.to_h
+      else
+        request
+      end
+    end
+
     # Add values to here when extending this class to have default REST options.
     # See rest client resource at https://github.com/rest-client/rest-client for details
     # It's easier to set headers via 'headers' accessor rather than here
@@ -145,6 +118,7 @@ module Soaspec
     end
 
     # Initialize value of merged options
+    # Also called to verify any issues with options on creating object
     # @return [Hash] Hash of merged options
     def init_merge_options
       options = rest_resource_options
@@ -179,6 +153,9 @@ module Soaspec
     # @return [Boolean] Whether response body contains expected key
     def include_key?(response, expected)
       value_from_path(response, expected)
+      true
+    rescue NoElementAtPath
+      false
     end
 
     # @return [Integer] HTTP Status code for response
@@ -270,38 +247,14 @@ module Soaspec
       end
     end
 
-    # @return [RestClient::Request] Request of API call. Either intended request or actual request
+    # @return [RestClient::Request, String] Request of API call. Either intended request or actual request
     def request(response)
-      return 'Request not yet sent' if response.nil?
+      if response.nil?
+        return 'Request not yet sent. Call :request_parameters' \
+        'for what will be sent'
+      end
 
       response.request
     end
-
-    # Work out data to send based upon payload, template_name, or body
-    # @return [String] Payload to send in REST request
-    def post_data(test_values)
-      data = if @request_option == :hash && !test_values[:payload]
-               test_values[:payload] = JSON.generate(hash_used_in_request(test_values[:body])).to_s
-             elsif @request_option == :template
-               test_values = test_values[:body].dup if test_values[:body]
-               test_values = IndifferentHash.new(test_values) # Allow test_values to be either Symbol or String
-               Soaspec::TemplateReader.new.render_body(template_name, binding)
-             else
-               test_values[:payload]
-             end
-      # Soaspec::SpecLogger.info "Request Empty for '#{@request_option}'" if data.strip.empty?
-      data
-    end
-
-    # @param [Hash] override_hash Values to override default hash with
-    # @return [Hash] Hash used in REST request based on data conversion
-    def hash_used_in_request(override_hash)
-      request = override_hash ? @default_hash.merge(override_hash) : @default_hash
-      if pascal_keys?
-        request.map { |k, v| [convert_to_pascal_case(k.to_s), v] }.to_h
-      else
-        request
-      end
-    end
   end
 end

data/lib/soaspec/exchange_handlers/soap_defaults.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+module Soaspec
+  # Default values set in order to make testing easier. Override to fit what you
+  # need in testing
+  module SoapDefaults
+    class << self
+      # Default Savon options. See http://savonrb.com/version2/globals.html for details
+      # @example Things could go wrong if not set properly
+      #   env_namespace: :soap, # Change environment namespace
+      #   namespace_identifier: :tst, # Change namespace element
+      #   element_form_default: :qualified # Populate each element with namespace
+      #   namespace: 'http://Extended_namespace.xsd' change root namespace
+      #   basic_auth: 'user', 'password'
+      # @return [Hash] Default Savon options for all BasicSoapHandler
+      def options
+        {
+          ssl_verify_mode: :none, # Easier for testing. Not so secure
+          follow_redirects: true, # Necessary for many API calls
+          soap_version: 2, # use SOAP 1.2. You will get 415 error if this is incorrect
+          raise_errors: false # HTTP errors not cause failure as often negative test scenarios expect not 200 response
+        }
+      end
+    end
+  end
+end

data/lib/soaspec/exchange_handlers/soap_globals.rb

@@ -0,0 +1,28 @@
+module Soaspec
+  # Singleton methods for assigning Savon globals (http://savonrb.com/version2/globals.html)
+  module SoapGlobals
+    # Set SOAP WSDL. Use namespace and endpoint if no WSDL defined
+    # @param [String] path Path to wsdl, either on network or locally
+    def wsdl(path)
+      define_method('wsdl') { path }
+    end
+
+    # Set Basic auth
+    def basic_auth(user, password)
+      define_method('basic_auth') { [user, password] }
+    end
+
+    # SOAP version number. Default is version 1.2
+    # @example SOAP Version 1.1
+    #   soap_version 1
+    def soap_version(number)
+      define_method('soap_version') { number }
+    end
+
+    %w[raise_errors namespace namespaces endpoint ssl_verify_mode].each do |method|
+      define_method(method) do |param|
+        define_method(method) { param }
+      end
+    end
+  end
+end

data/lib/soaspec/exchange_handlers/soap_handler.rb

@@ -6,6 +6,8 @@ require_relative '../errors'
 require_relative 'handler_accessors'
 require_relative '../interpreter'
 require_relative 'request/soap_request'
+require_relative 'soap_globals'
+require_relative 'soap_defaults'
 require 'forwardable'
 
 module Soaspec
@@ -22,6 +24,7 @@ module Soaspec
   class SoapHandler < ExchangeHandler
     extend Soaspec::SoapAccessors
     extend Forwardable
+    extend Soaspec::SoapGlobals
 
     delegate [:operations] => :client
 
@@ -29,6 +32,17 @@ module Soaspec
     attr_accessor :client
     # SOAP Operation to use by default
     attr_accessor :operation
+    # @return [Hash] List of Savon globals
+    attr_writer :savon_globals
+
+    def savon_globals
+      @savon_globals = {}
+      %i[wsdl basic_auth soap_version raise_errors namespace namespaces endpoint
+         ssl_verify_mode].each do |global|
+        @savon_globals.merge!(global => send(global)) if respond_to? global
+      end
+      @savon_globals
+    end
 
     # Attributes set at the root XML element of SOAP request
     def request_root_attributes; end
@@ -43,23 +57,6 @@ module Soaspec
       }
     end
 
-    # Default Savon options. See http://savonrb.com/version2/globals.html for details
-    # @example Things could go wrong if not set properly
-    #   env_namespace: :soap, # Change environment namespace
-    #   namespace_identifier: :tst, # Change namespace element
-    #   element_form_default: :qualified # Populate each element with namespace
-    #   namespace: 'http://Extended_namespace.xsd' change root namespace
-    #   basic_auth: 'user', 'password'
-    # @return [Hash] Default Savon options for all BasicSoapHandler
-    def default_options
-      {
-        ssl_verify_mode: :none, # Easier for testing. Not so secure
-        follow_redirects: true, # Necessary for many API calls
-        soap_version: 2, # use SOAP 1.2. You will get 415 error if this is incorrect
-        raise_errors: false # HTTP errors not cause failure as often negative test scenarios expect not 200 response
-      }
-    end
-
     # Add values to here when extending this class to have default Savon options.
     # See http://savonrb.com/version2/globals.html for details
     # @return [Hash] Savon options adding to & overriding defaults
@@ -77,14 +74,17 @@ module Soaspec
       end
       super
       set_remove_keys(options, %i[operation default_hash template_name])
-      merged_options = Soaspec::SpecLogger.log_api_traffic? ? default_options.merge(logging_options) : default_options
+      merged_options = SoapDefaults.options
+      merged_options.merge!(logging_options) if Soaspec::SpecLogger.log_api_traffic?
       merged_options.merge! savon_options
+      puts 'globals' + savon_globals.to_s
+      merged_options.merge! savon_globals
       merged_options.merge!(options)
       self.client = Savon.client(merged_options)
     end
 
     # @param [Hash] override_parameters Parameters for building the request
-    # @return [Hash] Parameters used in making a request
+    # @return [SoapRequest] Parameters used in making a request
     def request_parameters(override_parameters)
       SoapRequest.new(operation, request_body_params(override_parameters), @request_option)
     end
@@ -97,7 +97,7 @@ module Soaspec
       test_values.transform_keys_to_symbols if Soaspec.always_use_keys?
       if @request_option == :template
         test_values = IndifferentHash.new(test_values) # Allow test_values to be either Symbol or String
-        { xml: Soaspec::TemplateReader.new.render_body(template_name, binding) }
+        { xml: Soaspec::TemplateReader.new.render_body(template_name, test_values) }
       elsif @request_option == :hash
         { message: @default_hash.merge(test_values), attributes: request_root_attributes }
       end
@@ -111,7 +111,7 @@ module Soaspec
       begin
         client.call request.operation, request.body # request_body_params(request_parameters)
       rescue Savon::HTTPError => e
-        soap_error
+        e
       end
     end
 
@@ -213,14 +213,19 @@ module Soaspec
 
     # Convenience methods for once off usage of a SOAP request
     class << self
+      # @return [Array] List of operations WSDL can perform
+      def operations
+        operation_class = new('Get operations')
+        operation_class.operations
+      end
+
       # Implement undefined setter with []= for FactoryBot to use without needing to define params to set
       # @param [Object] method_name Name of method not defined
       # @param [Object] args Arguments passed to method
       # @param [Object] block
       def method_missing(method_name, *args, &block)
-        tmp_class = new(method_name)
-        operations = tmp_class.operations
         if operations.include? method_name
+          tmp_class = new(method_name)
           tmp_class.operation = method_name
           exchange = Exchange.new(method_name, *args)
           exchange.exchange_handler = tmp_class
@@ -231,9 +236,9 @@ module Soaspec
         end
       end
 
+      # Override respond_to_missing so that any method name that is an operation
+      # can be used
       def respond_to_missing?(method_name, *args)
-        tmp_class = new(args)
-        operations = tmp_class.operations
         operations.include?(method_name) || super
       end
     end

data/lib/soaspec/interpreter.rb

@@ -15,7 +15,8 @@ class Interpreter
       @xml_errors = nil
       @json_errors = nil
       @response = response
-      if @response.is_a? String
+      case @response
+      when String
         if xml?
           :xml
         elsif json?
@@ -25,10 +26,8 @@ class Interpreter
         else
           :string
         end
-      elsif response.is_a? Hash
-        :hash
-      elsif response.is_a?(Nokogiri::XML::NodeSet) || response.is_a?(Nokogiri::XML::Document)
-        :xml
+      when Hash then :hash
+      when Nokogiri::XML::NodeSet, Nokogiri::XML::Document, Savon::Response then :xml
       else
         :unknown
       end

data/lib/soaspec/matchers.rb

@@ -25,19 +25,20 @@ RSpec::Matchers.define :include_in_body do |expected|
   end
 end
 
-# Whether an element exists at expected xpath
-RSpec::Matchers.define :have_element_at_path do |xpath|
+# Whether an element exists at expected path
+RSpec::Matchers.define :have_element_at_path do |path|
   match do |object|
     # Object like `response` returns the Exchange object from which a path can be obtained
     exchange = object.respond_to?(:exchange) ? object.exchange : object
-    expect { exchange[xpath] }.to_not raise_error # Error will be raised if Path returns no value
+    exchange.element? path # [xpath]
+    # expect { exchange[xpath] }.to_not raise_error # Error will be raised if Path returns no value
   end
 
   # TODO: Would be better to print failure message
   failure_message do |object|
     # Object like `response` returns the Exchange object from which a path can be obtained
     exchange = object.respond_to?(:exchange) ? object.exchange : object
-    "expected that #{exchange.exchange_handler.response_body(exchange.response, format: :raw)} would have element at path '#{xpath}'"
+    "expected that #{exchange.exchange_handler.response_body(exchange.response, format: :raw)} would have element at path '#{path}'"
   end
 end
 
@@ -76,7 +77,6 @@ end
 # @param [Symbol] format Format to save the baseline as. Default is :raw. Use :hash
 #   to store as hash which will ignore order in comparison
 RSpec::Matchers.define :match_baseline do |format = :raw|
-
   match do |exchange|
     Soaspec::Baseline.new(exchange, format).matches?
   end

data/lib/soaspec/o_auth2.rb

@@ -132,11 +132,21 @@ module Soaspec
       payload.merge(if params[:password] && params[:username]
                       {
                         grant_type: 'password', username: params[:username],
-                        password: password, multipart: true
-                      }
+                        password: password
+                      }.merge multipart true
                     else
-                      { grant_type: 'client_credentials' }
+                      { grant_type: 'client_credentials' }.merge multipart false
                     end)
     end
+
+    private
+
+    # @param [Boolean] default Default value for multipart
+    # @return [Hash] Multipart set to true if not set and is grant_type password
+    def multipart(default)
+      return { multipart: true } if (params[:multipart].nil? && default) || params[:multipart]
+
+      {}
+    end
   end
 end

data/lib/soaspec/template_reader.rb

@@ -15,7 +15,11 @@ module Soaspec
 
     # @param [String] template_name File where template is stored
     # @return [String] Body of template after determining test_values
-    def render_body(template_name, binding)
+    def render_body(template_name, test_values)
+      test_values = IndifferentHash.new(test_values) # Allow test_values to be either Symbol or String
+      test_values&.each do |key, value|
+        instance_variable_set("@#{key}", value)
+      end
       self.template_name = template_name
       unless File.exist? file_location
         raise "Cannot see file at #{file_location}. "\

data/lib/soaspec/version.rb

@@ -2,5 +2,5 @@
 
 module Soaspec
   # @return [String] Version of the gem
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

data/lib/soaspec/virtual_server.rb

@@ -102,6 +102,11 @@ module Soaspec
       Soaspec::TestServer::IdManager.developed.to_s
     end
 
+    documentation 'Sends back params received'
+    get '/echoer' do
+      params.to_s
+    end
+
     # Used for simple testing of posing
     documentation 'Simply sends the response body back'
     post '/echoer' do
@@ -192,14 +197,14 @@ module Soaspec
 
     documentation 'HTML doc that is not valid HTML'
     get '/html_doc' do
-      <<-HTML
-<!doctype html>
-<html lang="en">
-<head></head>
-<body>
-<h1>Heading</h1>
-</body>
-</html>
+      <<~HTML
+        <!doctype html>
+        <html lang="en">
+        <head></head>
+        <body>
+        <h1>Heading</h1>
+        </body>
+        </html>
       HTML
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soaspec
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - SamuelGarrattIQA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-01 00:00:00.000000000 Z
+date: 2019-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -459,6 +459,7 @@ files:
 - ".gitlab-ci.yml"
 - ".rspec"
 - ".rubocop.yml"
+- ".yardopts"
 - CODE_OF_CONDUCT.md
 - ChangeLog
 - Dockerfile
@@ -492,6 +493,8 @@ files:
 - lib/soaspec/exchange_handlers/rest_methods.rb
 - lib/soaspec/exchange_handlers/rest_parameters.rb
 - lib/soaspec/exchange_handlers/rest_parameters_defaults.rb
+- lib/soaspec/exchange_handlers/soap_defaults.rb
+- lib/soaspec/exchange_handlers/soap_globals.rb
 - lib/soaspec/exchange_handlers/soap_handler.rb
 - lib/soaspec/exe_helpers.rb
 - lib/soaspec/generate_server.rb
@@ -558,7 +561,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Helps to create tests for 'SOAP' or 'REST' apis