destroyed_at 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d06484805624dd702d8643850b8f78b685c98af
-  data.tar.gz: d0d99bfb2bcabbf43ba9b862ee70feeef8a25397
+  metadata.gz: 9bc7d600d04c50b142c9c5191f0c10fc6da97818
+  data.tar.gz: 3013c9ef4cd5f8e2702a9c2299c34277bfddad9c
 SHA512:
-  metadata.gz: 2e0fff0a4085b7a3ee28b2fec68eb9899b91689933fa1abf1e3deb780eac1b7d1d3259041033879f65bc580d8c99cc5ce736f3242aacf0359133354ec044d2f0
-  data.tar.gz: 4e13c5e59e4a735df53c146a1c60c35852b74f2f2164e9ae2d8ed6ccb282b9066d26a69a62540c84b8cbc3b378fbfa1fbd6b0d00637e88644bd57fa299aaa265
+  metadata.gz: 7344d639a761abc3ba0765fc53e7ffafd94eac0b155879b0e99fc6f937e35f445945667842aff8ebd3f5e71a9c5b933e479ca1059eb24d78851805c26e803265
+  data.tar.gz: 0717292ca7a7b3075d4fb00c49a226a50f91ba337dcdd19866e638604eca59297c3a16110204900e5b9e3d30db9bc4ca04d7eeda21192523b24d879f851771ed

data/lib/destroyed_at.rb

@@ -13,7 +13,8 @@ module DestroyedAt
   def destroy
     run_callbacks(:destroy) do
       destroy_associations
-      self.update_attribute(:destroyed_at, current_time_from_proper_timezone)
+      self.destroyed_at = current_time_from_proper_timezone
+      self.save(callbacks: false)
       @destroyed = true
     end
   end
@@ -22,7 +23,8 @@ module DestroyedAt
   def restore
     state = nil
     run_callbacks(:restore) do
-      if state = self.update_attribute(:destroyed_at, nil)
+      self.destroyed_at = nil
+      if state = self.save(callbacks: false)
         @destroyed = false
         _restore_associations
       end

data/lib/destroyed_at/version.rb

@@ -1,3 +1,3 @@
 module DestroyedAt
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/test/destroyed_at_test.rb

@@ -108,7 +108,7 @@ describe 'Destroying AR models' do
     2.times do
        User.create(dinners: [Dinner.create, Dinner.create, Dinner.create])
     end
-  
+
     User.first.destroy
     Dinner.count.must_equal 3
     User.first.destroy
@@ -116,4 +116,12 @@ describe 'Destroying AR models' do
     User.unscoped.first.restore
     Dinner.count.must_equal 3
   end
+
+  it 'skips callbacks' do
+    user = User.create
+    user.destroy
+    user.before_save_count.must_equal nil
+    user.restore
+    user.before_save_count.must_equal nil
+  end
 end

data/test/test_helper.rb

@@ -42,6 +42,16 @@ class User < ActiveRecord::Base
   has_one :show
   has_many :fleets
   has_many :cars, :through => :fleets, :dependent => :destroy
+  before_save :increment_counter
+
+  attr_accessor :before_save_count
+
+  private
+
+  def increment_counter
+    @counter ||= 0
+    @counter = @counter + 1
+  end
 end
 
 class Person < User

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: destroyed_at
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Michael Dupuis Jr.