schema_validations 2.2.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f722b7a85eff3f3def8a6355153476f9801da846
-  data.tar.gz: 1e6eb1107162cd7eb637473d59ebd1d4de2ec33e
+SHA256:
+  metadata.gz: 1b78d8982bebac58a973056eafde5936834ccca0d4c14d082ce4de1f077a9520
+  data.tar.gz: 929c35cc4a3d93b3442396ed13491b806c2d72915f2125bb16884e65ce4bca9c
 SHA512:
-  metadata.gz: b5dfa087e36e5a81ac6f3e38fa6912db50e43785bb0d6c46959d1c48dc1a208cf6108d5eabab8c255a159ca65ed5de5994f6519f039dcca155e3548ad7963534
-  data.tar.gz: 102c7dda2cc81cb0c0dbbc0e5518ee6c14368b365ce34c0181c69405b7521964b764a978b2e3ca598446894d3ee54a01bd8cbfaff3e420a6974c2351db12733a
+  metadata.gz: 10650e92299fcb0d86a864587f50f8337bdac03972d195d46eff628ea6de22323c0ef1d0272e840fd8383f8c032413b47eda302dd56bae8cf0163786b4646a69
+  data.tar.gz: 89b78874b3d66ee0fcde0818677aa6cd00cee09d375e9121e016209c64c40be11e4005cf37ea2694c74810326cc34fc0688236b4e8794fab8fed24cf85d248e2

data/.github/workflows/prs.yml

@@ -0,0 +1,134 @@
+# 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.
+---
+name: CI PR Builds
+'on':
+  push:
+    branches:
+    - master
+  pull_request:
+concurrency:
+  group: ci-${{ github.ref }}
+  cancel-in-progress: true
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+        - '2.5'
+        - '2.7'
+        - '3.0'
+        activerecord:
+        - '5.2'
+        - '6.0'
+        db:
+        - mysql2
+        - sqlite3
+        - skip
+        dbversion:
+        - skip
+        exclude:
+        - ruby: '3.0'
+          activerecord: '5.2'
+        - db: skip
+          dbversion: skip
+        include:
+        - ruby: '2.5'
+          activerecord: '5.2'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '2.5'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '2.7'
+          activerecord: '5.2'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '2.7'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.0'
+          activerecord: '6.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
+      MYSQL_DB_USER: root
+      MYSQL_DB_PASS: database
+      POSTGRESQL_DB_HOST: 127.0.0.1
+      POSTGRESQL_DB_USER: schema_plus_test
+      POSTGRESQL_DB_PASS: database
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: "${{ matrix.ruby }}"
+        bundler-cache: true
+    - name: Run bundle update
+      run: bundle update
+    - name: Start Mysql
+      if: matrix.db == 'mysql2'
+      run: |
+        docker run --rm --detach \
+          -e MYSQL_ROOT_PASSWORD=$MYSQL_DB_PASS \
+          -p 3306:3306 \
+          --health-cmd "mysqladmin ping --host=127.0.0.1 --password=$MYSQL_DB_PASS --silent" \
+          --health-interval 5s \
+          --health-timeout 5s \
+          --health-retries 5 \
+          --name database mysql:5.6
+    - name: Start Postgresql
+      if: matrix.db == 'postgresql'
+      run: |
+        docker run --rm --detach \
+          -e POSTGRES_USER=$POSTGRESQL_DB_USER \
+          -e POSTGRES_PASSWORD=$POSTGRESQL_DB_PASS \
+          -p 5432:5432 \
+          --health-cmd "pg_isready -q" \
+          --health-interval 5s \
+          --health-timeout 5s \
+          --health-retries 5 \
+          --name database postgres:${{ matrix.dbversion }}
+    - name: Wait for database to start
+      if: "(matrix.db == 'postgresql' || matrix.db == 'mysql2')"
+      run: |
+        COUNT=0
+        ATTEMPTS=20
+        until [[ $COUNT -eq $ATTEMPTS ]]; do
+          [ "$(docker inspect -f {{.State.Health.Status}} database)" == "healthy" ] && break
+          echo $(( COUNT++ )) > /dev/null
+          sleep 2
+        done
+    - name: Create testing database
+      if: "(matrix.db == 'postgresql' || matrix.db == 'mysql2')"
+      run: bundle exec rake create_ci_database
+    - name: Run tests
+      run: bundle exec rake spec
+    - name: Shutdown database
+      if: always() && (matrix.db == 'postgresql' || matrix.db == 'mysql2')
+      run: docker stop database
+    - name: Coveralls Parallel
+      if: "${{ !env.ACT }}"
+      uses: coverallsapp/github-action@master
+      with:
+        github-token: "${{ secrets.GITHUB_TOKEN }}"
+        flag-name: run-${{ matrix.ruby }}-${{ matrix.activerecord }}-${{ matrix.db }}-${{ matrix.dbversion }}
+        parallel: true
+  finish:
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+    - name: Coveralls Finished
+      if: "${{ !env.ACT }}"
+      uses: coverallsapp/github-action@master
+      with:
+        github-token: "${{ secrets.GITHUB_TOKEN }}"
+        parallel-finished: true

data/.gitignore

@@ -27,3 +27,4 @@ Gemfile.local
 Gemfile.lock
 gemfiles/*.lock
 gemfiles/**/*.lock
+/.idea

data/.simplecov

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+SimpleCov.configure do
+  enable_coverage :branch
+  add_filter '/spec/'
+
+  add_group 'Binaries', '/bin/'
+  add_group 'Libraries', '/lib/'
+
+  if ENV['CI']
+    require 'simplecov-lcov'
+
+    SimpleCov::Formatter::LcovFormatter.config do |c|
+      c.report_with_single_file = true
+      c.single_report_path = 'coverage/lcov.info'
+    end
+
+    formatter SimpleCov::Formatter::LcovFormatter
+  end
+end

data/.travis.yml

@@ -7,12 +7,15 @@ sudo: false
 rvm:
 - 2.3.1
 gemfile:
-- gemfiles/activerecord-4.2/Gemfile.mysql2
-- gemfiles/activerecord-4.2/Gemfile.postgresql
-- gemfiles/activerecord-4.2/Gemfile.sqlite3
 - 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'

data/Gemfile

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
 source "http://rubygems.org"
 
 gemspec
+
+gemfile_local = File.expand_path '../Gemfile.local', __FILE__
+eval File.read(gemfile_local), binding, gemfile_local if File.exist? gemfile_local

data/README.md

@@ -5,8 +5,8 @@ definitions simpler and more DRY, by automatically defining validations based
 on the database schema.
 
 [![Gem Version](https://badge.fury.io/rb/schema_validations.svg)](http://badge.fury.io/rb/schema_validations)
-[![Build Status](https://secure.travis-ci.org/SchemaPlus/schema_validations.svg)](http://travis-ci.org/SchemaPlus/schema_validations)
-[![Coverage Status](https://coveralls.io/repos/SchemaPlus/schema_validations/badge.svg?branch=master&service=github)](https://coveralls.io/github/SchemaPlus/schema_validations)
+[![Build Status](https://github.com/SchemaPlus/schema_validations/actions/workflows/pr.yml/badge.svg)](http://github.com/SchemaPlus/schema_validations/actions)
+[![Coverage Status](https://coveralls.io/github/SchemaPlus/schema_validations/badge.svg)](https://coveralls.io/github/SchemaPlus/schema_validations)
 
 
 ## Overview
@@ -174,8 +174,11 @@ As of version 1.2.0, SchemaValidations supports and is tested on:
 
 <!-- SCHEMA_DEV: MATRIX - begin -->
 <!-- These lines are auto-generated by schema_dev based on schema_dev.yml -->
-* ruby **2.3.1** with activerecord **4.2**, using **mysql2**, **postgresql** or **sqlite3**
-* ruby **2.3.1** with activerecord **5.0**, using **mysql2**, **postgresql** or **sqlite3**
+* 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.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 **3.0** with activerecord **6.0**, using **mysql2**, **postgresql:9.6** or **sqlite3**
 
 <!-- SCHEMA_DEV: MATRIX - end -->
 
@@ -187,6 +190,23 @@ Earlier versions of SchemaValidations supported:
 
 ## Release Notes
 
+### 2.4.0
+
+* Add AR 6.0
+* Add Ruby 3.0
+* Remove support for AR < 5.2
+* Remove support for Ruby < 2.5
+
+### 2.3.0
+
+* Works with AR 5.1.
+* No longer testing rails 4.2
+
+### 2.2.1
+
+* Bug fix: don't create presence validation for `null: false` with a
+  default defined (#18, #49)
+
 ### 2.2.0
 
 * Works with AR 5.0.  Thanks to [@plicjo](https://github.coms/plicjo).
@@ -273,7 +293,7 @@ Some things to know about to help you develop and test:
 * **schema_dev**:  SchemaValidations uses [schema_dev](https://github.com/SchemaPlus/schema_dev) to
   facilitate running rspec tests on the matrix of ruby, activerecord, and database
   versions that the gem supports, both locally and on
-  [travis-ci](http://travis-ci.org/SchemaPlus/schema_validations)
+  [github actions](https://github.com/SchemaPlus/schema_validations/actions)
 
   To to run rspec locally on the full matrix, do:
 
@@ -285,7 +305,6 @@ Some things to know about to help you develop and test:
   The matrix of configurations is specified in `schema_dev.yml` in
   the project root.
 
-
 <!-- SCHEMA_DEV: TEMPLATE USES SCHEMA_DEV - end -->
 
 Code coverage results will be in coverage/index.html -- it should be at 100% coverage.

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler'
 Bundler::GemHelper.install_tasks
 

data/gemfiles/Gemfile.base

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
-gemspec :path => File.expand_path('..', __FILE__)
+gemspec path: File.expand_path('..', __FILE__)
 
 File.exist?(gemfile_local = File.expand_path('../Gemfile.local', __FILE__)) and eval File.read(gemfile_local), binding, gemfile_local

data/gemfiles/activerecord-5.2/Gemfile.base

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

data/gemfiles/activerecord-5.2/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-5.2/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-5.0 → activerecord-5.2}/Gemfile.sqlite3

@@ -1,5 +1,5 @@
-require "pathname"
-eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
 
 platform :ruby do
   gem "sqlite3"
@@ -7,4 +7,4 @@ end
 
 platform :jruby do
   gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
-end
+end

data/gemfiles/activerecord-6.0/Gemfile.base

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

data/gemfiles/activerecord-6.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-6.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-4.2 → activerecord-6.0}/Gemfile.sqlite3

@@ -1,5 +1,5 @@
-require "pathname"
-eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
 
 platform :ruby do
   gem "sqlite3"
@@ -7,4 +7,4 @@ end
 
 platform :jruby do
   gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
-end
+end

data/init.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'schema_validations' unless defined?(SchemaValidations)

data/lib/schema_validations/active_record/type.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SchemaValidations
   module ActiveRecord
     module Type

data/lib/schema_validations/active_record/validations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SchemaValidations
   module ActiveRecord
     module Base
@@ -123,7 +125,12 @@ module SchemaValidations
               if datatype == :boolean
                 validate_logged :validates_inclusion_of, name, :in => [true, false], :message => :blank
               else
-                validate_logged :validates_presence_of, name
+                if !column.default.nil? && column.default.blank?
+                  validate_logged :validates_with, SchemaValidations::Validators::NotNilValidator, attributes: [name]
+                else
+                  # Validate presence
+                  validate_logged :validates_presence_of, name
+                end
               end
             end
 

data/lib/schema_validations/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SchemaValidations
   class Railtie < Rails::Railtie #:nodoc:
 

data/lib/schema_validations/validators/not_nil_validator.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module SchemaValidations
+  module Validators
+    # 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?
+      end
+    end
+  end
+end

data/lib/schema_validations/version.rb

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

data/lib/schema_validations.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 require 'valuable'
 
 require 'schema_plus_columns'
 require 'schema_validations/version'
+require 'schema_validations/validators/not_nil_validator'
 require 'schema_validations/active_record/validations'
 require 'schema_validations/active_record/type'
 

data/schema_dev.yml

@@ -1,8 +1,10 @@
 ruby:
-  - 2.3.1
+  - 2.5
+  - 2.7
+  - 3.0
 activerecord:
-  - 4.2
-  - 5.0
+  - 5.2
+  - 6.0
 db:
   - mysql2
   - postgresql

data/schema_validations.gemspec

@@ -1,35 +1,31 @@
-# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
+
 $:.push File.expand_path("../lib", __FILE__)
 require "schema_validations/version"
 
-Gem::Specification.new do |s|
-  s.name        = "schema_validations"
-  s.version     = SchemaValidations::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Ronen Barzel", "Michał Łomnicki"]
-  s.email       = ["ronen@barzel.org", "michal.lomnicki@gmail.com"]
-  s.homepage    = "https://github.com/SchemaPlus/schema_validations"
-  s.summary     = "Automatically creates validations basing on the database schema."
-  s.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 level."
-  s.license     = 'MIT'
+Gem::Specification.new do |gem|
+  gem.name        = "schema_validations"
+  gem.version     = SchemaValidations::VERSION
+  gem.platform    = Gem::Platform::RUBY
+  gem.authors     = ["Ronen Barzel", "Michał Łomnicki"]
+  gem.email       = ["ronen@barzel.org", "michal.lomnicki@gmail.com"]
+  gem.homepage    = "https://github.com/SchemaPlus/schema_validations"
+  gem.summary     = "Automatically creates validations basing on the database schema."
+  gem.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 level."
+  gem.license     = 'MIT'
 
-  s.rubyforge_project = "schema_validations"
+  gem.files         = `git ls-files`.split("\n")
+  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.require_paths = ["lib"]
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  gem.required_ruby_version = '>= 2.5'
 
-  s.add_dependency("schema_plus_columns")
-  s.add_dependency("activerecord", ">= 4.2.1", "< 5.1")
-  s.add_dependency("valuable")
+  gem.add_dependency 'schema_plus_columns', '~> 1.0.0'
+  gem.add_dependency 'activerecord', '>= 5.2', '< 6.1'
+  gem.add_dependency 'valuable'
 
-  s.add_development_dependency("schema_dev", "~> 3.6")
-  s.add_development_dependency("rake")
-  s.add_development_dependency("rdoc")
-  s.add_development_dependency("rspec")
-  s.add_development_dependency("simplecov")
-  s.add_development_dependency("simplecov-gem-profile")
-  s.add_development_dependency("database_cleaner")
+  gem.add_development_dependency 'rake', '~> 13.0'
+  gem.add_development_dependency 'rspec', '~> 3.0'
+  gem.add_development_dependency 'schema_dev', '~> 4.1'
 end
-

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 require 'simplecov'
-require 'simplecov-gem-profile'
-SimpleCov.start "gem"
+SimpleCov.start
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -9,26 +10,19 @@ require 'rspec'
 require 'active_record'
 require 'schema_validations'
 require 'schema_dev/rspec'
-require 'database_cleaner'
-DatabaseCleaner.strategy = :truncation
 
 SchemaDev::Rspec.setup
 
 RSpec.configure do |config|
   config.around(:each) do |example|
-    DatabaseCleaner.clean
     remove_all_models
 
-    class ActiveRecord::InternalMetadata
-      def self.create_table
-      end
-
-      def self.[]=(first, second)
-      end
-    end
-
     ActiveRecord::Migration.suppress_messages do
       example.run
+    ensure
+      ActiveRecord::Base.connection.tables.each do |table|
+        ActiveRecord::Migration.drop_table table, force: :cascade
+      end
     end
   end
 end
@@ -36,15 +30,25 @@ end
 # avoid deprecation warnings
 I18n.enforce_available_locales = true
 
-Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
+Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each { |f| require f }
 
 def remove_all_models
-  ObjectSpace.each_object(Class) do |c|
-    next unless c.ancestors.include? ActiveRecord::Base
-    next if c == ActiveRecord::Base
-    next if c.name.blank?
+  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
+      connection.tables.each do |table|
+        drop_table table, force: :cascade
+      end
+      instance_eval &block
+    end
+  end
+end
+
 SimpleCov.command_name "[Ruby #{RUBY_VERSION} - ActiveRecord #{::ActiveRecord::VERSION::STRING}]"

data/spec/support/active_model.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # ported from rspec-rails
 # There is no reason to install whole gem as we
 # need only that tiny helper