finapps_core 3.0.6 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc265faba0f375f0f83fe357fdcdadfb5499f1311015039160715523f3463a92
-  data.tar.gz: e06536b9eb01a627340f862f6592dade9acf5cfd2482ac707851306d7ff71b7e
+  metadata.gz: 96d7a4d630928d28cae45e1aa056d384f3ea1eb3a68c0d609f4d41ab8f099aa5
+  data.tar.gz: 1b076ce2d77fe18607eff40229b1247572bcbc46e4f14f2d56a42a055a5885f6
 SHA512:
-  metadata.gz: becdd0c64ab55bfc3bbd1b272452979db7012765df96d052e9fc3e06496077f1cb13b7e639242149d10f1b228d3d7e4d35fe3f014c945cc3e96dc252811804ff
-  data.tar.gz: a461eee345e25dc09c843584f1f2a068f803c6be5ff9f0a960c2696e3009b2baf1c1e6bb01e43cfdaa89084ea25d1b3877d8d5f273b032a385be50979ac89874
+  metadata.gz: 62466071fddf710839f9b731831d8c063bc96fd2c55592694d4b79a97ad0b7f4af8ee883771c82f19bfae9de87eb7b175febdd3f0522e07ea0e0c729ab6b4e17
+  data.tar.gz: 21ac2a4503f836043123380eee90510a308b36fdf414499a48b6b39d890db651d13e619dcebde0f1c29bb8a4b66edfe523c250bd0daf279fb938cb225fa95be7

data/.rubocop.yml

@@ -14,10 +14,10 @@ AllCops:
 Metrics/LineLength:
   Max: 120
 
-# No space makes the method definition shorter and differentiates
-# from a regular assignment.
-Layout/SpaceAroundEqualsInParameterDefault:
-  EnforcedStyle: no_space
+# Re-enable this when the following is resolved:
+# https://github.com/rubocop-hq/rubocop/issues/5953
+Style/AccessModifierDeclarations:
+  Enabled: false
 
 Layout/SpaceInsideBlockBraces:
   # The space here provides no real gain in readability while consuming
@@ -25,12 +25,6 @@ Layout/SpaceInsideBlockBraces:
   # Also {| differentiates better from a hash than { | does.
   SpaceBeforeBlockParameters: false
 
-# No trailing space differentiates better from the block:
-# foo} means hash, foo } means block.
-Layout/SpaceInsideHashLiteralBraces:
-  EnforcedStyle: no_space
-
-
 Style/CollectionMethods:
   Description: Preferred collection methods.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#map-find-select-reduce-size
@@ -41,47 +35,10 @@ Style/CollectionMethods:
     find: detect
     find_all: select
     reduce: inject
-Layout/DotPosition:
-  Description: Checks the position of the dot in multi-line method calls.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#consistent-multi-line-chains
-  Enabled: true
-  EnforcedStyle: leading
-  SupportedStyles:
-  - leading
-  - trailing
-Style/FileName:
-  Description: Use snake_case for source file names.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#snake-case-files
-  Enabled: false
-  Exclude: []
-Style/GuardClause:
-  Description: Check for conditionals that can be replaced with guard clauses
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-nested-conditionals
-  Enabled: false
-  MinBodyLength: 1
-Style/IfUnlessModifier:
-  Description: Favor modifier if/unless usage when you have a single-line body.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#if-as-a-modifier
-  Enabled: false
-  MaxLineLength: 80
 Style/OptionHash:
   Description: Don't use option hashes when you can use keyword arguments.
   Enabled: false
-Style/PercentLiteralDelimiters:
-  Description: Use `%`-literal delimiters consistently
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#percent-literal-braces
-  Enabled: false
-  PreferredDelimiters:
-    "%": "()"
-    "%i": "()"
-    "%q": "()"
-    "%Q": "()"
-    "%r": "{}"
-    "%s": "()"
-    "%w": "()"
-    "%W": "()"
-    "%x": "()"
-Style/PredicateName:
+Naming/PredicateName:
   Description: Check the names of predicate methods.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#bool-methods-qmark
   Enabled: true
@@ -93,55 +50,6 @@ Style/PredicateName:
   - is_
   Exclude:
   - spec/**/*
-Style/RaiseArgs:
-  Description: Checks the arguments passed to raise/fail.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#exception-class-messages
-  Enabled: false
-  EnforcedStyle: exploded
-  SupportedStyles:
-  - compact
-  - exploded
-Style/SignalException:
-  Description: Checks for proper usage of fail and raise.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#fail-method
-  Enabled: false
-  EnforcedStyle: semantic
-  SupportedStyles:
-  - only_raise
-  - only_fail
-  - semantic
-Style/SingleLineBlockParams:
-  Description: Enforces the names of some block params.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#reduce-blocks
-  Enabled: false
-  Methods:
-  - reduce:
-    - a
-    - e
-  - inject:
-    - a
-    - e
-Style/SingleLineMethods:
-  Description: Avoid single-line methods.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-single-line-methods
-  Enabled: false
-  AllowIfMethodIsEmpty: true
-Style/StringLiterals:
-  Description: Checks if uses of quotes match the configured preference.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#consistent-string-literals
-  Enabled: true
-  EnforcedStyle: single_quotes
-  SupportedStyles:
-  - single_quotes
-  - double_quotes
-Style/StringLiteralsInInterpolation:
-  Description: Checks if uses of quotes inside expressions in interpolated strings
-    match the configured preference.
-  Enabled: true
-  EnforcedStyle: single_quotes
-  SupportedStyles:
-  - single_quotes
-  - double_quotes
 Metrics/AbcSize:
   Description: A calculated magnitude based on number of assignments, branches, and
     conditions.
@@ -181,75 +89,19 @@ Metrics/PerceivedComplexity:
     reader.
   Enabled: false
   Max: 7
-Lint/AssignmentInCondition:
-  Description: Don't use assignment in conditions.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#safe-assignment-in-condition
-  Enabled: false
-  AllowSafeAssignment: true
-Style/InlineComment:
-  Description: Avoid inline comments.
-  Enabled: false
-Style/AccessorMethodName:
-  Description: Check the naming of accessor methods for get_/set_.
-  Enabled: false
-Style/Alias:
-  Description: Use alias_method instead of alias.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#alias-method
-  Enabled: false
 Style/Documentation:
   Description: Document classes and non-namespace modules.
   Enabled: false
-Style/DoubleNegation:
-  Description: Checks for uses of double negation (!!).
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-bang-bang
-  Enabled: false
-Style/EachWithObject:
-  Description: Prefer `each_with_object` over `inject` or `reduce`.
-  Enabled: false
 Style/EmptyLiteral:
   Description: Prefer literals to Array.new/Hash.new/String.new.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#literal-array-hash
   Enabled: false
-Style/ModuleFunction:
-  Description: Checks for usage of `extend self` in modules.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#module-function
-  Enabled: false
-Style/OneLineConditional:
-  Description: Favor the ternary operator(?:) over if/then/else/end constructs.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#ternary-operator
-  Enabled: false
-Style/PerlBackrefs:
-  Description: Avoid Perl-style regex back references.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-perl-regexp-last-matchers
-  Enabled: false
-Style/Send:
-  Description: Prefer `Object#__send__` or `Object#public_send` to `send`, as `send`
-    may overlap with existing methods.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#prefer-public-send
-  Enabled: false
-Style/SpecialGlobalVars:
-  Description: Avoid Perl-style global variables.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-cryptic-perlisms
-  Enabled: false
 Style/VariableInterpolation:
   Description: Don't interpolate global, instance and class variables directly in
     strings.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#curlies-interpolate
   Enabled: false
-Style/WhenThen:
-  Description: Use when x then ... for one-line cases.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#one-line-cases
-  Enabled: false
-Lint/EachWithObjectArgument:
-  Description: Check for immutable argument given to each_with_object.
-  Enabled: true
 Lint/HandleExceptions:
   Description: Don't suppress exception.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#dont-hide-exceptions
   Enabled: false
-Lint/LiteralInCondition:
-  Description: Checks of literals used in conditions.
-  Enabled: false
-Lint/LiteralInInterpolation:
-  Description: Checks for literals used in interpolation.
-  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-ruby-2.4.2
+ruby-2.5.1

data/.travis.yml

@@ -1,11 +1,12 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.4.2
+  - 2.5.1
 before_install:
   - "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc"
   - gem update --system
   - gem --version
+  - gem install bundler
 script:
   - bundle exec rspec
 notifications:

data/finapps_core.gemspec

@@ -20,20 +20,19 @@ Gem::Specification.new do |spec|
   spec.test_files = Dir['spec/**/*.rb']
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency     'faraday',                    '0.13.1'
+  spec.add_runtime_dependency     'faraday',                    '~> 0.15',  '>= 0.15.3'
   spec.add_runtime_dependency     'faraday_middleware',         '~> 0.12',  '>= 0.12.2'
-  spec.add_runtime_dependency     'rash_alt',                   '~> 0.4',   '>= 0.4.3'
-  spec.add_runtime_dependency     'typhoeus',                   '~> 1.3',   '>= 1.3.0'
+  spec.add_runtime_dependency     'rash_alt',                   '~> 0.4',   '>= 0.4.7'
 
-  spec.add_development_dependency 'bundler',                    '~> 1.15',  '>= 1.15.4'
-  spec.add_development_dependency 'codeclimate-test-reporter',  '~> 1.0',   '>= 1.0.8'
-  spec.add_development_dependency 'gem-release',                '~> 0.7',   '>= 0.7.4'
-  spec.add_development_dependency 'rake',                       '~> 12.1',  '>= 12.1.0'
-  spec.add_development_dependency 'rspec',                      '~> 3.5',   '>= 3.5.0'
-  spec.add_development_dependency 'rubocop',                    '~> 0.49.1'
-  spec.add_development_dependency 'sinatra',                    '~> 2.0',   '>= 2.0.0'
-  spec.add_development_dependency 'webmock',                    '~> 3.0',   '>= 3.0.1'
+  spec.add_development_dependency 'bundler',                    '~> 1.16',  '>= 1.16.6'
+  spec.add_development_dependency 'codeclimate-test-reporter',  '~> 1.0',   '>= 1.0.9'
+  spec.add_development_dependency 'gem-release',                '~> 2.0',   '>= 2.0.1'
+  spec.add_development_dependency 'rake',                       '~> 12.3',  '>= 12.3.1'
+  spec.add_development_dependency 'rspec',                      '~> 3.8',   '>= 3.8.0'
+  spec.add_development_dependency 'rubocop',                    '~> 0.59',  '>= 0.59.2'
+  spec.add_development_dependency 'sinatra',                    '~> 2.0',   '>= 2.0.4'
+  spec.add_development_dependency 'webmock',                    '~> 3.4',   '>= 3.4.2'
 
   spec.extra_rdoc_files = %w(README.md LICENSE)
   spec.rdoc_options = %w(--line-numbers --inline-source --title finapps-ruby-core --main README.md)
-end
+end

data/lib/core_extensions/object/is_integer.rb

@@ -4,7 +4,7 @@ module ObjectExtensions
   refine Object do
     def integer?
       Integer(self)
-    rescue
+    rescue StandardError
       false
     end
   end

data/lib/finapps_core.rb

@@ -4,8 +4,6 @@ require 'finapps_core/version' unless defined?(FinAppsCore::VERSION)
 
 require 'faraday'
 require 'faraday_middleware'
-require 'typhoeus'
-require 'typhoeus/adapters/faraday'
 
 require 'core_extensions/object/is_integer'
 require 'core_extensions/string/json_to_hash'

data/lib/finapps_core/error.rb

@@ -20,8 +20,8 @@ module FinAppsCore # :nodoc:
   # Raised whenever the connection fails.
   class ConnectionFailedError < Error; end
 
-  %i(InvalidArgumentsError MissingArgumentsError ApiSessionTimeoutError
-     UnsupportedHttpMethodError ConnectionFailedError).each do |const|
+  %i[InvalidArgumentsError MissingArgumentsError ApiSessionTimeoutError
+     UnsupportedHttpMethodError ConnectionFailedError].each do |const|
     Error.const_set(const, FinAppsCore.const_get(const))
   end
 end

data/lib/finapps_core/middleware/response/custom_logger.rb

@@ -4,56 +4,26 @@ require 'logger'
 
 module FinAppsCore
   module Middleware
-    class CustomLogger < Faraday::Response::Middleware
-      extend Forwardable
+    class CustomLogger < Faraday::Response::Logger
       include FinAppsCore::Utils::ParameterFilter
 
-      DEFAULT_OPTIONS = {bodies: false}.freeze
-
-      def initialize(app, logger=nil, options={})
-        super(app)
-        @logger = logger || new_logger
-        @options = DEFAULT_OPTIONS.merge(options)
-      end
-
-      def_delegators :@logger, :debug
+      private
 
-      def call(env)
-        debug "#{self.class.name}##{__method__} => URL: #{env.method.upcase} #{env.url}"
-        debug "#{self.class.name}##{__method__} => Request Headers: #{dump env.request_headers}"
-        if env[:body] && log_body?(:request)
-          debug "#{self.class.name}##{__method__} => Request Response: #{dump env[:body]}"
-        end
-        super
+      def dump_headers(headers)
+        dump headers
       end
 
-      def on_complete(env)
-        debug "#{self.class.name}##{__method__} => Response Headers: #{dump env.response_headers}"
-        if env.body && log_body?(:response)
-          debug "#{self.class.name}##{__method__} => Response Body: #{dump env.body}"
-        end
+      def dump_body(body)
+        dump body
       end
 
-      private
-
       def dump(value)
-        s = skip_sensitive_data(value.is_a?(Array) ? value.to_h : value)
-        s.nil? ? 'NO-CONTENT' : s.to_json
-      end
-
-      def log_body?(type)
-        case @options[:bodies]
-        when Hash then
-          @options[:bodies][type]
-        else
-          @options[:bodies]
-        end
+        s = skip_sensitive_data value
+        s.respond_to?(:to_json) ? s.to_json : s
       end
 
-      def new_logger
-        logger = Logger.new(STDOUT)
-        logger.level = FinAppsCore::REST::Defaults::DEFAULTS[:log_level]
-        logger
+      def apply_filters(value)
+        value
       end
     end
   end

data/lib/finapps_core/middleware/response/raise_error.rb

@@ -14,12 +14,13 @@ module FinAppsCore
         return if SUCCESS_STATUSES.include?(env[:status])
 
         if env[:status] == API_SESSION_TIMEOUT
-          raise(FinAppsCore::Error::ApiSessionTimeoutError, 'Api Session Timed out')
-        elsif env[:status] == CONNECTION_FAILED_STATUS
+          raise(FinAppsCore::Error::ApiSessionTimeoutError, 'API Session Timed out')
+        end
+        if env[:status] == CONNECTION_FAILED_STATUS
           raise(FinAppsCore::Error::ConnectionFailedError, 'Connection Failed')
-        else
-          raise(Faraday::Error::ClientError, response_values(env))
         end
+
+        raise(Faraday::Error::ClientError, response_values(env))
       end
 
       def response_values(env)
@@ -35,22 +36,25 @@ module FinAppsCore
 
       def error_messages(body)
         return nil if empty?(body)
+
         hash = to_hash body
         messages hash
       end
 
       def messages(hash)
         return nil unless hash.respond_to?(:key?) && hash.key?('messages')
+
         hash['messages']
       end
 
       def to_hash(source)
         return source unless source.is_a?(String)
+
         source.json_to_hash
       end
 
-      def empty?(o)
-        o.nil? || (o.respond_to?(:empty?) && o.empty?)
+      def empty?(obj)
+        obj.nil? || (obj.respond_to?(:empty?) && obj.empty?)
       end
     end
   end

data/lib/finapps_core/rest/base_client.rb

@@ -18,7 +18,7 @@ module FinAppsCore
 
       attr_reader :config
 
-      def initialize(options, logger=nil)
+      def initialize(options, logger = nil)
         @config = ::FinAppsCore::REST::Configuration.new options
         @logger = logger
       end
@@ -38,7 +38,7 @@ module FinAppsCore
       # @param [String] method
       # @param [Hash] params
       # @return [Hash,Array<String>]
-      def send_request(path, method, params={})
+      def send_request(path, method, params = {})
         not_blank(path, :path)
         not_blank(method, :method)
 
@@ -56,22 +56,26 @@ module FinAppsCore
       # Returns a hash obtained from parsing the JSON object in the response body.
       #
       def method_missing(method_id, *arguments, &block)
-        if %i(get post put delete).include? method_id
-          connection.send(method_id) do |req|
-            req.url arguments.first
-            req.body = arguments[1] unless method_id == :get
-          end
+        if %i[get post put delete].include? method_id
+          send_to_connection method_id, arguments
         else
           super
         end
       end
 
-      def respond_to_missing?(method_sym, include_private=false)
-        %i(get post put delete).include?(method_sym) ? true : super
+      def respond_to_missing?(method_sym, include_private = false)
+        %i[get post put delete].include?(method_sym) ? true : super
       end
 
       private
 
+      def send_to_connection(method_id, arguments)
+        connection.send(method_id) do |req|
+          req.url arguments.first
+          req.body = arguments[1] unless method_id == :get
+        end
+      end
+
       def empty?(response)
         !response || empty_body?(response)
       end
@@ -119,7 +123,7 @@ module FinAppsCore
         when :delete
           delete(path, params)
         else
-          raise FinAppsCore::UnsupportedHttpMethodError.new "Method not supported: #{method}."
+          raise FinAppsCore::UnsupportedHttpMethodError, "Method not supported: #{method}."
         end
       end
     end

data/lib/finapps_core/rest/configuration.rb

@@ -10,12 +10,12 @@ module FinAppsCore
                     :host, :proxy, :timeout, :retry_limit, :rashify,
                     :log_level, :request_id
 
-      def initialize(options={})
+      def initialize(options = {})
         FinAppsCore::REST::Defaults::DEFAULTS.merge(remove_empty_options(options))
                                              .each {|key, value| public_send("#{key}=", value) }
 
-        raise FinAppsCore::InvalidArgumentsError.new "Invalid argument. {host: #{host}}" unless valid_host?
-        raise FinAppsCore::InvalidArgumentsError.new "Invalid argument. {timeout: #{timeout}}" unless timeout.integer?
+        raise FinAppsCore::InvalidArgumentsError, "Invalid argument. {host: #{host}}" unless valid_host?
+        raise FinAppsCore::InvalidArgumentsError, "Invalid argument. {timeout: #{timeout}}" unless timeout.integer?
       end
 
       def valid_user_credentials?

data/lib/finapps_core/rest/connection.rb

@@ -5,33 +5,41 @@ module FinAppsCore
     module Connection # :nodoc:
       # @return [Faraday::Connection]
       def faraday(config, logger)
-        options = {
-          url: "#{config.host}/v#{Defaults::API_VERSION}/",
-          request: {open_timeout: config.timeout,
-                    timeout: config.timeout}
-        }
+        options = connection_options config
 
         Faraday.new(options) do |conn|
           conn.request :accept_json
           conn.request :user_agent
-          conn.request :tenant_authentication, config.tenant_token unless config.valid_user_credentials?
+          if config.valid_user_credentials?
+            conn.request :no_encoding_basic_authentication, config.user_token
+          else
+            conn.request :tenant_authentication, config.tenant_token
+          end
           conn.request :json
           conn.request :retry
           conn.request :multipart
           conn.request :url_encoded
-          conn.request :no_encoding_basic_authentication, config.user_token if config.valid_user_credentials?
           conn.request :request_id, config.request_id if config.request_id
 
           conn.use FinAppsCore::Middleware::RaiseError
           conn.response :rashify if config.rashify
           conn.response :json, content_type: /\bjson$/
-          conn.response :custom_logger, logger, bodies: (ENV['SILENT_LOG_BODIES'] != 'true')
+          conn.response :custom_logger, logger, bodies: true
 
           # Adapter (ensure that the adapter is always last.)
-          conn.adapter :typhoeus
+          conn.adapter Faraday.default_adapter
         end
       end
-      module_function :faraday # becomes available as a *private instance method* to classes that mix in the module
+      module_function :faraday
+
+      def connection_options(config)
+        {
+          url: "#{config.host}/v#{Defaults::API_VERSION}/",
+          request: { open_timeout: config.timeout,
+                     timeout: config.timeout }
+        }
+      end
+      module_function :connection_options
     end
   end
 end

data/lib/finapps_core/rest/defaults.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'logger'
+
 module FinAppsCore
   module REST
     module Defaults
@@ -10,7 +12,6 @@ module FinAppsCore
         host:             'https://api.financialapps.com',
         timeout:          30,
         proxy:            nil,
-        retry_limit:      1,
         log_level:        Logger::INFO
       }.freeze
     end

data/lib/finapps_core/rest/resources.rb

@@ -22,24 +22,24 @@ module FinAppsCore
         @logger = client.logger if client.respond_to?(:logger)
       end
 
-      def list(path=nil)
+      def list(path = nil)
         path = end_point.to_s if path.nil?
         send_request path, :get
       end
 
-      def show(id=nil, path=nil)
+      def show(id = nil, path = nil)
         send_request_for_id path, :get, id
       end
 
-      def create(params={}, path=nil)
+      def create(params = {}, path = nil)
         send_request path, :post, params
       end
 
-      def update(params={}, path=nil)
+      def update(params = {}, path = nil)
         send_request path, :put, params
       end
 
-      def destroy(id=nil, path=nil)
+      def destroy(id = nil, path = nil)
         send_request_for_id path, :delete, id
       end
 
@@ -61,7 +61,7 @@ module FinAppsCore
         "#{end_point}/#{ERB::Util.url_encode(id)}"
       end
 
-      def send_request(path, method, params={})
+      def send_request(path, method, params = {})
         path = end_point if path.nil?
         logger.debug "#{self.class.name}##{__method__} => path: #{path} params: #{skip_sensitive_data(params)}"
 

data/lib/finapps_core/utils/parameter_filter.rb

@@ -3,31 +3,48 @@
 module FinAppsCore
   module Utils
     module ParameterFilter
+      include ::FinAppsCore::Utils::Loggeable
       using StringExtensions
-      PROTECTED_KEYS = %w(login login1 username password password1 password_confirm token
-                          x-tenant-token authorization routing_no account_no tpr_id).freeze
+      PROTECTED_KEYS = %w[login login1 username password password1 password_confirm token
+                          x-tenant-token authorization routing_no account_no tpr_id].freeze
 
-      def skip_sensitive_data(hash)
-        if hash.is_a? String
-          hash = hash.json_to_hash
-        end
+      def skip_sensitive_data(param)
+        hash = param_to_hash param
         if hash.is_a? Hash
-          filtered_hash = hash.clone
-          filtered_hash.each do |key, value|
-            if PROTECTED_KEYS.include? key.to_s.downcase
-              filtered_hash[key] = '[REDACTED]'
-            elsif value.is_a?(Hash)
-              filtered_hash[key] = skip_sensitive_data(value)
-            elsif value.is_a?(Array)
-              filtered_hash[key] = value.map {|v| v.is_a?(Hash) ? skip_sensitive_data(v) : v }
-            end
-          end
-
-          filtered_hash
+          clone_and_redact hash
+        else
+          replace_nil hash
+        end
+      end
+
+      private
+
+      def param_to_hash(param)
+        param.is_a?(String) ? param.json_to_hash : param
+      end
+
+      def clone_and_redact(hash)
+        redact_each hash.clone
+      end
+
+      def redact_each(hash)
+        hash.each {|key, value| hash[key] = redact(key, value) }
+        hash
+      end
+
+      def redact(key, value)
+        if PROTECTED_KEYS.include? key.to_s.downcase
+          '[REDACTED]'
+        elsif value.is_a? Hash
+          redact_each value
         else
-          hash
+          replace_nil value
         end
       end
+
+      def replace_nil(value)
+        value || 'NO-CONTENT'
+      end
     end
   end
 end

data/lib/finapps_core/utils/validatable.rb

@@ -7,15 +7,12 @@ module FinAppsCore
   module Utils
     # Adds validation capabilities when included into other classes
     module Validatable
-      def not_blank(value, name=nil)
-        if nil_or_empty?(value)
-          argument_name = name.nil? ? nil : ": #{name}"
-          raise FinAppsCore::MissingArgumentsError.new "Missing argument#{argument_name}"
-        end
+      def not_blank(value, name = nil)
+        raise FinAppsCore::MissingArgumentsError, name.nil? ? nil : ": #{name}" if nil_or_empty?(value)
       end
 
       def nil_or_empty?(value)
-        !value || (value.respond_to?(:empty?) && value.empty?)
+        !value || value.respond_to?(:empty?) && value.empty?
       end
     end
   end

data/lib/finapps_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FinAppsCore
-  VERSION = '3.0.6'
+  VERSION = '4.0.1'
 end

data/spec/core_extensions/object/is_integer_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe ObjectExtensions do
 
     describe '#integer?' do
       context 'for integers' do
-        subject { 1 + rand(10) }
+        subject { rand(1..10) }
         it { expect(subject.integer?).to eq(true) }
       end
       context 'for non integers' do

data/spec/middleware/request/accept_json_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe FinAppsCore::Middleware::AcceptJson do
   let(:fake_app) { proc {|env| env } }
   describe '#call' do
     subject { FinAppsCore::Middleware::AcceptJson.new(fake_app) }
-    env = {request_headers: {}}
+    env = { request_headers: {} }
 
     it('generates a UserAgent header') do
       expect(subject.call(env)[:request_headers][FinAppsCore::Middleware::AcceptJson::KEY]).to eq('application/json')

data/spec/middleware/request/no_encoding_basic_authentication_spec.rb

@@ -8,17 +8,17 @@ RSpec.describe FinAppsCore::Middleware::NoEncodingBasicAuthentication do
 
     context 'when credentials were provided' do
       let(:middleware) { FinAppsCore::Middleware::NoEncodingBasicAuthentication.new(app, :token) }
-      let(:expected_header_value) { "Bearer #{:token}" }
+      let(:expected_header_value) { 'Bearer token' }
 
       context 'when header was not previously set' do
-        let(:request_env) { {request_headers: {}} }
+        let(:request_env) { { request_headers: {} } }
         subject(:result) { middleware.call(request_env) }
 
         it('generates a header') { expect(result[:request_headers][key]).to eq(expected_header_value) }
       end
 
       context 'when header was previously set' do
-        let(:request_env) { {request_headers: {key => 'foo'}} }
+        let(:request_env) { { request_headers: { key => 'foo' } } }
         subject(:result) { middleware.call(request_env) }
 
         it('does not override existing header') { expect(result[:request_headers][key]).to eq('foo') }

data/spec/middleware/request/request_id_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe FinAppsCore::Middleware::RequestId do
   let(:key) { FinAppsCore::Middleware::RequestId::KEY }
   let(:id) { 'request_id' }
   let(:fake_app) { proc {|env| env } }
-  let(:env) { {request_headers: {}} }
+  let(:env) { { request_headers: {} } }
 
   describe '#call' do
     subject { FinAppsCore::Middleware::RequestId.new(fake_app, id) }

data/spec/middleware/request/tenant_authentication_spec.rb

@@ -12,15 +12,15 @@ RSpec.describe FinAppsCore::Middleware::TenantAuthentication do
       let(:expected_header) { valid_tenant_options[:token] }
 
       context 'when header was not previously set' do
-        let(:request_env) { {request_headers: {}} }
+        let(:request_env) { { request_headers: {} } }
         subject(:actual_header) { middleware.call(request_env)[:request_headers][key] }
 
         it('generates a Tenant Authentication header') { expect(actual_header).to eq(expected_header) }
       end
 
       context 'when header was previously set' do
-        let(:existing_header) { {FinAppsCore::Middleware::TenantAuthentication::KEY => 'foo'} }
-        let(:request_env) { {request_headers: existing_header} }
+        let(:existing_header) { { FinAppsCore::Middleware::TenantAuthentication::KEY => 'foo' } }
+        let(:request_env) { { request_headers: existing_header } }
         subject(:actual_header) { middleware.call(request_env)[:request_headers][key] }
 
         it('does not override existing Tenant Authentication header') { expect(actual_header).to eq('foo') }

data/spec/middleware/request/user_agent_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe FinAppsCore::Middleware::UserAgent do
   let(:fake_app) { proc {|env| env } }
   describe '#call' do
     subject { FinAppsCore::Middleware::UserAgent.new(fake_app) }
-    env = {request_headers: {}}
+    env = { request_headers: {} }
 
     it('generates a UserAgent header') do
       expect(subject.call(env)[:request_headers][FinAppsCore::Middleware::UserAgent::KEY]).to start_with('finapps-ruby')

data/spec/middleware/response/raise_error_spec.rb

@@ -23,7 +23,7 @@ RSpec.describe FinAppsCore::Middleware::RaiseError do
     end
     context 'for connection failed error' do
       let(:env) { Env.new(419) }
-      error_message = 'Api Session Timed out'
+      error_message = 'API Session Timed out'
       it { expect { subject.on_complete(env) }.to raise_error(FinAppsCore::ApiSessionTimeoutError, error_message) }
     end
   end

data/spec/rest/base_client_spec.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 RSpec.describe FinAppsCore::REST::BaseClient do
-  let(:valid_tenant_options) { {tenant_token: VALID_CREDENTIALS[:token]} }
+  let(:valid_tenant_options) { { tenant_token: VALID_CREDENTIALS[:token] } }
   subject { FinAppsCore::REST::BaseClient.new(valid_tenant_options) }
 
   RESPONSE = 0
   ERROR_MESSAGES = 1
-  let(:return_array) { %i(RESPONSE ERROR_MESSAGES) }
+  let(:return_array) { %i[RESPONSE ERROR_MESSAGES] }
 
   describe '#new' do
     it 'assigns @config' do
@@ -34,17 +34,17 @@ RSpec.describe FinAppsCore::REST::BaseClient do
 
     it 'should raise FinAppsCore::MissingArgumentsError if method is NOT provided' do
       expect { subject.send_request(nil, :get) }.to raise_error(FinAppsCore::MissingArgumentsError,
-                                                                'Missing argument: path')
+                                                                ': path')
     end
 
     it 'should raise FinAppsCore::MissingArgumentsError if path is NOT provided' do
       expect { subject.send_request('fake_path', nil) }.to raise_error(FinAppsCore::MissingArgumentsError,
-                                                                       'Missing argument: method')
+                                                                       ': method')
     end
 
     context 'when method and path are provided' do
       subject { FinAppsCore::REST::BaseClient.new(valid_tenant_options).send_request('relevance/ruleset/names', :get) }
-      let(:return_array) { %i(RESPONSE ERROR_MESSAGES) }
+      let(:return_array) { %i[RESPONSE ERROR_MESSAGES] }
 
       it('returns an array of 2 items') do
         expect(subject).to be_a(Array)
@@ -89,7 +89,7 @@ RSpec.describe FinAppsCore::REST::BaseClient do
 
   describe '#respond_to_missing?' do
     context 'for supported methods' do
-      %i(get post put delete).each do |method|
+      %i[get post put delete].each do |method|
         it("responds to #{method}") { expect(subject).to respond_to(method) }
       end
     end

data/spec/rest/defaults_spec.rb

@@ -12,7 +12,6 @@ RSpec.describe FinAppsCore::REST::Defaults do
     it('sets DEFAULTS[:host]') { expect(described_class::DEFAULTS[:host]).to eq 'https://api.financialapps.com' }
     it('sets DEFAULTS[:timeout]') { expect(described_class::DEFAULTS[:timeout]).to eq 30 }
     it('does not set DEFAULTS[:proxy]') { expect(described_class::DEFAULTS[:proxy]).to be_nil }
-    it('sets DEFAULTS[:retry_limit]') { expect(described_class::DEFAULTS[:retry_limit]).to eq 1 }
     it('sets DEFAULTS[:log_level]') { expect(described_class::DEFAULTS[:log_level]).to eq Logger::INFO }
   end
 end

data/spec/spec_helper.rb

@@ -36,5 +36,5 @@ RSpec.configure do |config|
   WebMock.disable_net_connect!(allow: 'codeclimate.com')
 end
 
-VALID_CREDENTIALS = {identifier: '49fb918d-7e71-44dd-7378-58f19606df2a',
-                     token:      'hohoho='}.freeze
+VALID_CREDENTIALS = { identifier: '49fb918d-7e71-44dd-7378-58f19606df2a',
+                      token:      'hohoho=' }.freeze

data/spec/utils/parameter_filter_spec.rb

@@ -15,8 +15,10 @@ RSpec.describe FinAppsCore::Utils::ParameterFilter do
           login: 'sammysosa',
           username: 'johnny',
           name: 'george',
-          routing_no: '2316151651',
-          account_no: '987984654',
+          account: {
+            routing_no: '2316151651',
+            account_no: '987984654'
+          },
           tpr_id: 'asdfasdf5465w1e65r4we654r',
           'x-tenant-token': '498798465132154987498'
         }
@@ -29,8 +31,10 @@ RSpec.describe FinAppsCore::Utils::ParameterFilter do
           login: '[REDACTED]',
           username: '[REDACTED]',
           name: 'george',
-          routing_no: '[REDACTED]',
-          account_no: '[REDACTED]',
+          account: {
+            routing_no: '[REDACTED]',
+            account_no: '[REDACTED]'
+          },
           tpr_id: '[REDACTED]',
           'x-tenant-token': '[REDACTED]'
         }

data/spec/utils/validatable_spec.rb

@@ -8,13 +8,12 @@ RSpec.describe FinAppsCore::Utils::Validatable do
   describe '#not_blank' do
     context 'for null values' do
       it 'should raise FinAppsCore::MissingArgumentsError' do
-        expect { FakeClass.new.not_blank(nil) }.to raise_error(FinAppsCore::MissingArgumentsError,
-                                                               'Missing argument')
+        expect { FakeClass.new.not_blank(nil) }.to raise_error(FinAppsCore::MissingArgumentsError)
       end
 
       it 'should describe the argument name when provided' do
         expect { FakeClass.new.not_blank(nil, :name) }.to raise_error(FinAppsCore::MissingArgumentsError,
-                                                                      'Missing argument: name')
+                                                                      ': name')
       end
     end
 

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: finapps_core
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 4.0.0
 platform: ruby
 authors:
 - Erich Quintero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-12 00:00:00.000000000 Z
+date: 2018-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.15.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: '0.15'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.15.3
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +59,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -63,47 +69,27 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.3
-- !ruby/object:Gem::Dependency
-  name: typhoeus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 0.4.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.16'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.15.4
+        version: 1.16.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.16'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.15.4
+        version: 1.16.6
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -113,7 +99,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 1.0.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -123,81 +109,87 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 1.0.9
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.1'
+        version: '12.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.1.0
+        version: 12.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.1'
+        version: '12.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.1.0
+        version: 12.3.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.8.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: '0.59'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.59.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: '0.59'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.59.2
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -207,7 +199,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -217,27 +209,27 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.4
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.4.2
 description: A simple library for communicating with the FinApps REST API. Core functionality.
 email:
 - erich@financialapps.com
@@ -332,25 +324,25 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: FinApps REST API ruby client - Core.
 test_files:
-- spec/rest/defaults_spec.rb
-- spec/rest/base_client_spec.rb
-- spec/rest/credentials_spec.rb
-- spec/rest/configuration_spec.rb
-- spec/rest/resources_spec.rb
-- spec/support/fake_api.rb
-- spec/utils/parameter_filter_spec.rb
-- spec/utils/validatable_spec.rb
-- spec/spec_helpers/client.rb
-- spec/spec_helper.rb
-- spec/core_extensions/object/is_integer_spec.rb
-- spec/middleware/request/no_encoding_basic_authentication_spec.rb
+- spec/middleware/response/raise_error_spec.rb
 - spec/middleware/request/user_agent_spec.rb
+- spec/middleware/request/request_id_spec.rb
 - spec/middleware/request/tenant_authentication_spec.rb
 - spec/middleware/request/accept_json_spec.rb
-- spec/middleware/request/request_id_spec.rb
-- spec/middleware/response/raise_error_spec.rb
+- spec/middleware/request/no_encoding_basic_authentication_spec.rb
+- spec/spec_helper.rb
+- spec/spec_helpers/client.rb
+- spec/utils/validatable_spec.rb
+- spec/utils/parameter_filter_spec.rb
+- spec/support/fake_api.rb
+- spec/core_extensions/object/is_integer_spec.rb
+- spec/rest/credentials_spec.rb
+- spec/rest/base_client_spec.rb
+- spec/rest/configuration_spec.rb
+- spec/rest/defaults_spec.rb
+- spec/rest/resources_spec.rb