database_validations 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84632667aa6aec235e306d5443ca94804d19541330fe13ec52cfcc80c44e3719
-  data.tar.gz: f7619dd8fd5093302a959f978839433a38fa0735b4d6f105110b6042758eb64a
+  metadata.gz: d4f713f4e6cffee98b4e7825fa18de17fdd25780659d0bea75f8fbc90ada6ecd
+  data.tar.gz: 73d3f1d54aaea77a61fbc3fcb221348be0ffcb6430eaeec98c09d6cd1e4ca9a7
 SHA512:
-  metadata.gz: b38c529569458eac14defeec0216018f5db85f9a1a82dbf9793b3c32fc4d378dceafb3fbbb9a2094374db898a49f36fbef8be2d09f54b10c0f22fed036945a73
-  data.tar.gz: d6f93d5f638ee921f8d01980310866f0bc811909fd7963e7c901c9bc7e0122a891ed2813af37653e4c9ccb7bac92084593794f2d396f66fa4fb9b10ee9faca9d
+  metadata.gz: 84927dd603f9f8bf8de7fbe98b5414e40de5c30f3d6adb95f5e1c77eef85c8fb7caef58c618e70ce3272feb6407cba159ce36b294d871eb793b30042b3bc5c28
+  data.tar.gz: b51be17960b5f2ad13ca0c6e128dc3352d5bfc53b94ecd1ea40edf1448da300ba546cf1c94e8965b839f29ea693bb1369a4bee7b1ba92f90e7d256544eec906c

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)
@@ -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.1'.freeze
+  VERSION = '1.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_validations
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Evgeniy Demin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-15 00:00:00.000000000 Z
+date: 2021-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -223,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Provide compatibility between database constraints and ActiveRecord validations