schema_validations 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a23ef37b81324aaf2c339a28090b57a870f14583
-  data.tar.gz: baee93aa0e3c28544a09f145ca178456ea1928c7
+  metadata.gz: 8484a054c29074d10d3fa8dbb06df1206e4f3d3f
+  data.tar.gz: a6d45b80b265de0de5c5d23a33ddfcfbafc4c2e4
 SHA512:
-  metadata.gz: 49c6eb9dfacb6b4dda7027f6b37dd21533479d1157ddc10276d957fcbb56962078a35040af02d07815071121bbcff1e5c260c9c82c6cdb96b73e6ee099c3ef50
-  data.tar.gz: 37200e9a56008fab775fb0c7b38f638f645ecc447f77184ed09ae96f9385f7f9e2b89e53e5f9a2d284906032133466c214621708770fa2e30f8464bd2518ac36
+  metadata.gz: d0e13def81c02bf86fe2a0df3f557cccfc9ec5f50a1501a43bedb5837f3b311a64e13867e8d8bacb682ddfddb068f5ff936d72514d6d3d99be54ebb5cea9412c
+  data.tar.gz: 302f4ea589910494881650a2aae57ed654cadc880622acfc0b645a5d66c89122bbbaff1f55ecc59ebb27efff05af58d0473d4285aa510b4d05907a02f2cea325

data/.travis.yml

@@ -7,9 +7,9 @@ sudo: false
 rvm:
 - 2.1.5
 gemfile:
-- gemfiles/activerecord-4.2.1/Gemfile.mysql2
-- gemfiles/activerecord-4.2.1/Gemfile.postgresql
-- gemfiles/activerecord-4.2.1/Gemfile.sqlite3
+- gemfiles/activerecord-4.2/Gemfile.mysql2
+- gemfiles/activerecord-4.2/Gemfile.postgresql
+- gemfiles/activerecord-4.2/Gemfile.sqlite3
 env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
 addons:
   postgresql: '9.4'

data/README.md

@@ -48,7 +48,7 @@ As of version 1.2.0, SchemaValidations supports and is tested on:
 
 <!-- SCHEMA_DEV: MATRIX - begin -->
 <!-- These lines are auto-generated by schema_dev based on schema_dev.yml -->
-* ruby **2.1.5** with activerecord **4.2.1**, using **mysql2**, **postgresql** or **sqlite3**
+* ruby **2.1.5** with activerecord **4.2**, using **mysql2**, **postgresql** or **sqlite3**
 
 <!-- SCHEMA_DEV: MATRIX - end -->
 
@@ -102,6 +102,7 @@ Constraints:
 | :null => false      | validates ... :presence => true                          |
 | :limit => 100       | validates ... :length => { :maximum => 100 }             |
 | :unique => true     | validates ... :uniqueness => true                        |
+| :unique => true, :case_sensitive => false <br>(If [schema_plus_pg_indexes](https://github.com/SchemaPlus/schema_plus_pg_indexes) is also in use) | validates ... :uniqueness => { :case_sensitive => false } |
 
 Data types:
 
@@ -130,6 +131,10 @@ use case.
 
 ## Release Notes
 
+### 1.4.0
+
+* Add support for case-insensitive uniqueness.  Thanks to [allenwq](https://github.com/allenwq)
+
 ### 1.3.1
 
 * Change log level from 'info' to 'debug', since there's no need to clutter production logs with this sort of development info.  Thanks to [@obduk](https://github.com/obduk)

data/gemfiles/{activerecord-4.2.1 → activerecord-4.2}/Gemfile.base

@@ -1,3 +1,3 @@
 eval File.read File.expand_path('../../Gemfile.base', __FILE__)
 
-gem "activerecord", "4.2.1"
+gem "activerecord", "~> 4.2.0"

data/lib/schema_validations/active_record/validations.rb

@@ -159,13 +159,27 @@ module SchemaValidations
       def add_uniqueness_validation(column) #:nodoc:
         scope = column.unique_scope.map(&:to_sym)
         name = column.name.to_sym
-        validate_logged :validates_uniqueness_of, name, :scope => scope, :allow_nil => true, :if => (proc do |record|
+
+        options = {}
+        options[:scope] = scope if scope.any?
+        options[:allow_nil] = true
+        options[:case_sensitive] = false if has_case_insensitive_index?(column, scope)
+        options[:if] = (proc do |record|
           if scope.all? { |scope_sym| record.public_send(:"#{scope_sym}?") }
             record.public_send(:"#{column.name}_changed?")
           else
             false
           end
         end)
+
+        validate_logged :validates_uniqueness_of, name, options
+      end
+
+      def has_case_insensitive_index?(column, scope)
+        indexed_columns = (scope + [column.name]).map(&:to_sym).sort
+        index = column.indexes.select { |i| i.unique && i.columns.map(&:to_sym).sort == indexed_columns }.first
+
+        index && index.respond_to?(:case_sensitive?) && !index.case_sensitive?
       end
 
       def create_schema_validations? #:nodoc:

data/lib/schema_validations/version.rb

@@ -1,3 +1,3 @@
 module SchemaValidations
-  VERSION = "1.3.1"
+  VERSION = "1.4.0"
 end

data/schema_dev.yml

@@ -1,7 +1,7 @@
 ruby:
   - 2.1.5
 activerecord:
-  - 4.2.1
+  - 4.2
 db:
   - mysql2
   - postgresql

data/spec/spec_helper.rb

@@ -15,8 +15,12 @@ DatabaseCleaner.strategy = :truncation
 SchemaDev::Rspec.setup
 
 RSpec.configure do |config|
-  config.before(:each) do
+  config.around(:each) do |example|
     DatabaseCleaner.clean
+    remove_all_models
+    ActiveRecord::Migration.suppress_messages do
+      example.run
+    end
   end
 end
 

data/spec/validations_spec.rb

@@ -2,12 +2,34 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Validations" do
 
-  before(:all) do
-    define_schema
-  end
+  before(:each) do
+    ActiveRecord::Schema.define do
+
+      create_table :articles, :force => true do |t|
+        t.string :title, :limit => 50
+        t.text  :content, :null => false
+        t.integer :state
+        t.integer :votes
+        t.float   :average_mark, :null => false
+        t.boolean :active, :null => false
+      end
+      add_index :articles, :title, :unique => true
+      add_index :articles, [:state, :active], :unique => true
+
+      create_table :reviews, :force => true do |t|
+        t.integer :article_id, :null => false
+        t.string :author, :null => false
+        t.string :content, :limit => 200
+        t.string :type
+      end
+      add_index :reviews, :article_id, :unique => true
 
-  after(:each) do
-    remove_all_models
+      create_table :article_reviews, :force => true do |t|
+        t.integer :article_id
+        t.integer :review_id
+      end
+      add_index :article_reviews, [:article_id, :review_id], :unique => true
+    end
   end
 
   context "auto-created" do
@@ -298,6 +320,64 @@ describe "Validations" do
     end
   end if ActiveRecord::Base.respond_to? :enum
 
+  context 'with case sensitive options' do
+    before do
+      allow_any_instance_of(ActiveRecord::ConnectionAdapters::IndexDefinition).to receive(:case_sensitive?).and_return(false)
+    end
+
+    context 'without scope' do
+      before do
+        ActiveRecord::Schema.define do
+          create_table :books, :force => true do |t|
+            t.string :title
+          end
+
+          add_index :books, :title, :unique => true
+        end
+
+        with_auto_validations do
+          class Book < ActiveRecord::Base; end
+        end
+      end
+
+      it "should validate the uniqueness in a case insensitive manner" do
+        mixed_case_title = 'Schema Validations'
+        Book.create(title: mixed_case_title)
+
+        expect(Book.new(title: mixed_case_title)).not_to be_valid
+        expect(Book.new(title: mixed_case_title.downcase)).not_to be_valid
+      end
+    end
+
+    context 'within a scope' do
+      before do
+        ActiveRecord::Schema.define do
+          create_table :folders, :force => true do |t|
+            t.integer :parent_id
+            t.string :name
+          end
+
+          add_index :folders, [:parent_id, :name], :unique => true
+        end
+
+        with_auto_validations do
+          class Folder < ActiveRecord::Base
+            belongs_to :parent, class_name: Folder.name
+          end
+        end
+      end
+
+      it "should validate the uniqueness in a case insensitive manner" do
+        mixed_case_name = 'Schema Validations'
+        parent_folder = Folder.create
+        Folder.create(:parent => parent_folder, :name => mixed_case_name)
+
+        expect(Folder.new(:parent => parent_folder, :name => mixed_case_name)).not_to be_valid
+        expect(Folder.new(:parent => parent_folder, :name => mixed_case_name.downcase)).not_to be_valid
+      end
+    end
+  end
+
   protected
   def with_auto_validations(value = true)
     old_value = SchemaValidations.config.auto_create
@@ -311,38 +391,6 @@ describe "Validations" do
     end
   end
 
-  def define_schema
-    ActiveRecord::Migration.suppress_messages do
-      ActiveRecord::Schema.define do
-        connection.tables.each do |table| drop_table table end
-
-        create_table :articles, :force => true do |t|
-          t.string :title, :limit => 50
-          t.text  :content, :null => false
-          t.integer :state
-          t.integer :votes
-          t.float   :average_mark, :null => false
-          t.boolean :active, :null => false
-        end
-        add_index :articles, :title, :unique => true
-        add_index :articles, [:state, :active], :unique => true
-
-        create_table :reviews, :force => true do |t|
-          t.integer :article_id, :null => false
-          t.string :author, :null => false
-          t.string :content, :limit => 200
-          t.string :type
-        end
-        add_index :reviews, :article_id, :unique => true
-
-        create_table :article_reviews, :force => true do |t|
-          t.integer :article_id
-          t.integer :review_id
-        end
-        add_index :article_reviews, [:article_id, :review_id], :unique => true
-      end
-    end
-  end
 
   def valid_article_attributes
     {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_validations
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-28 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: schema_plus_columns
@@ -175,10 +175,10 @@ files:
 - README.md
 - Rakefile
 - gemfiles/Gemfile.base
-- gemfiles/activerecord-4.2.1/Gemfile.base
-- gemfiles/activerecord-4.2.1/Gemfile.mysql2
-- gemfiles/activerecord-4.2.1/Gemfile.postgresql
-- gemfiles/activerecord-4.2.1/Gemfile.sqlite3
+- gemfiles/activerecord-4.2/Gemfile.base
+- gemfiles/activerecord-4.2/Gemfile.mysql2
+- gemfiles/activerecord-4.2/Gemfile.postgresql
+- gemfiles/activerecord-4.2/Gemfile.sqlite3
 - init.rb
 - lib/schema_validations.rb
 - lib/schema_validations/active_record/validations.rb