database_validations 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0272e7610a4c92445421092f94faff13711f4b235d74340ee924b946dfe4d487
-  data.tar.gz: 0646b4e6bab48d3e48c4860d715e600a7f02211be18676d0c5258e33b490e1e8
+  metadata.gz: 2236241fbd9c25b9cbe9ffa63f5634659c6ad0ded206324cc7021765049ae116
+  data.tar.gz: ec3e6c0ec0ea21a00455a2035452030977994e99bdb4b4ff45b8405d57e5f0d4
 SHA512:
-  metadata.gz: 0a475cdbd890674df1b3ed1f7f493c0426638016e5c4a20e8a5f333cb7f4d3101581a40478d45c2dedde0fea77fbdd1589a7947d8ab6c7d4f26008c829b066db
-  data.tar.gz: b7e63a9b639fcb81a3f7921336563d9c4cb5d68e27c27c80863ad0ed56d40977ffb9f93ba6732ef469983052f174374e30f38e42cf732833b51898ceee81f135
+  metadata.gz: f5691f17f29a775e910150be7415c77a02eb0436e428bf14efa60365f0840574066307b02d0b71de00431dff71f24215e366a68d44f1cf34528efb3570a584ec
+  data.tar.gz: 613e741dc4f48e245f3d6abc9af136fad6ae28d974583e2713ce9af4955d68c97d73fb371444e8fc519bfa428758221680dffc77b48e91a1d9b62103a2291d5a

data/README.md

@@ -87,11 +87,11 @@ We want to provide full compatibility with existing `validates_uniqueness_of` va
 | unless         | +          | +     | +      |
 | index_name     | +          | +     | -      |
 | where          | +          | -     | -      |
-| case_sensitive | -          | -     | -      |
+| case_sensitive | +          | -     | -      |
 | allow_nil      | -          | -     | -      | 
 | allow_blank    | -          | -     | -      |
 
-**Keep in mind**: Both `if` and `unless` options are used only for `valid?` method and provided only for performance reason.
+**Keep in mind**: `if`, `unless` and `case_sensitive` options are used only for `valid?` method. 
 
 ```ruby
 class User < ActiveRecord::Base
@@ -104,7 +104,7 @@ 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:
+**Backward compatibility**: Even when we don't natively support `case_sensitive`, `allow_nil` and `allow_blank` options now, the following:
 
 ```ruby
 validates_db_uniqueness_of :email
@@ -116,6 +116,18 @@ Is the same by default as the following
 validates_uniqueness_of :email, allow_nil: true, allow_blank: false, case_sensitive: true
 ``` 
 
+Complete `case_sensitive` replacement example (for `PostgreSQL` only):
+
+```ruby
+validates :slug, uniqueness: { case_sensitive: false, scope: :field }
+```
+
+Should be replaced by:
+
+```ruby
+validates_db_uniqueness_of :slug, index_name: :unique_index_with_field_lower_on_slug, case_sensitive: false
+```
+
 Options descriptions: 
 - `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").

data/lib/database_validations/rspec/uniqueness_validator_matcher.rb

@@ -7,6 +7,7 @@
 # * `scoped_to(scope)` -- specifies a scope for the validator;
 # * `with_where(where)` -- specifies a where condition for the validator;
 # * `with_index(index_name)` -- specifies an index name for the validator;
+# * `case_insensitive` -- specifies case insensitivity for the validator;
 #
 # Example:
 #
@@ -36,6 +37,10 @@ RSpec::Matchers.define :validate_db_uniqueness_of do |field|
     @index_name = index_name
   end
 
+  chain(:case_insensitive) do
+    @case_sensitive = false
+  end
+
   match do |object|
     @validators = []
 
@@ -43,15 +48,23 @@ RSpec::Matchers.define :validate_db_uniqueness_of do |field|
 
     DatabaseValidations::Helpers.each_validator(model) do |validator|
       @validators << {
-        field:      validator.field,
-        scope:      validator.scope,
-        where:      validator.where_clause,
-        message:    validator.message,
-        index_name: validator.index_name
+        field:          validator.field,
+        scope:          validator.scope,
+        where:          validator.where_clause,
+        message:        validator.message,
+        index_name:     validator.index_name,
+        case_sensitive: validator.case_sensitive
       }
     end
 
-    @validators.include?(field: field, scope: Array.wrap(@scope), where: @where, message: @message, index_name: @index_name)
+    @validators.include?(
+      field: field,
+      scope: Array.wrap(@scope),
+      where: @where,
+      message: @message,
+      index_name: @index_name,
+      case_sensitive: @case_sensitive
+    )
   end
 
   description do
@@ -60,7 +73,8 @@ RSpec::Matchers.define :validate_db_uniqueness_of do |field|
     desc += "message: '#{@message}'; " if @message
     desc += "scope: #{@scope}; " if @scope
     desc += "where: '#{@where}'; " if @where
-    desc += "index_name: '#{index_name}'." if @index_name
+    desc += "index_name: '#{@index_name}'; " if @index_name
+    desc += "be case insensitive." if @case_sensitive === false
     desc
   end
 

data/lib/database_validations/validations/adapters/postgresql_adapter.rb

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

data/lib/database_validations/validations/uniqueness_options.rb

@@ -1,6 +1,7 @@
 module DatabaseValidations
   class UniquenessOptions
     CUSTOM_OPTIONS = %i[where index_name].freeze
+    DEFAULT_OPTIONS = {allow_nil: true, case_sensitive: true, allow_blank: false}.freeze
 
     attr_reader :field
 
@@ -24,8 +25,9 @@ module DatabaseValidations
     def validates_uniqueness_options
       where_clause_str = where_clause
 
-      options.except(*CUSTOM_OPTIONS)
-        .merge(allow_nil: true, case_sensitive: true, allow_blank: false)
+      DEFAULT_OPTIONS
+        .merge(options)
+        .except(*CUSTOM_OPTIONS)
         .tap { |opts| opts[:conditions] = -> { where(where_clause_str) } if where_clause }
     end
 
@@ -65,6 +67,11 @@ module DatabaseValidations
       @index_name ||= options[:index_name]
     end
 
+    # @return [Boolean|nil]
+    def case_sensitive
+      @case_sensitive ||= options[:case_sensitive]
+    end
+
     private
 
     attr_reader :adapter, :options

data/lib/database_validations/version.rb

@@ -1,3 +1,3 @@
 module DatabaseValidations
-  VERSION = '0.7.2'
+  VERSION = '0.7.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_validations
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Evgeniy Demin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-17 00:00:00.000000000 Z
+date: 2018-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord