workato-connector-sdk 1.3.4 → 1.3.6

data/lib/workato/connector/sdk/dsl/aws.rb

@@ -4,8 +4,6 @@
 require 'aws-sigv4'
 require 'workato/utilities/xml'
 
-using Workato::Extension::HashWithIndifferentAccess
-
 module Workato
   module Connector
     module Sdk
@@ -68,7 +66,7 @@ module Workato
                 method: method,
                 path: path,
                 params: params,
-                headers: HashWithIndifferentAccess.wrap(headers),
+                headers: Utilities::HashWithIndifferentAccess.wrap(headers),
                 payload: payload
               )
 

data/lib/workato/connector/sdk/dsl/reinvoke_after.rb

@@ -74,8 +74,7 @@ module Workato
 
           sig { returns(Integer) }
           def reinvoke_limit
-            @reinvoke_limit = T.let(@reinvoke_limit, T.nilable(Integer))
-            @reinvoke_limit ||= (ENV['MAX_REINVOKES'].presence || MAX_REINVOKES).to_i
+            @reinvoke_limit ||= T.let((ENV['MAX_REINVOKES'].presence || MAX_REINVOKES).to_i, T.nilable(Integer))
           end
         end
       end

data/lib/workato/connector/sdk/dsl/workato_package.rb

@@ -2,11 +2,9 @@
 # frozen_string_literal: true
 
 require 'jwt'
-require_relative './csv_package'
-require_relative './net_package'
-require_relative './stream_package'
-
-using Workato::Extension::HashWithIndifferentAccess
+require_relative 'csv_package'
+require_relative 'net_package'
+require_relative 'stream_package'
 
 module Workato
   module Connector
@@ -72,9 +70,9 @@ module Workato
               end
             end
 
-            header_fields = HashWithIndifferentAccess.wrap(header_fields)
-                                                     .except(:typ, :alg)
-                                                     .reverse_merge(typ: 'JWT', alg: algorithm)
+            header_fields = Utilities::HashWithIndifferentAccess.wrap(header_fields)
+                                                                .except(:typ, :alg)
+                                                                .reverse_merge(typ: 'JWT', alg: algorithm)
 
             ::JWT.encode(payload, key, algorithm, header_fields)
           rescue JWT::IncorrectAlgorithm

data/lib/workato/connector/sdk/dsl.rb

@@ -1,19 +1,19 @@
 # typed: true
 # frozen_string_literal: true
 
-require_relative './block_invocation_refinements'
-
-require_relative './dsl/http'
-require_relative './dsl/call'
-require_relative './dsl/reinvoke_after'
-require_relative './dsl/error'
-require_relative './dsl/account_property'
-require_relative './dsl/lookup_table'
-require_relative './dsl/workato_package'
-require_relative './dsl/workato_schema'
-require_relative './dsl/time'
-require_relative './dsl/aws'
-require_relative './dsl/execution_context'
+require_relative 'block_invocation_refinements'
+
+require_relative 'dsl/http'
+require_relative 'dsl/call'
+require_relative 'dsl/reinvoke_after'
+require_relative 'dsl/error'
+require_relative 'dsl/account_property'
+require_relative 'dsl/lookup_table'
+require_relative 'dsl/workato_package'
+require_relative 'dsl/workato_schema'
+require_relative 'dsl/time'
+require_relative 'dsl/aws'
+require_relative 'dsl/execution_context'
 
 module Workato
   module Connector

data/lib/workato/connector/sdk/lookup_tables.rb

@@ -4,8 +4,6 @@
 require 'csv'
 require 'singleton'
 
-using Workato::Extension::HashWithIndifferentAccess
-
 module Workato
   module Connector
     module Sdk
@@ -42,7 +40,7 @@ module Workato
           @table_by_id ||= {}
           @table_by_name ||= {}
           data.each do |name, table|
-            table = HashWithIndifferentAccess.wrap(table)
+            table = Utilities::HashWithIndifferentAccess.wrap(table)
             rows = table['rows'].freeze
             @table_by_id[table['id'].to_i] = rows
             @table_by_name[name] = rows

data/lib/workato/connector/sdk/object_definitions.rb

@@ -1,13 +1,13 @@
 # typed: strict
 # frozen_string_literal: true
 
-require_relative './block_invocation_refinements'
+require_relative 'block_invocation_refinements'
 
 module Workato
   module Connector
     module Sdk
       module SorbetTypes
-        ObjectDefinitionOutput = T.type_alias { T::Array[HashWithIndifferentAccess] }
+        ObjectDefinitionOutput = T.type_alias { T::Array[ActiveSupport::HashWithIndifferentAccess] }
       end
 
       class ObjectDefinitions
@@ -34,7 +34,7 @@ module Workato
           params(
             settings: T.nilable(SorbetTypes::SettingsHash),
             config_fields: SorbetTypes::OperationInputHash
-          ).returns(HashWithIndifferentAccess)
+          ).returns(ActiveSupport::HashWithIndifferentAccess)
         end
         def lazy(settings = nil, config_fields = {})
           DupHashWithIndifferentAccess.new do |object_definitions, name|
@@ -99,7 +99,7 @@ module Workato
 
         private_constant :ObjectDefinition
 
-        class DupHashWithIndifferentAccess < HashWithIndifferentAccess
+        class DupHashWithIndifferentAccess < ActiveSupport::HashWithIndifferentAccess
           extend T::Sig
           extend T::Generic
 

data/lib/workato/connector/sdk/operation.rb

@@ -1,11 +1,9 @@
 # typed: strict
 # frozen_string_literal: true
 
-require_relative './dsl'
-require_relative './block_invocation_refinements'
-require_relative './schema'
-
-using Workato::Extension::HashWithIndifferentAccess
+require_relative 'dsl'
+require_relative 'block_invocation_refinements'
+require_relative 'schema'
 
 module Workato
   module Connector
@@ -15,11 +13,11 @@ module Workato
 
         OperationExecuteProc = T.type_alias do
           T.proc.params(
-            arg0: HashWithIndifferentAccess,
-            arg1: HashWithIndifferentAccess,
-            arg2: T.any(Schema, T::Array[HashWithIndifferentAccess]),
-            arg3: T.any(Schema, T::Array[HashWithIndifferentAccess]),
-            arg4: HashWithIndifferentAccess
+            arg0: ActiveSupport::HashWithIndifferentAccess,
+            arg1: ActiveSupport::HashWithIndifferentAccess,
+            arg2: T.any(Schema, T::Array[ActiveSupport::HashWithIndifferentAccess]),
+            arg3: T.any(Schema, T::Array[ActiveSupport::HashWithIndifferentAccess]),
+            arg4: ActiveSupport::HashWithIndifferentAccess
           ).returns(
             T.untyped
           )
@@ -31,9 +29,9 @@ module Workato
 
         OperationSchemaProc = T.type_alias do
           T.proc.params(
-            arg0: HashWithIndifferentAccess,
-            arg1: HashWithIndifferentAccess,
-            arg2: HashWithIndifferentAccess
+            arg0: ActiveSupport::HashWithIndifferentAccess,
+            arg1: ActiveSupport::HashWithIndifferentAccess,
+            arg2: ActiveSupport::HashWithIndifferentAccess
           ).returns(
             T.nilable(T.any(SorbetTypes::OperationSchema, T::Hash[T.any(Symbol, String), T.untyped]))
           )
@@ -66,8 +64,14 @@ module Workato
         end
         def initialize(operation: {}, methods: {}, connection: Connection.new, streams: ProhibitedStreams.new,
                        object_definitions: nil)
-          @operation = T.let(HashWithIndifferentAccess.wrap(operation), HashWithIndifferentAccess)
-          @_methods = T.let(HashWithIndifferentAccess.wrap(methods), HashWithIndifferentAccess)
+          @operation = T.let(
+            Utilities::HashWithIndifferentAccess.wrap(operation),
+            ActiveSupport::HashWithIndifferentAccess
+          )
+          @_methods = T.let(
+            Utilities::HashWithIndifferentAccess.wrap(methods),
+            ActiveSupport::HashWithIndifferentAccess
+          )
           @connection = T.let(connection, Connection)
           @streams = T.let(streams, Streams)
           @object_definitions = T.let(object_definitions, T.nilable(ObjectDefinitions))
@@ -90,10 +94,10 @@ module Workato
           connection.merge_settings!(settings) if settings
           request_or_result = T.unsafe(self).instance_exec(
             connection.settings,
-            HashWithIndifferentAccess.wrap(input),
-            Array.wrap(extended_input_schema).map { |i| HashWithIndifferentAccess.wrap(i) },
-            Array.wrap(extended_output_schema).map { |i| HashWithIndifferentAccess.wrap(i) },
-            HashWithIndifferentAccess.wrap(continue),
+            Utilities::HashWithIndifferentAccess.wrap(input),
+            Array.wrap(extended_input_schema).map { |i| Utilities::HashWithIndifferentAccess.wrap(i) },
+            Array.wrap(extended_output_schema).map { |i| Utilities::HashWithIndifferentAccess.wrap(i) },
+            Utilities::HashWithIndifferentAccess.wrap(continue),
             &block
           )
           result = resolve_request(request_or_result)
@@ -105,7 +109,7 @@ module Workato
             settings: T.nilable(SorbetTypes::SettingsHash),
             config_fields: SorbetTypes::OperationInputHash
           ).returns(
-            HashWithIndifferentAccess
+            ActiveSupport::HashWithIndifferentAccess
           )
         end
         def extended_schema(settings = nil, config_fields = {})
@@ -200,7 +204,7 @@ module Workato
 
         sig do
           params(
-            object_definitions_hash: HashWithIndifferentAccess,
+            object_definitions_hash: ActiveSupport::HashWithIndifferentAccess,
             settings: T.nilable(SorbetTypes::SettingsHash),
             config_fields: SorbetTypes::OperationInputHash,
             schema_proc: T.nilable(SorbetTypes::OperationSchemaProc)
@@ -253,7 +257,7 @@ module Workato
         def try_convert_to_hash_with_indifferent_access(value)
           case value
           when ::Hash
-            HashWithIndifferentAccess.wrap(value)
+            Utilities::HashWithIndifferentAccess.wrap(value)
           when ::Array
             value.map! { |i| try_convert_to_hash_with_indifferent_access(i) }
           else
@@ -266,7 +270,7 @@ module Workato
           T.must(@object_definitions)
         end
 
-        sig { returns(HashWithIndifferentAccess) }
+        sig { returns(ActiveSupport::HashWithIndifferentAccess) }
         attr_reader :operation
 
         sig { override.returns(Connection) }

data/lib/workato/connector/sdk/request.rb

@@ -11,9 +11,7 @@ require 'active_support/json'
 
 require 'workato/utilities/encoding'
 require 'workato/utilities/xml'
-require_relative './block_invocation_refinements'
-
-using Workato::Extension::HashWithIndifferentAccess
+require_relative 'block_invocation_refinements'
 
 module Workato
   module Connector
@@ -77,7 +75,7 @@ module Workato
 
         def params(params)
           if params.is_a?(Hash)
-            @params ||= HashWithIndifferentAccess.new
+            @params ||= ActiveSupport::HashWithIndifferentAccess.new
             @params.merge!(params)
           else
             @params = params
@@ -86,15 +84,11 @@ module Workato
         end
 
         def payload(payload = nil)
-          case payload
-          when Array
-            @payload ||= []
-            @payload += payload
-          when NilClass
-            # no-op
+          if defined?(@payload) || payload.is_a?(Hash)
+            @payload ||= ActiveSupport::HashWithIndifferentAccess.new
+            @payload.merge!(payload) if payload
           else
-            @payload ||= {}.with_indifferent_access
-            @payload.merge!(payload)
+            @payload = payload
           end
           yield(@payload) if Kernel.block_given?
           self
@@ -367,7 +361,7 @@ module Workato
         end
 
         def detect_auth_error!(response)
-          return unless authorized?
+          return unless authorization? && connection.authorization.reauthorizable?
 
           error_patterns = connection.authorization.detect_on
           return unless error_patterns.any? { |pattern| pattern === response rescue false }
@@ -376,7 +370,7 @@ module Workato
         end
 
         def after_error_response_matches?(exception)
-          return if @after_error_response_matches.blank?
+          return false if @after_error_response_matches.blank?
 
           @after_error_response_matches.find do |match|
             case match
@@ -394,14 +388,15 @@ module Workato
           within_action_context(
             exception.http_code,
             exception.http_body,
-            HashWithIndifferentAccess.wrap(exception.http_headers),
+            Utilities::HashWithIndifferentAccess.wrap(exception.http_headers),
             exception.message,
             &@after_error_response
           )
         end
 
         def apply_after_response(code, parsed_response, headers)
-          encoded_headers = (headers || {}).each_with_object(HashWithIndifferentAccess.new) do |(k, v), h|
+          headers ||= {}
+          encoded_headers = headers.each_with_object(ActiveSupport::HashWithIndifferentAccess.new) do |(k, v), h|
             h[k] = Workato::Utilities::Encoding.force_best_encoding!(v.to_s)
           end
           within_action_context(code, parsed_response, encoded_headers, &@after_response)
@@ -412,12 +407,12 @@ module Workato
         end
 
         sig { returns(T::Boolean) }
-        def authorized?
+        def authorization?
           !!@connection&.authorization?
         end
 
         def authorized
-          return yield unless authorized?
+          return yield unless authorization?
 
           apply = connection.authorization.source[:apply] || connection.authorization.source[:credentials]
           return yield unless apply
@@ -442,11 +437,11 @@ module Workato
 
         sig do
           params(
-            settings: HashWithIndifferentAccess,
+            settings: ActiveSupport::HashWithIndifferentAccess,
             access_token: T.untyped,
             auth_type: T.untyped,
             apply_proc: T.proc.params(
-              settings: HashWithIndifferentAccess,
+              settings: ActiveSupport::HashWithIndifferentAccess,
               access_token: T.untyped,
               auth_type: T.untyped
             ).void
@@ -458,10 +453,10 @@ module Workato
 
         sig do
           params(
-            settings: HashWithIndifferentAccess,
+            settings: ActiveSupport::HashWithIndifferentAccess,
             auth_type: T.untyped,
             apply_proc: T.proc.params(
-              settings: HashWithIndifferentAccess,
+              settings: ActiveSupport::HashWithIndifferentAccess,
               auth_type: T.untyped
             ).void
           ).void
@@ -472,7 +467,7 @@ module Workato
 
         sig do
           params(
-            settings_before: HashWithIndifferentAccess,
+            settings_before: ActiveSupport::HashWithIndifferentAccess,
             http_code: T.nilable(Integer),
             http_body: T.nilable(String),
             exception: T.nilable(String)

data/lib/workato/connector/sdk/schema/field/array.rb

@@ -1,7 +1,7 @@
 # typed: true
 # frozen_string_literal: true
 
-require_relative './convertors'
+require_relative 'convertors'
 
 module Workato
   module Connector

data/lib/workato/connector/sdk/schema/field/date.rb

@@ -1,7 +1,7 @@
 # typed: true
 # frozen_string_literal: true
 
-require_relative './convertors'
+require_relative 'convertors'
 
 module Workato
   module Connector

data/lib/workato/connector/sdk/schema/field/date_time.rb

@@ -1,7 +1,7 @@
 # typed: true
 # frozen_string_literal: true
 
-require_relative './convertors'
+require_relative 'convertors'
 
 module Workato
   module Connector

data/lib/workato/connector/sdk/schema/field/integer.rb

@@ -1,7 +1,7 @@
 # typed: true
 # frozen_string_literal: true
 
-require_relative './convertors'
+require_relative 'convertors'
 
 module Workato
   module Connector

data/lib/workato/connector/sdk/schema/field/number.rb

@@ -1,7 +1,7 @@
 # typed: true
 # frozen_string_literal: true
 
-require_relative './convertors'
+require_relative 'convertors'
 
 module Workato
   module Connector

data/lib/workato/connector/sdk/schema/field/object.rb

@@ -1,7 +1,7 @@
 # typed: true
 # frozen_string_literal: true
 
-require_relative './convertors'
+require_relative 'convertors'
 
 module Workato
   module Connector

data/lib/workato/connector/sdk/schema/field/string.rb

@@ -1,7 +1,7 @@
 # typed: true
 # frozen_string_literal: true
 
-require_relative './convertors'
+require_relative 'convertors'
 
 module Workato
   module Connector

data/lib/workato/connector/sdk/schema.rb

@@ -1,22 +1,20 @@
 # typed: false
 # frozen_string_literal: true
 
-using Workato::Extension::HashWithIndifferentAccess
-
 module Workato
   module Connector
     module Sdk
       class Schema < SimpleDelegator
         def initialize(schema: [])
-          super(Fields.new(::Array.wrap(schema).map { |i| HashWithIndifferentAccess.wrap(i) }))
+          super(Fields.new(::Array.wrap(schema).map { |i| Utilities::HashWithIndifferentAccess.wrap(i) }))
         end
 
         def trim(input)
-          HashWithIndifferentAccess.wrap(input).keep_if { |property_name| includes_property?(property_name) }
+          Utilities::HashWithIndifferentAccess.wrap(input).keep_if { |property_name| includes_property?(property_name) }
         end
 
         def apply(input, enforce_required:, &block)
-          HashWithIndifferentAccess.wrap(input).tap do |input_with_indifferent_access|
+          Utilities::HashWithIndifferentAccess.wrap(input).tap do |input_with_indifferent_access|
             apply_to_hash(self, input_with_indifferent_access, enforce_required: enforce_required, &block)
           end
         end
@@ -225,12 +223,12 @@ module Workato
   end
 end
 
-require_relative './schema/field/array'
-require_relative './schema/field/date'
-require_relative './schema/field/date_time'
-require_relative './schema/field/integer'
-require_relative './schema/field/number'
-require_relative './schema/field/object'
-require_relative './schema/field/string'
+require_relative 'schema/field/array'
+require_relative 'schema/field/date'
+require_relative 'schema/field/date_time'
+require_relative 'schema/field/integer'
+require_relative 'schema/field/number'
+require_relative 'schema/field/object'
+require_relative 'schema/field/string'
 
-require_relative './schema/type/time'
+require_relative 'schema/type/time'

data/lib/workato/connector/sdk/settings.rb

@@ -3,13 +3,13 @@
 
 require 'active_support/encrypted_configuration'
 
-using Workato::Extension::HashWithIndifferentAccess
-
 module Workato
   module Connector
     module Sdk
       module SorbetTypes
-        SettingsHash = T.type_alias { T.any(HashWithIndifferentAccess, T::Hash[T.any(Symbol, String), T.untyped]) }
+        SettingsHash = T.type_alias do
+          T.any(ActiveSupport::HashWithIndifferentAccess, T::Hash[T.any(Symbol, String), T.untyped])
+        end
       end
 
       class Settings
@@ -100,13 +100,13 @@ module Workato
         end
 
         def read_encrypted_file
-          all_settings = HashWithIndifferentAccess.wrap(encrypted_configuration.config)
+          all_settings = Utilities::HashWithIndifferentAccess.wrap(encrypted_configuration.config)
 
           (name ? all_settings.fetch(name) : all_settings) || {}
         end
 
         def update_encrypted_file(new_settings)
-          all_settings = HashWithIndifferentAccess.wrap(encrypted_configuration.config)
+          all_settings = Utilities::HashWithIndifferentAccess.wrap(encrypted_configuration.config)
 
           merge_settings(all_settings, new_settings)
 

data/lib/workato/connector/sdk/stream.rb

@@ -1,8 +1,6 @@
 # typed: strict
 # frozen_string_literal: true
 
-using Workato::Extension::HashWithIndifferentAccess
-
 module Workato
   module Connector
     module Sdk
@@ -152,7 +150,7 @@ module Workato
             when Proc
               Proxy.new(
                 name: hash[:name],
-                input: HashWithIndifferentAccess.wrap(hash[:input] || {}),
+                input: Utilities::HashWithIndifferentAccess.wrap(hash[:input] || {}),
                 stream: Stream.new(
                   stream: hash[:chunks],
                   connection: Connection.new(

data/lib/workato/connector/sdk/streams.rb

@@ -1,8 +1,6 @@
 # typed: strict
 # frozen_string_literal: true
 
-using Workato::Extension::HashWithIndifferentAccess
-
 module Workato
   module Connector
     module Sdk

data/lib/workato/connector/sdk/trigger.rb

@@ -3,8 +3,6 @@
 
 require 'securerandom'
 
-using Workato::Extension::HashWithIndifferentAccess
-
 module Workato
   module Connector
     module Sdk
@@ -145,14 +143,14 @@ module Workato
         )
           connection.merge_settings!(settings) if settings
           output = global_dsl_context.execute(
-            HashWithIndifferentAccess.wrap(input),
+            Utilities::HashWithIndifferentAccess.wrap(input),
             payload,
-            Array.wrap(extended_input_schema).map { |i| HashWithIndifferentAccess.wrap(i) },
-            Array.wrap(extended_output_schema).map { |i| HashWithIndifferentAccess.wrap(i) },
-            HashWithIndifferentAccess.wrap(headers),
-            HashWithIndifferentAccess.wrap(params),
+            Array.wrap(extended_input_schema).map { |i| Utilities::HashWithIndifferentAccess.wrap(i) },
+            Array.wrap(extended_output_schema).map { |i| Utilities::HashWithIndifferentAccess.wrap(i) },
+            Utilities::HashWithIndifferentAccess.wrap(headers),
+            Utilities::HashWithIndifferentAccess.wrap(params),
             connection.settings,
-            HashWithIndifferentAccess.wrap(webhook_subscribe_output),
+            Utilities::HashWithIndifferentAccess.wrap(webhook_subscribe_output),
             &trigger[:webhook_notification]
           )
           if output.is_a?(::Array)

data/lib/workato/connector/sdk.rb

@@ -18,7 +18,6 @@ require_relative '../extension/date'
 require_relative '../extension/enumerable'
 require_relative '../extension/extra_chain_cert'
 require_relative '../extension/hash'
-require_relative '../extension/hash_with_indifferent_access'
 require_relative '../extension/integer'
 require_relative '../extension/nil_class'
 require_relative '../extension/object'
@@ -27,7 +26,7 @@ require_relative '../extension/string'
 require_relative '../extension/symbol'
 require_relative '../extension/time'
 
-require_relative './sdk/core'
+require_relative 'sdk/core'
 
 begin
   tz = ENV.fetch('TZ', nil)

data/lib/workato/extension/currency.rb

@@ -1,8 +1,8 @@
 # typed: false
 # frozen_string_literal: true
 
-require_relative './currency/currencies'
-require_relative './currency/countries'
+require_relative 'currency/currencies'
+require_relative 'currency/countries'
 
 module Workato
   module Extension

data/lib/workato/extension/enumerable.rb

@@ -18,7 +18,7 @@ module Enumerable
     end
 
     map do |val|
-      format % (Array.wrap(val).map { |v| v.is_a?(HashWithIndifferentAccess) ? v.symbolize_keys : v })
+      format % (Array.wrap(val).map { |v| v.is_a?(ActiveSupport::HashWithIndifferentAccess) ? v.symbolize_keys : v })
     end
   end
 

data/lib/workato/{extension → utilities}/hash_with_indifferent_access.rb

@@ -1,14 +1,17 @@
-# typed: false
+# typed: strict
 # frozen_string_literal: true
 
 require 'active_support/hash_with_indifferent_access'
 
 module Workato
-  module Extension
+  module Utilities
     module HashWithIndifferentAccess
-      refine ::ActiveSupport::HashWithIndifferentAccess.singleton_class do
+      class << self
+        extend T::Sig
+
+        sig { params(value: T.untyped).returns(ActiveSupport::HashWithIndifferentAccess) }
         def wrap(value)
-          return ::ActiveSupport::HashWithIndifferentAccess.new unless value
+          return ActiveSupport::HashWithIndifferentAccess.new unless value
           return value if value.is_a?(ActiveSupport::HashWithIndifferentAccess)
 
           value.with_indifferent_access

data/lib/workato/utilities/xml.rb

@@ -14,7 +14,7 @@ module Workato
             ancestors.shift while ancestors.count > node.depth + 1
             case node.node_type
             when Nokogiri::XML::Reader::TYPE_ELEMENT
-              element = HashWithIndifferentAccess.new
+              element = ActiveSupport::HashWithIndifferentAccess.new
               node.attributes&.each do |name, value|
                 element["@#{strip_namespaces ? name[/(?:^xmlns:)?[^:]+$/] : name}"] = value
               end