lhs 21.2.2 → 21.2.3.pre.preload.pre.providers.pre.too.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97ca91f932322b206403f8179975b5b9b82b3963518af2c914ea3dce57323ffc
-  data.tar.gz: 13849b65f18f9dce4748f11d693cb79ad3c4c467b3d790235de8d9b75ee410c5
+  metadata.gz: 86d0b18d2781746245a64d4b1594cae9933712760d984685d61e19b680a27f43
+  data.tar.gz: 9b89ffa0271afe18cea56f049c539d19f40c498fd0da8351a94abacbc3bf27da
 SHA512:
-  metadata.gz: 1ab0338a4892d6ff23ea4698019d732733503d8f4c23eeff50beb7ceb6d41905d324c46d9e16e543514ec5c704c4392ce902f9c48ccf92aa4f01ef6b54833498
-  data.tar.gz: 401fbcaf2c25f3eca613a41bf1ca8815867c3df9a3e2ed18d3234da8b5d7c62e0499065f7d72f1d3bdde14ae1cf9dea7f017258647a9156c1c4a4d2f26b52ba7
+  metadata.gz: 4afb8fd86eaa9127581720a1abdc2057033be1fe3196b074a6798224e01e25ad586d92b9683ebf77b70be2137fe6c575d119773f227f2986a4be04b7fccd0e37
+  data.tar.gz: 5f929ebc2f5f8d88300019c372507750ca48b4ad53930d89a0a34cf87621224dcbfd95908d0ca84fbbafe9c3d712db2cbfe01e46bd1db95f80dcf9ee222baa15

data/lib/lhs/concerns/autoload_records.rb

@@ -27,11 +27,28 @@ module AutoloadRecords
           @app.call(env)
         end
 
-        def self.require_records
-          Dir.glob(Rails.root.join('app', 'models', '**', '*.rb')).each do |file|
-            require_dependency file if File.read(file).match('LHS::Record')
+        def self.model_files
+          Dir.glob(Rails.root.join('app', 'models', '**', '*.rb'))
+        end
+
+        def self.require_direct_inheritance
+          model_files.map do |file|
+            next unless File.read(file).match('LHS::Record')
+            require_dependency file
+            file.split('models/').last.gsub('.rb', '').classify
+          end.compact
+        end
+
+        def self.require_inheriting_records(parents)
+          model_files.each do |file|
+            next if parents.none? { |parent| File.read(file).match(parent) }
+            require_dependency file
           end
         end
+
+        def self.require_records
+          require_inheriting_records(require_direct_inheritance)
+        end
       end
     end
   end

data/lib/lhs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LHS
-  VERSION = '21.2.2'
+  VERSION = '21.2.3.pre.preload-providers-too.1'
 end

data/spec/autoloading_spec.rb

@@ -4,18 +4,45 @@ require "rails_helper"
 
 describe LHS, type: :request do
   context 'autoloading' do
-    it "pre/re-loads all LHS classes initialy,|
-        because it's necessary for endpoint-to-record-class-discovery",
-    reset_before: false do
-      all_endpoints = LHS::Record::Endpoints.all
-      expect(all_endpoints['http://datastore/v2/users']).to be_present
-      expect(all_endpoints['http://datastore/v2/users/{id}']).to be_present
+
+    let(:endpoints) { LHS::Record::Endpoints.all }
+
+    it "pre/re-loads all LHS classes initialy, because it's necessary for endpoint-to-record-class-discovery", reset_before: false do
+
+      expect(endpoints['http://datastore/v2/users']).to be_present
+      expect(endpoints['http://datastore/v2/users/{id}']).to be_present
+
       expect(
-        User.endpoints.detect { |endpoint| endpoint.url == 'http://datastore/v2/users' }
+        DummyUser.endpoints.detect { |endpoint| endpoint.url == 'http://datastore/v2/users' }
       ).to be_present
       expect(
-        User.endpoints.detect { |endpoint| endpoint.url == 'http://datastore/v2/users/{id}' }
+        DummyUser.endpoints.detect { |endpoint| endpoint.url == 'http://datastore/v2/users/{id}' }
       ).to be_present
     end
+
+    it "also pre/re-loads all LHS classes that inherited from an LHS provider, because it's necessary for endpoint-to-record-class-discovery", reset_before: false do
+
+      expect(endpoints['http://customers']).to be_present
+      expect(endpoints['http://customers/{id}']).to be_present
+
+      expect(
+        DummyCustomer.endpoints.detect { |endpoint| endpoint.url == 'http://customers' }
+      ).to be_present
+      expect(
+        DummyCustomer.endpoints.detect { |endpoint| endpoint.url == 'http://customers/{id}' }
+      ).to be_present
+
+      customer_request = stub_request(:get, "http://customers/1")
+        .with(
+          headers: {
+            'Authorization' => 'token123'
+          }
+        )
+        .to_return(body: { name: 'Steve' }.to_json)
+
+      DummyCustomer.find(1)
+
+      expect(customer_request).to have_been_requested
+    end
   end
 end

data/spec/dummy/app/controllers/error_handling_with_chains_controller.rb

@@ -5,7 +5,7 @@ class ErrorHandlingWithChainsController < ApplicationController
   # Example where the query chain is resolved
   # in the view (during render 'show')
   def fetch_in_view
-    @records = Record
+    @records = DummyRecord
       .handle(LHC::Error, ->(error) { handle_error(error) })
       .where(color: 'blue')
     render 'show'
@@ -15,7 +15,7 @@ class ErrorHandlingWithChainsController < ApplicationController
   # Example where the query chain is resolved
   # before the view is rendered
   def fetch_in_controller
-    @records = Record
+    @records = DummyRecord
       .handle(LHC::Error, ->(error) { handle_error(error) })
       .where(color: 'blue').fetch
     render 'show'

data/spec/dummy/app/controllers/extended_rollbar_controller.rb

@@ -3,8 +3,8 @@
 class ExtendedRollbarController < ApplicationController
 
   def extended_rollbar
-    Record.where(color: 'blue').fetch
-    Record.where(color: 'red').fetch
+    DummyRecord.where(color: 'blue').fetch
+    DummyRecord.where(color: 'red').fetch
     raise "Let's see if rollbar logs information about what kind of requests where made around here!"
   end
 end

data/spec/dummy/app/controllers/option_blocks_controller.rb

@@ -4,12 +4,12 @@ class OptionBlocksController < ApplicationController
 
   def first
     LHS::OptionBlocks::CurrentOptionBlock.options = { params: { request: 'first' } }
-    Record.where(request: 'second').fetch
+    DummyRecord.where(request: 'second').fetch
     render text: 'ok'
   end
 
   def second
-    Record.where(request: 'second').fetch
+    DummyRecord.where(request: 'second').fetch
     render text: 'ok'
   end
 end

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

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+class DummyCustomer < Providers::CustomerSystem
+  endpoint 'http://customers'
+  endpoint 'http://customers/{id}'
+end

data/spec/dummy/app/models/{record.rb → dummy_record.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Record < LHS::Record
+class DummyRecord < LHS::Record
   endpoint 'http://datastore/v2/records'
   endpoint 'http://datastore/v2/records/{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/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/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

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.2.3.pre.preload.pre.providers.pre.too.1
 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-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -381,8 +381,10 @@ 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_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
@@ -546,9 +548,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - Ruby >= 2.3.0
 rubygems_version: 3.0.6
@@ -598,8 +600,10 @@ 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_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