database_validations 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a94ceacef368255d4e55eaf4ac852a839b78238ca47a0d3bceac249e4a1ded3
-  data.tar.gz: a38b1061a9c345543aa353c5048b2472026c4cb806991c64c5e2b23e48ac6fd7
+  metadata.gz: 0540cd1970a66666d9d87489076205155314a0b6e67c105c053fa61f8f22b19a
+  data.tar.gz: c8e0a0cac2b2e86571159053e29b840bba391527060adcd501f3f7a4836e0c5e
 SHA512:
-  metadata.gz: 3f1543f0a6b04ce50064e74bc56fa059153f7660774932008c5ef50699bb02c31b88f9cee8fa01ef519128932caefe770364536867a5c108ec42fee3e6a31984
-  data.tar.gz: b0d74dc13be3a54b9bc95c20f5ce24673e5a586392f3d63d3e5f4ad171fadf49bf3b202e4e3e12480af5bf3eba4ed935c9a4cb75a2638248e09c1ae835a634a2
+  metadata.gz: b79ba0d354e4337a39d8182de5dca5080980fa97a2b2d4094cba86347f583b7afa2a61b3c1e7440eaacb0f09344b9dd7dbbea553abf8cb64b361a35c79c7c74b
+  data.tar.gz: 7a899554d2373b049fc360939ae493dee275648f52d32f243c2c22338e9d643850b6a60749ef524e5bfd8658f47a98209cd87ec3df94f2454650361709221a03

data/README.md

@@ -81,8 +81,27 @@ List of supported options from `validates_uniqueness_of` validator:
 
 - `scope`: One or more columns by which to limit the scope of the uniqueness constraint.
 - `message`: Specifies a custom error message (default is: "has already been taken").
+- `if`: Specifies a method or proc to call to determine if the validation should occur 
+(e.g. <tt>if: :allow_validation</tt>, or <tt>if: Proc.new { |user| user.signup_step > 2 }</tt>). The method or
+proc should return or evaluate to a `true` or `false` value.
+- `unless`: Specifies a method or proc to call to determine if the validation should not 
+occur (e.g. <tt>unless: :skip_validation</tt>, or <tt>unless: Proc.new { |user| user.signup_step <= 2 }</tt>). 
+The method or proc should return or evaluate to a `true` or `false` value.
 
-**Keep in mind**: Even when we don't support `case_sensitive`, `allow_nil` and `allow_blank` options now, the following:
+**Keep in mind**: Both `if` and `unless` options are used only for `valid?` method and provided only for performance reason. 
+
+```ruby
+class User < ActiveRecord::Base
+  validates_db_uniqueness_of :email, if: -> { email && email_changed? }
+end 
+
+user = User.create(email: 'email@mail.com', field: 'field')
+user.field = 'another'
+
+user.valid? # Will not query the database
+```
+
+**Backward compatibility**: Even when we don't support `case_sensitive`, `allow_nil` and `allow_blank` options now, the following:
 
 ```ruby
 validates_db_uniqueness_of :email
@@ -106,12 +125,6 @@ The list of options to add support:
 - `case_sensitive`: Looks for an exact match. Ignored by non-text columns (`true` by default).
 - `allow_nil`: If set to `true`, skips this validation if the attribute is `nil` (default is `false`).
 - `allow_blank`: If set to `true`, skips this validation if the attribute is blank (default is `false`).
-- `if`: Specifies a method, proc or string to call to determine if the validation should occur 
-(e.g. <tt>if: :allow_validation</tt>, or <tt>if: Proc.new { |user| user.signup_step > 2 }</tt>). The method,
-proc or string should return or evaluate to a `true` or `false` value.
-- `unless`: Specifies a method, proc or string to call to determine if the validation should not 
-occur (e.g. <tt>unless: :skip_validation</tt>, or <tt>unless: Proc.new { |user| user.signup_step <= 2 }</tt>). 
-The method, proc or string should return or evaluate to a `true` or `false` value.
 
 ### Benchmark ([code](https://github.com/toptal/database_validations/blob/master/benchmarks/uniqueness_validator_benchmark.rb))
 

data/lib/database_validations/adapters/mysql_adapter.rb

@@ -1,7 +1,7 @@
 module DatabaseValidations
   module Adapters
     class MysqlAdapter < BaseAdapter
-      SUPPORTED_OPTIONS = %i[scope message].freeze
+      SUPPORTED_OPTIONS = %i[scope message if unless].freeze
       ADAPTER = :mysql2
 
       def error_columns(error_message)

data/lib/database_validations/adapters/postgresql_adapter.rb

@@ -1,7 +1,7 @@
 module DatabaseValidations
   module Adapters
     class PostgresqlAdapter < BaseAdapter
-      SUPPORTED_OPTIONS = %i[scope message where].freeze
+      SUPPORTED_OPTIONS = %i[scope message where if unless].freeze
       ADAPTER = :postgresql
 
       def error_columns(error_message)

data/lib/database_validations/adapters/sqlite_adapter.rb

@@ -1,7 +1,7 @@
 module DatabaseValidations
   module Adapters
     class SqliteAdapter < BaseAdapter
-      SUPPORTED_OPTIONS = %i[scope message].freeze
+      SUPPORTED_OPTIONS = %i[scope message if unless].freeze
       ADAPTER = :sqlite
 
       def error_columns(error_message)

data/lib/database_validations/uniqueness_options.rb

@@ -24,6 +24,11 @@ module DatabaseValidations
         .tap { |opts| opts[:conditions] = -> { where(where_clause_str) } if where_clause }
     end
 
+    def if_and_unless_pass?(instance)
+      (options[:if].nil? || condition_passes?(options[:if], instance)) &&
+        (options[:unless].nil? || !condition_passes?(options[:unless], instance))
+    end
+
     def key
       @key ||= Helpers.generate_key(columns)
     end
@@ -36,6 +41,20 @@ module DatabaseValidations
       @where_clause ||= options[:where]
     end
 
+    private
+
+    attr_reader :adapter, :field, :options
+
+    def condition_passes?(condition, instance)
+      if condition.is_a?(Symbol)
+        instance.__send__(condition)
+      elsif condition.is_a?(Proc) && condition.arity == 0
+        instance.instance_exec(&condition)
+      else
+        instance.instance_eval(&condition)
+      end
+    end
+
     def raise_if_unsupported_options!
       options.except(:attributes).each_key do |option|
         unless adapter.support_option?(option)
@@ -47,10 +66,6 @@ module DatabaseValidations
     def raise_if_index_missed!
       raise Errors::IndexNotFound.new(columns, where_clause, adapter.indexes) unless adapter.find_index(columns, where_clause)
     end
-
-    private
-
-    attr_reader :adapter, :field, :options
   end
 end
 

data/lib/database_validations/uniqueness_validator.rb

@@ -9,7 +9,9 @@ module DatabaseValidations
         output = super(context)
 
         Helpers.each_validator(self.class) do |validator|
-          validates_with(ActiveRecord::Validations::UniquenessValidator, validator.validates_uniqueness_options)
+          if validator.if_and_unless_pass?(self)
+            validates_with(ActiveRecord::Validations::UniquenessValidator, validator.validates_uniqueness_options)
+          end
         end
 
         errors.empty? && output

data/lib/database_validations/version.rb

@@ -1,3 +1,3 @@
 module DatabaseValidations
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

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