immortal 0.1.3 → 0.1.4

data/Gemfile.lock

@@ -17,10 +17,12 @@ GEM
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
     activesupport (3.0.3)
-    arel (2.0.6)
+    arel (2.0.7)
     builder (2.1.2)
+    columnize (0.3.2)
     diff-lcs (1.1.2)
     i18n (0.5.0)
+    linecache (0.43)
     rspec (2.3.0)
       rspec-core (~> 2.3.0)
       rspec-expectations (~> 2.3.0)
@@ -29,14 +31,19 @@ GEM
     rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
     sqlite3-ruby (1.3.2)
-    tzinfo (0.3.23)
+    tzinfo (0.3.24)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 3.0.3)
   immortal!
   rspec (~> 2.3.0)
+  ruby-debug (~> 0.10.4)
   sqlite3-ruby (~> 1.3.2)

data/README.md

@@ -44,6 +44,9 @@ If you want to improve immortal
 
 ## CHANGELOG
 
+- 0.1.4 fix bug where ALL records of any dependent associations were
+  immortally deleted if assocation has :dependant => :delete_all option
+  set
 - 0.1.3 fix bug where join model is not immortal
 - 0.1.2 fix loading issue when the `deleted` column doesn't exist (or even the table)
 - 0.1.1 fix behavior with `has_many :through` associations

data/immortal.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "immortal"
-  s.version     = '0.1.3'
+  s.version     = '0.1.4'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Jordi Romero", "Saimon Moore"]
   s.email       = ["jordi@jrom.net", "saimon@saimonmoore.net"]
@@ -19,4 +19,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'activerecord', '~> 3.0.3'
   s.add_development_dependency 'rspec', '~> 2.3.0'
   s.add_development_dependency 'sqlite3-ruby', '~> 1.3.2'
+  s.add_development_dependency 'ruby-debug', '~> 0.10.4'
 end

data/lib/immortal.rb

@@ -36,12 +36,12 @@ module Immortal
       only_deleted.find(*args)
     end
 
-    def immortal_delete_all(*args)
-      unscoped.update_all :deleted => true
+    def immortal_delete_all(conditions = nil)
+      unscoped.update_all({:deleted => 1}, conditions)
     end
 
     def delete_all!(*args)
-      unscoped.mortal_delete_all
+      unscoped.mortal_delete_all(*args)
     end
 
     # In has_many :through => join_model we have to explicitly add
@@ -66,17 +66,17 @@ module Immortal
       end
     end
 
-    def immortal_destroy(*args)
+    def immortal_destroy
       run_callbacks :destroy do
-        destroy_without_callbacks(*args)
+        destroy_without_callbacks
       end
     end
 
-    def destroy!(*args)
+    def destroy!
       mortal_destroy
     end
 
-    def destroy_without_callbacks(*args)
+    def destroy_without_callbacks
       self.class.unscoped.update_all({ :deleted => true }, "id = #{self.id}")
       reload
       freeze

data/spec/immortal_spec.rb

@@ -189,4 +189,20 @@ describe Immortal do
     @m.immortal_nodes.count.should == 0
     @n.immortal_models.count.should == 0
   end
+
+  it "should only immortally delete scoped associations, NOT ALL RECORDS" do
+    n1 = ImmortalNode.create! :title => 'testing association 1'
+    j1 = ImmortalJoin.create! :immortal_model => @m, :immortal_node => n1
+
+    n2 = ImmortalNode.create! :title => 'testing association 2'
+    j2 = ImmortalJoin.create! :immortal_model => @m, :immortal_node => n2
+
+    n3 = ImmortalNode.create! :title => 'testing association 3'
+    j3 = ImmortalJoin.create! :immortal_node => n3
+
+    @m.destroy
+
+    [n1,n2,j1,j2].all? {|r| r.reload.deleted?}.should be_true
+    [n3,j3].all? {|r| !r.reload.deleted?}.should be_true
+  end
 end

data/spec/spec_helper.rb

@@ -46,11 +46,25 @@ ensure
   $stdout = old_stdout
 end
 
-class ImmortalModel < ActiveRecord::Base
+class ImmortalJoin < ActiveRecord::Base
+  include Immortal
+
+  belongs_to :immortal_model
+  belongs_to :immortal_node
+end
+
+class ImmortalNode < ActiveRecord::Base
   include Immortal
 
-  has_many :immortal_nodes, :through => :immortal_joins
   has_many :immortal_joins
+  has_many :immortal_models, :through => :immortal_joins
+end
+
+class ImmortalModel < ActiveRecord::Base
+  include Immortal
+
+  has_many :immortal_nodes, :through => :immortal_joins, :dependent => :destroy
+  has_many :immortal_joins, :dependent => :delete_all
 
   attr_accessor :before_d, :after_d, :before_u, :after_u
 
@@ -78,16 +92,3 @@ class ImmortalModel < ActiveRecord::Base
 
 end
 
-class ImmortalJoin < ActiveRecord::Base
-  include Immortal
-
-  belongs_to :immortal_model
-  belongs_to :immortal_node
-end
-
-class ImmortalNode < ActiveRecord::Base
-  include Immortal
-
-  has_many :immortal_joins
-  has_many :immortal_models, :through => :immortal_joins
-end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: immortal
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Jordi Romero
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-30 00:00:00 +01:00
+date: 2011-01-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,6 +67,22 @@ dependencies:
         version: 1.3.2
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 10
+        - 4
+        version: 0.10.4
+  type: :development
+  version_requirements: *id004
 description: Typical paranoid gem built for Rails 3 and with the minimum code needed to satisfy acts_as_paranoid's API
 email: 
 - jordi@jrom.net