soaspec 0.0.65 → 0.0.66

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b74599fe5d32dc78abe0ad63f1454c5173ac188
-  data.tar.gz: ab105cf905b37f63a6fc6a52c694e85d3577c621
+  metadata.gz: 8e85c415626794edcaa1b13f12026dc04e619359
+  data.tar.gz: 1bafaf7d28a044e41cfd284d94ee5210c19a3d98
 SHA512:
-  metadata.gz: fe214897a46aef14ffc950badadcd818927d5e6e38d427d29a7e3ce4d9ae0916d24f4262c3457d2d812ea3b198c7d2365ee174d498d31a457c485d0f54085bac
-  data.tar.gz: ec75d15728e9b97082d9039bf9ea14652671488652991b539c1d883f77061057acf9de25ef83b6cce0d8a7b944dd51c83937e7549bc73cb6c2b920e5ca4aa0be
+  metadata.gz: c4062eae6480b45730bd44a8f94a2f564ba9a95f33c2e82cc5cb35de5a6d496d61e5f4cb41854c805e167c7d14d0758bb4bb2099f219f3fe3b9e6255b00091cd
+  data.tar.gz: aa7e71f4c08aa808fc381eb1199ee5027b4ee56bd5b03a41cc5ecbd4cd7692763f17ff9f642cf2d5f73de016427293f7ec5271e6625d46fb69873c8a2c7a3fbb

data/ChangeLog

@@ -1,3 +1,8 @@
+Version 0.0.66
+* Enhancements
+  * Added method to convert REST request keys to 'PascalCase' if 'pascal_keys' is set to true
+  * This also converts paths obtaining elements to 'PascalCase' if they're simple and have no starting '//' or '$..'
+
 Version 0.0.65
 * Enhancements
   * Added ability to set 'suburl' and 'method' in Exchange accessor. Will be used in FactoryBot later

data/exe/soaspec-virtual-server

@@ -35,8 +35,8 @@ end
 post '/test/name' do
   request_hash = JSON.parse(request.body.string)
   id = Soaspec::TestServer::PuppyService.new_id
-  Soaspec::TestServer::PuppyService.data[id][:name] = request_hash['name']
-  response_hash = { result: { status: 'success', data: Soaspec::TestServer::PuppyService.data[id] } }
+  Soaspec::TestServer::PuppyService.data[id][:Name] = request_hash['Name']
+  response_hash = { result: { Status: 'success', Data: Soaspec::TestServer::PuppyService.data[id] } }
   JSON.generate response_hash
 end
 
@@ -48,7 +48,7 @@ end
 
 patch '/test/name/:id' do |id|
   request_hash = JSON.parse(request.body.string)
-  Soaspec::TestServer::PuppyService.data[id.to_i][:name] = request_hash['name']
-  response_hash = { result: { status: 'updated', with: request_hash['name'] } }
+  Soaspec::TestServer::PuppyService.data[id.to_i][:Name] = request_hash['Name']
+  response_hash = { result: { Status: 'updated', With: request_hash['Name'] } }
   JSON.generate response_hash
 end

data/lib/soaspec/exchange_handlers/rest_handler.rb

@@ -84,6 +84,13 @@ module Soaspec
       end
     end
 
+    # Convert each key from snake_case to PascalCase
+    def pascal_keys(set)
+      define_method('pascal_keys?') do
+        set
+      end
+    end
+
   end
 
   # Wraps around Savon client defining default values dependent on the soap request
@@ -138,6 +145,26 @@ module Soaspec
       @resource = RestClient::Resource.new(base_url_value, merged_options) # @resource[url_extension].get
     end
 
+    def convert_to_pascal_case(key)
+      key.split('_').map(&:capitalize).join
+    end
+
+    # @return Whether to convert each key in the request to PascalCase
+    # It will also auto convert simple XPath, JSONPath where '//' or '..' not specified
+    def pascal_keys?
+      false
+    end
+
+    # @return [Hash]
+    def hash_used_in_request(override_hash)
+      request = @default_hash.merge(override_hash)
+      if pascal_keys?
+        request.map { |k, v| [convert_to_pascal_case(k.to_s), v] }.to_h
+      else
+        request
+      end
+    end
+
     # Used in together with Exchange request that passes such override parameters
     # @param [Hash] override_parameters Params to characterize REST request
     # @param_value [params] Extra parameters (E.g. headers)
@@ -156,7 +183,7 @@ module Soaspec
       response = case test_values[:method]
                  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]
+                     test_values[:payload] = JSON.generate(hash_used_in_request(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
@@ -170,9 +197,9 @@ module Soaspec
       response
     end
 
-    # @param [Hash] format Format of expected result. Ignored for this
+    # @param [Hash] _format Format of expected result. Ignored for this
     # @return [Object] Generic body to be displayed in error messages
-    def response_body(response, format: :hash)
+    def response_body(response, _format: :hash)
       extract_hash response
     end
 
@@ -270,11 +297,17 @@ module Soaspec
       case Interpreter.response_type_for(response)
       when :xml
         path = "//*[@#{attribute}]" unless attribute.nil?
-        path = '//' + path if path[0] != '/'
+        if path[0] != '/'
+          path = convert_to_pascal_case(path) if pascal_keys?
+          path = '//' + path
+        end
         xpath_value_for(response: response, xpath: path, attribute: attribute)
       when :json
         raise 'JSON does not support attributes' if attribute
-        path = '$..' + path if path[0] != '$'
+        if path[0] != '$'
+          path = convert_to_pascal_case(path) if pascal_keys?
+          path = '$..' + path
+        end
         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

data/lib/soaspec/test_server/puppy_service.rb

@@ -8,7 +8,7 @@ module Soaspec
 
         def new_id
           @data[@current_id] = {}
-          @data[@current_id][:id] = @current_id
+          @data[@current_id][:Id] = @current_id
           @current_id += 1
           @current_id - 1
         end

data/lib/soaspec/version.rb

@@ -1,3 +1,3 @@
 module Soaspec
-  VERSION = '0.0.65'.freeze
+  VERSION = '0.0.66'.freeze
 end

metadata

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