soft_deletion 0.1.3 → 0.1.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    soft_deletion (0.1.3)
+    soft_deletion (0.1.4)
 
 GEM
   remote: http://rubygems.org/

data/gemfiles/rails2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/soft_deletion
   specs:
-    soft_deletion (0.1.2)
+    soft_deletion (0.1.3)
 
 GEM
   remote: http://rubygems.org/

data/gemfiles/rails3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/soft_deletion
   specs:
-    soft_deletion (0.1.2)
+    soft_deletion (0.1.3)
 
 GEM
   remote: http://rubygems.org/

data/lib/soft_deletion/version.rb

@@ -1,3 +1,3 @@
 module SoftDeletion
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/lib/soft_deletion.rb

@@ -8,7 +8,12 @@ module SoftDeletion
       raise "You can only include this if #{base} extends ActiveRecord::Base"
     end
     base.extend(ClassMethods)
-    base.send(:default_scope, :conditions => base.soft_delete_default_scope_conditions)
+
+    # Avoids a bad SQL request with versions of code without the colun deleted_at (for example a migration prior to the migration
+    # that adds deleted_at)
+    if base.column_names.include?('deleted_at')
+      base.send(:default_scope, :conditions => base.soft_delete_default_scope_conditions)
+    end
 
     # backport after_soft_delete so we can safely upgrade to rails 3
     if ActiveRecord::VERSION::MAJOR > 2

data/test/soft_deletion_test.rb

@@ -20,6 +20,9 @@ ActiveRecord::Schema.define(:version => 1) do
   create_table :categories do |t|
     t.timestamp :deleted_at
   end
+
+  create_table :original_categories do |t|
+  end
 end
 
 class ActiveRecord::Base
@@ -45,31 +48,35 @@ end
 
 # No association
 class NACategory < ActiveRecord::Base
-  include SoftDeletion
   silent_set_table_name 'categories'
+  include SoftDeletion
 end
 
 # Independent association
 class IDACategory < ActiveRecord::Base
-  include SoftDeletion
   silent_set_table_name 'categories'
+  include SoftDeletion
   has_many :forums, :dependent => :destroy, :foreign_key => :category_id
 end
 
 # Nullified dependent association
 class NDACategory < ActiveRecord::Base
-  include SoftDeletion
   silent_set_table_name 'categories'
+  include SoftDeletion
   has_many :forums, :dependent => :destroy, :foreign_key => :category_id
 end
 
 # Has ome association
 class HOACategory < ActiveRecord::Base
-  include SoftDeletion
   silent_set_table_name 'categories'
+  include SoftDeletion
   has_one :forum, :dependent => :destroy, :foreign_key => :category_id
 end
 
+# Class without column deleted_at
+class OriginalCategory < ActiveRecord::Base
+  include SoftDeletion
+end
 
 def clear_callbacks(model, callback)
   if ActiveRecord::VERSION::MAJOR > 2
@@ -214,4 +221,12 @@ class SoftDeletionTest < ActiveSupport::TestCase
       #assert_nil forum.category_id # TODO
     end
   end
+
+  context 'without deleted_at column' do
+    should 'default scope should not provoke an error' do
+      assert_nothing_raised do
+        OriginalCategory.create!
+      end
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: soft_deletion
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Zendesk
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-08 00:00:00 Z
+date: 2012-06-05 00:00:00 Z
 dependencies: []
 
 description: