soft_deletion 0.1.10 → 0.2.0

data/.gitignore

@@ -0,0 +1 @@
+gemfiles/*.gemfile.lock

data/Gemfile

@@ -1,11 +1,10 @@
 source :rubygems
 gemspec
 
-gem 'appraisal'
 gem 'activerecord'
 gem 'activesupport'
+gem 'appraisal'
 gem 'rake'
-gem 'shoulda'
-gem 'mocha'
 gem 'sqlite3'
-gem 'test-unit', '2.2' # >2.2 does not show dots
+gem 'rspec'
+gem 'database_cleaner'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    soft_deletion (0.1.10)
+    soft_deletion (0.2.0)
 
 GEM
   remote: http://rubygems.org/
@@ -22,20 +22,20 @@ GEM
       rake
     arel (3.0.2)
     builder (3.0.0)
+    database_cleaner (0.8.0)
+    diff-lcs (1.1.3)
     i18n (0.6.0)
-    metaclass (0.0.1)
-    mocha (0.12.3)
-      metaclass (~> 0.0.1)
     multi_json (1.3.6)
     rake (0.9.2.2)
-    shoulda (3.1.1)
-      shoulda-context (~> 1.0)
-      shoulda-matchers (~> 1.2)
-    shoulda-context (1.0.0)
-    shoulda-matchers (1.2.0)
-      activesupport (>= 3.0.0)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
     sqlite3 (1.3.6)
-    test-unit (2.2.0)
     tzinfo (0.3.33)
 
 PLATFORMS
@@ -45,9 +45,8 @@ DEPENDENCIES
   activerecord
   activesupport
   appraisal
-  mocha
+  database_cleaner
   rake
-  shoulda
+  rspec
   soft_deletion!
   sqlite3
-  test-unit (= 2.2)

data/Rakefile

@@ -1,13 +1,12 @@
 require 'appraisal'
 require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 task :default do
-  sh "bundle exec rake appraisal:install && bundle exec rake appraisal test"
+  sh "bundle exec rake appraisal:install && bundle exec rake appraisal spec"
 end
 
-task :test do
-  sh "ruby -Itest test/soft_deletion_test.rb"
-end
+RSpec::Core::RakeTask.new(:spec)
 
 # extracted from https://github.com/grosser/project_template
 rule /^version:bump:.*/ do |t|

data/Readme.md

@@ -1,19 +1,16 @@
-Explicit soft deletion for ActiveRecord via deleted_at and default scope + callbacks.<br/>
+Explicit soft deletion for ActiveRecord via deleted_at + callbacks and optional default scope.<br/>
 Not overwriting destroy or delete.
 
 Install
 =======
     gem install soft_deletion
-Or
-
-    rails plugin install git://github.com/grosser/soft_deletion.git
-
 
 Usage
 =====
-    # mix into any model ...
+    require 'soft_deletion'
+
     class User < ActiveRecord::Base
-      include SoftDeletion
+      has_soft_deletion :default_scope => true
 
       after_soft_delete :send_deletion_emails # Rails 2 + 3
       set_callback :soft_delete, :after, :prepare_emails # Rails 3
@@ -44,7 +41,7 @@ Usage
 
 TODO
 ====
- - Rails 3 from with inspiration from https://github.com/JackDanger/permanent_records/blob/master/lib/permanent_records.rb
+ - Rails 3 with inspiration from https://github.com/JackDanger/permanent_records/blob/master/lib/permanent_records.rb
  - maybe stuff from https://github.com/smoku/soft_delete
 
 Authors

data/gemfiles/rails2.gemfile

@@ -4,10 +4,9 @@ source :rubygems
 
 gem "appraisal"
 gem "rake"
-gem "shoulda"
-gem "mocha"
 gem "sqlite3"
-gem "test-unit", "2.2"
+gem "rspec"
+gem "database_cleaner"
 gem "activerecord", "2.3.14"
 gem "activesupport", "2.3.14"
 

data/gemfiles/rails3.gemfile

@@ -4,10 +4,9 @@ source :rubygems
 
 gem "appraisal"
 gem "rake"
-gem "shoulda"
-gem "mocha"
 gem "sqlite3"
-gem "test-unit", "2.2"
+gem "rspec"
+gem "database_cleaner"
 gem "activerecord", "3.2.3"
 gem "activesupport", "3.2.3"
 

data/lib/soft_deletion.rb

@@ -1,129 +1,7 @@
 require 'active_record'
 require 'soft_deletion/version'
+require 'soft_deletion/core'
 require 'soft_deletion/dependency'
+require 'soft_deletion/setup'
 
-module SoftDeletion
-  def self.included(base)
-    unless base.ancestors.include?(ActiveRecord::Base)
-      raise "You can only include this if #{base} extends ActiveRecord::Base"
-    end
-    base.extend(ClassMethods)
-
-    if base.respond_to?(:define_default_soft_delete_scope)
-      base.define_default_soft_delete_scope
-    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)
-      base.send(:default_scope, :conditions => { :deleted_at => nil })
-    end
-
-    # backport after_soft_delete so we can safely upgrade to rails 3
-    if ActiveRecord::VERSION::MAJOR > 2
-      base.define_callbacks :soft_delete
-      class << base
-        def before_soft_delete(*callbacks)
-          set_callback :soft_delete, :before, *callbacks
-        end
-
-        def after_soft_delete(*callbacks)
-          set_callback :soft_delete, :after, *callbacks
-        end
-      end
-    else
-      base.define_callbacks :before_soft_delete
-      base.define_callbacks :after_soft_delete
-    end
-  end
-
-  module ClassMethods
-    def soft_delete_dependents
-      self.reflect_on_all_associations.
-        select { |a| [:destroy, :delete_all, :nullify].include?(a.options[:dependent]) }.
-        map(&:name)
-    end
-
-    def with_deleted
-      with_exclusive_scope do
-        yield self
-      end
-    end
-
-    def mark_as_soft_deleted_sql
-      ["deleted_at = ?", Time.now]
-    end
-
-    def soft_delete_all!(ids_or_models)
-      ids_or_models = Array.wrap(ids_or_models)
-
-      if ids_or_models.first.is_a?(ActiveRecord::Base)
-        ids = ids_or_models.map(&:id)
-        models = ids_or_models
-      else
-        ids = ids_or_models
-        models = all(:conditions => { :id => ids })
-      end
-
-      transaction do
-        update_all(mark_as_soft_deleted_sql, :id => ids)
-        models.each do |model|
-          model.soft_delete_dependencies.each(&:soft_delete!)
-          model.run_callbacks ActiveRecord::VERSION::MAJOR > 2 ? :soft_delete : :after_soft_delete
-        end
-      end
-    end
-  end
-
-  def deleted?
-    deleted_at.present?
-  end
-
-  def mark_as_deleted
-    self.deleted_at = Time.now
-  end
-
-  def mark_as_undeleted
-    self.deleted_at = nil
-  end
-
-  def soft_delete!
-    _run_soft_delete { save! }
-  end
-
-  def soft_delete(*args)
-    _run_soft_delete{ save(*args) }
-  end
-
-  def soft_undelete!
-    self.class.transaction do
-      mark_as_undeleted
-      soft_delete_dependencies.each(&:soft_undelete!)
-      save!
-    end
-  end
-
-  def soft_delete_dependencies
-    self.class.soft_delete_dependents.map { |dependent| Dependency.new(self, dependent) }
-  end
-
-  protected
-
-  def _run_soft_delete(&block)
-    self.class.transaction do
-      result = nil
-      if ActiveRecord::VERSION::MAJOR > 2
-        run_callbacks :soft_delete do
-          mark_as_deleted
-          soft_delete_dependencies.each(&:soft_delete!)
-          result = block.call
-        end
-      else
-        run_callbacks :before_soft_delete
-        mark_as_deleted
-        soft_delete_dependencies.each(&:soft_delete!)
-        result = block.call
-        run_callbacks :after_soft_delete
-      end
-      result
-    end
-  end
-end
+ActiveRecord::Base.send(:include, SoftDeletion::Setup)

data/lib/soft_deletion/core.rb

@@ -0,0 +1,119 @@
+module SoftDeletion
+  module Core
+    def self.included(base)
+      unless base.ancestors.include?(ActiveRecord::Base)
+        raise "You can only include this if #{base} extends ActiveRecord::Base"
+      end
+      base.extend(ClassMethods)
+
+      # backport after_soft_delete so we can safely upgrade to rails 3
+      if ActiveRecord::VERSION::MAJOR > 2
+        base.define_callbacks :soft_delete
+        class << base
+          def before_soft_delete(*callbacks)
+            set_callback :soft_delete, :before, *callbacks
+          end
+
+          def after_soft_delete(*callbacks)
+            set_callback :soft_delete, :after, *callbacks
+          end
+        end
+      else
+        base.define_callbacks :before_soft_delete
+        base.define_callbacks :after_soft_delete
+      end
+    end
+
+    module ClassMethods
+      def soft_delete_dependents
+        self.reflect_on_all_associations.
+          select { |a| [:destroy, :delete_all, :nullify].include?(a.options[:dependent]) }.
+          map(&:name)
+      end
+
+      def with_deleted
+        with_exclusive_scope do
+          yield self
+        end
+      end
+
+      def mark_as_soft_deleted_sql
+        ["deleted_at = ?", Time.now]
+      end
+
+      def soft_delete_all!(ids_or_models)
+        ids_or_models = Array.wrap(ids_or_models)
+
+        if ids_or_models.first.is_a?(ActiveRecord::Base)
+          ids = ids_or_models.map(&:id)
+          models = ids_or_models
+        else
+          ids = ids_or_models
+          models = all(:conditions => { :id => ids })
+        end
+
+        transaction do
+          update_all(mark_as_soft_deleted_sql, :id => ids)
+          models.each do |model|
+            model.soft_delete_dependencies.each(&:soft_delete!)
+            model.run_callbacks ActiveRecord::VERSION::MAJOR > 2 ? :soft_delete : :after_soft_delete
+          end
+        end
+      end
+    end
+
+    def deleted?
+      deleted_at.present?
+    end
+
+    def mark_as_deleted
+      self.deleted_at = Time.now
+    end
+
+    def mark_as_undeleted
+      self.deleted_at = nil
+    end
+
+    def soft_delete!
+      _run_soft_delete { save! }
+    end
+
+    def soft_delete(*args)
+      _run_soft_delete{ save(*args) }
+    end
+
+    def soft_undelete!
+      self.class.transaction do
+        mark_as_undeleted
+        soft_delete_dependencies.each(&:soft_undelete!)
+        save!
+      end
+    end
+
+    def soft_delete_dependencies
+      self.class.soft_delete_dependents.map { |dependent| SoftDeletion::Dependency.new(self, dependent) }
+    end
+
+    protected
+
+    def _run_soft_delete(&block)
+      self.class.transaction do
+        result = nil
+        if ActiveRecord::VERSION::MAJOR > 2
+          run_callbacks :soft_delete do
+            mark_as_deleted
+            soft_delete_dependencies.each(&:soft_delete!)
+            result = block.call
+          end
+        else
+          run_callbacks :before_soft_delete
+          mark_as_deleted
+          soft_delete_dependencies.each(&:soft_delete!)
+          result = block.call
+          run_callbacks :after_soft_delete
+        end
+        result
+      end
+    end
+  end
+end

data/lib/soft_deletion/setup.rb

@@ -0,0 +1,32 @@
+module SoftDeletion
+  module Setup
+
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
+    module ClassMethods
+      # When you call this, it will include the core module and its methods
+      #
+      # Options:
+      #
+      # *default_scope*, value: true/false
+      # If true, it will also define a default scope
+      #
+      # It will check if the column "deleted_at" exist before applying default scope
+      def has_soft_deletion(options={})
+        default_options = {:default_scope => false}
+
+        include SoftDeletion::Core
+
+        options = default_options.merge(options)
+
+        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 }
+        end
+      end
+    end
+  end
+end

data/lib/soft_deletion/version.rb

@@ -1,3 +1,3 @@
 module SoftDeletion
-  VERSION = '0.1.10'
+  VERSION = '0.2.0'
 end

data/spec/soft_deletion_spec.rb

@@ -0,0 +1,321 @@
+require 'spec_helper'
+
+describe SoftDeletion do
+  def self.successfully_soft_deletes
+    context "successfully soft deleted" do
+      before do
+        @category.soft_delete!
+      end
+
+      it "should mark itself as deleted" do
+        @category.reload
+        @category.should be_deleted
+      end
+
+      it "should soft delete its dependent associations" do
+        @forum.reload
+        @forum.should be_deleted
+      end
+    end
+  end
+
+  def self.successfully_bulk_soft_deletes
+    context "successfully bulk soft deleted" do
+      before do
+        Category.soft_delete_all!(@category)
+      end
+
+      it "should mark itself as deleted" do
+        @category.reload
+        @category.should be_deleted
+      end
+
+      it "should soft delete its dependent associations" do
+        @forum.reload
+        @forum.should be_deleted
+      end
+    end
+  end
+
+  before do
+    clear_callbacks Category, :soft_delete
+
+    # Stub dump method calls
+    Category.any_instance.stub(:foo)
+    Category.any_instance.stub(:bar)
+  end
+
+  describe "callbacks" do
+    describe ".before_soft_delete" do
+      it "should be called on soft-deletion" do
+        Category.before_soft_delete :foo
+        category = Category.create!
+
+        category.should_receive(:foo)
+
+        category.soft_delete!
+      end
+    end
+
+    describe ".after_soft_delete" do
+      it "should be called after soft-deletion" do
+        Category.after_soft_delete :foo
+        category = Category.create!
+
+        category.should_receive(:foo)
+
+        category.soft_delete!
+      end
+
+      it "should be called after bulk soft-deletion" do
+        Category.after_soft_delete :foo
+        category = Category.create!
+
+        category.should_receive(:foo)
+
+        Category.soft_delete_all!(category)
+      end
+
+      it "should be call multiple after soft-deletion" do
+        Category.after_soft_delete :foo, :bar
+        category = Category.create!
+
+        category.should_receive(:foo)
+        category.should_receive(:bar)
+
+        category.soft_delete!
+      end
+
+      it "should not be called after normal destroy" do
+        Category.after_soft_delete :foo
+        category = Category.create!
+
+        category.should_not_receive(:foo)
+
+        category.destroy
+      end
+    end
+  end
+
+  describe "association" do
+    context "without dependent associations" do
+      it "should only soft-delete itself" do
+        category = NACategory.create!
+        category.soft_delete!
+
+        category.reload
+        category.should be_deleted
+      end
+    end
+
+    context "with independent associations" do
+      it "should not delete associations" do
+        category = IDACategory.create!
+        forum = category.forums.create!
+        category.soft_delete!
+
+        forum.reload
+        forum.should be_deleted
+      end
+    end
+
+    context "with dependent has_one association" do
+      before do
+        @category = HOACategory.create!
+        @forum = @category.create_forum
+      end
+
+      successfully_soft_deletes
+      successfully_bulk_soft_deletes
+    end
+
+    context "with dependent association that doesn't have soft deletion" do
+      before do
+        @category = DACategory.create!
+        @forum = @category.destroyable_forums.create!
+      end
+
+      context "successfully soft deleted" do
+        before do
+          @category.soft_delete!
+        end
+
+        it "should mark itself as deleted" do
+          @category.reload
+          @category.should be_deleted
+        end
+
+        it "should not destroy dependent association" do
+          DestroyableForum.exists?(@forum.id).should be_true
+        end
+      end
+    end
+
+    context "with dependent has_many associations" do
+      before do
+        @category = Category.create!
+        @forum = @category.forums.create!
+      end
+
+      context "failing to soft delete" do
+        before do
+          @category.stub(:valid?).and_return(false)
+          expect{ @category.soft_delete! }.to raise_error(ActiveRecord::RecordInvalid)
+        end
+
+        it "should not mark itself as deleted" do
+          @category.reload
+          @category.should_not be_deleted
+        end
+
+        it "should not soft delete its dependent associations" do
+          @forum.reload
+          @forum.should_not be_deleted
+        end
+      end
+
+      successfully_soft_deletes
+      successfully_bulk_soft_deletes
+
+      context "being restored from soft deletion" do
+        before do
+          @category.soft_delete!
+          Category.with_deleted do
+            @category.reload
+            @category.soft_undelete!
+          end
+        end
+
+        it "should not mark itself as deleted" do
+          @category.reload
+          @category.should_not be_deleted
+        end
+
+        it "should restore its dependent associations" do
+          @forum.reload
+          @forum.should_not be_deleted
+        end
+      end
+    end
+
+    context "a soft-deleted has-many category that nullifies forum references on delete" do
+      it "should nullify those references" do
+        category = NDACategory.create!
+        forum = category.forums.create!
+        category.soft_delete!
+
+        forum.reload
+        forum.should be_deleted
+        #forum.category_id.should be_nil # TODO
+      end
+    end
+  end
+
+  context "without deleted_at column" do
+    it "should default scope should not provoke an error" do
+      expect do
+        OriginalCategory.create!
+      end.to_not raise_error
+    end
+  end
+
+  describe ".soft_delete_all!" do
+    before do
+      @categories = 2.times.map { Category.create! }
+    end
+
+    context "by id" do
+      before do
+        Category.soft_delete_all!(@categories.map(&:id))
+      end
+
+      it "should delete all models" do
+        @categories.each do |category|
+          category.reload
+          category.should be_deleted
+        end
+      end
+    end
+
+    context "by model" do
+      before do
+        Category.soft_delete_all!(@categories)
+      end
+
+      it "should delete all models" do
+        @categories.each do |category|
+          category.reload
+          category.should be_deleted
+        end
+      end
+    end
+  end
+
+  describe "overwritten default scope" do
+    it "should find even with deleted_at" do
+      forum = Cat1Forum.create(:deleted_at => Time.now)
+
+      Cat1Forum.find_by_id(forum.id).should_not be_nil
+    end
+
+    it "should not find by new scope" do
+      # create! does not work here on rails 2
+      forum = Cat1Forum.new
+      forum.category_id = 2
+      forum.save!
+
+      Cat1Forum.find_by_id(forum.id).should be_nil
+    end
+  end
+
+  describe "validations" do
+    it "should fail when validations fail" do
+      forum = ValidatedForum.create!(:category_id => 1)
+      forum.category_id = nil
+
+      expect do
+        forum.soft_delete!
+      end.to raise_error(ActiveRecord::RecordInvalid)
+
+      forum.reload
+      forum.should_not be_deleted
+    end
+
+    it "should pass when validations pass" do
+      forum = ValidatedForum.create!(:category_id => 1)
+      forum.soft_delete!
+
+      forum.reload
+      forum.should be_deleted
+    end
+  end
+
+  describe "#soft_delete" do
+    it "should return true if it succeeds" do
+      forum = ValidatedForum.create!(:category_id => 1)
+
+      forum.soft_delete.should be_true
+      forum.reload
+      forum.should be_deleted
+    end
+
+    it "should return false if validations fail" do
+      forum = ValidatedForum.create!(:category_id => 1)
+      forum.category_id = nil
+
+      forum.soft_delete.should be_false
+      forum.reload
+      forum.should_not be_deleted
+    end
+
+    it "should return true if validations are prevented and it succeeds" do
+      forum = ValidatedForum.create!(:category_id => 1)
+      forum.category_id = nil
+      skip_validations = (ActiveRecord::VERSION::MAJOR == 2 ? false : {:validate => false})
+
+      forum.soft_delete(skip_validations).should be_true
+      forum.reload
+      forum.should be_deleted
+    end
+  end
+end

data/{test/test_helper.rb → spec/spec_helper.rb}

@@ -1,8 +1,25 @@
-require 'active_support/test_case'
-require 'shoulda'
 require 'active_record'
+require 'soft_deletion'
+require 'database_cleaner'
+require 'logger'
+
+# ActiveRecord::Base.logger = Logger.new(STDOUT) # for easier debugging
+
+RSpec.configure do |config|
+  config.before(:suite) do
+    # would be nicer to use transaction, but Rails 2 does not open a new transaction or savepoint
+    # when already inside a transaction
+    DatabaseCleaner.strategy = :truncation
+  end
+
+  config.before do
+    DatabaseCleaner.start
+  end
 
-ENV['EMACS'] = 't' # colors for test-unit < 2.4.9
+  config.after do
+    DatabaseCleaner.clean
+  end
+end
 
 def clear_callbacks(model, callback)
   if ActiveRecord::VERSION::MAJOR > 2
@@ -47,61 +64,73 @@ class ActiveRecord::Base
 end
 
 # setup models
-require 'soft_deletion'
 
 class Forum < ActiveRecord::Base
-  include SoftDeletion
+  has_soft_deletion
+
   belongs_to :category
 end
 
 class ValidatedForum < ActiveRecord::Base
   silent_set_table_name 'forums'
-  include SoftDeletion
+
+  has_soft_deletion
+
   belongs_to :category
   validates_presence_of :category_id
 end
 
 class Category < ActiveRecord::Base
-  include SoftDeletion
+  has_soft_deletion
+
   has_many :forums, :dependent => :destroy
 end
 
 # No association
 class NACategory < ActiveRecord::Base
   silent_set_table_name 'categories'
-  include SoftDeletion
+
+  has_soft_deletion
 end
 
 # Independent association
 class IDACategory < ActiveRecord::Base
   silent_set_table_name 'categories'
-  include SoftDeletion
+
+  has_soft_deletion
+
   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_soft_deletion
+
   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_soft_deletion
+
   has_one :forum, :dependent => :destroy, :foreign_key => :category_id
 end
 
 # Class without column deleted_at
 class OriginalCategory < ActiveRecord::Base
-  include SoftDeletion
+  has_soft_deletion
 end
 
 # Has many destroyable association
 class DACategory < ActiveRecord::Base
   silent_set_table_name 'categories'
-  include SoftDeletion
+
+  has_soft_deletion
+
   has_many :destroyable_forums, :dependent => :destroy, :foreign_key => :category_id
 end
 
@@ -112,18 +141,17 @@ 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
+  has_soft_deletion
 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
+  has_soft_deletion
+  default_scope :conditions => {:category_id => 1}
+
 
-  include SoftDeletion
   belongs_to :category
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soft_deletion
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-07 00:00:00.000000000 Z
+date: 2012-10-15 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -17,6 +17,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - .travis.yml
 - Appraisals
 - Gemfile
@@ -25,15 +26,15 @@ files:
 - Rakefile
 - Readme.md
 - gemfiles/rails2.gemfile
-- gemfiles/rails2.gemfile.lock
 - gemfiles/rails3.gemfile
-- gemfiles/rails3.gemfile.lock
 - lib/soft_deletion.rb
+- lib/soft_deletion/core.rb
 - lib/soft_deletion/dependency.rb
+- lib/soft_deletion/setup.rb
 - lib/soft_deletion/version.rb
 - soft_deletion.gemspec
-- test/soft_deletion_test.rb
-- test/test_helper.rb
+- spec/soft_deletion_spec.rb
+- spec/spec_helper.rb
 homepage: http://github.com/grosser/soft_deletion
 licenses:
 - MIT
@@ -49,7 +50,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1755831677353429354
+      hash: -3275884841840712801
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -58,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1755831677353429354
+      hash: -3275884841840712801
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/gemfiles/rails2.gemfile.lock

@@ -1,33 +0,0 @@
-PATH
-  remote: /Users/mgrosser/code/tools/soft_deletion
-  specs:
-    soft_deletion (0.1.9)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activerecord (2.3.14)
-      activesupport (= 2.3.14)
-    activesupport (2.3.14)
-    appraisal (0.4.1)
-      bundler
-      rake
-    mocha (0.9.12)
-    rake (0.9.2.2)
-    shoulda (2.10.3)
-    sqlite3 (1.3.6)
-    test-unit (2.2.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (= 2.3.14)
-  activesupport (= 2.3.14)
-  appraisal
-  mocha
-  rake
-  shoulda
-  soft_deletion!
-  sqlite3
-  test-unit (= 2.2)

data/gemfiles/rails3.gemfile.lock

@@ -1,46 +0,0 @@
-PATH
-  remote: /Users/mgrosser/code/tools/soft_deletion
-  specs:
-    soft_deletion (0.1.9)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.2.3)
-      activesupport (= 3.2.3)
-      builder (~> 3.0.0)
-    activerecord (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.3)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    appraisal (0.4.1)
-      bundler
-      rake
-    arel (3.0.2)
-    builder (3.0.0)
-    i18n (0.6.0)
-    mocha (0.9.12)
-    multi_json (1.3.4)
-    rake (0.9.2.2)
-    shoulda (2.10.3)
-    sqlite3 (1.3.6)
-    test-unit (2.2.0)
-    tzinfo (0.3.33)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (= 3.2.3)
-  activesupport (= 3.2.3)
-  appraisal
-  mocha
-  rake
-  shoulda
-  soft_deletion!
-  sqlite3
-  test-unit (= 2.2)

data/test/soft_deletion_test.rb

@@ -1,286 +0,0 @@
-require File.expand_path '../test_helper', __FILE__
-
-class SoftDeletionTest < ActiveSupport::TestCase
-  def assert_deleted(resource)
-    resource.class.with_deleted do
-      resource.reload
-      assert resource.deleted?
-    end
-  end
-
-  def assert_not_deleted(resource)
-    resource.reload
-    assert !resource.deleted?
-  end
-
-  def self.successfully_soft_deletes
-    context "successfully soft deleted" do
-      setup do
-        @category.soft_delete!
-      end
-
-      should "mark itself as deleted" do
-        assert_deleted @category
-      end
-
-      should "soft delete its dependent associations" do
-        assert_deleted @forum
-      end
-    end
-  end
-
-  def self.successfully_bulk_soft_deletes
-    context "successfully bulk soft deleted" do
-      setup do
-        Category.soft_delete_all!(@category)
-      end
-
-      should "mark itself as deleted" do
-        assert_deleted @category
-      end
-
-      should "soft delete its dependent associations" do
-        assert_deleted @forum
-      end
-    end
-  end
-
-  setup do
-    clear_callbacks Category, :soft_delete
-  end
-
-  context ".before_soft_delete" do
-    should "be called on soft-deletion" do
-      Category.before_soft_delete :foo
-      category = Category.create!
-      category.expects(:foo)
-      category.soft_delete!
-    end
-  end
-
-  context ".after_soft_delete" do
-    should "be called after soft-deletion" do
-      Category.after_soft_delete :foo
-      category = Category.create!
-      category.expects(:foo)
-      category.soft_delete!
-    end
-
-    should "be called after bulk soft-deletion" do
-      Category.after_soft_delete :foo
-      category = Category.create!
-      category.expects(:foo)
-      Category.soft_delete_all!(category)
-    end
-
-    should "be call multiple after soft-deletion" do
-      Category.after_soft_delete :foo, :bar
-      category = Category.create!
-      category.expects(:foo)
-      category.expects(:bar)
-      category.soft_delete!
-    end
-
-    should "not be called after normal destroy" do
-      Category.after_soft_delete :foo
-      category = Category.create!
-      category.expects(:foo).never
-      category.destroy
-    end
-  end
-
-  context "without dependent associations" do
-    should "only soft-delete itself" do
-      category = NACategory.create!
-      category.soft_delete!
-      assert_deleted category
-    end
-  end
-
-  context "with independent associations" do
-    should "not delete associations" do
-      category = IDACategory.create!
-      forum = category.forums.create!
-      category.soft_delete!
-      assert_deleted forum
-    end
-  end
-
-  context "with dependent has_one association" do
-    setup do
-      @category = HOACategory.create!
-      @forum = @category.create_forum
-    end
-
-    successfully_soft_deletes
-    successfully_bulk_soft_deletes
-  end
-
-  context "with dependent association that doesn't have soft deletion" do
-    setup do
-      @category = DACategory.create!
-      @forum = @category.destroyable_forums.create!
-    end
-
-    context "successfully soft deleted" do
-      setup do
-        @category.soft_delete!
-      end
-
-      should "mark itself as deleted" do
-        assert_deleted @category
-      end
-
-      should "not destroy dependent association" do
-        assert DestroyableForum.exists?(@forum.id)
-      end
-    end
-  end
-
-  context "with dependent has_many associations" do
-    setup do
-      @category = Category.create!
-      @forum = @category.forums.create!
-    end
-
-    context "failing to soft delete" do
-      setup do
-        @category.stubs(:valid?).returns(false)
-        assert_raise(ActiveRecord::RecordInvalid) { @category.soft_delete! }
-      end
-
-      should "not mark itself as deleted" do
-        assert_not_deleted @category
-      end
-
-      should "not soft delete its dependent associations" do
-        assert_not_deleted @forum
-      end
-    end
-
-    successfully_soft_deletes
-    successfully_bulk_soft_deletes
-
-    context "being restored from soft deletion" do
-      setup do
-        @category.soft_delete!
-        Category.with_deleted do
-          @category.reload
-          @category.soft_undelete!
-          @category.reload
-        end
-      end
-
-      should "not mark itself as deleted" do
-        assert_not_deleted @category
-      end
-
-      should "restore its dependent associations" do
-        assert_not_deleted @forum
-      end
-    end
-  end
-
-  context "a soft-deleted has-many category that nullifies forum references on delete" do
-    should "nullify those references" do
-      category = NDACategory.create!
-      forum = category.forums.create!
-      category.soft_delete!
-      assert_deleted forum
-      #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
-
-  context ".soft_delete_all!" do
-    setup do
-      @categories = 2.times.map { Category.create! }
-    end
-
-    context "by id" do
-      setup do
-        Category.soft_delete_all!(@categories.map(&:id))
-      end
-
-      should "delete all models" do
-        @categories.each do |category|
-          assert_deleted category
-        end
-      end
-    end
-
-    context "by model" do
-      setup do
-        Category.soft_delete_all!(@categories)
-      end
-
-      should "delete all models" do
-        @categories.each do |category|
-          assert_deleted category
-        end
-      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
-
-  context "validations" do
-    should "fail when validations fail" do
-      forum = ValidatedForum.create!(:category_id => 1)
-      forum.category_id = nil
-      assert_raise ActiveRecord::RecordInvalid do
-        forum.soft_delete!
-      end
-      assert_not_deleted forum
-    end
-
-    should "pass when validations pass" do
-      forum = ValidatedForum.create!(:category_id => 1)
-      forum.soft_delete!
-      assert_deleted forum
-    end
-  end
-
-  context "#soft_delete" do
-    should "return true if it succeeds" do
-      forum = ValidatedForum.create!(:category_id => 1)
-      assert_equal true, forum.soft_delete
-      assert_deleted forum
-    end
-
-    should "return false if validations fail" do
-      forum = ValidatedForum.create!(:category_id => 1)
-      forum.category_id = nil
-      assert_equal false, forum.soft_delete
-      assert_not_deleted forum
-    end
-
-    should "return true if validations are prevented and it succeeds" do
-      forum = ValidatedForum.create!(:category_id => 1)
-      forum.category_id = nil
-      skip_validations = (ActiveRecord::VERSION::MAJOR == 2 ? false : {:validate => false})
-      assert_equal true, forum.soft_delete(skip_validations)
-      assert_deleted forum
-    end
-  end
-end