paranoid42 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e570b02db22769fdd1f075786855bb8a0f69b86c
-  data.tar.gz: 50b87789f4e9598ab3ef6684746cd54692230fd8
+  metadata.gz: 69e4b2c87e3fb10a533307a92a108d7401095fce
+  data.tar.gz: ca31ba429e73de3d1744e2f9a69f927fa8074e9c
 SHA512:
-  metadata.gz: 9bb7953888ba744e8836b14fefa60061fe5df737ba007d5612cd9c8b3e9583cf932224cabf0b689b42ae706c01e6ce17840543717a68c75149b988e81eb5230e
-  data.tar.gz: 332914f9bf6b643c64cccecc22d79b992ba7f53c5aff9ac13bd17f89d935136bc762db0da835e4d7ad3a52437709932b162c58eefbd39064d8748280c4659860
+  metadata.gz: 07eab9d0d50aec82382eea3e41c109bb4aacc9598c1be13ba698f573d0046da1c9064c7233ba8ea0eb7d734504b0111cad2f84ec186a356bf152eefb9f4f0ceb
+  data.tar.gz: 259251463b5b1dde4c046c297def4628632907d11727e275960327ebbbc83551637ee46f59b08cbf1b9fc66c2cfe0cb6973ca1cf83adce71f91be0e632109802

data/README.md

@@ -1,10 +1,8 @@
 # Paranoid42
 
-[paranoid2](https://github.com/anjlab/paranoid2) ideas (and code) adapted for rails 4.2
+Retain soft-deleting functionality without losing AdequateRecord's speed improvements. A fork of [paranoid2](https://github.com/anjlab/paranoid2).
 
-Rails 4.2 introduced adequate record, but in order to take advantage of the improvements, default_scope can't be used. Paranoid42 removes the default scope from Paranoid2. This means you have to be explicit about telling your app not to return deleted records.
-
-Paranoid42 removes the default scope and adds a new `not_deleted` method to your paranoid classes.
+Rails 4.2 introduced adequate record, but in order to take advantage of the improvements, default_scope can't be used ([Release Notes](http://edgeguides.rubyonrails.org/4_2_release_notes.html)). Paranoid42 removes the default scope, and adds a new `not_deleted` method to your paranoid classes ([Benchmarks](https://gist.github.com/effektz/f18e1be522a328a981b9)).
 
 So this:
 
@@ -30,11 +28,7 @@ def active
 end
 ```
 
-[Benchmarks](https://gist.github.com/effektz/f18e1be522a328a981b9)
-
-## Paranoid2
-
-Rails 4 defines `ActiveRecord::Base#destroy!` so `Paranoid42` gem use `force: true` arg to force destroy.
+Counter Caches have also been tied into Paranoid42. Soft-deleting a record will decrement the association counter cache, and recovering a record will incremenet the association counter cache.
 
 ## Installation
 
@@ -73,11 +67,11 @@ c = Client.find(params[:id])
 # will set destroyed_at time
 c.destroy
 
-# will restore object and all it's associations
-c.restore
+# will recover object and all it's associations
+c.recover
 
-# will restore only this object without it's associations
-c.restore(associations: false)
+# will recover only this object without it's associations
+c.recover(associations: false)
 
 # will destroy object for real
 c.destroy(force: true)

data/lib/paranoid42/persistence.rb

@@ -10,16 +10,34 @@ module Paranoid42
       with_paranoid(opts) { super() }
     end
 
+    def update_counter_caches(opts = {})
+      return unless opts[:direction].present? && [:up, :down].include?(opts[:direction])
+      each_counter_cached_associations do |association|
+        foreign_key = association.reflection.foreign_key.to_sym
+        unless destroyed_by_association && destroyed_by_association.foreign_key.to_sym == foreign_key
+          if send(association.reflection.name)
+            if opts[:direction] == :up
+              association.increment_counters
+            elsif opts[:direction] == :down
+              association.decrement_counters
+            end
+          end
+        end
+      end
+    end
+
     def delete(opts = {})
       with_paranoid(opts) do
-        touch(:deleted_at) if !deleted? && persisted?
+        if !deleted? && persisted?
+          touch(:deleted_at)
+          update_counter_caches({direction: :down})
+        end
         self.class.unscoped { super() } if paranoid_force
       end
     end
 
-    def restore(opts={})
+    def recover(opts={})
       return if !destroyed?
-
       attrs = timestamp_attributes_for_update_in_model
       current_time = current_time_from_proper_timezone
       changes = {}
@@ -27,26 +45,23 @@ module Paranoid42
         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
+        recover_associations
       end
+      update_counter_caches({direction: :up})
     end
 
-    def restore_associations
+    def recover_associations
       self.class.reflect_on_all_associations.each do |a|
         next unless a.klass.paranoid?
-
         if a.collection?
-          send(a.name).restore_all
+          send(a.name).recover_all
         else
-          a.klass.unscoped { send(a.name).try(:restore) }
+          a.klass.unscoped { send(a.name).try(:recover) }
         end
       end
     end
@@ -80,8 +95,8 @@ module Paranoid42
         end
       end
 
-      def restore_all
-        only_deleted.each &:restore
+      def recover_all
+        only_deleted.each &:recover
       end
     end
   end

data/lib/paranoid42/version.rb

@@ -1,3 +1,3 @@
 module Paranoid42
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/paranoid42.gemspec

@@ -6,10 +6,10 @@ require 'paranoid42/version'
 Gem::Specification.new do |gem|
   gem.name          = "paranoid42"
   gem.version       = Paranoid42::VERSION
-  gem.authors       = ["effektz", "yury"]
-  gem.email         = ["alexweidmann@gmail.com", "yury.korolev@gmail.com"]
-  gem.description   = %q{paranoid models for rails 4.2}
-  gem.summary       = %q{paranoid models for rails 4.2}
+  gem.authors       = ["effektz", "nitsujw"]
+  gem.email         = ["alexweidmann@gmail.com", "nitsujweidmann@gmail.com"]
+  gem.description   = %q{Paranoid soft deleting for Rails 4.2}
+  gem.summary       = %q{Paranoid soft deleting for Rails 4.2}
   gem.homepage      = "https://github.com/effektz/paranoid42"
   gem.license       = "MIT"
 

data/spec/paranoid42_spec.rb

@@ -70,12 +70,12 @@ describe Paranoid42 do
       model.only_deleted.wont_include b
     end
 
-    it 'restores' do
+    it 'recovers' do
       a = model.create
       a.destroy
       a.must_be :destroyed?
       b = model.only_deleted.find(a.id)
-      b.restore
+      b.recover
       b.reload
       b.wont_be :destroyed?
     end
@@ -137,7 +137,7 @@ describe Paranoid42 do
       employee.employers.not_deleted.count.must_equal 1
     end
 
-    it 'restores has_many associations' do
+    it 'recovers has_many associations' do
       parent = ParentModel.create
       a = model.create(parent_model: parent)
       parent.destroy
@@ -145,20 +145,20 @@ describe Paranoid42 do
       parent.must_be :destroyed?
       a.must_be :destroyed?
       parent = ParentModel.unscoped.find(parent.id)
-      parent.restore
+      parent.recover
       a.reload
       parent.wont_be :destroyed?
       a.wont_be :destroyed?
     end
 
-    it 'restores belongs_to associations' do
+    it 'recovers belongs_to associations' do
       parent = ParentModel.create
       a = model.create(parent_model: parent)
       parent.destroy
       a.reload
       parent.must_be :destroyed?
       a.must_be :destroyed?
-      a.restore
+      a.recover
       a.wont_be :destroyed?
       a.parent_model.wont_be :destroyed?
     end
@@ -190,7 +190,7 @@ describe Paranoid42 do
     end
 
     it 'validates uniqueness with scope' do
-      a = model.create!(name: 'yury', phone: '9106701550')
+      a = model.create!(name: 'yury', phone: '3034207100')
       b = model.create(name: 'effektz', phone: '3034207100')
       b.wont_be :valid?
       a.destroy

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: paranoid42
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - effektz
-- yury
+- nitsujw
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-02 00:00:00.000000000 Z
+date: 2015-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -53,10 +53,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: paranoid models for rails 4.2
+description: Paranoid soft deleting for Rails 4.2
 email:
 - alexweidmann@gmail.com
-- yury.korolev@gmail.com
+- nitsujweidmann@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -97,7 +97,7 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: paranoid models for rails 4.2
+summary: Paranoid soft deleting for Rails 4.2
 test_files:
 - spec/paranoid42_spec.rb
 - spec/spec_helper.rb