finapps_core 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1314ddfbd9ff74692398f160775f37eb95fea522
-  data.tar.gz: f35d567b3a9cb5377e2b1c17500745a55d05878a
+  metadata.gz: d572a8ff17d98bcb1ce97450aabb466546643c43
+  data.tar.gz: a817625334d11a4913d77dbc5301525ac652416b
 SHA512:
-  metadata.gz: 7285d2858e9db560ce841bab335a4bd762f914b263a640167a9469824b8d25e2f605d8f86018ab808c8b798bf90544fd69f12db8a764f90678939ba1266d9a24
-  data.tar.gz: bb6a5288ce228de689ef6fbd09c4b63a5849d6393aa67202735093b1e8740d80a5c86fd7c3829ea9056804fd19f8bbbc7d41115add35acb4eaf7cee3545dcfee
+  metadata.gz: 7cc72f84ff5c4f4051d56f8a8a59d6313c3516b1541287ca438f04af2658e2c5056bb41845dbbd10a173fd5df9e594ebeb3acb50b4e99fb3949a88f6b53b3d65
+  data.tar.gz: abbde216bd6238f0ebd250ece49ffc7265746baa786635c5cdd14c26eee6de4848073eb5181786c661b64e143196f7ab719a2c5cbca85b88bff07f9c79fc56ec

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    finapps_core (2.0.4)
+    finapps_core (2.0.5)
       faraday (~> 0.11, >= 0.11.0)
-      faraday_middleware (~> 0.11, >= 0.11.0)
+      faraday_middleware (~> 0.11, >= 0.11.0.1)
       rash (~> 0.4, >= 0.4.0)
       typhoeus (~> 1.1, >= 1.1.2)
 
@@ -87,7 +87,7 @@ DEPENDENCIES
   bundler (~> 1.14, >= 1.14.3)
   codeclimate-test-reporter (~> 1.0, >= 1.0.5)
   finapps_core!
-  rake (~> 12.0.0, >= 12.0.0)
+  rake (~> 12.0, >= 12.0.0)
   rspec (~> 3.5, >= 3.5.0)
   rubocop (~> 0.47, >= 0.47.1)
   simplecov (~> 0.11, >= 0.11.2)

data/finapps_core.gemspec

@@ -20,19 +20,19 @@ Gem::Specification.new do |spec|
   spec.test_files = Dir['spec/**/*.rb']
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'faraday', '~> 0.11', '>= 0.11.0'
-  spec.add_runtime_dependency 'faraday_middleware', '~> 0.11', '>= 0.11.0'
-  spec.add_runtime_dependency 'typhoeus', '~> 1.1', '>= 1.1.2'
-  spec.add_runtime_dependency 'rash', '~> 0.4', '>= 0.4.0'
+  spec.add_runtime_dependency 'faraday',                        '~> 0.11',  '>= 0.11.0'
+  spec.add_runtime_dependency 'faraday_middleware',             '~> 0.11',  '>= 0.11.0.1'
+  spec.add_runtime_dependency 'typhoeus',                       '~> 1.1',   '>= 1.1.2'
+  spec.add_runtime_dependency 'rash',                           '~> 0.4',   '>= 0.4.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.14', '>= 1.14.3'
-  spec.add_development_dependency 'rake', '~> 12.0.0', '>= 12.0.0'
-  spec.add_development_dependency 'rspec', '~> 3.5', '>= 3.5.0'
-  spec.add_development_dependency 'webmock', '~> 2.3', '>= 2.3.2'
-  spec.add_development_dependency 'sinatra', '~> 1.4', '>= 1.4.7'
-  spec.add_development_dependency 'simplecov', '~> 0.11', '>= 0.11.2'
-  spec.add_development_dependency 'codeclimate-test-reporter', '~> 1.0', '>= 1.0.5'
-  spec.add_development_dependency 'rubocop', '~> 0.47','>= 0.47.1'
+  spec.add_development_dependency 'bundler',                    '~> 1.14',  '>= 1.14.3'
+  spec.add_development_dependency 'rake',                       '~> 12.0',  '>= 12.0.0'
+  spec.add_development_dependency 'rspec',                      '~> 3.5',   '>= 3.5.0'
+  spec.add_development_dependency 'webmock',                    '~> 2.3',   '>= 2.3.2'
+  spec.add_development_dependency 'sinatra',                    '~> 1.4',   '>= 1.4.7'
+  spec.add_development_dependency 'simplecov',                  '~> 0.11',  '>= 0.11.2'
+  spec.add_development_dependency 'codeclimate-test-reporter',  '~> 1.0',   '>= 1.0.5'
+  spec.add_development_dependency 'rubocop',                    '~> 0.47',  '>= 0.47.1'
 
   spec.extra_rdoc_files = %w(README.md LICENSE)
   spec.rdoc_options = %w(--line-numbers --inline-source --title finapps-ruby-core --main README.md)

data/lib/finapps_core/middleware/request/tenant_authentication.rb

@@ -6,9 +6,9 @@ module FinAppsCore
     class TenantAuthentication < Faraday::Middleware
       KEY = 'X-FinApps-Token' unless defined? KEY
 
-      def initialize(app, identifier, token)
+      def initialize(app, token)
         super(app)
-        @header_value = "#{identifier.to_s.strip}=#{token.to_s.strip}"
+        @header_value = token.to_s.strip
       end
 
       def call(env)

data/lib/finapps_core/rest/base_client.rb

@@ -1,4 +1,8 @@
 # frozen_string_literal: true
+require_relative './configuration.rb'
+require_relative './connection.rb'
+require_relative '../utils/loggeable'
+
 module FinAppsCore
   module REST
     # base client functionality
@@ -11,7 +15,7 @@ module FinAppsCore
       attr_reader :config
 
       def initialize(options, logger=nil)
-        @config = FinAppsCore::REST::Configuration.new options
+        @config = ::FinAppsCore::REST::Configuration.new options
         @logger = logger
       end
 

data/lib/finapps_core/rest/configuration.rb

@@ -5,15 +5,14 @@ module FinAppsCore
     class Configuration # :nodoc:
       using ObjectExtensions
 
-      attr_accessor :host,
-                    :tenant_identifier, :tenant_token,
-                    :user_identifier, :user_token,
-                    :proxy, :timeout, :retry_limit, :log_level
+      attr_accessor :tenant_token, :user_identifier, :user_token,
+                    :host, :proxy, :timeout, :retry_limit,
+                    :log_level
 
       def initialize(options={})
-        non_nil_options = options.select {|_, value| !value.nil? }
-        FinAppsCore::REST::Defaults::DEFAULTS.merge(non_nil_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?
       end
@@ -27,6 +26,10 @@ module FinAppsCore
       def valid_host?
         host.start_with?('http://', 'https://')
       end
+
+      def remove_empty_options(hash)
+        hash.select {|_, value| !value.nil? }
+      end
     end
   end
 end

data/lib/finapps_core/rest/connection.rb

@@ -13,7 +13,7 @@ module FinAppsCore
         Faraday.new(options) do |conn|
           conn.request :accept_json
           conn.request :user_agent
-          conn.request :tenant_authentication, config.tenant_identifier, config.tenant_token
+          conn.request :tenant_authentication, config.tenant_token
           conn.request :json
           conn.request :retry
           conn.request :multipart

data/lib/finapps_core/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module FinAppsCore
-  VERSION = '2.0.5'
+  VERSION = '2.0.6'
 end

data/spec/middleware/request/no_encoding_basic_authentication_spec.rb

@@ -1,31 +1,27 @@
 # frozen_string_literal: true
 RSpec.describe FinAppsCore::Middleware::NoEncodingBasicAuthentication do
-  let(:valid_credentials) { VALID_CREDENTIALS }
   let(:key) { FinAppsCore::Middleware::NoEncodingBasicAuthentication::KEY }
 
   describe '#call' do
-    fake_app = proc {|env| env }
+    app = proc {|env| env }
 
     context 'when credentials were provided' do
-      let(:middleware) do
-        FinAppsCore::Middleware::NoEncodingBasicAuthentication.new(fake_app, VALID_CREDENTIALS[:token])
-      end
-      let(:expected_header) { "Basic #{valid_credentials[:token]}" }
+      let(:middleware) { FinAppsCore::Middleware::NoEncodingBasicAuthentication.new(app, VALID_CREDENTIALS[:token]) }
+      let(:expected_header_value) { "Basic #{VALID_CREDENTIALS[:token]}" }
 
       context 'when header was not previously set' do
         let(:request_env) { {request_headers: {}} }
-        subject(:actual_header) { middleware.call(request_env)[:request_headers][key] }
+        subject(:result) { middleware.call(request_env) }
 
-        it('generates a header') { expect(actual_header).to eq(expected_header) }
+        it('generates a header') { expect(result[:request_headers][key]).to eq(expected_header_value) }
       end
 
       context 'when header was previously set' do
-        let(:existing_header) { {FinAppsCore::Middleware::NoEncodingBasicAuthentication::KEY => 'foo'} }
-        let(:request_env) { {request_headers: existing_header} }
-        subject(:actual_header) { middleware.call(request_env)[:request_headers][key] }
+        let(:request_env) { {request_headers: {key => 'foo'}} }
+        subject(:result) { middleware.call(request_env) }
 
-        it('does not override existing header') { expect(actual_header).to eq('foo') }
-        it('does not generate a header') { expect(actual_header).to_not eq(expected_header) }
+        it('does not override existing header') { expect(result[:request_headers][key]).to eq('foo') }
+        it('does not generate a header') { expect(result[:request_headers][key]).to_not eq(expected_header_value) }
       end
     end
   end

data/spec/middleware/request/tenant_authentication_spec.rb

@@ -7,12 +7,8 @@ RSpec.describe FinAppsCore::Middleware::TenantAuthentication do
     fake_app = proc {|env| env }
 
     context 'when company credentials were provided' do
-      let(:middleware) do
-        FinAppsCore::Middleware::TenantAuthentication.new(fake_app,
-                                                          VALID_CREDENTIALS[:identifier],
-                                                          VALID_CREDENTIALS[:token])
-      end
-      let(:expected_header) { "#{valid_tenant_options[:identifier]}=#{valid_tenant_options[:token]}" }
+      let(:middleware) { FinAppsCore::Middleware::TenantAuthentication.new(fake_app, VALID_CREDENTIALS[:token]) }
+      let(:expected_header) { valid_tenant_options[:token] }
 
       context 'when header was not previously set' do
         let(:request_env) { {request_headers: {}} }

data/spec/rest/base_client_spec.rb

@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 RSpec.describe FinAppsCore::REST::BaseClient do
-  let(:valid_tenant_options) do
-    {tenant_identifier: VALID_CREDENTIALS[:identifier],
-     tenant_token: VALID_CREDENTIALS[:token]}
-  end
+  let(:valid_tenant_options) { {tenant_token: VALID_CREDENTIALS[:token]} }
   subject { FinAppsCore::REST::BaseClient.new(valid_tenant_options) }
 
   RESPONSE = 0

data/spec/utils/parameter_filter_spec.rb

@@ -1,18 +1,30 @@
 # frozen_string_literal: true
 class FakeClass
-  include ::FinAppsCore::Utils::ParameterFilter
+  include FinAppsCore::Utils::ParameterFilter
 end
 
 RSpec.describe FinAppsCore::Utils::ParameterFilter do
   describe '#skip_sensitive_data' do
     context 'when provided with sensitive data' do
       let(:unfiltered_params) do
-        {password: 'FinApps@123', password_confirm: 'FinApps@123', token: '123456',
-         login: 'sammysosa', username: 'johnny', name: 'george'}
+        {
+          password: 'FinApps@123',
+          password_confirm: 'FinApps@123',
+          token: '123456',
+          login: 'sammysosa',
+          username: 'johnny',
+          name: 'george'
+        }
       end
       let(:filtered_params) do
-        {password: '[REDACTED]', password_confirm: '[REDACTED]', token: '[REDACTED]',
-         login: '[REDACTED]', username: '[REDACTED]', name: 'george'}
+        {
+          password: '[REDACTED]',
+          password_confirm: '[REDACTED]',
+          token: '[REDACTED]',
+          login: '[REDACTED]',
+          username: '[REDACTED]',
+          name: 'george'
+        }
       end
 
       it 'filters out sensitive values' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: finapps_core
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Erich Quintero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2017-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -39,7 +39,7 @@ dependencies:
         version: '0.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '0.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.0.1
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
@@ -116,7 +116,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.0.0
+        version: '12.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 12.0.0
@@ -126,7 +126,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.0.0
+        version: '12.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 12.0.0