active_archive 4.0.6 → 4.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92c1e713b49eefb44aeb6add213b87c81de0225d
-  data.tar.gz: 6c5106eff7503054c0793240d47a184c0463a713
+  metadata.gz: 5092866dde1665b90ef7990da9caf0d876daec7c
+  data.tar.gz: 6ea0affb05227176e452ee64619ae618b0d1550f
 SHA512:
-  metadata.gz: '0369966d50e4af17708b1756466a6dce60afa64f061eeab2d56798b83679a8dc1be9764e7b18a171dd6a3511b60c919112f2ccdface89c4f04707478a30e0b88'
-  data.tar.gz: 69e4a6ccf751be3252291e924780d076f185cfafd4d542fc4c14e19d092b73821b5842843c6610a719ac75148f23e4325088f687f1605c47da62f23395efb75e
+  metadata.gz: a616c28a17e305a010cc0ed56941f6961b192dcf7d0e55f6dba329ed27aa7b026e49c7ff7ff3a3efe344d4567fba2d5881311134ada9767d3066f4013fa55ca0
+  data.tar.gz: d88833a0cdffce65f24898d0cba0e086362dd52050c881c623f0b078bcd8f2f5b91c7808f4381474c69885bfedc88ae0659c7ec3e1fe870f7cfea56b53239e88

data/lib/active_archive/base.rb

@@ -60,13 +60,35 @@ module ActiveArchive
 
     def destroy_with_active_archive(force = nil)
       run_callbacks(:destroy) do
-        archived? || new_record? ? save : set_archived_at(Time.now, force)
+        if archived? || new_record?
+          save
+        else
+          set_archived_at(Time.now, force)
+          each_counter_cache do |assoc_class, counter_cache_column, assoc_id|
+            assoc_class.decrement_counter(counter_cache_column, assoc_id)
+          end
+        end
         return(true)
       end
 
       archived? ? self : false
     end
 
+    def each_counter_cache
+      _reflections.each do |name, reflection|
+        next unless respond_to?(name.to_sym)
+
+        association = send(name.to_sym)
+
+        next if association.nil?
+        next unless reflection.belongs_to? && reflection.counter_cache_column
+
+        associated_class = association.class
+
+        yield(associated_class, reflection.counter_cache_column, send(reflection.foreign_key))
+      end
+    end
+
     def retrieve_archived_record
       self.class.unscoped.find(id)
     end
@@ -114,6 +136,9 @@ module ActiveArchive
         lambda do |validate|
           run_callbacks(:unarchive) do
             set_archived_at(nil, validate)
+            each_counter_cache do |assoc_class, counter_cache_column, assoc_id|
+              assoc_class.increment_counter(counter_cache_column, assoc_id)
+            end
             return(true)
           end
         end
@@ -151,7 +176,11 @@ module ActiveArchive
 
       begin
         should_ignore_validations?(force) ? record.save(validate: false) : record.save!
+
+        @previous_mutation_tracker = record.send(:previous_mutation_tracker)
+        @changed_attributes = HashWithIndifferentAccess.new
         @attributes = record.instance_variable_get('@attributes')
+        @mutation_tracker = nil
       rescue => error
         record.destroy
         raise(error)

data/lib/active_archive/version.rb

@@ -1,3 +1,3 @@
 module ActiveArchive
-  VERSION = '4.0.6'.freeze
+  VERSION = '4.0.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_archive
 version: !ruby/object:Gem::Version
-  version: 4.0.6
+  version: 4.0.7
 platform: ruby
 authors:
 - Juan Gomez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-27 00:00:00.000000000 Z
+date: 2017-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails