setsuzoku 0.12.56 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2c77487d2492717b45ce979383f28ce7f981cdcb6686438ee3fa95648e6900a
-  data.tar.gz: fee54d6cc4ccd975874d4319453962589a7066c82cbca30abb03fd6fd09a9894
+  metadata.gz: 2fc8faec9ca8af63095c8bcb40750b05286261e2d55c3e5b0e72716254de0d8d
+  data.tar.gz: e4f78c16811e13234dfccb2b60bf2158bcd25cf586e7c770b5c67643ec681344
 SHA512:
-  metadata.gz: 5a355ced8681dcbe0a5ea9db83ccab04a7551f9cc63fe95b15c57d9ea311075accb3637d89b9b8a4c3504d5dd74ba0a08cc9e9fea8a2bc5c346f20c6629a6fa6
-  data.tar.gz: fcbda4c7bbff627afecef61bf01177f1f78e8d4a53d7cc3c9ec630f1d7e43c80c1cb2d232ca0ec672cb068551170f2e97d8ba79a467ff09fcb75c3dd88ef6ab8
+  metadata.gz: 280622a422f80f84bc13dd5b83e87be5b756d393645741d8b0b155b45713fad63bb55e62147cb2a4f34e963241c6f56ad66018c412141f927c5679f0ea514bd4
+  data.tar.gz: b106bffe570548d00faf98b7d19695b759bbeff0dd9c807848b5147a049ff2d5836688fb67d4a362398c1844eaaff648605f5775b660770453a287a662348433

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    setsuzoku (0.12.56)
-      activesupport (~> 5.0)
+    setsuzoku (0.13.1)
+      activesupport (>= 5.0, < 7)
       faraday (~> 0.11)
       nokogiri (~> 1.10)
       sorbet-runtime (~> 0.5)
@@ -10,11 +10,12 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.4.4)
+    activesupport (6.0.3.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     concurrent-ruby (1.1.7)
@@ -49,7 +50,7 @@ GEM
     safe_yaml (1.0.5)
     sorbet (0.5.5675)
       sorbet-static (= 0.5.5675)
-    sorbet-runtime (0.5.5924)
+    sorbet-runtime (0.5.5937)
     sorbet-static (0.5.5675-universal-darwin-14)
     thread_safe (0.3.6)
     tzinfo (1.2.7)
@@ -58,6 +59,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby

data/lib/setsuzoku/api_strategy.rb

@@ -86,7 +86,7 @@ module Setsuzoku
           raw_response = self.perform_external_call(request: request, action_details: action_details, **options)
           formatted_response = self.parse_response(response: raw_response, response_type: action_details[:actions][request.action][:response_type])
           success = true
-        rescue Exception => e
+        rescue ::Exception => e
           exception = e
           self.external_api_handler.call_external_api_exception(
               plugin: self.plugin,

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

@@ -65,12 +65,12 @@ module Setsuzoku
                   image = open(url, 'rb')
                   Faraday::UploadIO.new(image, T.must(image).content_type, File.basename(url))
                 end
-                payload[options[:attachment_url_key]] = attachments
                 if request_properties[:request_format] == :json
                   payload[:json] = Faraday::UploadIO.new(StringIO.new(full_request), 'application/json')
                 else
                   payload.merge!(full_request)
                 end
+                payload[options[:attachment_url_key]] = attachments
                 req.body = payload
               end
             else
@@ -147,7 +147,7 @@ module Setsuzoku
               .merge!(self.auth_strategy.get_from_context(:auth_headers).except(:authorization))
               .merge!(self.get_from_context(:api_headers))
               .merge!(action_details[:request_options] || {})
-            request_options[:authorization] = self.auth_strategy.get_from_context(:auth_headers)[:authorization]
+            request_options[:authorization] = action_details[:authorization] || self.auth_strategy.get_from_context(:auth_headers)[:authorization]
 
             content_type = case request_format
                            when :json

data/lib/setsuzoku/service/web_service/api_strategy.rb

@@ -86,6 +86,16 @@ module Setsuzoku
             convert_xml_to_hash(response.body)
           when :html
             response.body
+          when :txt, :png, :jpg, :gif
+            # for now just return the file
+            response.body
+            # for now just put in tmp
+            # tmp_dir = "#{Dir.tmpdir}/setsuzoku/#{self.plugin.class.system_name.underscore}/#{self.plugin.name.underscore}"
+            # file_name = "#{self.plugin.class.system_name.underscore}_#{self.plugin.name.underscore}_#{Time.now.strftime("%Y_%m_%d_%T")}"
+            # t = Tempfile.new([file_name, ".#{options[:response_type]}"], encoding: 'ascii-8bit')
+            # t.write(response.body)
+            # t.rewind
+            # t
           else
             JSON.parse(response.body).deep_symbolize_keys
           end
@@ -116,8 +126,10 @@ module Setsuzoku
         def convert_xml_to_hash(xml)
           begin
             result = Nokogiri::XML(xml)
-            { result.root.name.underscore.to_sym => xml_node_to_hash(result.root) }
-          rescue Exception => e
+            key = result.root.name.underscore.to_sym
+            val = xml_node_to_hash(result.root)
+            { key => val }
+          rescue ::Exception => e
             {}
           end
         end

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

@@ -137,7 +137,8 @@ module Setsuzoku
           # @return void
           def get_token!(body, action)
             success = false
-            request = self.api_strategy.request_class.new(action: action, body: body, without_headers: true)
+            without_headers = self.credential.auth_actions[action].has_key?(:without_headers) ? self.credential.auth_actions[action][:without_headers] : true
+            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/service/web_service/credentials/o_auth_credential.rb

@@ -59,7 +59,7 @@ module Setsuzoku
           # @param resp [Hash] the response hash from the external api call for a token.
           #
           # @return [Hash] the attributes to assign to the credential.
-          sig{ override.params(resp: Setsuzoku::ApiResponse).returns(T::Hash[Symbol, T.untyped]) }
+          sig{ overridable.params(resp: Setsuzoku::ApiResponse).returns(T::Hash[Symbol, T.untyped]) }
           def token_attributes_to_assign(resp)
             attrs = {
                 token: resp.data[:access_token],

data/lib/setsuzoku/version.rb

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

data/setsuzoku.gemspec

@@ -40,7 +40,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "3.8"
   spec.add_development_dependency "webmock", "3.8"
-  spec.add_runtime_dependency "activesupport", "~> 5.0"
+  spec.add_runtime_dependency "activesupport", ">= 5.0", '< 7'
   spec.add_development_dependency "sorbet", "~> 0.5"
   spec.add_runtime_dependency "sorbet-runtime", "~> 0.5"
   #TODO: we should remove httparty if we can just use faraday

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: setsuzoku
 version: !ruby/object:Gem::Version
-  version: 0.12.56
+  version: 0.13.1
 platform: ruby
 authors:
 - Luke Stadtler
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-29 00:00:00.000000000 Z
+date: 2021-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,16 +70,22 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: sorbet
   requirement: !ruby/object:Gem::Requirement
@@ -221,7 +227,7 @@ homepage: https://github.com/rocketreferrals/setsuzoku
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -237,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.1
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Extensible 3rd-party interface and functionality plugins
 test_files: []