paranoid2 1.1.0 → 1.1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: cd8254456dffe6785004b42a14847214d5a4817c
+  data.tar.gz: 8637b827888a0be9ec7712024e655f5719fcef3d
+SHA512:
+  metadata.gz: 352fb19eb6cca276dfa8da79aa3e4fc2c436b08d088da7b4245d2ad9fa524f5eb7e22ecb33cd3de2c2034745844198da66fa29efc7c0d7a3d8131547a0c6883e
+  data.tar.gz: bb5d6bfd7a4c668399d26f471e7d868d7e37a21861caa3d9a2be197a37094709765d59203dce6451e3d5e75551d473959c2f5fec8de598bf871c4b4278fdba58

data/README.md

@@ -56,6 +56,16 @@ Client.only_deleted
 
 ```
 
+### With paperclip
+
+```ruby
+class Listing < ActiveRecord::Base
+  has_attached_file :image,
+    # ...
+    preserve_files: true
+end
+```
+
 ## Contributing
 
 1. Fork it

data/lib/paranoid2.rb

@@ -29,6 +29,8 @@ module Paranoid2
       include Scoping
     end
 
+    alias acts_as_paranoid paranoid
+
     def with_paranoid opts={}
       forced = opts[:force] || paranoid_force
       previous, self.paranoid_force = paranoid_force, forced

data/lib/paranoid2/persistence.rb

@@ -12,7 +12,7 @@ module Paranoid2
 
     def delete(opts = {})
       with_paranoid(opts) do
-        update_attribute(:deleted_at, Time.now) if !deleted? && persisted?
+        touch(:deleted_at) if !deleted? && persisted?
         if paranoid_force
           self.class.unscoped { super() }
         else
@@ -24,7 +24,19 @@ module Paranoid2
     def restore(opts={})
       return if !destroyed?
 
-      update_attribute :deleted_at, nil
+      attrs = timestamp_attributes_for_update_in_model
+      current_time = current_time_from_proper_timezone
+      changes = {}
+      attrs.each do |column|
+        changes[column.to_s] = write_attribute(column.to_s, current_time)
+      end
+      changes['deleted_at'] = write_attribute('deleted_at', nil)
+
+      changes[self.class.locking_column] = increment_lock if locking_enabled?
+
+      @changed_attributes.except!(*changes.keys)
+      primary_key = self.class.primary_key
+      self.class.unscoped.where({ primary_key => self[primary_key] }).update_all(changes)
 
       if opts.fetch(:associations) { true }
         restore_associations

data/lib/paranoid2/version.rb

@@ -1,3 +1,3 @@
 module Paranoid2
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/paranoid2.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'activerecord', '>= 4.0.0.beta'
+  gem.add_dependency 'activerecord', '>= 3.2.11'
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "sqlite3"

data/spec/paranoid2_spec.rb

@@ -216,7 +216,7 @@ describe Paranoid2 do
 
     it 'chains paranoid models' do
       scope = model.where(name: 'foo').only_deleted
-      scope.where_values_hash[:name].must_equal 'foo'
+      scope.where_values_hash['name'].must_equal 'foo'
     end
   end
 end

data/spec/spec_models.rb

@@ -6,7 +6,7 @@ class PlainModel < ActiveRecord::Base
 end
 
 class ParanoidModel < ActiveRecord::Base
-  paranoid
+  acts_as_paranoid
 
   belongs_to :parent_model
 end

metadata

@@ -1,64 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: paranoid2
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - yury
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-08 00:00:00.000000000 Z
+date: 2013-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 4.0.0.beta
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta
-  prerelease: false
+        version: 3.2.11
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: rake
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.11
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: sqlite3
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: paranoid models for rails 4
 email:
 - yury.korolev@gmail.com
@@ -82,33 +75,26 @@ files:
 homepage: https://github.com/anjlab/paranoid2
 licenses:
 - MIT
+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'
-      hash: 2406579501986756191
-      segments:
-      - 0
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      hash: 2406579501986756191
-      segments:
-      - 0
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: paranoid models for rails 4
 test_files:
 - spec/paranoid2_spec.rb