destroyed_at 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0cbd15c416464ff4ef00e2af5b0a037bf72691e
-  data.tar.gz: 7f0cdd43d097e1f28b8c557ba444fa1f0befc6f6
+  metadata.gz: 31f75d25de69694f1b0550d6acfa484ecfa0332f
+  data.tar.gz: 415f0de4a3c8dfadfb647f08fe0fb51b723cc808
 SHA512:
-  metadata.gz: bb3d75a9b8ab6488912479cc5623556f4f23e84d2235ecd6b668e1a2417037abf43ee377aa27b26504fb32a8878e0cb8c92540f3a6188d231dc917c2e5b9f2aa
-  data.tar.gz: ca2b3311fcec370efa0d5ab14d0fa6c5b11b7a36e8282f931f54501f399c173c2c0d0d18af81f124e49afb66351510ac268631eb89fbf239f990712133c32079
+  metadata.gz: 52ab8675b98527803e9f4d012e51259a5c975ba468419262527a70ef2e3f6acb9c5f53fff94dc5f2342903bf7990d3ccc3ccb76e0ce27f79d844bcce436720a5
+  data.tar.gz: 96056fbf155a22dc22e5170e7dc95334fd1b226b379249de334e14259d4e01b7079e089a1b61b0a6640ef68d51a5be4ff34f67b62152079d308e513dcdc3635f

data/lib/destroyed_at.rb

@@ -13,7 +13,7 @@ module DestroyedAt
   def destroy
     run_callbacks(:destroy) do
       destroy_associations
-      self.update_attribute(:destroyed_at, DateTime.current)
+      self.update_attribute(:destroyed_at, current_time_from_proper_timezone)
       @destroyed = true
     end
   end
@@ -33,7 +33,7 @@ module DestroyedAt
   private
 
   def _set_destruction_state
-    @destroyed = destroyed_at.present? if respond_to?(:destroyed_at)
+    @destroyed = destroyed_at.present? if has_attribute?(:destroyed_at)
     # Don't stop the other callbacks from running
     true
   end
@@ -44,7 +44,8 @@ module DestroyedAt
       if assoc.options[:through] && assoc.options[:dependent] == :destroy
         assoc = association(assoc.options[:through])
       end
-      assoc.scoped.unscoped.each { |r| r.restore if r.respond_to? :restore }
+      relation = assoc.respond_to?(:scope) ? assoc.scope : assoc.scoped
+      relation.unscoped.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.1"
+  VERSION = "0.1.2"
 end

data/test/destroyed_at_test.rb

@@ -9,11 +9,11 @@ describe 'Destroying AR models' do
   end
 
   it 'Destroying a model will set the timestamp it was destroyed at' do
-    date = DateTime.current
-    Timecop.freeze(date) do
+    time = Time.now
+    Timecop.freeze(time) do
       user = User.create
       user.destroy
-      user.destroyed_at.inspect.must_equal date.inspect
+      user.destroyed_at.must_equal time
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: destroyed_at
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Michael Dupuis Jr.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -174,10 +174,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: Safe destroy for ActiveRecord.
 test_files:
 - test/destroyed_at_test.rb
 - test/test_helper.rb
+has_rdoc: