paranoia 2.1.4 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45933ae6db17d7ae34422587c41002a61915c588
-  data.tar.gz: 993a0cf0d2414179bcc916b3a3f00debf582332a
+  metadata.gz: 32a4bc8e17adc564a3c87661d90c1457b44323bd
+  data.tar.gz: 94527885cf5fb887a88ee2a938472995623639dd
 SHA512:
-  metadata.gz: ef70ba0f7801c7f6cc624159120fd149a25d15e3ba8a06b050a1549bedb75bfc4bcf16c70c2882104ee7623294890c4760c2baae0f99ef2eb18dca8093c3a3f1
-  data.tar.gz: 452e9212c38168259988b8df9e26656cb3799cae8ab093341a9679b5d6b5430eae3430da82d67e4a46aa92cdefd92354dc61d126394e96f934b3bd6fb6119a92
+  metadata.gz: 865a43181fa3699d92554cc800dff88a20070f2a00d839bc583c99b9e6ad2da78217711a0ca52cb5c358322a33865dbe378332c90c9182b7cf47971d2751f8a2
+  data.tar.gz: d55b46e33174f428e607557b60ba25b8adf6058acdac6dedd3aad00d5f010d7df4c9a5045b9d445c6d640ec1606399f75fbf0f383a6f8297569fd8b90c3d29f8

data/.travis.yml

@@ -1,8 +1,10 @@
+sudo: false
 language: ruby
 rvm:
   - 2.0.0
   - 2.1.0
   - 2.2.0
+  - 2.3.0
   - jruby-19mode
 
 env:

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # paranoia Changelog
 
+## 2.1.5 (2016-01-06)
+
+* Ruby 2.3 support
+
+## 2.1.4
+
+## 2.1.3
+
+## 2.1.2
+
+## 2.1.1
+
 ## 2.1.0 (2015-01-23)
 
 ### Major changes

data/lib/paranoia.rb

@@ -110,6 +110,7 @@ module Paranoia
         if (noop_if_frozen && !@attributes.frozen?) || !noop_if_frozen
           write_attribute paranoia_column, paranoia_sentinel_value
           update_columns(paranoia_restore_attributes)
+          touch
         end
         restore_associated_records if opts[:recursive]
       end
@@ -124,6 +125,30 @@ module Paranoia
   end
   alias :deleted? :paranoia_destroyed?
 
+  def really_destroy!
+    transaction do
+      run_callbacks(:real_destroy) do
+        dependent_reflections = self.class.reflections.select do |name, reflection|
+          reflection.options[:dependent] == :destroy
+        end
+        if dependent_reflections.any?
+          dependent_reflections.each do |name, reflection|
+            association_data = self.send(name)
+            # has_one association can return nil
+            # .paranoid? will work for both instances and classes
+            next unless association_data && association_data.paranoid?
+            if reflection.collection?
+              next association_data.with_deleted.each(&:really_destroy!)
+            end
+            association_data.really_destroy!
+          end
+        end
+        write_attribute(paranoia_column, current_time_from_proper_timezone)
+        destroy_without_paranoia
+      end
+    end
+  end
+
   private
 
   def paranoia_restore_attributes
@@ -184,31 +209,7 @@ class ActiveRecord::Base
   def self.acts_as_paranoid(options={})
     alias :really_destroyed? :destroyed?
     alias :really_delete :delete
-
     alias :destroy_without_paranoia :destroy
-    def really_destroy!
-      transaction do
-        run_callbacks(:real_destroy) do
-          dependent_reflections = self.class.reflections.select do |name, reflection|
-            reflection.options[:dependent] == :destroy
-          end
-          if dependent_reflections.any?
-            dependent_reflections.each do |name, reflection|
-              association_data = self.send(name)
-              # has_one association can return nil
-              # .paranoid? will work for both instances and classes
-              next unless association_data && association_data.paranoid?
-              if reflection.collection?
-                next association_data.with_deleted.each(&:really_destroy!)
-              end
-              association_data.really_destroy!
-            end
-          end
-          write_attribute(paranoia_column, current_time_from_proper_timezone)
-          destroy_without_paranoia
-        end
-      end
-    end
 
     include Paranoia
     class_attribute :paranoia_column, :paranoia_sentinel_value

data/lib/paranoia/version.rb

@@ -1,3 +1,3 @@
 module Paranoia
-  VERSION = "2.1.4"
+  VERSION = "2.1.5"
 end

data/test/paranoia_test.rb

@@ -20,6 +20,7 @@ def setup!
     'paranoid_model_with_build_belongs' => 'parent_model_id INTEGER, deleted_at DATETIME, paranoid_model_with_has_one_and_build_id INTEGER, name VARCHAR(32)',
     'paranoid_model_with_anthor_class_name_belongs' => 'parent_model_id INTEGER, deleted_at DATETIME, paranoid_model_with_has_one_id INTEGER',
     'paranoid_model_with_foreign_key_belongs' => 'parent_model_id INTEGER, deleted_at DATETIME, has_one_foreign_key_id INTEGER',
+    'paranoid_model_with_timestamps' => 'parent_model_id INTEGER, created_at DATETIME, updated_at DATETIME, deleted_at DATETIME',
     'not_paranoid_model_with_belongs' => 'parent_model_id INTEGER, paranoid_model_with_has_one_id INTEGER',
     'paranoid_model_with_has_one_and_builds' => 'parent_model_id INTEGER, color VARCHAR(32), deleted_at DATETIME, has_one_foreign_key_id INTEGER',
     'featureful_models' => 'deleted_at DATETIME, name VARCHAR(32)',
@@ -757,6 +758,19 @@ class ParanoiaTest < test_framework
     refute b.valid?
   end
 
+  def test_updated_at_modification_on_restore
+    parent1 = ParentModel.create
+    pt1 = ParanoidModelWithTimestamp.create(:parent_model => parent1)
+    ParanoidModelWithTimestamp.record_timestamps = false
+    pt1.update_columns(created_at: 20.years.ago, updated_at: 10.years.ago, deleted_at: 10.years.ago) 
+    ParanoidModelWithTimestamp.record_timestamps = true
+    assert pt1.updated_at < 10.minutes.ago
+    refute pt1.deleted_at.nil?
+    pt1.restore!
+    assert pt1.deleted_at.nil?
+    assert pt1.updated_at > 10.minutes.ago
+  end
+
   def test_i_am_the_destroyer
     expected = %Q{
       Sharon: "There should be a method called I_AM_THE_DESTROYER!"
@@ -1122,6 +1136,11 @@ class ParanoidModelWithForeignKeyBelong < ActiveRecord::Base
   belongs_to :paranoid_model_with_has_one
 end
 
+class ParanoidModelWithTimestamp < ActiveRecord::Base
+  belongs_to :parent_model
+  acts_as_paranoid
+end
+
 class NotParanoidModelWithBelong < ActiveRecord::Base
   belongs_to :paranoid_model_with_has_one
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paranoia
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors:
 - radarlistener@gmail.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: paranoia
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Paranoia is a re-implementation of acts_as_paranoid for Rails 3, using much,