declare_schema 2.3.2 → 2.3.3.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b38ba5f14cb9ff014da1baaf10698db6e1ad744aa50804e62c2a958d75f26c47
-  data.tar.gz: 526ab470daae916fcb233fa397d385feef77b7933237219e733db1543bef7184
+  metadata.gz: 97f3a5d50a7212aac5b3688c3e2a20a87d5957f6053d243eb5d2f81b5d2d8f3e
+  data.tar.gz: 635a2bac38835fa207cb7467de27eaf9fb30177e565b306d12644eb3d66a8953
 SHA512:
-  metadata.gz: 18768edfdc06e9562246243d1d91e698545f0dfceefbcd48a29894733a684493e2c521cc782bbd45767d0980479c17657a12bc7ec25242d594ac4851b62925c5
-  data.tar.gz: 760e5374a42726af4a3eb04f3c6063c1266d3384a5c23082d671b0485ce341b58c0ac5cf6726a49b5ddeb73d01cccd8213e81ea64eee1ac19fa219b3bdefb961
+  metadata.gz: 03b085e2c18ed987e5660e1c1cabef1535a68d31d5188ab48abf8c1051c494c19c23a7fe20d23b0d47331d5738f533ee8e8e0b198a706eb932ed8dc66b2233db
+  data.tar.gz: 2d78ff8de5e66d958ec025912260a5f797f3b381d4b02b93cf023f822229e75760b482cebbc825217da877e356fbf01e858997b7f19e770ce8ae67ff01c909a6

data/CHANGELOG.md

@@ -4,6 +4,14 @@ Inspired by [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 Note: this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.3.3] - Unreleased
+### Changed
+- The `timestamps` DSL method to create `created_at` and `updated_at` columns now defaults to `null: false` for `datetime` columns
+- The `timestamps` DSL method to allow additional options to be passed to the `datetime` fields
+
+### Fixed
+- Fixed a bug where `#validate` methods on core object classes with required arguments were cuasing model validations to fail
+
 ## [2.3.2] - 2025-02-21
 ### Fixed
 - Removed require of `activesupport/proxy_object` which is removed in Rails 8.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    declare_schema (2.3.2)
+    declare_schema (2.3.3.pre.1)
       rails (>= 6.0)
 
 GEM

data/lib/declare_schema/dsl.rb

@@ -17,9 +17,9 @@ module DeclareSchema
 
     attr_reader :model
 
-    def timestamps
-      field(:created_at, :datetime, null: true)
-      field(:updated_at, :datetime, null: true)
+    def timestamps(**options)
+      field(:created_at, :datetime, null: false, **options)
+      field(:updated_at, :datetime, null: false, **options)
     end
 
     def optimistic_lock

data/lib/declare_schema/model.rb

@@ -310,7 +310,7 @@ module DeclareSchema
 
         # Support for custom validations
         if (type_class = DeclareSchema.to_class(type))
-          if type_class.public_method_defined?("validate")
+          if type_class.public_method_defined?("validate") && type_class.instance_method("validate").arity.zero?
             validate do |record|
               v = record.send(name)&.validate
               record.errors.add(name, v) if v.is_a?(String)

data/lib/declare_schema/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DeclareSchema
-  VERSION = "2.3.2"
+  VERSION = "2.3.3.pre.1"
 end

data/spec/lib/declare_schema/migration_generator_spec.rb

@@ -471,8 +471,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
 
       expect(Generators::DeclareSchema::Migration::Migrator.run).to(
         migrate_up(<<~EOS.strip)
-          add_column :adverts, :created_at, :datetime, null: true
-          add_column :adverts, :updated_at, :datetime, null: true
+          add_column :adverts, :created_at, :datetime, null: false
+          add_column :adverts, :updated_at, :datetime, null: false
           add_column :adverts, :lock_version, :integer#{lock_version_limit}, null: false, default: 1
         EOS
         .and(migrate_down(<<~EOS.strip))
@@ -486,6 +486,30 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       Advert.field_specs.delete(:created_at)
       Advert.field_specs.delete(:lock_version)
 
+      ### Timestamps with null: true
+
+      # `updated_at` and `created_at` can be declared with the shorthand `timestamps` passed with null: true override
+
+      class Advert < ActiveRecord::Base # rubocop:disable Lint/ConstantDefinitionInBlock
+        declare_schema do
+          timestamps null: true
+        end
+      end
+
+      expect(Generators::DeclareSchema::Migration::Migrator.run).to(
+        migrate_up(<<~EOS.strip)
+          add_column :adverts, :created_at, :datetime, null: true
+          add_column :adverts, :updated_at, :datetime, null: true
+        EOS
+        .and(migrate_down(<<~EOS.strip))
+          remove_column :adverts, :updated_at
+          remove_column :adverts, :created_at
+        EOS
+      )
+
+      Advert.field_specs.delete(:updated_at)
+      Advert.field_specs.delete(:created_at)
+
       ### Indices
 
       # You can add an index to a field definition

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: declare_schema
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3.pre.1
 platform: ruby
 authors:
 - Invoca Development adapted from hobo_fields by Tom Locke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-22 00:00:00.000000000 Z
+date: 2025-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.5.10
+rubygems_version: 3.4.16
 signing_key:
 specification_version: 4
 summary: Database schema declaration and migration generator for Rails