soft_deletion 0.4.5 → 0.4.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    soft_deletion (0.4.5)
+    soft_deletion (0.4.6)
 
 GEM
   remote: https://rubygems.org/

data/Readme.md

@@ -46,6 +46,7 @@ Authors
  - [Steven Davidovitz](https://github.com/steved555)
  - [PikachuEXE](https://github.com/PikachuEXE)
  - [Noel Dellofano](https://github.com/pinkvelociraptor)
+ - [Oliver Nightingale](https://github.com/olivernn)
 
 [Zendesk](http://zendesk.com)<br/>
 michael@grosser.it<br/>

data/lib/soft_deletion/dependency.rb

@@ -38,7 +38,8 @@ module SoftDeletion
         else
           association.primary_key_name
         end
-        dependency.update_attribute(foreign_key, nil)
+        method = (ActiveRecord::VERSION::STRING >= "3.1" ? :update_column : :update_attribute)
+        dependency.send(method, foreign_key, nil)
       end
     end
 

data/lib/soft_deletion/setup.rb

@@ -24,7 +24,12 @@ module SoftDeletion
         if options[:default_scope] && table_exists? && column_names.include?("deleted_at")
           # Avoids a bad SQL request with versions of code without the column deleted_at (for example a migration prior to the migration
           # that adds deleted_at)
-          default_scope :conditions => { :deleted_at => nil }
+          conditions = {:deleted_at => nil}
+          if ActiveRecord::VERSION::STRING < "3.1"
+            default_scope :conditions => conditions
+          else
+            default_scope { where(conditions) }
+          end
         end
       end
     end

data/lib/soft_deletion/version.rb

@@ -1,3 +1,3 @@
 module SoftDeletion
-  VERSION = '0.4.5'
+  VERSION = '0.4.6'
 end

data/spec/soft_deletion_spec.rb

@@ -332,13 +332,32 @@ describe SoftDeletion do
   end
 
   context "without deleted_at column" do
-    it "should default scope should not provoke an error" do
+    it "does not provoke an error" do
       expect do
         OriginalCategory.create!
       end.to_not raise_error
     end
   end
 
+  context "default_scope" do
+    let(:forum) do
+      # create! does not work on rails 2
+      f = Cat2Forum.new
+      f.deleted_at = Time.now
+      f.save!
+      f
+    end
+
+    it "prevents find when deleted" do
+      Cat2Forum.find_by_id(forum.id).should == nil
+    end
+
+    it "can find without deleted" do
+      forum.update_attributes(:deleted_at => nil)
+      Cat2Forum.find_by_id(forum.id).should_not == nil
+    end
+  end
+
   describe ".soft_delete_all!" do
     before do
       @categories = 2.times.map { Category.create! }

data/spec/spec_helper.rb

@@ -168,3 +168,9 @@ class Cat1Forum < ActiveRecord::Base
   belongs_to :category
 end
 
+class Cat2Forum < ActiveRecord::Base
+  silent_set_table_name 'forums'
+
+  has_soft_deletion :default_scope => true
+end
+

metadata

@@ -1,42 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: soft_deletion
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
   prerelease: 
 platform: ruby
 authors:
 - Zendesk
 autorequire: 
 bindir: bin
-cert_chain:
-- !binary |-
-  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURNakNDQWhxZ0F3SUJB
-  Z0lCQURBTkJna3Foa2lHOXcwQkFRVUZBREEvTVJBd0RnWURWUVFEREFkdGFX
-  Tm8KWVdWc01SY3dGUVlLQ1pJbWlaUHlMR1FCR1JZSFozSnZjM05sY2pFU01C
-  QUdDZ21TSm9tVDhpeGtBUmtXQW1sMApNQjRYRFRFek1ESXdNekU0TVRNeE1W
-  b1hEVEUwTURJd016RTRNVE14TVZvd1B6RVFNQTRHQTFVRUF3d0hiV2xqCmFH
-  RmxiREVYTUJVR0NnbVNKb21UOGl4a0FSa1dCMmR5YjNOelpYSXhFakFRQmdv
-  SmtpYUprL0lzWkFFWkZnSnAKZERDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFB
-  RGdnRVBBRENDQVFvQ2dnRUJBTW9yWG8vaGdiVXE5NytrSUk5SApNc1FjTGRD
-  Lzd3UTFaUDJPc2hWSFBrZVAwcUg4TUJIR2c2ZVlpc09YMnViTmFnRjlZVENa
-  V25ocmRLcndwTE9PCmNQTGFaYmpVamxqSjNjUVIzQjhZbjF2ZVY1SWhHODZR
-  c2VUQmp5bXpKV3NMcHFKMVVaR3BmQjl0WGNzRnR1eE8KNnZIdmNJSGR6dmMv
-  T1VrSUN0dExiSCsxcWI2cnNIVWNlcWgrSnJINEdyc0o1SDRoQWZJZHlTMlhN
-  SzdZUktiaApoK0lCdTZkRldKSkJ5ekZzWW1WMVBEWGxuM1VCbWdBdDY1Y21D
-  dTRxUGZUaGlvQ0dEemJTSnJHREdMbXcvcEZYCkZQcFZDbTF6Z1lTYjF2NlFu
-  ZjNjZ1hhMmYyd1lHbTE3K3pBVnlJRHB3cnlGcnU5eUYvakp4RTM4ei9EUnNk
-  OVIKLzg4Q0F3RUFBYU01TURjd0NRWURWUjBUQkFJd0FEQWRCZ05WSFE0RUZn
-  UVVzaU5uWEh0S2VNWVljcjR5SlZtUQpXT05MK0l3d0N3WURWUjBQQkFRREFn
-  U3dNQTBHQ1NxR1NJYjNEUUVCQlFVQUE0SUJBUUFseU43a0tvL05RQ1EwCkFP
-  elpMWjNXQWVQdlN0a0NGSUo1M3RzdjVLeW80cE1BbGx2K0JnUHp6QnQ3cWk2
-  MDVtRlNMNnpCZDl1TG91K1cKQ28zczQ4cDFkeTdDampBZlZRZG1WTkhGM013
-  WHRmQzJPRXl2U1FQaTR4S1I4aWJhOHdhM3hwOUxWbzFQdUxwdwovNkRzckNo
-  V3c3NEhmc0pONnFKT0s2ODRoSmVUOGxCWUFVZmlDM3dEMG93b1BTZytYdHlB
-  QWRkaXNSK0tWNVkxCk5tVkh1THRRY05UWnkrZ1JodDNhaEpSTXVDNlF5TG1r
-  VHNmKzZNYWVud0FNa0FnSGRzd0dzSnp0T25ObkJhM0YKeTBrQ1NXbUs2RCt4
-  L1NiZlM2cjdLZTA3TVJxemlKZEI5R3VFMSswY0lSdUZoOEVRK0xONkhYQ0tN
-  NXBvbi9HVQp5Y3dNWGZsMAotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2013-07-26 00:00:00.000000000 Z
+cert_chain: []
+date: 2013-08-24 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -81,7 +54,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 888472233015841176
+      hash: 2245798785145605998
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -90,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 888472233015841176
+      hash: 2245798785145605998
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25