validates_by_schema 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a44382b4c751d51c6056b9eae1daed6f8eedfe8040383fe38ce717beafc2c84d
-  data.tar.gz: 553ffe11b1a3c83f6c2f1126954d691553465492f7f3820f6530b14a48675971
+  metadata.gz: a0460d1427aec1f4b27e66917d3b708c33f277e799ffb32150f8a34e2317795a
+  data.tar.gz: e1dd3c76c989ed56df9dfb3d40a912206fcf75ed05d7843ce73c3d3914f99656
 SHA512:
-  metadata.gz: b404ea525a570681cc76d936755f6f6fbc89a310e8409d0480161a2a9aad11e1c803445c30b0cf03ce951d02ae63f614715e48c3a9bfde80455e5cec4b293c71
-  data.tar.gz: a7b24d0fe512674063b0c055f155b5cd608661fcf284634399354c6d63a3acfbf7fba6e9de335ea5e55e25765cedc8bda60505879aa7d9a09f96a3e828ebadba
+  metadata.gz: 0aa543eb8486c4df7e2be25863a079f81a377da4f0f06a25f6d8878dfc8d075eb78f10b0aeed0caecc9d5fbff653b1c985e1d5cc5abf12e65322c32aacb40a17
+  data.tar.gz: 30d69fea7343a822b90008d8ba24c8bc46bf4f3f552f00b9c9a6c8db5a9782728a6f6ce4e81dcf16be3cd0150891176571ec99597aa3f0999e057fdd285366ac

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.1'
 end

data/lib/validates_by_schema.rb

@@ -28,13 +28,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 +64,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/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

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.1
 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: 2023-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -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.3.26
 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/rails50.gemfile
+- spec/ci/rails50.gemfile.lock
+- spec/ci/rails52.gemfile
+- spec/ci/rails60.gemfile
+- spec/config/database.yml
+- spec/config/schema.rb
 - spec/db/test.sqlite3
-- spec/validations_spec.rb
-- spec/support/models/widget.rb
+- 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