setsuzoku 0.14.8 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65e48591475a806438d5b6e92976a50b430f2c04678f5401f1fdb5eed437bcc5
-  data.tar.gz: 24d7ee0501318d5ea4b5f5ac0c768c64906aa2b09195a2228df7fb9ccd802611
+  metadata.gz: 33e2792dd95e82af3c6d7da592db91dfc6deb3231bba7408b02a5d0d400a06df
+  data.tar.gz: c3dd57468f5e8e1a8f948522f34a62231759c15b2778e3a591b414b6e208e6cf
 SHA512:
-  metadata.gz: 4aa65457286fd02d73b5b979341f046958a18604af56a1bc0c24c1ae468830533dca95475bbf5dcb3bce7133abdeab956a0452bcbbadce0a0828a9caf6e37ef4
-  data.tar.gz: 6c8c2b1b13b07b65285a9dada7820509db42672b9ce4c7109c745f6271d37442e0c95e841515c76a0718cc5af1432823a0fe08ee7ae9948b93414446fd033d83
+  metadata.gz: 17824e32cc43b626875a9fb4bcfdae86b29a109b78f8c8aea01116734d72e4093ebfa1087e50b54ebcc65a1439b7002eb592057b9633596102f8590726e777ee
+  data.tar.gz: 7ad2426f1f7959301f1ec50ce45611363d79f433de59a0414226e8cd99f765a6bc68a6c2c9b391b84f1533aca6cbc07f8a46ff60b893d5af42241bd586c738a9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    setsuzoku (0.14.8)
+    setsuzoku (0.15.1)
       activesupport (>= 5.0, < 7)
       faraday (~> 0.11)
       nokogiri (~> 1.10)
@@ -10,7 +10,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4)
+    activesupport (6.1.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -18,21 +18,23 @@ GEM
       zeitwerk (~> 2.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.4.2)
-    faraday (0.17.4)
+    faraday (0.17.5)
       multipart-post (>= 1.2, < 3)
     hashdiff (1.0.1)
-    i18n (1.8.10)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.4)
-    multipart-post (2.1.1)
-    nokogiri (1.11.7-x86_64-darwin)
+    mini_portile2 (2.8.0)
+    minitest (5.16.1)
+    multipart-post (2.2.3)
+    nokogiri (1.13.6)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     public_suffix (4.0.5)
-    racc (1.5.2)
+    racc (1.6.0)
     rake (10.5.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -48,17 +50,17 @@ GEM
       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.6497)
-    sorbet-static (0.5.5675-universal-darwin-14)
+    sorbet (0.5.10030)
+      sorbet-static (= 0.5.10030)
+    sorbet-runtime (0.5.10125)
+    sorbet-static (0.5.10030-universal-darwin-14)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     webmock (3.8.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.4.2)
+    zeitwerk (2.6.0)
 
 PLATFORMS
   ruby

data/lib/setsuzoku/api_response.rb

@@ -4,8 +4,13 @@
 module Setsuzoku
   # The generic API response object that all API responses should return.
   class ApiResponse < T::Struct
+    # the formatted response object for use in the application.
     prop :data, T.nilable(T.untyped), default: {}
+    # whether the API request "succeeded" -- atm this is simply whether we hit the 3rd-party and received any kind of response.
     prop :success, T::Boolean, default: false
+    # the error from the request -- this needs to manage codes and error messages in the future.
     prop :error, T.nilable(String), default: nil
+    # the full object of the request/response. this is primarily for debugging purposes.
+    prop :full_object, T::Hash[T.untyped, T.untyped], default: {}
   end
 end

data/lib/setsuzoku/api_strategy.rb

@@ -70,6 +70,7 @@ module Setsuzoku
       self.current_action = request.action
       formatted_response = T.let(nil, T.nilable(T::Hash[Symbol, T.untyped]))
       success = T.let(false, T::Boolean)
+      full_object = {}
       exception = T.let(nil, T.nilable(Setsuzoku::Exception))
       action_details = case strategy
                        when :auth
@@ -99,7 +100,7 @@ module Setsuzoku
           )
         end
 
-        {
+        full_object = {
             success: success,
             plugin: self.plugin,
             request: request,
@@ -110,7 +111,7 @@ module Setsuzoku
         }
       end
       self.current_action = nil
-      ApiResponse.new(data: formatted_response, success: success)
+      ApiResponse.new(data: formatted_response, success: success, full_object: full_object)
     end
 
     # Parse the response from the API for the given request.

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

@@ -57,11 +57,13 @@ module Setsuzoku
               end
               faraday.adapter Faraday.default_adapter
             end
-
-            if options[:attachment_urls].present?
+            attachment_urls = options[:attachment_url] || options[:attachment_urls]
+            if attachment_urls.present?
               resp = @faraday.post do |req|
                 payload = {}
-                attachments = options[:attachment_urls].map do |url|
+                # create an array to just iterate over for 1 or many urls
+                attachment_urls = [attachment_urls] if options[:attachment_url]
+                attachments = attachment_urls.map do |url|
                   image = open(url, 'rb')
                   Faraday::UploadIO.new(image, T.must(image).content_type, File.basename(url))
                 end
@@ -70,7 +72,8 @@ module Setsuzoku
                 else
                   payload.merge!(full_request)
                 end
-                payload[options[:attachment_url_key]] = attachments
+                # if using the singular "attachment_url" key pull out the first item
+                payload[options[:attachment_url_key]] = options[:attachment_url] ? attachments.first : attachments
                 req.body = payload
               end
             else
@@ -126,7 +129,10 @@ module Setsuzoku
               # Faraday expects get requests params to be a hash
               params
             elsif request_properties[:req_params].empty?
-              if %i[put patch post].include?(request_properties[:request_method])
+              # if the header or request format include urlencoded return the body as a hash
+              if request_format.include?('urlencoded')
+                params
+              elsif %i[put patch post].include?(request_properties[:request_method])
                 params.to_json # Faraday doesn't support an empty hash for PUT/PATCH/POST requests
               else
                 params # Faraday supports empty hashes for other request types...

data/lib/setsuzoku/service/web_service/auth_strategies/strategy_can_use_tokens.rb

@@ -138,6 +138,8 @@ module Setsuzoku
           def get_token!(body, action)
             success = false
             without_headers = self.credential.auth_actions[action].has_key?(:without_headers) ? self.credential.auth_actions[action][:without_headers] : true
+            body.merge!(self.credential.auth_actions[action][:body]) if self.credential.auth_actions[action].has_key?(:body)
+  
             request = self.api_strategy.request_class.new(action: action, body: body, without_headers: without_headers)
 
             resp = self.api_strategy.call_external_api(request: request, strategy: :auth)

data/lib/setsuzoku/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: setsuzoku
 version: !ruby/object:Gem::Version
-  version: 0.14.8
+  version: 0.15.1
 platform: ruby
 authors:
 - Luke Stadtler
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-07 00:00:00.000000000 Z
+date: 2022-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -227,7 +227,7 @@ homepage: https://github.com/rocketreferrals/setsuzoku
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -242,8 +242,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: Extensible 3rd-party interface and functionality plugins
 test_files: []