database_validations 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 024d8f6fa0f65112e4d673192635627ede7a89dfa612673eb4262cc83f952ed1
-  data.tar.gz: 5cb13bf8b39e72528187d77d8d6e3aeb7e316f265f7513dc8f5db59a90662ff7
+  metadata.gz: 5be0a1cf5c74a0aa6744a86a14aa6a81707dc767dac4009706d882a6bbd43f86
+  data.tar.gz: 1e278b7a7399acc9305465129c68f7e8970d4dc283d5586a8531cb8fd0103369
 SHA512:
-  metadata.gz: 8d8b6308e29ef341fef318a2ef3a91288b7f56f6275fe07e05980753eaf6ac83a6bf6b036fe4c6381c862294eae74246e2770ca42f429d06b7715bf0a026c479
-  data.tar.gz: 4e5bc1cfb78d5db9d0397cd5f0675d7f8bf2ceca15f241aadcd1ad93091d42a401e16afeb54feb436f9e9d944fc817400d3124f211f7493e73609a5cf5a6f81d
+  metadata.gz: 5080c42455f88a031b2cbefd620637c3312b576d7ba1af781c1d179b362d93194cd3f892693a07cfbc666c6bf98911ab0f302a6b1ef8bacd9d1b6ea88159717c
+  data.tar.gz: 7f83a786582d700407fe95a092a3675e9444b7a25265379befd16972462d528c7f9784ea992480124c8d889dc3e9492520f44c9b0ca07fad08451e9766aafc02

data/lib/database_validations/errors.rb

@@ -7,7 +7,9 @@ module DatabaseValidations
 
       def initialize(columns)
         @columns = columns.map(&:to_s)
-        super "No unique index found with columns: #{self.columns}"
+        super "No unique index found with columns: #{self.columns}. "\
+              "Use ENV['SKIP_DB_UNIQUENESS_VALIDATOR_INDEX_CHECK']=true in case you want to skip the check. "\
+              "For example, when you run migrations."
       end
     end
 

data/lib/database_validations/helpers.rb

@@ -18,12 +18,23 @@ module DatabaseValidations
                   .map!(&:to_s)
                   .sort!
 
-      options = instance.class.validates_db_uniqueness[columns]
+      options = uniqueness_validators_options(instance.class)[columns]
 
       error_options = options.except(:case_sensitive, :scope, :conditions, :attributes)
       error_options[:value] = instance.public_send(options[:attributes])
 
       instance.errors.add(options[:attributes], :taken, error_options)
     end
+
+    def uniqueness_validators_options(klass)
+      validators_options = klass.instance_variable_get(:'@validates_db_uniqueness_opts') || {}
+
+      while klass.superclass.respond_to?(:validates_db_uniqueness_of)
+        validators_options.reverse_merge!(klass.superclass.instance_variable_get(:'@validates_db_uniqueness_opts') || {})
+        klass = klass.superclass
+      end
+
+      validators_options
+    end
   end
 end

data/lib/database_validations/uniqueness_validator.rb

@@ -8,7 +8,8 @@ module DatabaseValidations
       def valid?(context = nil)
         output = super(context)
 
-        self.class.validates_db_uniqueness.each_value do |opts|
+
+        DatabaseValidations::Helpers.uniqueness_validators_options(self.class).each_value do |opts|
           validates_with(ActiveRecord::Validations::UniquenessValidator, opts.merge(allow_nil: true))
         end
 
@@ -41,24 +42,19 @@ module DatabaseValidations
 
   module ClassMethods
     def validates_db_uniqueness_of(*attributes)
-      @validates_db_uniqueness ||= {}
+      @validates_db_uniqueness_opts ||= {}
 
       options = attributes.extract_options!
 
       attributes.each do |attribute|
         columns = [attribute, Array.wrap(options[:scope])].flatten!.map!(&:to_s).sort!
 
-        DatabaseValidations::Helpers.raise_if_index_missed!(self, columns)
+        DatabaseValidations::Helpers.raise_if_index_missed!(self, columns) unless ENV['SKIP_DB_UNIQUENESS_VALIDATOR_INDEX_CHECK']
 
-        @validates_db_uniqueness[columns] = options.merge(attributes: attribute)
+        @validates_db_uniqueness_opts[columns] = options.merge(attributes: attribute)
       end
 
       include(DatabaseUniquenessValidator)
     end
-
-    def validates_db_uniqueness
-      derived = superclass.respond_to?(:validates_db_uniqueness) ? superclass.validates_db_uniqueness : {}
-      derived.merge(@validates_db_uniqueness || {})
-    end
   end
 end

data/lib/database_validations/version.rb

@@ -1,3 +1,3 @@
 module DatabaseValidations
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_validations
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Evgeniy Demin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-06 00:00:00.000000000 Z
+date: 2018-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord