validates_by_schema 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a44382b4c751d51c6056b9eae1daed6f8eedfe8040383fe38ce717beafc2c84d
-  data.tar.gz: 553ffe11b1a3c83f6c2f1126954d691553465492f7f3820f6530b14a48675971
+  metadata.gz: 6877c59f4c23593b7c11bb834b7ab9cc6cede8bf24a66fb6b3aef6d6d7d8ca20
+  data.tar.gz: 3c5bcafcfcaa8b2cf6b902fb2c93e85cdc550fe03c740939b9eeb7f1251b4ae0
 SHA512:
-  metadata.gz: b404ea525a570681cc76d936755f6f6fbc89a310e8409d0480161a2a9aad11e1c803445c30b0cf03ce951d02ae63f614715e48c3a9bfde80455e5cec4b293c71
-  data.tar.gz: a7b24d0fe512674063b0c055f155b5cd608661fcf284634399354c6d63a3acfbf7fba6e9de335ea5e55e25765cedc8bda60505879aa7d9a09f96a3e828ebadba
+  metadata.gz: 692c60647d11664e68d00bdbc7d2a7567277722d3cd95a8a8d608426e7b1d492863301c60ad7e9ffb267af171cdecef22753687cf165e0c68de91c29cfc2768a
+  data.tar.gz: 7c96d752cb3f58938e4ae17ff81900d77cf3f6d6a7f76bf320169e5a4136bac62ba87026b1f2f31e03aa4f9279c31e21ac72652eddc4b7259d4ddeeaa1da3f2c

data/README.md

@@ -1,9 +1,9 @@
 # Validates By Schema (validates_by_schema)
 
-[![Gem Version](http://img.shields.io/gem/v/validates_by_schema.svg?style=flat)](https://rubygems.org/gems/validates_by_schema)
-[![Build Status](http://img.shields.io/github/workflow/status/joshwlewis/validates_by_schema/Build?style=flat)](https://github.com/joshwlewis/validates_by_schema/actions/workflows/build.yml)
-[![Coverage Status](http://img.shields.io/coveralls/joshwlewis/validates_by_schema.svg?style=flat)](https://coveralls.io/r/joshwlewis/validates_by_schema)
-[![Code Climate](http://img.shields.io/codeclimate/maintainability/joshwlewis/validates_by_schema.svg?style=flat)](https://codeclimate.com/github/joshwlewis/validates_by_schema)
+[![Gem Version](https://img.shields.io/gem/v/validates_by_schema.svg?style=flat)](https://rubygems.org/gems/validates_by_schema)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/joshwlewis/validates_by_schema/build.yml?style=flat)](https://github.com/joshwlewis/validates_by_schema/actions/workflows/build.yml)
+[![Coverage Status](https://img.shields.io/coveralls/joshwlewis/validates_by_schema.svg?style=flat)](https://coveralls.io/r/joshwlewis/validates_by_schema)
+[![Code Climate](https://img.shields.io/codeclimate/maintainability/joshwlewis/validates_by_schema.svg?style=flat)](https://codeclimate.com/github/joshwlewis/validates_by_schema)
 
 Automatic validation based on your database schema column types and limits. Keep your code DRY by inferring column validations from table properties!
 

data/lib/validates_by_schema/validation_option.rb

@@ -1,11 +1,12 @@
 class ValidatesBySchema::ValidationOption
   # column here must be an ActiveRecord column
   # i.e. MyARModel.columns.first
-  attr_accessor :klass, :column
+  attr_accessor :klass, :column, :unique_indexes
 
-  def initialize(klass, column)
+  def initialize(klass, column, unique_indexes = [])
     @klass = klass
     @column = column
+    @unique_indexes = unique_indexes.select { |index| index.columns.first == column.name }
   end
 
   def define!
@@ -16,13 +17,15 @@ class ValidatesBySchema::ValidationOption
     else
       define_validations(to_hash)
     end
-    define_uniqueness_validations if ValidatesBySchema.validate_uniqueness
+    define_uniqueness_validations
   end
 
   private
 
   def define_belongs_to_presence_validation
-    klass.validates association.name, presence: true if !ActiveRecord::Base.belongs_to_required_by_default && presence
+    if !ActiveRecord::Base.belongs_to_required_by_default && presence
+      klass.validates association.name, presence: true
+    end
   end
 
   def define_uniqueness_validations
@@ -79,13 +82,6 @@ class ValidatesBySchema::ValidationOption
     end
   end
 
-  def unique_indexes
-    klass
-      .connection
-      .indexes(klass.table_name)
-      .select { |index| index.unique && index.columns.first == column.name }
-  end
-
   def case_sensitive?
     !klass.connection.respond_to?(:collation) ||
       !klass.connection.collation.end_with?('_ci')

data/lib/validates_by_schema/version.rb

@@ -1,3 +1,3 @@
 module ValidatesBySchema
-  VERSION = '0.5.0'
+  VERSION = '0.5.2'
 end

data/lib/validates_by_schema.rb

@@ -18,6 +18,9 @@ module ValidatesBySchema
 
     def load_schema!
       super
+      # Set flag here to avoid infinite recursion
+      @schema_loaded = true
+
       # define schema validations lazy to avoid accessing the database
       # at class load time.
       define_schema_validations
@@ -28,13 +31,23 @@ module ValidatesBySchema
     def define_schema_validations
       return unless @validates_by_schema_options
 
+      unique_indexes = ValidatesBySchema.validate_uniqueness ? fetch_unique_indexes : []
       customized_schema_validatable_columns.each do |c|
-        ValidationOption.new(self, c).define!
+        ValidationOption.new(self, c, unique_indexes).define!
       end
 
       @validates_by_schema_options = nil
     end
 
+    def fetch_unique_indexes
+      if connection.schema_cache.respond_to?(:indexes)
+        connection.schema_cache.indexes(table_name).select(&:unique)
+      else
+        # Rails < 6.0
+        connection.indexes(table_name).select(&:unique)
+      end
+    end
+
     def customized_schema_validatable_columns
       # Allow user to specify :only or :except options
       schema_validatable_columns.tap do |columns|
@@ -54,7 +67,7 @@ module ValidatesBySchema
     end
 
     def ignored_columns_for_validates_by_schema
-      [primary_key.to_s, 'created_at', 'updated_at', 'deleted_at']
+      ['id', 'created_at', 'updated_at', 'deleted_at']
     end
 
   end

data/spec/ci/{rails52.gemfile → rails70.gemfile}

@@ -5,4 +5,4 @@ gemspec path: '../..'
 gem 'simplecov', require: false
 gem 'simplecov-lcov', require: false
 
-gem 'activerecord', '~> 5.2.0'
+gem 'activerecord', '~> 7.0.0'

data/spec/ci/{rails60.gemfile → rails71.gemfile}

@@ -5,4 +5,4 @@ gemspec path: '../..'
 gem 'simplecov', require: false
 gem 'simplecov-lcov', require: false
 
-gem 'activerecord', '~> 6.0.0'
+gem 'activerecord', '~> 7.1.0'

data/spec/config/schema.rb

@@ -32,7 +32,7 @@ ActiveRecord::Schema.define(version: 20_121_210_034_140) do
     t.integer 'parent_id',                                           null: false
     t.integer 'other_id'
     t.integer 'kind',                                                null: false
-    t.string 'list', array: true, limit: 3
+    t.string 'list', ENV['DB'] == 'postgresql' ? { array: true, limit: 3 } : {}
 
     t.index 'parent_id'
     t.index ['name', 'wheels'], unique: true

data/spec/spec_helper.rb

@@ -22,7 +22,15 @@ end
 require 'validates_by_schema'
 
 # Setup the database
-conf = YAML.load(ERB.new(File.read(File.join(File.dirname(__FILE__), 'config', 'database.yml'))).result)
+conf = nil
+begin
+  # load with psych 4 (>= ruby 3.1)
+  conf = YAML.load(ERB.new(File.read(File.join(File.dirname(__FILE__), 'config', 'database.yml'))).result, aliases: true)
+rescue ArgumentError
+  # fallback to psych 3 syntax
+  conf = YAML.load(ERB.new(File.read(File.join(File.dirname(__FILE__), 'config', 'database.yml'))).result)
+end
+
 ActiveRecord::Base.establish_connection(conf['test'])
 
 ActiveRecord::Base.belongs_to_required_by_default = false

data/spec/support/models/contraption.rb

@@ -1,7 +1,7 @@
 require 'widget'
 
 class Contraption < Widget
-  enum kind: %w(one other)
+  enum :kind, %w(one other)
 
   validates_by_schema
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validates_by_schema
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Josh Lewis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-25 00:00:00.000000000 Z
+date: 2024-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -99,16 +99,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 description: Keep your code DRY by inferring column validations from table properties!
   Automagically validate presence, length, numericality, inclusion and uniqueness
   of ActiveRecord backed columns.
@@ -125,13 +125,13 @@ files:
 - lib/validates_by_schema.rb
 - lib/validates_by_schema/validation_option.rb
 - lib/validates_by_schema/version.rb
-- spec/ci/rails50.gemfile
-- spec/ci/rails50.gemfile.lock
-- spec/ci/rails52.gemfile
-- spec/ci/rails60.gemfile
+- spec/ci/rails70.gemfile
+- spec/ci/rails71.gemfile
 - spec/config/database.yml
 - spec/config/schema.rb
 - spec/db/test.sqlite3
+- spec/db/test.sqlite3-shm
+- spec/db/test.sqlite3-wal
 - spec/spec_helper.rb
 - spec/support/models/contraption.rb
 - spec/support/models/gadget.rb
@@ -161,22 +161,22 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.5.16
 signing_key: 
 specification_version: 4
 summary: Automatic validation based on your database schema column types and limits.
 test_files:
-- spec/spec_helper.rb
+- spec/ci/rails70.gemfile
+- spec/ci/rails71.gemfile
+- spec/config/database.yml
+- spec/config/schema.rb
 - spec/db/test.sqlite3
-- spec/validations_spec.rb
-- spec/support/models/widget.rb
+- spec/db/test.sqlite3-shm
+- spec/db/test.sqlite3-wal
+- spec/spec_helper.rb
 - spec/support/models/contraption.rb
-- spec/support/models/sub_contraption.rb
 - spec/support/models/gadget.rb
 - spec/support/models/gizmo.rb
-- spec/config/schema.rb
-- spec/config/database.yml
-- spec/ci/rails52.gemfile
-- spec/ci/rails50.gemfile
-- spec/ci/rails60.gemfile
-- spec/ci/rails50.gemfile.lock
+- spec/support/models/sub_contraption.rb
+- spec/support/models/widget.rb
+- spec/validations_spec.rb

data/spec/ci/rails50.gemfile

@@ -1,10 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '../..'
-
-gem 'simplecov', require: false
-gem 'simplecov-lcov', require: false
-
-gem 'activerecord', '~> 5.0.0'
-
-gem 'sqlite3', '~> 1.3.7'

data/spec/ci/rails50.gemfile.lock

@@ -1,118 +0,0 @@
-PATH
-  remote: ../..
-  specs:
-    validates_by_schema (0.4.0)
-      activerecord (>= 5.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionpack (5.0.7.2)
-      actionview (= 5.0.7.2)
-      activesupport (= 5.0.7.2)
-      rack (~> 2.0)
-      rack-test (~> 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.7.2)
-      activesupport (= 5.0.7.2)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activemodel (5.0.7.2)
-      activesupport (= 5.0.7.2)
-    activerecord (5.0.7.2)
-      activemodel (= 5.0.7.2)
-      activesupport (= 5.0.7.2)
-      arel (~> 7.0)
-    activesupport (5.0.7.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (7.1.4)
-    builder (3.2.4)
-    concurrent-ruby (1.1.9)
-    crass (1.0.6)
-    diff-lcs (1.4.4)
-    docile (1.4.0)
-    erubis (2.7.0)
-    i18n (1.8.11)
-      concurrent-ruby (~> 1.0)
-    loofah (2.12.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    method_source (1.0.0)
-    mini_portile2 (2.6.1)
-    minitest (5.14.4)
-    mysql2 (0.5.3)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
-      racc (~> 1.4)
-    pg (1.2.3)
-    racc (1.6.0)
-    rack (2.2.3)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
-      loofah (~> 2.3)
-    railties (5.0.7.2)
-      actionpack (= 5.0.7.2)
-      activesupport (= 5.0.7.2)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (13.0.6)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-rails (4.1.2)
-      actionpack (>= 4.2)
-      activesupport (>= 4.2)
-      railties (>= 4.2)
-      rspec-core (~> 3.10)
-      rspec-expectations (~> 3.10)
-      rspec-mocks (~> 3.10)
-      rspec-support (~> 3.10)
-    rspec-support (3.10.3)
-    shoulda-matchers (4.5.1)
-      activesupport (>= 4.2.0)
-    simplecov (0.21.2)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-      simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
-    simplecov-lcov (0.8.0)
-    simplecov_json_formatter (0.1.3)
-    sqlite3 (1.3.13)
-    thor (1.1.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 5.0.0)
-  mysql2
-  pg
-  rake
-  rspec-rails
-  shoulda-matchers
-  simplecov
-  simplecov-lcov
-  sqlite3 (~> 1.3.7)
-  validates_by_schema!
-
-BUNDLED WITH
-   2.1.4