forest_liana 9.15.6 → 9.15.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34a394e776ab9ef99fe30e7e367e834f84e5e0fdf0a2314aaa76ec368dc7f0a3
-  data.tar.gz: 619adc9e67f4d7a9182be43a383a688a7782de23718a3c2e1640cf361386b61d
+  metadata.gz: 196dd946e590abc0f8d08471986655e8bd3244638cb278e91fd9e13ae446dcf4
+  data.tar.gz: 6fc5262c9b202656e03f6f490d0c25776cee50c5af1743705667f06aee69d205
 SHA512:
-  metadata.gz: b56de9223cf035c62a35bd1cebf6a8390ce0887d11818940a8f945ca90295c0d4ad7d7d63e6991378c224f2f3c549ab011e0127cf41b8e2e99a83c9eabf8d559
-  data.tar.gz: db9cf2fa2a26ac1f1d084ffab1046b7cb9d22d1cc4bc4bf36e5dc196ca58792102a2e1d636117d96f50da32f303b4ac57074dd0bf23f8397ccb74523aea97e81
+  metadata.gz: 72a7ce8cca5d0e3d0e3829a5db69120d30c1c99e6ce09a766a00bb9816b52e071c4ed2c8a57879d0ce2e09213bc24b32ee782cd382ec4328af2131baa5b30167
+  data.tar.gz: d78f92c535f06d035ea1eb896621dfc8cb0c9f77001f252b84f594c8f5c58215b57a7bdb7cac5f339f7e7f7612baf506ef94e6a983bcec8f7cd849cedde6072b

data/app/controllers/forest_liana/application_controller.rb

@@ -188,7 +188,11 @@ module ForestLiana
           else
             smart_relations.each do |smart_relation|
               if smart_relation[:field].to_s == relation_name
-                fields[relation_name] = relation_fields
+                if smart_relation[:reference].split('.').first == params[:collection]
+                  fields[relation_name] = relation_fields
+                else
+                  fields[smart_relation[:reference].split('.').first] = relation_fields
+                end
               end
             end
           end

data/app/serializers/forest_liana/serializer_factory.rb

@@ -60,28 +60,20 @@ module ForestLiana
           unformatted_attr_name = serializer.unformat_name(attribute_name).to_sym
           object = nil
           is_collection = false
-          is_valid_attr = false
           if serializer.has_one_relationships.has_key?(unformatted_attr_name)
             # only added this condition
             if root_object.class.reflect_on_association(unformatted_attr_name)&.polymorphic?
               options[:context][:unoptimized] = true
             end
 
-            is_valid_attr = true
             attr_data = serializer.has_one_relationships[unformatted_attr_name]
             object = serializer.has_one_relationship(unformatted_attr_name, attr_data)
           elsif serializer.has_many_relationships.has_key?(unformatted_attr_name)
-            is_valid_attr = true
             is_collection = true
             attr_data = serializer.has_many_relationships[unformatted_attr_name]
             object = serializer.has_many_relationship(unformatted_attr_name, attr_data)
           end
 
-          if !is_valid_attr
-            raise ForestAdmin::JSONAPI::Serializer::InvalidIncludeError.new(
-              "'#{attribute_name}' is not a valid include.")
-          end
-
           if attribute_name != serializer.format_name(attribute_name)
             expected_name = serializer.format_name(attribute_name)
 

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "9.15.6"
+  VERSION = "9.15.8"
 end

data/spec/requests/actions_controller_spec.rb

@@ -606,4 +606,93 @@ describe 'Requesting Actions routes', :type => :request  do
       controller.send(:serialize_models, records, options)
     end
   end
+
+  describe 'fields_per_model method' do
+    let(:model) { Island }
+    let(:collection_name) { 'Island' }
+
+    before do
+      forest_collection = double('forest_collection')
+      allow(ForestLiana).to receive(:apimap).and_return([forest_collection])
+      allow(forest_collection).to receive(:name).and_return(collection_name)
+    end
+
+    context 'with smart relations pointing to external models' do
+      it 'should use reference model name as key for external smart relations' do
+        smart_relations = [
+          {
+            field: :organization,
+            reference: 'Api__OrganizationsView.id',
+            is_virtual: true,
+            is_searchable: false,
+            type: 'String'
+          }
+        ]
+
+        forest_collection = double('forest_collection')
+        allow(forest_collection).to receive(:name).and_return(collection_name)
+        allow(forest_collection).to receive(:fields_smart_belongs_to).and_return(smart_relations)
+        allow(ForestLiana).to receive(:apimap).and_return([forest_collection])
+
+        params_fields = ActionController::Parameters.new({
+                                                           'organization' => 'name'
+                                                         })
+
+        mock_params = ActionController::Parameters.new({
+                                                         collection: 'Island',
+                                                         fields: { 'Island' => 'id,name', 'organization' => 'name'},
+                                                         page: { 'number' => '1', 'size' => '10' },
+                                                         searchExtended: '0',
+                                                         sort: '-id',
+                                                         timezone: 'Europe/Paris'
+                                                       })
+        allow(controller).to receive(:params).and_return(mock_params)
+
+        result = controller.send(:fields_per_model, params_fields, model)
+
+        expect(result).to have_key('Api__OrganizationsView')
+        expect(result['Api__OrganizationsView']).to eq('name')
+        expect(result).not_to have_key('organization')
+      end
+    end
+
+    context 'with smart relations pointing to same collection (self-reference)' do
+      it 'should use relation name as key for self-referencing smart relations' do
+        smart_relations = [
+          {
+            field: :parent_island,
+            reference: 'Island.id',
+            is_virtual: true,
+            is_searchable: false,
+            type: 'String'
+          }
+        ]
+
+        forest_collection = double('forest_collection')
+        allow(forest_collection).to receive(:name).and_return(collection_name)
+        allow(forest_collection).to receive(:fields_smart_belongs_to).and_return(smart_relations)
+        allow(ForestLiana).to receive(:apimap).and_return([forest_collection])
+
+        params_fields = ActionController::Parameters.new({
+                                                           'parent_island' => 'name'
+                                                         })
+
+        mock_params = ActionController::Parameters.new({
+                                                         collection: 'Island',
+                                                         fields: { 'Island' => 'id,name', 'parent_island' => 'name'},
+                                                         page: { 'number' => '1', 'size' => '10' },
+                                                         searchExtended: '0',
+                                                         sort: '-id',
+                                                         timezone: 'Europe/Paris'
+                                                       })
+        allow(controller).to receive(:params).and_return(mock_params)
+
+        result = controller.send(:fields_per_model, params_fields, model)
+
+        expect(result).to have_key('parent_island')
+        expect(result['parent_island']).to eq('name')
+        expect(result).not_to have_key('Island')
+      end
+    end
+  end
 end

data/spec/requests/resources_spec.rb

@@ -167,6 +167,52 @@ describe 'Requesting Tree resources', :type => :request  do
       end
     end
   end
+
+  describe 'csv' do
+    it 'should return CSV with correct headers and data' do
+      params = {
+        fields: { 'Tree' => 'id,name,owner', 'owner' => 'name'},
+        page: { 'number' => '1', 'size' => '10' },
+        searchExtended: '0',
+        sort: '-id',
+        timezone: 'Europe/Paris',
+        header: 'id,name,owner',
+      }
+      get '/forest/Tree.csv', params: params, headers: headers
+
+      expect(response.status).to eq(200)
+      expect(response.headers['Content-Type']).to include('text/csv')
+      expect(response.headers['Content-Disposition']).to include('attachment')
+
+      csv_content = response.body
+      csv_lines = csv_content.split("\n")
+
+      expect(csv_lines.first).to eq(params[:header])
+      expect(csv_lines[1]).to eq('1,Lemon Tree,Michel')
+    end
+
+    it 'returns CSV with only requested fields and ignores optional relation' do
+      params = {
+        fields: { 'Tree' => 'id,name', 'owner' => 'name'},
+        page: { 'number' => '1', 'size' => '10' },
+        searchExtended: '0',
+        sort: '-id',
+        timezone: 'Europe/Paris',
+        header: 'id,name',
+      }
+      get '/forest/Tree.csv', params: params, headers: headers
+
+      expect(response.status).to eq(200)
+      expect(response.headers['Content-Type']).to include('text/csv')
+      expect(response.headers['Content-Disposition']).to include('attachment')
+
+      csv_content = response.body
+      csv_lines = csv_content.split("\n")
+
+      expect(csv_lines.first).to eq(params[:header])
+      expect(csv_lines[1]).to eq('1,Lemon Tree')
+    end
+  end
 end
 
 describe 'Requesting User resources', :type => :request  do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 9.15.6
+  version: 9.15.8
 platform: ruby
 authors:
 - Sandro Munda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-27 00:00:00.000000000 Z
+date: 2025-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails