soaspec 0.2.33 → 0.3.1

data/lib/soaspec/exchange/exchange_properties.rb

@@ -1,28 +1,28 @@
-# frozen_string_literal: true
-
-module Soaspec
-  # Convenience methods to set Exchange specific properties
-  # Will be used when creating a subclass of Exchange
-  module ExchangeProperties
-    # Set default exchange handler for this exchange
-    # This is helpful for when you need a new exchange handler created for each exchange
-    # @param [Class] handler_class Class of ExchangeHandler to set Exchange to use
-    # @param [String] name Name to call handler when it's instantiated (Defaults to class name)
-    # @param [Hash] params Hash of parameters to set for instance of ExchangeHandler
-    def default_handler(handler_class, name = handler_class.to_s, params = '')
-      define_method('default_handler_used') do
-        params_used = Hash[params.map do |k, param|
-          [k, param.is_a?(String) ? ERB.new(param).result(binding) : param]
-        end]
-        handler_class.new name, params_used
-      end
-    end
-
-    # Set retry_for_success to true, retrying response until a successful status code is returned
-    # @param [Integer] retry_count Times to retry to get a positive response
-    def expect_positive_status(retry_count: 3)
-      define_method('retry_count') { retry_count }
-      define_method('retry_for_success?') { true }
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Soaspec
+  # Convenience methods to set Exchange specific properties
+  # Will be used when creating a subclass of Exchange
+  module ExchangeProperties
+    # Set default exchange handler for this exchange
+    # This is helpful for when you need a new exchange handler created for each exchange
+    # @param [Class] handler_class Class of ExchangeHandler to set Exchange to use
+    # @param [String] name Name to call handler when it's instantiated (Defaults to class name)
+    # @param [Hash] params Hash of parameters to set for instance of ExchangeHandler
+    def default_handler(handler_class, name = handler_class.to_s, params = '')
+      define_method('default_handler_used') do
+        params_used = Hash[params.map do |k, param|
+          [k, param.is_a?(String) ? ERB.new(param).result(binding) : param]
+        end]
+        handler_class.new name, params_used
+      end
+    end
+
+    # Set retry_for_success to true, retrying response until a successful status code is returned
+    # @param [Integer] retry_count Times to retry to get a positive response
+    def expect_positive_status(retry_count: 3)
+      define_method('retry_count') { retry_count }
+      define_method('retry_for_success?') { true }
+    end
+  end
+end

data/lib/soaspec/exchange/exchange_repeater.rb

@@ -1,21 +1,21 @@
-# frozen_string_literal: true
-
-module Soaspec
-  # Ways of repeating an exchange to reach a desired outcome
-  module ExchangeRepeater
-    # Wait until the passed block returns true
-    # @param [Hash] opts Options for this instance
-    # @option opts [Numeric] :timeout (5) Seconds to wait before timing out.
-    # @option opts [Numeric] :interval (0.2) Seconds to sleep between polls.
-    # @option opts [String] :message Exception message if timed out.
-    # @option opts [Array, Exception] :ignore Exceptions to ignore while polling (default: Error::NoSuchElementError)
-    # @return [Exchange] Returns itself so operations can be done on the exchange after it's done waiting
-    def until(opts = {}, &script)
-      Soaspec::Wait.until(opts) do
-        @response = nil # Reset response so it can be made repeatedly
-        instance_eval(&script)
-      end
-      self
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Soaspec
+  # Ways of repeating an exchange to reach a desired outcome
+  module ExchangeRepeater
+    # Wait until the passed block returns true
+    # @param [Hash] opts Options for this instance
+    # @option opts [Numeric] :timeout (5) Seconds to wait before timing out.
+    # @option opts [Numeric] :interval (0.2) Seconds to sleep between polls.
+    # @option opts [String] :message Exception message if timed out.
+    # @option opts [Array, Exception] :ignore Exceptions to ignore while polling (default: Error::NoSuchElementError)
+    # @return [Exchange] Returns itself so operations can be done on the exchange after it's done waiting
+    def until(opts = {}, &script)
+      Soaspec::Wait.until(opts) do
+        @response = nil # Reset response so it can be made repeatedly
+        instance_eval(&script)
+      end
+      self
+    end
+  end
+end

data/lib/soaspec/exchange/request_builder.rb

@@ -1,70 +1,108 @@
-# frozen_string_literal: true
-
-module Soaspec
-  # Methods to help build a Request
-  module RequestBuilder
-    # Specify a url to add onto the base_url of the ExchangeHandler used
-    # @param [String] url Url to add onto the base_url of the ExchangeHandler used
-    def suburl=(url)
-      @override_parameters[:suburl] = url
-    end
-
-    # Specify HTTP method to use. Default is :post
-    # @param [Symbol] method HTTP method. E.g, :get, :patch
-    def method=(method)
-      @override_parameters[:method] = method
-    end
-
-    # Set a parameter request in the request body.
-    # Can be used to build a request over several steps (e.g Cucumber)
-    # Will be used with FactoryBot
-    #
-    # @example
-    #   exchange['name'] = 'tester'
-    #   # Will set { name: tester } in the response, formatting as JSON or XML depending on REST / SOAP
-    # @param [String, Symbol] key Name of request element to set
-    # @param [String] value Value to set request element to
-    def []=(key, value)
-      @override_parameters[:body] ||= {}
-      @override_parameters[:body][key] = value
-    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 Block passed to method
-    def method_missing(method_name, *args, &block)
-      set_value = args.first
-      if method_name[-1] == '=' # A setter method
-        getter_name = method_name[0..-2]
-        if set_value.class < Exchange # This would be prerequisite exchange
-          define_singleton_method(getter_name) { set_value }
-          self[getter_name] = set_value.id if set_value.respond_to?(:id)
-        else
-          self[getter_name] = set_value
-        end
-      else
-        super
-      end
-    end
-
-    # Used for setters that are not defined
-    # @param [String] method_name Name of method
-    # @param [Array] args List of arguments to method
-    def respond_to_missing?(method_name, *args)
-      method_name[-1] == '=' || super
-    end
-
-    # Makes request, caching the response and returning self
-    # Used by FactoryBot
-    # @return [Self] Return itself so methods can be called on itself afterwards
-    def save!
-      @retry_for_success = @fail_factory ? false : true
-      previous_setting = Soaspec.log_warnings
-      Soaspec.log_warnings = false # Don't log this warning as result of call not being used
-      call
-      Soaspec.log_warnings = previous_setting
-      self
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Soaspec
+  # Methods to help build a Request
+  module RequestBuilder
+    # Specify a url to add onto the base_url of the ExchangeHandler used
+    # @param [String] url Url to add onto the base_url of the ExchangeHandler used
+    def suburl=(url)
+      @override_parameters[:suburl] = url
+    end
+
+    # Specify HTTP method to use. Default is :post
+    # @param [Symbol] method HTTP method. E.g, :get, :patch
+    def method=(method)
+      @override_parameters[:method] = method
+    end
+
+    # Set a parameter request in the request body.
+    # Can be used to build a request over several steps (e.g Cucumber)
+    # Will be used with FactoryBot
+    #
+    # @example
+    #   exchange['name'] = 'tester'
+    #   # Will set { name: tester } in the response, formatting as JSON or XML depending on REST / SOAP
+    # @param [String, Symbol] key Name of request element to set
+    # @param [String] value Value to set request element to
+    def []=(key, value)
+      @override_parameters[:body] ||= {}
+      @override_parameters[:body][key] = value
+    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 Block passed to method
+    def method_missing(method_name, *args, &block)
+      set_value = args.first
+      if method_name[-1] == '=' # A setter method
+        getter_name = method_name[0..-2]
+        if set_value.class < Exchange # This would be prerequisite exchange
+          define_singleton_method(getter_name) { set_value }
+          self[getter_name] = set_value.id if set_value.respond_to?(:id)
+        else
+          self[getter_name] = set_value
+        end
+      else
+        super
+      end
+    end
+
+    # Used for setters that are not defined
+    # @param [String] method_name Name of method
+    # @param [Array] args List of arguments to method
+    def respond_to_missing?(method_name, *args)
+      method_name[-1] == '=' || super
+    end
+
+    # Makes request, caching the response and returning self
+    # Used by FactoryBot
+    # @return [Self] Return itself so methods can be called on itself afterwards
+    def save!
+      @retry_for_success = @fail_factory ? false : true
+      call
+    end
+
+    # Add request parameters onto existing exchange
+    # @example New query of api_key=123 to exchange
+    #   exchange = Exchange.new
+    #   exchange + { q: { api_key: 123 } }
+    #
+    # @example Add query of testing as true to exchange
+    #   exchange = Exchange.new q: { api_key: 123 }
+    #   exchange + { q: { testing: true } }
+    #   exchange.request_parameters.q # => { api_key: 123, testing: true } }
+    #
+    # @example Add suburl of 'test' to existing suburl
+    #   exchange = Exchange.new suburl: 'subpath'
+    #   exchange + { suburl: '/test' }
+    #   exchange.request_parameters.suburl # => 'subpath/test'
+    #
+    # @example Using add to add suburl
+    #   exchange = Exchange.new suburl: 'subpath'
+    #   exchange.add suburl: '/test'
+    #   exchange.request_parameters.suburl # => 'subpath/test'
+    # @param [Hash] request_parameters Parameters to add to exchange
+    def +(request_parameters)
+      request_parameters.each do |req_name, req_value|
+        if req_value.respond_to?(:each)
+          req_value.each do |key, value|
+            if @override_parameters[req_name]
+              @override_parameters[req_name][key] = value
+            else
+              @override_parameters[req_name] = { key => value }
+            end
+          end
+        else
+          if @override_parameters[req_name]
+            @override_parameters[req_name] += req_value
+          else
+            @override_parameters[req_name] = req_value
+          end
+        end
+      end
+    end
+
+    alias add +
+  end
+end

data/lib/soaspec/exchange/variable_storer.rb

@@ -1,24 +1,24 @@
-# frozen_string_literal: true
-
-module Soaspec
-  # Enables Exchange to store and retrieve variables so that one
-  # exchange can make assertions based on a previous one
-  module VariableStorer
-    # Stores a value in the api handler that can be accessed by the provided name
-    # @param [Symbol] name Name of method to use to access this value within handler
-    # @param [String] value Path to value to store
-    def store(name, value)
-      exchange_handler.store(name, self[value])
-    end
-
-    # Retrieve the stored value from the Api Handler
-    # @param [String, Symbol] name Name of value to retrieve
-    # @return [Object] value from the Api Handler stored previously
-    def retrieve(name)
-      method = '__stored_val__' + name.to_s
-      raise ArgumentError('Value not stored at ') unless exchange_handler.respond_to? method
-
-      exchange_handler.send(method)
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Soaspec
+  # Enables Exchange to store and retrieve variables so that one
+  # exchange can make assertions based on a previous one
+  module VariableStorer
+    # Stores a value in the api handler that can be accessed by the provided name
+    # @param [Symbol] name Name of method to use to access this value within handler
+    # @param [String] value Path to value to store
+    def store(name, value)
+      exchange_handler.store(name, self[value])
+    end
+
+    # Retrieve the stored value from the Api Handler
+    # @param [String, Symbol] name Name of value to retrieve
+    # @return [Object] value from the Api Handler stored previously
+    def retrieve(name)
+      method = '__stored_val__' + name.to_s
+      raise ArgumentError('Value not stored at ') unless exchange_handler.respond_to? method
+
+      exchange_handler.send(method)
+    end
+  end
+end

data/lib/soaspec/exchange_handlers/exchange_handler.rb

@@ -1,98 +1,98 @@
-# frozen_string_literal: true
-
-require_relative 'handler_accessors'
-require_relative 'exchange_handler_defaults'
-
-module Soaspec
-  # Inherit this for a class describing how to implement a particular exchange.
-  # Has methods common to Soaspec framework for working with Exchange/Handler pair
-  class ExchangeHandler
-    extend Soaspec::HandlerAccessors
-    include ExchangeHandlerDefaults
-
-    # @return [Exception] Exception if raised
-    attr_accessor :exception
-
-    # Use an instance of this ExchangeHandler in any further Exchange's
-    # This is a convenience method as it creates an ExchangeHandler behind the scenes
-    # @return [ExchangeHandler] Exchange handler instance created
-    def self.use
-      new.use
-    end
-
-    # @return [String] Name of the template file to be used in the API request
-    attr_reader :template_name
-
-    # Explicitly defined elements for which a path has been predefined
-    def elements
-      public_methods.select { |i| i[/__custom_path_.+/] }
-    end
-
-    # Set instance variable name
-    # @param [String, Symbol] name Name used when describing API test
-    # @param [Hash] _options Parameters defining handler. Used in descendants
-    def initialize(name = self.class.to_s, _options = {})
-      use
-      @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 : ''
-      @default_hash = respond_to?(:default_hash_value) ? default_hash_value : {}
-      @name = name
-    end
-
-    # Set Api handler used by Exchange class to this handler
-    # @return [Self]
-    def use
-      Soaspec.api_handler = self
-      self
-    end
-
-    # Sets api handler variable globally. This is used in 'Exchange' class
-    # @return [String] Name set upon initialisation
-    def to_s
-      use
-      @name.to_s
-    end
-
-    # Set the default hash representing data to be used in making a request
-    # 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
-      @default_hash = Soaspec.always_use_keys? ? hash.transform_keys_to_symbols : hash
-    end
-
-    # Set the request option type and the template name
-    # 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
-      @template_name = name
-    end
-
-    # Stores a value in a method that can be accessed by the provided name
-    # @param [Symbol] name Name of method to use to access this value within handler
-    # @param [String] value Value to store
-    def store(name, value)
-      define_singleton_method('__stored_val__' + name.to_s) { value }
-    end
-
-    # Set instance variable for each key in hash remove it from Hash
-    # @param [Hash] hash with items to remove from
-    # @param [Array] keys List of keys to remove from hash, setting each one
-    def set_remove_keys(hash, keys)
-      keys.each { |key| set_remove_key(hash, key) }
-    end
-
-    # Set instance variable and remove it from Hash
-    # @param [Hash] hash Hash to remove/retrieve keys from
-    # @param [String,Symbol] key Key to remove and to set instance variable for
-    def set_remove_key(hash, key)
-      return unless hash.key? key
-
-      __send__("#{key}=", hash[key])
-      hash.delete key
-    end
-  end
-end
+# frozen_string_literal: true
+
+require_relative 'handler_accessors'
+require_relative 'exchange_handler_defaults'
+
+module Soaspec
+  # Inherit this for a class describing how to implement a particular exchange.
+  # Has methods common to Soaspec framework for working with Exchange/Handler pair
+  class ExchangeHandler
+    extend Soaspec::HandlerAccessors
+    include ExchangeHandlerDefaults
+
+    # @return [Exception] Exception if raised
+    attr_accessor :exception
+
+    # Use an instance of this ExchangeHandler in any further Exchange's
+    # This is a convenience method as it creates an ExchangeHandler behind the scenes
+    # @return [ExchangeHandler] Exchange handler instance created
+    def self.use
+      new.use
+    end
+
+    # @return [String] Name of the template file to be used in the API request
+    attr_reader :template_name
+
+    # Explicitly defined elements for which a path has been predefined
+    def elements
+      public_methods.select { |i| i[/__custom_path_.+/] }
+    end
+
+    # Set instance variable name
+    # @param [String, Symbol] name Name used when describing API test
+    # @param [Hash] _options Parameters defining handler. Used in descendants
+    def initialize(name = self.class.to_s, _options = {})
+      use
+      @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 : ''
+      @default_hash = respond_to?(:default_hash_value) ? default_hash_value : {}
+      @name = name
+    end
+
+    # Set Api handler used by Exchange class to this handler
+    # @return [Self]
+    def use
+      Soaspec.api_handler = self
+      self
+    end
+
+    # Sets api handler variable globally. This is used in 'Exchange' class
+    # @return [String] Name set upon initialisation
+    def to_s
+      use
+      @name.to_s
+    end
+
+    # Set the default hash representing data to be used in making a request
+    # 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
+      @default_hash = Soaspec.always_use_keys? ? hash.transform_keys_to_symbols : hash
+    end
+
+    # Set the request option type and the template name
+    # 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
+      @template_name = name
+    end
+
+    # Stores a value in a method that can be accessed by the provided name
+    # @param [Symbol] name Name of method to use to access this value within handler
+    # @param [String] value Value to store
+    def store(name, value)
+      define_singleton_method('__stored_val__' + name.to_s) { value }
+    end
+
+    # Set instance variable for each key in hash remove it from Hash
+    # @param [Hash] hash with items to remove from
+    # @param [Array] keys List of keys to remove from hash, setting each one
+    def set_remove_keys(hash, keys)
+      keys.each { |key| set_remove_key(hash, key) }
+    end
+
+    # Set instance variable and remove it from Hash
+    # @param [Hash] hash Hash to remove/retrieve keys from
+    # @param [String,Symbol] key Key to remove and to set instance variable for
+    def set_remove_key(hash, key)
+      return unless hash.key? key
+
+      __send__("#{key}=", hash[key])
+      hash.delete key
+    end
+  end
+end