forest_liana 9.16.1 → 9.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5def4c0d7226797a8b932f16749a655b526c6278689417b712866c1eb223a78
-  data.tar.gz: c08d1acf4f8f36a67590b334cd175c76e87deabc47507dd7a57619a7f94302ec
+  metadata.gz: 16bdb91facdb11410af87209603b89aee45670322979b84bcb586a753fe47179
+  data.tar.gz: 0c748d62bc3081e48a2ad46f1c7a27ce133b7e5c2b2eb9e9fa1f5c64c2a6491e
 SHA512:
-  metadata.gz: 63b2d98871047ed88390ba98905430e201c7bf43b94d86d13fa1dd7a3c77ccbc8f0711e6d0f878f93ac48c09d6d3a35db630979690764038e4b85ad6e51b976a
-  data.tar.gz: 134d72f9a8b49d5f3fdf3889eb72fb08f4308ff2645fc97933c7122cffcaf35891b5bff8e3e3fa5de9725381cf9a7142bf5188146db6035048efccab6e7c33dc
+  metadata.gz: 426d29525742b6b53c939838a6db17ccfc40f781fa3ae9bc1e9d085170468944d9487c52c653c5d5ff45ea991303ceb809916c1b6e49389153baf3476026a448
+  data.tar.gz: 1f7db109fff86b8d6ac6bfb53e31aa0a6e2a449a8074243359ece98c69058a4f361aa0ce92f4d632dfd08a0e758e316e70e2b09d446fcfa646d029fe394969c5

data/app/services/forest_liana/schema_adapter.rb

@@ -454,7 +454,31 @@ module ForestLiana
     def add_default_value(column_schema, column)
       # TODO: detect/introspect the attribute default value with Rails 5
       #       ex: attribute :email, :string, default: 'arnaud@forestadmin.com'
-      column_schema[:default_value] = column.default if column.default
+
+      unless column.default.nil?
+        column_schema[:default_value] = normalize_default_value(column)
+      end
+    end
+
+    def normalize_default_value(column)
+      # In Ruby 4.0+ and Rails 8+, ActiveRecord returns default values as strings
+      case column.type
+      when :boolean
+        case column.default.to_s
+        when '0', 'f', 'false'
+          false
+        when '1', 't', 'true'
+          true
+        else
+          column.default
+        end
+      when :integer
+        column.default.to_i
+      when :float, :decimal
+        column.default.to_f
+      else
+        column.default
+      end
     end
 
     def add_validations(column_schema, column)

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "9.16.1"
+  VERSION = "9.17.1"
 end

data/spec/services/forest_liana/schema_adapter_default_values_spec.rb

@@ -0,0 +1,157 @@
+module ForestLiana
+  describe SchemaAdapter do
+    describe 'normalize_default_value' do
+      context 'with boolean fields' do
+        before(:each) do
+          @original_apimap = ForestLiana.apimap.dup
+          @original_models = ForestLiana.models.dup
+
+          Object.const_set(:BooleanFieldWithDefault, Class.new(ActiveRecord::Base) do
+            self.table_name = 'boolean_fields_with_defaults'
+          end)
+
+          ActiveRecord::Migration.suppress_messages do
+            if ActiveRecord::Base.connection.table_exists?('boolean_fields_with_defaults')
+              ActiveRecord::Base.connection.drop_table('boolean_fields_with_defaults')
+            end
+            ActiveRecord::Base.connection.create_table('boolean_fields_with_defaults') do |t|
+              t.boolean :active, default: false
+              t.boolean :verified, default: true
+              t.boolean :nullable
+            end
+          end
+        end
+
+        after(:each) do
+          ForestLiana.apimap = @original_apimap
+          ForestLiana.models = @original_models
+
+          ActiveRecord::Migration.suppress_messages do
+            ActiveRecord::Base.connection.drop_table('boolean_fields_with_defaults') if ActiveRecord::Base.connection.table_exists?('boolean_fields_with_defaults')
+          end
+          Object.send(:remove_const, :BooleanFieldWithDefault) if Object.const_defined?(:BooleanFieldWithDefault)
+        end
+
+        it 'should convert boolean default values to proper booleans' do
+          ForestLiana.models = [BooleanFieldWithDefault]
+          ForestLiana.apimap = []
+
+          adapter = SchemaAdapter.new(BooleanFieldWithDefault)
+          collection = adapter.perform
+
+          active_field = collection.fields.find { |f| f[:field] == 'active' }
+          verified_field = collection.fields.find { |f| f[:field] == 'verified' }
+          nullable_field = collection.fields.find { |f| f[:field] == 'nullable' }
+
+          expect(active_field[:default_value]).to eq(false)
+          expect(active_field[:default_value].class).to eq(FalseClass)
+
+          expect(verified_field[:default_value]).to eq(true)
+          expect(verified_field[:default_value].class).to eq(TrueClass)
+
+          expect(nullable_field[:default_value]).to be_nil
+        end
+      end
+
+      context 'with enum fields' do
+        before(:each) do
+          @original_apimap = ForestLiana.apimap.dup
+          @original_models = ForestLiana.models.dup
+
+          Object.const_set(:EnumFieldModel, Class.new(ActiveRecord::Base) do
+            self.table_name = 'enum_field_models'
+            enum status: { inactive: 0, active: 1, archived: 2 }
+            enum role: { user: "0", admin: "1", superadmin: "2" }
+          end)
+
+          ActiveRecord::Migration.suppress_messages do
+            if ActiveRecord::Base.connection.table_exists?('enum_field_models')
+              ActiveRecord::Base.connection.drop_table('enum_field_models')
+            end
+            ActiveRecord::Base.connection.create_table('enum_field_models') do |t|
+              t.integer :status, default: 0
+              t.integer :role, default: 1
+            end
+          end
+        end
+
+        after(:each) do
+          ForestLiana.apimap = @original_apimap
+          ForestLiana.models = @original_models
+
+          ActiveRecord::Migration.suppress_messages do
+            ActiveRecord::Base.connection.drop_table('enum_field_models') if ActiveRecord::Base.connection.table_exists?('enum_field_models')
+          end
+          Object.send(:remove_const, :EnumFieldModel) if Object.const_defined?(:EnumFieldModel)
+        end
+
+        it 'should convert enum default values to integers' do
+          ForestLiana.models = [EnumFieldModel]
+          ForestLiana.apimap = []
+
+          adapter = SchemaAdapter.new(EnumFieldModel)
+          collection = adapter.perform
+
+          status_field = collection.fields.find { |f| f[:field] == 'status' }
+          role_field = collection.fields.find { |f| f[:field] == 'role' }
+
+          expect(status_field[:default_value]).to eq(0)
+          expect(status_field[:default_value].class).to eq(Integer)
+
+          expect(role_field[:default_value]).to eq(1)
+          expect(role_field[:default_value].class).to eq(Integer)
+        end
+      end
+
+      context 'with numeric fields' do
+        before(:each) do
+          @original_apimap = ForestLiana.apimap.dup
+          @original_models = ForestLiana.models.dup
+
+          Object.const_set(:NumericFieldModel, Class.new(ActiveRecord::Base) do
+            self.table_name = 'numeric_field_models'
+          end)
+
+          ActiveRecord::Migration.suppress_messages do
+            if ActiveRecord::Base.connection.table_exists?('numeric_field_models')
+              ActiveRecord::Base.connection.drop_table('numeric_field_models')
+            end
+            ActiveRecord::Base.connection.create_table('numeric_field_models') do |t|
+              t.integer :count, default: 0
+              t.float :rate, default: 0.5
+              t.decimal :price, default: 9.99
+            end
+          end
+        end
+
+        after(:each) do
+          ForestLiana.apimap = @original_apimap
+          ForestLiana.models = @original_models
+
+          ActiveRecord::Migration.suppress_messages do
+            ActiveRecord::Base.connection.drop_table('numeric_field_models') if ActiveRecord::Base.connection.table_exists?('numeric_field_models')
+          end
+          Object.send(:remove_const, :NumericFieldModel) if Object.const_defined?(:NumericFieldModel)
+        end
+
+        it 'should convert numeric default values to proper types' do
+          ForestLiana.models = [NumericFieldModel]
+          ForestLiana.apimap = []
+
+          adapter = SchemaAdapter.new(NumericFieldModel)
+          collection = adapter.perform
+
+          count_field = collection.fields.find { |f| f[:field] == 'count' }
+          rate_field = collection.fields.find { |f| f[:field] == 'rate' }
+          price_field = collection.fields.find { |f| f[:field] == 'price' }
+
+          expect(count_field[:default_value]).to eq(0)
+          expect(count_field[:default_value].class).to eq(Integer)
+
+          expect(rate_field[:default_value]).to be_a(Float)
+          expect(price_field[:default_value]).to be_a(Float)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 9.16.1
+  version: 9.17.1
 platform: ruby
 authors:
 - Sandro Munda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-05 00:00:00.000000000 Z
+date: 2026-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -192,6 +192,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Forest is a modern admin interface that works on all major web frameworks.
   forest_liana is the gem that makes Forest admin work on any Rails application (Rails
   >= 4.0).
@@ -433,6 +461,7 @@ files:
 - spec/services/forest_liana/resource_updater_spec.rb
 - spec/services/forest_liana/resources_getter_composite_keys_spec.rb
 - spec/services/forest_liana/resources_getter_spec.rb
+- spec/services/forest_liana/schema_adapter_default_values_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
@@ -741,6 +770,7 @@ test_files:
 - spec/services/forest_liana/resource_updater_spec.rb
 - spec/services/forest_liana/resources_getter_composite_keys_spec.rb
 - spec/services/forest_liana/resources_getter_spec.rb
+- spec/services/forest_liana/schema_adapter_default_values_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