destroyed_at 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7d179e6fcbc606b511c8f487d48cc6bf51b48aa
-  data.tar.gz: 3a5163d54f812bee7ccffb46efb59724a806094f
+  metadata.gz: 04939466ff647a0d0017648e6c952b9223b192d1
+  data.tar.gz: f4063081197fd1557dfee1128da533be633eef54
 SHA512:
-  metadata.gz: f837e70ea9b18712645e0d710c230dde370d300bc2184a88f0a70223c662066c61c3749f2e6e50ee4f5825b8567c6fff2948528d041ac4ac621cf1fad31b1038
-  data.tar.gz: b5355d8bf3b48f2f6dbe4ebbbc899b8931c4b8d68d62572d82afaef45f0f81d793b1815f3510669fdf9748f5733bb2701c166c410097f0e0a3849fcaa1239d8a
+  metadata.gz: 0aa141594c6795094f7090832560cd0e51ed8f77444a29161ee8e9df911c9637f06490c0e4a746fcfbdf9a754aa8a2a1431a8277bc49ce6e264304dce179cf86
+  data.tar.gz: 9f03d073154ff339e9c56f920eef9580198ec3d3a45f577aec105bd6eea5e6cedd337f8d896d13ae26b5f8f4579ee982a42adee34383f83d444c87ad746e41d1

data/.ruby-version

@@ -0,0 +1 @@
+2.1.6

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.0.2
+* Fixes an issue in which
+  `DestroyedAt::BelongsToAssociation#handle_dependency` was not deriving
+the action from the `options` hash, but was using `method` and raising
+an error for the wrong number of arguments. Thanks to
+[harmdewit](https://github.com/harmdewit) for catching this!
+
 ## 1.0.1
 * Fixes an issue with where the incorrect arguments were being passed
   from inside the `BelongsToAssociation` and `HasOneAssociation`, as

data/lib/destroyed_at/belongs_to_association.rb

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

data/lib/destroyed_at/version.rb

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

data/test/destroyed_at_test.rb

@@ -186,7 +186,7 @@ end
 describe 'non destroyed-at models' do
   it 'can destroy has_on dependants' do
     person = Person.create!
-    pet = person.create_pet!
+    person.create_pet!
 
     person.destroy
 
@@ -194,3 +194,15 @@ describe 'non destroyed-at models' do
     assert_equal(0, Pet.count, 'Pet must be zero')
   end
 end
+
+describe 'destroying a child that destroys its parent on destroy' do
+  it 'does not destroy a parent record without DestroyedAt' do
+    parent = Person.create!
+    child = DestructiveChild.create!(person: parent)
+
+    child.destroy
+
+    assert_equal(1, Person.count, 'Person must be one')
+    assert_equal(0, DestructiveChild.count, 'DestructiveChild must be zero')
+  end
+end

data/test/test_helper.rb

@@ -33,6 +33,7 @@ ActiveRecord::Base.connection.execute(%{CREATE TABLE categories (id INTEGER PRIM
 ActiveRecord::Base.connection.execute(%{CREATE TABLE categorizations (id INTEGER PRIMARY KEY, category_id INTEGER, post_id INTEGER);})
 ActiveRecord::Base.connection.execute(%{CREATE TABLE comments (id INTEGER PRIMARY KEY, commenter_id INTEGER, post_id INTEGER, destroyed_at DATETIME);})
 ActiveRecord::Base.connection.execute(%{CREATE TABLE commenters (id INTEGER PRIMARY KEY, destroyed_at DATETIME);})
+ActiveRecord::Base.connection.execute(%{CREATE TABLE destructive_children (id INTEGER PRIMARY KEY, person_id INTEGER, 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);})
@@ -44,6 +45,7 @@ class Author < ActiveRecord::Base
 end
 
 class Person < ActiveRecord::Base
+  has_many :destructive_children
   has_one :pet, dependent: :destroy
 end
 
@@ -78,6 +80,10 @@ class Commenter < ActiveRecord::Base
   has_many :posts, through: :comments
 end
 
+class DestructiveChild < ActiveRecord::Base
+  belongs_to :person, dependent: :destroy
+end
+
 class Post < ActiveRecord::Base
   include DestroyedAt
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: destroyed_at
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Michael Dupuis Jr.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2015-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -144,6 +144,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -182,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Safe destroy for ActiveRecord.