schema_validations 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b78d8982bebac58a973056eafde5936834ccca0d4c14d082ce4de1f077a9520
-  data.tar.gz: 929c35cc4a3d93b3442396ed13491b806c2d72915f2125bb16884e65ce4bca9c
+  metadata.gz: 2ab55b81e765e8fb52d2775cdc56d28457a8210770bd78037fc8a05a5c1e3fa0
+  data.tar.gz: a3871e40d193076ad1e8e3144407fa0a87eba01764c96e74d3f35ac8dc61a776
 SHA512:
-  metadata.gz: 10650e92299fcb0d86a864587f50f8337bdac03972d195d46eff628ea6de22323c0ef1d0272e840fd8383f8c032413b47eda302dd56bae8cf0163786b4646a69
-  data.tar.gz: 89b78874b3d66ee0fcde0818677aa6cd00cee09d375e9121e016209c64c40be11e4005cf37ea2694c74810326cc34fc0688236b4e8794fab8fed24cf85d248e2
+  metadata.gz: 452d43d12d06516b2667f601e3b49536a2d4e866a61a9391e2f925cfbbd1ce94b503442fd2cdce092327a93b1ae42c35e789639946680873bd7741a1d105421f
+  data.tar.gz: cb34384da433ae3ddb1a1318b4ad514f72d1b00c2bf6d28a422051b9e872f3f7797c44b10b3333b5845922ef60fd9fe3a242c9b01e40f86c49a007f0dd076566

data/.github/workflows/prs.yml

@@ -22,9 +22,12 @@ jobs:
         - '2.5'
         - '2.7'
         - '3.0'
+        - '3.1'
         activerecord:
         - '5.2'
         - '6.0'
+        - '6.1'
+        - '7.0'
         db:
         - mysql2
         - sqlite3
@@ -34,6 +37,10 @@ jobs:
         exclude:
         - ruby: '3.0'
           activerecord: '5.2'
+        - ruby: '3.1'
+          activerecord: '5.2'
+        - ruby: '2.5'
+          activerecord: '7.0'
         - db: skip
           dbversion: skip
         include:
@@ -45,6 +52,10 @@ jobs:
           activerecord: '6.0'
           db: postgresql
           dbversion: '9.6'
+        - ruby: '2.5'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '9.6'
         - ruby: '2.7'
           activerecord: '5.2'
           db: postgresql
@@ -53,10 +64,38 @@ jobs:
           activerecord: '6.0'
           db: postgresql
           dbversion: '9.6'
+        - ruby: '2.7'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '2.7'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.0'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.0'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '9.6'
         - ruby: '3.0'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.1'
           activerecord: '6.0'
           db: postgresql
           dbversion: '9.6'
+        - ruby: '3.1'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.1'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '9.6'
     env:
       BUNDLE_GEMFILE: "${{ github.workspace }}/gemfiles/activerecord-${{ matrix.activerecord }}/Gemfile.${{ matrix.db }}"
       MYSQL_DB_HOST: 127.0.0.1

data/README.md

@@ -176,9 +176,17 @@ As of version 1.2.0, SchemaValidations supports and is tested on:
 <!-- These lines are auto-generated by schema_dev based on schema_dev.yml -->
 * ruby **2.5** with activerecord **5.2**, using **mysql2**, **postgresql:9.6** or **sqlite3**
 * ruby **2.5** with activerecord **6.0**, using **mysql2**, **postgresql:9.6** or **sqlite3**
+* ruby **2.5** with activerecord **6.1**, using **mysql2**, **postgresql:9.6** or **sqlite3**
 * ruby **2.7** with activerecord **5.2**, using **mysql2**, **postgresql:9.6** or **sqlite3**
 * ruby **2.7** with activerecord **6.0**, using **mysql2**, **postgresql:9.6** or **sqlite3**
+* ruby **2.7** with activerecord **6.1**, using **mysql2**, **postgresql:9.6** or **sqlite3**
+* ruby **2.7** with activerecord **7.0**, using **mysql2**, **postgresql:9.6** or **sqlite3**
 * ruby **3.0** with activerecord **6.0**, using **mysql2**, **postgresql:9.6** or **sqlite3**
+* ruby **3.0** with activerecord **6.1**, using **mysql2**, **postgresql:9.6** or **sqlite3**
+* ruby **3.0** with activerecord **7.0**, using **mysql2**, **postgresql:9.6** or **sqlite3**
+* ruby **3.1** with activerecord **6.0**, using **mysql2**, **postgresql:9.6** or **sqlite3**
+* ruby **3.1** with activerecord **6.1**, using **mysql2**, **postgresql:9.6** or **sqlite3**
+* ruby **3.1** with activerecord **7.0**, using **mysql2**, **postgresql:9.6** or **sqlite3**
 
 <!-- SCHEMA_DEV: MATRIX - end -->
 
@@ -190,6 +198,11 @@ Earlier versions of SchemaValidations supported:
 
 ## Release Notes
 
+### 2.4.1
+
+* Add AR 6.1 and 7.0
+* add ruby 3.1
+
 ### 2.4.0
 
 * Add AR 6.0

data/gemfiles/activerecord-6.1/Gemfile.base

@@ -0,0 +1,4 @@
+base_gemfile = File.expand_path('../../Gemfile.base', __FILE__)
+eval File.read(base_gemfile)
+
+gem "activerecord", ">= 6.1", "< 6.2"

data/gemfiles/activerecord-6.1/Gemfile.mysql2

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "mysql2"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcmysql-adapter'
+end

data/gemfiles/activerecord-6.1/Gemfile.postgresql

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "pg"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcpostgresql-adapter'
+end

data/gemfiles/activerecord-6.1/Gemfile.sqlite3

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "sqlite3"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
+end

data/gemfiles/activerecord-7.0/Gemfile.base

@@ -0,0 +1,4 @@
+base_gemfile = File.expand_path('../../Gemfile.base', __FILE__)
+eval File.read(base_gemfile)
+
+gem "activerecord", ">= 7.0", "< 7.1"

data/gemfiles/activerecord-7.0/Gemfile.mysql2

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "mysql2"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcmysql-adapter'
+end

data/gemfiles/activerecord-7.0/Gemfile.postgresql

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "pg"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcpostgresql-adapter'
+end

data/gemfiles/activerecord-7.0/Gemfile.sqlite3

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "sqlite3"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
+end

data/lib/schema_validations/validators/not_nil_validator.rb

@@ -5,9 +5,15 @@ module SchemaValidations
     # Validates that the field is not nil?
     # (Unlike the standard PresenceValidator which uses #blank?)
     class NotNilValidator < ActiveModel::EachValidator
-      def validate_each(record, attr_name, value)
-        record.errors.add(attr_name, :blank, options) if value.nil?
+      if Gem::Version.new(::ActiveRecord::VERSION::STRING) < Gem::Version.new('6.1')
+        def validate_each(record, attr_name, value)
+          record.errors.add(attr_name, :blank, options) if value.nil?
+        end
+      else
+        def validate_each(record, attr_name, value)
+          record.errors.add(attr_name, :blank, **options) if value.nil?
+        end
       end
     end
   end
-end
+end

data/lib/schema_validations/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SchemaValidations
-  VERSION = "2.4.0"
+  VERSION = "2.4.1"
 end

data/schema_dev.yml

@@ -2,9 +2,12 @@ ruby:
   - 2.5
   - 2.7
   - 3.0
+  - 3.1
 activerecord:
   - 5.2
   - 6.0
+  - 6.1
+  - 7.0
 db:
   - mysql2
   - postgresql

data/schema_validations.gemspec

@@ -21,11 +21,11 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.5'
 
-  gem.add_dependency 'schema_plus_columns', '~> 1.0.0'
-  gem.add_dependency 'activerecord', '>= 5.2', '< 6.1'
+  gem.add_dependency 'schema_plus_columns', '~> 1.0.1'
+  gem.add_dependency 'activerecord', '>= 5.2', '< 7.1'
   gem.add_dependency 'valuable'
 
   gem.add_development_dependency 'rake', '~> 13.0'
   gem.add_development_dependency 'rspec', '~> 3.0'
-  gem.add_development_dependency 'schema_dev', '~> 4.1'
+  gem.add_development_dependency 'schema_dev', '~> 4.2.0'
 end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'simplecov'
-SimpleCov.start
+SimpleCov.start unless SimpleCov.running
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -15,8 +15,6 @@ SchemaDev::Rspec.setup
 
 RSpec.configure do |config|
   config.around(:each) do |example|
-    remove_all_models
-
     ActiveRecord::Migration.suppress_messages do
       example.run
     ensure
@@ -32,14 +30,6 @@ I18n.enforce_available_locales = true
 
 Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each { |f| require f }
 
-def remove_all_models
-  ActiveRecord::Base.descendants.each do |c|
-    next if c == ActiveRecord::InternalMetadata
-    next if c == ActiveRecord::SchemaMigration
-    ActiveSupport::Dependencies.remove_constant c.name
-  end
-end
-
 def define_schema(config={}, &block)
   ActiveRecord::Migration.suppress_messages do
     ActiveRecord::Schema.define do

data/spec/validations_spec.rb

@@ -3,6 +3,15 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Validations" do
+  def stub_model(name, base = ActiveRecord::Base, &block)
+    klass = Class.new(base)
+
+    if block_given?
+      klass.instance_eval(&block)
+    end
+
+    stub_const(name, klass)
+  end
 
   before(:each) do
     define_schema do
@@ -41,15 +50,15 @@ describe "Validations" do
   context "auto-created" do
     before(:each) do
       with_auto_validations do
-        class Article < ActiveRecord::Base ; end
+        stub_model('Article')
 
-        class Review < ActiveRecord::Base
+        stub_model('Review') do
           belongs_to :article
           belongs_to :news_article, class_name: 'Article', foreign_key: :article_id
           schema_validations except: :content
         end
 
-        class ArticleReview < ActiveRecord::Base
+        stub_model('ArticleReview') do
           belongs_to :article
           belongs_to :review
         end
@@ -187,7 +196,7 @@ describe "Validations" do
           end
         end
         with_auto_validations do
-          class AntiNull < ActiveRecord::Base
+          stub_model('AntiNull') do
             def self.all_blank
               @all_blank ||= AntiNull.new(
                 no_default: '',
@@ -244,8 +253,8 @@ describe "Validations" do
   context "auto-created but changed" do
     before(:each) do
       with_auto_validations do
-        class Article < ActiveRecord::Base ; end
-        class Review < ActiveRecord::Base
+        stub_model('Article')
+        stub_model('Review') do
           belongs_to :article
           belongs_to :news_article, class_name: 'Article', foreign_key: :article_id
         end
@@ -314,7 +323,8 @@ describe "Validations" do
     end
 
     before(:each) do
-      class Review < ActiveRecord::Base
+      stub_model('Article')
+      stub_model('Review') do
         belongs_to :article
         belongs_to :news_article, class_name: 'Article', foreign_key: :article_id
       end
@@ -339,10 +349,10 @@ describe "Validations" do
 
   context "manually invoked" do
     before(:each) do
-      class Article < ActiveRecord::Base ; end
+      stub_model('Article')
       Article.schema_validations only: [:title, :state]
 
-      class Review < ActiveRecord::Base
+      stub_model('Review') do
         belongs_to :dummy_association
         schema_validations except: :content
       end
@@ -378,7 +388,7 @@ describe "Validations" do
 
   context "manually invoked" do
     before(:each) do
-      class Review < ActiveRecord::Base
+      stub_model('Review') do
         belongs_to :article
       end
       @columns = Review.content_columns.dup
@@ -399,16 +409,16 @@ describe "Validations" do
     around(:each) { |example| with_auto_validations(&example) }
 
     it "should set validations on base class" do
-      class Review < ActiveRecord::Base ; end
-      class PremiumReview < Review ; end
+      stub_model('Review')
+      stub_model('PremiumReview', Review)
       PremiumReview.new
       expect(Review.new.error_on(:author).size).to eq(1)
     end
 
     it "shouldn't create doubled validations" do
-      class Review < ActiveRecord::Base ; end
+      stub_model('Review')
       Review.new
-      class PremiumReview < Review ; end
+      stub_model('PremiumReview', Review)
       expect(PremiumReview.new.error_on(:author).size).to eq(1)
     end
 
@@ -416,7 +426,7 @@ describe "Validations" do
 
   context "when used with enum" do
     it "does not validate numericality" do
-      class Article < ActiveRecord::Base
+      stub_model('Article') do
         enum state: [:happy, :sad]
       end
       expect(Article.new(valid_article_attributes.merge(state: :happy))).to be_valid
@@ -439,7 +449,7 @@ describe "Validations" do
         end
 
         with_auto_validations do
-          class Book < ActiveRecord::Base; end
+          stub_model('Book') do; end
         end
       end
 
@@ -464,8 +474,8 @@ describe "Validations" do
         end
 
         with_auto_validations do
-          class Folder < ActiveRecord::Base
-            belongs_to :parent, class_name: Folder.name
+          stub_model('Folder') do
+            belongs_to :parent, class_name: 'Folder'
           end
         end
       end
@@ -489,7 +499,7 @@ describe "Validations" do
         end
       end
       with_auto_validations do
-        class Optimistic < ActiveRecord::Base; end
+        stub_model('Optimistic') do; end
       end
     end
     it 'should not crash' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_validations
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-06 00:00:00.000000000 Z
+date: 2022-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: schema_plus_columns
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: valuable
   requirement: !ruby/object:Gem::Requirement
@@ -93,14 +93,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.2.0
 description: SchemaValidations extends ActiveRecord to automatically create validations
   by inspecting the database schema. This makes your models more DRY as you no longer
   need to duplicate NOT NULL, unique, numeric and varchar constraints on the model
@@ -115,7 +115,6 @@ files:
 - ".github/workflows/prs.yml"
 - ".gitignore"
 - ".simplecov"
-- ".travis.yml"
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -129,6 +128,14 @@ files:
 - gemfiles/activerecord-6.0/Gemfile.mysql2
 - gemfiles/activerecord-6.0/Gemfile.postgresql
 - gemfiles/activerecord-6.0/Gemfile.sqlite3
+- gemfiles/activerecord-6.1/Gemfile.base
+- gemfiles/activerecord-6.1/Gemfile.mysql2
+- gemfiles/activerecord-6.1/Gemfile.postgresql
+- gemfiles/activerecord-6.1/Gemfile.sqlite3
+- gemfiles/activerecord-7.0/Gemfile.base
+- gemfiles/activerecord-7.0/Gemfile.mysql2
+- gemfiles/activerecord-7.0/Gemfile.postgresql
+- gemfiles/activerecord-7.0/Gemfile.sqlite3
 - init.rb
 - lib/schema_validations.rb
 - lib/schema_validations/active_record/type.rb
@@ -160,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Automatically creates validations basing on the database schema.

data/.travis.yml

@@ -1,24 +0,0 @@
-# This file was auto-generated by the schema_dev tool, based on the data in
-#                 ./schema_dev.yml
-# Please do not edit this file; any changes will be overwritten next time
-# schema_dev gets run.
----
-sudo: false
-rvm:
-- 2.3.1
-gemfile:
-- gemfiles/activerecord-5.0/Gemfile.mysql2
-- gemfiles/activerecord-5.0/Gemfile.postgresql
-- gemfiles/activerecord-5.0/Gemfile.sqlite3
-- gemfiles/activerecord-5.1/Gemfile.mysql2
-- gemfiles/activerecord-5.1/Gemfile.postgresql
-- gemfiles/activerecord-5.1/Gemfile.sqlite3
-- gemfiles/activerecord-5.2/Gemfile.mysql2
-- gemfiles/activerecord-5.2/Gemfile.postgresql
-- gemfiles/activerecord-5.2/Gemfile.sqlite3
-env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
-addons:
-  postgresql: '9.4'
-before_script: bundle exec rake create_databases
-after_script: bundle exec rake drop_databases
-script: bundle exec rake travis