database_validations 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c0e233ecf1999d511840c65bbce2744faf3af3cfc2a1c64f1bcee504c86129e
-  data.tar.gz: ed0cb02abcb98e1e4e8d6172a3695b953fdcc9f05561dd6c7c63945929705061
+  metadata.gz: 4ee6d1beb244daa4a90b9336e202f68912a3e25b55085b2459ef8e4ffea161db
+  data.tar.gz: e266c1b54751162c0c589a2dea9fd450bfe1dde94271d91958b612b0d96282c8
 SHA512:
-  metadata.gz: aa02581639a2a37ae25202d32aee451934d607a96843fe13227096eeda0631ce759e538d14e34c3e523e6302ec91fe88c3a651aabd3cda717ace5fb13f9c824e
-  data.tar.gz: 0f84690c7ce7fdd5a19c62c20ea211b33d8a5039254e3b08a5765eef050d69f426cbfcaa0d1cdaa15f00e07c0ff503d0535ccc194bfd031a90237d18e1df2a35
+  metadata.gz: 1d98bb0b3d2b8810c60d5dabbfab6f4aa41619a1016c7d996394839822fcd61bcc2a9fbaf0c5b0502c88c76cc1cc39d16a4691b400d8dde679ce93d2bd1908a2
+  data.tar.gz: 7e7725c739b7e708e3736497a753c6aa2b446008d2070b82d6eed859e662513dac65f77bc96d264abd3cb329ef502856aa6b529dd6e825911bb24b1ec536b003

data/README.md

@@ -1,6 +1,7 @@
 # DatabaseValidations
 
 [![Build Status](https://travis-ci.org/toptal/database_validations.svg?branch=master)](https://travis-ci.org/toptal/database_validations)
+[![Gem Version](https://badge.fury.io/rb/database_validations.svg)](https://badge.fury.io/rb/database_validations)
 
 ActiveRecord provides validations on app level but it won't guarantee the 
 consistent. In some cases, like `validates_uniqueness_of` it executes 
@@ -154,13 +155,13 @@ Example:
 
 ```ruby
 class User < ActiveRecord::Base
-  validates_db_uniqueness_of :field, message: 'duplicate', where: '(some_field IS NULL)', scope: :another_field
+  validates_db_uniqueness_of :field, message: 'duplicate', where: '(some_field IS NULL)', scope: :another_field, index_name: :unique_index
 end
 
 describe 'validations' do
   subject { User }
   
-  it { is_expected.to validate_db_uniqueness_of(:field).with_message('duplicate').with_where('(some_field IS NULL)').scoped_to(:another_field) }
+  it { is_expected.to validate_db_uniqueness_of(:field).with_message('duplicate').with_where('(some_field IS NULL)').scoped_to(:another_field).with_index(:unique_index) }
 end
 ```
 

data/lib/database_validations/rspec/uniqueness_validator_matcher.rb

@@ -6,6 +6,7 @@
 # * `with_message(message)` -- specifies a message of the error;
 # * `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;
 #
 # Example:
 #
@@ -25,19 +26,24 @@ RSpec::Matchers.define :validate_db_uniqueness_of do |field|
     @where = where
   end
 
+  chain(:with_index) do |index_name|
+    @index_name = index_name
+  end
+
   match do |model|
     @validators = []
 
     DatabaseValidations::Helpers.each_validator(model) do |validator|
       @validators << {
-        field:   validator.field,
-        scope:   validator.scope,
-        where:   validator.where_clause,
-        message: validator.message
+        field:      validator.field,
+        scope:      validator.scope,
+        where:      validator.where_clause,
+        message:    validator.message,
+        index_name: validator.index_name
       }
     end
 
-    @validators.include?(field: field, scope: Array.wrap(@scope), where: @where, message: @message)
+    @validators.include?(field: field, scope: Array.wrap(@scope), where: @where, message: @message, index_name: @index_name)
   end
 
   description do
@@ -45,7 +51,8 @@ RSpec::Matchers.define :validate_db_uniqueness_of do |field|
     desc += "With options - " if @message || @scope || @where
     desc += "message: '#{@message}'; " if @message
     desc += "scope: #{@scope}; " if @scope
-    desc += "where: '#{@where}'. " if @where
+    desc += "where: '#{@where}'; " if @where
+    desc += "index_name: '#{index_name}'." if @index_name
     desc
   end
 

data/lib/database_validations/tasks/database_validations.rake

@@ -1,9 +1,5 @@
-module DatabaseValidations
-  module Tasks
-    namespace :database_validations do
-      task :skip_db_uniqueness_validator_index_check do
-        ENV['SKIP_DB_UNIQUENESS_VALIDATOR_INDEX_CHECK'] = 'true'
-      end
-    end
+namespace :database_validations do
+  task :skip_db_uniqueness_validator_index_check do
+    ENV['SKIP_DB_UNIQUENESS_VALIDATOR_INDEX_CHECK'] = 'true'
   end
 end

data/lib/database_validations/version.rb

@@ -1,3 +1,3 @@
 module DatabaseValidations
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

metadata

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