declare_schema 1.4.0 → 1.5.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a00635546beea8512ef5678ea8d182612f6a6e5b099d6a13c4287e52312e8490
-  data.tar.gz: f5ba19f1fd2dc5d3c66923dda796e413f4a3bcd4586764b254c4345602ebb984
+  metadata.gz: 9389b7ee742afb3976a2eb8468ab59f37782cdf1b60c75e64e0cd999aa12ae8b
+  data.tar.gz: 778b052b3107291f4305af5eb62798d5a3f30d931a936fdaa957f8016871d1a9
 SHA512:
-  metadata.gz: 4cd37d8cf76460b9af36e1f05c7e5c42f370eae8fec0936e563a6dcd74e7176d1d8c66e6fa464d7e58429be220be0dbb5b6a7f5bf7c19dfb0ff834e53771e806
-  data.tar.gz: '0870d0173821829d81c8033fda33921c8de00f7b1ec5aa2b9da56fb15b7d73b716a14058be0dc2ad595bc2bf2a6b9b66c8cdcbb612dd91fd21d88c0992b0e057'
+  metadata.gz: 53d80c7f261bf5e646478556ae721ee6beecf8aa98446e768292aac9f6a53ec5f3270f580095aadacc8aa7a3ad60510e9589cc2dafb6756ee14770c0a86df113
+  data.tar.gz: dcd96a0d62da5dc3ffc4a2f48443b93b8991053fedd3a179ba6953f08b2801c649ffc893915a7fa77c75d1ffb74f8f5b468094f6e0c645b86a92dd91caaddd75

data/.github/workflows/declare_schema_build.yml

@@ -10,10 +10,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.7, '3.0', 3.1, 3.2]
+        ruby: ['3.0', 3.1, 3.2, 3.3]
         gemfile:
-        - gemfiles/rails_6_mysql.gemfile
-        - gemfiles/rails_6_sqlite.gemfile
+        - gemfiles/rails_6_1_mysql2.gemfile
+        - gemfiles/rails_6_1_sqlite3.gemfile
+        - gemfiles/rails_7_0_mysql2.gemfile
+        - gemfiles/rails_7_0_sqlite3.gemfile
+        - gemfiles/rails_7_1_mysql2.gemfile
+        - gemfiles/rails_7_1_sqlite3.gemfile
+        exclude:
+        - ruby: 3.3
+          gemfile: gemfiles/rails_6_1_mysql2.gemfile
+        - ruby: 3.3
+          gemfile: gemfiles/rails_6_1_sqlite3.gemfile
 
     env:
       BUNDLE_GEMFILE: "${{ matrix.gemfile }}"

data/Appraisals

@@ -1,12 +1,30 @@
 # frozen_string_literal: true
 
-appraise 'rails-6-sqlite' do
-  gem 'rails', '~> 6.1'
-  gem 'sqlite3'
+require 'json'
+require 'open-uri'
+
+MIN_RAILS_VERSION = Gem::Version.new('6.1.0')
+DB_ADAPTERS = {
+  sqlite3: '~> 1.4',
+  mysql2:  '~> 0.5',
+}.freeze
+
+rails_versions_to_test = Set.new
+
+URI.parse('https://rubygems.org/api/v1/versions/rails.json').open do |raw_version_data|
+  JSON.parse(raw_version_data.read).each do |version_data|
+    version = Gem::Version.new(version_data['number'])
+
+    rails_versions_to_test << version.segments[0..1].join('.') if version >= MIN_RAILS_VERSION && !version.prerelease?
+  end
 end
 
-appraise 'rails-6-mysql' do
-  gem 'rails', '~> 6.1'
-  gem 'mysql2'
-  remove_gem 'sqlite3'
+rails_versions_to_test.each do |version|
+  DB_ADAPTERS.each do |adapter, adapter_version|
+    appraise "rails-#{version.gsub('.', '_')}-#{adapter}" do
+      gem 'rails', "~> #{version}.0"
+      remove_gem 'sqlite3' # To make sure that the adapter only exists when we're testing against sqlite3
+      gem adapter, adapter_version
+    end
+  end
 end

data/CHANGELOG.md

@@ -4,6 +4,11 @@ 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).
 
+## [1.5.0] - Unreleased
+### Added
+- Added support for Rails 7.0 and 7.1
+- Add support for automatic enum scopes for each value in the `:limit` array
+
 ## [1.4.0] - 2024-01-24
 ### Added
 - Added support for partial indexes with `length:` option.

data/Gemfile.lock

@@ -1,98 +1,98 @@
 PATH
   remote: .
   specs:
-    declare_schema (1.4.0)
+    declare_schema (1.5.0.pre.1)
       rails (>= 5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.7.4)
-      actionpack (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    actioncable (6.1.7.7)
+      actionpack (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.7.4)
-      actionpack (= 6.1.7.4)
-      activejob (= 6.1.7.4)
-      activerecord (= 6.1.7.4)
-      activestorage (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    actionmailbox (6.1.7.7)
+      actionpack (= 6.1.7.7)
+      activejob (= 6.1.7.7)
+      activerecord (= 6.1.7.7)
+      activestorage (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
       mail (>= 2.7.1)
-    actionmailer (6.1.7.4)
-      actionpack (= 6.1.7.4)
-      actionview (= 6.1.7.4)
-      activejob (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    actionmailer (6.1.7.7)
+      actionpack (= 6.1.7.7)
+      actionview (= 6.1.7.7)
+      activejob (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.7.4)
-      actionview (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    actionpack (6.1.7.7)
+      actionview (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.7.4)
-      actionpack (= 6.1.7.4)
-      activerecord (= 6.1.7.4)
-      activestorage (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    actiontext (6.1.7.7)
+      actionpack (= 6.1.7.7)
+      activerecord (= 6.1.7.7)
+      activestorage (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
       nokogiri (>= 1.8.5)
-    actionview (6.1.7.4)
-      activesupport (= 6.1.7.4)
+    actionview (6.1.7.7)
+      activesupport (= 6.1.7.7)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.7.4)
-      activesupport (= 6.1.7.4)
+    activejob (6.1.7.7)
+      activesupport (= 6.1.7.7)
       globalid (>= 0.3.6)
-    activemodel (6.1.7.4)
-      activesupport (= 6.1.7.4)
-    activerecord (6.1.7.4)
-      activemodel (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
-    activestorage (6.1.7.4)
-      actionpack (= 6.1.7.4)
-      activejob (= 6.1.7.4)
-      activerecord (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    activemodel (6.1.7.7)
+      activesupport (= 6.1.7.7)
+    activerecord (6.1.7.7)
+      activemodel (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
+    activestorage (6.1.7.7)
+      actionpack (= 6.1.7.7)
+      activejob (= 6.1.7.7)
+      activerecord (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.7.4)
+    activesupport (6.1.7.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    appraisal (2.4.1)
+    appraisal (2.5.0)
       bundler
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
-    bootsnap (1.16.0)
+    bootsnap (1.18.3)
       msgpack (~> 1.2)
     builder (3.2.4)
     byebug (11.1.3)
     climate_control (0.2.0)
     coderay (1.1.3)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     crass (1.0.6)
-    date (3.3.3)
-    diff-lcs (1.5.0)
+    date (3.3.4)
+    diff-lcs (1.5.1)
     erubi (1.12.0)
-    ffi (1.15.5)
-    globalid (1.1.0)
-      activesupport (>= 5.0)
-    i18n (1.14.1)
+    ffi (1.16.3)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    json (2.6.3)
+    json (2.7.2)
     language_server-protocol (3.17.0.3)
-    listen (3.8.0)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.21.3)
+    loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -100,27 +100,27 @@ GEM
       net-imap
       net-pop
       net-smtp
-    marcel (1.0.2)
-    method_source (1.0.0)
-    mini_mime (1.1.2)
-    mini_portile2 (2.8.2)
-    minitest (5.18.1)
-    msgpack (1.7.1)
-    net-imap (0.3.6)
+    marcel (1.0.4)
+    method_source (1.1.0)
+    mini_mime (1.1.5)
+    mini_portile2 (2.8.6)
+    minitest (5.22.3)
+    msgpack (1.7.2)
+    net-imap (0.4.11)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.2.1)
+    net-protocol (0.2.2)
       timeout
-    net-smtp (0.3.3)
+    net-smtp (0.5.0)
       net-protocol
-    nio4r (2.5.9)
-    nokogiri (1.15.2)
+    nio4r (2.7.3)
+    nokogiri (1.16.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    parallel (1.23.0)
-    parser (3.2.2.3)
+    parallel (1.24.0)
+    parser (3.3.1.0)
       ast (~> 2.4.1)
       racc
     pry (0.14.2)
@@ -129,94 +129,94 @@ GEM
     pry-byebug (3.10.1)
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
-    racc (1.7.1)
-    rack (2.2.7)
+    racc (1.7.3)
+    rack (2.2.9)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (6.1.7.4)
-      actioncable (= 6.1.7.4)
-      actionmailbox (= 6.1.7.4)
-      actionmailer (= 6.1.7.4)
-      actionpack (= 6.1.7.4)
-      actiontext (= 6.1.7.4)
-      actionview (= 6.1.7.4)
-      activejob (= 6.1.7.4)
-      activemodel (= 6.1.7.4)
-      activerecord (= 6.1.7.4)
-      activestorage (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    rails (6.1.7.7)
+      actioncable (= 6.1.7.7)
+      actionmailbox (= 6.1.7.7)
+      actionmailer (= 6.1.7.7)
+      actionpack (= 6.1.7.7)
+      actiontext (= 6.1.7.7)
+      actionview (= 6.1.7.7)
+      activejob (= 6.1.7.7)
+      activemodel (= 6.1.7.7)
+      activerecord (= 6.1.7.7)
+      activestorage (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
       bundler (>= 1.15.0)
-      railties (= 6.1.7.4)
+      railties (= 6.1.7.7)
       sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.1.1)
+    rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (6.1.7.4)
-      actionpack (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    railties (6.1.7.7)
+      actionpack (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
     rainbow (3.1.1)
-    rake (13.0.6)
+    rake (13.2.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    regexp_parser (2.8.1)
-    responders (3.1.0)
+    regexp_parser (2.9.1)
+    responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.2.5)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rexml (3.2.6)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.5)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
-    rubocop (1.54.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.63.5)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.3)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
-      parser (>= 3.2.1.0)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
     ruby-progressbar (1.13.0)
-    sprockets (4.2.0)
+    sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
     sprockets-rails (3.4.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.6.3)
+    sqlite3 (1.7.3)
       mini_portile2 (~> 2.8.0)
-    thor (1.2.2)
-    timeout (0.4.0)
+    thor (1.3.1)
+    timeout (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.4.2)
-    websocket-driver (0.7.5)
+    unicode-display_width (2.5.0)
+    websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    yard (0.9.34)
-    zeitwerk (2.6.8)
+    yard (0.9.36)
+    zeitwerk (2.6.13)
 
 PLATFORMS
   ruby

data/Rakefile

@@ -29,7 +29,7 @@ namespace "test" do
   task :prepare_testapp, :force do |_t, args|
     if args.force || !File.directory?(TESTAPP_PATH)
       FileUtils.remove_entry_secure(TESTAPP_PATH, true)
-      sh %(#{BIN} new #{TESTAPP_PATH} --skip-wizard --skip-bundle)
+      sh %(#{BIN} new #{TESTAPP_PATH} --skip-wizard --skip-bundle --api)
       FileUtils.chdir(TESTAPP_PATH)
       begin
         require 'mysql2'
@@ -51,7 +51,7 @@ namespace "test" do
       sh "echo '' > app/models/.gitignore" # because git reset --hard would rm the dir
       rm ".gitignore" # we need to reset everything in a testapp
       sh "git init && git add . && git commit -nm \"initial commit\""
-      sh "rake db:create"
+      sh "bin/rails db:create"
       puts "The testapp has been created in '#{TESTAPP_PATH}'"
     else
       FileUtils.chdir(TESTAPP_PATH)

data/gemfiles/{rails_6_mysql.gemfile → rails_6_1_mysql2.gemfile}

@@ -8,12 +8,12 @@ gem "mail"
 gem "net-smtp"
 gem "pry"
 gem "pry-byebug"
-gem "rails", "~> 6.1"
+gem "rails", "~> 6.1.0"
 gem "responders"
 gem "rspec"
 gem "rubocop"
 gem "yard"
-gem "mysql2"
+gem "mysql2", "~> 0.5"
 
 group :testapp do
   gem "bootsnap", ">= 1.1.0", require: false

data/gemfiles/rails_6_1_sqlite3.gemfile

@@ -0,0 +1,23 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "climate_control", "~> 0.2"
+gem "mail"
+gem "net-smtp"
+gem "pry"
+gem "pry-byebug"
+gem "rails", "~> 6.1.0"
+gem "responders"
+gem "rspec"
+gem "rubocop"
+gem "yard"
+gem "sqlite3", "~> 1.4"
+
+group :testapp do
+  gem "bootsnap", ">= 1.1.0", require: false
+  gem "listen"
+end
+
+gemspec path: "../"

data/gemfiles/{rails_6_sqlite.gemfile → rails_7_0_mysql2.gemfile}

@@ -8,12 +8,12 @@ gem "mail"
 gem "net-smtp"
 gem "pry"
 gem "pry-byebug"
-gem "rails", "~> 6.1"
+gem "rails", "~> 7.0.0"
 gem "responders"
 gem "rspec"
 gem "rubocop"
 gem "yard"
-gem "sqlite3"
+gem "mysql2", "~> 0.5"
 
 group :testapp do
   gem "bootsnap", ">= 1.1.0", require: false

data/gemfiles/rails_7_0_sqlite3.gemfile

@@ -0,0 +1,23 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "climate_control", "~> 0.2"
+gem "mail"
+gem "net-smtp"
+gem "pry"
+gem "pry-byebug"
+gem "rails", "~> 7.0.0"
+gem "responders"
+gem "rspec"
+gem "rubocop"
+gem "yard"
+gem "sqlite3", "~> 1.4"
+
+group :testapp do
+  gem "bootsnap", ">= 1.1.0", require: false
+  gem "listen"
+end
+
+gemspec path: "../"

data/gemfiles/rails_7_1_mysql2.gemfile

@@ -0,0 +1,23 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "climate_control", "~> 0.2"
+gem "mail"
+gem "net-smtp"
+gem "pry"
+gem "pry-byebug"
+gem "rails", "~> 7.1.0"
+gem "responders"
+gem "rspec"
+gem "rubocop"
+gem "yard"
+gem "mysql2", "~> 0.5"
+
+group :testapp do
+  gem "bootsnap", ">= 1.1.0", require: false
+  gem "listen"
+end
+
+gemspec path: "../"

data/gemfiles/rails_7_1_sqlite3.gemfile

@@ -0,0 +1,23 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "climate_control", "~> 0.2"
+gem "mail"
+gem "net-smtp"
+gem "pry"
+gem "pry-byebug"
+gem "rails", "~> 7.1.0"
+gem "responders"
+gem "rspec"
+gem "rubocop"
+gem "yard"
+gem "sqlite3", "~> 1.4"
+
+group :testapp do
+  gem "bootsnap", ">= 1.1.0", require: false
+  gem "listen"
+end
+
+gemspec path: "../"

data/lib/declare_schema/model.rb

@@ -99,6 +99,7 @@ module DeclareSchema
         _add_formatting_for_field(name, type)
         _add_validations_for_field(name, type, args, options)
         _add_index_for_field(name, args, **options)
+        _add_scopes_for_field(name, type, **options)
         field_specs[name] = ::DeclareSchema::Model::FieldSpec.new(self, name, type, position: field_specs.size, **options)
         attr_order << name unless attr_order.include?(name)
       end
@@ -263,9 +264,13 @@ module DeclareSchema
       # unlike the `primary_key` method, DOES NOT query the database to find the actual primary key in use right now
       # if no explicit primary key set, returns the _default_declared_primary_key
       def _declared_primary_key
-        if defined?(@primary_key)
+        if !defined?(@primary_key) ||
+           (ActiveSupport.version >= Gem::Version.new('7.1.0') &&
+             @primary_key == ActiveRecord::AttributeMethods::PrimaryKey::ClassMethods::PRIMARY_KEY_NOT_SET)
+          _default_declared_primary_key
+        else
           @primary_key&.to_s
-        end || _default_declared_primary_key
+        end
       end
 
       private
@@ -314,6 +319,16 @@ module DeclareSchema
         end
       end
 
+      def _add_scopes_for_field(field_name, field_type, options)
+        if field_type == :enum && options[:scopes]
+          scope_prefix = options[:scopes].is_a?(Hash) ? options[:scopes][:prefix] : nil
+          options[:limit].each do |enum_value|
+            scope_name = scope_prefix ? "#{scope_prefix}_#{enum_value}" : enum_value
+            scope scope_name, -> { where(field_name => enum_value) }
+          end
+        end
+      end
+
       def _add_serialize_for_field(name, type, options)
         if (serialize_class = options.delete(:serialize))
           type == :string || type == :text or raise ArgumentError, "serialize field type must be :string or :text"

data/lib/declare_schema/version.rb

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

data/lib/generators/declare_schema/migration/migration_generator.rb

@@ -94,18 +94,7 @@ module DeclareSchema
     private
 
     def migrations_pending?
-      migrations = case ActiveSupport::VERSION::MAJOR
-                   when 5
-                     ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths).migrations
-                   else
-                     ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths, ActiveRecord::SchemaMigration).migrations
-                   end
-      pending_migrations = case ActiveSupport::VERSION::MAJOR
-                           when 5
-                             ActiveRecord::Migrator.new(:up, migrations).pending_migrations
-                           else
-                             ActiveRecord::Migrator.new(:up, migrations, ActiveRecord::SchemaMigration).pending_migrations
-                           end
+      pending_migrations = load_pending_migrations
 
       pending_migrations.any?.tap do |any|
         if any
@@ -117,6 +106,36 @@ module DeclareSchema
       end
     end
 
+    def load_migrations
+      if ActiveSupport.version >= Gem::Version.new('7.1.0')
+        ActiveRecord::MigrationContext.new(
+          ActiveRecord::Migrator.migrations_paths,
+          ActiveRecord::Base.connection.schema_migration,
+          ActiveRecord::Base.connection.internal_metadata
+        ).migrations
+      elsif ActiveSupport.version >= Gem::Version.new('6.0.0')
+        ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths, ActiveRecord::SchemaMigration).migrations
+      else # Rails 5.2 and earlier
+        ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths).migrations
+      end
+    end
+
+    def load_pending_migrations
+      migrations = load_migrations
+      if ActiveSupport.version >= Gem::Version.new('7.1.0')
+        ActiveRecord::Migrator.new(
+          :up,
+          migrations,
+          ActiveRecord::Base.connection.schema_migration,
+          ActiveRecord::Base.connection.internal_metadata
+        ).pending_migrations
+      elsif ActiveSupport.version >= Gem::Version.new('6.0.0')
+        ActiveRecord::Migrator.new(:up, migrations, ActiveRecord::SchemaMigration).pending_migrations
+      else # Rails 5.2 and earlier
+        ActiveRecord::Migrator.new(:up, migrations).pending_migrations
+      end
+    end
+
     def extract_renames!(to_create, to_drop, kind_str, name_prefix = "")
       to_rename = {}
 

data/spec/lib/declare_schema/generator_spec.rb

@@ -19,13 +19,23 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       end
     EOS
 
-    expect_model_definition_to_eq('alpha', <<~EOS)
-      module Alpha
-        def self.table_name_prefix
-          'alpha_'
+    if ActiveSupport::VERSION::MAJOR >= 7
+      expect_model_definition_to_eq('alpha', <<~EOS)
+        module Alpha
+          def self.table_name_prefix
+            "alpha_"
+          end
         end
-      end
-    EOS
+      EOS
+    else
+      expect_model_definition_to_eq('alpha', <<~EOS)
+        module Alpha
+          def self.table_name_prefix
+            'alpha_'
+          end
+        end
+      EOS
+    end
 
     case ActiveSupport::VERSION::MAJOR
     when 5
@@ -88,7 +98,11 @@ RSpec.describe 'DeclareSchema Migration Generator' do
     expect(File.exist?('db/schema.rb')).to be_truthy
 
     if defined?(SQLite3)
-      expect(File.exist?("db/development.sqlite3") || File.exist?("db/test.sqlite3")).to be_truthy
+      if ActiveSupport.version >= Gem::Version.new('7.1.0')
+        expect(File.exist?("storage/development.sqlite3") || File.exist?("storage/test.sqlite3")).to be_truthy
+      else
+        expect(File.exist?("db/development.sqlite3") || File.exist?("db/test.sqlite3")).to be_truthy
+      end
     end
 
     module Alpha; end

data/spec/lib/declare_schema/migration_generator_spec.rb

@@ -30,7 +30,9 @@ RSpec.describe 'DeclareSchema Migration Generator' do
     end
   end
   let(:datetime_precision) do
-    if defined?(Mysql2)
+    if ActiveSupport::VERSION::MAJOR >= 7
+      ', precision: 6'
+    elsif defined?(Mysql2)
       ', precision: 0'
     end
   end
@@ -860,21 +862,39 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       end
 
       expect(Generators::DeclareSchema::Migration::Migrator.run).to(
-        migrate_up(<<~EOS.strip)
-          create_table :advertisers, id: :bigint#{create_table_charset_and_collation} do |t|
-            t.string :name, limit: 250, null: false#{charset_and_collation}
-          end
-          create_table :advertisers_creatives, primary_key: [:advertiser_id, :creative_id]#{create_table_charset_and_collation} do |t|
-            t.integer :advertiser_id, limit: 8, null: false
-            t.integer :creative_id, limit: 8, null: false
-          end
-          create_table :creatives, id: :bigint#{create_table_charset_and_collation} do |t|
-            t.string :url, limit: 500, null: false#{charset_and_collation}
-          end
-          add_index :advertisers_creatives, [:creative_id], name: :index_advertisers_creatives_on_creative_id
-          add_foreign_key :advertisers_creatives, :advertisers, column: :advertiser_id, name: :advertisers_creatives_FK1
-          add_foreign_key :advertisers_creatives, :creatives, column: :creative_id, name: :advertisers_creatives_FK2
-      EOS
+        if ActiveSupport.version >= Gem::Version.new('7.0.0') && Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
+          migrate_up(<<~EOS.strip)
+            create_table :advertisers_creatives, primary_key: [:advertiser_id, :creative_id]#{create_table_charset_and_collation} do |t|
+              t.integer :advertiser_id, limit: 8, null: false
+              t.integer :creative_id, limit: 8, null: false
+            end
+            create_table :creatives, id: :bigint#{create_table_charset_and_collation} do |t|
+              t.string :url, limit: 500, null: false#{charset_and_collation}
+            end
+            create_table :advertisers, id: :bigint#{create_table_charset_and_collation} do |t|
+              t.string :name, limit: 250, null: false#{charset_and_collation}
+            end
+            add_index :advertisers_creatives, [:creative_id], name: :index_advertisers_creatives_on_creative_id
+            add_foreign_key :advertisers_creatives, :advertisers, column: :advertiser_id, name: :advertisers_creatives_FK1
+            add_foreign_key :advertisers_creatives, :creatives, column: :creative_id, name: :advertisers_creatives_FK2
+          EOS
+        else
+          migrate_up(<<~EOS.strip)
+            create_table :advertisers, id: :bigint#{create_table_charset_and_collation} do |t|
+              t.string :name, limit: 250, null: false#{charset_and_collation}
+            end
+            create_table :advertisers_creatives, primary_key: [:advertiser_id, :creative_id]#{create_table_charset_and_collation} do |t|
+              t.integer :advertiser_id, limit: 8, null: false
+              t.integer :creative_id, limit: 8, null: false
+            end
+            create_table :creatives, id: :bigint#{create_table_charset_and_collation} do |t|
+              t.string :url, limit: 500, null: false#{charset_and_collation}
+            end
+            add_index :advertisers_creatives, [:creative_id], name: :index_advertisers_creatives_on_creative_id
+            add_foreign_key :advertisers_creatives, :advertisers, column: :advertiser_id, name: :advertisers_creatives_FK1
+            add_foreign_key :advertisers_creatives, :creatives, column: :creative_id, name: :advertisers_creatives_FK2
+          EOS
+        end
       )
 
       nuke_model_class(Ad)
@@ -905,23 +925,43 @@ RSpec.describe 'DeclareSchema Migration Generator' do
 
       it 'will generate unique constraint names' do
         expect(Generators::DeclareSchema::Migration::Migrator.run).to(
-          migrate_up(<<~EOS.strip)
-            create_table :categories, id: :bigint, options: "CHARACTER SET utf8mb4 COLLATE utf8mb4_bin" do |t|
-              t.string :name, limit: 250, null: true, charset: "utf8mb4", collation: "utf8mb4_bin"
-            end
-            create_table :advertisers, id: :bigint, options: "CHARACTER SET utf8mb4 COLLATE utf8mb4_bin" do |t|
-              t.string  :name, limit: 250, null: true, charset: "utf8mb4", collation: "utf8mb4_bin"
-              t.integer :category_id, limit: 8, null: false
-            end
-            create_table :affiliates, id: :bigint, options: "CHARACTER SET utf8mb4 COLLATE utf8mb4_bin" do |t|
-              t.string  :name, limit: 250, null: true, charset: "utf8mb4", collation: "utf8mb4_bin"
-              t.integer :category_id, limit: 8, null: false
-            end
-            add_index :advertisers, [:category_id], name: :index_advertisers_on_category_id
-            add_index :affiliates, [:category_id], name: :index_affiliates_on_category_id
-            add_foreign_key :advertisers, :categories, column: :category_id, name: :index_advertisers_on_category_id
-            add_foreign_key :affiliates, :categories, column: :category_id, name: :index_affiliates_on_category_id
-        EOS
+          if ActiveSupport.version >= Gem::Version.new('7.0.0') && Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
+            migrate_up(<<~EOS.strip)
+              create_table :affiliates, id: :bigint, options: "CHARACTER SET utf8mb4 COLLATE utf8mb4_bin" do |t|
+                t.string  :name, limit: 250, null: true, charset: "utf8mb4", collation: "utf8mb4_bin"
+                t.integer :category_id, limit: 8, null: false
+              end
+              create_table :advertisers, id: :bigint, options: "CHARACTER SET utf8mb4 COLLATE utf8mb4_bin" do |t|
+                t.string  :name, limit: 250, null: true, charset: "utf8mb4", collation: "utf8mb4_bin"
+                t.integer :category_id, limit: 8, null: false
+              end
+              create_table :categories, id: :bigint, options: "CHARACTER SET utf8mb4 COLLATE utf8mb4_bin" do |t|
+                t.string :name, limit: 250, null: true, charset: "utf8mb4", collation: "utf8mb4_bin"
+              end
+              add_index :affiliates, [:category_id], name: :index_affiliates_on_category_id
+              add_index :advertisers, [:category_id], name: :index_advertisers_on_category_id
+              add_foreign_key :affiliates, :categories, column: :category_id, name: :index_affiliates_on_category_id
+              add_foreign_key :advertisers, :categories, column: :category_id, name: :index_advertisers_on_category_id
+            EOS
+          else
+            migrate_up(<<~EOS.strip)
+              create_table :categories, id: :bigint, options: "CHARACTER SET utf8mb4 COLLATE utf8mb4_bin" do |t|
+                t.string :name, limit: 250, null: true, charset: "utf8mb4", collation: "utf8mb4_bin"
+              end
+              create_table :advertisers, id: :bigint, options: "CHARACTER SET utf8mb4 COLLATE utf8mb4_bin" do |t|
+                t.string  :name, limit: 250, null: true, charset: "utf8mb4", collation: "utf8mb4_bin"
+                t.integer :category_id, limit: 8, null: false
+              end
+              create_table :affiliates, id: :bigint, options: "CHARACTER SET utf8mb4 COLLATE utf8mb4_bin" do |t|
+                t.string  :name, limit: 250, null: true, charset: "utf8mb4", collation: "utf8mb4_bin"
+                t.integer :category_id, limit: 8, null: false
+              end
+              add_index :advertisers, [:category_id], name: :index_advertisers_on_category_id
+              add_index :affiliates, [:category_id], name: :index_affiliates_on_category_id
+              add_foreign_key :advertisers, :categories, column: :category_id, name: :index_advertisers_on_category_id
+              add_foreign_key :affiliates, :categories, column: :category_id, name: :index_affiliates_on_category_id
+            EOS
+          end
         )
         migrate
 

data/spec/lib/generators/declare_schema/migration/migrator_spec.rb

@@ -6,6 +6,7 @@ rescue LoadError
 end
 require 'rails'
 require 'rails/generators'
+require 'generators/declare_schema/migration/migrator'
 
 module Generators
   module DeclareSchema

data/spec/spec_helper.rb

@@ -39,11 +39,15 @@ RSpec.configure do |config|
   end
 
   def nuke_model_class(klass)
-    ActiveSupport::DescendantsTracker.instance_eval do
-      direct_descendants = class_variable_get('@@direct_descendants')
-      direct_descendants[ActiveRecord::Base] = direct_descendants[ActiveRecord::Base].to_a.reject { |descendant| descendant == klass }
-      if defined?(ApplicationRecord)
-        direct_descendants[ApplicationRecord] = direct_descendants[ApplicationRecord].to_a.reject { |descendant| descendant == klass }
+    if ActiveSupport.version >= Gem::Version.new('7.1.0') || (ActiveSupport.version >= Gem::Version.new('7.0.0') && Class.method_defined?(:subclasses))
+      ActiveSupport::DescendantsTracker.clear([klass])
+    else
+      ActiveSupport::DescendantsTracker.instance_eval do
+        direct_descendants = class_variable_get('@@direct_descendants')
+        direct_descendants[ActiveRecord::Base] = direct_descendants[ActiveRecord::Base].to_a.reject { |descendant| descendant == klass }
+        if defined?(ApplicationRecord)
+          direct_descendants[ApplicationRecord] = direct_descendants[ApplicationRecord].to_a.reject { |descendant| descendant == klass }
+        end
       end
     end
     Object.instance_eval { remove_const(klass.name.to_sym) rescue nil }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: declare_schema
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0.pre.1
 platform: ruby
 authors:
 - Invoca Development adapted from hobo_fields by Tom Locke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-25 00:00:00.000000000 Z
+date: 2024-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -50,8 +50,12 @@ files:
 - config/brakeman.ignore
 - declare_schema.gemspec
 - gemfiles/.bundle/config
-- gemfiles/rails_6_mysql.gemfile
-- gemfiles/rails_6_sqlite.gemfile
+- gemfiles/rails_6_1_mysql2.gemfile
+- gemfiles/rails_6_1_sqlite3.gemfile
+- gemfiles/rails_7_0_mysql2.gemfile
+- gemfiles/rails_7_0_sqlite3.gemfile
+- gemfiles/rails_7_1_mysql2.gemfile
+- gemfiles/rails_7_1_sqlite3.gemfile
 - lib/declare_schema.rb
 - lib/declare_schema/command.rb
 - lib/declare_schema/dsl.rb
@@ -141,7 +145,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