paranoid2 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f9a15a900223d0201ed3b29ca9c35ac48800545
-  data.tar.gz: 4214d3d5cbceb9dfc2f66f035f4a794b96208ec2
+  metadata.gz: 41f8a90b29f702033ddfbcd98b0a63efa4f92a9e
+  data.tar.gz: 8e4db488f8d9fa3b829be3f3408c8eebc8999ca9
 SHA512:
-  metadata.gz: ba9e499c0ddb509a80e6f28c99cd99e2eb20abfed81c39d83c4f36943925ff129221e135a74c885002e1a11a85f837d122cecdae47d29c52e9e75e569495dc98
-  data.tar.gz: 5c0d65b7cb3bd6b718b6094bdd9f784e91f04d1901a8d320cdf99dbf2147a835d84b24ff639af8eee3b413ec64beaacb1286749a5ef911d56152ac3cb614f980
+  metadata.gz: 85c9bef842a3c280a85ad375ef80e8586ef87397092dc8b15a32a3bac7fbf66af4445583d28b743b3ae88423e033eee9ce21c7b7ad64482c7ea55c24ae2ef0cc
+  data.tar.gz: b0533d5734434f3d0d21bc07c7789326b201dbfc55748198209899040e491122d7858745c553f9efbe8fe4a23dea488e2abae725ab36e88eea1cd9b0a31e450f

data/lib/paranoid2/scoping.rb

@@ -19,6 +19,6 @@ module Paranoid2
       def with_deleted
         all.tap { |s| s.default_scoped = false }
       end
-    end    
+    end
   end
 end

data/lib/paranoid2/version.rb

@@ -1,3 +1,3 @@
 module Paranoid2
-  VERSION = '1.1.3'
+  VERSION = '1.1.4'
 end

data/paranoid2.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'activerecord', '>= 4.0.0.rc1'
+  gem.add_dependency 'activerecord', '>= 4.0.0'
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "sqlite3"

data/spec/paranoid2_spec.rb

@@ -117,12 +117,24 @@ describe Paranoid2 do
       b.destroy
       parent1.paranoid_models.count.must_equal 0
       parent1.paranoid_models.only_deleted.count.must_equal 1
-    
+
       c = model.create(parent_model: parent1)
       parent1.paranoid_models.with_deleted.count.must_equal 2
       parent1.paranoid_models.with_deleted.must_equal [a, c]
     end
 
+    it 'allows "Model#includes"' do
+      parent1 = ParentModel.create
+      parent2 = ParentModel.create
+      a = model.create(parent_model: parent1)
+      b = model.create(parent_model: parent2)
+
+      l = ActiveRecord::Base.logger
+      ActiveRecord::Base.logger = Logger.new(STDOUT)
+      res = model.includes(:parent_model).merge(ParentModel.with_deleted).references(:parent_model).to_a
+      ActiveRecord::Base.logger = l
+    end
+
     it 'works with has_many_through relationships' do
       employer = Employer.create
       employee = Employee.create
@@ -170,7 +182,7 @@ describe Paranoid2 do
       a.reload
 
       parent.wont_be :destroyed?
-      a.wont_be :destroyed?            
+      a.wont_be :destroyed?
     end
 
     it 'restores belongs_to associations' do
@@ -197,7 +209,7 @@ describe Paranoid2 do
     it 'delete without callback' do
       object.save
       object.delete
-      
+
       object.callback_called.must_be_nil
     end
 
@@ -218,5 +230,13 @@ describe Paranoid2 do
       scope = model.where(name: 'foo').only_deleted
       scope.where_values_hash['name'].must_equal 'foo'
     end
+
+    it 'validates uniqueness with scope' do
+      a = model.create!(name: 'yury', phone: '9106701550')
+      b = model.create(name: 'bla', phone: '9106701550')
+      b.wont_be :valid?
+      a.destroy
+      b.must_be :valid?
+    end
   end
 end

data/spec/spec_helper.rb

@@ -12,7 +12,7 @@ ActiveRecord::Base.establish_connection adapter: 'sqlite3', :database => DB_FILE
 
 [ 'CREATE TABLE parent_models (id INTEGER NOT NULL PRIMARY KEY, deleted_at DATETIME)',
   'CREATE TABLE paranoid_models (id INTEGER NOT NULL PRIMARY KEY, parent_model_id INTEGER, deleted_at DATETIME)',
-  'CREATE TABLE featureful_models (id INTEGER NOT NULL PRIMARY KEY, deleted_at DATETIME, name VARCHAR(32))',
+  'CREATE TABLE featureful_models (id INTEGER NOT NULL PRIMARY KEY, deleted_at DATETIME, name VARCHAR(32), phone VARCHAR(20))',
   'CREATE TABLE plain_models (id INTEGER NOT NULL PRIMARY KEY, deleted_at DATETIME)',
   'CREATE TABLE callback_models (id INTEGER NOT NULL PRIMARY KEY, deleted_at DATETIME)',
   'CREATE TABLE related_models (id INTEGER NOT NULL PRIMARY KEY, parent_model_id INTEGER NOT NULL, deleted_at DATETIME)',

data/spec/spec_models.rb

@@ -15,6 +15,9 @@ class FeaturefulModel < ActiveRecord::Base
   paranoid
 
   validates :name, presence: true, uniqueness: true
+  validates :phone, uniqueness: {conditions: -> { paranoid_scope } }
+
+  scope :find_last, lambda {|name| where(name: name).last }
 end
 
 class CallbackModel < ActiveRecord::Base

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: paranoid2
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - yury
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-23 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc1
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc1
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: paranoid models for rails 4
@@ -59,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -82,17 +82,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: paranoid models for rails 4