forest_liana 7.6.9 → 7.6.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5771aacdf3ba9cccd4c4b041298e2848f1a7f80260d5c8c3efac7994117a4a87
-  data.tar.gz: b284e42c3adabfb13b37f7588d669d7a3b52863ff7d1970a8f45b0d6b3f62cd5
+  metadata.gz: '095735ab97e1d107e2746eb6c118198798434aed96e915fdc2e476249bf24cc9'
+  data.tar.gz: 4d37f6fa5b27393ebb2ddfc06bddb1fb5c3398c9157c527625a37d9b87fdb380
 SHA512:
-  metadata.gz: 7578fe5932e400ba5215bffdb9c7178196118f2ab20ad3fd945115162c67f2c062c32dafb0528eefe6af5be19fcbd692c97d46b58a89a371c74c82a979038bd3
-  data.tar.gz: 9f3e3d85106f52f3785c81c100f65ae2bf24709f5d2da127ec726e5a1eb9e3135f81bd7332ac9b1fb1a6c23a954185a2ab108787d76679dacb1cd0e731520789
+  metadata.gz: efdfdb98774e37d1dbd7d641f518a7ea9c62ececca98b7cc2ca06eb3bd27ca6638d03c3a7f4077b11fd77002033d379fd784b2e5226f4030ff41614e56fa2520
+  data.tar.gz: '029ba78907e4996a79d6b3a58849beb37f1f9bfe18b34cfa011e60dde7a2e7a3cb0312d26a45ceaa14f7d4585b5bf87e7f18d0b681fddaf4848bb554d5c03a28'

data/app/services/forest_liana/base_getter.rb

@@ -34,10 +34,10 @@ module ForestLiana
       instance_dependent_associations = instance_dependent_associations(resource)
 
       preload_loads = @includes.select do |name|
-        targetModelConnection = resource.reflect_on_association(name).inverse_of&.active_record&.connection
+        targetModelConnection = resource.reflect_on_association(name).klass.connection
         targetModelDatabase = targetModelConnection.current_database if targetModelConnection.respond_to? :current_database
         resourceConnection = resource.connection
-        resourceDatabase = resourceConnection if resourceConnection.respond_to? :current_database
+        resourceDatabase = resourceConnection.current_database if resourceConnection.respond_to? :current_database
 
         targetModelDatabase != resourceDatabase
       end + instance_dependent_associations

data/app/services/forest_liana/schema_adapter.rb

@@ -8,7 +8,7 @@ module ForestLiana
       add_columns
       add_associations
 
-      collection.fields.sort_by! { |k| k[:field].to_s }
+      collection.fields.sort_by!.with_index { |k, idx| [k[:field].to_s, idx] }
 
       # NOTICE: Add ActsAsTaggable fields
       if @model.try(:taggable?) && @model.respond_to?(:acts_as_taggable) &&

data/app/services/forest_liana/schema_utils.rb

@@ -31,11 +31,7 @@ module ForestLiana
         if model.abstract_class?
           model_found = self.find_model_from_abstract_class(model, collection_name)
         elsif ForestLiana.name_for(model) == collection_name
-          if self.sti_child?(model)
-            model_found = model
-          else
-            model_found = model.base_class
-          end
+          model_found = model
         end
 
         break if model_found
@@ -90,28 +86,5 @@ module ForestLiana
     def self.is_active_type? model
       Object.const_defined?('ActiveType::Object') && model < ActiveType::Object
     end
-
-    def self.sti_child?(model)
-      begin
-        parent = model.try(:superclass)
-        return false unless parent.try(:table_name)
-
-        if ForestLiana.name_for(parent)
-          inheritance_column = parent.columns.find do |column|
-            (parent.inheritance_column && column.name == parent.inheritance_column)\
-              || column.name == 'type'
-          end
-
-          return inheritance_column.present?
-        end
-      rescue NoMethodError
-        # NOTICE: ActiveRecord::Base throw the exception "undefined method
-        # `abstract_class?' for Object:Class" when calling the existing method
-        # "table_name".
-        return false
-      end
-
-      return false
-    end
   end
 end

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "7.6.9"
+  VERSION = "7.6.12"
 end

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

@@ -0,0 +1,3 @@
+class Manufacturer < ApplicationRecord
+  has_many :products
+end

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

@@ -1,3 +1,6 @@
 class Product < ApplicationRecord
+  belongs_to :manufacturer
+  belongs_to :driver, optional: true
+
   validates :uri, presence: true, format: { with: URI::DEFAULT_PARSER.make_regexp }
 end

data/spec/dummy/db/migrate/20220727114450_create_manufacturers.rb

@@ -0,0 +1,7 @@
+class CreateManufacturers < ActiveRecord::Migration[6.0]
+  def change
+    create_table :manufacturers do |t|
+      t.string :name
+    end
+  end
+end

data/spec/dummy/db/migrate/20220727114930_add_columns_to_products.rb

@@ -0,0 +1,9 @@
+class AddColumnsToProducts < ActiveRecord::Migration[6.0]
+  def change
+    change_table :products do |table|
+      table.string :name
+      table.belongs_to(:manufacturer)
+      table.belongs_to(:driver)
+    end
+  end
+end

data/spec/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2021_05_26_084712) do
+ActiveRecord::Schema.define(version: 2022_07_27_114930) do
 
   create_table "isle", force: :cascade do |t|
     t.string "name"
@@ -27,6 +27,10 @@ ActiveRecord::Schema.define(version: 2021_05_26_084712) do
     t.index ["island_id"], name: "index_locations_on_island_id"
   end
 
+  create_table "manufacturers", force: :cascade do |t|
+    t.string "name"
+  end
+
   create_table "owners", force: :cascade do |t|
     t.string "name"
     t.datetime "hired_at"
@@ -34,6 +38,11 @@ ActiveRecord::Schema.define(version: 2021_05_26_084712) do
 
   create_table "products", force: :cascade do |t|
     t.string "uri"
+    t.string "name"
+    t.integer "manufacturer_id"
+    t.integer "driver_id"
+    t.index ["driver_id"], name: "index_products_on_driver_id"
+    t.index ["manufacturer_id"], name: "index_products_on_manufacturer_id"
   end
 
   create_table "references", force: :cascade do |t|

data/spec/lib/forest_liana/bootstrapper_spec.rb

@@ -25,6 +25,7 @@ module ForestLiana
         [
           Island,
           Location,
+          Manufacturer,
           Owner,
           Product,
           Reference,

data/spec/services/forest_liana/resources_getter_spec.rb

@@ -4,9 +4,9 @@ module ForestLiana
     let(:pageSize) { 10 }
     let(:pageNumber) { 1 }
     let(:sort) { 'id' }
-    let(:fields) { }
-    let(:filters) { }
-    let(:scopes) { { } }
+    let(:fields) {}
+    let(:filters) {}
+    let(:scopes) { {} }
     let(:rendering_id) { 13 }
     let(:user) { { 'id' => '1', 'rendering_id' => rendering_id } }
 
@@ -22,7 +22,21 @@ module ForestLiana
       allow(ForestLiana::ScopeManager).to receive(:fetch_scopes).and_return(scopes)
     end
 
+    def clean_database
+      [
+        Driver,
+        Island,
+        Location,
+        Manufacturer,
+        Product,
+        Tree,
+        User,
+      ].each(&:destroy_all)
+    end
+
     before(:each) do
+      clean_database
+
       users = ['Michel', 'Robert', 'Vince', 'Sandro', 'Olesya', 'Romain', 'Valentin', 'Jason', 'Arnaud', 'Jeff', 'Steve', 'Marc', 'Xavier', 'Paul', 'Mickael', 'Mike', 'Maxime', 'Gertrude', 'Monique', 'Mia', 'Rachid', 'Edouard', 'Sacha', 'Caro', 'Amand', 'Nathan', 'Noémie', 'Robin', 'Gaelle', 'Isabelle']
       .map { |name| User.create(name: name) }
 
@@ -50,15 +64,94 @@ module ForestLiana
         { :coordinates => '32154', :island => islands[4] }
       ].map { |location| Location.create(coordinates: location[:coordinates], island: location[:island]) }
 
+      manufacturers = ['Orange', 'Pear'].map { |name| Manufacturer.create!(name: 'name') }
+
+      drivers = ['Baby driver', 'Taxi driver'].map { |firstname| Driver.create!(firstname: firstname) }
+
+      products = [
+        { name: 'Valencia', uri: 'https://valencia.com', manufacturer: manufacturers[0], driver: drivers[0] },
+        { name: 'Blood', uri: 'https://blood.com', manufacturer: manufacturers[0], driver: drivers[1] },
+        { name: 'Conference', uri: 'https://conference.com', manufacturer: manufacturers[1], driver: drivers[0] },
+        { name: 'Concorde', uri: 'https://concorde.com', manufacturer: manufacturers[1], driver: drivers[1] }
+      ].map {|attributes| Product.create!(attributes) }
+
       reference = Reference.create()
       init_scopes
     end
 
-    after(:each) do
-      User.destroy_all
-      Island.destroy_all
-      Location.destroy_all
-      Tree.destroy_all
+    describe 'records eager loading' do
+      let(:resource) { Product }
+      let(:fields) { { resource.name => 'id,name,manufacturer', 'manufacturer' => 'name' } }
+
+      shared_context 'resource current_database' do
+        before do
+          connection = resource.connection
+
+          def connection.current_database
+            'db/test.sqlite3'
+          end
+        end
+
+        after do
+          resource.connection.singleton_class.remove_method(:current_database)
+        end
+      end
+
+      shared_examples 'left outer join' do
+        it 'should perform a left outer join with the association' do
+          expect(getter.perform.to_sql).to match(/LEFT OUTER JOIN "manufacturers"/)
+        end
+      end
+
+      shared_examples 'records' do
+        it 'should get only the expected records' do
+          getter.perform
+
+          records = getter.records
+
+          count = getter.count
+
+          expect(records.count).to eq 4
+          expect(count).to eq 4
+          expect(records.map(&:name)).to match_array(%w[Valencia Blood Conference Concorde])
+        end
+      end
+
+      context 'when the connections do not support current_database' do
+        include_examples 'left outer join'
+        include_examples 'records'
+      end
+
+      context 'when the included association uses a different database connection' do
+        let(:fields) { { resource.name => 'id,name,driver', 'driver' => 'firstname' } }
+
+        before do
+          association_connection = resource.reflect_on_association(:driver).klass.connection
+
+          def association_connection.current_database
+            'db/different_test.sqlite3'
+          end
+        end
+
+        after do
+          resource.reflect_on_association(:driver).klass.connection.singleton_class.remove_method(:current_database)
+        end
+
+        include_context 'resource current_database'
+
+        include_examples 'records'
+
+        it 'does not perform a left outer join with the association' do
+          expect(getter.perform.to_sql).not_to match(/LEFT OUTER JOIN "drivers"/)
+        end
+      end
+
+      context 'when the included association uses the same database connection' do
+        include_context 'resource current_database'
+
+        include_examples 'left outer join'
+        include_examples 'records'
+      end
     end
 
     describe 'when there are more records than the page size' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 7.6.9
+  version: 7.6.12
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-22 00:00:00.000000000 Z
+date: 2022-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -334,6 +334,7 @@ files:
 - spec/dummy/app/models/garage_record.rb
 - spec/dummy/app/models/island.rb
 - spec/dummy/app/models/location.rb
+- spec/dummy/app/models/manufacturer.rb
 - spec/dummy/app/models/owner.rb
 - spec/dummy/app/models/product.rb
 - spec/dummy/app/models/reference.rb
@@ -377,6 +378,8 @@ files:
 - spec/dummy/db/migrate/20210526084712_create_products.rb
 - spec/dummy/db/migrate/20220719094127_create_cars.rb
 - spec/dummy/db/migrate/20220719094450_create_drivers.rb
+- spec/dummy/db/migrate/20220727114450_create_manufacturers.rb
+- spec/dummy/db/migrate/20220727114930_add_columns_to_products.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/forest_liana/collections/island.rb
 - spec/dummy/lib/forest_liana/collections/location.rb
@@ -657,6 +660,7 @@ test_files:
 - spec/dummy/app/models/island.rb
 - spec/dummy/app/models/owner.rb
 - spec/dummy/app/models/application_record.rb
+- spec/dummy/app/models/manufacturer.rb
 - spec/dummy/app/models/town.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/models/reference.rb
@@ -678,7 +682,9 @@ test_files:
 - spec/dummy/db/migrate/20220719094127_create_cars.rb
 - spec/dummy/db/migrate/20210511141752_create_owners.rb
 - spec/dummy/db/migrate/20220719094450_create_drivers.rb
+- spec/dummy/db/migrate/20220727114930_add_columns_to_products.rb
 - spec/dummy/db/migrate/20210526084712_create_products.rb
+- spec/dummy/db/migrate/20220727114450_create_manufacturers.rb
 - spec/dummy/db/migrate/20190226174951_create_tree.rb
 - spec/dummy/db/migrate/20190716130830_add_age_to_tree.rb
 - spec/dummy/db/migrate/20190226172951_create_user.rb