permanent_records 3.1.3 → 3.1.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d9168f3838093ff7964c638791514a76527be17b
+  data.tar.gz: 86a5e9abf2e075d456504a33c0af87f75d18c3b6
+SHA512:
+  metadata.gz: 2606d84799ba25652b5a422452d25a8a00ec37678e6d115197fdca8fea8a0cb1267a0411c0fd1e2d61333b2be61ba12ad51d06c161a1a4d1b29ad3ebba804ef5
+  data.tar.gz: 651d8c7f6ce729f6dbfab6457ab8432b9204d98a1d9affa4fc7def68e15483192d54ee001c287de9d1e2ce72cdf95ace4a320a9d131a195b209d8e35e892bcb3

data/VERSION

@@ -1 +1 @@
-3.1.3
+3.1.4

data/lib/permanent_records.rb

@@ -28,8 +28,8 @@ module PermanentRecords
       deleted_at if is_permanent?
     end
 
-    def revive
-      run_callbacks(:revive) { set_deleted_at nil }
+    def revive(validate = nil)
+      run_callbacks(:revive) { set_deleted_at(nil, validate) }
       self
     end
 
@@ -56,6 +56,18 @@ module PermanentRecords
           record.save!
         end
         @attributes, @attributes_cache = record.attributes, record.attributes
+        # 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
+            end
+          end
+        end
       rescue Exception => e
         # trigger dependent record destruction (they were revived before this record,
         # which cannot be revived due to validations)
@@ -163,11 +175,11 @@ module PermanentRecords
 
   module Scopes
     def deleted
-      where "#{table_name}.deleted_at IS NOT NULL"
+      where arel_table[:deleted_at].not_eq(nil)
     end
 
     def not_deleted
-      where "#{table_name}.deleted_at IS NULL"
+      where arel_table[:deleted_at].eq(nil)
     end
   end
 

data/permanent_records.gemspec

@@ -52,14 +52,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, [">= 0"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
     else
-      s.add_dependency(%q<activerecord>, [">= 0"])
+      s.add_dependency(%q<activerecord>, [">= 3.0.0"])
       s.add_dependency(%q<rake>, [">= 0"])
     end
   else
-    s.add_dependency(%q<activerecord>, [">= 0"])
+    s.add_dependency(%q<activerecord>, [">= 3.0.0"])
     s.add_dependency(%q<rake>, [">= 0"])
   end
 end

data/spec/permanent_records_spec.rb

@@ -37,6 +37,11 @@ describe PermanentRecords do
       expect { subject }.to_not change { record.class.count }
     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)
+    end
+
     context 'with force argument set to truthy' do
       let(:should_force) { :force }
 
@@ -135,8 +140,9 @@ describe PermanentRecords do
   describe '#revive' do
 
     let!(:record) { hole.destroy }
+    let(:should_validate) { nil  }
 
-    subject { record.revive }
+    subject { record.revive should_validate }
 
     it 'returns the record' do
       subject.should == record
@@ -159,6 +165,16 @@ describe PermanentRecords do
       it 'raises' do
         expect { subject }.to raise_error(ActiveRecord::RecordInvalid)
       end
+
+      context 'with validation opt-out' do
+        let(:should_validate) {{ validate: false }}
+        it 'doesnt raise' do
+          expect { subject }.to_not raise_error
+        end
+        it 'makes deleted? return false' do
+          subject.should_not be_deleted
+        end
+      end
     end
 
     context 'with dependent records' do

data/spec/support/hole.rb

@@ -11,4 +11,7 @@ class Hole < ActiveRecord::Base
   has_one :unused_model, :dependent => :destroy
   has_one :difficulty, :dependent => :destroy
   has_many :comments, :dependent => :destroy
+
+  serialize :options, Hash
+  store :properties, :accessors => [:size] if respond_to?(:store)
 end

data/spec/support/schema.rb

@@ -12,6 +12,8 @@ ActiveRecord::Schema.define(:version => 1) do
 
   create_table :holes, :force => true do |t|
     t.integer :number
+    t.text :options
+    t.text :properties
     t.references :dirt
     t.datetime :deleted_at
   end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: permanent_records
 version: !ruby/object:Gem::Version
-  version: 3.1.3
-  prerelease: 
+  version: 3.1.4
 platform: ruby
 authors:
 - Jack Danger Canty
@@ -12,38 +11,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-01 00:00:00.000000000 Z
+date: 2013-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Never Lose Data. Rather than deleting rows this sets Record#deleted_at
@@ -80,28 +75,24 @@ files:
 - spec/support/unused_model.rb
 homepage: https://github.com/JackDanger/permanent_records
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3995586655398578288
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 3
 summary: Soft-delete your ActiveRecord records