active_archive 4.0.2 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af67b471ff812548802cf841ac32bd3186e5b4dc
-  data.tar.gz: 2c4e302d7542347ed0cbbfee4b9ce1079150200b
+  metadata.gz: 864f0d72e7dfd6798436108e50a06e302cdc6e10
+  data.tar.gz: 2bec4eea982a712c349f9f9bd93e4fe8a617993c
 SHA512:
-  metadata.gz: ac905b798f7353d1122e7122d382a00297e1d78b21e60e6ae24118e3c5129ff410cea3251d965d646bb5e73978f09094e6387223b66137c35317ac21904d9946
-  data.tar.gz: '086fdc5175d7fbc3e2efcb93c1e4f19b9261fe31bf96b590f1e892c6251214cbbbfa73d9bae030f0717fbc0fd1edda987d23b638bbcea0a6db4bbb5490be6450'
+  metadata.gz: 41a063fb155b91ff2ce1606cb4fc28fff4afbff2c791f6ace986832f705422a8602480e116b2a22ef3c134b19878bc3c18b377909b7d118a49214747bb20c414
+  data.tar.gz: 071c2c2fa40f486a9f7aef3c640bba9245f06d5587b3326c3dd3cbf483e51bc4b0050f4d7459eaab4fabba00dff060866f0f2de17fdb4be346c69fe0eb64eec1

data/lib/active_archive/base.rb

@@ -36,7 +36,7 @@ module ActiveArchive
     def unarchive(opts = nil)
       with_transaction_returning_status do
         records = should_unarchive_parent_first?(opts) ? unarchival.reverse : unarchival
-        records.each { |record| record.call(opts) }
+        records.each { |rec| rec.call(opts) }
 
         self
       end
@@ -75,8 +75,8 @@ module ActiveArchive
     def retrieve_dependent_records
       dependent_records = {}
 
-      self.class.reflections.each do |key, reflection|
-        next unless reflection.options[:dependent] == :destroy
+      self.class.reflections.each do |key, ref|
+        next unless ref.options[:dependent] == :destroy
 
         records = send(key)
         next unless records
@@ -120,24 +120,27 @@ module ActiveArchive
       ]
     end
 
+    # rubocop:disable Metrics/LineLength
     def dependent_records_for_unarchival(name, reflection)
       record = send(name)
 
       case reflection.macro.to_s.gsub('has_', '').to_sym
       when :many
-        records = archived_at ? set_record_window(record, name, reflection) : record
+        records = archived_at ? set_record_window(record, name, reflection) : record.unscope(where: :archived_at)
       when :one, :belongs_to
         self.class.unscoped { records = [] << record }
       end
 
       [records].flatten.compact
     end
+    # rubocop:enable Metrics/LineLength
 
     def unarchive_destroyed_dependent_records(force = nil)
       self.class.reflections
           .select { |_, ref| 'destroy' == ref.options[:dependent].to_s && ref.klass.archivable? }
           .each do |name, ref|
-            dependent_records_for_unarchival(name, ref).each { |record| record.unarchive(force) }
+            dependent_records_for_unarchival(name, ref).each { |rec| rec.try(:unarchive, force) }
+            reload
           end
     end
 

data/lib/active_archive/methods.rb

@@ -2,7 +2,7 @@ module ActiveArchive
   module Methods
 
     def archivable?
-      columns.detect { |column| column.name == 'archived_at' }
+      columns.detect { |col| col.name == 'archived_at' }
     end
 
     def archive_all(conditions = nil)

data/lib/active_archive/railtie.rb

@@ -9,11 +9,11 @@ module ActiveArchive
       end
     end
 
-    protected
-
-    def path(locale)
+    def self.path(locale)
       File.expand_path("../../config/locales/#{locale}.yml", __FILE__)
     end
 
+    private_class_method :path
+
   end
 end

data/lib/active_archive/table_definition.rb

@@ -8,10 +8,9 @@ module ActiveArchive
       column(:created_at, :datetime, options)
       column(:updated_at, :datetime, options)
 
-      if ActiveArchive::Settings.config.all_records_archivable == true
-        options[:null] = true
-        column(:archived_at, :datetime, options)
-      end
+      return unless ActiveArchive::Settings.config.all_records_archivable == true
+      options[:null] = true
+      column(:archived_at, :datetime, options)
     end
 
   end

data/lib/active_archive/version.rb

@@ -1,3 +1,3 @@
 module ActiveArchive
-  VERSION = '4.0.2'.freeze
+  VERSION = '4.0.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_archive
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.3
 platform: ruby
 authors:
 - Juan Gomez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2016-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -233,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Gem for soft-deleting ActiveRecord objects.