permanent_records 4.1.5 → 4.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 653264c14471c15f5b24a60821927d23e67bf12e
-  data.tar.gz: 0d7b3cb1a5772bd55bc3a573e4007ba278eb96c7
+  metadata.gz: ea46f013888d1a6a86b72d48dc0695d6e8c001aa
+  data.tar.gz: d881533bfce2762905a83a6ad2255333cae14197
 SHA512:
-  metadata.gz: 8c89b0d0a913ca7d245e906143123f7af4b85dd4e9fc4ed7bf4a2c714942b4caea5f0e6b50309fe94c33cfe9e1a6b5212a6ed6c3331a5757c42e566b1ddf92d8
-  data.tar.gz: bbbe06aac87b420d7b6f63fc3c59200cd3633534302f6ec69b56874f98e95338075021b3f29198fa53f0ff5da8501679465ce9eb5ef27d2b18dc881f3ab0ebb4
+  metadata.gz: 179fa785989872e008a059d1d1fcbc00b3aa1dbb04039f1a79a9900b048fc21f9ac790e21880a9e96d3da6ef7c279cfe8305da30086bf4bc2bb62177d2687e23
+  data.tar.gz: a4d4bf79adb1284f10ad2229dfb3edd54ec318a6ca9fa858d68a46df57f92f24617393105bfea710b9238f667afee62b4eb2ded835053180fac6b09dfd83114f

data/.gitignore

@@ -1,3 +1,6 @@
 spec/support/debug.log
 Gemfile.lock
 pkg
+
+*.swp
+.bundle

data/.rubocop.yml

@@ -0,0 +1,3 @@
+AllCops:
+  Exclude:
+    - bin/*

data/VERSION

@@ -1 +1 @@
-4.1.5
+4.1.6

data/bin/rspec

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

data/lib/permanent_records.rb

@@ -66,6 +66,10 @@ module PermanentRecords
         lambda do |validate|
           run_callbacks(:revive) do
             set_deleted_at(nil, validate)
+            # increment all associated counters for counter cache
+            each_counter_cache do |assoc_class, counter_cache_column, assoc_id|
+              assoc_class.increment_counter counter_cache_column, assoc_id
+            end
             true
           end
         end
@@ -91,6 +95,7 @@ module PermanentRecords
         else
           record.save!
         end
+
         @attributes = record.instance_variable_get('@attributes')
       rescue => e
         # trigger dependent record destruction (they were revived before this
@@ -100,9 +105,27 @@ module PermanentRecords
       end
     end
 
+    def each_counter_cache
+      _reflections.each do |name, reflection|
+        associated_class = association(name).reflection.class_name.constantize
+        next unless reflection.belongs_to? && reflection.counter_cache_column
+        yield(associated_class,
+              reflection.counter_cache_column,
+              send(reflection.foreign_key))
+      end
+    end
+
     def destroy_with_permanent_records(force = nil)
       run_callbacks(:destroy) do
-        deleted? || new_record? ? save : set_deleted_at(Time.now, force)
+        if deleted? || new_record?
+          save
+        else
+          set_deleted_at(Time.now, force)
+          # decrement all associated counters for counter cache
+          each_counter_cache do |assoc_class, counter_cache_column, assoc_id|
+            assoc_class.decrement_counter counter_cache_column, assoc_id
+          end
+        end
         true
       end
       deleted? ? self : false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: permanent_records
 version: !ruby/object:Gem::Version
-  version: 4.1.5
+  version: 4.1.6
 platform: ruby
 authors:
 - Jack Danger Canty
@@ -16,90 +16,90 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
 - !ruby/object:Gem::Dependency
@@ -120,14 +120,14 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: |
@@ -140,15 +140,17 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- .document
-- .gitignore
-- .travis.yml
+- ".document"
+- ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - CONTRIBUTORS.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - VERSION
+- bin/rspec
 - ci
 - lib/permanent_records.rb
 - permanent_records.gemspec
@@ -162,17 +164,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Soft-delete your ActiveRecord records