destroyed_at 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0891b99ff62c41dcc3c065cb1ac598781707ea66
-  data.tar.gz: 15b26364c34fa8e7ba0868e995a787dcfa3b9328
+  metadata.gz: d7d179e6fcbc606b511c8f487d48cc6bf51b48aa
+  data.tar.gz: 3a5163d54f812bee7ccffb46efb59724a806094f
 SHA512:
-  metadata.gz: 5bd593a8e0d239de2196877179e935a02f0bf4ef3b1907396b405430011455a3bf4ba9771dbb434ac6498e5ff05aea79ab25d9375f84752831c90cb10e385120
-  data.tar.gz: 27072734f2bcfcf621ef0fe54748b2d035477f5f7cf228e7fc4533d47b385eca584308bd47601c816ebe39b3d94b88ed1ce52ab6882477fd04b60d5ee34c8c8d
+  metadata.gz: f837e70ea9b18712645e0d710c230dde370d300bc2184a88f0a70223c662066c61c3749f2e6e50ee4f5825b8567c6fff2948528d041ac4ac621cf1fad31b1038
+  data.tar.gz: b5355d8bf3b48f2f6dbe4ebbbc899b8931c4b8d68d62572d82afaef45f0f81d793b1815f3510669fdf9748f5733bb2701c166c410097f0e0a3849fcaa1239d8a

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.0.1
+* Fixes an issue with where the incorrect arguments were being passed
+  from inside the `BelongsToAssociation` and `HasOneAssociation`, as
+reported by [anarchocurious](https://github.com/anarchocurious)
+
 ## 1.0.0
 
 * Requires equal to or greater than Ruby `2.0` -

data/Gemfile

@@ -2,3 +2,4 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in destroyed_at.gemspec
 gemspec
+gem 'm', github: 'unmanbearpig/m'

data/destroyed_at.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["michael.dupuis@dockyard.com"]
   spec.description   = %q{Safe destroy for ActiveRecord.}
   spec.summary       = %q{Safe destroy for ActiveRecord.}
-  spec.homepage      = "https://github.com/dockyard/destroyed_at"
+  spec.homepage      = "https://github.com/dockyard/ruby-destroyed_at"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)

data/lib/destroyed_at.rb

@@ -22,6 +22,10 @@ module DestroyedAt
     end
   end
 
+  def self.has_destroy_at?(object)
+    object.class.included_modules.include?(DestroyedAt)
+  end
+
   module ClassMethods
     def destroyed(time = nil)
       query = where.not(destroyed_at: nil)

data/lib/destroyed_at/belongs_to_association.rb

@@ -2,7 +2,7 @@ module DestroyedAt
   module BelongsToAssociation
     def handle_dependency
       if load_target && method == :destroy
-        DestroyedAt.destroy_target_of_association(target, owner)
+        DestroyedAt.destroy_target_of_association(owner, target)
       else
         super
       end

data/lib/destroyed_at/has_one_association.rb

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

data/lib/destroyed_at/version.rb

@@ -1,3 +1,3 @@
 module DestroyedAt
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/test/destroyed_at_test.rb

@@ -79,7 +79,7 @@ describe 'destroying an activerecord instance' do
     author.destroy!
 
     Author.count.must_equal 0
-    Avatar.count.must_equal 1
+    Avatar.count.must_equal 0
   end
 end
 
@@ -182,3 +182,15 @@ describe 'creating a destroyed record' do
     post.persisted?.must_equal false
   end
 end
+
+describe 'non destroyed-at models' do
+  it 'can destroy has_on dependants' do
+    person = Person.create!
+    pet = person.create_pet!
+
+    person.destroy
+
+    assert_equal(0, Person.count, 'Person must be zero')
+    assert_equal(0, Pet.count, 'Pet must be zero')
+  end
+end

data/test/test_helper.rb

@@ -35,12 +35,22 @@ ActiveRecord::Base.connection.execute(%{CREATE TABLE comments (id INTEGER PRIMAR
 ActiveRecord::Base.connection.execute(%{CREATE TABLE commenters (id INTEGER PRIMARY KEY, destroyed_at DATETIME);})
 ActiveRecord::Base.connection.execute(%{CREATE TABLE images (id INTEGER PRIMARY KEY, post_id INTEGER);})
 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);})
 
 class Author < ActiveRecord::Base
   has_many :posts
   has_one :avatar, dependent: :destroy
 end
 
+class Person < ActiveRecord::Base
+  has_one :pet, dependent: :destroy
+end
+
+class Pet < ActiveRecord::Base
+  belongs_to :person
+end
+
 class Avatar < ActiveRecord::Base
   include DestroyedAt
   belongs_to :author

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: destroyed_at
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Michael Dupuis Jr.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -162,7 +162,7 @@ files:
 - test/mapper_test.rb
 - test/scope_test.rb
 - test/test_helper.rb
-homepage: https://github.com/dockyard/destroyed_at
+homepage: https://github.com/dockyard/ruby-destroyed_at
 licenses:
 - MIT
 metadata: {}
@@ -182,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Safe destroy for ActiveRecord.
@@ -191,4 +191,3 @@ test_files:
 - test/mapper_test.rb
 - test/scope_test.rb
 - test/test_helper.rb
-has_rdoc: