permanent_records 1.0.6 → 1.1.0

data/VERSION

@@ -1 +1 @@
-1.0.6
+1.1.0

data/lib/permanent_records.rb

@@ -7,9 +7,15 @@ module PermanentRecords
       base.extend LegacyScopes
     end
     base.send :include, InstanceMethods
-    base.define_callbacks :before_revive, :after_revive
-    base.alias_method_chain :destroy, :permanent_record_force
-    base.alias_method_chain :destroy_without_callbacks, :permanent_record
+    base.instance_eval do
+      define_callbacks :before_revive, :after_revive
+      alias_method_chain :destroy, :permanent_record_force
+      alias_method_chain :destroy_without_callbacks, :permanent_record
+      before_revive :revive_destroyed_dependent_records
+      def is_permanent?
+        columns.detect {|c| 'deleted_at' == c.name}
+      end
+    end
   end
   
   module LegacyScopes
@@ -81,6 +87,28 @@ module PermanentRecords
       end
       self
     end
+
+    def revive_destroyed_dependent_records
+      self.class.reflections.select do |name, reflection|
+        'destroy' == reflection.options[:dependent].to_s && reflection.klass.is_permanent?
+      end.each do |name, reflection|
+
+        send(name).find(:all,
+                        :conditions => [
+                          "#{reflection.quoted_table_name}.deleted_at > ?" +
+                          " AND " +
+                          "#{reflection.quoted_table_name}.deleted_at < ?",
+                          deleted_at - 3.seconds,
+                          deleted_at + 3.seconds
+                        ]
+                      ).each do |dependent|
+          dependent.revive
+        end
+
+        # and update the reflection cache
+        send(name, :reload)
+      end
+    end
   end
 end
 ActiveRecord::Base.send :include, PermanentRecords

data/permanent_records.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{permanent_records}
-  s.version = "1.0.6"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jack Danger Canty"]
-  s.date = %q{2009-12-28}
+  s.date = %q{2010-08-30}
   s.description = %q{Never Lose Data. Rather than deleting rows this sets Record#deleted_at and gives you all the scopes you need to work with your data.}
   s.email = %q{gems@6brand.com}
   s.extra_rdoc_files = [
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/JackDanger/permanent_records}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Soft-delete your ActiveRecord records}
   s.test_files = [
     "test/hole.rb",
@@ -55,7 +55,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/test/permanent_records_test.rb

@@ -15,7 +15,8 @@ class PermanentRecordsTest < ActiveSupport::TestCase
     Kitty.delete_all
     @kitty = Kitty.create!(:name => 'Meow Meow')
     @hole = Hole.create(:number => 14)
-    @mole = @hole.muskrats.create(:name => "Steady Rat")
+    @hole.muskrats.create(:name => "Active Muskrat")
+    @hole.muskrats.create(:name => "Deleted Muskrat", :deleted_at => 5.days.ago)
     @mole = @hole.moles.create(:name => "Grabowski")
   end
   
@@ -30,7 +31,7 @@ class PermanentRecordsTest < ActiveSupport::TestCase
   
   def test_revive_should_return_the_record
     muskrat = @deleted
-    assert_equal muskrat, muskrat.destroy
+    assert_equal muskrat, muskrat.revive
   end
 
   def test_destroy_should_set_deleted_at_attribute
@@ -116,4 +117,20 @@ class PermanentRecordsTest < ActiveSupport::TestCase
     end
     assert @hole.muskrats.first.deleted?
   end
+  
+  def test_dependent_permanent_records_should_be_revived_when_parent_is_revived
+    assert @hole.is_permanent?
+    @hole.destroy
+    assert @hole.muskrats.find_by_name("Active Muskrat").deleted?
+    @hole.revive
+    assert !@hole.muskrats.find_by_name("Active Muskrat").deleted?
+  end
+  
+  def test_old_dependent_permanent_records_should_not_be_revived
+    assert @hole.is_permanent?
+    @hole.destroy
+    assert @hole.muskrats.find_by_name("Deleted Muskrat").deleted?
+    @hole.revive
+    assert @hole.muskrats.find_by_name("Deleted Muskrat").deleted?
+  end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: permanent_records
 version: !ruby/object:Gem::Version 
-  version: 1.0.6
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Jack Danger Canty
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-28 00:00:00 -08:00
+date: 2010-08-30 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -51,21 +56,25 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Soft-delete your ActiveRecord records