setsuzoku 0.10.3 → 0.10.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be6b4f73f228cd56bcafd263862f5a84c6d7ef27bf37dcbbacb08e9d9924f28a
-  data.tar.gz: 735fd334007864a9a40647edff5d3441c3baad7b8b637bfde5414a5d1f20adc7
+  metadata.gz: 726efb395552a5927e31afa4acd12813f6e7f918dda1e7bfc0228649f6908178
+  data.tar.gz: 93984b66449f1cbec2986569660e45e4a1ab3c3287774ff8faf915cfffe4686f
 SHA512:
-  metadata.gz: b3bf581fad087d683aa66a7c80d18b31317cae6401953b5f67f6e04e574d1507fafbe3dea6d0a3f8d2fa17ef8852f3a2f35633eb0e68328f87625d6ccfff1c77
-  data.tar.gz: 31bf1b3ab7eee17f8e00a3ba51471c5340f4ffecad8812e96daaafe7d1181b8365b1d20a5152ef7398758d5b4649af93033e9d2349ea5b8abf14afefc5b38214
+  metadata.gz: 8b5e47d6549a27ecb3688ddae78c77ae5284da2398eb2939e0749a936d1491430c8321adf0426bfbfb3f145ebfac2221d388d5be6be8754abb411c005342b672
+  data.tar.gz: 3c033c68a032c683014a77387da6643bda95311c1f7e58c2590cfccb3d38b395ee758d6fb171263888c7ed041fc4a2cc25234cbca38605a2d17b6303457336f1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    setsuzoku (0.10.3)
+    setsuzoku (0.10.7)
       activesupport (~> 5.0)
       faraday (~> 0.11)
       httparty (~> 0.16.4)
@@ -21,7 +21,7 @@ GEM
     concurrent-ruby (1.1.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    diff-lcs (1.3)
+    diff-lcs (1.4.2)
     faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
     hashdiff (1.0.1)
@@ -41,28 +41,28 @@ GEM
       mini_portile2 (~> 2.4.0)
     public_suffix (4.0.5)
     rake (10.5.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.2)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.3)
     safe_yaml (1.0.5)
     sorbet (0.5.5675)
       sorbet-static (= 0.5.5675)
-    sorbet-runtime (0.5.5786)
+    sorbet-runtime (0.5.5794)
     sorbet-static (0.5.5675-universal-darwin-14)
     thread_safe (0.3.6)
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    webmock (3.8.3)
+    webmock (3.8.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -73,10 +73,10 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.17)
   rake (~> 10.0)
-  rspec (~> 3.0)
+  rspec (= 3.8)
   setsuzoku!
   sorbet (~> 0.5)
-  webmock (~> 3.8)
+  webmock (= 3.8)
 
 BUNDLED WITH
    1.17.2

data/lib/setsuzoku/rspec/dynamic_spec_helper.rb

@@ -67,12 +67,12 @@ module Setsuzoku
     def stub_plugin_methods_for_spec(registering_class = self.described_class)
       plugin_class = registering_class.plugin_context[:plugin_class]
       plugin_class.spec_definitions.each do |action_name, spec|
-        allow_any_instance_of(plugin_class).to receive(action_name).and_return(spec[:stub][:response])
+        plugin_class.any_instance.stub(action_name).and_return(spec[:stub][:response])
         # a plugin spec might have some dynamic data, e.g. certain methods are called with plugin specific args.
         if spec[:stub][:dynamic_methods]
           spec[:stub][:dynamic_methods].each do |meth, resp|
             #how can we ignore the call count instead of just putting a high limit?
-            allow_any_instance_of(plugin_class).to receive(meth).and_return(resp)
+            plugin_class.any_instance.stub(meth).and_return(resp)
           end
         end
       end
@@ -208,12 +208,12 @@ module Setsuzoku
       define_method stub_plugin_method_name do
         #TODO: let this use the appropriate rspec instance stub method
         #TODO: Does it make sense to have the stub with the method? or should it be in a json file we parse?
-        plugin_class.any_instance.should_receive(action_name).and_return(spec[:stub][:response])
+        plugin_class.any_instance.stub(action_name).and_return(spec[:stub][:response])
         # a plugin spec might have some dynamic data, e.g. certain methods are called with plugin specific args.
         if spec[:stub][:dynamic_methods]
           spec[:stub][:dynamic_methods].each do |meth, resp|
             #how can we ignore the call count instead of just putting a high limit?
-            plugin_class.any_instance.should_receive(meth).and_return(resp)
+            plugin_class.any_instance.stub(meth).and_return(resp)
           end
         end
       end
@@ -231,10 +231,15 @@ module Setsuzoku
     def get_url_and_body(plugin, propz, stub_directory, action_name, url_params = nil)
       body = nil
       url = propz[:url]
-      format = propz[:request_format].to_s.include?('x-www-form') ? :json : propz[:request_format]
+      format = propz[:request_format].to_s.include?('x-www-form') || propz[:request_format] == :file ? :json : propz[:request_format]
       begin
-        body = if propz[:request_format] == :binary
-                 JSON.parse(ERB.new(File.read("#{Dir.pwd}/spec/support/setsuzoku/#{stub_directory}/#{action_name}_request.json.erb")))
+        body = if propz[:request_format] == :file
+                 request_with_files = JSON.parse(ERB.new(File.read("#{Dir.pwd}/spec/support/setsuzoku/#{stub_directory}/#{action_name}_request.json.erb")).result)
+                 request_with_files['files'].each do |k, path|
+                   request_with_files[k] = File.new(path)
+                 end
+                 request_with_files.delete('files')
+                 request_with_files
                else
                  File.read("#{Dir.pwd}/spec/support/setsuzoku/#{stub_directory}/#{action_name}_request.#{format}")
                end
@@ -251,8 +256,6 @@ module Setsuzoku
         end
 
         # We will convert these to url params when making requests. need to replicate that.
-
-
         req_params = case format
                      when :json
                        temp_body = JSON.parse(body)

data/lib/setsuzoku/service/web_service/api_strategies/rest_strategy.rb

@@ -40,7 +40,7 @@ module Setsuzoku
 
             full_request = self.formulate_request(request_properties, request_options)
 
-            @faraday = Faraday.new(url: request_properties[:formatted_full_url]) do |faraday|
+            @faraday = Faraday.new(url: request_properties[:formatted_full_url], request: { params_encoder: Faraday::FlatParamsEncoder }) do |faraday|
               faraday.request(:multipart) if options[:attachments].present?
               faraday.request(:url_encoded)
               # faraday.basic_auth(request_options[:basic_auth][:username], request_options[:basic_auth][:password]) if request_options[:basic_auth]
@@ -105,13 +105,12 @@ module Setsuzoku
           # @return full_request [Hash/String] returns the request body in the format required
           def formulate_request(request_properties = {}, request_options = {})
             request_format = request_properties.dig(:request_format).to_s
-            content_type = request_options.dig(:headers, :'Content-Type').to_s
 
             if request_properties[:request_method] == :get || request_properties[:req_params].empty?
               request_properties[:req_params]
             else
-              # if the header or request format and request format include urlencoded return the body as a hash
-              if request_format.include?('urlencoded') && content_type.include?('urlencoded')
+              # if the header or request format include urlencoded return the body as a hash
+              if request_format.include?('urlencoded')
                 request_properties[:req_params]
               else
                 # return either xml or json
@@ -122,7 +121,7 @@ module Setsuzoku
                 end
               end
             end
-        end
+          end
 
           def request_options(request_format = nil, action_details = {})
             request_options = self.auth_strategy.auth_headers.merge(self.plugin.api_headers).merge(action_details[:request_options] || {})
@@ -131,10 +130,12 @@ module Setsuzoku
                              'application/json'
                            when :xml
                              'application/xml'
-                           when :text
+                           when :text, :file
                              'text/plain'
                            when :pdf
                              'application/pdf'
+                           when :'x-www-form-urlencoded;charset=UTF-8'
+                             'application/x-www-form-urlencoded;charset=UTF-8'
                            else
                              'application/json'
                            end

data/lib/setsuzoku/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Setsuzoku
-  VERSION = '0.10.3'
+  VERSION = '0.10.8'
 end

data/setsuzoku.gemspec

@@ -38,8 +38,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "webmock", "~> 3.8"
+  spec.add_development_dependency "rspec", "3.8"
+  spec.add_development_dependency "webmock", "3.8"
   spec.add_runtime_dependency "activesupport", "~> 5.0"
   spec.add_development_dependency "sorbet", "~> 0.5"
   spec.add_runtime_dependency "sorbet-runtime", "~> 0.5"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: setsuzoku
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.8
 platform: ruby
 authors:
 - Luke Stadtler
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-26 00:00:00.000000000 Z
+date: 2020-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,28 +42,28 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: '3.8'
 - !ruby/object:Gem::Dependency