immortal 1.0.2 → 1.0.3

data/README.md

@@ -41,6 +41,7 @@ If you want to improve immortal
 
 ## CHANGELOG
 
+- 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
 - 1.0.0 Changed the API, made it compatible with Rails 3.1, removed

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.2'
+  s.version     = '1.0.3'
   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

@@ -42,8 +42,24 @@ module Immortal
     end
 
     def without_default_scope
-      with_exclusive_scope do
-        yield
+      new_scope = self.unscoped
+      our_scope = self.current_scope || self.unscoped
+
+      non_immortal_constraints = our_scope.arel.constraints.select do |constraint|
+        !constraint.to_sql.include?('deleted')
+      end
+
+      non_immortal_constraints_sql = non_immortal_constraints.to_a.map do |constraint|
+        constraint.to_sql
+      end.join(' AND ')
+
+      new_scope = new_scope.merge(our_scope.except(:where))
+      new_scope = new_scope.where(non_immortal_constraints_sql)
+
+      unscoped do
+        with_scope(new_scope) do
+          yield
+        end
       end
     end
 

data/spec/immortal_spec.rb

@@ -247,4 +247,39 @@ describe Immortal do
     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'
+    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.count_with_deleted.should == 1
+    @n.joins.count_with_deleted.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.count_only_deleted
+    @m.nodes.count_only_deleted.should == 1
+    @n.joins.count_only_deleted.should == 1
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: immortal
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   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: &70147088431320 !ruby/object:Gem::Requirement
+  requirement: &70129308919760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70147088431320
+  version_requirements: *70129308919760
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70147088430840 !ruby/object:Gem::Requirement
+  requirement: &70129308919280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70147088430840
+  version_requirements: *70129308919280
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70147088430460 !ruby/object:Gem::Requirement
+  requirement: &70129308918900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70147088430460
+  version_requirements: *70129308918900
 description: Typical paranoid gem built for Rails 3 and with the minimum code needed
   to satisfy acts_as_paranoid's API
 email: