soaspec 0.2.10 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 479264a2d576169c5b37f414b7c413991da0d58d
-  data.tar.gz: 1f7d26e2d200d735a376cf45c6cc829787439f4d
+  metadata.gz: f4316417650edcdef9d66fb391ff90736a400dc2
+  data.tar.gz: 163b3ca2c9a547915693d33a7e7147dbc079cea6
 SHA512:
-  metadata.gz: a6ad91dc7c734051b75c0c2308f5186aec8cb6eb215f949a54ecc9f0f466fa94e8dbf3a1ca9ab7374e1474f6543dec96682b5b1be7f9ad3de1126a5604b8665d
-  data.tar.gz: 02be37ad8dbb06ca077357c0edf94a5c3cbdef3e75ff13c74dda336283d4bf21ce14cf6fe5252d05d99faf24811ad368942e46228de16a77078855d56b2fe3e3
+  metadata.gz: 2a58886e537a7e063f4977a184cac67d32ffe4827d4331315475d780450d0025bf86a000978457a0d5b52f1361e54496d1661f70904f6aa84f9ada7a8d300f12
+  data.tar.gz: 41c07147d1db749aab3b3c4dfbfa638b46e46297ddbdc39c9f8eef0eb27bc9ad47dc347920c960fa1069236641aa2acd58d4619c6f46f0d775783b933b8dcbfb

data/ChangeLog

@@ -1,3 +1,7 @@
+Version 0.2.11
+* Bug Fix
+  * Cache 'Soaspec::OAuth2.instance_url' so Access token server not called everytime it's needed
+
 Version 0.2.10
 * Enhancements
   * Added 'soaspec/demo' to be required to simplify demoing

data/lib/soaspec.rb

@@ -15,7 +15,7 @@ require 'soaspec/template_reader'
 require 'soaspec/exchange_handlers/soap_handler'
 require 'soaspec/exchange_handlers/exchange_handler'
 require 'soaspec/exchange_handlers/rest_methods'
-require 'soaspec/exchange'
+require 'soaspec/exchange/exchange'
 require 'soaspec/matchers'
 require 'soaspec/soaspec_shared_examples'
 require 'soaspec/core_ext/hash'

data/lib/soaspec/demo.rb

@@ -1,4 +1,4 @@
 # Load this file for demoing Soaspec (e.g in IRB). Has common settings applicable for demoing
 
 require_relative '../soaspec'
-Soaspec::SpecLogger.output_to_terminal = true
+Soaspec::SpecLogger.output_to_terminal = true

data/lib/soaspec/exchange/exchange.rb

@@ -0,0 +1,97 @@
+require_relative '../../soaspec'
+require_relative 'exchange_properties'
+require_relative 'exchange_extractor'
+require_relative 'request_builder'
+require_relative 'exchange_repeater'
+require_relative 'variable_storer'
+
+# This represents a request / response pair
+# Essentially, params in the exchange that are set are related to the request
+# What is returned is related to the response
+class Exchange
+  extend Soaspec::ExchangeProperties
+  include Soaspec::ExchangeExtractor
+  include Soaspec::RequestBuilder
+  include Soaspec::ExchangeRepeater
+  include Soaspec::VariableStorer
+
+  # Instance of ExchangeHandler for which this exchange is made
+  attr_accessor :exchange_handler
+  # How many times to retry for a success
+  attr_accessor :retry_count
+  # Name used for displaying class
+  attr_accessor :test_name
+  # Expect Factory to fail upon trying to create
+  attr_writer :fail_factory
+  # Parameters to override for default params
+  attr_accessor :override_parameters
+
+  # Set retry for success variable to true so that request will be retried
+  # for retry_count until it's true
+  def retry_for_success
+    @retry_for_success = true
+    self
+  end
+
+  # @return [Bool] Whether to keep making request until success code reached
+  def retry_for_success?
+    @retry_for_success
+  end
+
+  # @return [Boolean] Soaspec::ExchangeHandler used by this exchange
+  def default_handler_used
+    nil
+  end
+
+  # @param [Symbol, String] name Name shown in RSpec run
+  # @param [Hash] override_parameters Parameters to override for default params
+  def initialize(name = self.class.to_s, override_parameters = {})
+    self.test_name ||= name.to_s
+    # As a last resort this uses the global parameter. The handler should be set straight before an exchange is made to use this
+    @exchange_handler ||= default_handler_used || Soaspec.api_handler
+    raise '@exchange_handler not set. Set either with `Soaspec.api_handler = Handler.new` or within the exchange' unless @exchange_handler
+
+    @fail_factory = nil
+    @override_parameters = override_parameters
+    @retry_for_success = false
+    self.retry_count = 3
+    @exchange_handler.elements.each { |element| methods_for_element(element) }
+  end
+
+  # Make request to handler with parameters defined
+  # Will retry until success code reached if retry_for_success? is set
+  # @return [Response] Response from Api handler
+  def make_request
+    Soaspec::SpecLogger.info 'Example ' + test_name
+    request_params = @override_parameters
+    (1..retry_count).each do |count|
+      response = exchange_handler.make_request(request_params)
+      return response unless retry_for_success?
+      return response if (200..299).cover? exchange_handler.status_code_for(response)
+
+      sleep 0.5
+      break response if count == retry_count
+    end
+  end
+
+  # Name describing this class when used with `RSpec.describe`
+  # This will make the request and store the response
+  # @return [String] Name given when initializing
+  def to_s
+    test_name
+  end
+
+  # Returns response object from Api. Will make the request if not made and then cache it for later on
+  # @example For SOAP it will be a Savon response
+  #   response.body (body of response as Hash)
+  #   response.header (head of response as Hash)
+  # @example For REST it will be a RestClient::Response
+  def response
+    Soaspec.last_exchange = self
+    @response ||= make_request
+    @response.define_singleton_method(:exchange) { Soaspec.last_exchange } unless @response.respond_to?(:exchange)
+    @response
+  end
+
+  alias call response
+end

data/lib/soaspec/exchange/exchange_extractor.rb

@@ -0,0 +1,59 @@
+module Soaspec
+  # Methods for extracting aspects of the traffic for a request / response
+  # in an exchange from the ExchangeHandler that it's tied to
+  module ExchangeExtractor
+    # @param [String] path XPath, JSONPath to extract value
+    # @param [String] attribute Attribute to obtain from XML element
+    # @return [Array] List of values found at path
+    def values_from_path(path, attribute: nil)
+      exchange_handler.values_from_path(response, path, attribute: attribute)
+    end
+
+    # Request of API call. Either intended request or actual request
+    def request
+      exchange_handler.request(@response)
+    end
+
+    # Get status code from api class. This is http response for Web Api
+    # @return [Integer] Status code from api class
+    def status_code
+      exchange_handler.status_code_for(response)
+    end
+
+    # @return [Boolean] Whether an element exists at the path
+    def element?(path)
+      self[path]
+      true
+    rescue NoElementAtPath
+      false
+    end
+
+    # Extract value from path api class
+    # @param [Object] path Path to return element for api class E.g - for SOAP this is XPath string. For JSON, this is Hash dig Array
+    # @return [String] Value at path
+    def [](path)
+      exchange_handler.value_from_path(response, path.to_s)
+    end
+
+    # @param [String] element Element to define methods for
+    def methods_for_element(element)
+      element_name = element.to_s.split('__custom_path_').last
+      define_singleton_method(element_name) do
+        exchange_handler.__send__(element, response) # Forward the call onto handler to retrieve the element for the response
+      end
+      define_singleton_method("#{element_name}?") do
+        begin
+          __send__ element_name
+          true
+        rescue NoElementAtPath
+          false
+        end
+      end
+    end
+
+    # @return [Hash] Hash representing the response of the API
+    def to_hash
+      exchange_handler.to_hash(response)
+    end
+  end
+end

data/lib/soaspec/exchange/exchange_properties.rb

@@ -0,0 +1,29 @@
+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
+    def expect_positive_status(retry_count: 3)
+      define_method('retry_count') do
+        retry_count
+      end
+      define_method('retry_for_success?') do
+        true
+      end
+    end
+  end
+end

data/lib/soaspec/exchange/exchange_repeater.rb

@@ -0,0 +1,19 @@
+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 [Self] 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

@@ -0,0 +1,57 @@
+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
+    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
+    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
+    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]
+    def save!
+      @retry_for_success = @fail_factory ? false : true
+      call
+      self
+    end
+  end
+end

data/lib/soaspec/exchange/variable_storer.rb

@@ -0,0 +1,22 @@
+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/handler_accessors.rb

@@ -62,7 +62,8 @@ module Soaspec
     # This will use the 'value_from_path' method which
     # should be implemented by each ExchangeHandler
     # @param [String, Symbol] name Method name used to access element
-    # @param [String, Symbol] path Path to find object (e.g, XPath, JSONPath)
+    # @param [String, Symbol] path Path to find object (e.g, XPath, JSONPath).
+    #                              For JSONPath a ',' can be put to get an element either path
     def element(name, path)
       define_method("__custom_path_#{name}") do |response|
         value_from_path(response, path.to_s)

data/lib/soaspec/exchange_handlers/rest_parameters.rb

@@ -23,7 +23,7 @@ module Soaspec
       # @!method access_token Retrieve OAuth2 access token
       define_method('access_token') { oauth_obj.access_token }
       # @!method instance_url Retrieve instance url from OAuth request
-      define_method('instance_url') { oauth_obj.response['instance_url'] }
+      define_method('instance_url') { oauth_obj.instance_url }
     end
 
     # Pass path to YAML file containing OAuth2 parameters

data/lib/soaspec/o_auth2.rb

@@ -7,6 +7,8 @@ module Soaspec
     @refresh_token = :always
     # List of access tokens. They are mapped according to the OAuth parameters used
     @access_tokens = {}
+    # List of instance URLs. They are mapped according to the OAuth parameters used
+    @instance_urls = {}
     class << self
       # Default token url used across entire suite
       attr_accessor :token_url
@@ -17,6 +19,8 @@ module Soaspec
       attr_accessor :refresh_token
       # @attr [Hash] access_tokens List of access tokens. They are mapped according to the OAuth parameters used
       attr_accessor :access_tokens
+      # List of URLs to that define the instance of an application
+      attr_accessor :instance_urls
     end
 
     # @attr [Hash] OAuth parameters
@@ -47,6 +51,14 @@ module Soaspec
       Soaspec::SpecLogger.info request_message
     end
 
+    # Retrieve instance_url according to access token response.
+    # Some applications have a different instance
+    # It's assumed this will be constant for a set of oauth parameters
+    # @return [String] Instance url
+    def instance_url
+      Soaspec::OAuth2.instance_urls[params] ||= response['instance_url']
+    end
+
     # @return [String] Existing or new access token, dependent on refresh_token attribute
     def access_token
       case Soaspec::OAuth2.refresh_token

data/lib/soaspec/test_server/invoices.rb

@@ -17,7 +17,8 @@ module Soaspec
           {
             access_token: 'TEST_TOKENiIsImtpZCI6IlRFU1QifQ.AAAABBBBRfaWQiOiJhYWQ5MjY3SIMULATE_LARGE_TOKEN3MmM5OGQ5NGE2YTU5YSIsImV4cCI6MTUyNzU3MTY4Mywic2NvcGUiOltdfQ.3OmCdW7fLZMUST_BE_ABLE_TO_HANDLEgAGaJB0lFYyhaw',
             token_type: 'Bearer',
-            expires_in: '86399'
+            expires_in: '86399',
+            instance_url: %w[http://this_is_my_instance http://this_is_second_instance].sample
           }
         end
       end

data/lib/soaspec/version.rb

@@ -1,3 +1,3 @@
 module Soaspec
-  VERSION = '0.2.10'.freeze
+  VERSION = '0.2.11'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soaspec
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
 platform: ruby
 authors:
 - SamuelGarrattIQA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-17 00:00:00.000000000 Z
+date: 2019-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -403,7 +403,12 @@ files:
 - lib/soaspec/core_ext/hash.rb
 - lib/soaspec/cucumber/generic_steps.rb
 - lib/soaspec/demo.rb
-- lib/soaspec/exchange.rb
+- lib/soaspec/exchange/exchange.rb
+- lib/soaspec/exchange/exchange_extractor.rb
+- lib/soaspec/exchange/exchange_properties.rb
+- lib/soaspec/exchange/exchange_repeater.rb
+- lib/soaspec/exchange/request_builder.rb
+- lib/soaspec/exchange/variable_storer.rb
 - lib/soaspec/exchange_handlers/exchange_handler.rb
 - lib/soaspec/exchange_handlers/handler_accessors.rb
 - lib/soaspec/exchange_handlers/response_extractor.rb
@@ -413,7 +418,6 @@ files:
 - lib/soaspec/exchange_handlers/rest_parameters.rb
 - lib/soaspec/exchange_handlers/rest_parameters_defaults.rb
 - lib/soaspec/exchange_handlers/soap_handler.rb
-- lib/soaspec/exchange_properties.rb
 - lib/soaspec/exe_helpers.rb
 - lib/soaspec/generator/.rspec.erb
 - lib/soaspec/generator/.travis.yml.erb

data/lib/soaspec/exchange.rb

@@ -1,236 +0,0 @@
-require_relative '../soaspec'
-require_relative 'exchange_properties'
-
-# This represents a request / response pair
-# Essentially, params in the exchange that are set are related to the request
-# What is returned is related to the response
-class Exchange
-  extend ExchangeProperties
-
-  # Instance of ExchangeHandler for which this exchange is made
-  attr_accessor :exchange_handler
-  # How many times to retry for a success
-  attr_accessor :retry_count
-  # Name used for displaying class
-  attr_accessor :test_name
-  # Expect Factory to fail upon trying to create
-  attr_writer :fail_factory
-  # Parameters to override for default params
-  attr_accessor :override_parameters
-
-  def values_from_path(path, attribute: nil)
-    exchange_handler.values_from_path(response, path, attribute: attribute)
-  end
-
-  # Set retry for success variable to true so that request will be retried
-  # for retry_count until it's true
-  def retry_for_success
-    @retry_for_success = true
-    self
-  end
-
-  # @return [Bool] Whether to keep making request until success code reached
-  def retry_for_success?
-    @retry_for_success
-  end
-
-  # @return [Boolean] Soaspec::ExchangeHandler used by this exchange
-  def default_handler_used
-    nil
-  end
-
-  # @param [String] element Element to define methods for
-  def methods_for_element(element)
-    element_name = element.to_s.split('__custom_path_').last
-    define_singleton_method(element_name) do
-      exchange_handler.__send__(element, response) # Forward the call onto handler to retrieve the element for the response
-    end
-    define_singleton_method("#{element_name}?") do
-      begin
-        __send__ element_name
-        true
-      rescue NoElementAtPath
-        false
-      end
-    end
-  end
-
-  # @param [Symbol, String] name Name shown in RSpec run
-  # @param [Hash] override_parameters Parameters to override for default params
-  def initialize(name = self.class.to_s, override_parameters = {})
-    self.test_name ||= name.to_s
-    # As a last resort this uses the global parameter. The handler should be set straight before an exchange is made to use this
-    @exchange_handler ||= default_handler_used || Soaspec.api_handler
-    raise '@exchange_handler not set. Set either with `Soaspec.api_handler = Handler.new` or within the exchange' unless @exchange_handler
-
-    @fail_factory = nil
-    @override_parameters = override_parameters
-    @retry_for_success = false
-    self.retry_count = 3
-    @exchange_handler.elements.each { |element| methods_for_element(element) }
-  end
-
-  # 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
-
-  # Make request to handler with parameters defined
-  # Will retry until success code reached if retry_for_success? is set
-  # @return [Response] Response from Api handler
-  def make_request
-    Soaspec::SpecLogger.info 'Example ' + test_name
-    request_params = @override_parameters
-    (1..retry_count).each do |count|
-      response = exchange_handler.make_request(request_params)
-      return response unless retry_for_success?
-      return response if (200..299).cover? @exchange_handler.status_code_for(response)
-
-      sleep 0.5
-      break response if count == retry_count
-    end
-  end
-
-  # 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
-
-  # Name describing this class when used with `RSpec.describe`
-  # This will make the request and store the response
-  # @return [String] Name given when initializing
-  def to_s
-    test_name
-  end
-
-  # Returns response object from Api. Will make the request if not made and then cache it for later on
-  # @example For SOAP it will be a Savon response
-  #   response.body (body of response as Hash)
-  #   response.header (head of response as Hash)
-  # @example For REST it will be a RestClient::Response
-  def response
-    Soaspec.last_exchange = self
-    @response ||= make_request
-    @response.define_singleton_method(:exchange) { Soaspec.last_exchange } unless @response.respond_to?(:exchange)
-    @response
-  end
-
-  alias call response
-
-  # Request of API call. Either intended request or actual request
-  def request
-    exchange_handler.request(@response)
-  end
-
-  # Get status code from api class. This is http response for Web Api
-  # @return [Integer] Status code from api class
-  def status_code
-    exchange_handler.status_code_for(response)
-  end
-
-  # Dummy request used to make a request without verifying it and ignoring WSDL errors
-  # @return [Boolean] Always returns true. Unless of course an unexpected exception occurs
-  def dummy_request
-    make_request
-    true
-  rescue Savon::HTTPError
-    puts 'Resolver error'
-    # This seems to occur first time IP address asks for WSDL
-    true
-  end
-
-  # @return [Boolean] Whether an element exists at the path
-  def element?(path)
-    [path]
-    true
-  rescue NoElementAtPath
-    false
-  end
-
-  # Extract value from path api class
-  # @param [Object] path Path to return element for api class E.g - for SOAP this is XPath string. For JSON, this is Hash dig Array
-  # @return [String] Value at path
-  def [](path)
-    exchange_handler.value_from_path(response, path.to_s)
-  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
-  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
-  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
-  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]
-  def save!
-    @retry_for_success = @fail_factory ? false : true
-    call
-    self
-  end
-
-  # @return [Hash] Hash representing the response of the API
-  def to_hash
-    exchange_handler.to_hash(response)
-  end
-
-  # 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 mesage if timed out.
-  # @option opts [Array, Exception] :ignore Exceptions to ignore while polling (default: Error::NoSuchElementError)
-  # @return [Self] 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

data/lib/soaspec/exchange_properties.rb

@@ -1,27 +0,0 @@
-# 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
-  def expect_positive_status(retry_count: 3)
-    define_method('retry_count') do
-      retry_count
-    end
-    define_method('retry_for_success?') do
-      true
-    end
-  end
-end