active_archive 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60185c6924bee924839cffc700ca82fea6244b3c
-  data.tar.gz: 3b533e035064b8d54f20cef9f8a8b1dadc81538a
+  metadata.gz: 1d0ebc9e989d471df9de539fa9f0a7189ec4ab04
+  data.tar.gz: 9229273513eee94f67040e1c792513b17debaecc
 SHA512:
-  metadata.gz: 282ea0ada88bbb6d94e26100b9f2d1701fa8f532a0a396b8979648a3126dd4d2573c582f2c962f3cd46151bd2a899d69aec9164b08ef405856f994fd467fbe15
-  data.tar.gz: 77573041c37ac6dae54b8d12e3ccf9bbc3420112657e8feca96b0ec570366310ae680c84ad7751891c418f435f9efb1524a303e65b0446c76b2063275c997eb2
+  metadata.gz: 81203ac1d02c7d50a8880d701c2967c56ba4ac264c36e8848bcf2b23c318b6e15c426764444b23966008e177e60810635ae156461e78b3575dde6d074d80ac2b
+  data.tar.gz: fbdd2b2f21ed9e83e9a359cf0a513e28b37b2a53a4eb62f84f2f18eb667eecc87685c5004126a4fd9cee174f3432c860f5de500495b9da7ea36d5fcfd2741de8

data/lib/active_archive/base.rb

@@ -5,11 +5,7 @@ module ActiveArchive
       base.extend Methods
       base.extend Scopes
 
-      base.instance_eval do
-        define_model_callbacks :unarchive
-
-        before_unarchive :unarchive_destroyed_dependent_records
-      end
+      base.instance_eval { define_model_callbacks(:unarchive) }
     end
 
     def archived?
@@ -25,7 +21,7 @@ module ActiveArchive
         if unarchivable? || should_force_destroy?(force)
           permanently_delete_records_after { super() }
         else
-          destroy_with_permanent_records(force)
+          destroy_with_active_archive(force)
         end
       end
     end
@@ -37,9 +33,9 @@ module ActiveArchive
       I18n.t("active_archive.archival.#{archived? ? :archived : :unarchived}")
     end
 
-    def unarchive(validate=nil)
+    def unarchive(options=nil)
       with_transaction_returning_status do
-        run_callbacks(:unarchive) { set_archived_at(nil, validate) }
+        (should_unarchive_parent_first?(options) ? unarchival.reverse : unarchival).lazy.each { |r| r.call(options) }
         self
       end
     end
@@ -64,11 +60,20 @@ module ActiveArchive
       end
     end
 
-    def destroy_with_permanent_records(force=nil)
-      run_callbacks(:destroy) { archived? || (new_record? ? save : set_archived_at(Time.now, force)) }
+    def destroy_with_active_archive(force=nil)
+      run_callbacks(:destroy) do
+        (archived? || new_record?) ? save : set_archived_at(Time.now, force)
+        true
+      end
+
       archived? ? self : false
     end
 
+    def get_archived_record
+      record_id = (self.respond_to?(:parent_id) && self.parent_id.present?) ? parent_id : id
+      self.class.unscoped.find(record_id)
+    end
+
     def get_dependent_records
       dependent_records = {}
       self.class.reflections.lazy.each do |key, reflection|
@@ -89,7 +94,7 @@ module ActiveArchive
 
     def permanently_delete_records(dependent_records)
       dependent_records.lazy.each do |klass, ids|
-        ids.each do |id|
+        ids.lazy.each do |id|
           record = begin
             klass.unscoped.find(id)
           rescue ::ActiveRecord::RecordNotFound
@@ -108,59 +113,53 @@ module ActiveArchive
       return(dependent_results)
     end
 
-    def unarchive_destroyed_dependent_records
-      self.class.reflections
-                .lazy
-                .select { |name, reflection| (reflection.options[:dependent].to_s == 'destroy'.freeze) && reflection.klass.archivable? }
-                .each do |name, reflection|
-                  cardinality = reflection.macro.to_s.gsub('has_'.freeze, ''.freeze)
-
-                  if cardinality == 'many'.freeze
-                    records = archived_at.nil? ? send(name).unscoped : send(name).unscoped.where(
-                        [
-                          "#{reflection.quoted_table_name}.archived_at > ? AND #{reflection.quoted_table_name}.archived_at < ?",
-                          archived_at - ActiveArchive.configuration.dependent_record_window,
-                          archived_at + ActiveArchive.configuration.dependent_record_window
-                        ]
-                      )
-                  elsif cardinality == 'one'.freeze or cardinality == 'belongs_to'.freeze
-                    self.class.unscoped do
-                      records = [] << send(name)
-                    end
-                  end
-
-                  [records].flatten.compact.lazy.each { |d| d.unarchive }
-                  send(name, :reload)
-                end
+    def unarchival
+      [
+        ->(_validate) { unarchive_destroyed_dependent_records(_validate) },
+        ->(_validate) { run_callbacks(:unarchive) { set_archived_at(nil, _validate) } }
+      ]
+    end
+
+    def unarchive_destroyed_dependent_records(force = nil)
+      self.class.reflections.select do |name, reflection|
+        'destroy'.freeze == reflection.options[:dependent].to_s && reflection.klass.archivable?
+      end.each do |name, reflection|
+        cardinality = reflection.macro.to_s.gsub('has_'.freeze, ''.freeze).to_sym
+        case cardinality
+        when :many
+          records = (archived_at ? set_record_window(send(name), name, reflection) : send(name))
+        when :one, :belongs_to
+          self.class.unscoped { records = [] << send(name) }
+        end
+
+        [records].flatten.compact.lazy.each { |d| d.unarchive(force) }
+        send(name, :reload)
+      end
     end
 
     def set_archived_at(value, force=nil)
       return self unless archivable?
-      record = self.class.unscoped.find(id)
+      record = get_archived_record
       record.archived_at = value
 
       begin
         should_ignore_validations?(force) ? record.save(validate: false) : record.save!
-
-        if ::Gem::Version.new(::ActiveRecord::VERSION::STRING) < ::Gem::Version.new('4.2.0'.freeze)
-          @attributes       = record.attributes
-          @attributes_cache = record.attributes.except(record.class.serialized_attributes.keys)
-
-          if defined?(::ActiveRecord::AttributeMethods::Serialization::Attribute)
-            serialized_attribute_class = ::ActiveRecord::AttributeMethods::Serialization::Attribute
-            self.class.serialized_attributes.lazy.each do |key, coder|
-              @attributes[key] = serialized_attribute_class.new(coder, @attributes[key], :unserialized) if @attributes.key?(key)
-            end
-          end
-        else
-          @attributes = record.instance_variable_get('@attributes'.freeze)
-        end
+        @attributes = record.instance_variable_get('@attributes'.freeze)
       rescue Exception => e
         record.destroy
         raise(e)
       end
     end
 
+    def set_record_window(request, name, reflection)
+      send(name).unscope(where: :archived_at)
+                .where([
+                        "#{reflection.quoted_table_name}.archived_at > ? AND #{reflection.quoted_table_name}.archived_at < ?",
+                        archived_at - ActiveArchive.configuration.dependent_record_window,
+                        archived_at + ActiveArchive.configuration.dependent_record_window
+                      ])
+    end
+
     def should_force_destroy?(force)
       (Hash === force) ? force[:force] : (:force == force)
     end
@@ -169,5 +168,9 @@ module ActiveArchive
       (Hash === force) && (false == force[:validate])
     end
 
+    def should_unarchive_parent_first?(order)
+      (Hash === order) && (true == order[:reverse])
+    end
+
   end
 end

data/lib/active_archive/version.rb

@@ -1,3 +1,3 @@
 module ActiveArchive
-  VERSION = "2.3.0"
+  VERSION = "2.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_archive
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Juan Gomez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-17 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -171,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Gem for soft-deleting ActiveRecord objects.