permanent_records 3.2.0 → 3.3.0

checksums.yaml

@@ -1,4 +1,7 @@
 ---
+SHA1:
+  metadata.gz: 04a19ebb7eaed9a5f5269e95e0655b1c3beb7d59
+  data.tar.gz: 24b041c8d21fb99043f5593eed109a5d372ed2dd
 SHA512:
-  metadata.gz: be9cd9f51f282ac7959ef28b582ce21f6ea5fb324d08974bc290a6a3f826ee2fa8d753a31f8b66def452efaa612804e05f512ad966d431f44274af5f98291bbd
-  data.tar.gz: eaa35e4b1c6e95590e0ac67f4109464d8d5609cf7b8b024d74cfef90657fb34d57ed9aa26f37d93795a75c8faa458899cb348c8ee703915d29c4f19c86198b50
+  metadata.gz: 06d0fed27670e3a7f4342af120ef8464a5e560afdce3c357129bfcffeb7e5ec423405afcea8d75e880d2c389e605152a27dfc9755f1d10a5f30e713e51fe3b72
+  data.tar.gz: 5e4c127d4485362f7ccf12ce5fba120109dbe5201585b15603086985e98b7f209d8abb7e182d649b80d04670333cc3d1c8dfef561ab0eeeff9de2ea20779d079

data/.gitignore

@@ -0,0 +1,3 @@
+spec/support/debug.log
+Gemfile.lock
+pkg

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 1.9.3
+env:
+  - AR_TEST_VERSION: 3.1.0
+  - AR_TEST_VERSION: 3.2.12
+  - AR_TEST_VERSION: 4.0.0
+  - AR_TEST_VERSION: 4.2.0

data/CONTRIBUTORS.md

@@ -0,0 +1,12 @@
+Folks who gave their time and effort and didn't have to:
+
+* [David Sulc](https://github.com/davidsulc)
+* [Joe Nelson](https://github.com/begriffs)
+* [Trond Arve Nordheim](https://github.com/tanordheim)
+* [Josh Teneycke](https://github.com/jteneycke)
+* [Maximilian Herold](https://github.com/mherold)
+
+To join this list just open a GH issue with some code you'd like to
+change in this project. New features are fine, bug fixes are better. No
+experience or credentials necessary to begin contributing - if you can
+read this you're welcome to join.

data/README.markdown

@@ -1,4 +1,4 @@
-# PermanentRecords (Rails 3+)
+# PermanentRecords (Rails 3.1+)
 
 [http://github.com/JackDanger/permanent_records/](http://github.com/JackDanger/permanent_records/)
 
@@ -8,12 +8,12 @@ Any model that you've given a "deleted_at" datetime column will have that column
 ## What methods does it give me?
 
 ```ruby
-User.find(3).destroy          # Sets the 'deleted_at' attribute to Time.now 
+User.find(3).destroy          # Sets the 'deleted_at' attribute to Time.now
                               # and returns a frozen record.
-                              
-User.find(3).destroy(:force)  # Executes the real destroy method, the record 
+
+User.find(3).destroy(:force)  # Executes the real destroy method, the record
                               # will be removed from the database.
-                              
+
 User.destroy_all              # Soft-deletes all User records.
 
 User.delete_all               # bye bye everything (no soft-deleting here)
@@ -53,7 +53,7 @@ end
 
 User.find(3).destroy         # All the comments are destroyed as well.
 
-User.find(3).revive          # All the comments that were just destroyed 
+User.find(3).revive          # All the comments that were just destroyed
                              # are now back in pristine condition.
 ```
 
@@ -75,7 +75,7 @@ end
 
 ## Is Everything Automated?
 
-Yes. You don't have to change ANY of your code to get permanent archiving of all your data with this gem. 
+Yes. You don't have to change ANY of your code to get permanent archiving of all your data with this gem.
 When you call `destroy` on any record  (or `destroy_all` on a class or association) your records will
 all have a deleted_at timestamp set on them.
 
@@ -88,4 +88,4 @@ value that works for you.
 
 Patches welcome, forks celebrated.
 
-Copyright (c) 2013 Jack Danger Canty @ [http://jåck.com](http://jåck.com) released under the MIT license
+Copyright 2015 Jack Danger Canty @ [https://jdanger.com](https://jdanger.com) released under the MIT license

data/VERSION

@@ -1 +1 @@
-3.2.0
+3.3.0

data/lib/permanent_records.rb

@@ -33,15 +33,20 @@ module PermanentRecords
     end
 
     def revive(validate = nil)
-      run_callbacks(:revive) { set_deleted_at(nil, validate) }
-      self
+      with_transaction_returning_status do
+        run_callbacks(:revive) { set_deleted_at(nil, validate) }
+        self
+      end
     end
 
     def destroy(force = nil)
-      if !is_permanent? || PermanentRecords.should_force_destroy?(force)
-        return permanently_delete_records_after { super() }
+      with_transaction_returning_status do
+        if !is_permanent? || PermanentRecords.should_force_destroy?(force)
+          permanently_delete_records_after { super() }
+        else
+          destroy_with_permanent_records force
+        end
       end
-      destroy_with_permanent_records force
     end
 
     private
@@ -60,16 +65,15 @@ module PermanentRecords
           record.save!
         end
         if ::Gem::Version.new(::ActiveRecord::VERSION::STRING) < ::Gem::Version.new('4.2.0')
-          @attributes, @attributes_cache = record.attributes, record.attributes
+          @attributes = record.attributes
+          @attributes_cache = record.attributes.except(record.class.serialized_attributes.keys)
           # workaround for active_record >= 3.2.0: re-wrap values of serialized attributes
           # (record.attributes returns the plain values but in the instance variables they are expected to be wrapped)
           if defined?(::ActiveRecord::AttributeMethods::Serialization::Attribute)
             serialized_attribute_class = ::ActiveRecord::AttributeMethods::Serialization::Attribute
             self.class.serialized_attributes.each do |key, coder|
               if @attributes.key?(key)
-                attr = serialized_attribute_class.new(coder, @attributes[key], :unserialized)
-                @attributes[key] = attr
-                @attributes_cache[key] = attr
+                @attributes[key] = serialized_attribute_class.new(coder, @attributes[key], :unserialized)
               end
             end
           end

data/permanent_records.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.license = 'MIT'
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jack Danger Canty", "David Sulc", "Joe Nelson", "Trond Arve Nordheim", "Josh Teneycke"]
+  s.authors = ["Jack Danger Canty", "David Sulc", "Joe Nelson", "Trond Arve Nordheim", "Josh Teneycke", "Maximilian Herold"]
   s.date = Date.today.to_s
   s.description = "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 = "gems@6brand.com"
@@ -19,30 +19,7 @@ Gem::Specification.new do |s|
     "LICENSE",
     "README.markdown"
   ]
-  s.files = [
-    ".document",
-    "Gemfile",
-    "LICENSE",
-    "README.markdown",
-    "Rakefile",
-    "VERSION",
-    "lib/permanent_records.rb",
-    "permanent_records.gemspec",
-    "spec/spec_helper.rb",
-    "spec/permanent_records_spec.rb",
-    "spec/support/comment.rb",
-    "spec/support/database.yml",
-    "spec/support/difficulty.rb",
-    "spec/support/dirt.rb",
-    "spec/support/earthworm.rb",
-    "spec/support/hole.rb",
-    "spec/support/kitty.rb",
-    "spec/support/location.rb",
-    "spec/support/mole.rb",
-    "spec/support/muskrat.rb",
-    "spec/support/schema.rb",
-    "spec/support/unused_model.rb"
-  ]
+  s.files = `git ls-files`.split($\)
   s.homepage = "https://github.com/JackDanger/permanent_records"
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.17"

data/spec/permanent_records_spec.rb

@@ -5,7 +5,7 @@ describe PermanentRecords do
   let!(:frozen_moment) { Time.now                            }
   let!(:dirt)          { Dirt.create!                        }
   let!(:earthworm)     { dirt.create_earthworm               }
-  let!(:hole)          { dirt.create_hole                    }
+  let!(:hole)          { dirt.create_hole(:options => {})    }
   let!(:muskrat)       { hole.muskrats.create!               }
   let!(:mole)          { hole.moles.create!                  }
   let!(:location)      { hole.create_location                }
@@ -38,8 +38,8 @@ describe PermanentRecords do
     end
 
     it 'handles serialized attributes correctly' do
-      expect { subject.options }.to_not raise_error
-      expect { subject.size }.to_not raise_error if record.respond_to?(:size)
+      expect(subject.options).to eq({})
+      expect(subject.size).to be_nil if record.respond_to?(:size)
     end
 
     context 'with force argument set to truthy' do
@@ -77,7 +77,6 @@ describe PermanentRecords do
       end
     end
 
-
     context 'when model has no deleted_at column' do
       let(:record) { kitty }
 
@@ -100,10 +99,25 @@ describe PermanentRecords do
           it 'marks records as deleted' do
             subject.muskrats.each {|m| m.should be_deleted }
           end
+
+          context 'when error occurs' do
+            before { Hole.any_instance.stub(:valid?).and_return(false) }
+            it 'does not mark records as deleted' do
+              expect { subject }.to raise_error(ActiveRecord::RecordInvalid)
+              expect(record.muskrats.not_deleted.count).to eq(1)
+            end
+          end
+
           context 'with force delete' do
             let(:should_force) { :force }
             it('') { expect { subject }.to change { Muskrat.count }.by(-1) }
             it('') { expect { subject }.to change { Comment.count }.by(-2) }
+
+            context 'when error occurs' do
+              before { Difficulty.any_instance.stub(:destroy).and_return(false) }
+              it('') { expect { subject }.not_to change { Muskrat.count } }
+              it('') { expect { subject }.not_to change { Comment.count } }
+            end
           end
         end
 
@@ -111,18 +125,59 @@ describe PermanentRecords do
           it 'marks records as deleted' do
             subject.location.should be_deleted
           end
+
+          context 'when error occurs' do
+            before { Hole.any_instance.stub(:valid?).and_return(false) }
+            it('does not mark records as deleted') do
+              expect { subject }.to raise_error(ActiveRecord::RecordInvalid)
+              expect(record.location(true)).not_to be_deleted
+            end
+          end
+
           context 'with force delete' do
             let(:should_force) { :force }
             it('') { expect { subject }.to change { Muskrat.count  }.by(-1) }
             it('') { expect { subject }.to change { Location.count }.by(-1) }
+
+            context 'when error occurs' do
+              before { Difficulty.any_instance.stub(:destroy).and_return(false) }
+              it('') { expect { subject }.not_to change { Muskrat.count } }
+              it('') { expect { subject }.not_to change { Location.count } }
+            end
+          end
+        end
+
+        context 'with belongs_to cardinality' do
+          it 'marks records as deleted' do
+            subject.dirt.should be_deleted
+          end
+
+          context 'when error occurs' do
+            before { Hole.any_instance.stub(:valid?).and_return(false) }
+            it 'does not mark records as deleted' do
+              expect { subject }.to raise_error(ActiveRecord::RecordInvalid)
+              expect(record.dirt(true)).not_to be_deleted
+            end
+          end
+
+          context 'with force delete' do
+            let(:should_force) { :force }
+            it('') { expect { subject }.to change { Dirt.count }.by(-1) }
+
+            context 'when error occurs' do
+              before { Difficulty.any_instance.stub(:destroy).and_return(false) }
+              it('') { expect { subject }.not_to change { Dirt.count } }
+            end
           end
         end
       end
+
       context 'that are non-permanent' do
         it 'removes them' do
           expect { subject }.to change { Mole.count }.by(-1)
         end
       end
+
       context 'as default scope' do
         let(:load_comments) { Comment.unscoped.where(:hole_id => subject.id) }
         context 'with :has_many cardinality' do
@@ -131,11 +186,7 @@ describe PermanentRecords do
           }
           it 'deletes them' do
             load_comments.all?(&:deleted?).should be_true
-            # Doesn't change the default scope
-            # (in versions with non-broken default scope)
-            if ActiveRecord::VERSION::STRING > '3.0.0'
-              subject.comments.should be_blank
-            end
+            subject.comments.should be_blank
           end
         end
         context 'with :has_one cardinality' do
@@ -205,19 +256,49 @@ describe PermanentRecords do
           it 'revives them' do
             subject.muskrats.each {|m| m.should_not be_deleted }
           end
+          context 'when error occurs' do
+            before { Hole.any_instance.stub(:valid?).and_return(false) }
+            it 'does not revive them' do
+              expect { subject }.to raise_error(ActiveRecord::RecordInvalid)
+              expect(record.muskrats.deleted.count).to eq(1)
+            end
+          end
         end
 
         context 'with has_one cardinality' do
           it 'revives them' do
             subject.location.should_not be_deleted
           end
+          context 'when error occurs' do
+            before { Hole.any_instance.stub(:valid?).and_return(false) }
+            it('does not mark records as deleted') do
+              expect { subject }.to raise_error(ActiveRecord::RecordInvalid)
+              expect(record.location(true)).to be_deleted
+            end
+          end
+        end
+
+        context 'with belongs_to cardinality' do
+          it 'revives them' do
+            subject.dirt.should_not be_deleted
+          end
+
+          context 'when error occurs' do
+            before { Hole.any_instance.stub(:valid?).and_return(false) }
+            it 'does not revive them' do
+              expect { subject }.to raise_error(ActiveRecord::RecordInvalid)
+              expect(record.dirt(true)).to be_deleted
+            end
+          end
         end
       end
+
       context 'that are non-permanent' do
         it 'cannot revive them' do
           expect { subject }.to_not change { Mole.count }
         end
       end
+
       context 'as default scope' do
         context 'with :has_many cardinality' do
           its('comments.size') { should == 2 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: permanent_records
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Jack Danger Canty
@@ -9,10 +9,11 @@ authors:
 - Joe Nelson
 - Trond Arve Nordheim
 - Josh Teneycke
+- Maximilian Herold
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-17 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -52,6 +53,9 @@ extra_rdoc_files:
 - README.markdown
 files:
 - ".document"
+- ".gitignore"
+- ".travis.yml"
+- CONTRIBUTORS.md
 - Gemfile
 - LICENSE
 - README.markdown
@@ -93,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 3
 summary: Soft-delete your ActiveRecord records