immortal 0.1.0 → 0.1.1

data/README.md

@@ -41,3 +41,7 @@ If you want to improve immortal
 2. Create a topic branch `git checkout -b my_feature`
 3. Push it! `git push origin my_feature`
 4. Open a pull request
+
+## CHANGELOG
+
+- 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.0'
+  s.version     = '0.1.1'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Jordi Romero", "Saimon Moore"]
   s.email       = ["jordi@jrom.net", "saimon@saimonmoore.net"]

data/lib/immortal.rb

@@ -44,6 +44,17 @@ module Immortal
       unscoped.mortal_delete_all
     end
 
+    # In has_many :through => join_model we have to explicitly add
+    # the 'not deleted' scope, otherwise it will take all the rows
+    # from the join model
+    def has_many(association_id, options = {}, &extension)
+      if options.key?(:through)
+        conditions = "#{options[:through].to_s.pluralize}.deleted IS NULL OR #{options[:through].to_s.pluralize}.deleted = ?"
+        options[:conditions] = ["(" + [options[:conditions], conditions].compact.join(") AND (") + ")", false]
+      end
+      super
+    end
+
   end
 
   module InstanceMethods

data/spec/immortal_spec.rb

@@ -177,4 +177,16 @@ describe Immortal do
     ImmortalModel.count.should == 2
   end
 
+  it "should consider an Many-to-many association with through as deleted when the join is deleted." do
+    @n = ImmortalNode.create! :title => 'testing association'
+    @join = ImmortalJoin.create! :immortal_model => @m, :immortal_node => @n
+
+    @m.immortal_nodes.count.should == 1
+    @n.immortal_models.count.should == 1
+
+    @join.destroy
+
+    @m.immortal_nodes.count.should == 0
+    @n.immortal_models.count.should == 0
+  end
 end

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ require 'rspec'
 require 'lib/immortal'
 require 'active_record'
 require 'sqlite3'
+require 'logger'
 
 RSpec.configure do |config|
   config.before(:each) do
@@ -15,6 +16,7 @@ end
 
 
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
+ActiveRecord::Base.logger = Logger.new(STDOUT) if ENV['DEBUG']
 
 old_stdout = $stdout
 $stdout = StringIO.new
@@ -27,6 +29,18 @@ begin
       t.boolean :deleted, :default => false
       t.timestamps
     end
+    create_table :immortal_joins do |t|
+      t.integer :immortal_model_id
+      t.integer :immortal_node_id
+      t.boolean :deleted, :default => false
+      t.timestamps
+    end
+    create_table :immortal_nodes do |t|
+      t.string :title
+      t.integer :value
+      t.boolean :deleted, :default => false
+      t.timestamps
+    end
   end
 ensure
   $stdout = old_stdout
@@ -35,6 +49,9 @@ end
 class ImmortalModel < ActiveRecord::Base
   include Immortal
 
+  has_many :immortal_nodes, :through => :immortal_joins
+  has_many :immortal_joins
+
   attr_accessor :before_d, :after_d, :before_u, :after_u
 
   before_destroy   :set_before
@@ -60,3 +77,17 @@ class ImmortalModel < ActiveRecord::Base
   end
 
 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: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Jordi Romero
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-17 00:00:00 +01:00
+date: 2010-12-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency