lhs 21.2.2 → 21.3.0

data/spec/dummy/app/models/dummy_record_with_oauth.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class DummyRecordWithOauth < LHS::Record
+  oauth
+  endpoint 'http://datastore/v2/records_with_oauth'
+  endpoint 'http://datastore/v2/records_with_oauth/{id}'
+end

data/spec/dummy/app/models/{user.rb → dummy_user.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class User < LHS::Record
+class DummyUser < LHS::Record
   endpoint 'http://datastore/v2/users'
   endpoint 'http://datastore/v2/users/{id}'
 end

data/spec/dummy/app/models/providers/customer_system.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Providers
+  class CustomerSystem < LHS::Record
+    provider(headers: { 'Authorization': 'token123' })
+  end
+end

data/spec/dummy/config/routes.rb

@@ -3,6 +3,10 @@
 Rails.application.routes.draw do
   root 'application#root'
 
+  # Automatic Authentication
+  get 'automatic_authentication/oauth' => 'automatic_authentication#o_auth'
+  get 'automatic_authentication/oauth_with_multiple_providers' => 'automatic_authentication#o_auth_with_multiple_providers'
+
   # Request Cycle Cache
   get 'request_cycle_cache/simple' => 'request_cycle_cache#simple'
   get 'request_cycle_cache/no_caching_interceptor' => 'request_cycle_cache#no_caching_interceptor'

data/spec/option_blocks/ensure_reset_between_requests_spec.rb

@@ -13,7 +13,8 @@ describe 'Option Blocks', type: :request do
       .to_return(status: 200)
   end
 
-  it 'always ensures option blocks are always reset for new requests', dummy_models: true do
+  it 'always ensures option blocks are always reset for new requests',
+  dummy_models: true, reset_before: true do
     get '/option_blocks/first'
     expect(first_request).to have_been_made.once
     get '/option_blocks/second'

data/spec/record/error_handling_integration_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
-require 'lhc/test/cache_helper.rb'
+require 'lhc/rspec'
 
 describe 'Error handling with chains', type: :request do
   let!(:request) do

data/spec/record/includes_spec.rb

@@ -664,6 +664,28 @@ describe LHS::Record do
       expect(nested_request).to have_been_requested
       expect(place.customer.salesforce.name).to eq 'Steve'
     end
+
+    context 'included data has a configured record endpoint option' do
+      before do
+        class SalesforceCustomer < LHS::Record
+          endpoint 'https://salesforce/customers/{id}', headers: { 'Authorization': 'Bearer 123' }
+        end
+      end
+
+      let!(:nested_request) do
+        stub_request(:get, "https://salesforce/customers/1")
+          .with(headers: { 'Authorization' => 'Bearer 123' })
+          .to_return(body: {
+            name: 'Steve'
+          }.to_json)
+      end
+
+      it 'includes data that has been nested in an additional structure' do
+        place = Place.includes(customer: :salesforce).find(1)
+        expect(nested_request).to have_been_requested
+        expect(place.customer.salesforce.name).to eq 'Steve'
+      end
+    end
   end
 
   context 'include empty structures' do
@@ -683,4 +705,23 @@ describe LHS::Record do
       }).not_to raise_exception
     end
   end
+
+  context 'include partially empty structures' do
+    before do
+      class Place < LHS::Record
+        endpoint 'https://places/{id}'
+      end
+      stub_request(:get, "https://places/1")
+        .to_return(body: {
+          id: '123',
+          customer: {}
+        }.to_json)
+    end
+
+    it 'skips includes when there is nothing and also does not raise an exception' do
+      expect(-> {
+        Place.includes(customer: :salesforce).find(1)
+      }).not_to raise_exception
+    end
+  end
 end

data/spec/request_cycle_cache_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
-require 'lhc/test/cache_helper.rb'
+require 'lhc/rspec'
 
 describe 'Request Cycle Cache', type: :request do
   let!(:request) do
@@ -37,7 +37,7 @@ describe 'Request Cycle Cache', type: :request do
     expect(lambda do
       get '/request_cycle_cache/no_caching_interceptor'
     end).to output(
-      %r{\[WARNING\] Can't enable request cycle cache as LHC::Caching interceptor is not enabled/configured \(see https://github.com/local-ch/lhc/blob/master/docs/interceptors/caching.md#caching-interceptor\)!}
+      %r{\[WARNING\] Can't enable request cycle cache as LHC::Caching interceptor is not enabled/configured \(see https://github.com/local-ch/lhc/blob/master/README.md#caching-interceptor\)!}
     ).to_stderr
     expect(request).to have_been_made.times(2)
   end
@@ -70,7 +70,7 @@ describe 'Request Cycle Cache', type: :request do
       expect(lambda do
         get '/request_cycle_cache/no_caching_interceptor'
       end).not_to output(
-        %r{\[WARNING\] Can't enable request cycle cache as LHC::Caching interceptor is not enabled/configured \(see https://github.com/local-ch/lhc/blob/master/docs/interceptors/caching.md#caching-interceptor\)!}
+        %r{\[WARNING\] Can't enable request cycle cache as LHC::Caching interceptor is not enabled/configured \(see https://github.com/local-ch/lhc/blob/master/README.md#caching-interceptor\)!}
       ).to_stderr
       expect(request).to have_been_made.times(2)
     end

data/spec/support/reset.rb

@@ -12,10 +12,15 @@ end
 
 class LHS::Record
 
-  CHILDREN = []
+  DESCENDANTS = []
 
   def self.inherited(child)
-    CHILDREN.push(child)
+    DESCENDANTS.push(child)
+    child.singleton_class.class_eval do
+      define_method(:inherited) do |grand_child|
+        DESCENDANTS.push(grand_child)
+      end
+    end
     super
   end
 
@@ -27,9 +32,28 @@ end
 
 def reset_lhs
   LHS::Record::Endpoints.all = {}
-  LHS::Record::CHILDREN.each do |child|
-    child.endpoints = [] if !child.name['LHS'] && defined?(child.endpoints)
-    child.configuration({}) if !child.name['LHS']
+  LHS::Record::DESCENDANTS.each do |decendant|
+    decendant.endpoints = [] if !decendant.name['LHS'] && defined?(decendant.endpoints)
+    decendant.configuration({}) if !decendant.name['LHS']
+  end
+end
+
+def model_files_to_reload
+  Dir.glob(Rails.root.join('app', 'models', '**', '*.rb'))
+end
+
+def reload_direct_inheritance
+  model_files_to_reload.map do |file|
+    next unless File.read(file).match('LHS::Record')
+    load file
+    file.split('models/').last.gsub('.rb', '').classify
+  end.compact
+end
+
+def reload_inheriting_records(parents)
+  model_files_to_reload.each do |file|
+    next if parents.none? { |parent| File.read(file).match(parent) }
+    load file
   end
 end
 
@@ -37,9 +61,7 @@ RSpec.configure do |config|
   config.before do |spec|
     reset_lhc unless spec.metadata.key?(:reset_before) && spec.metadata[:reset_before] == false
     reset_lhs unless spec.metadata.key?(:reset_before) && spec.metadata[:reset_before] == false
-    next unless spec.metadata.key?(:dummy_models) && spec.metadata[:dummy_models] == true
-    Dir.glob(Rails.root.join('app', 'models', '**', '*.rb')).each do |file|
-      load file if File.read(file).match('LHS::Record')
-    end
+    next if !spec.metadata.key?(:dummy_models) || spec.metadata[:dummy_models] != true
+    reload_inheriting_records(reload_direct_inheritance)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 21.2.2
+  version: 21.3.0
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-23 00:00:00.000000000 Z
+date: 2020-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -146,16 +146,16 @@ dependencies:
   name: rollbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.24.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.24.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -283,6 +283,7 @@ files:
 - lib/lhs/concerns/item/save.rb
 - lib/lhs/concerns/item/update.rb
 - lib/lhs/concerns/item/validation.rb
+- lib/lhs/concerns/o_auth.rb
 - lib/lhs/concerns/option_blocks.rb
 - lib/lhs/concerns/proxy/accessors.rb
 - lib/lhs/concerns/proxy/create.rb
@@ -314,6 +315,8 @@ files:
 - lib/lhs/config.rb
 - lib/lhs/data.rb
 - lib/lhs/endpoint.rb
+- lib/lhs/interceptors/auto_oauth/interceptor.rb
+- lib/lhs/interceptors/auto_oauth/thread_registry.rb
 - lib/lhs/interceptors/extended_rollbar/handler.rb
 - lib/lhs/interceptors/extended_rollbar/interceptor.rb
 - lib/lhs/interceptors/extended_rollbar/thread_registry.rb
@@ -340,6 +343,7 @@ files:
 - lib/lhs/version.rb
 - script/ci/build.sh
 - spec/.DS_Store
+- spec/auto_oauth_spec.rb
 - spec/autoloading_spec.rb
 - spec/collection/accessors_spec.rb
 - spec/collection/collection_items_spec.rb
@@ -372,6 +376,7 @@ files:
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/controllers/automatic_authentication_controller.rb
 - spec/dummy/app/controllers/concerns/.keep
 - spec/dummy/app/controllers/error_handling_with_chains_controller.rb
 - spec/dummy/app/controllers/extended_rollbar_controller.rb
@@ -381,8 +386,14 @@ files:
 - spec/dummy/app/mailers/.keep
 - spec/dummy/app/models/.keep
 - spec/dummy/app/models/concerns/.keep
-- spec/dummy/app/models/record.rb
-- spec/dummy/app/models/user.rb
+- spec/dummy/app/models/dummy_customer.rb
+- spec/dummy/app/models/dummy_record.rb
+- spec/dummy/app/models/dummy_record_with_multiple_oauth_providers1.rb
+- spec/dummy/app/models/dummy_record_with_multiple_oauth_providers2.rb
+- spec/dummy/app/models/dummy_record_with_multiple_providers_per_endpoint.rb
+- spec/dummy/app/models/dummy_record_with_oauth.rb
+- spec/dummy/app/models/dummy_user.rb
+- spec/dummy/app/models/providers/customer_system.rb
 - spec/dummy/app/views/error_handling_with_chains/error.html.erb
 - spec/dummy/app/views/error_handling_with_chains/show.html.erb
 - spec/dummy/app/views/form_for.html.erb
@@ -557,6 +568,7 @@ specification_version: 4
 summary: 'REST services accelerator: Rails gem providing an easy, active-record-like
   interface for http (hypermedia) json services'
 test_files:
+- spec/auto_oauth_spec.rb
 - spec/autoloading_spec.rb
 - spec/collection/accessors_spec.rb
 - spec/collection/collection_items_spec.rb
@@ -589,6 +601,7 @@ test_files:
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/controllers/automatic_authentication_controller.rb
 - spec/dummy/app/controllers/concerns/.keep
 - spec/dummy/app/controllers/error_handling_with_chains_controller.rb
 - spec/dummy/app/controllers/extended_rollbar_controller.rb
@@ -598,8 +611,14 @@ test_files:
 - spec/dummy/app/mailers/.keep
 - spec/dummy/app/models/.keep
 - spec/dummy/app/models/concerns/.keep
-- spec/dummy/app/models/record.rb
-- spec/dummy/app/models/user.rb
+- spec/dummy/app/models/dummy_customer.rb
+- spec/dummy/app/models/dummy_record.rb
+- spec/dummy/app/models/dummy_record_with_multiple_oauth_providers1.rb
+- spec/dummy/app/models/dummy_record_with_multiple_oauth_providers2.rb
+- spec/dummy/app/models/dummy_record_with_multiple_providers_per_endpoint.rb
+- spec/dummy/app/models/dummy_record_with_oauth.rb
+- spec/dummy/app/models/dummy_user.rb
+- spec/dummy/app/models/providers/customer_system.rb
 - spec/dummy/app/views/error_handling_with_chains/error.html.erb
 - spec/dummy/app/views/error_handling_with_chains/show.html.erb
 - spec/dummy/app/views/form_for.html.erb