destroyed_at 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31f75d25de69694f1b0550d6acfa484ecfa0332f
-  data.tar.gz: 415f0de4a3c8dfadfb647f08fe0fb51b723cc808
+  metadata.gz: 5d06484805624dd702d8643850b8f78b685c98af
+  data.tar.gz: d0d99bfb2bcabbf43ba9b862ee70feeef8a25397
 SHA512:
-  metadata.gz: 52ab8675b98527803e9f4d012e51259a5c975ba468419262527a70ef2e3f6acb9c5f53fff94dc5f2342903bf7990d3ccc3ccb76e0ce27f79d844bcce436720a5
-  data.tar.gz: 96056fbf155a22dc22e5170e7dc95334fd1b226b379249de334e14259d4e01b7079e089a1b61b0a6640ef68d51a5be4ff34f67b62152079d308e513dcdc3635f
+  metadata.gz: 2e0fff0a4085b7a3ee28b2fec68eb9899b91689933fa1abf1e3deb780eac1b7d1d3259041033879f65bc580d8c99cc5ce736f3242aacf0359133354ec044d2f0
+  data.tar.gz: 4e13c5e59e4a735df53c146a1c60c35852b74f2f2164e9ae2d8ed6ccb282b9066d26a69a62540c84b8cbc3b378fbfa1fbd6b0d00637e88644bd57fa299aaa265

data/destroyed_at.gemspec

@@ -25,5 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "timecop"
-  spec.add_development_dependency "database_cleaner"
+  spec.add_development_dependency "database_cleaner", '1.0.1'
 end

data/lib/destroyed_at.rb

@@ -44,8 +44,7 @@ module DestroyedAt
       if assoc.options[:through] && assoc.options[:dependent] == :destroy
         assoc = association(assoc.options[:through])
       end
-      relation = assoc.respond_to?(:scope) ? assoc.scope : assoc.scoped
-      relation.unscoped.each { |r| r.restore if r.respond_to? :restore }
+      assoc.association_scope.each { |r| r.restore if r.respond_to? :restore }
     end
   end
 end

data/lib/destroyed_at/version.rb

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

data/test/destroyed_at_test.rb

@@ -103,4 +103,17 @@ describe 'Destroying AR models' do
     User.create
     User.select(:id).must_be_kind_of ActiveRecord::Relation
   end
+
+  it 'only destroys and restores related dependents' 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
+    Dinner.count.must_equal 0
+    User.unscoped.first.restore
+    Dinner.count.must_equal 3
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: destroyed_at
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Michael Dupuis Jr.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2013-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -126,16 +126,16 @@ dependencies:
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.1
 description: Safe destroy for ActiveRecord.
 email:
 - michael.dupuis@dockyard.com
@@ -174,11 +174,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.1.0
 signing_key: 
 specification_version: 4
 summary: Safe destroy for ActiveRecord.
 test_files:
 - test/destroyed_at_test.rb
 - test/test_helper.rb
-has_rdoc: