setsuzoku 0.10.1 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aef3c39e156bb15569d8bf6de134794150fa92d13d09c90ebd2353db146abe5a
-  data.tar.gz: 0e583bdf0d58ef9e51ff614ccb604a8ac936c0e57f6c1d310bba7ec856539ffa
+  metadata.gz: be6b4f73f228cd56bcafd263862f5a84c6d7ef27bf37dcbbacb08e9d9924f28a
+  data.tar.gz: 735fd334007864a9a40647edff5d3441c3baad7b8b637bfde5414a5d1f20adc7
 SHA512:
-  metadata.gz: 8f4a10541b26ac6e634aa9f615d636961016667c85a80d371f67df0391c8267ef7c0123bd9e2bdbd9894b0e1d0a1bfdc8573f0d7df5afa53c5e269007e7ce8df
-  data.tar.gz: 21fe9ec50e376486befa73d5228a953e772db4f02372bd17da83984ecad29448679fbc9cc73c02c141afbf727c4fef6a34d55827a233a75be97e84a16168effc
+  metadata.gz: b3bf581fad087d683aa66a7c80d18b31317cae6401953b5f67f6e04e574d1507fafbe3dea6d0a3f8d2fa17ef8852f3a2f35633eb0e68328f87625d6ccfff1c77
+  data.tar.gz: 31bf1b3ab7eee17f8e00a3ba51471c5340f4ffecad8812e96daaafe7d1181b8365b1d20a5152ef7398758d5b4649af93033e9d2349ea5b8abf14afefc5b38214

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    setsuzoku (0.10.1)
+    setsuzoku (0.10.3)
       activesupport (~> 5.0)
       faraday (~> 0.11)
       httparty (~> 0.16.4)

data/lib/setsuzoku/rspec/dynamic_spec_helper.rb

@@ -233,7 +233,11 @@ module Setsuzoku
       url = propz[:url]
       format = propz[:request_format].to_s.include?('x-www-form') ? :json : propz[:request_format]
       begin
-        body = File.read("#{Dir.pwd}/spec/support/setsuzoku/#{stub_directory}/#{action_name}_request.#{format}")
+        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.squish!
         case format
         when :xml

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

@@ -74,16 +74,16 @@ module Setsuzoku
                 action_details: T::Hash[Symbol, T.untyped]
             ).returns(T::Hash[Symbol, T.untyped])
           end
-
           def get_request_properties(action_name:, for_stub: false, req_params: {}, action_details: { actions: self.plugin.api_actions, url: self.plugin.api_base_url })
             action = action_details[:actions][action_name]
+            url = action.has_key?(:request_url) ? action[:request_url] : action_details[:url]
             request_method, endpoint = action.first
             request_method = request_method.downcase.to_sym
             request_format = action[:request_type]
             response_format = action[:response_type]
             token = action[:token]
             stub_data = action[:stub_data] if for_stub
-            full_url = action_details[:url] + endpoint
+            full_url = url + endpoint
             formatted_full_url, req_params = self.replace_dynamic_vars(full_url: full_url, req_params: req_params)
             {
                 request_method: request_method,
@@ -126,7 +126,19 @@ module Setsuzoku
 
           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] || {})
-            (request_options[:headers] ||= {})[:'Content-Type'] = "application/#{request_format || :json}"
+            content_type = case request_format
+                           when :json
+                             'application/json'
+                           when :xml
+                             'application/xml'
+                           when :text
+                             'text/plain'
+                           when :pdf
+                             'application/pdf'
+                           else
+                             'application/json'
+                           end
+            (request_options[:headers] ||= {})[:'Content-Type'] = content_type
             request_options
           end
 

data/lib/setsuzoku/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: setsuzoku
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.3
 platform: ruby
 authors:
 - Luke Stadtler
@@ -248,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Extensible 3rd-party interface and functionality plugins