soft_deletion 0.1.0 → 0.1.1

data/Appraisals

@@ -0,0 +1,11 @@
+appraise "rails2" do
+  version = "2.3.14"
+  gem 'activerecord', version
+  gem 'activesupport', version
+end
+
+appraise "rails3" do
+  version = "3.2.3"
+  gem 'activerecord', version
+  gem 'activesupport', version
+end

data/Gemfile

@@ -1,14 +1,11 @@
 source :rubygems
 gemspec
 
-version = '2.3.14' # hardcoded for now...
-
-group :development do
-  gem 'activerecord', version
-  gem 'activesupport', version
-  gem 'rake'
-  gem 'shoulda'
-  gem 'mocha'
-  gem 'sqlite3'
-  gem 'mynyml-redgreen'
-end
+gem 'appraisal'
+gem 'activerecord'
+gem 'activesupport'
+gem 'rake'
+gem 'shoulda'
+gem 'mocha'
+gem 'sqlite3'
+gem 'mynyml-redgreen'

data/Gemfile.lock

@@ -1,28 +1,45 @@
 PATH
   remote: .
   specs:
-    soft_deletion (0.1.0)
+    soft_deletion (0.1.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activerecord (2.3.14)
-      activesupport (= 2.3.14)
-    activesupport (2.3.14)
+    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)
     mynyml-redgreen (0.7.1)
       term-ansicolor (>= 1.0.4)
-    rake (0.9.2)
+    rake (0.9.2.2)
     shoulda (2.10.3)
     sqlite3 (1.3.6)
     term-ansicolor (1.0.7)
+    tzinfo (0.3.33)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (= 2.3.14)
-  activesupport (= 2.3.14)
+  activerecord
+  activesupport
+  appraisal
   mocha
   mynyml-redgreen
   rake

data/Rakefile

@@ -1,6 +1,11 @@
+require 'appraisal'
 require 'bundler/gem_tasks'
 
 task :default do
+  sh "bundle exec rake appraisal test"
+end
+
+task :test do
   sh "ruby -Itest test/soft_deletion_test.rb"
 end
 

data/gemfiles/rails2.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source :rubygems
+
+gem "appraisal"
+gem "rake"
+gem "shoulda"
+gem "mocha"
+gem "sqlite3"
+gem "mynyml-redgreen"
+gem "activerecord", "2.3.14"
+gem "activesupport", "2.3.14"
+
+gemspec :path=>"../"

data/gemfiles/rails2.gemfile.lock

@@ -0,0 +1,35 @@
+PATH
+  remote: /Users/mgrosser/code/tools/soft_deletion
+  specs:
+    soft_deletion (0.1.0)
+
+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)
+    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)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (= 2.3.14)
+  activesupport (= 2.3.14)
+  appraisal
+  mocha
+  mynyml-redgreen
+  rake
+  shoulda
+  soft_deletion!
+  sqlite3

data/gemfiles/rails3.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source :rubygems
+
+gem "appraisal"
+gem "rake"
+gem "shoulda"
+gem "mocha"
+gem "sqlite3"
+gem "mynyml-redgreen"
+gem "activerecord", "3.2.3"
+gem "activesupport", "3.2.3"
+
+gemspec :path=>"../"

data/gemfiles/rails3.gemfile.lock

@@ -0,0 +1,48 @@
+PATH
+  remote: /Users/mgrosser/code/tools/soft_deletion
+  specs:
+    soft_deletion (0.1.0)
+
+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)
+    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)
+    tzinfo (0.3.33)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (= 3.2.3)
+  activesupport (= 3.2.3)
+  appraisal
+  mocha
+  mynyml-redgreen
+  rake
+  shoulda
+  soft_deletion!
+  sqlite3

data/lib/soft_deletion/version.rb

@@ -1,3 +1,3 @@
 module SoftDeletion
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/soft_deletion.rb

@@ -9,7 +9,18 @@ module SoftDeletion
     end
     base.extend(ClassMethods)
     base.send(:default_scope, :conditions => base.soft_delete_default_scope_conditions)
-    base.define_callbacks :after_soft_delete
+
+    # 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 after_soft_delete(callback)
+          set_callback :soft_delete, :after, callback
+        end
+      end
+    else
+      base.define_callbacks :after_soft_delete
+    end
   end
 
   module ClassMethods
@@ -44,10 +55,14 @@ module SoftDeletion
 
   def soft_delete!
     self.class.transaction do
-      mark_as_deleted
-      soft_delete_dependencies.each(&:soft_delete!)
-      save!
-      run_callbacks(:after_soft_delete)
+      if ActiveRecord::VERSION::MAJOR > 2
+        run_callbacks :soft_delete do
+          _soft_delete!
+        end
+      else
+        _soft_delete!
+        run_callbacks :after_soft_delete
+      end
     end
   end
 
@@ -61,6 +76,12 @@ module SoftDeletion
 
   protected
 
+  def _soft_delete!
+    mark_as_deleted
+    soft_delete_dependencies.each(&:soft_delete!)
+    save!
+  end
+
   def soft_delete_dependencies
     self.class.soft_delete_dependents.map { |dependent| Dependency.new(self, dependent) }
   end

data/test/soft_deletion_test.rb

@@ -22,6 +22,16 @@ ActiveRecord::Schema.define(:version => 1) do
   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
@@ -35,23 +45,31 @@ end
 
 class NoAssociationCategory < ActiveRecord::Base
   include SoftDeletion
-  set_table_name 'categories'
+  silent_set_table_name 'categories'
 end
 
 # Independent association
 class IDACategory < ActiveRecord::Base
   include SoftDeletion
-  set_table_name 'categories'
+  silent_set_table_name 'categories'
   has_many :forums, :dependent => :destroy, :foreign_key => :category_id
 end
 
 # Nullified dependent association
 class NDACategory < ActiveRecord::Base
   include SoftDeletion
-  set_table_name 'categories'
+  silent_set_table_name 'categories'
   has_many :forums, :dependent => :destroy, :foreign_key => :category_id
 end
 
+def clear_callbacks(model, callback)
+  if ActiveRecord::VERSION::MAJOR > 2
+    model.define_callbacks callback
+  else
+    model.class_eval{ instance_variable_set "@after_#{callback}_callbacks", nil }
+  end
+end
+
 class SoftDeletionTest < ActiveSupport::TestCase
   def assert_deleted(resource)
     resource.class.with_deleted do
@@ -66,8 +84,7 @@ class SoftDeletionTest < ActiveSupport::TestCase
   end
 
   setup do
-    # clear callbacks
-    Category.class_eval{ @after_soft_delete_callbacks = nil }
+    clear_callbacks Category, :soft_delete
   end
 
   context ".after_soft_delete" do

metadata

@@ -1,61 +1,79 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: soft_deletion
-version: !ruby/object:Gem::Version
-  version: 0.1.0
+version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
-authors:
+authors: 
 - ZenDesk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-02 00:00:00.000000000 Z
+
+date: 2012-05-02 00:00:00 Z
 dependencies: []
+
 description: 
 email: michael@grosser.it
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .travis.yml
+- Appraisals
 - Gemfile
 - Gemfile.lock
 - Rakefile
 - Readme.md
+- gemfiles/rails2.gemfile
+- gemfiles/rails2.gemfile.lock
+- gemfiles/rails3.gemfile
+- gemfiles/rails3.gemfile.lock
 - lib/soft_deletion.rb
 - lib/soft_deletion/dependency.rb
 - lib/soft_deletion/version.rb
 - soft_deletion.gemspec
 - test/soft_deletion_test.rb
 homepage: http://github.com/grosser/soft_deletion
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 1139909322211905394
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 1139909322211905394
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Explicit soft deletion for ActiveRecord via deleted_at and default scope.
 test_files: []
+