immortal 1.0.4 → 1.0.5

data/README.md

@@ -41,6 +41,7 @@ If you want to improve immortal
 
 ## CHANGELOG
 
+- 1.0.5 Use separate internal accessors for with/only_deleted singular association readers
 - 1.0.4 Extract with_deleted singular assoc readers to separate module
 - 1.0.3 Added back feature where using immortal finders doesn't unscope association scopes.
 - 1.0.2 Added with/only_deleted singular association readers (see specs)

data/immortal.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "immortal"
-  s.version     = '1.0.4'
+  s.version     = '1.0.5'
   s.authors     = ["Jordi Romero", "Saimon Moore"]
   s.email       = ["jordi@jrom.net", "saimon@saimonmoore.net"]
   s.homepage    = "http://github.com/teambox/immortal"

data/lib/immortal/singular_association.rb

@@ -1,33 +1,147 @@
 module Immortal
   module SingularAssociation
+    attr_reader :with_deleted_target, :only_deleted_target
 
     def with_deleted_reader(force_reload = false)
-      deleted_reader('with', force_reload)
+      reader_with_deleted(force_reload)
     end
 
     def only_deleted_reader(force_reload = false)
-      deleted_reader('only', force_reload)
+      reader_only_deleted(force_reload)
     end
 
     private
 
-        def deleted_reader(how, force_reload = false)
-          klass.uncached do
-            send(:"find_#{how}_deleted_target")
+      def reset_with_deleted
+        @with_deleted_loaded = false
+        ActiveRecord::IdentityMap.remove(with_deleted_target) if ActiveRecord::IdentityMap.enabled? && with_deleted_target
+        @with_deleted_target = nil
+      end
+
+      def reset_only_deleted
+        @only_deleted_loaded = false
+        ActiveRecord::IdentityMap.remove(only_deleted_target) if ActiveRecord::IdentityMap.enabled? && only_deleted_target
+        @only_deleted_target = nil
+      end
+
+      def with_deleted_loaded!
+        @with_deleted_loaded      = true
+        @with_deleted_stale_state = stale_state
+      end
+
+      def only_deleted_loaded!
+        @only_deleted_loaded      = true
+        @only_deleted_stale_state = stale_state
+      end
+
+      def with_deleted_loaded?
+        @with_deleted_loaded
+      end
+
+      def only_deleted_loaded?
+        @only_deleted_loaded
+      end
+
+      def stale_with_deleted_target?
+        with_deleted_loaded? && @with_deleted_stale_state != stale_state
+      end
+
+      def stale_only_deleted_target?
+        only_deleted_loaded? && @only_deleted_stale_state != stale_state
+      end
+
+      def reload_only_deleted
+        reset_only_deleted
+        reset_scope
+        load_only_deleted_target
+        self unless only_deleted_target.nil?
+      end
+
+      def reload_with_deleted
+        reset_with_deleted
+        reset_scope
+        load_with_deleted_target
+        self unless with_deleted_target.nil?
+      end
+
+      def find_with_deleted_target?
+        !with_deleted_loaded? && (!owner.new_record? || foreign_key_present?) && klass
+      end
+
+      def find_only_deleted_target?
+        !only_deleted_loaded? && (!owner.new_record? || foreign_key_present?) && klass
+      end
+
+      def load_with_deleted_target
+        if find_with_deleted_target?
+          begin
+            if ActiveRecord::IdentityMap.enabled? && association_class && association_class.respond_to?(:base_class)
+              @with_deleted_target = ActiveRecord::IdentityMap.get(association_class, owner[reflection.foreign_key])
+            end
+          rescue NameError
+            nil
+          ensure
+            @with_deleted_target ||= find_with_deleted_target
           end
         end
+        with_deleted_loaded! unless with_deleted_loaded?
+        with_deleted_target
+      rescue ActiveRecord::RecordNotFound
+        with_deleted_reset
+      end
 
-        def find_with_deleted_target
-          klass.unscoped do
-            scoped.first.tap { |record| set_inverse_instance(record) }
+      def load_only_deleted_target
+        if find_only_deleted_target?
+          begin
+            if ActiveRecord::IdentityMap.enabled? && association_class && association_class.respond_to?(:base_class)
+              @only_deleted_target = ActiveRecord::IdentityMap.get(association_class, owner[reflection.foreign_key])
+            end
+          rescue NameError
+            nil
+          ensure
+            @only_deleted_target ||= find_only_deleted_target
           end
         end
+        only_deleted_loaded! unless only_deleted_loaded?
+        only_deleted_target
+      rescue ActiveRecord::RecordNotFound
+        only_deleted_reset
+      end
 
-        def find_only_deleted_target
-          klass.unscoped do
-            scoped.where(:deleted => true).first.tap { |record| set_inverse_instance(record) }
-          end
+      def reader_with_deleted(force_reload = false)
+        if force_reload
+          klass.uncached { reload_with_deleted } if klass
+        elsif !with_deleted_loaded? || stale_with_deleted_target?
+          reload_with_deleted
+        end
+
+        with_deleted_target
+      end
+
+      def reader_only_deleted(force_reload = false)
+
+        if force_reload
+          klass.uncached { reload_only_deleted } if klass
+        elsif !only_deleted_loaded? || stale_only_deleted_target?
+          reload_only_deleted
+        end
+
+        only_deleted_target
+      end
+
+      def find_with_deleted_target
+        return nil unless klass
+        klass.unscoped do
+          scoped.first.tap { |record| set_inverse_instance(record) }
+        end
+      end
+
+      def find_only_deleted_target
+        return nil unless klass
+        klass.unscoped do
+          scoped.where(:deleted => true).first.tap { |record| set_inverse_instance(record) }
         end
+      end
 
   end
 end

data/spec/immortal_spec.rb

@@ -234,12 +234,13 @@ describe Immortal do
     #don't assign directly and destroy new target
     target_2.destroy
 
-    #Respect what's expected
-    node.target.should be_nil
-
     #Ask for deleted target (or not deleted). Will NOT cache
+    # Run this before default accessor to test scope has been reset.
     node.target_with_deleted.should == target_2
 
+    #Respect what's expected
+    node.target.should be_nil
+
     #Ask only for deleted target. Will NOT cache
     node.target_only_deleted.should == target_2
 
@@ -260,7 +261,7 @@ describe Immortal do
     node.target = target_1
     node.target.should == target_1
 
-    #switch target indirectly
+    #switch target directly
     node.target = target_2
 
     node.target.should == target_2
@@ -279,6 +280,49 @@ describe Immortal do
     node.target.should be_nil
   end
 
+  it "deleted readers should respect staleness" do
+    #setup
+    node = ImmortalNode.create! :title => 'testing association 1'
+    target_1 = ImmortalSomeTarget.create! :title => 'target 1'
+    target_2 = ImmortalSomeOtherTarget.create! :title => 'target 2'
+
+    #confirm initial state
+    node.target.should be_nil
+    node.target_with_deleted.should be_nil
+    node.target_only_deleted.should be_nil
+
+    #load target & confirm
+    node.target = target_1
+    node.target.should == target_1
+    node.target_with_deleted.should == target_1
+    node.target_only_deleted.should be_nil
+
+    #switch target directly
+    node.target = target_2
+
+    node.target.should == target_2
+    node.target_with_deleted.should == target_2
+
+    #don't assign directly and destroy new target
+    target_2.destroy
+
+    #Respect what's expected
+    node.target(true).should be_nil
+
+    #Ask for deleted target (or not deleted).
+    node.target_with_deleted.should == target_2
+    node.target_only_deleted.should == target_2
+
+    #Confirm we haven't invaded the target namespace
+    node.target.should be_nil
+
+    node.target_id = target_1.id
+    node.target_type = target_1.class.name
+    node.target.should == target_1
+    node.target_with_deleted.should == target_1
+    node.target_only_deleted.should be_nil
+  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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: immortal
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-17 00:00:00.000000000 Z
+date: 2011-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70364462440520 !ruby/object:Gem::Requirement
+  requirement: &70196367376140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70364462440520
+  version_requirements: *70196367376140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70364462440040 !ruby/object:Gem::Requirement
+  requirement: &70196367375660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70364462440040
+  version_requirements: *70196367375660
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70364462439660 !ruby/object:Gem::Requirement
+  requirement: &70196367375280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70364462439660
+  version_requirements: *70196367375280
 description: Typical paranoid gem built for Rails 3 and with the minimum code needed
   to satisfy acts_as_paranoid's API
 email: