immortal 0.1.7 → 1.0.0

data/Gemfile.lock

@@ -1,28 +1,32 @@
 PATH
   remote: .
   specs:
-    immortal (0.1.7)
-      activerecord (~> 3.0.5)
+    immortal (0.1.6)
+      activerecord (= 3.1.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
-      builder (~> 2.1.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.9)
-    arel (2.0.10)
-    builder (2.1.2)
+    activemodel (3.1.0)
+      activesupport (= 3.1.0)
+      bcrypt-ruby (~> 3.0.0)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activesupport (3.1.0)
+      multi_json (~> 1.0)
+    arel (2.2.1)
+    bcrypt-ruby (3.0.1)
+    builder (3.0.0)
     columnize (0.3.2)
     diff-lcs (1.1.2)
-    i18n (0.5.0)
+    i18n (0.6.0)
     linecache (0.43)
+    multi_json (1.0.3)
     rspec (2.3.0)
       rspec-core (~> 2.3.0)
       rspec-expectations (~> 2.3.0)
@@ -36,7 +40,7 @@ GEM
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    sqlite3-ruby (1.3.2)
+    sqlite3 (1.3.4)
     tzinfo (0.3.29)
 
 PLATFORMS
@@ -46,4 +50,4 @@ DEPENDENCIES
   immortal!
   rspec (~> 2.3.0)
   ruby-debug (~> 0.10.4)
-  sqlite3-ruby (~> 1.3.2)
+  sqlite3

data/README.md

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

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.7'
+  s.version     = '1.0.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Jordi Romero", "Saimon Moore"]
   s.email       = ["jordi@jrom.net", "saimon@saimonmoore.net"]
@@ -16,8 +16,8 @@ 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.5'
+  s.add_dependency 'activerecord', '3.1.0'
   s.add_development_dependency 'rspec', '~> 2.3.0'
-  s.add_development_dependency 'sqlite3-ruby', '~> 1.3.2'
+  s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'ruby-debug', '~> 0.10.4'
 end

data/lib/immortal.rb

@@ -1,5 +1,3 @@
-require 'immortal/has_many_through_mortal_association'
-
 module Immortal
 
   def self.included(base)
@@ -12,11 +10,7 @@ module Immortal
         # 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
+            # FIXME This must be re-implemented after the ActiveRecord internals refactor in 3.1
           end
         end
 
@@ -35,32 +29,38 @@ module Immortal
       self.included_modules.include?(::Immortal::InstanceMethods)
     end
 
-    def with_deleted
-      except(:where).where(filter_undeleted_where_clauses.join(' AND '))
+    def without_default_scope
+      with_exclusive_scope do
+        yield
+      end
     end
 
-    def only_deleted
-      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 "))
+    def exists?(id = false)
+      where(:deleted => false).exists?(id)
     end
 
     def count_with_deleted(*args)
-      with_deleted.count(*args)
+      without_default_scope do
+        count(*args)
+      end
     end
 
     def count_only_deleted(*args)
-      only_deleted.count(*args)
+      without_default_scope do
+        where(:deleted => true).count(*args)
+      end
     end
 
     def find_with_deleted(*args)
-      with_deleted.find(*args)
+      without_default_scope do
+        find(*args)
+      end
     end
 
     def find_only_deleted(*args)
-      only_deleted.find(*args)
+      without_default_scope do
+        where(:deleted => true).find(*args)
+      end
     end
 
     def immortal_delete_all(conditions = nil)
@@ -72,24 +72,11 @@ module Immortal
     end
 
     def undeleted_clause_sql
-      unscoped.where(arel_table[:deleted].eq(nil).or(arel_table[:deleted].eq(false))).where_clauses.first
+      unscoped.where(arel_table[:deleted].eq(nil).or(arel_table[:deleted].eq(false))).constraints.first.to_sql
     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
+      unscoped.where(arel_table[:deleted].eq(true)).constraints.first.to_sql
     end
 
   end

data/spec/immortal_spec.rb

@@ -38,12 +38,6 @@ describe Immortal do
     ImmortalModel.all.should be_empty
   end
 
-  it "should find deleted records using scope" do
-    @m.destroy
-    ImmortalModel.with_deleted.first.should == @m
-    ImmortalModel.with_deleted.all.should include(@m)
-  end
-
   it "should find deleted records using the old method" do
     ImmortalModel.find_with_deleted(@m.id).should == @m
     @m.destroy
@@ -53,12 +47,10 @@ describe Immortal do
   it "should count undeleted records by default" do
     @m2 = ImmortalModel.create! :title => 'testing immortal again'
     ImmortalModel.count_only_deleted.should == 0
-    ImmortalModel.only_deleted.count.should == 0
 
     @m.destroy
 
     ImmortalModel.count_only_deleted.should == 1
-    ImmortalModel.only_deleted.count.should == 1
   end
 
   it "should find only deleted records" do
@@ -67,19 +59,12 @@ describe Immortal do
       ImmortalModel.find_only_deleted(@m.id)
     }.to raise_error(ActiveRecord::RecordNotFound)
 
-    expect {
-      ImmortalModel.only_deleted.find(@m.id)
-    }.to raise_error(ActiveRecord::RecordNotFound)
-
     @m.destroy
 
     ImmortalModel.find_only_deleted(@m.id).should == @m
     expect {
       ImmortalModel.find_only_deleted(@m2.id)
     }.to raise_error(ActiveRecord::RecordNotFound)
-
-    ImmortalModel.only_deleted.should include(@m)
-    ImmortalModel.only_deleted.should_not include(@m2)
   end
 
   it "should be able to count undeleted records" do
@@ -95,7 +80,6 @@ describe Immortal do
     @m2 = ImmortalModel.create! :title => 'testing immortal again'
     @m.destroy
     ImmortalModel.count_with_deleted.should == 2
-    ImmortalModel.with_deleted.count.should == 2
   end
 
   it "should not exist if deleted" do
@@ -152,7 +136,7 @@ describe Immortal do
   it "should immortally delete all records with delete_all!" do
     expect {
       ImmortalModel.delete_all!
-    }.to change(ImmortalModel.with_deleted, :count).by(-1)
+    }.to change(ImmortalModel, :count_with_deleted).by(-1)
   end
 
   it "should know if it's deleted" do
@@ -163,7 +147,7 @@ describe Immortal do
 
   it "should be recoverable" do
     @m.destroy
-    @m = ImmortalModel.with_deleted.find(@m.id)
+    @m = ImmortalModel.find_with_deleted(@m.id)
     @m.recover!
     @m.should_not be_frozen
     @m.should_not be_changed
@@ -207,41 +191,11 @@ describe Immortal do
   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
+    join_sql1 = 'INNER JOIN "immortal_joins" ON "immortal_joins"."immortal_node_id" = "immortal_nodes"."id"'
+    join_sql2 = 'INNER JOIN "immortal_models" ON "immortal_models"."id" = "immortal_joins"."immortal_model_id"'
+    generated_sql = ImmortalNode.joins(:immortal_models).to_sql
+    generated_sql.should include(join_sql1)
+    generated_sql.should include(join_sql2)
   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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: immortal
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 23
   prerelease: false
   segments: 
-  - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 0
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Jordi Romero
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-30 00:00:00 +02:00
+date: 2011-09-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,14 +25,14 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 3
         segments: 
         - 3
+        - 1
         - 0
-        - 5
-        version: 3.0.5
+        version: 3.1.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -52,19 +52,17 @@ dependencies:
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
+  name: sqlite3
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 3
         segments: 
-        - 1
-        - 3
-        - 2
-        version: 1.3.2
+        - 0
+        version: "0"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -101,7 +99,6 @@ 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

data/lib/immortal/has_many_through_mortal_association.rb

@@ -1,23 +0,0 @@
-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