setsuzoku 0.15.6 → 0.15.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff8246ca48a229497f92f8c6a5742783fc02a85da6baeb3ace84cabde73805e7
-  data.tar.gz: ddbe3e59623598c5ac438fee6a0dd5d2bacb568e5546c310cb671d2fa34e4e47
+  metadata.gz: 2845af66689814f88f37e06cd20516904d7000d8eb5e7b65893db42f93e47e18
+  data.tar.gz: d85e64ea68bf642ce3ac6dda479575d8a34b9896b15e14332072cb35692d65d5
 SHA512:
-  metadata.gz: 24ab5631b9babbf9951d12b81e737a1fa6db5438ed5a0fd5997ebb8ddec6f4c0c016b25e2bb9cc5ac0bda87aef32660de9d722bc1adc6189e24060d38b1f0f84
-  data.tar.gz: 9f4638fafb345772f85ce3b1dbf29cb8e5202d51c8bf58f39eed4d90ee030fea68a6d2091e7e6838e48c559e86786d311d883e700fadd89736450284b2468e2e
+  metadata.gz: 8409e05401d6ce653ae9704058a6a5874ffb63687d467514cb7fc69fd3c37dfd7c9a1931d843e558f4726f6a5a5355edb6a841dd888384a52959925e570575aa
+  data.tar.gz: d2829f923f90faccaf2afdc7449af20948fc85234a0eb257e6b3d7aece01db815c24e9360cc168c4af45b6bb84cb16e3ba43c972982c8827f02731532ed7cc1e

data/Gemfile.lock

@@ -2,8 +2,9 @@ PATH
   remote: .
   specs:
     setsuzoku (0.15.6)
-      activesupport (>= 5.0, < 7)
+      activesupport (>= 5.0, < 8)
       faraday (>= 2.7.10, < 3.0)
+      faraday-multipart (>= 1.0.4, < 2.0)
       nokogiri (>= 1.10, < 2.0)
       sorbet-runtime (>= 0.5, < 1.0)
 
@@ -25,13 +26,22 @@ GEM
     faraday (2.7.10)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
     faraday-net_http (3.0.2)
     hashdiff (1.0.1)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
+    mini_portile2 (2.8.5)
     minitest (5.19.0)
+    multipart-post (2.4.0)
+    nokogiri (1.15.4)
+      mini_portile2 (~> 2.8.2)
+      racc (~> 1.4)
     nokogiri (1.15.4-arm64-darwin)
       racc (~> 1.4)
+    nokogiri (1.15.4-x86_64-linux)
+      racc (~> 1.4)
     public_suffix (5.0.4)
     racc (1.7.1)
     rake (13.1.0)
@@ -54,6 +64,7 @@ GEM
       sorbet-static (= 0.5.11151)
     sorbet-runtime (0.5.10972)
     sorbet-static (0.5.11151-universal-darwin)
+    sorbet-static (0.5.11151-x86_64-linux)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     webmock (3.19.1)

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

@@ -4,6 +4,8 @@
 require 'active_support/json'
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/string/access'
+require 'faraday'
+require 'faraday/multipart'
 
 module Setsuzoku
   module Service
@@ -35,32 +37,49 @@ module Setsuzoku
           #   attachment_urls - 'Array<String>' List of attachment urls to be attached as form files.
           #
           # @return [Hash] the parsed response object.
-          sig { override.params(request: RestAPIRequest, action_details: T::Hash[T.untyped, T.untyped], options: T.untyped).returns(Faraday::Response) }
+          sig do
+            override.params(request: RestAPIRequest, action_details: T::Hash[T.untyped, T.untyped],
+                            options: T.untyped).returns(Faraday::Response)
+          end
           def perform_external_call(request:, action_details:, **options)
-            request_properties = self.get_request_properties(action_name: request.action, action_details: action_details, req_params: request.body)
-            request_options = self.request_options(request_properties[:request_format], action_details[:actions][request.action])
+            request_properties = get_request_properties(action_name: request.action,
+                                                        action_details: action_details, req_params: request.body)
+            request_options = self.request_options(request_properties[:request_format],
+                                                   action_details[:actions][request.action])
             authorization = request_options.delete(:authorization)
-            full_request = self.formulate_request(request_properties, request_options)
-
-            @faraday = Faraday.new(url: request_properties[:formatted_full_url], request: { params_encoder: Faraday::FlatParamsEncoder }) do |faraday|
-              faraday.request(:multipart) if options[:attachment_urls].present?
-              faraday.request(:url_encoded)
-              unless request.without_headers
-                if authorization
-                  # updated authorization with updated faraday
-                  # https://lostisland.github.io/faraday/#/middleware/included/authentication
-                  if authorization.key?(:token)
-                    faraday.request(:authorization, 'Bearer', authorization[:token])
-                  elsif authorization.key?(:basic_auth)
-                    faraday.request(:authorization, :basic, authorization[:basic_auth][:username], authorization[:basic_auth][:password])
-                  end
+            full_request = formulate_request(request_properties, request_options)
+
+            connection = Faraday.new(url: request_properties[:formatted_full_url],
+                                     request: { params_encoder: Faraday::FlatParamsEncoder }) do |faraday|
+              # Request type middle-ware
+              if options[:attachment_urls].present? || request_options.dig(:headers,
+                                                                           :'Content-Type')&.include?('multipart')
+                faraday.request(:multipart)
+              else
+                faraday.request(:url_encoded)
+              end
+
+              # Logging
+              faraday.response :logger, Logger.new($stdout), bodies: true if Rails.env.development?
+
+              if !request.without_headers && authorization
+                # updated authorization with updated faraday
+                # https://lostisland.github.io/faraday/#/middleware/included/authentication
+                if authorization.key?(:token)
+                  faraday.request(:authorization, 'Bearer', authorization[:token])
+                elsif authorization.key?(:basic_auth)
+                  faraday.request(:authorization, :basic, authorization[:basic_auth][:username],
+                                  authorization[:basic_auth][:password])
                 end
               end
+
               faraday.adapter Faraday.default_adapter
             end
+
+            # Attachments URLs
             attachment_urls = options[:attachment_url] || options[:attachment_urls]
             if attachment_urls.present?
-              resp = @faraday.post do |req|
+              resp = connection.post do |req|
                 payload = {}
                 # create an array to just iterate over for 1 or many urls
                 attachment_urls = [attachment_urls] if options[:attachment_url]
@@ -79,24 +98,36 @@ module Setsuzoku
               end
             else
               if request.without_headers
-                @faraday.headers = {}
+                connection.headers = {}
               elsif request_options[:headers]
-                @faraday.headers = (@faraday.headers || {}).merge(request_options[:headers])
+                connection.headers = (connection.headers || {}).merge(request_options[:headers])
+              end
+
+              # TODO: !!!! this is wrong here because multipart is used for images as well not only text/plain
+              # TODO: What if the request params are empty?
+              if connection.builder.app.class <= Faraday::Multipart::Middleware
+                full_request = request_properties[:req_params].transform_values do |v|
+                  Faraday::Multipart::ParamPart.new(v, 'text/plain')
+                end
               end
-              resp = @faraday.send(request_properties[:request_method], request_properties[:formatted_full_url], full_request)
+
+              resp = connection.send(request_properties[:request_method], request_properties[:formatted_full_url],
+                                     full_request)
             end
+
             resp
           end
 
           sig do
             params(
-                action_name: Symbol,
-                for_stub: T::Boolean,
-                req_params: T::Hash[T.untyped, T.untyped],
-                action_details: T::Hash[Symbol, T.untyped]
+              action_name: Symbol,
+              for_stub: T::Boolean,
+              req_params: T::Hash[T.untyped, T.untyped],
+              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 })
+          def get_request_properties(action_name:, for_stub: false, req_params: {},
+                                     action_details: { actions: plugin.api_actions, url: 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
@@ -105,15 +136,15 @@ module Setsuzoku
             response_format = action[:response_type]
             stub_data = action[:stub_data] if for_stub
             full_url = url + endpoint
-            formatted_full_url, req_params = self.replace_dynamic_vars(full_url: full_url, req_params: req_params)
+            formatted_full_url, req_params = replace_dynamic_vars(full_url: full_url, req_params: req_params)
             {
-                request_method: request_method,
-                endpoint: endpoint,
-                request_format: request_format,
-                response_format: response_format,
-                formatted_full_url: formatted_full_url,
-                req_params: req_params,
-                stub_data: stub_data,
+              request_method: request_method,
+              endpoint: endpoint,
+              request_format: request_format,
+              response_format: response_format,
+              formatted_full_url: formatted_full_url,
+              req_params: req_params,
+              stub_data: stub_data
             }
           end
 
@@ -138,29 +169,27 @@ module Setsuzoku
               else
                 params # Faraday supports empty hashes for other request types...
               end
-            else
+            elsif request_format.include?('urlencoded')
               # if the header or request format include urlencoded return the body as a hash
-              if request_format.include?('urlencoded')
-                params
-              else
-                # return either xml or json
-                if request_properties[:request_format] == :xml
-                  convert_hash_to_xml(params)
-                else
-                  params.to_json
-                end
-              end
+              params
+            elsif request_properties[:request_format] == :xml
+              # return either xml or json
+              convert_hash_to_xml(params)
+            else
+              params.to_json
             end
           end
 
           def request_options(request_format = nil, action_details = {})
-            request_options = {}
-            (request_options = {})[:headers] = {}
+            request_options = {
+              headers: {}
+            }
             request_options[:headers]
-              .merge!(self.auth_strategy.get_from_context(:auth_headers).except(:authorization))
-              .merge!(self.get_from_context(:api_headers))
+              .merge!(auth_strategy.get_from_context(:auth_headers).except(:authorization))
+              .merge!(get_from_context(:api_headers))
               .merge!(action_details[:request_options] || {})
-            request_options[:authorization] = action_details[:authorization] || self.auth_strategy.get_from_context(:auth_headers)[:authorization]
+            request_options[:authorization] =
+              action_details[:authorization] || auth_strategy.get_from_context(:auth_headers)[:authorization]
 
             content_type = case request_format
                            when :json
@@ -174,7 +203,8 @@ module Setsuzoku
                            when :'x-www-form-urlencoded;charset=UTF-8'
                              'application/x-www-form-urlencoded;charset=UTF-8'
                            else
-                             'application/json'
+                             # allow any format to be passed otherwise default to application/json
+                             request_format || 'application/json'
                            end
             (request_options[:headers] ||= {})[:'Content-Type'] = content_type
             request_options
@@ -187,7 +217,7 @@ module Setsuzoku
             # it in the body and the url, then you should put it in params twice with different names.
             req_params = req_params.dup
             full_url = full_url.dup
-            dynamic_vars = self.plugin.dynamic_url_params.merge(req_params).with_indifferent_access
+            dynamic_vars = plugin.dynamic_url_params.merge(req_params).with_indifferent_access
             full_url.scan(/({{.*?}})/).flatten.each do |var|
               var_name = var.tr('{{ }}', '')
               next unless dynamic_vars[var_name]

data/lib/setsuzoku/version.rb

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

data/setsuzoku.gemspec

@@ -40,9 +40,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "3.8"
   spec.add_development_dependency "webmock", "3.19.1"
-  spec.add_runtime_dependency "activesupport", ">= 5.0", '< 7'
+  spec.add_runtime_dependency "activesupport", ">= 5.0", '< 8'
   spec.add_development_dependency "sorbet", ">= 0.5", '< 1.0'
   spec.add_runtime_dependency "sorbet-runtime", ">= 0.5", '< 1.0'
   spec.add_runtime_dependency "faraday", ">= 2.7.10", "< 3.0"
+  spec.add_runtime_dependency "faraday-multipart", ">= 1.0.4", "< 2.0"
   spec.add_runtime_dependency "nokogiri", ">= 1.10", "< 2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: setsuzoku
 version: !ruby/object:Gem::Version
-  version: 0.15.6
+  version: 0.15.7
 platform: ruby
 authors:
 - Luke Stadtler
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-14 00:00:00.000000000 Z
+date: 2024-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,7 +75,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -85,7 +85,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: sorbet
   requirement: !ruby/object:Gem::Requirement
@@ -146,6 +146,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: faraday-multipart
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -267,7 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Extensible 3rd-party interface and functionality plugins