forest_liana 9.5.7 → 9.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef02f4f1dde4cd777a5716344e1ffe08328870746e34cd4b61fe0494462765f8
-  data.tar.gz: f00356a4fd733f3d08cd317e0f1a74e81ff936c71b6263da013f2f9528e3a5e4
+  metadata.gz: bdddfd71dbc4f9c5ddab069162d5b0ba65c057c6f9e25cda811259e72e1daaa8
+  data.tar.gz: 8213f378007db1ac2663b3143c0e8cc5ca35a63e603c8fb81b2c4bdbbcb7d270
 SHA512:
-  metadata.gz: c7b5c5c600644678f25cac77cbef4ec5e410a1d324638abf00f897f9c9b1f4683ae1f94f9b11a9a643a803881f9160ebc2b6fdad72cab124a3a09a4e38d06475
-  data.tar.gz: 1c20cb1fb9457418ef6aa7d91bb68d842a9d311b484c95be108b6a1b848b74a022e8370cfa3c56685cdae91c550c6ebbbb5031b2a11e357461addd34d66e705c
+  metadata.gz: 1f805f7d8604f9db01bb69a41d6a70d0b30d1baa4897e12cf4d16d2805c915d272cf197111d8102c7d1f543efbd34490399d8d86144840c615b1a02a2cc03e36
+  data.tar.gz: 257e946211ad7b126c99ef5f75e45f2f5e8e073b9c4996294ac1d3fcce1da7fbaa4db06d52284ead53072b3c7585d72a4cc1d7b2a7a3a61f5dfe0c37325c7ca6

data/lib/forest_liana/collection.rb

@@ -80,8 +80,16 @@ module ForestLiana::Collection
 
       field = opts.merge({
         field: name,
-        is_filterable: !!opts[:is_filterable],
-        is_sortable: !!opts[:is_sortable],
+        is_filterable: if opts.has_key?(:is_filterable)
+                        !!opts[:is_filterable]
+                      else
+                        !!opts[:polymorphic_key]
+                      end,
+        is_sortable: if opts.has_key?(:is_sortable)
+                      !!opts[:is_sortable]
+                    else
+                      !!opts[:polymorphic_key]
+                    end
       })
 
       add_field(field)

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "9.5.7"
+  VERSION = "9.6.0"
 end

data/spec/dummy/lib/forest_liana/collections/address.rb

@@ -0,0 +1,17 @@
+class Forest::Address
+    include ForestLiana::Collection
+
+    collection :Address
+
+    field :addressable_type, type: 'String', polymorphic_key: true, is_filterable: false do
+      object.addressable_type
+    end
+
+    field :addressable_id, type: 'String', polymorphic_key: true do
+      object.addressable_type
+    end
+
+    field :address_type, type: 'String' do
+      'delivery'
+    end
+end

data/spec/lib/forest_liana/collection_spec.rb

@@ -0,0 +1,51 @@
+module ForestLiana
+  describe Collection do
+    before do
+      allow(ForestLiana).to receive(:env_secret).and_return(nil)
+    end
+
+    let(:collection) { ForestLiana.apimap.select { |collection| collection.name == 'Address' }.first }
+
+    describe 'field' do
+      it 'add simple smart field' do
+        field = collection.fields.select { |field| field[:field] == :address_type }.first
+
+        expect(field).not_to be_nil
+        expect(field).to eq(
+          {
+            type: "String",
+            is_read_only: true,
+            is_required: false,
+            default_value: nil,
+            integration: nil,
+            reference: nil,
+            inverse_of: nil,
+            relationships: nil,
+            widget: nil,
+            validations: [],
+            is_virtual: true,
+            field: :address_type,
+            is_filterable: false,
+            is_sortable: false
+          }
+        )
+      end
+
+      it 'add polymorphic smart field with default values' do
+        field = collection.fields.select { |field| field[:field] == :addressable_id }.first
+
+        expect(field).not_to be_nil
+        expect(field[:is_filterable]).to eq(true)
+        expect(field[:is_sortable]).to eq(true)
+      end
+
+      it 'add polymorphic smart field with is_filterable option set to false' do
+        field = collection.fields.select { |field| field[:field] == :addressable_type }.first
+
+        expect(field).not_to be_nil
+        expect(field[:is_filterable]).to eq(false)
+        expect(field[:is_sortable]).to eq(true)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 9.5.7
+  version: 9.6.0
 platform: ruby
 authors:
 - Sandro Munda
@@ -395,6 +395,7 @@ files:
 - spec/dummy/db/migrate/20220727114930_add_columns_to_products.rb
 - spec/dummy/db/migrate/20231117084236_create_addresses.rb
 - spec/dummy/db/schema.rb
+- spec/dummy/lib/forest_liana/collections/address.rb
 - spec/dummy/lib/forest_liana/collections/island.rb
 - spec/dummy/lib/forest_liana/collections/location.rb
 - spec/dummy/lib/forest_liana/collections/user.rb
@@ -403,6 +404,7 @@ files:
 - spec/helpers/forest_liana/query_helper_spec.rb
 - spec/helpers/forest_liana/schema_helper_spec.rb
 - spec/lib/forest_liana/bootstrapper_spec.rb
+- spec/lib/forest_liana/collection_spec.rb
 - spec/lib/forest_liana/schema_file_updater_spec.rb
 - spec/rails_helper.rb
 - spec/requests/actions_controller_spec.rb
@@ -696,6 +698,7 @@ test_files:
 - spec/dummy/db/migrate/20220727114930_add_columns_to_products.rb
 - spec/dummy/db/migrate/20231117084236_create_addresses.rb
 - spec/dummy/db/schema.rb
+- spec/dummy/lib/forest_liana/collections/address.rb
 - spec/dummy/lib/forest_liana/collections/island.rb
 - spec/dummy/lib/forest_liana/collections/location.rb
 - spec/dummy/lib/forest_liana/collections/user.rb
@@ -704,6 +707,7 @@ test_files:
 - spec/helpers/forest_liana/query_helper_spec.rb
 - spec/helpers/forest_liana/schema_helper_spec.rb
 - spec/lib/forest_liana/bootstrapper_spec.rb
+- spec/lib/forest_liana/collection_spec.rb
 - spec/lib/forest_liana/schema_file_updater_spec.rb
 - spec/rails_helper.rb
 - spec/requests/actions_controller_spec.rb