soaspec 0.0.50 → 0.0.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19dafaaba6b39b922969a31020ea43fa9c93b530
-  data.tar.gz: 04ed01a14243a2f6763590c6bf2ef00b9f394715
+  metadata.gz: e5b5fa8cf8849c0d7ad63f02428f7a7c7050e7b0
+  data.tar.gz: 55a05b486e03cb4d7ccb32f3cbfd14be87cd0f09
 SHA512:
-  metadata.gz: e4c0e7c85069f3cb5263b41468523f07f675665f2616a1b4254dc3e588fab1f2f7e8992c6c9ba7a8ea0d774e312cb05ba2d7371de0cf8bcd1010bcabbaf81424
-  data.tar.gz: ad6c88d92f1563669fd2454f2eb034877040699314e8db3fe3bb65f4276a24d03baafc0ff5ba73ad5523de88940ba247374a613c0b881343a8e47f4187de8e30
+  metadata.gz: 497e23505b69ba428131d7f327a69d60d25c0db3127a12c09711cca6d26e48212c10129768c63efca13f29a8222a09e0ed1f9ed7a6980963ab8cf7dc81e55754
+  data.tar.gz: 9873e4e70251804d46114bc60e84877bb778528cd854cb1062044006681f926903c5de323e15a3ab1bf45ebcd63bda1ae6fd37b4b0f5769cc385104c82c17c3e

data/ChangeLog

@@ -1,3 +1,8 @@
+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)
+
 Version 0.0.50
 * Enhancements
   * Able to use ERB in oauth parameters and extract oauth hash with 'oauth_response' method defined by 'oauth_file'

data/Gemfile.lock

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

data/config/data/default.yml

@@ -14,7 +14,7 @@ pet:
       name: 'string'
   status: sold
 
-pet1:
+default_pet:
   id: '123987'
   category:
     id: '1'
@@ -27,28 +27,11 @@ pet1:
       name: 'string'
   status: available
 
+pet1:
+  id: '123987'
+
 pet2:
   id: '9998772'
-  category:
-    id: '1'
-    name: 'string'
-  name: 'new_puppy'
-  photoUrls:
-    - 'string'
-  tags:
-    - id: '1'
-      name: 'string'
-  status: available
 
 pet3:
   id: '554678'
-  category:
-    id: '1'
-    name: 'string'
-  name: 'new_puppy'
-  photoUrls:
-    - 'string'
-  tags:
-    - id: '1'
-      name: 'string'
-  status: available

data/lib/soaspec/exchange.rb

@@ -28,10 +28,9 @@ class Exchange
     @override_parameters = override_parameters
     @retry_for_success = false
     self.retry_count = 3
-    # puts 'ELE ' + @api_class.elements.to_s
     @api_class.elements.each do |element|
-      define_singleton_method(element) do
-        @api_class.__send__(element, response)
+      define_singleton_method(element.to_s.split('__custom_path_').last) do
+        @api_class.__send__(element, response) # Forward the call onto handler to retrieve the element for the response
       end
     end
   end

data/lib/soaspec/exchange_handlers/exchange_handler.rb

@@ -13,7 +13,14 @@ module Soaspec
 
     # Explicitly defined elements for which a path has been predefined
     def elements
-      @elements || []
+      public_methods.select { |i| i[/__custom_path_.+/] }
+    end
+
+    # Set the default hash representing data to be used in making a request
+    # This will set the @request_option instance variable too
+    def default_hash=(hash)
+      @request_option = :hash
+      @default_hash = Soaspec.always_use_keys? ? hash.transform_keys_to_symbols : hash
     end
 
     # Set instance variable name

data/lib/soaspec/exchange_handlers/handler_accessors.rb

@@ -65,11 +65,7 @@ module Soaspec
     # @param [String, Symbol] name Method name used to access element
     # @param [String, Symbol] path Path to find object (e.g, XPath, JSONPath)
     def element(name, path)
-      # puts 'Making with ' + name.to_s + path
-      @elements ||= []
-      @elements << name.to_s # Add record to list of elements used by exchange
-      # puts 'NOW ELE' + @elements.to_s
-      define_method(name.to_s) do |response|
+      define_method("__custom_path_#{name}") do |response|
         value_from_path(response, path.to_s)
       end
     end

data/lib/soaspec/exchange_handlers/rest_handler.rb

@@ -7,6 +7,7 @@ require_relative '../interpreter'
 require 'json'
 require 'jsonpath'
 require 'nori'
+require 'erb'
 
 module Soaspec
 
@@ -110,17 +111,19 @@ module Soaspec
     end
 
     # Setup object to handle communicating with a particular SOAP WSDL
-    # @param [Hash] specific_options Options defining SOAP request. WSDL, authentication
+    # @param [Hash] options Options defining SOAP request. WSDL, authentication
     def initialize(name = self.class.to_s, options = {})
       raise "Base URL not set! Please set in class with 'base_url' method" unless base_url_value
+      @default_hash = {}
       if name.is_a?(Hash) && options == {} # If name is not set
         options = name
         name = self.class.to_s
       end
+      super
+      set_remove_key(options, :default_hash)
       merged_options = rest_resource_options
       merged_options.merge!(options)
       @resource = RestClient::Resource.new(base_url_value, merged_options) # @resource[url_extension].get
-      super
     end
 
     # Used in together with Exchange request that passes such override parameters
@@ -137,14 +140,14 @@ module Soaspec
 
       begin
       response = case test_values[:method]
-      when :post, :patch, :put
-        unless test_values[:payload]
-          test_values[:payload] = JSON.generate(test_values[:body]).to_s if test_values[:body]
-        end
-        @resource_used.send(test_values[:method].to_s, test_values[:payload], test_values[:params])
-      else
-        @resource_used.send(test_values[:method].to_s, test_values[:params])
-      end
+                 when :post, :patch, :put
+                   unless test_values[:payload]
+                     test_values[:payload] = JSON.generate(@default_hash.merge(test_values[:body])).to_s if test_values[:body]
+                   end
+                   @resource_used.send(test_values[:method].to_s, test_values[:payload], test_values[:params])
+                 else
+                   @resource_used.send(test_values[:method].to_s, test_values[:params])
+                 end
       rescue RestClient::ExceptionWithResponse => e
         response = e.response
       end

data/lib/soaspec/exchange_handlers/soap_handler.rb

@@ -103,13 +103,6 @@ module Soaspec
       end
     end
 
-    # Set the default hash representing data to be used in making a request
-    # This will set the @request_option instance variable too
-    def default_hash=(hash)
-      @request_option = :hash
-      @default_hash = Soaspec.always_use_keys? ? hash.transform_keys_to_symbols : hash
-    end
-
     # @param [Hash] format Format of expected result
     # @return [Object] Generic body to be displayed in error messages
     def response_body(response, format: :hash)

data/lib/soaspec/version.rb

@@ -1,3 +1,3 @@
 module Soaspec
-  VERSION = '0.0.50'
+  VERSION = '0.0.51'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soaspec
 version: !ruby/object:Gem::Version
-  version: 0.0.50
+  version: 0.0.51
 platform: ruby
 authors:
 - SamuelGarrattIQA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-30 00:00:00.000000000 Z
+date: 2018-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler