destroyed_at 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28d8c5c555222b4e7e45c3a782e60b7026970c37
-  data.tar.gz: 7f343f2ec3da1c7baec08b06c2433a29a2ab0fc5
+  metadata.gz: 072d8f78b587daebb48a6fa406287342c2e1ee3a
+  data.tar.gz: 6e963e35a47e92e114fc14038e2e8cc0734bf4b0
 SHA512:
-  metadata.gz: 068490e630e8dd369dc013ffa5e5ac9a44cae31bbd88d4e080b1621154dd85da503783d3bf1fd9bb082dbcff97d1079d98561a6b27760ff2782681fbee7bd22f
-  data.tar.gz: 9f4f2b3dccba9fa4046039e055ed1726d159dea30f4781aac80ab29e1fceea3570e631a74867e94afbd8808da4767a3eeda772c11041aa4dc01a2c8895b2facc
+  metadata.gz: 1fe52260f693cdd042dc38b26b55c51fbd2b1ee3043c5ef7273154fd78d3b91c54dc84a36a8a70e92498df6a5ec3b1dfd3a0628540cac6c35f66a8aceeb00171
+  data.tar.gz: 10eeacbd7a71381ddd8401d9069f4cc5d3b1a195b0338d4a46b33d780327b2a57041b3af1ced43e1fa193f25c741ed59c0e47c0bff86cc3e5511bba992d96be7

data/destroyed_at.gemspec

@@ -17,10 +17,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '>= 2.0'
+
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "activerecord", "~> 3.2"
-  spec.add_development_dependency "minitest", "~> 5"
+  spec.add_development_dependency "activerecord", "~> 4.0.0"
+  spec.add_development_dependency "minitest"
   spec.add_development_dependency "m"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "byebug"

data/lib/destroyed_at.rb

@@ -1,4 +1,7 @@
-require "destroyed_at/version"
+require 'destroyed_at/version'
+require 'destroyed_at/belongs_to_association'
+require 'destroyed_at/has_many_association'
+require 'destroyed_at/has_one_association'
 
 module DestroyedAt
   def self.included(klass)
@@ -10,11 +13,12 @@ module DestroyedAt
   end
 
   # Set an object's destroyed_at time.
-  def destroy
+  def destroy(timestamp = nil)
+    timestamp ||= current_time_from_proper_timezone
+    raw_write_attribute(:destroyed_at, timestamp)
     run_callbacks(:destroy) do
       destroy_associations
-      self.destroyed_at = current_time_from_proper_timezone
-      self.save(callbacks: false)
+      self.class.unscoped.where(self.class.primary_key => id).update_all(destroyed_at: timestamp)
       @destroyed = true
     end
   end
@@ -23,15 +27,25 @@ module DestroyedAt
   def restore
     state = nil
     run_callbacks(:restore) do
-      self.destroyed_at = nil
-      if state = self.save(callbacks: false, validate: false)
-        @destroyed = false
+      if state = (self.class.unscoped.where(self.class.primary_key => id).update_all(destroyed_at: nil) == 1)
         _restore_associations
+        raw_write_attribute(:destroyed_at, nil)
+        @destroyed = false
+        true
       end
     end
     state
   end
 
+  def persisted?
+    !new_record? && destroyed_at.present? || super
+  end
+
+  def delete
+    self.destroyed_at = nil
+    super
+  end
+
   private
 
   def _set_destruction_state
@@ -43,10 +57,20 @@ module DestroyedAt
   def _restore_associations
     reflections.select { |key, value| value.options[:dependent] == :destroy }.keys.each do |key|
       assoc = association(key)
+      reload_association = false
       if assoc.options[:through] && assoc.options[:dependent] == :destroy
         assoc = association(assoc.options[:through])
       end
-      assoc.association_scope.each { |r| r.restore if r.respond_to? :restore }
+      assoc.association_scope.each do |r|
+        if r.respond_to?(:restore) && r.destroyed_at == self.destroyed_at
+          r.restore
+          reload_association = true
+        end
+      end
+
+      if reload_association
+        assoc.reload
+      end
     end
   end
 end

data/lib/destroyed_at/belongs_to_association.rb

@@ -0,0 +1,15 @@
+module DestroyedAt
+  module BelongsToAssociation
+    def handle_dependency
+      if load_target
+        if options[:dependent] == :destroy && target.respond_to?(:destroyed_at)
+          target.destroy(owner.destroyed_at)
+        else
+          super
+        end
+      end
+    end
+  end
+end
+
+ActiveRecord::Associations::BelongsToAssociation.send(:prepend, DestroyedAt::BelongsToAssociation)

data/lib/destroyed_at/has_many_association.rb

@@ -0,0 +1,14 @@
+module DestroyedAt
+  module HasManyAssociation
+    def delete_records(records, method)
+      if method == :destroy
+        records.each { |r| r.destroy(owner.destroyed_at) }
+        update_counter(-records.length) unless inverse_updates_counter_cache?
+      else
+        super
+      end
+    end
+  end
+end
+
+ActiveRecord::Associations::HasManyAssociation.send(:prepend, DestroyedAt::HasManyAssociation)

data/lib/destroyed_at/has_one_association.rb

@@ -0,0 +1,15 @@
+module DestroyedAt
+  module HasOneAssociation
+    def delete(method = options[:dependent])
+      if load_target
+        if method == :destroy && target.respond_to?(:destroyed_at)
+          target.destroy(owner.destroyed_at)
+        else
+          super
+        end
+      end
+    end
+  end
+end
+
+ActiveRecord::Associations::HasOneAssociation.send(:prepend, DestroyedAt::HasOneAssociation)

data/lib/destroyed_at/version.rb

@@ -1,3 +1,3 @@
 module DestroyedAt
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end

data/test/destroyed_at_test.rb

@@ -5,7 +5,7 @@ describe 'Destroying AR models' do
     user = User.create
     user.destroy
     User.all.must_be_empty
-    User.unscoped.all.wont_be_empty
+    User.unscoped.load.wont_be_empty
   end
 
   it 'Destroying a model will set the timestamp it was destroyed at' do
@@ -22,6 +22,7 @@ describe 'Destroying AR models' do
     User.all.must_be_empty
     user.reload
     user.restore
+    user.destroyed_at.must_be_nil
     User.all.wont_be_empty
   end
 
@@ -56,9 +57,11 @@ describe 'Destroying AR models' do
   end
 
   it 'can restore relationships' do
-    user = User.create(:destroyed_at => DateTime.current)
-    Profile.create(:destroyed_at => DateTime.current, :user => user)
+    timestamp = DateTime.current
+    user = User.create(:destroyed_at => timestamp)
+    Profile.create(:destroyed_at => timestamp, :user => user)
     Profile.count.must_equal 0
+    user.reload
     user.restore
     Profile.count.must_equal 1
   end
@@ -71,20 +74,23 @@ describe 'Destroying AR models' do
   end
 
   it 'will respect has many associations' do
-    user = User.create(:destroyed_at => DateTime.current)
-    Dinner.create(:destroyed_at => DateTime.current, :user => user)
+    timestamp = DateTime.current
+    user = User.create(:destroyed_at => timestamp)
+    Dinner.create(:destroyed_at => timestamp, :user => user)
     Dinner.count.must_equal 0
+    user.reload
     user.restore
     Dinner.count.must_equal 1
   end
 
   it 'will respect has many through associations' do
-    #user = User.create(:destroyed_at => DateTime.current, :fleets => [Fleet.new(:destroyed_at => DateTime.current, :car => Car.new)])
-    user = User.create(:destroyed_at => DateTime.current)
+    timestamp = DateTime.current
+    user = User.create(:destroyed_at => timestamp)
     car = Car.create
-    fleet = Fleet.create(:destroyed_at => DateTime.current, :car => car)
+    fleet = Fleet.create(:destroyed_at => timestamp, :car => car)
     user.fleets = [fleet]
     user.cars.count.must_equal 0
+    user.reload
     user.restore
     user.cars.count.must_equal 1
   end
@@ -120,14 +126,75 @@ describe 'Destroying AR models' do
   it 'skips callbacks' do
     user = User.create
     user.destroy
-    user.before_save_count.must_equal nil
+    user.before_update_count.must_equal nil
     user.restore
-    user.before_save_count.must_equal nil
+    user.before_update_count.must_equal nil
   end
 
   it 'skips validations on restore' do
-    user = User.create(nil_attribute: '123')
+    user = User.create
+    user.validation_count.must_equal 1
+    user.destroy
+    user.validation_count.must_equal 1
+    user.restore
+    user.validation_count.must_equal 1
+  end
+
+  it 'stays persisted after destruction' do
+    user = User.create
+    user.destroy
+    user.persisted?.must_equal true
+  end
+
+  it 'does not allow new records with destroyed_at columns present to be marked persisted' do
+    user = User.new(destroyed_at: Time.now)
+    user.persisted?.must_equal false
+  end
+
+  it 'is not persisted after deletion' do
+    user = User.create
+    user.delete
+    user.persisted?.must_equal false
+  end
+
+  it 'can delete destroyed records and they are marked as not persisted' do
+    user = User.create
+    user.destroy
+    user.persisted?.must_equal true
+    user.delete
+    user.persisted?.must_equal false
+  end
+
+  it 'only restores dependencies destroyed with parent with has many' do
+    user = User.create
+    dinner_one = Dinner.create(user: user, destroyed_at: Time.now - 1.day)
+    dinner_two = Dinner.create(user: user)
+    user.destroy
+    user.restore
+    user.dinners.include?(dinner_one).must_equal false
+    user.dinners.include?(dinner_two).must_equal true
+  end
+
+  it 'only restores dependencies destroyed with parent with has one' do
+    user = User.create
+    profile_1 = Profile.create(user: user, destroyed_at: Time.now - 1.day)
+    profile_2 = Profile.create(user: user)
     user.destroy
-    user.restore.must_equal true
+    user.restore
+    user.profile.must_equal profile_2
+    profile_1.reload
+    profile_1.destroyed_at.wont_equal nil
+  end
+
+  it 'destroys and restores dependencies in a belongs_to relationship' do
+    user = User.create
+    show = Show.create(user: user)
+    show.destroy
+    show.reload
+    user.reload
+    user.destroyed_at.wont_equal nil
+    show.restore
+    user.reload
+    user.destroyed_at.must_equal nil
   end
 end

data/test/test_helper.rb

@@ -1,12 +1,12 @@
 require 'bundler/setup'
+require 'active_record'
 require 'destroyed_at'
 require 'minitest/autorun'
-require 'active_record'
 require 'byebug'
 require 'timecop'
 require 'database_cleaner'
 
-class Minitest::Spec
+class MiniTest::Spec
   class << self
     alias :context :describe
   end
@@ -42,15 +42,21 @@ class User < ActiveRecord::Base
   has_one :show
   has_many :fleets
   has_many :cars, :through => :fleets, :dependent => :destroy
-  before_save :increment_counter
+  before_update :increment_callback_counter
+  validate :increment_validation_counter
 
-  attr_accessor :before_save_count, :nil_attribute
+  attr_accessor :before_update_count, :validation_count
 
   private
 
-  def increment_counter
-    @counter ||= 0
-    @counter = @counter + 1
+  def increment_callback_counter
+    self.before_update_count ||= 0
+    self.before_update_count = self.before_update_count + 1
+  end
+
+  def increment_validation_counter
+    self.validation_count ||= 0
+    self.validation_count = self.validation_count + 1
   end
 end
 
@@ -89,6 +95,7 @@ end
 
 class Show < ActiveRecord::Base
   include DestroyedAt
+  belongs_to :user, :dependent => :destroy
 end
 
 class Fleet < ActiveRecord::Base

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: destroyed_at
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Dupuis Jr.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: m
   requirement: !ruby/object:Gem::Requirement
@@ -150,7 +150,11 @@ files:
 - README.md
 - Rakefile
 - destroyed_at.gemspec
+- lib/.DS_Store
 - lib/destroyed_at.rb
+- lib/destroyed_at/belongs_to_association.rb
+- lib/destroyed_at/has_many_association.rb
+- lib/destroyed_at/has_one_association.rb
 - lib/destroyed_at/version.rb
 - test/destroyed_at_test.rb
 - test/test_helper.rb
@@ -166,7 +170,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='