soaspec 0.0.52 → 0.0.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4911806fb7e9d447b98f407491c2de192f458440
-  data.tar.gz: 4674407c680162fb21d61e0c9d2d61e27fca641f
+  metadata.gz: 5daa27106c98f54680acdfaf513f175a745c08cf
+  data.tar.gz: 2eeaffbcee9233a978c6e6abb5c94e9aa4dd6bbb
 SHA512:
-  metadata.gz: 179745c8a33ec800887bc6d0ee6e30616a4ba348fa6f461e7e94b58a211a060cd52dfeefe7dbf0833c5270ee642b370a954af8e793467b684323e820f1855ae0
-  data.tar.gz: 9bfbe31e1b78028e9a51470be0d43c7b5c0c31e897484bdf9ace7adac1a381f9d5964f20b08e72c6e88df101f212e649b9bd8a1c393cfb17b8cad31cc96fc39e
+  metadata.gz: 7014f7f8944d4ffb28ee0391800d7167544236c4e0be5827e8954ff41c0b8fd882e10ee87670a91807282927c8d266584f34e3309db6f453ccf7366c2622e30a
+  data.tar.gz: dfb370de19a9640736b5e1f2bd365d1c8206f548b557625c62f75c4b2f023435b728c89fde95cfe414ac43d8486ef19973756d5006ec32ea2fa63d8b27cf2f4f

data/ChangeLog

@@ -1,3 +1,8 @@
+Version 0.0.53
+* Enhancements
+  * Make attribute possible for REST methods as well (as they can use XML too)
+  * For non XML, non JSON responses, handle with regex or key for a Hash
+
 Version 0.0.52
 * Enhancements
   * Now have 'attribute' accessor making it easy to access an attribute from a response

data/Gemfile.lock

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

data/Rakefile

@@ -24,9 +24,9 @@ end
 
 
 desc 'Run tests'
-task :spec => %w[clean clobber use_soaspec_init logs start_test_server run_spec]
+task spec: %w[clean clobber use_soaspec_init logs start_test_server run_spec]
 
-task :default => :spec
+task default: :spec
 
 CLEAN.include 'tmp/*'
 CLOBBER.include 'logs/*'

data/exe/soaspec-init

@@ -21,7 +21,7 @@ class BLZService < Soaspec::SoapHandler
   def savon_options
     {
       # wsdl: 'http://www.thomas-bayer.com/axis2/services/BLZService?wsdl' # External
-      wsdl: File.join('spec', 'wsdl', 'get_bank.wsdl') # Virtual service
+      wsdl: File.join('spec', 'test_data', 'wsdl', 'get_bank.wsdl')
     }
   end
 
@@ -228,11 +228,12 @@ create_folder 'config'
 create_folder 'config/data'
 create_file(filename: 'config/data/default.yml', content: default_yaml_content)
 create_folder 'spec'
-create_folder 'spec/wsdl'
+create_folder 'spec/test_data'
+create_folder 'spec/test_data/wsdl'
 create_file(filename: 'spec/spec_helper.rb', content: spec_helper_content)
 create_file(filename: 'spec/soap_spec.rb', content: soap_spec_content)
 create_file(filename: 'spec/test_server.rb', content: test_server_content)
-create_file(filename: 'spec/wsdl/get_bank.wsdl', content: test_wsdl_content)
+create_file(filename: 'spec/test_data/wsdl/get_bank.wsdl', content: test_wsdl_content)
 create_folder 'template'
 create_file(filename: 'template/soap_template.xml', content: soap_template_content)
 create_folder 'logs'

data/lib/soaspec/exchange_handlers/rest_handler.rb

@@ -228,7 +228,7 @@ module Soaspec
     # @param [RestClient::Response] response
     # @param [String] xpath
     # @return [String] Value inside element found through Xpath
-    def xpath_value_for(response: nil, xpath: nil)
+    def xpath_value_for(response: nil, xpath: nil, attribute: nil)
       raise ArgumentError unless response && xpath
       raise "Can't perform XPATH if response is not XML" unless Interpreter.response_type_for(response) == :xml
       result =
@@ -240,27 +240,34 @@ module Soaspec
           Nokogiri.parse(response.body).xpath(xpath).first
         end
       raise NoElementAtPath, "No value at Xpath '#{xpath}'" 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 [Response] response
     # @param [Object] path Xpath, JSONPath or other path identifying how to find element
+    # @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 = path.to_s
+
       case Interpreter.response_type_for(response)
       when :xml
+        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)
       when :json
+        raise 'JSON does not support attributes' if attribute
         path = '$..' + path if path[0] != '$'
         matching_values = JsonPath.on(response.body, path)
         raise NoElementAtPath, "Element in #{response.body} not found with path '#{path}'" if matching_values.empty?
         matching_values.first
+      when :hash
+        response.dig(path.split('.')) # Use path as Hash dig expression separating params via '.' TODO: Unit test
       else
-        raise 'Unrecognised response message. Neither xml nor json detected'
+        response.to_s[/path/] # Perform regular expression using path if not XML nor JSON TODO: Unit test
       end
     end
 

data/lib/soaspec/version.rb

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

metadata

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