declare_schema 2.3.1 → 2.3.3.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32cd73e09d5530729bfef42e4277d229d3688c826a8f8c28575175508fe023ee
-  data.tar.gz: 8ce537e1883effbb466242547580c2de3db9ca87064b1ae6a778a3422a3e5f61
+  metadata.gz: 97f3a5d50a7212aac5b3688c3e2a20a87d5957f6053d243eb5d2f81b5d2d8f3e
+  data.tar.gz: 635a2bac38835fa207cb7467de27eaf9fb30177e565b306d12644eb3d66a8953
 SHA512:
-  metadata.gz: 51a55ba1f327ba291d5b0efece8fa168520ebfd91cd984dad9a4a36cb6b9abfa03379563ff170969124d31e09fd908e2de29c3cb0f9ae8ee4fa840a11c0d3e03
-  data.tar.gz: f869a73076a408d5b229d125f59d64af06fc7d1908f6e139fd1a032559a9f6e9476ec3bef93bab43190e264f1f05e35e310c390c14eb990b541ee7944c7d5612
+  metadata.gz: 03b085e2c18ed987e5660e1c1cabef1535a68d31d5188ab48abf8c1051c494c19c23a7fe20d23b0d47331d5738f533ee8e8e0b198a706eb932ed8dc66b2233db
+  data.tar.gz: 2d78ff8de5e66d958ec025912260a5f797f3b381d4b02b93cf023f822229e75760b482cebbc825217da877e356fbf01e858997b7f19e770ce8ae67ff01c909a6

data/.github/workflows/{declare_schema_build.yml → pipeline.yml}

@@ -4,39 +4,25 @@ on: [push]
 name: DeclareSchema Build
 
 jobs:
-  build:
+  tests:
     name: DeclareSchema Build
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         adapter: [mysql, postgresql, sqlite3]
-        ruby: ['3.0', 3.1, 3.2, 3.3]
+        ruby: [3.1, 3.2, 3.3, 3.4]
         gemfile:
-        - gemfiles/rails_6_1.gemfile
         - gemfiles/rails_7_0.gemfile
         - gemfiles/rails_7_1.gemfile
         - gemfiles/rails_7_2.gemfile
+        - gemfiles/rails_8_0.gemfile
         exclude:
-        - adapter: mysql
-          ruby: 3.3
-          gemfile: gemfiles/rails_6_1.gemfile
-        - adapter: postgresql
-          ruby: 3.3
-          gemfile: gemfiles/rails_6_1.gemfile
+        - ruby: 3.1
+          gemfile: gemfiles/rails_8_0.gemfile
+        # TODO: Support SQLite3 with Rails 8.0
         - adapter: sqlite3
-          ruby: 3.3
-          gemfile: gemfiles/rails_6_1.gemfile
-        - adapter: mysql
-          ruby: '3.0'
-          gemfile: gemfiles/rails_7_2.gemfile
-        - adapter: postgresql
-          ruby: '3.0'
-          gemfile: gemfiles/rails_7_2.gemfile
-        - adapter: sqlite3
-          ruby: '3.0'
-          gemfile: gemfiles/rails_7_2.gemfile
-
+          gemfile: gemfiles/rails_8_0.gemfile
     env:
       BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
       MYSQL_HOST: 127.0.0.1

data/Appraisals

@@ -3,7 +3,7 @@
 require 'json'
 require 'open-uri'
 
-MIN_RAILS_VERSION = Gem::Version.new('6.1.0')
+MIN_RAILS_VERSION = Gem::Version.new('7.0.0')
 
 rails_versions_to_test = Set.new
 

data/CHANGELOG.md

@@ -4,7 +4,19 @@ 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.1] - Unreleased
+## [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
+
+## [2.3.1] - 2024-12-10
 ### Fixed
 - Fixed bug where a new model with `belongs_to :owner, polymorphic: true` would cause
   a "Mysql2::Error: Table '<new table>' doesn't exist:" exception when generating a migration.

data/Gemfile

@@ -26,3 +26,10 @@ gem 'yard'
 gem 'mysql2',  '~> 0.5'
 gem 'pg',      '~> 1.1'
 gem 'sqlite3', '~> 1.4'
+
+
+gem "concurrent-ruby", "~> 1.3", "< 1.3.5"
+
+gem "base64", ">= 0.2.0"
+gem "bigdecimal", ">= 3.1"
+gem "mutex_m", ">= 0.3.0"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    declare_schema (2.3.1)
+    declare_schema (2.3.3.pre.1)
       rails (>= 6.0)
 
 GEM
@@ -71,6 +71,8 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
+    base64 (0.2.0)
+    bigdecimal (3.1.9)
     bootsnap (1.18.4)
       msgpack (~> 1.2)
     builder (3.3.0)
@@ -106,6 +108,7 @@ GEM
     mini_portile2 (2.8.7)
     minitest (5.25.0)
     msgpack (1.7.2)
+    mutex_m (0.3.0)
     mysql2 (0.5.6)
     net-imap (0.4.14)
       date
@@ -228,11 +231,15 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal
+  base64 (>= 0.2.0)
+  bigdecimal (>= 3.1)
   bootsnap (>= 1.1.0)
   climate_control (~> 0.2)
+  concurrent-ruby (~> 1.3, < 1.3.5)
   declare_schema!
   listen
   mail
+  mutex_m (>= 0.3.0)
   mysql2 (~> 0.5)
   net-smtp
   pg (~> 1.1)

data/catalog-info.yaml

@@ -26,6 +26,8 @@ metadata:
   - open-source
   - gem
   - executable
+  - public
+  - rails-dependent
   description: Declare your Rails/active_record model schemas and have database migrations
     generated for you!
 spec:

data/gemfiles/rails_7_0.gemfile

@@ -17,6 +17,10 @@ gem "yard"
 gem "mysql2", "~> 0.5"
 gem "pg", "~> 1.1"
 gem "sqlite3", "~> 1.4"
+gem "concurrent-ruby", "~> 1.3", "< 1.3.5"
+gem "base64", ">= 0.2.0"
+gem "bigdecimal", ">= 3.1"
+gem "mutex_m", ">= 0.3.0"
 
 group :testapp do
   gem "bootsnap", ">= 1.1.0", require: false

data/gemfiles/rails_7_1.gemfile

@@ -17,6 +17,10 @@ gem "yard"
 gem "mysql2", "~> 0.5"
 gem "pg", "~> 1.1"
 gem "sqlite3", "~> 1.4"
+gem "concurrent-ruby", "~> 1.3", "< 1.3.5"
+gem "base64", ">= 0.2.0"
+gem "bigdecimal", ">= 3.1"
+gem "mutex_m", ">= 0.3.0"
 
 group :testapp do
   gem "bootsnap", ">= 1.1.0", require: false

data/gemfiles/rails_7_2.gemfile

@@ -17,6 +17,10 @@ gem "yard"
 gem "mysql2", "~> 0.5"
 gem "pg", "~> 1.1"
 gem "sqlite3", "~> 1.4"
+gem "concurrent-ruby", "~> 1.3", "< 1.3.5"
+gem "base64", ">= 0.2.0"
+gem "bigdecimal", ">= 3.1"
+gem "mutex_m", ">= 0.3.0"
 
 group :testapp do
   gem "bootsnap", ">= 1.1.0", require: false

data/gemfiles/{rails_6_1.gemfile → rails_8_0.gemfile}

@@ -8,7 +8,7 @@ gem "mail"
 gem "net-smtp"
 gem "pry"
 gem "pry-byebug"
-gem "rails", "~> 6.1.0"
+gem "rails", "~> 8.0.0"
 gem "responders"
 gem "rspec"
 gem "rspec-its"
@@ -17,6 +17,10 @@ gem "yard"
 gem "mysql2", "~> 0.5"
 gem "pg", "~> 1.1"
 gem "sqlite3", "~> 1.4"
+gem "concurrent-ruby", "~> 1.3", "< 1.3.5"
+gem "base64", ">= 0.2.0"
+gem "bigdecimal", ">= 3.1"
+gem "mutex_m", ">= 0.3.0"
 
 group :testapp do
   gem "bootsnap", ">= 1.1.0", require: false

data/lib/declare_schema/dsl.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'active_support/proxy_object'
-
 module DeclareSchema
   class Dsl < BasicObject # avoid Object because that gets extended by lots of gems
     include ::Kernel      # but we need the basic class methods
@@ -19,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/field_declaration_dsl.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'active_support/proxy_object'
-
 module DeclareSchema
   class FieldDeclarationDsl < BasicObject # avoid Object because that gets extended by lots of gems
     include ::Kernel                      # but we need the basic class methods

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.1"
+  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
@@ -899,7 +923,12 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       end
       up, _down = Generators::DeclareSchema::Migration::Migrator.run
       ActiveRecord::Migration.class_eval(up)
-      expect(Ad.field_specs['company'].options[:validates].inspect).to eq("{:presence=>true, :uniqueness=>{:case_sensitive=>false}}")
+
+      if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.4")
+        expect(Ad.field_specs['company'].options[:validates].inspect).to eq("{:presence=>true, :uniqueness=>{:case_sensitive=>false}}")
+      else
+        expect(Ad.field_specs['company'].options[:validates].inspect).to eq("{presence: true, uniqueness: {case_sensitive: false}}")
+      end
 
       # DeclareSchema supports has_and_belongs_to_many relationships and generates the intersection ("join") table
       # with appropriate primary key, indexes, and foreign keys.

data/spec/lib/declare_schema/model/table_options_definition_spec.rb

@@ -24,7 +24,11 @@ RSpec.describe DeclareSchema::Model::TableOptionsDefinition do
 
       describe '#to_key' do
         subject { model.to_key }
-        it { is_expected.to eq(['table_options_definition_test_models', "{:charset=>#{charset.inspect}, :collation=>#{collation.inspect}}"]) }
+        if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.4")
+          it { is_expected.to eq(['table_options_definition_test_models', "{:charset=>#{charset.inspect}, :collation=>#{collation.inspect}}"]) }
+        else
+          it { is_expected.to eq(['table_options_definition_test_models', "{charset: #{charset.inspect}, collation: #{collation.inspect}}"]) }
+        end
       end
 
       describe '#settings' do
@@ -56,7 +60,11 @@ RSpec.describe DeclareSchema::Model::TableOptionsDefinition do
 
       describe '#hash' do
         subject { model.hash }
-        it { is_expected.to eq(['table_options_definition_test_models', "{:charset=>#{charset.inspect}, :collation=>#{collation.inspect}}"].hash) }
+        if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.4")
+          it { is_expected.to eq(['table_options_definition_test_models', "{:charset=>#{charset.inspect}, :collation=>#{collation.inspect}}"].hash) }
+        else
+          it { is_expected.to eq(['table_options_definition_test_models', "{charset: #{charset.inspect}, collation: #{collation.inspect}}"].hash) }
+        end
       end
 
       describe '#to_s' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: declare_schema
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.3.pre.1
 platform: ruby
 authors:
 - Invoca Development adapted from hobo_fields by Tom Locke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-11 00:00:00.000000000 Z
+date: 2025-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -37,8 +37,8 @@ files:
 - ".devcontainer/devcontainer.json"
 - ".devcontainer/docker-compose.yml"
 - ".github/CODEOWNERS"
-- ".github/workflows/declare_schema_build.yml"
 - ".github/workflows/gem_release.yml"
+- ".github/workflows/pipeline.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -57,10 +57,10 @@ files:
 - config/brakeman.ignore
 - declare_schema.gemspec
 - gemfiles/.bundle/config
-- gemfiles/rails_6_1.gemfile
 - gemfiles/rails_7_0.gemfile
 - gemfiles/rails_7_1.gemfile
 - gemfiles/rails_7_2.gemfile
+- gemfiles/rails_8_0.gemfile
 - lib/declare_schema.rb
 - lib/declare_schema/command.rb
 - lib/declare_schema/dsl.rb
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.16
 signing_key:
 specification_version: 4
 summary: Database schema declaration and migration generator for Rails