database_validations 0.8.9 → 0.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c5d3a56f3d69b34fdc1da4e3b74b9ff3797d0ca93772df93746e709f9b9fd64
-  data.tar.gz: db772a3a726ccce4ce21bfceb0ddac72da07d9da3650f89d1845e92e580519b2
+  metadata.gz: c934b2c71117e26cc8493d7eafb35a681cb54f77bb6a1ad7d9ba0ec309664817
+  data.tar.gz: 7b7e34001d44eac5b818d756288ecb5e5d7f33147d5f8bbc07a3e54b0de6287c
 SHA512:
-  metadata.gz: da0b57c3e7203be84466c31f72a517852d1b4484a306607bf48e6d6f6d683e43dc1ebdcd678bc258075c5ce1f9c52af756805b749ab5562cc84ac83a6ac48ee4
-  data.tar.gz: 1580a4718c53aa42267a2d7efd04148df0de38ddba3ce7c4c5f6c4c226736e4f568919cbe600b79d269566f081c7c9537b09fca0f5b0d65cdd73378e81b9ae71
+  metadata.gz: 544cee2e2edf40aec5a25bfdc789df6324d07120997a1a68b366eac75152eeb095ca9cfb3758c32842e189da2ad5306e4530faaa24fa2ecbf44c93c44995e2c9
+  data.tar.gz: 3e006dfe1110c3758a3a971a2db45660a73427e6b9007d140f1e338d8dd02bd099c5a9cd29f78b8018c1f541c8c67f4bd064a845bbbf5bb6f1a18ff21d6d679c

data/lib/database_validations/lib/db_belongs_to/belongs_to_handlers.rb

@@ -1,11 +1,20 @@
 module DatabaseValidations
   module ClassMethods
+    # rubocop: disable Metrics/AbcSize
     def db_belongs_to(name, scope = nil, **options)
       Helpers.cache_valid_method!(self)
 
       @database_validations_storage ||= DatabaseValidations::OptionsStorage.new(self)
 
-      belongs_to(name, scope, options.merge(optional: true))
+      belongs_to_options =
+        if ActiveRecord::VERSION::MAJOR < 5
+          options.delete(:optional)
+          options.merge(required: false)
+        else
+          options.merge(optional: true)
+        end
+
+      belongs_to(name, scope, belongs_to_options)
 
       foreign_key = reflections[name.to_s].foreign_key
 
@@ -17,4 +26,5 @@ module DatabaseValidations
       include(DatabaseValidations::Rescuer)
     end
   end
+  # rubocop: enable Metrics/AbcSize
 end

data/lib/database_validations/lib/db_belongs_to/belongs_to_options.rb

@@ -1,7 +1,14 @@
 module DatabaseValidations
   class BelongsToOptions
+    VALIDATOR_MESSAGE =
+      if ActiveRecord::VERSION::MAJOR < 5
+        :blank
+      else
+        :required
+      end
+
     def self.validator_options(association, foreign_key)
-      { attributes: association, foreign_key: foreign_key, message: :required }
+      { attributes: association, foreign_key: foreign_key, message: VALIDATOR_MESSAGE }
     end
 
     attr_reader :column, :adapter, :relation
@@ -23,7 +30,7 @@ module DatabaseValidations
     def handle_foreign_key_error(instance)
       # Hack to not query the database because we know the result already
       instance.send("#{relation}=", nil)
-      instance.errors.add(relation, :blank, message: :required)
+      instance.errors.add(relation, :blank, message: VALIDATOR_MESSAGE)
     end
 
     private

data/lib/database_validations/lib/db_belongs_to/db_presence_validator.rb

@@ -23,7 +23,7 @@ module DatabaseValidations
       else
         return unless record.public_send(foreign_key).blank? && record.public_send(association).blank?
 
-        record.errors.add(association, :blank, message: :required)
+        record.errors.add(association, :blank, message: BelongsToOptions::VALIDATOR_MESSAGE)
       end
     end
   end

data/lib/database_validations/lib/helpers.rb

@@ -5,7 +5,7 @@ module DatabaseValidations
     def cache_valid_method!(klass)
       return if klass.method_defined?(:valid_without_database_validations?)
 
-      klass.alias_method(:valid_without_database_validations?, :valid?)
+      klass.__send__(:alias_method, :valid_without_database_validations?, :valid?)
     end
 
     def handle_error!(instance, error)

data/lib/database_validations/lib/validates_db_uniqueness_of/uniqueness_options.rb

@@ -91,8 +91,18 @@ module DatabaseValidations
       index_name ? adapter.find_index_by_name(index_name.to_s) : adapter.find_index(columns, where_clause)
     end
 
+    def index_columns_size(columns)
+      columns.is_a?(Array) ? columns.size : (columns.count(',') + 1)
+    end
+
+    def check_index_options?(index)
+      (columns.size == index_columns_size(index.columns)) && (where_clause.nil? == index.where.nil?)
+    end
+
     def raise_if_index_missed!(index)
-      raise Errors::IndexNotFound.new(columns, where_clause, index_name, adapter.indexes, adapter.table_name) unless index
+      return if index && check_index_options?(index)
+
+      raise Errors::IndexNotFound.new(columns, where_clause, index_name, adapter.indexes, adapter.table_name)
     end
   end
 end

data/lib/database_validations/version.rb

@@ -1,3 +1,3 @@
 module DatabaseValidations
-  VERSION = '0.8.9'.freeze
+  VERSION = '0.8.10'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_validations
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.8.10
 platform: ruby
 authors:
 - Evgeniy Demin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-13 00:00:00.000000000 Z
+date: 2019-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
@@ -62,30 +56,30 @@ dependencies:
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -148,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.0
 description: |-
   ActiveRecord provides validations on app level but it won't guarantee the
   consistent. In some cases, like `validates_uniqueness_of` it executes