database_validations 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e13dbc2023a631be57aaacd12ec2c75ca9b7b355e7015737df4b760713b5756
-  data.tar.gz: 8b84441e52646fba283120a8e33d40bdb43162f31f202e2cd07e6f5fa6dbb03e
+  metadata.gz: 397b350ccf27a15694e155a4bb21bae6a01fe94cacceaa14aff89d1db6f542c1
+  data.tar.gz: da042f3adbf3b00a1b85e01a8dd740b23dec523379adc1c5500f1a367f2a0391
 SHA512:
-  metadata.gz: 324f867954cf0b2660431e6da9b5851f3ccae84b6ff2e5d10de6149b336387adc7c07a4e295748c75663a18822436c88578c6d246e869238f56d0e3563bc1f2e
-  data.tar.gz: 3d99ab395db1b3b493e372c22674283cd7822bd6de89cbcd71b08218cfec96eee709538dd89a872977edd936434564798a20e1af8e837c1f886fbd3a9f8e345c
+  metadata.gz: bf357e666a546058018322985ffe4a342d3004d9105c11bcd9e9eeb9b904ce8ecc915960783987b6b57cab8cca26c63eb7d6a788e74f581dc2e8e566f3a32bf9
+  data.tar.gz: 8c9d658eff8041b6237c3b554b82dee7ca390a833aafdfd5d0fc4c7fa6f730241f5a9412c0a8b171ae4df1323e53e1fed796d6782df83b166a76cb78a26ab5e7

data/lib/database_validations/lib/checkers/db_presence_validator.rb

@@ -14,14 +14,14 @@ module DatabaseValidations
       end
 
       def validate!
-        validate_foreign_keys! unless ENV['SKIP_DB_UNIQUENESS_VALIDATOR_INDEX_CHECK']
+        return if ENV['SKIP_DB_UNIQUENESS_VALIDATOR_INDEX_CHECK']
+
+        validate_foreign_keys! unless validator.klass.abstract_class?
       end
 
       private
 
-      def validate_foreign_keys! # rubocop:disable Metrics/AbcSize
-        adapter = Adapters::BaseAdapter.new(validator.klass)
-
+      def validate_foreign_keys!(adapter = Adapters::BaseAdapter.new(validator.klass))
         validator.attributes.each do |attribute|
           reflection = validator.klass._reflect_on_association(attribute)
 

data/lib/database_validations/lib/checkers/db_uniqueness_validator.rb

@@ -16,7 +16,9 @@ module DatabaseValidations
       def validate!
         validate_index_usage!
 
-        validate_indexes! unless ENV['SKIP_DB_UNIQUENESS_VALIDATOR_INDEX_CHECK']
+        return if ENV['SKIP_DB_UNIQUENESS_VALIDATOR_INDEX_CHECK']
+
+        validate_indexes!(validator.klass) unless validator.klass.abstract_class?
       end
 
       private
@@ -33,8 +35,8 @@ module DatabaseValidations
         raise ArgumentError, "When index_name is provided validator can have only one attribute. See #{validator.inspect}"
       end
 
-      def validate_indexes! # rubocop:disable Metrics/AbcSize
-        adapter = Adapters::BaseAdapter.new(validator.klass)
+      def validate_indexes!(klass) # rubocop:disable Metrics/AbcSize
+        adapter = Adapters::BaseAdapter.new(klass)
 
         validator.attributes.map do |attribute|
           columns = KeyGenerator.unify_columns(attribute, validator.options[:scope])

data/lib/database_validations/lib/rescuer.rb

@@ -2,19 +2,19 @@ module DatabaseValidations
   module Rescuer
     module_function
 
-    def handled?(instance, error)
+    def handled?(instance, error, validate)
       Storage.prepare(instance.class) unless Storage.prepared?(instance.class)
 
       case error
       when ActiveRecord::RecordNotUnique
-        process(instance, error, for_unique_index: :unique_index_name, for_db_uniqueness: :unique_error_columns)
+        process(validate, instance, error, for_unique_index: :unique_index_name, for_db_uniqueness: :unique_error_columns)
       when ActiveRecord::InvalidForeignKey
-        process(instance, error, for_db_presence: :foreign_key_error_column)
+        process(validate, instance, error, for_db_presence: :foreign_key_error_column)
       else false
       end
     end
 
-    def process(instance, error, key_types)
+    def process(validate, instance, error, key_types)
       adapter = Adapters.factory(instance.class)
 
       keys = key_types.map do |key_generator, error_processor|
@@ -26,14 +26,14 @@ module DatabaseValidations
 
         next unless attribute_validator
 
-        return process_validator(instance, attribute_validator)
+        return process_validator(validate, instance, attribute_validator)
       end
 
       false
     end
 
-    def process_validator(instance, attribute_validator)
-      return false unless attribute_validator.validator.perform_db_validation?
+    def process_validator(validate, instance, attribute_validator)
+      return false unless attribute_validator.validator.perform_rescue?(validate)
 
       attribute_validator.validator.apply_error(instance, attribute_validator.attribute)
       true

data/lib/database_validations/lib/validations.rb

@@ -15,21 +15,16 @@ module DatabaseValidations
 
     def create_or_update(*args, &block)
       options = args.extract_options!
-
-      if options[:validate] == false
-        super
-      else
-        rescue_from_database_exceptions { super }
-      end
+      rescue_from_database_exceptions(options[:validate]) { super }
     end
 
     private
 
-    def rescue_from_database_exceptions(&block)
+    def rescue_from_database_exceptions(validate, &block)
       self._database_validations_fallback = false
       self.class.connection.transaction(requires_new: true, &block)
     rescue ActiveRecord::InvalidForeignKey, ActiveRecord::RecordNotUnique => e
-      raise e unless Rescuer.handled?(self, e)
+      raise e unless Rescuer.handled?(self, e, validate)
 
       raise ActiveRecord::RecordInvalid, self
     end

data/lib/database_validations/lib/validators/db_presence_validator.rb

@@ -21,8 +21,8 @@ module DatabaseValidations
       Checkers::DbPresenceValidator.validate!(self)
     end
 
-    def perform_db_validation?
-      true
+    def perform_rescue?(validate)
+      validate != false
     end
 
     # TODO: add support of optional db_belongs_to

data/lib/database_validations/lib/validators/db_uniqueness_validator.rb

@@ -29,8 +29,8 @@ module DatabaseValidations
       Checkers::DbUniquenessValidator.validate!(self)
     end
 
-    def perform_db_validation?
-      @mode != :standard
+    def perform_rescue?(validate)
+      (validate != false && @mode != :standard) || @rescue == :always
     end
 
     def validate(record)
@@ -41,7 +41,7 @@ module DatabaseValidations
       error_options = options.except(:case_sensitive, :scope, :conditions)
       error_options[:value] = instance.public_send(attribute)
 
-      instance.errors.add(attribute, :taken, error_options)
+      instance.errors.add(attribute, :taken, **error_options)
     end
 
     private
@@ -50,6 +50,7 @@ module DatabaseValidations
       @index_name = options.delete(:index_name) if options.key?(:index_name)
       @where = options.delete(:where) if options.key?(:where)
       @mode = (options.delete(:mode).presence || DEFAULT_MODE).to_sym
+      @rescue = (options.delete(:rescue).presence || :default).to_sym
     end
 
     def perform_query?

data/lib/database_validations/version.rb

@@ -1,3 +1,3 @@
 module DatabaseValidations
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_validations
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Evgeniy Demin
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-22 00:00:00.000000000 Z
+date: 2022-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -208,7 +208,7 @@ homepage: https://github.com/toptal/database_validations
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -223,8 +223,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.0.8
+signing_key: 
 specification_version: 4
 summary: Provide compatibility between database constraints and ActiveRecord validations
   with better performance and consistency.