forest_liana 9.14.2 → 9.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a594bcf7830da0f415fbfadfa90d985e46814d07cda6892f317f1834db731ce3
-  data.tar.gz: a565c34a7ef4c7b6e637818963a76b11d772cd716b3eed1db7ffe6b4e8711d2f
+  metadata.gz: fc578d6e8079646a883e1fa6685a272b47ea49c956fb90cc2bcb3e946d04de9a
+  data.tar.gz: 938d02f609606ef9ed4e5efed2038ed1f93715339cb874b90c3effbbb308dc37
 SHA512:
-  metadata.gz: c12bd80a362e62935a333d6c9b3df3e8bee0618cb29ef3f0a3677d50b4a33b79a66a09e42b38b3ca2a72cb15c2fdef5542d08a4b190f03ce270ed35ce0d951e4
-  data.tar.gz: f0a9ea3a170fff1bab99b583d7c5cc491740ffec9b8f48f6de8eee29bc497c77a7d28db34f49b53e08ee49957a3601c4b37be074a4f2a9a7ee1e427fca5df5a8
+  metadata.gz: 0410aade693b10507faf1977d767aeafe0d9cac0cf9ba08ff948815d219a3885bc7c4a4b5da7442f4347466862f2c9750d0c97b2e48bae751dca90bedd5093ce
+  data.tar.gz: 8d693fe4ef1ace2bb391eaf2d4c062d27c0d59d74725328f2cf28eee2a17759610c6c01a091ed8e6abf52a187700ebdfae64a1fd13713f35167c8ea2877354da

data/app/serializers/forest_liana/serializer_factory.rb

@@ -146,7 +146,10 @@ module ForestLiana
                 @options[:fields][relation_class_name]&.size == 1 &&
                 @options[:fields][relation_class_name]&.include?(relation.klass.primary_key.to_sym)
 
-                attr_data[:attr_or_block] = proc {  relation.klass.new(relation.klass.primary_key => object.send(relation.foreign_key.to_sym)) }
+                attr_data[:attr_or_block] = proc {
+                  foreign_key_value = object.send(relation.foreign_key.to_sym)
+                  foreign_key_value.nil? ? nil : relation.klass.new(relation.klass.primary_key => foreign_key_value)
+                }
               end
             end
 

data/app/services/forest_liana/has_many_getter.rb

@@ -62,9 +62,8 @@ module ForestLiana
     end
 
     def field_names_requested
-      return nil unless @params[:fields] && @params[:fields][@collection_name]
-      @params[:fields][@collection_name].split(',')
-        .map { |name| name.to_sym }
+      fields = @params.dig(:fields, @collection_name)
+      Array(fields&.split(',')).map(&:to_sym)
     end
 
     def model_association

data/app/services/forest_liana/resources_getter.rb

@@ -32,7 +32,7 @@ module ForestLiana
     def perform
       polymorphic_association, preload_loads = analyze_associations(@resource)
       includes = @includes.uniq - polymorphic_association - preload_loads - @optional_includes
-      has_smart_fields =  @params[:fields][@collection_name].split(',').any? do |field|
+      has_smart_fields = Array(@params.dig(:fields, @collection_name)&.split(',')).any? do |field|
         ForestLiana::SchemaHelper.is_smart_field?(@resource, field)
       end
 
@@ -143,10 +143,8 @@ module ForestLiana
         includes = associations_has_one.map do |association|
           association_name = association.name.to_s
 
-          if @params[:fields].key?(association_name) &&
-            @params[:fields][association_name].split(',').size == 1 &&
-            @params[:fields][association_name].split(',').include?(association.klass.primary_key)
-
+          fields = @params[:fields]&.[](association_name)&.split(',')
+          if fields&.size == 1 && fields.include?(association.klass.primary_key)
             @field_names_requested << association.foreign_key
             @optional_includes << association.name
           end
@@ -191,7 +189,7 @@ module ForestLiana
     end
 
     def field_names_requested
-      return nil unless @params[:fields] && @params[:fields][@collection_name]
+      return [] unless @params.dig(:fields, @collection_name)
 
       associations_for_query = extract_associations_from_filter
       associations_for_query << @params[:sort].split('.').first.to_sym if @params[:sort]&.include?('.')
@@ -332,11 +330,12 @@ module ForestLiana
           select << "#{@resource.table_name}.#{association.foreign_key}"
         end
 
-        if @params[:fields].key?(path)
+        fields = @params[:fields]&.[](path)&.split(',')
+        if fields
           association = get_one_association(path)
           table_name = association.table_name
 
-          @params[:fields][path].split(',').each do |association_path|
+          fields.each do |association_path|
             if ForestLiana::SchemaHelper.is_smart_field?(association.klass, association_path)
               association.klass.attribute_names.each { |attribute| select << "#{table_name}.#{attribute}" }
             else

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "9.14.2"
+  VERSION = "9.14.4"
 end

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

@@ -1,7 +1,7 @@
 class Tree < ActiveRecord::Base
   belongs_to :owner, class_name: 'User', inverse_of: :trees_owned
   belongs_to :cutter, class_name: 'User', inverse_of: :trees_cut
-  belongs_to :island
+  belongs_to :island, optional: true
   belongs_to :eponymous_island,
     ->(record) { where(name: record.name) },
     class_name: 'Island',

data/spec/services/forest_liana/resources_getter_spec.rb

@@ -572,6 +572,26 @@ module ForestLiana
           expect(records.second.name).to eq 'Treasure'
         end
       end
+
+      describe '#perform' do
+        let(:resource) { User }
+        let(:fields) { nil }
+        let(:sort) { nil }
+        let(:filters) { nil }
+
+        it 'does not raise an error when params[:fields] is nil' do
+          expect {
+            getter.perform
+          }.not_to raise_error
+
+          records = getter.records
+          count = getter.count
+
+          expect(records).to all(be_a(User))
+          expect(count).to eq User.count
+        end
+      end
+
     end
   end
 end

data/spec/services/forest_liana/serializer_factory_spec.rb

@@ -0,0 +1,53 @@
+module ForestLiana
+  describe SerializerFactory do
+    describe '#serializer_for has_one_relationships patch' do
+      let(:user) { User.create!(name: 'PatchTest') }
+      let(:island) { Island.create!(name: 'TestIsland') }
+      let(:tree) { Tree.create!(name: 'TestTree', island: island, owner: user) }
+
+      it 'simulates has_one relation with only primary key' do
+        factory = described_class.new
+        serializer_class = factory.serializer_for(Tree)
+
+        serializer_class.send(:has_one, :island) { }
+
+        instance = serializer_class.new(tree, fields: {
+          'Island' => [:id],
+          'Tree' => [:island]
+        })
+
+        relationships = instance.send(:has_one_relationships)
+        expect(relationships).to have_key(:island)
+        relation_data = relationships[:island]
+        expect(relation_data[:attr_or_block]).to be_a(Proc)
+        model = relation_data[:attr_or_block].call
+
+        expect(model).to be_a(Island)
+        expect(model.id).to eq(island.id)
+      end
+
+      it 'returns nil if foreign key is nil' do
+        tree_without_island = Tree.create!(name: 'NoIslandTree', island_id: nil, owner: user)
+
+        factory = described_class.new
+        serializer_class = factory.serializer_for(Tree)
+
+        serializer_class.send(:has_one, :island) { }
+
+        instance = serializer_class.new(tree_without_island, fields: {
+          'Island' => [:id],
+          'Tree' => [:island]
+        })
+
+        relationships = instance.send(:has_one_relationships)
+        expect(relationships).to have_key(:island)
+        relation_data = relationships[:island]
+        expect(relation_data[:attr_or_block]).to be_a(Proc)
+        model = relation_data[:attr_or_block].call
+
+        expect(model).to be_nil
+      end
+
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 9.14.2
+  version: 9.14.4
 platform: ruby
 authors:
 - Sandro Munda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-10 00:00:00.000000000 Z
+date: 2025-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -431,6 +431,7 @@ files:
 - spec/services/forest_liana/resources_getter_spec.rb
 - spec/services/forest_liana/schema_adapter_spec.rb
 - spec/services/forest_liana/scope_manager_spec.rb
+- spec/services/forest_liana/serializer_factory_spec.rb
 - spec/services/forest_liana/smart_action_field_validator_spec.rb
 - spec/services/forest_liana/smart_action_form_parser_spec.rb
 - spec/services/forest_liana/utils/context_variables_injector_spec.rb
@@ -736,6 +737,7 @@ test_files:
 - spec/services/forest_liana/resources_getter_spec.rb
 - spec/services/forest_liana/schema_adapter_spec.rb
 - spec/services/forest_liana/scope_manager_spec.rb
+- spec/services/forest_liana/serializer_factory_spec.rb
 - spec/services/forest_liana/smart_action_field_validator_spec.rb
 - spec/services/forest_liana/smart_action_form_parser_spec.rb
 - spec/services/forest_liana/utils/context_variables_injector_spec.rb