setsuzoku 0.10.5 → 0.10.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebb07133f2399524199b1c5a2f1cd500ae8317656ea91539bf99868eaa3a0b4d
-  data.tar.gz: 56c9a198f24fc19be3f510c062f8e5e6c13d6249c33932c7aba4715edca11c89
+  metadata.gz: 224d8d5fd6ed22ff68d738482797161907131f18134517cb7a78ce9f27ba822b
+  data.tar.gz: 108a049185faf8f49bbfa75474e84e4281b5294ef0393109aa0d625eee7d5999
 SHA512:
-  metadata.gz: c479986f2b169b6b6bfa503e10d6826d463ad08521aeb8bbbe9357840c964e8ca6b61e077876004fa3a7fd96a82fbf2f9fa3cce4dbb3792905ca9c7ee0b0ea6b
-  data.tar.gz: 2a73541b422fc3e802f293c5e6991b3e6aabc17b709531db19d2f33d0ecef712af530ac2eec33efc1de82ccdd130b24144d5c95eacb7cdfd4de4829cce83ac29
+  metadata.gz: 930280914e8cec4d2fb5605e48c4465dcca78b05dd72fbee5599240e2eaf9c8cf7122e46f5515479270c8945e97f9927f7fe4ab78a7e86e7a32bc1c7aa2c6db2
+  data.tar.gz: b2864f186ce5b56412149a7fc7bfb25ba4e5dd6b402a6bf5c976bcc4d9627feb5d238dceacbed3a6dab3a4bcb1565452b928c6982301ab08f5758b18098fafbc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    setsuzoku (0.10.5)
+    setsuzoku (0.10.10)
       activesupport (~> 5.0)
       faraday (~> 0.11)
       httparty (~> 0.16.4)
@@ -28,7 +28,7 @@ GEM
     httparty (0.16.4)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.8.3)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
@@ -37,7 +37,7 @@ GEM
     minitest (5.14.1)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    nokogiri (1.10.9)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     public_suffix (4.0.5)
     rake (10.5.0)
@@ -57,7 +57,7 @@ GEM
     safe_yaml (1.0.5)
     sorbet (0.5.5675)
       sorbet-static (= 0.5.5675)
-    sorbet-runtime (0.5.5786)
+    sorbet-runtime (0.5.5862)
     sorbet-static (0.5.5675-universal-darwin-14)
     thread_safe (0.3.6)
     tzinfo (1.2.7)

data/lib/setsuzoku/rspec/dynamic_spec_helper.rb

@@ -231,13 +231,9 @@ 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")))
-               else
-                 File.read("#{Dir.pwd}/spec/support/setsuzoku/#{stub_directory}/#{action_name}_request.#{format}")
-               end
+        body = File.read("#{Dir.pwd}/spec/support/setsuzoku/#{stub_directory}/#{action_name}_request.#{format}")
         body.squish!
         case format
         when :xml
@@ -251,8 +247,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)
@@ -274,6 +268,7 @@ module Setsuzoku
         case format
         when :json
           #faraday sorts hash keys for some reason
+          body = body.to_json if body.is_a?(Hash)
           body = JSON.parse(body).sort.to_h
         end
         [url, 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.5'
+  VERSION = '0.10.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: setsuzoku
 version: !ruby/object:Gem::Version
-  version: 0.10.5
+  version: 0.10.10
 platform: ruby
 authors:
 - Luke Stadtler
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-27 00:00:00.000000000 Z
+date: 2020-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler