paranoia_uniqueness_validator 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c8349a30e88d13b9971047c6d29d61dd7128bf0
-  data.tar.gz: 287a9fdef45d7de4f778812ef448d16dca1c96c3
+  metadata.gz: a61f98888b05a46e6a994dd16e1bdf7136a22c91
+  data.tar.gz: 19699acd3367c7551a071a1accae0105c8f0a9cd
 SHA512:
-  metadata.gz: 43e9b1d5ffdd891470b02979736783f422a236b678da580a8caf67b2c34a20db18e59efc3e4a58d91f3bbd4bc6941177dfd80d22a94d4e0643baa8b023092737
-  data.tar.gz: 5c0a1049cf15ea515caa4f14acc70ab06b87b0e7d36940eeaa7cbf05e63fd69088b17ed29ddd4ca8c1f03d6e865ba1a47fbedcc6d4ab682dfdc84c182cf3f038
+  metadata.gz: 45cddd3449be7e2d54767cd37e4251e0e9bb79aa9d019f32c093716aaa869acee8fefb21ebbc6e46b1d16460d4f4a85c367cac17978c8858024b9ee6122955de
+  data.tar.gz: 2fd6d1fd44c9bb25fb7a34d87e08c9d638599ec9a42c6028322a0f769e645b2d47cd52528ce017ffd69fe172b62c3fb5b4bbf9d782b2c91f0e1ff8d6ab5fd597

data/.travis.yml

@@ -16,3 +16,4 @@ matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
+sudo: false

data/Gemfile

@@ -26,6 +26,10 @@ platforms :ruby do
   gem "test-unit"
 end
 
+platforms :ruby_19, :jruby_19 do
+  gem "mime-types", "< 3.0"
+end
+
 platforms :rbx do
   #gem 'psych'
   #gem 'racc'

data/README.md

@@ -1,4 +1,4 @@
-# ParanoiaUniquenessValidator [![endorse](http://api.coderwall.com/anthonator/endorsecount.png)](http://coderwall.com/anthonator)
+# ParanoiaUniquenessValidator
 
 Adds validator validates_uniqueness_without_deleted.
 
@@ -14,7 +14,7 @@ Add this line to your application's Gemfile:
     gem 'paranoia_uniqueness_validator', '0.1.0'
 
     # Rails 4
-    gem 'paranoia_uniqueness_validator', '1.0.0'
+    gem 'paranoia_uniqueness_validator', '1.1.0'
 And then execute:
 
     $ bundle

data/lib/paranoia_uniqueness_validator/validations/uniqueness_without_deleted.rb

@@ -13,7 +13,11 @@ module ParanoiaUniquenessValidator
 
         relation = build_relation(finder_class, table, attribute, value)
         relation = relation.and(table[finder_class.primary_key.to_sym].not_eq(record.id)) if record.persisted?
-        relation = relation.and(table[:deleted_at].eq(nil))
+
+        default_sentinel_value = Object.const_defined?('Paranoia') ? Paranoia.default_sentinel_value : nil
+
+        relation = relation.and(table[:deleted_at].eq(default_sentinel_value))
+
         relation = scope_relation(record, table, relation)
         relation = finder_class.unscoped.where(relation)
         relation = relation.merge(options[:conditions]) if options[:conditions]

data/lib/paranoia_uniqueness_validator/version.rb

@@ -1,3 +1,3 @@
 module ParanoiaUniquenessValidator
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/spec/dummy/app/models/dummy_non_nil_model.rb

@@ -0,0 +1,3 @@
+class DummyNonNilModel < ActiveRecord::Base
+  validates :unique_field, :uniqueness_without_deleted => true
+end

data/spec/dummy/db/migrate/20160421194241_create_dummy_non_nil_models.rb

@@ -0,0 +1,10 @@
+class CreateDummyNonNilModels < ActiveRecord::Migration
+  def change
+    create_table :dummy_non_nil_models do |t|
+      t.string   :unique_field
+      t.datetime :deleted_at, null: false, default: DateTime.new(0)
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,13 +11,20 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20130511080827) do
+ActiveRecord::Schema.define(version: 20160421194241) do
 
-  create_table "dummy_models", force: true do |t|
-    t.string   "unique_field"
+  create_table "dummy_models", force: :cascade do |t|
+    t.string   "unique_field", limit: 255
     t.datetime "deleted_at"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
+  create_table "dummy_non_nil_models", force: :cascade do |t|
+    t.string   "unique_field"
+    t.datetime "deleted_at",   default: '0000-01-01 00:00:00', null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
 end

data/spec/validations/uniqueness_without_deleted_spec.rb

@@ -1,15 +1,47 @@
 require 'spec_helper'
+require 'paranoia'
+
 
 describe ParanoiaUniquenessValidator::Validations::UniquenessWithoutDeletedValidator do
-  it "should validate uniqueness" do
-    DummyModel.create(:unique_field => "unique")
-    DummyModel.new(:unique_field => "unique").should_not be_valid
+
+  context 'with nil default_sentinel_value' do
+
+    before(:all) do
+      Paranoia.default_sentinel_value = nil
+    end
+
+    it "should validate uniqueness" do
+      DummyModel.create(:unique_field => "unique")
+      DummyModel.new(:unique_field => "unique").should_not be_valid
+    end
+
+    it "should should be valid if not unique with a deleted record" do
+      dummy_model = DummyModel.create(:unique_field => "unique")
+      dummy_model.destroy
+      dummy_model = DummyModel.new(:unique_field => "unique")
+      dummy_model.should be_valid
+    end
+
   end
 
-  it "should should be valid if not unqiue with a deleted record" do
-    dummy_model = DummyModel.create(:unique_field => "unique")
-    dummy_model.destroy
-    dummy_model = DummyModel.new(:unique_field => "unique")
-    dummy_model.should be_valid
+  context 'with datetime (non nil) default_sentinel_value' do
+
+    before(:all) do
+      Paranoia.default_sentinel_value = DateTime.new(0)
+    end
+
+    it "should validate uniqueness" do
+      DummyNonNilModel.create(:unique_field => "unique")
+      DummyNonNilModel.new(:unique_field => "unique").should_not be_valid
+    end
+
+    it "should should be valid if not unique with a deleted record" do
+      dummy_model = DummyNonNilModel.create(:unique_field => "unique")
+      dummy_model.destroy
+      dummy_model = DummyNonNilModel.new(:unique_field => "unique")
+      dummy_model.should be_valid
+    end
+
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paranoia_uniqueness_validator
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Anthony Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -97,6 +97,7 @@ files:
 - spec/dummy/app/models/.keep
 - spec/dummy/app/models/concerns/.keep
 - spec/dummy/app/models/dummy_model.rb
+- spec/dummy/app/models/dummy_non_nil_model.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
@@ -119,6 +120,7 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20130511080827_create_dummy_models.rb
+- spec/dummy/db/migrate/20160421194241_create_dummy_non_nil_models.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
 - spec/dummy/db/test.sqlite3
@@ -153,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Validate unique fields without letting those pesky deleted records get in
@@ -172,6 +174,7 @@ test_files:
 - spec/dummy/app/models/.keep
 - spec/dummy/app/models/concerns/.keep
 - spec/dummy/app/models/dummy_model.rb
+- spec/dummy/app/models/dummy_non_nil_model.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
@@ -194,6 +197,7 @@ test_files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20130511080827_create_dummy_models.rb
+- spec/dummy/db/migrate/20160421194241_create_dummy_non_nil_models.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
 - spec/dummy/db/test.sqlite3