soft_deletion 0.1.8 → 0.1.9

data/Gemfile

@@ -8,4 +8,4 @@ gem 'rake'
 gem 'shoulda'
 gem 'mocha'
 gem 'sqlite3'
-gem 'mynyml-redgreen'
+gem 'test-unit', '2.2' # >2.2 does not show dots

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    soft_deletion (0.1.8)
+    soft_deletion (0.1.9)
 
 GEM
   remote: http://rubygems.org/
@@ -25,12 +25,10 @@ GEM
     i18n (0.6.0)
     mocha (0.9.12)
     multi_json (1.3.4)
-    mynyml-redgreen (0.7.1)
-      term-ansicolor (>= 1.0.4)
     rake (0.9.2.2)
     shoulda (2.10.3)
     sqlite3 (1.3.6)
-    term-ansicolor (1.0.7)
+    test-unit (2.2.0)
     tzinfo (0.3.33)
 
 PLATFORMS
@@ -41,8 +39,8 @@ DEPENDENCIES
   activesupport
   appraisal
   mocha
-  mynyml-redgreen
   rake
   shoulda
   soft_deletion!
   sqlite3
+  test-unit (= 2.2)

data/gemfiles/rails2.gemfile

@@ -7,7 +7,7 @@ gem "rake"
 gem "shoulda"
 gem "mocha"
 gem "sqlite3"
-gem "mynyml-redgreen"
+gem "test-unit", "2.2"
 gem "activerecord", "2.3.14"
 gem "activesupport", "2.3.14"
 

data/gemfiles/rails2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/soft_deletion
   specs:
-    soft_deletion (0.1.7)
+    soft_deletion (0.1.8)
 
 GEM
   remote: http://rubygems.org/
@@ -13,12 +13,10 @@ GEM
       bundler
       rake
     mocha (0.9.12)
-    mynyml-redgreen (0.7.1)
-      term-ansicolor (>= 1.0.4)
     rake (0.9.2.2)
     shoulda (2.10.3)
     sqlite3 (1.3.6)
-    term-ansicolor (1.0.7)
+    test-unit (2.2.0)
 
 PLATFORMS
   ruby
@@ -28,8 +26,8 @@ DEPENDENCIES
   activesupport (= 2.3.14)
   appraisal
   mocha
-  mynyml-redgreen
   rake
   shoulda
   soft_deletion!
   sqlite3
+  test-unit (= 2.2)

data/gemfiles/rails3.gemfile

@@ -7,7 +7,7 @@ gem "rake"
 gem "shoulda"
 gem "mocha"
 gem "sqlite3"
-gem "mynyml-redgreen"
+gem "test-unit", "2.2"
 gem "activerecord", "3.2.3"
 gem "activesupport", "3.2.3"
 

data/gemfiles/rails3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/soft_deletion
   specs:
-    soft_deletion (0.1.7)
+    soft_deletion (0.1.8)
 
 GEM
   remote: http://rubygems.org/
@@ -25,12 +25,10 @@ GEM
     i18n (0.6.0)
     mocha (0.9.12)
     multi_json (1.3.4)
-    mynyml-redgreen (0.7.1)
-      term-ansicolor (>= 1.0.4)
     rake (0.9.2.2)
     shoulda (2.10.3)
     sqlite3 (1.3.6)
-    term-ansicolor (1.0.7)
+    test-unit (2.2.0)
     tzinfo (0.3.33)
 
 PLATFORMS
@@ -41,8 +39,8 @@ DEPENDENCIES
   activesupport (= 3.2.3)
   appraisal
   mocha
-  mynyml-redgreen
   rake
   shoulda
   soft_deletion!
   sqlite3
+  test-unit (= 2.2)

data/lib/soft_deletion.rb

@@ -11,12 +11,10 @@ module SoftDeletion
 
     if base.respond_to?(:define_default_soft_delete_scope)
       base.define_default_soft_delete_scope
-    else
+    elsif base.table_exists? && base.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)
-      if base.column_names.include?('deleted_at')
-        base.send(:default_scope, :conditions => { :deleted_at => nil })
-      end
+      base.send(:default_scope, :conditions => { :deleted_at => nil })
     end
 
     # backport after_soft_delete so we can safely upgrade to rails 3

data/lib/soft_deletion/version.rb

@@ -1,3 +1,3 @@
 module SoftDeletion
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

data/test/soft_deletion_test.rb

@@ -1,105 +1,4 @@
-require 'soft_deletion'
-
-require 'active_support/test_case'
-require 'shoulda'
-require 'redgreen'
-
-# connect
-ActiveRecord::Base.establish_connection(
-  :adapter => "sqlite3",
-  :database => ":memory:"
-)
-
-# create tables
-ActiveRecord::Schema.define(:version => 1) do
-  create_table :forums do |t|
-    t.integer :category_id
-    t.timestamp :deleted_at
-  end
-
-  create_table :categories do |t|
-    t.timestamp :deleted_at
-  end
-
-  create_table :original_categories do |t|
-  end
-end
-
-class ActiveRecord::Base
-  def self.silent_set_table_name(name)
-    if ActiveRecord::VERSION::MAJOR > 2
-      self.table_name = name
-    else
-      set_table_name name
-    end
-  end
-end
-
-# setup models
-class Forum < ActiveRecord::Base
-  include SoftDeletion
-  belongs_to :category
-end
-
-class Category < ActiveRecord::Base
-  include SoftDeletion
-  has_many :forums, :dependent => :destroy
-end
-
-# No association
-class NACategory < ActiveRecord::Base
-  silent_set_table_name 'categories'
-  include SoftDeletion
-end
-
-# Independent association
-class IDACategory < ActiveRecord::Base
-  silent_set_table_name 'categories'
-  include SoftDeletion
-  has_many :forums, :dependent => :destroy, :foreign_key => :category_id
-end
-
-# Nullified dependent association
-class NDACategory < ActiveRecord::Base
-  silent_set_table_name 'categories'
-  include SoftDeletion
-  has_many :forums, :dependent => :destroy, :foreign_key => :category_id
-end
-
-# Has ome association
-class HOACategory < ActiveRecord::Base
-  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
-
-# Has many destroyable association
-class DACategory < ActiveRecord::Base
-  silent_set_table_name 'categories'
-  include SoftDeletion
-  has_many :destroyable_forums, :dependent => :destroy, :foreign_key => :category_id
-end
-
-# Forum that isn't soft deletable for association checing
-class DestroyableForum < ActiveRecord::Base
-  silent_set_table_name 'forums'
-end
-
-def clear_callbacks(model, callback)
-  if ActiveRecord::VERSION::MAJOR > 2
-    model.reset_callbacks callback
-  else
-    model.class_eval do
-      instance_variable_set "@before_#{callback}_callbacks", nil
-      instance_variable_set "@after_#{callback}_callbacks", nil
-    end
-  end
-end
+require File.expand_path '../test_helper', __FILE__
 
 class SoftDeletionTest < ActiveSupport::TestCase
   def assert_deleted(resource)
@@ -329,4 +228,19 @@ class SoftDeletionTest < ActiveSupport::TestCase
       end
     end
   end
+
+  context "overwritten default scope" do
+    should "find even with deleted_at" do
+      forum = Cat1Forum.create(:deleted_at => Time.now)
+      assert Cat1Forum.find_by_id(forum.id)
+    end
+
+    should "not find by new scope" do
+      # create! does not work here on rails 2
+      forum = Cat1Forum.new
+      forum.category_id = 2
+      forum.save!
+      assert_nil Cat1Forum.find_by_id(forum.id)
+    end
+  end
 end

data/test/test_helper.rb

@@ -0,0 +1,122 @@
+require 'active_support/test_case'
+require 'shoulda'
+require 'active_record'
+
+ENV['EMACS'] = 't' # colors for test-unit < 2.4.9
+
+def clear_callbacks(model, callback)
+  if ActiveRecord::VERSION::MAJOR > 2
+    model.reset_callbacks callback
+  else
+    model.class_eval do
+      instance_variable_set "@before_#{callback}_callbacks", nil
+      instance_variable_set "@after_#{callback}_callbacks", nil
+    end
+  end
+end
+
+# connect
+ActiveRecord::Base.establish_connection(
+  :adapter => "sqlite3",
+  :database => ":memory:"
+)
+
+# create tables
+ActiveRecord::Schema.define(:version => 1) do
+  create_table :forums do |t|
+    t.integer :category_id
+    t.timestamp :deleted_at
+  end
+
+  create_table :categories do |t|
+    t.timestamp :deleted_at
+  end
+
+  create_table :original_categories do |t|
+  end
+end
+
+class ActiveRecord::Base
+  def self.silent_set_table_name(name)
+    if ActiveRecord::VERSION::MAJOR > 2
+      self.table_name = name
+    else
+      set_table_name name
+    end
+  end
+end
+
+# setup models
+require 'soft_deletion'
+
+class Forum < ActiveRecord::Base
+  include SoftDeletion
+  belongs_to :category
+end
+
+class Category < ActiveRecord::Base
+  include SoftDeletion
+  has_many :forums, :dependent => :destroy
+end
+
+# No association
+class NACategory < ActiveRecord::Base
+  silent_set_table_name 'categories'
+  include SoftDeletion
+end
+
+# Independent association
+class IDACategory < ActiveRecord::Base
+  silent_set_table_name 'categories'
+  include SoftDeletion
+  has_many :forums, :dependent => :destroy, :foreign_key => :category_id
+end
+
+# Nullified dependent association
+class NDACategory < ActiveRecord::Base
+  silent_set_table_name 'categories'
+  include SoftDeletion
+  has_many :forums, :dependent => :destroy, :foreign_key => :category_id
+end
+
+# Has ome association
+class HOACategory < ActiveRecord::Base
+  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
+
+# Has many destroyable association
+class DACategory < ActiveRecord::Base
+  silent_set_table_name 'categories'
+  include SoftDeletion
+  has_many :destroyable_forums, :dependent => :destroy, :foreign_key => :category_id
+end
+
+# Forum that isn't soft deletable for association checking
+class DestroyableForum < ActiveRecord::Base
+  silent_set_table_name 'forums'
+end
+
+# test that it does not blow up when the table is not yet defined (e.g. in rake db:reset)
+class NoTable < ActiveRecord::Base
+  include SoftDeletion
+end
+
+# Forum with other default scope
+class Cat1Forum < ActiveRecord::Base
+  silent_set_table_name 'forums'
+
+  def self.define_default_soft_delete_scope
+    default_scope :conditions => {:category_id => 1}
+  end
+
+  include SoftDeletion
+  belongs_to :category
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: soft_deletion
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - Zendesk
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-28 00:00:00 Z
+date: 2012-06-29 00:00:00 Z
 dependencies: []
 
 description: 
@@ -43,6 +43,7 @@ files:
 - lib/soft_deletion/version.rb
 - soft_deletion.gemspec
 - test/soft_deletion_test.rb
+- test/test_helper.rb
 homepage: http://github.com/grosser/soft_deletion
 licenses: 
 - MIT