immortal 0.1.4 → 0.1.7

data/Gemfile.lock

@@ -1,23 +1,23 @@
 PATH
   remote: .
   specs:
-    immortal (0.1.3)
-      activerecord (~> 3.0.3)
+    immortal (0.1.7)
+      activerecord (~> 3.0.5)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
+    activemodel (3.0.9)
+      activesupport (= 3.0.9)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-      arel (~> 2.0.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
+      arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activesupport (3.0.3)
-    arel (2.0.7)
+    activesupport (3.0.9)
+    arel (2.0.10)
     builder (2.1.2)
     columnize (0.3.2)
     diff-lcs (1.1.2)
@@ -37,7 +37,7 @@ GEM
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
     sqlite3-ruby (1.3.2)
-    tzinfo (0.3.24)
+    tzinfo (0.3.29)
 
 PLATFORMS
   ruby

data/README.md

@@ -44,6 +44,9 @@ If you want to improve immortal
 
 ## CHANGELOG
 
+- 0.1.6 Fixing immortal issue 2: with_deleted breaks associations
+- 0.1.5 Add "without deleted" scope to join model by overriding HasManyThroughAssociation#construct_conditions
+    rather than simply adding to has_many conditions.
 - 0.1.4 fix bug where ALL records of any dependent associations were
   immortally deleted if assocation has :dependant => :delete_all option
   set

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.4'
+  s.version     = '0.1.7'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Jordi Romero", "Saimon Moore"]
   s.email       = ["jordi@jrom.net", "saimon@saimonmoore.net"]
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'activerecord', '~> 3.0.3'
+  s.add_dependency 'activerecord', '~> 3.0.5'
   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'

data/lib/immortal.rb

@@ -1,9 +1,28 @@
+require 'immortal/has_many_through_mortal_association'
+
 module Immortal
+
   def self.included(base)
     base.send :extend, ClassMethods
     base.send :include, InstanceMethods
     base.class_eval do
       class << self
+        # 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_mortal(association_id, options = {}, &extension)
+          has_many_immortal(association_id, options, &extension).tap do
+            if options[:through] and reflections[options[:through]] and reflections[options[:through]].class_name.classify.constantize.arel_table[:deleted]
+              reflection = reflect_on_association(association_id)
+              collection_reader_method(reflection, Immortal::HasManyThroughMortalAssociation)
+              collection_accessor_methods(reflection, Immortal::HasManyThroughMortalAssociation, false)
+            end
+          end
+        end
+
+        alias_method :has_many_immortal, :has_many
+        alias_method :has_many, :has_many_mortal
+
         alias :mortal_delete_all :delete_all
         alias :delete_all :immortal_delete_all
       end
@@ -12,12 +31,20 @@ module Immortal
 
   module ClassMethods
 
+    def immortal?
+      self.included_modules.include?(::Immortal::InstanceMethods)
+    end
+
     def with_deleted
-      unscoped
+      except(:where).where(filter_undeleted_where_clauses.join(' AND '))
     end
 
     def only_deleted
-      unscoped.where(:deleted => true)
+      deleted_clause = arel_table[:deleted].eq(true)
+      where_sql_clauses = filter_undeleted_where_clauses
+      where_sql_clauses.concat unscoped.where(deleted_clause).where_clauses
+
+      except(:where).where(where_sql_clauses.join(" AND "))
     end
 
     def count_with_deleted(*args)
@@ -44,15 +71,25 @@ module Immortal
       unscoped.mortal_delete_all(*args)
     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) and options[:through].to_s.classify.constantize.arel_table[:deleted]
-        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
+    def undeleted_clause_sql
+      unscoped.where(arel_table[:deleted].eq(nil).or(arel_table[:deleted].eq(false))).where_clauses.first
+    end
+
+    def deleted_clause_sql
+      unscoped.where(arel_table[:deleted].eq(true)).where_clauses.first
+    end
+
+    private
+
+    def filter_undeleted_where_clauses
+      where_clauses = scoped.arel.send(:where_clauses)
+
+      #Yes it's an ugly hack but I couldn't find a cleaner way of doing this
+      filtered_clauses = where_clauses.dup.map do |clause| 
+        clause.gsub(/(\s+AND\s+)?\("?`?(\w+)`?"?."?`?deleted`?"?\sIS\sNULL[^\)]+\)/, '')
+      end.map {|cl| cl.gsub("()", '')}.select {|cl| !cl.empty?}
+
+      filtered_clauses
     end
 
   end

data/lib/immortal/has_many_through_mortal_association.rb

@@ -0,0 +1,23 @@
+require 'active_record'
+
+module Immortal
+
+  class HasManyThroughMortalAssociation < ActiveRecord::Associations::HasManyThroughAssociation
+    protected
+
+      def construct_conditions
+        klass = @reflection.through_reflection.klass
+        return super unless klass.respond_to?(:immortal?) && klass.immortal?
+        table_name = @reflection.through_reflection.quoted_table_name
+        conditions = construct_quoted_owner_attributes(@reflection.through_reflection).map do |attr, value|
+          "#{table_name}.#{attr} = #{value}"
+        end
+
+        deleted_conditions = ["#{table_name}.deleted IS NULL OR #{table_name}.deleted = ?", false]
+        conditions << klass.send(:sanitize_sql, deleted_conditions)
+        conditions << sql_conditions if sql_conditions
+        "(" + conditions.join(') AND (') + ")"
+      end
+  end
+
+end

data/spec/immortal_spec.rb

@@ -181,13 +181,13 @@ describe Immortal 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
+    @m.nodes.count.should == 1
+    @n.models.count.should == 1
 
     @join.destroy
 
-    @m.immortal_nodes.count.should == 0
-    @n.immortal_models.count.should == 0
+    @m.nodes.count.should == 0
+    @n.models.count.should == 0
   end
 
   it "should only immortally delete scoped associations, NOT ALL RECORDS" do
@@ -205,4 +205,43 @@ describe Immortal do
     [n1,n2,j1,j2].all? {|r| r.reload.deleted?}.should be_true
     [n3,j3].all? {|r| !r.reload.deleted?}.should be_true
   end
+
+  it "should properly generate joins" do
+    join_sql = 'INNER JOIN "immortal_joins" ON "immortal_nodes"."id" = "immortal_joins"."immortal_node_id" INNER JOIN "immortal_models" ON "immortal_models"."id" = "immortal_joins"."immortal_model_id"'
+    ImmortalNode.joins(:immortal_models).to_sql.should include(join_sql)
+  end
+
+  it "should not unscope associations when using with_deleted scope" do
+    m1 = ImmortalModel.create! :title => 'previously created model'
+    n1 = ImmortalNode.create! :title => 'previously created association'
+    j1 = ImmortalJoin.create! :immortal_model => m1, :immortal_node => n1
+
+    @n = ImmortalNode.create! :title => 'testing association'
+    @join = ImmortalJoin.create! :immortal_model => @m, :immortal_node => @n
+
+    @join.destroy
+
+    @m.nodes.count.should == 0
+    @n.joins.count.should == 0
+
+    @m.nodes.with_deleted.count.should == 1
+    @n.joins.with_deleted.count.should == 1
+  end
+
+  it "should not unscope associations when using only_deleted scope" do
+    m1 = ImmortalModel.create! :title => 'previously created model'
+    n1 = ImmortalNode.create! :title => 'previously created association'
+    j1 = ImmortalJoin.create! :immortal_model => m1, :immortal_node => n1
+
+    @n = ImmortalNode.create! :title => 'testing association'
+    @join = ImmortalJoin.create! :immortal_model => @m, :immortal_node => @n
+
+    @join.destroy
+
+    @m.nodes.count.should == 0
+    @n.joins.count.should == 0
+
+    @m.nodes.only_deleted.count.should == 1
+    @n.joins.only_deleted.count.should == 1
+  end
 end

data/spec/spec_helper.rb

@@ -50,7 +50,7 @@ class ImmortalJoin < ActiveRecord::Base
   include Immortal
 
   belongs_to :immortal_model
-  belongs_to :immortal_node
+  belongs_to :immortal_node, :dependent => :destroy
 end
 
 class ImmortalNode < ActiveRecord::Base
@@ -58,6 +58,9 @@ class ImmortalNode < ActiveRecord::Base
 
   has_many :immortal_joins
   has_many :immortal_models, :through => :immortal_joins
+  
+  has_many :joins, :class_name => 'ImmortalJoin'
+  has_many :models, :through => :joins, :source => :immortal_model
 end
 
 class ImmortalModel < ActiveRecord::Base
@@ -66,6 +69,9 @@ class ImmortalModel < ActiveRecord::Base
   has_many :immortal_nodes, :through => :immortal_joins, :dependent => :destroy
   has_many :immortal_joins, :dependent => :delete_all
 
+  has_many :joins, :class_name => 'ImmortalJoin', :dependent => :delete_all
+  has_many :nodes, :through => :joins, :source => :immortal_node, :dependent => :destroy
+
   attr_accessor :before_d, :after_d, :before_u, :after_u
 
   before_destroy   :set_before

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: immortal
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Jordi Romero
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-19 00:00:00 +01:00
+date: 2011-08-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 13
         segments: 
         - 3
         - 0
-        - 3
-        version: 3.0.3
+        - 5
+        version: 3.0.5
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -101,6 +101,7 @@ files:
 - Rakefile
 - immortal.gemspec
 - lib/immortal.rb
+- lib/immortal/has_many_through_mortal_association.rb
 - spec/immortal_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true