soaspec 0.0.51 → 0.0.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5b5fa8cf8849c0d7ad63f02428f7a7c7050e7b0
-  data.tar.gz: 55a05b486e03cb4d7ccb32f3cbfd14be87cd0f09
+  metadata.gz: 4911806fb7e9d447b98f407491c2de192f458440
+  data.tar.gz: 4674407c680162fb21d61e0c9d2d61e27fca641f
 SHA512:
-  metadata.gz: 497e23505b69ba428131d7f327a69d60d25c0db3127a12c09711cca6d26e48212c10129768c63efca13f29a8222a09e0ed1f9ed7a6980963ab8cf7dc81e55754
-  data.tar.gz: 9873e4e70251804d46114bc60e84877bb778528cd854cb1062044006681f926903c5de323e15a3ab1bf45ebcd63bda1ae6fd37b4b0f5769cc385104c82c17c3e
+  metadata.gz: 179745c8a33ec800887bc6d0ee6e30616a4ba348fa6f461e7e94b58a211a060cd52dfeefe7dbf0833c5270ee642b370a954af8e793467b684323e820f1855ae0
+  data.tar.gz: 9bfbe31e1b78028e9a51470be0d43c7b5c0c31e897484bdf9ace7adac1a381f9d5964f20b08e72c6e88df101f212e649b9bd8a1c393cfb17b8cad31cc96fc39e

data/ChangeLog

@@ -1,7 +1,11 @@
+Version 0.0.52
+* Enhancements
+  * Now have 'attribute' accessor making it easy to access an attribute from a response
+
 Version 0.0.51
 * Enhancements
   * Allow for 'default_hash=' method to be used in RestHandler. See 'many_calls_one_method_spec' for example
-  * Got element accessor working correctly (See soap/hash_spec.rb + 'blz_service' for example)
+  * Got 'element' accessor working correctly (See soap/hash_spec.rb + 'blz_service' for example)
 
 Version 0.0.50
 * Enhancements

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    soaspec (0.0.51)
+    soaspec (0.0.52)
       jsonpath
       rest-client (>= 2.0)
       rspec (~> 3.0)

data/lib/soaspec.rb

@@ -15,7 +15,7 @@ require 'soaspec/exchange_handlers/rest_methods'
 require 'soaspec/exchange'
 require 'soaspec/matchers'
 require 'soaspec/soaspec_shared_examples'
-require 'soaspec/hash_methods'
+require 'soaspec/core_ext/hash'
 require 'soaspec/spec_logger'
 require 'soaspec/exe_helpers'
 require 'soaspec/exchange_handlers/rest_handler'

data/lib/soaspec/exchange_handlers/exchange_handler.rb

@@ -69,7 +69,7 @@ module Soaspec
 
     # Change this through 'mandatory_json_values' method to specify json results that must be present in the response
     # Will be used in 'success_scenarios' shared examples
-    # @return [Hash] Hash of 'xpath' => 'expected value' pairs
+    # @return [Hash] Hash of 'json/path' => 'expected value' pairs
     def expected_mandatory_json_values
       {}
     end

data/lib/soaspec/exchange_handlers/handler_accessors.rb

@@ -60,7 +60,8 @@ module Soaspec
       end
     end
 
-    # Links a particular path to a meaningful name. This will use the 'value_from_path' method which
+    # Links a particular path to a meaningful method that can be accessed from Exchange class.
+    # 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)
@@ -70,5 +71,17 @@ module Soaspec
       end
     end
 
+    # Links an attribute to a meaningful method that can be accessed from Exchange class.
+    # This will use the 'value_from_path' method which
+    # should be implemented by each ExchangeHandler
+    # @param [String, Symbol] name Method name used to access attribute
+    # @param [String, nil, Hash] attribute Attribute name. If not set, this will default to @name
+    def attribute(name, attribute = nil)
+      attribute_used = attribute ? attribute : name.to_s
+      define_method("__custom_path_#{name}") do |response|
+        value_from_path(response, 'implicit', attribute: attribute_used)
+      end
+    end
+
   end
 end

data/lib/soaspec/exchange_handlers/rest_handler.rb

@@ -1,6 +1,6 @@
 
 require_relative 'exchange_handler'
-require_relative '../hash_methods'
+require_relative '../core_ext/hash'
 require_relative '../not_found_errors'
 require_relative 'handler_accessors'
 require_relative '../interpreter'

data/lib/soaspec/exchange_handlers/soap_handler.rb

@@ -1,6 +1,6 @@
 
 require_relative 'exchange_handler'
-require_relative '../hash_methods'
+require_relative '../core_ext/hash'
 require_relative '../not_found_errors'
 require_relative 'handler_accessors'
 require_relative '../interpreter'
@@ -141,29 +141,33 @@ module Soaspec
     # Returns the value at the provided xpath
     # @param [Savon::Response] response
     # @param [String] xpath
+    # @param [String] attribute Generic attribute to find
     # @return [String] Value inside element found through Xpath
-    def xpath_value_for(response: nil, xpath: nil)
-      raise ArgumentError unless response && xpath
+    def xpath_value_for(response: nil, xpath: nil, attribute: nil)
+      raise ArgumentError('response and xpath must be passed to method') unless response && xpath
       result =
         if Soaspec.strip_namespaces? && !xpath.include?(':')
           temp_doc = response.doc.dup
           temp_doc.remove_namespaces!
-          temp_doc.xpath(xpath).first
+          temp_doc.at_xpath(xpath)
         else
-          response.xpath(xpath).first
+          response.xpath(xpath).first # Note this is Savon's xpath method. Hence Nokogiri 'at_xpath' not used
         end
       raise NoElementAtPath, "No value at Xpath '#{xpath}' in XML #{response.doc}" unless result
-      result.inner_text
+      return result.inner_text if attribute.nil?
+      result.attributes[attribute].inner_text
     end
 
     # Based on a exchange, return the value at the provided xpath
     # If the path does not begin with a '/', a '//' is added to it
     # @param [Savon::Response] response
     # @param [String] path Xpath
+    # @param [String] attribute Generic attribute to find. Will override path
     # @return [String] Value at Xpath
-    def value_from_path(response, path)
+    def value_from_path(response, path, attribute: nil)
+      path = "//*[@#{attribute}]" unless attribute.nil?
       path = '//' + path if path[0] != '/'
-      xpath_value_for(response: response, xpath: path)
+      xpath_value_for(response: response, xpath: path, attribute: attribute)
     end
 
     # Whether any of the keys of the Body Hash include value

data/lib/soaspec/matchers.rb

@@ -1,9 +1,7 @@
 
-require_relative 'hash_methods'
+require_relative 'core_ext/hash'
 require_relative 'not_found_errors'
 
-# TODO: Mathcers are specific to SOAP. Make generic for REST and others by using actual.api_class
-
 # Whether response has any element with the provided value
 RSpec::Matchers.define :contain_value do |expected|
   match do |actual|

data/lib/soaspec/version.rb

@@ -1,3 +1,3 @@
 module Soaspec
-  VERSION = '0.0.51'
+  VERSION = '0.0.52'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soaspec
 version: !ruby/object:Gem::Version
-  version: 0.0.51
+  version: 0.0.52
 platform: ruby
 authors:
 - SamuelGarrattIQA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-01 00:00:00.000000000 Z
+date: 2018-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -167,6 +167,7 @@ files:
 - exe/soaspec-init
 - exe/xml_to_yaml_file
 - lib/soaspec.rb
+- lib/soaspec/core_ext/hash.rb
 - lib/soaspec/exchange.rb
 - lib/soaspec/exchange_handlers/exchange_handler.rb
 - lib/soaspec/exchange_handlers/handler_accessors.rb
@@ -174,7 +175,6 @@ files:
 - lib/soaspec/exchange_handlers/rest_methods.rb
 - lib/soaspec/exchange_handlers/soap_handler.rb
 - lib/soaspec/exe_helpers.rb
-- lib/soaspec/hash_methods.rb
 - lib/soaspec/interpreter.rb
 - lib/soaspec/matchers.rb
 - lib/soaspec/not_found_errors.rb