Minimum Ruby and Rails versions are updated

.github/workflows/ci.yml

@@ -15,8 +15,8 @@ jobs:
 
       matrix:
         include:
-          - ruby: '3.0'
-            gemfile: rails70
+          - ruby: '3.2'
+            gemfile: rails72
           - ruby: '3.4'
             gemfile: rails80
           - ruby: '4.0'

.rubocop.yml

@@ -6,7 +6,7 @@ AllCops:
   NewCops: disable
   SuggestExtensions: false
   DisplayCopNames: true
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.2
   Include:
     - '**/*.rb'
     - 'Gemfile'

CHANGELOG.md

@@ -4,7 +4,8 @@
 ### Improvements
 
 - Add Rails 8.1 support
-- Set minimum Ruby version to 3.0
+- Set minimum Ruby version to 3.2 and minimum Rails version to 7.2
+- Remove Rails 5 compatibility code
 - Loosen gemspec development dependency version constraints
 - Modernize CI configuration and add dedicated RuboCop workflow
 - Consolidate database configuration into `config/database.yml`

database_validations.gemspec

@@ -19,9 +19,9 @@ and ActiveRecord validations with better performance and consistency."
   spec.license       = 'MIT'
   spec.files         = Dir['lib/**/*']
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 3.0.0'
+  spec.required_ruby_version = '>= 3.2.0'
 
-  spec.add_dependency 'activerecord', '>= 7.0.0'
+  spec.add_dependency 'activerecord', '>= 7.2.0'
 
   spec.add_development_dependency 'benchmark-ips'
   spec.add_development_dependency 'bundler'

gemfiles/rails72.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 7.2.0'
+
+gemspec path: '../'

lib/database_validations/lib/validators/db_presence_validator.rb

@@ -1,6 +1,6 @@
 module DatabaseValidations
   class DbPresenceValidator < ActiveRecord::Validations::PresenceValidator
-    REFLECTION_MESSAGE = ActiveRecord::VERSION::MAJOR < 5 ? :blank : :required
+    REFLECTION_MESSAGE = :required
 
     attr_reader :klass
 
@@ -53,11 +53,7 @@ def validates_db_presence_of(*attr_names)
     end
 
     def db_belongs_to(name, scope = nil, **options)
-      if ActiveRecord::VERSION::MAJOR < 5
-        options[:required] = false
-      else
-        options[:optional] = true
-      end
+      options[:optional] = true
 
       belongs_to(name, scope, **options)
 

lib/database_validations/rspec/uniqueness_validator_matcher.rb

@@ -63,15 +63,13 @@
       end
     end
 
-    case_sensitive_default = ActiveRecord::VERSION::MAJOR >= 6 ? nil : true
-
     @validators.include?(
       field: field,
       scope: Array.wrap(@scope),
       where: @where,
       message: @message,
       index_name: @index_name,
-      case_sensitive: @case_sensitive.nil? ? case_sensitive_default : @case_sensitive
+      case_sensitive: @case_sensitive.nil? ? nil : @case_sensitive
     )
   end
 

spec/spec_helper.rb

@@ -4,9 +4,6 @@
 require 'db-query-matchers'
 require_relative '../config/database_config'
 
-# Use this constant to enable Rails 5+ compatible specs
-RAILS_5 = ActiveRecord::VERSION::MAJOR >= 5
-
 DBQueryMatchers.configure do |config|
   config.schemaless = true
 end

spec/validations/db_belongs_to_spec.rb

@@ -15,11 +15,7 @@ def name
         'BelongsToUserTemp'
       end
 
-      if RAILS_5
-        belongs_to :company, optional: false
-      else
-        belongs_to :company, required: true
-      end
+      belongs_to :company, optional: false
     end
   end
 
@@ -29,11 +25,7 @@ def name
         'BelongsToUserWithFKTemp'
       end
 
-      if RAILS_5
-        belongs_to :company, optional: false
-      else
-        belongs_to :company, required: true
-      end
+      belongs_to :company, optional: false
     end
   end
 
@@ -108,26 +100,22 @@ def define_tables
     describe 'save' do
       include_examples 'pack', :save
 
-      if RAILS_5
-        it 'respects validate: false' do
-          expect { belongs_to_user_with_fk_klass.new(company_id: -1).save(validate: false) }
-            .to raise_error(ActiveRecord::InvalidForeignKey)
-          expect { db_belongs_to_user_klass.new(company_id: -1).save(validate: false) }
-            .to raise_error(ActiveRecord::InvalidForeignKey)
-        end
+      it 'respects validate: false' do
+        expect { belongs_to_user_with_fk_klass.new(company_id: -1).save(validate: false) }
+          .to raise_error(ActiveRecord::InvalidForeignKey)
+        expect { db_belongs_to_user_klass.new(company_id: -1).save(validate: false) }
+          .to raise_error(ActiveRecord::InvalidForeignKey)
       end
     end
 
     describe 'save!' do
       include_examples 'pack', :save!
 
-      if RAILS_5
-        it 'respects validate: false' do
-          expect { belongs_to_user_with_fk_klass.new(company_id: -1).save!(validate: false) }
-            .to raise_error(ActiveRecord::InvalidForeignKey)
-          expect { db_belongs_to_user_klass.new(company_id: -1).save!(validate: false) }
-            .to raise_error(ActiveRecord::InvalidForeignKey)
-        end
+      it 'respects validate: false' do
+        expect { belongs_to_user_with_fk_klass.new(company_id: -1).save!(validate: false) }
+          .to raise_error(ActiveRecord::InvalidForeignKey)
+        expect { db_belongs_to_user_klass.new(company_id: -1).save!(validate: false) }
+          .to raise_error(ActiveRecord::InvalidForeignKey)
       end
     end
 

spec/validations/validates_db_uniqueness_of_spec.rb

@@ -26,7 +26,7 @@
           old = app_uniqueness.new(persisted_attrs).tap(&:valid?)
 
           expect(old.errors.messages.sort).to eq(new.errors.messages.sort)
-          RAILS_5 && (expect(old.errors.details.sort).to eq(new.errors.details.sort))
+          expect(old.errors.details.sort).to eq(new.errors.details.sort)
         end
 
         context 'when wrapped by transaction' do
@@ -40,7 +40,7 @@
             end
 
             expect(old.errors.messages.sort).to eq(new.errors.messages.sort)
-            RAILS_5 && (expect(old.errors.details.sort).to eq(new.errors.details.sort))
+            expect(old.errors.details.sort).to eq(new.errors.details.sort)
           end
         end
       end
@@ -55,15 +55,13 @@
             .and not_change(parent_class, :count)
         end
 
-        if RAILS_5
-          it 'respects validate: false' do
-            expect { db_uniqueness.new(persisted_attrs).save(validate: false) }
-              .to raise_error(ActiveRecord::RecordNotUnique)
-              .and not_change(parent_class, :count)
-            expect { app_uniqueness.new(persisted_attrs).save(validate: false) }
-              .to raise_error(ActiveRecord::RecordNotUnique)
-              .and not_change(parent_class, :count)
-          end
+        it 'respects validate: false' do
+          expect { db_uniqueness.new(persisted_attrs).save(validate: false) }
+            .to raise_error(ActiveRecord::RecordNotUnique)
+            .and not_change(parent_class, :count)
+          expect { app_uniqueness.new(persisted_attrs).save(validate: false) }
+            .to raise_error(ActiveRecord::RecordNotUnique)
+            .and not_change(parent_class, :count)
         end
 
         # Database raise only one unique constraint error per query
@@ -73,10 +71,10 @@
           old = app_uniqueness.create(persisted_attrs)
 
           expect(new.errors.messages).to be_present
-          RAILS_5 && (expect(new.errors.details).to be_present)
+          expect(new.errors.details).to be_present
 
           expect(old.errors.messages.to_h).to include(new.errors.messages.to_h)
-          RAILS_5 && (expect(old.errors.details.to_h).to include(new.errors.details.to_h))
+          expect(old.errors.details.to_h).to include(new.errors.details.to_h)
         end
 
         context 'when wrapped by transaction' do
@@ -90,10 +88,10 @@
             end
 
             expect(new.errors.messages).to be_present
-            RAILS_5 && (expect(new.errors.details).to be_present)
+            expect(new.errors.details).to be_present
 
             expect(old.errors.messages.to_h).to include(new.errors.messages.to_h)
-            RAILS_5 && (expect(old.errors.details.to_h).to include(new.errors.details.to_h))
+            expect(old.errors.details.to_h).to include(new.errors.details.to_h)
           end
         end
       end
@@ -111,15 +109,13 @@
             .and not_change(parent_class, :count)
         end
 
-        if RAILS_5
-          it 'respects validate: false' do
-            expect { db_uniqueness.new(persisted_attrs).save!(validate: false) }
-              .to raise_error(ActiveRecord::RecordNotUnique)
-              .and not_change(parent_class, :count)
-            expect { app_uniqueness.new(persisted_attrs).save!(validate: false) }
-              .to raise_error(ActiveRecord::RecordNotUnique)
-              .and not_change(parent_class, :count)
-          end
+        it 'respects validate: false' do
+          expect { db_uniqueness.new(persisted_attrs).save!(validate: false) }
+            .to raise_error(ActiveRecord::RecordNotUnique)
+            .and not_change(parent_class, :count)
+          expect { app_uniqueness.new(persisted_attrs).save!(validate: false) }
+            .to raise_error(ActiveRecord::RecordNotUnique)
+            .and not_change(parent_class, :count)
         end
 
         def catch_error_message
@@ -473,7 +469,7 @@ def catch_error_message
 
         it "doesn't rescue from the constraint violation" do
           expect_any_instance_of(ActiveRecord::Validations::UniquenessValidator) # rubocop:disable RSpec/AnyInstance
-            .to receive(:scope_relation).twice.and_return(RAILS_5 ? app_uniqueness.none : '1=0')
+            .to receive(:scope_relation).twice.and_return(app_uniqueness.none)
 
           expect { app_uniqueness.create(persisted_attrs) }
             .to raise_error(ActiveRecord::RecordNotUnique)
@@ -831,8 +827,6 @@ def catch_error_message
   end
 
   shared_examples 'supports complex indexes' do
-    next unless RAILS_5
-
     context 'with index_name option' do
       let(:app_uniqueness) { define_class { validates_uniqueness_of :field, case_sensitive: false } }
       let(:db_uniqueness) { define_class { validates_db_uniqueness_of :field, index_name: :unique_index, case_sensitive: false } }