destroyed_at 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f228171fc8186eacb4a2b03091ac1da77801e98
-  data.tar.gz: 0e4ab1aadcc01078dd0b1decd2efaa2087131ee8
+  metadata.gz: e3fb7f279e758ccac81977388fb7231371b6dbe4
+  data.tar.gz: 4eae1c95bc510f1ba3bafce736b5741b9f5ed27e
 SHA512:
-  metadata.gz: b3c50322b6247e7baee90999128c42a8731812c4d37ba346e183f46c3dc54d6208740e5eacbf2c937a840f1e561d4ee5841cd5af7cae5824a7e5bf880e4a531f
-  data.tar.gz: 86f3b2fe4a8c15d9c5a1edb217161fdbe9377bfdcc970560d787dc6b63a7740e14330eee37a20f00b819d514253be378fd5a0dc7fce0652286b7aacf6e33ab6a
+  metadata.gz: 182864cb375de9bfaa99a612483d441f3b84c5d865447dcee45d06ef0fb7d7ba0c93d0bf7e0da40ba69d73db9f04e5721f564b8eb7d2c1807bdc0c8e54cff90e
+  data.tar.gz: f4c85b295b4a463a4ddcd80ac15e4ba375de63e2203b3a0e1879fa9cecbb75750858c837974a81449a178544d53cfb0daa1041234ab6667ce2e9300c265fee09

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 2.1.0
+* Allows `#mark_for_destruction` to be passed a timestamp which will be
+  used for future calls to `destroy`. Thanks
+  [anarchocurious](https://github.com/anarchocurious)!
+* Fixes polymorphic associations for dependencies that don't have the
+  same `destroyed_at` timestamp. Thanks
+  [nashby](https://github.com/nashby)!
+
 ## 2.0.0
 * Associated models that do not include `DestroyedAt` will now be
   **deleted** via `dependent: :destroy`. Previously, this was only the

data/README.md

@@ -1,8 +1,8 @@
 # DestroyedAt #
 
-[![Build Status](https://secure.travis-ci.org/dockyard/destroyed_at.png?branch=master)](http://travis-ci.org/dockyard/destroyed_at)
-[![Dependency Status](https://gemnasium.com/dockyard/destroyed_at.png?travis)](https://gemnasium.com/dockyard/destroyed_at)
-[![Code Climate](https://codeclimate.com/github/dockyard/destroyed_at.png)](https://codeclimate.com/github/dockyard/destroyed_at)
+[![Build Status](https://travis-ci.org/DockYard/ruby-destroyed_at.svg?branch=master)](http://travis-ci.org/dockyard/ruby-destroyed_at)
+[![Dependency Status](https://gemnasium.com/dockyard/ruby-destroyed_at.png?travis)](https://gemnasium.com/dockyard/ruby-destroyed_at)
+[![Code Climate](https://codeclimate.com/github/dockyard/ruby-destroyed_at/badges/gpa.svg)](https://codeclimate.com/github/dockyard/ruby-destroyed_at)
 
 ## Looking for help? ##
 

data/lib/destroyed_at.rb

@@ -39,7 +39,7 @@ module DestroyedAt
 
   # Set an object's destroyed_at time.
   def destroy(timestamp = nil)
-    timestamp ||= current_time_from_proper_timezone
+    timestamp ||= @marked_for_destruction_at || current_time_from_proper_timezone
     raw_write_attribute(:destroyed_at, timestamp)
     run_callbacks(:destroy) do
       destroy_associations
@@ -48,6 +48,12 @@ module DestroyedAt
     end
   end
 
+  def mark_for_destruction(timestamp = nil)
+    @marked_for_destruction_at = timestamp
+
+    super()
+  end
+
   # Set an object's destroyed_at time to nil.
   def restore
     state = nil

data/lib/destroyed_at/has_one_association.rb

@@ -1,7 +1,7 @@
 module DestroyedAt
   module HasOneAssociation
     def delete(method = options[:dependent])
-      if DestroyedAt.has_destroy_at?(target) && load_target && method == :destroy
+      if load_target && DestroyedAt.has_destroy_at?(target) && method == :destroy
         DestroyedAt.destroy_target_of_association(owner, target)
       else
         super

data/lib/destroyed_at/version.rb

@@ -1,3 +1,3 @@
 module DestroyedAt
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

data/test/destroyed_at_test.rb

@@ -81,6 +81,21 @@ describe 'destroying an activerecord instance' do
     Author.count.must_equal 0
     Avatar.count.must_equal 0
   end
+
+  it 'destroys child with the correct datetime through an an autosaving association' do
+    datetime = 10.minutes.ago
+
+    commenter = Commenter.create
+
+    comment = commenter.comments.build
+    commenter.save
+
+    comment.mark_for_destruction(datetime)
+    commenter.save
+
+    comment.destroyed_at.must_equal datetime
+  end
+
 end
 
 describe 'restoring an activerecord instance' do
@@ -108,6 +123,34 @@ describe 'restoring an activerecord instance' do
     initial_count.must_equal post.validation_count
   end
 
+  it 'restores polymorphic has_many relation with DestroyedAt' do
+    comment = Comment.create
+    Like.create(likeable: comment)
+    comment.destroy
+
+    Comment.count.must_equal 0
+    Like.count.must_equal 0
+
+    comment.reload
+    comment.restore
+    Comment.count.must_equal 1
+    Like.count.must_equal 1
+  end
+
+  it 'restores polymorphic has_one relation with DestroyedAt' do
+    post = Post.create
+    Like.create(likeable: post)
+    post.destroy
+
+    Post.count.must_equal 0
+    Like.count.must_equal 0
+
+    post.reload
+    post.restore
+    Post.count.must_equal 1
+    Like.count.must_equal 1
+  end
+
   it 'restores a dependent has_many relation with DestroyedAt' do
     Comment.create(:destroyed_at => timestamp, :post => post)
     Comment.count.must_equal 0
@@ -184,7 +227,7 @@ describe 'creating a destroyed record' do
 end
 
 describe 'non destroyed-at models' do
-  it 'can destroy has_on dependants' do
+  it 'can destroy has_one dependants' do
     person = Person.create!
     person.create_pet!
 

data/test/test_helper.rb

@@ -38,6 +38,7 @@ ActiveRecord::Base.connection.execute(%{CREATE TABLE images (id INTEGER PRIMARY
 ActiveRecord::Base.connection.execute(%{CREATE TABLE posts (id INTEGER PRIMARY KEY, author_id INTEGER, destroyed_at DATETIME);})
 ActiveRecord::Base.connection.execute(%{CREATE TABLE people (id INTEGER PRIMARY KEY);})
 ActiveRecord::Base.connection.execute(%{CREATE TABLE pets (id INTEGER PRIMARY KEY, person_id INTEGER);})
+ActiveRecord::Base.connection.execute(%{CREATE TABLE likes (id INTEGER PRIMARY KEY, likeable_id INTEGER, likeable_type TEXT, destroyed_at DATETIME);})
 
 class Author < ActiveRecord::Base
   has_many :posts
@@ -68,15 +69,22 @@ class Categorization < ActiveRecord::Base
   belongs_to :post
 end
 
+class Like < ActiveRecord::Base
+  include DestroyedAt
+  belongs_to :likeable, polymorphic: true
+end
+
 class Comment < ActiveRecord::Base
   include DestroyedAt
   belongs_to :post
   belongs_to :commenter
+
+  has_many :likes, as: :likeable, dependent: :destroy
 end
 
 class Commenter < ActiveRecord::Base
   include DestroyedAt
-  has_many :comments, dependent: :destroy
+  has_many :comments, dependent: :destroy, autosave: true
   has_many :posts, through: :comments
 end
 
@@ -92,6 +100,7 @@ class Post < ActiveRecord::Base
   has_many :categorizations, dependent: :destroy
   has_many :comments, dependent: :destroy
   has_many :commenters, through: :comments
+  has_one :like, as: :likeable, dependent: :destroy
 
   before_destroy :increment_destroy_callback_counter
   before_restore :increment_restore_callback_counter

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: destroyed_at
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Michael Dupuis Jr.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-13 00:00:00.000000000 Z
+date: 2016-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord