immortal 1.0.5 → 2.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 60ac9bd43b41aa290750329470ab9cd76e8adcb3
+  data.tar.gz: a779e1fb76253a4148f62e186c347be7ed19c847
+SHA512:
+  metadata.gz: 34bddc9c389145c501948b6255821a30424cd126fca8e6367a1ee65f7d99d32ea96fe53c684575d3c0c184f9c962fca802c1786e351e6b65d4ce858669ad70cf
+  data.tar.gz: a34d764cdc236d6cb6f055c32bdeb2eab35448390171af5988eaa0accca696e2a843d87f683cd65a9f753624b97168fb1569e5d4994c8ddfd4e85fb9bdda9db2

data/.gitignore

@@ -1,3 +1,5 @@
 pkg/*
 *.gem
 .bundle
+.Gemfile.lock
+Gemfile.lock

data/Gemfile

@@ -2,14 +2,3 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in immortal.gemspec
 gemspec
-
-group :test, :development do
-
-  # gem "ruby-debug", "~> 0.10.4", :require => "ruby-debug", :platform => :ruby_18
-
-  # gem "ruby-debug19", :require => "ruby-debug", :platform => :ruby_19
-  # # Uncomment this and rebundle to use the debugger under 1.9.3
-  # TODO: Remove this when ruby-debug-base19-0.11.26 is published
-  # gem "ruby-debug-base19", "0.11.26", :platform => :ruby_19
-
-end

data/LICENSE

@@ -0,0 +1,9 @@
+(The MIT License)
+
+Copyright (c) Teambox
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -57,3 +57,15 @@ If you want to improve immortal
 - 0.1.3 fix bug where join model is not immortal
 - 0.1.2 fix loading issue when the `deleted` column doesn't exist (or even the table)
 - 0.1.1 fix behavior with `has_many :through` associations
+
+## License
+
+(The MIT License)
+
+Copyright (c) Teambox
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/immortal.gemspec

@@ -1,22 +1,28 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
-  s.name        = "immortal"
-  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"
-  s.summary     = %q{Replacement for acts_as_paranoid for Rails 3}
-  s.description = %q{Typical paranoid gem built for Rails 3 and with the minimum code needed to satisfy acts_as_paranoid's API}
+  s.name        = 'immortal'
+  s.version     = '2.0.0'
+  s.authors     = [
+    'Jordi Romero', 'Saimon Moore', 'Pau Ramon', 'Carlos Saura', 'Andres Bravo',
+    'Fran Casas', 'Pau Perez'
+  ]
+  s.email       = ['jordi@jrom.net', 'saimon@saimonmoore.net']
+  s.homepage    = 'http://github.com/teambox/immortal'
+  s.summary     = 'Replacement for acts_as_paranoid for Rails 4'
+  s.description = 'Typical paranoid gem built for Rails 4 and with the ' \
+                  "minimum code needed to satisfy acts_as_paranoid's API"
+  s.license     = 'MIT'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {spec}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = ['lib']
 
-  s.add_dependency 'activerecord', '~> 3.1.1'
+  s.add_dependency 'activerecord', '~> 4.0.0'
   s.add_development_dependency 'rspec', '~> 2.6.0'
   s.add_development_dependency 'sqlite3'
-
+  s.add_development_dependency 'byebug'
+  s.add_development_dependency 'rake', '~> 10.0'
 end

data/lib/immortal.rb

@@ -8,19 +8,6 @@ module Immortal
     base.send :include, BelongsTo
     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
-            # FIXME This must be re-implemented after the ActiveRecord internals refactor in 3.1
-          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
@@ -37,26 +24,20 @@ module Immortal
       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 ')
+      non_immortal_constraints_sql = our_scope.arel.constraints.to_a.map do |constraint|
+        constraint.to_sql.split('AND').reject{|clause| clause.include?('deleted')}
+      end.flatten.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
+      unscoped.merge(new_scope).scoping do
+        yield
       end
     end
 
     def exists?(id = false)
-      where(:deleted => false).exists?(id)
+      where(deleted: false).exists?(id)
     end
 
     def count_with_deleted(*args)
@@ -67,24 +48,38 @@ module Immortal
 
     def count_only_deleted(*args)
       without_default_scope do
-        where(:deleted => true).count(*args)
+        where(deleted: true).count(*args)
+      end
+    end
+
+    def where_with_deleted(*args)
+      without_default_scope do
+        where(*args)
       end
     end
 
     def find_with_deleted(*args)
+      ActiveSupport::Deprecation.warn('[immortal] we are deprecating #find_with_deleted use where_with_deleted instead')
       without_default_scope do
         find(*args)
       end
     end
 
+    def where_only_deleted(*args)
+      without_default_scope do
+        where(deleted: true).where(args)
+      end
+    end
+
     def find_only_deleted(*args)
+      ActiveSupport::Deprecation.warn('[immortal] we are deprecating #find_only_deleted use where_only_deleted instead')
       without_default_scope do
-        where(:deleted => true).find(*args)
+        where(deleted: true).find(*args)
       end
     end
 
     def immortal_delete_all(conditions = nil)
-      unscoped.update_all({:deleted => 1}, conditions)
+      unscoped.where(conditions).update_all(deleted: 1)
     end
 
     def delete_all!(*args)
@@ -92,7 +87,7 @@ module Immortal
     end
 
     def undeleted_clause_sql
-      unscoped.where(arel_table[:deleted].eq(nil).or(arel_table[:deleted].eq(false))).constraints.first.to_sql
+      unscoped.where(deleted: false).constraints.first.to_sql
     end
 
     def deleted_clause_sql
@@ -103,16 +98,23 @@ module Immortal
 
   module InstanceMethods
     def self.included(base)
+      unless base.table_exists? && base.columns_hash["deleted"] && !base.columns_hash["deleted"].null
+        Kernel.warn "[Immortal] The 'deleted' column in #{base.to_s} is nullable, change the column to not accept NULL values"
+      end
+
       base.class_eval do
-        default_scope where(arel_table[:deleted].eq(nil).or(arel_table[:deleted].eq(false))) if arel_table[:deleted]
+        default_scope { ->{ where(deleted: false) } } if arel_table[:deleted]
+
         alias :mortal_destroy :destroy
         alias :destroy :immortal_destroy
       end
     end
 
     def immortal_destroy
-      run_callbacks :destroy do
-        destroy_without_callbacks
+      with_transaction_returning_status do
+        run_callbacks :destroy do
+          destroy_without_callbacks
+        end
       end
     end
 
@@ -121,15 +123,23 @@ module Immortal
     end
 
     def destroy_without_callbacks
-      self.class.unscoped.update_all({ :deleted => true }, "id = #{self.id}")
+      self.class.unscoped.where(id: id).update_all(deleted: true, updated_at: current_time_from_proper_timezone)
+      @destroyed = true
       reload
       freeze
     end
 
     def recover!
-      self.class.unscoped.update_all({ :deleted => false }, "id = #{self.id}")
+      self.class.unscoped.where(id: id).update_all(deleted: false, updated_at: current_time_from_proper_timezone)
+      @destroyed = false
       reload
     end
 
+    private
+
+    def current_time_from_proper_timezone
+      ActiveRecord::Base.default_timezone == :utc ? Time.now.utc : Time.now
+    end
+
   end
 end

data/lib/immortal/belongs_to.rb

@@ -8,8 +8,8 @@ module Immortal
         class << self
 
           # Add with/how_deleted singular association readers
-          def belongs_to_mortal(name, options = {})
-            ::Immortal::BelongsToBuilder.build(self, name, options)
+          def belongs_to_mortal(name, scope = nil, options = {})
+            ::Immortal::BelongsToBuilder.build(self, name, scope, options)
           end
 
           alias_method :belongs_to_immortal, :belongs_to

data/lib/immortal/singular_association.rb

@@ -12,15 +12,19 @@ module Immortal
 
     private
 
+      def supports_indetity_map?
+        defined?(ActiveRecord::IdentityMap) && ActiveRecord::IdentityMap.enabled?
+      end
+
       def reset_with_deleted
         @with_deleted_loaded = false
-        ActiveRecord::IdentityMap.remove(with_deleted_target) if ActiveRecord::IdentityMap.enabled? && with_deleted_target
+        ActiveRecord::IdentityMap.remove(with_deleted_target) if supports_indetity_map? && 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
+        ActiveRecord::IdentityMap.remove(only_deleted_target) if supports_indetity_map? && only_deleted_target
         @only_deleted_target = nil
       end
 
@@ -75,7 +79,7 @@ module Immortal
       def load_with_deleted_target
         if find_with_deleted_target?
           begin
-            if ActiveRecord::IdentityMap.enabled? && association_class && association_class.respond_to?(:base_class)
+            if supports_indetity_map? && association_class && association_class.respond_to?(:base_class)
               @with_deleted_target = ActiveRecord::IdentityMap.get(association_class, owner[reflection.foreign_key])
             end
           rescue NameError
@@ -93,7 +97,7 @@ module Immortal
       def load_only_deleted_target
         if find_only_deleted_target?
           begin
-            if ActiveRecord::IdentityMap.enabled? && association_class && association_class.respond_to?(:base_class)
+            if supports_indetity_map? && association_class && association_class.respond_to?(:base_class)
               @only_deleted_target = ActiveRecord::IdentityMap.get(association_class, owner[reflection.foreign_key])
             end
           rescue NameError
@@ -132,14 +136,14 @@ module Immortal
       def find_with_deleted_target
         return nil unless klass
         klass.unscoped do
-          scoped.first.tap { |record| set_inverse_instance(record) }
+          scope.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) }
+          scope.where(deleted: true).first.tap { |record| set_inverse_instance(record) }
         end
       end
 

data/spec/immortal_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/spec_helper'
 
 describe Immortal do
   before do
-    @m = ImmortalModel.create! :title => 'testing immortal'
+    @m = ImmortalModel.create! title: 'testing immortal'
   end
 
   it "should not be deleted from the database using #destroy" do
@@ -21,6 +21,12 @@ describe Immortal do
     @m.should_not be_changed
   end
 
+  it "should not be dirty using #destroy" do
+    expect {
+      @m.destroy
+    }.to change(@m, :updated_at)
+  end
+
   it "should be deleted from the database using #destroy!" do
     expect {
       @m.destroy!
@@ -45,7 +51,7 @@ describe Immortal do
   end
 
   it "should count undeleted records by default" do
-    @m2 = ImmortalModel.create! :title => 'testing immortal again'
+    @m2 = ImmortalModel.create! title: 'testing immortal again'
     ImmortalModel.count_only_deleted.should == 0
 
     @m.destroy
@@ -54,7 +60,7 @@ describe Immortal do
   end
 
   it "should find only deleted records" do
-    @m2 = ImmortalModel.create! :title => 'testing immortal again'
+    @m2 = ImmortalModel.create! title: 'testing immortal again'
     expect {
       ImmortalModel.find_only_deleted(@m.id)
     }.to raise_error(ActiveRecord::RecordNotFound)
@@ -68,7 +74,7 @@ describe Immortal do
   end
 
   it "should be able to count undeleted records" do
-    @m2 = ImmortalModel.create! :title => 'testing immortal again'
+    @m2 = ImmortalModel.create! title: 'testing immortal again'
     ImmortalModel.count.should == 2
 
     @m.destroy
@@ -77,7 +83,7 @@ describe Immortal do
   end
 
   it "should be able to count all the records including deleted" do
-    @m2 = ImmortalModel.create! :title => 'testing immortal again'
+    @m2 = ImmortalModel.create! title: 'testing immortal again'
     @m.destroy
     ImmortalModel.count_with_deleted.should == 2
   end
@@ -89,8 +95,8 @@ describe Immortal do
   end
 
   it "should calculate without deleted" do
-    @m2 = ImmortalModel.create! :value => 10
-    @m3 = ImmortalModel.create! :value => 20
+    @m2 = ImmortalModel.create! value: 10
+    @m3 = ImmortalModel.create! value: 20
     ImmortalModel.calculate(:sum, :value).should == 30
     @m2.destroy
     ImmortalModel.calculate(:sum, :value).should == 20
@@ -106,6 +112,19 @@ describe Immortal do
     @m.after_d.should be_true
   end
 
+  it "should execute the after_commit callback when immortally destroyed" do
+    @m.after_commit = false
+    @m.destroy
+    @m.after_commit.should be_true
+  end
+
+  it "should not return true when a before hook halts" do
+    @m.before_return = false
+    @m.after_commit = false
+    @m.destroy.should be_false
+    @m.after_commit.should_not be_true
+  end
+
   it "should not execute the before_update callback when immortally destroyed" do
     @m.destroy
     @m.before_u.should be_nil
@@ -148,22 +167,17 @@ describe Immortal do
   it "should be recoverable" do
     @m.destroy
     @m = ImmortalModel.find_with_deleted(@m.id)
-    @m.recover!
+    expect {
+      @m.recover!
+    }.to change(@m, :updated_at)
     @m.should_not be_frozen
     @m.should_not be_changed
     ImmortalModel.first.should == @m
   end
 
-  it "should consider an object with deleted = nil as not deleted" do
-    @m2 = ImmortalModel.create! :deleted => nil
-    @m2.deleted.should be_nil
-    @m2.should_not be_deleted
-    ImmortalModel.count.should == 2
-  end
-
   it "should consider an Many-to-many association with through as deleted when the join is deleted." do
-    @n = ImmortalNode.create! :title => 'testing association'
-    @join = ImmortalJoin.create! :immortal_model => @m, :immortal_node => @n
+    @n = ImmortalNode.create! title: 'testing association'
+    @join = ImmortalJoin.create! immortal_model: @m, immortal_node: @n
 
     @m.nodes.count.should == 1
     @n.models.count.should == 1
@@ -175,14 +189,14 @@ describe Immortal do
   end
 
   it "should only immortally delete scoped associations, NOT ALL RECORDS" do
-    n1 = ImmortalNode.create! :title => 'testing association 1'
-    j1 = ImmortalJoin.create! :immortal_model => @m, :immortal_node => n1
+    n1 = ImmortalNode.create! title: 'testing association 1'
+    j1 = ImmortalJoin.create! immortal_model: @m, immortal_node: n1
 
-    n2 = ImmortalNode.create! :title => 'testing association 2'
-    j2 = ImmortalJoin.create! :immortal_model => @m, :immortal_node => n2
+    n2 = ImmortalNode.create! title: 'testing association 2'
+    j2 = ImmortalJoin.create! immortal_model: @m, immortal_node: n2
 
-    n3 = ImmortalNode.create! :title => 'testing association 3'
-    j3 = ImmortalJoin.create! :immortal_node => n3
+    n3 = ImmortalNode.create! title: 'testing association 3'
+    j3 = ImmortalJoin.create! immortal_node: n3
 
     @m.destroy
 
@@ -199,9 +213,9 @@ describe Immortal do
   end
 
   it "should reload immortal polymorphic associations using default reader" do
-    node = ImmortalNode.create! :title => 'testing association 1'
-    target_1 = ImmortalSomeTarget.create! :title => 'target 1'
-    target_2 = ImmortalSomeOtherTarget.create! :title => 'target 2'
+    node = ImmortalNode.create! title: 'testing association 1'
+    target_1 = ImmortalSomeTarget.create! title: 'target 1'
+    target_2 = ImmortalSomeOtherTarget.create! title: 'target 2'
 
     node.target.should be_nil
     node.target = target_1
@@ -216,9 +230,9 @@ describe Immortal do
 
   it "should reload immortal polymorphic associations using deleted reader" do
     #setup
-    node = ImmortalNode.create! :title => 'testing association 1'
-    target_1 = ImmortalSomeTarget.create! :title => 'target 1'
-    target_2 = ImmortalSomeOtherTarget.create! :title => 'target 2'
+    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
@@ -250,9 +264,9 @@ describe Immortal do
 
   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'
+    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
@@ -282,9 +296,9 @@ describe Immortal do
 
   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'
+    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
@@ -324,12 +338,12 @@ describe Immortal do
   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
+    m1 = ImmortalModel.create! title: 'previously created model'
+    n1 = ImmortalNode.create! title: 'previously created association'
+    ImmortalJoin.create! immortal_model: m1, immortal_node: n1
 
-    @n = ImmortalNode.create! :title => 'testing association'
-    @join = ImmortalJoin.create! :immortal_model => @m, :immortal_node => @n
+    @n = ImmortalNode.create! title: 'testing association'
+    @join = ImmortalJoin.create! immortal_model: @m, immortal_node: @n
 
     @join.destroy
 
@@ -341,12 +355,12 @@ describe Immortal do
   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
+    m1 = ImmortalModel.create! title: 'previously created model'
+    n1 = ImmortalNode.create! title: 'previously created association'
+    ImmortalJoin.create! immortal_model: m1, immortal_node: n1
 
-    @n = ImmortalNode.create! :title => 'testing association'
-    @join = ImmortalJoin.create! :immortal_model => @m, :immortal_node => @n
+    @n = ImmortalNode.create! title: 'testing association'
+    @join = ImmortalJoin.create! immortal_model: @m, immortal_node: @n
 
     @join.destroy
 
@@ -358,4 +372,12 @@ describe Immortal do
     @n.joins.count_only_deleted.should == 1
   end
 
+  it 'warn when deleted column is nullable' do
+    Kernel.should_receive(:warn)
+
+    class ImmortalNullableDeleted
+      include Immortal
+    end
+  end
+
 end

data/spec/spec_helper.rb

@@ -15,7 +15,7 @@ RSpec.configure do |config|
 end
 
 
-ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
+ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: ":memory:")
 ActiveRecord::Base.logger = Logger.new(STDOUT) if ENV['DEBUG']
 
 old_stdout = $stdout
@@ -26,13 +26,13 @@ begin
     create_table :immortal_models do |t|
       t.string :title
       t.integer :value
-      t.boolean :deleted, :default => false
+      t.boolean :deleted, default: false, null: false
       t.timestamps
     end
     create_table :immortal_joins do |t|
       t.integer :immortal_model_id
       t.integer :immortal_node_id
-      t.boolean :deleted, :default => false
+      t.boolean :deleted, default: false, null: false
       t.timestamps
     end
     create_table :immortal_nodes do |t|
@@ -40,19 +40,25 @@ begin
       t.string :target_type
       t.string :title
       t.integer :value
-      t.boolean :deleted, :default => false
+      t.boolean :deleted, default: false, null: false
       t.timestamps
     end
 
     create_table :immortal_some_targets do |t|
       t.string :title
-      t.boolean :deleted, :default => false
+      t.boolean :deleted, default: false, null: false
       t.timestamps
     end
 
     create_table :immortal_some_other_targets do |t|
       t.string :title
-      t.boolean :deleted, :default => false
+      t.boolean :deleted, default: false, null: false
+      t.timestamps
+    end
+
+    create_table :immortal_nullable_deleteds do |t|
+      t.string :title
+      t.boolean :deleted, default: false
       t.timestamps
     end
   end
@@ -64,53 +70,56 @@ class ImmortalJoin < ActiveRecord::Base
   include Immortal
 
   belongs_to :immortal_model
-  belongs_to :immortal_node, :dependent => :destroy
+  belongs_to :immortal_node, dependent: :destroy
 end
 
 class ImmortalNode < ActiveRecord::Base
   include Immortal
 
   has_many :immortal_joins
-  has_many :immortal_models, :through => :immortal_joins
+  has_many :immortal_models, through: :immortal_joins
   
-  has_many :joins, :class_name => 'ImmortalJoin'
-  has_many :models, :through => :joins, :source => :immortal_model
+  has_many :joins, class_name: 'ImmortalJoin'
+  has_many :models, through: :joins, source: :immortal_model
 
-  belongs_to :target, :polymorphic => true
+  belongs_to :target, polymorphic: true
 end
 
 class ImmortalSomeTarget < ActiveRecord::Base
   include Immortal
 
-  has_many :immortal_nodes, :as => :target
+  has_many :immortal_nodes, as: :target
 end
 
 class ImmortalSomeOtherTarget < ActiveRecord::Base
   include Immortal
 
-  has_many :immortal_nodes, :as => :target
+  has_many :immortal_nodes, as: :target
 end
 
 
 class ImmortalModel < ActiveRecord::Base
   include Immortal
 
-  has_many :immortal_nodes, :through => :immortal_joins, :dependent => :destroy
-  has_many :immortal_joins, :dependent => :delete_all
+  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
+  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
+  attr_accessor :before_d, :after_d, :before_u, :after_u, :after_commit, :before_return
 
   before_destroy   :set_before
   after_destroy    :set_after
   before_update    :set_before_update
   after_update     :set_after_update
+  after_commit     :set_after_commit, on: :destroy
 
   private
+
   def set_before
     @before_d = true
+    @before_return
   end
 
   def set_after
@@ -121,9 +130,16 @@ class ImmortalModel < ActiveRecord::Base
     @after_u = true
   end
 
+  def set_after_commit
+    @after_commit = true
+  end
+
   def set_before_update
     @before_u = true
   end
 
 end
 
+class ImmortalNullableDeleted < ActiveRecord::Base
+end
+

metadata

@@ -1,51 +1,92 @@
 --- !ruby/object:Gem::Specification
 name: immortal
 version: !ruby/object:Gem::Version
-  version: 1.0.5
-  prerelease: 
+  version: 2.0.0
 platform: ruby
 authors:
 - Jordi Romero
 - Saimon Moore
+- Pau Ramon
+- Carlos Saura
+- Andres Bravo
+- Fran Casas
+- Pau Perez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-18 00:00:00.000000000 Z
+date: 2016-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70196367376140 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 4.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70196367376140
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70196367375660 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70196367375660
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70196367375280 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
   type: :development
   prerelease: false
-  version_requirements: *70196367375280
-description: Typical paranoid gem built for Rails 3 and with the minimum code needed
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+description: Typical paranoid gem built for Rails 4 and with the minimum code needed
   to satisfy acts_as_paranoid's API
 email:
 - jordi@jrom.net
@@ -54,9 +95,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
-- Gemfile.lock
+- LICENSE
 - README.md
 - Rakefile
 - immortal.gemspec
@@ -67,27 +108,27 @@ files:
 - spec/immortal_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/teambox/immortal
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 2.4.5.1
 signing_key: 
-specification_version: 3
-summary: Replacement for acts_as_paranoid for Rails 3
+specification_version: 4
+summary: Replacement for acts_as_paranoid for Rails 4
 test_files: []

data/Gemfile.lock

@@ -1,43 +0,0 @@
-PATH
-  remote: .
-  specs:
-    immortal (1.0.3)
-      activerecord (~> 3.1.1)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.1.1)
-      activesupport (= 3.1.1)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.1)
-      activemodel (= 3.1.1)
-      activesupport (= 3.1.1)
-      arel (~> 2.2.1)
-      tzinfo (~> 0.3.29)
-    activesupport (3.1.1)
-      multi_json (~> 1.0)
-    arel (2.2.1)
-    builder (3.0.0)
-    diff-lcs (1.1.3)
-    i18n (0.6.0)
-    multi_json (1.0.3)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    sqlite3 (1.3.4)
-    tzinfo (0.3.30)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  immortal!
-  rspec (~> 2.6.0)
-  sqlite3