immortal 1.0.3 → 1.0.4

data/README.md

@@ -41,6 +41,7 @@ If you want to improve immortal
 
 ## CHANGELOG
 
+- 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)
 - 1.0.1 Made compatible with Rails 3.1.X

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.3'
+  s.version     = '1.0.4'
   s.authors     = ["Jordi Romero", "Saimon Moore"]
   s.email       = ["jordi@jrom.net", "saimon@saimonmoore.net"]
   s.homepage    = "http://github.com/teambox/immortal"

data/lib/immortal.rb

@@ -1,18 +1,14 @@
-require 'immortal/belongs_to_builder'
+require 'immortal/belongs_to'
 
 module Immortal
 
   def self.included(base)
     base.send :extend, ClassMethods
     base.send :include, InstanceMethods
+    base.send :include, BelongsTo
     base.class_eval do
       class << self
 
-        # Add with/how_deleted singular association readers
-        def belongs_to_mortal(name, options = {})
-          ::Immortal::BelongsToBuilder.build(self, name, options)
-        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
@@ -25,10 +21,6 @@ module Immortal
         alias_method :has_many_immortal, :has_many
         alias_method :has_many, :has_many_mortal
 
-        alias_method :belongs_to_immortal, :belongs_to
-        alias_method :belongs_to, :belongs_to_mortal
-
-
         alias :mortal_delete_all :delete_all
         alias :delete_all :immortal_delete_all
       end

data/lib/immortal/belongs_to.rb

@@ -0,0 +1,21 @@
+require 'immortal/belongs_to_builder'
+
+#Include this to add {with/only}_deleted_ accessors for singular associations
+module Immortal
+  module BelongsTo
+    def self.included(base)
+      base.class_eval do
+        class << self
+
+          # Add with/how_deleted singular association readers
+          def belongs_to_mortal(name, options = {})
+            ::Immortal::BelongsToBuilder.build(self, name, options)
+          end
+
+          alias_method :belongs_to_immortal, :belongs_to
+          alias_method :belongs_to, :belongs_to_mortal
+        end
+      end
+    end
+  end
+end

data/lib/immortal/singular_association.rb

@@ -1,6 +1,5 @@
 module Immortal
   module SingularAssociation
-    attr_reader :deleted_target
 
     def with_deleted_reader(force_reload = false)
       deleted_reader('with', force_reload)
@@ -14,24 +13,8 @@ module Immortal
 
         def deleted_reader(how, force_reload = false)
           klass.uncached do
-            send(:"reload_#{how}_deleted")
+            send(:"find_#{how}_deleted_target")
           end
-
-          deleted_target
-        end
-
-        def reload_with_deleted
-          reset
-          reset_scope
-          load_deleted_target('with')
-          self unless deleted_target.nil?
-        end
-
-        def reload_only_deleted
-          reset
-          reset_scope
-          load_deleted_target('only')
-          self unless deleted_target.nil?
         end
 
         def find_with_deleted_target
@@ -46,12 +29,5 @@ module Immortal
           end
         end
 
-        def load_deleted_target(how)
-          @deleted_target ||= send(:"find_#{how}_deleted_target")
-          deleted_target
-        rescue ActiveRecord::RecordNotFound
-          reset
-        end
-
   end
 end

data/spec/immortal_spec.rb

@@ -247,6 +247,38 @@ describe Immortal do
     node.target.should be_nil
   end
 
+  it "should reload immortal polymorphic associations using deleted reader (direct assignment)" 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
+
+    #load target & confirm
+    node.target = target_1
+    node.target.should == target_1
+
+    #switch target indirectly
+    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). Will NOT cache
+    node.target_with_deleted.should == target_2
+
+    #Confirm we haven't invaded the target namespace
+    node.target.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.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70129308919760 !ruby/object:Gem::Requirement
+  requirement: &70364462440520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70129308919760
+  version_requirements: *70364462440520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70129308919280 !ruby/object:Gem::Requirement
+  requirement: &70364462440040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70129308919280
+  version_requirements: *70364462440040
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70129308918900 !ruby/object:Gem::Requirement
+  requirement: &70364462439660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70129308918900
+  version_requirements: *70364462439660
 description: Typical paranoid gem built for Rails 3 and with the minimum code needed
   to satisfy acts_as_paranoid's API
 email:
@@ -61,6 +61,7 @@ files:
 - Rakefile
 - immortal.gemspec
 - lib/immortal.rb
+- lib/immortal/belongs_to.rb
 - lib/immortal/belongs_to_builder.rb
 - lib/immortal/singular_association.rb
 - spec/immortal_spec.rb