forest_liana 9.12.1 → 9.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a205f59494a1a151c8bb1a5be912905bf7f1c9242136ae63de22f0372f7268bf
-  data.tar.gz: ddba735dde964ffe46c0dc2907edd065e707a3d63d8283f25b2155c903d3eeb5
+  metadata.gz: 5f3456439fa5952e7ed596a80b715612c094f75fd3435d543ce8bff33ab8faac
+  data.tar.gz: 28dd9cf312219f08bb4578320d4cb0062d7db96c836ec073f82b307d3185700a
 SHA512:
-  metadata.gz: eaaf6fbca9592c4853bcdfa2ec6c5983ee0f468fd62d36aab03cf55dc865a7ae7195c079b8d05a185c174a81cadb834f87e7ff85c69f489336a58ceb65c76559
-  data.tar.gz: 3f2dc59f88da2c969f8cf865809232d0b58988cf1f395d59837b2df0d3ef094854274e82eca82c3432d8672d9a1c760dc0204c86347cbdff3ae5304b5f555323
+  metadata.gz: 1114f9ba4d54605af8a5e0e3c137ca2ad5c907205ead7788cb7c735895706029f030394e1ba944d657a155d6cce4165b1286bf7e8944bfa0f321b25923cebd2a
+  data.tar.gz: a20ca44cdba0d53db97669898a49f5b6ee76e9b778a10aee63852e2c042b7ae46bf46ac968911a7b42bb7d41d055276bb05230d68c6cc15cf90deb086c96ce1e

data/app/serializers/forest_liana/serializer_factory.rb

@@ -118,7 +118,9 @@ module ForestLiana
 
           if ret[:href].blank?
             begin
-              if @options[:include].try(:include?, attribute_name.to_s)
+              if @options[:include].try(:include?, attribute_name.to_s) &&
+                !SchemaHelper.is_smart_field?(object.class, attribute_name.to_s)
+
                 object.send(attribute_name)
               end
 

data/app/services/forest_liana/base_getter.rb

@@ -21,11 +21,11 @@ module ForestLiana
       @includes = ForestLiana::QueryHelper.get_one_association_names_symbol(@resource)
     end
 
-    def optimize_record_loading(resource, records)
+    def optimize_record_loading(resource, records, force_preload = true)
       polymorphic, preload_loads = analyze_associations(resource)
       result = records.eager_load(@includes.uniq - preload_loads - polymorphic)
 
-      result = result.preload(preload_loads) if Rails::VERSION::MAJOR >= 7
+      result = result.preload(preload_loads) if Rails::VERSION::MAJOR >= 7 && force_preload
 
       result
     end

data/app/services/forest_liana/resources_getter.rb

@@ -37,10 +37,10 @@ module ForestLiana
       end
 
       if includes.empty? || has_smart_fields
-        @records = optimize_record_loading(@resource, @records)
+        @records = optimize_record_loading(@resource, @records, false)
       else
         select = compute_select_fields
-        @records = optimize_record_loading(@resource, @records).references(includes).select(*select)
+        @records = optimize_record_loading(@resource, @records, false).references(includes).select(*select)
       end
 
       @records
@@ -55,7 +55,79 @@ module ForestLiana
     end
 
     def records
-      @records.offset(offset).limit(limit).to_a
+      records = @records.offset(offset).limit(limit).to_a
+
+      polymorphic_association, preload_loads = analyze_associations(@resource)
+      if polymorphic_association && Rails::VERSION::MAJOR >= 7
+        # TODO
+      end
+
+      preload_cross_database_associations(records, preload_loads)
+
+      records
+    end
+
+    def preload_cross_database_associations(records, preload_loads)
+      preload_loads.each do |association_name|
+        association = @resource.reflect_on_association(association_name)
+        next unless separate_database?(@resource, association)
+
+        columns = columns_for_cross_database_association(association_name)
+
+        if association.macro == :belongs_to
+          foreign_key = association.foreign_key
+          primary_key = association.klass.primary_key
+
+          ids = records.map { |r| r.public_send(foreign_key) }.compact.uniq
+          next if ids.empty?
+
+          associated = association.klass.where(primary_key => ids)
+                                  .select(columns)
+                                  .index_by { |record| record.public_send(primary_key) }
+
+          records.each do |record|
+            record.define_singleton_method(association_name) do
+              associated[record.send(foreign_key.to_sym)] || nil
+            end
+          end
+        end
+
+        if association.macro == :has_one
+          foreign_key = association.foreign_key
+          primary_key = association.active_record_primary_key
+
+          ids = records.map { |r| r.public_send(primary_key) }.compact.uniq
+          next if ids.empty?
+
+          associated = association.klass.where(foreign_key => ids)
+                                  .select(columns)
+                                  .index_by { |record| record.public_send(foreign_key.to_sym) }
+
+          records.each do |record|
+            record.define_singleton_method(association_name) do
+              associated[record.send(primary_key.to_sym)] || nil
+            end
+          end
+        end
+      end
+    end
+
+    def columns_for_cross_database_association(association_name)
+      return [:id] unless @params[:fields].present?
+
+      fields = @params[:fields][association_name.to_s]
+      return [:id] unless fields
+
+      base_fields = fields.split(',').map(&:strip).map(&:to_sym) | [:id]
+
+      association = @resource.reflect_on_association(association_name)
+      extra_key = association.foreign_key
+
+      # Add the foreign key used for the association to ensure it's available in the preloaded records
+      # This is necessary for has_one associations, without it calling record.public_send(foreign_key) would raise a "missing attribute" error
+      base_fields << extra_key if association.macro == :has_one
+
+      base_fields.uniq
     end
 
     def compute_includes

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "9.12.1"
+  VERSION = "9.13.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 9.12.1
+  version: 9.13.0
 platform: ruby
 authors:
 - Sandro Munda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-15 00:00:00.000000000 Z
+date: 2025-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails