soft_deletion 0.1.2 → 0.1.3

data/Gemfile.lock

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

data/Readme.md

@@ -47,7 +47,7 @@ TODO
 
 Author
 ======
-[ZenDesk](http://zendesk.com)<br/>
+[Zendesk](http://zendesk.com)<br/>
 michael@grosser.it<br/>
 License: MIT<br/>
 [![Build Status](https://secure.travis-ci.org/grosser/soft_deletion.png)](http://travis-ci.org/grosser/soft_deletion)

data/gemfiles/rails2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/soft_deletion
   specs:
-    soft_deletion (0.1.1)
+    soft_deletion (0.1.2)
 
 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.1)
+    soft_deletion (0.1.2)
 
 GEM
   remote: http://rubygems.org/

data/lib/soft_deletion/dependency.rb

@@ -38,7 +38,7 @@ module SoftDeletion
     end
 
     def can_soft_delete?
-      klass.instance_methods.map(&:to_sym).include?(:soft_delete!)
+      respond_to? :soft_delete!
     end
 
     def klass
@@ -50,7 +50,7 @@ module SoftDeletion
     end
 
     def dependencies
-      Array.wrap(record.send(association_name.to_sym))
+      Array.wrap(record.send(association_name))
     end
   end
 end

data/lib/soft_deletion/version.rb

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

data/soft_deletion.gemspec

@@ -4,7 +4,7 @@ require "#{name}/version"
 
 Gem::Specification.new name, SoftDeletion::VERSION do |s|
   s.summary = "Explicit soft deletion for ActiveRecord via deleted_at and default scope."
-  s.authors = ["ZenDesk"]
+  s.authors = ["Zendesk"]
   s.email = "michael@grosser.it"
   s.homepage = "http://github.com/grosser/#{name}"
   s.files = `git ls-files`.split("\n")

data/test/soft_deletion_test.rb

@@ -43,7 +43,8 @@ class Category < ActiveRecord::Base
   has_many :forums, :dependent => :destroy
 end
 
-class NoAssociationCategory < ActiveRecord::Base
+# No association
+class NACategory < ActiveRecord::Base
   include SoftDeletion
   silent_set_table_name 'categories'
 end
@@ -62,6 +63,14 @@ class NDACategory < ActiveRecord::Base
   has_many :forums, :dependent => :destroy, :foreign_key => :category_id
 end
 
+# Has ome association
+class HOACategory < ActiveRecord::Base
+  include SoftDeletion
+  silent_set_table_name 'categories'
+  has_one :forum, :dependent => :destroy, :foreign_key => :category_id
+end
+
+
 def clear_callbacks(model, callback)
   if ActiveRecord::VERSION::MAJOR > 2
     model.define_callbacks callback
@@ -83,6 +92,22 @@ class SoftDeletionTest < ActiveSupport::TestCase
     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
+
   setup do
     clear_callbacks Category, :soft_delete
   end
@@ -113,7 +138,7 @@ class SoftDeletionTest < ActiveSupport::TestCase
 
   context 'without dependent associations' do
     should 'only soft-delete itself' do
-      category = NoAssociationCategory.create!
+      category = NACategory.create!
       category.soft_delete!
       assert_deleted category
     end
@@ -128,7 +153,16 @@ class SoftDeletionTest < ActiveSupport::TestCase
     end
   end
 
-  context 'with dependent associations' do
+  context 'with dependent has_one association' do
+    setup do
+      @category = HOACategory.create!
+      @forum = @category.create_forum
+    end
+
+    successfully_soft_deletes
+  end
+
+  context 'with dependent has_many associations' do
     setup do
       @category = Category.create!
       @forum = @category.forums.create!
@@ -149,19 +183,7 @@ class SoftDeletionTest < ActiveSupport::TestCase
       end
     end
 
-    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
+    successfully_soft_deletes
 
     context 'being restored from soft deletion' do
       setup do

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification 
 name: soft_deletion
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
-- ZenDesk
+- Zendesk
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-05-03 00:00:00 Z
+date: 2012-05-08 00:00:00 Z
 dependencies: []
 
 description: