soaspec 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fc08897eb83281f6c6226c6f0df1768129ec307
-  data.tar.gz: 58e5b2672c36a667471f97159e63dea73ca44dbe
+  metadata.gz: 745281f9da86335fb291d91c4546429d77e5850e
+  data.tar.gz: dedd883ba638f9c70372bad06de044eed127f5a4
 SHA512:
-  metadata.gz: 603ad5943c9f9e063163ab0cf485af270f0a91639a0c7a4535a9e2aeae757fac9d9ad442b14d039ece23316827e3be39ee3c53532a1cdc148d6526b37e9adc1b
-  data.tar.gz: 03312d09ccada29afa1c5d61a8a1a559287cdd35f96289b53490f25f22d3d07e44368e14824bfdd8ef5dce579de0f4ec2d64e7a76dadc8dfc50cfdfc1bf823d0
+  metadata.gz: bee2a56c5ceb91bdd88d0b117871f30e710bf76c1d06c10416dc761c5fab7bf5f5672369b30bd0d6490449fe8c24fc48dec79d5228c47940b51a3202f4236e21
+  data.tar.gz: 652a6203bbdd767967399a9141f8ac2c40b80626213c5d38e532def497bc81f0be136bb47740224c3cdffa1d8dbeb5a935cc36971b2189ea0f6883edf464d26f

data/ChangeLog

@@ -1,3 +1,8 @@
+Version 0.2.5
+* Bug fix
+  * Error wasn't throw if checking for element with empty response
+  * Default hash set on Exchange without example overriding value not setting request body
+
 Version 0.2.4
 * Enhancements
   * Enable block to be used when creating exchange with Handler.exchange

data/lib/soaspec/exchange.rb

@@ -187,9 +187,7 @@ class Exchange
     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) do
-          set_value
-        end
+        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

data/lib/soaspec/exchange_handlers/rest_handler.rb

@@ -196,6 +196,7 @@ module Soaspec
       when :hash
         response.dig(path.split('.')) # Use path as Hash dig expression separating params via '.' TODO: Unit test
       else
+        raise NoElementAtPath, 'Response is empty' if response.to_s.empty?
         response.to_s[/path/] # Perform regular expression using path if not XML nor JSON TODO: Unit test
       end
     end
@@ -218,7 +219,7 @@ module Soaspec
     # @param [String] response Response as a String (either in XML or JSON)
     # @return [Hash]
     def extract_hash(response)
-      raise ArgumentError("Empty Body. Can't assert on it") if response.body.empty?
+      raise NoElementAtPath, "Empty Body. Can't assert on it" if response.body.empty?
       case Interpreter.response_type_for response
       when :json
         converted = JSON.parse(response.body)
@@ -257,7 +258,7 @@ module Soaspec
     # 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[:body]
+      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]
@@ -272,7 +273,7 @@ module Soaspec
 
     # @return [Hash] Hash used in REST request based on data conversion
     def hash_used_in_request(override_hash)
-      request = @default_hash.merge(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

data/lib/soaspec/matchers.rb

@@ -33,8 +33,10 @@ RSpec::Matchers.define :have_element_at_path do |xpath|
   end
 
   # TODO: Would be better to print failure message
-  failure_message do |actual|
-    "expected that #{actual.exchange_handler.response_body(actual.response, format: :raw)} would have element at path '#{xpath}'"
+  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}'"
   end
 end
 

data/lib/soaspec/version.rb

@@ -1,3 +1,3 @@
 module Soaspec
-  VERSION = '0.2.4'.freeze
+  VERSION = '0.2.5'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soaspec
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - SamuelGarrattIQA