active_archive 2.4.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d0ebc9e989d471df9de539fa9f0a7189ec4ab04
-  data.tar.gz: 9229273513eee94f67040e1c792513b17debaecc
+  metadata.gz: 4a27cc51a169e10a792eb78e458c4f578f86000b
+  data.tar.gz: 3b1f2b28213632d8d97a26b77cb1c3e0fbb79079
 SHA512:
-  metadata.gz: 81203ac1d02c7d50a8880d701c2967c56ba4ac264c36e8848bcf2b23c318b6e15c426764444b23966008e177e60810635ae156461e78b3575dde6d074d80ac2b
-  data.tar.gz: fbdd2b2f21ed9e83e9a359cf0a513e28b37b2a53a4eb62f84f2f18eb667eecc87685c5004126a4fd9cee174f3432c860f5de500495b9da7ea36d5fcfd2741de8
+  metadata.gz: 534b1317fa36b6dc2822dc783b4817b7ff3db6c8b7255298808ee0f014a18aa3aaec0a2ddb9dd1914317559a2fde0fdec6f792161a79949b8031b83ee429bc4e
+  data.tar.gz: b7dba38f3a22e7ad42d5b4a9714fe1be10bf460e7c2ab6d4764b6675f339090af17c1b01242a0ad6dadbe9c587395b4a3dd99895b4d64fb439642f99c4f2bff3

data/.coveralls.yml

@@ -1 +1 @@
-service_name: travis-ci
+service_name: travis-ci

data/.gitignore

@@ -6,4 +6,4 @@
 /doc/
 /pkg/
 /spec/reports/
-/tmp/
+/tmp/

data/.rspec

@@ -1,4 +1,4 @@
 --backtrace
 --color
 --format progress
---order random
+--order random

data/.travis.yml

@@ -10,4 +10,4 @@ notifications:
     on_success: never
 rvm:
   - ruby-head
-script: 'bundle exec rake'
+script: 'bundle exec rake'

data/CODE_OF_CONDUCT.md

@@ -10,4 +10,4 @@ Project maintainers have the right and responsibility to remove, edit, or reject
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
 
-This Code of Conduct is adapted from the [Contributor Covenant](http:contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)
+This Code of Conduct is adapted from the [Contributor Covenant](http:contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in active_archive.gemspec
-gemspec
+gemspec

data/README.md

@@ -2,7 +2,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/active_archive.svg)](http://badge.fury.io/rb/active_archive)
 [![Build Status](https://travis-ci.org/drexed/active_archive.svg?branch=master)](https://travis-ci.org/drexed/active_archive)
-[![Coverage Status](https://coveralls.io/repos/drexed/active_archive/badge.png)](https://coveralls.io/r/drexed/active_archive)
+[![Coverage Status](https://coveralls.io/repos/github/drexed/active_archive/badge.svg?branch=master)](https://coveralls.io/github/drexed/active_archive?branch=master)
 
 ActiveArchive is a library for preventing database records from being destroyed.
 
@@ -11,7 +11,7 @@ ActiveArchive is a library for preventing database records from being destroyed.
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'active_archive'
+gem "active_archive"
 ```
 
 And then execute:
@@ -90,8 +90,10 @@ User.unarchived.all #=> returns only unarchived record
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/active_archive/fork )
+Your contribution is welcome.
+
+1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
+3. Commit your changes (`git commit -am 'Added some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+5. Create new Pull Request

data/Rakefile

@@ -1,3 +1,3 @@
 require "bundler/gem_tasks"
 
-task default: :spec
+task default: :spec

data/active_archive.gemspec

@@ -1,21 +1,21 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'active_archive/version'
+require "active_archive/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "active_archive"
-  spec.version       = ActiveArchive::VERSION
-  spec.authors       = ["Juan Gomez"]
-  spec.email         = ["j.gomez@drexed.com"]
+  spec.name = "active_archive"
+  spec.version = ActiveArchive::VERSION
+  spec.authors = ["Juan Gomez"]
+  spec.email = ["j.gomez@drexed.com"]
 
-  spec.summary       = %q{Gem for soft-deleting ActiveRecord objects.}
-  spec.description   = %q{Prevent database records from being destroyed.}
-  spec.homepage      = "https://github.com/drexed/active_archive"
+  spec.summary = %q{Gem for soft-deleting ActiveRecord objects.}
+  spec.description = %q{Prevent database records from being destroyed.}
+  spec.homepage = "https://github.com/drexed/active_archive"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib", "support"]
 
   spec.add_runtime_dependency "rails"
@@ -27,4 +27,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "database_cleaner"
   spec.add_development_dependency "generator_spec"
-end
+end

data/bin/console

@@ -11,4 +11,4 @@ require "active_archive"
 # Pry.start
 
 require "irb"
-IRB.start
+IRB.start

data/bin/rake

@@ -2,15 +2,15 @@
 #
 # This file was generated by Bundler.
 #
-# The application 'rake' is installed as part of a gem, and
+# The application "rake" 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",
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
   Pathname.new(__FILE__).realpath)
 
-require 'rubygems'
-require 'bundler/setup'
+require "rubygems"
+require "bundler/setup"
 
-load Gem.bin_path('rake', 'rake')
+load Gem.bin_path("rake", "rake")

data/bin/setup

@@ -4,4 +4,4 @@ IFS=$'\n\t'
 
 bundle install
 
-# Do any other automated setup that you need to do here
+# Do any other automated setup that you need to do here

data/config/locales/en.yml

@@ -2,4 +2,4 @@ en:
   active_archive:
     archival:
       archived: "Archived"
-      unarchived: "Unarchived"
+      unarchived: "Unarchived"

data/lib/active_archive.rb

@@ -1,5 +1,5 @@
-require 'active_archive/version'
-require 'active_archive/configuration'
+require "active_archive/version"
+require "active_archive/configuration"
 
 module ActiveArchive
 
@@ -21,21 +21,23 @@ module ActiveArchive
 
 end
 
-require 'active_archive/table_definition'
-require 'active_archive/methods'
-require 'active_archive/scopes'
-require 'active_archive/base'
-require 'generators/active_archive/install_generator'
+require "active_archive/table_definition"
+require "active_archive/methods"
+require "active_archive/scopes"
+require "active_archive/base"
+require "generators/active_archive/install_generator"
 
-ActiveRecord::Base.send(:include, ActiveArchive::Base)
+ActiveSupport.on_load(:active_record) do
+  ActiveRecord::Base.send(:include, ActiveArchive::Base)
+end
 
 if defined?(Rails)
-  require 'rails'
+  require "rails"
 
   module ActiveArchive
     class Railtie < ::Rails::Railtie
 
-      initializer 'active_archive' do |app|
+      initializer "active_archive" do |app|
         ActiveArchive::Railtie.instance_eval do
           [app.config.i18n.available_locales].flatten.each do |locale|
             (I18n.load_path << path(locale)) if File.file?(path(locale))
@@ -51,4 +53,4 @@ if defined?(Rails)
 
     end
   end
-end
+end

data/lib/active_archive/base.rb

@@ -35,7 +35,7 @@ module ActiveArchive
 
     def unarchive(options=nil)
       with_transaction_returning_status do
-        (should_unarchive_parent_first?(options) ? unarchival.reverse : unarchival).lazy.each { |r| r.call(options) }
+        (should_unarchive_parent_first?(options) ? unarchival.reverse : unarchival).each { |r| r.call(options) }
         self
       end
     end
@@ -53,11 +53,9 @@ module ActiveArchive
     private
 
     def attempt_notifying_observers(callback)
-      begin
-        notify_observers(callback)
-      rescue NoMethodError => e
-        # RETURN
-      end
+      notify_observers(callback)
+    rescue NoMethodError
+      # RETURN
     end
 
     def destroy_with_active_archive(force=nil)
@@ -70,36 +68,35 @@ module ActiveArchive
     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)
+      self.class.unscoped.find(id)
     end
 
     def get_dependent_records
       dependent_records = {}
-      self.class.reflections.lazy.each do |key, reflection|
-        if reflection.options[:dependent] == :destroy
-          next unless records = self.send(key)
-          if records.respond_to?(:size)
-            next unless records.size > 0
-          else
-            records = [] << records
-          end
-          dependent_record = records.first
-          next if dependent_record.nil?
-          dependent_records[dependent_record.class] = records.map(&:id)
+
+      self.class.reflections.each do |key, reflection|
+        next unless reflection.options[:dependent] == :destroy
+        next unless records = send(key)
+
+        if records.respond_to? :size
+          next unless records.size > 0
+        else
+          records = [] << records
         end
+
+        dependent_record = records.first
+        next if dependent_record.nil?
+        dependent_records[dependent_record.class] = records.map(&:id)
       end
-      return(dependent_records)
+
+      dependent_records
     end
 
     def permanently_delete_records(dependent_records)
-      dependent_records.lazy.each do |klass, ids|
-        ids.lazy.each do |id|
-          record = begin
-            klass.unscoped.find(id)
-          rescue ::ActiveRecord::RecordNotFound
-            next
-          end
+      dependent_records.each do |klass, ids|
+        ids.each do |id|
+          record = klass.unscoped.where(klass.primary_key => id).first
+          next unless record
           record.archived_at = nil
           record.destroy(:force)
         end
@@ -108,23 +105,28 @@ module ActiveArchive
 
     def permanently_delete_records_after(&block)
       dependent_records = get_dependent_records
-      dependent_results = block.call
+      dependent_results = yield
       permanently_delete_records(dependent_records) if dependent_results
       return(dependent_results)
     end
 
     def unarchival
       [
-        ->(_validate) { unarchive_destroyed_dependent_records(_validate) },
-        ->(_validate) { run_callbacks(:unarchive) { set_archived_at(nil, _validate) } }
+        ->(validate) { unarchive_destroyed_dependent_records(validate) },
+        ->(validate) do
+          run_callbacks(:unarchive) do
+            set_archived_at(nil, validate)
+            return(true)
+          end
+        end
       ]
     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?
+        "destroy" == reflection.options[:dependent].to_s && reflection.klass.archivable?
       end.each do |name, reflection|
-        cardinality = reflection.macro.to_s.gsub('has_'.freeze, ''.freeze).to_sym
+        cardinality = reflection.macro.to_s.gsub("has_", "").to_sym
         case cardinality
         when :many
           records = (archived_at ? set_record_window(send(name), name, reflection) : send(name))
@@ -132,7 +134,7 @@ module ActiveArchive
           self.class.unscoped { records = [] << send(name) }
         end
 
-        [records].flatten.compact.lazy.each { |d| d.unarchive(force) }
+        [records].flatten.compact.each { |d| d.unarchive(force) }
         send(name, :reload)
       end
     end
@@ -144,8 +146,8 @@ module ActiveArchive
 
       begin
         should_ignore_validations?(force) ? record.save(validate: false) : record.save!
-        @attributes = record.instance_variable_get('@attributes'.freeze)
-      rescue Exception => e
+        @attributes = record.instance_variable_get("@attributes")
+      rescue => e
         record.destroy
         raise(e)
       end
@@ -161,16 +163,16 @@ module ActiveArchive
     end
 
     def should_force_destroy?(force)
-      (Hash === force) ? force[:force] : (:force == force)
+      force.is_a?(Hash) ? force[:force] : (:force == force)
     end
 
     def should_ignore_validations?(force)
-      (Hash === force) && (false == force[:validate])
+      force.is_a?(Hash) && (false == force[:validate])
     end
 
     def should_unarchive_parent_first?(order)
-      (Hash === order) && (true == order[:reverse])
+      order.is_a?(Hash) && (true == order[:reverse])
     end
 
   end
-end
+end

data/lib/active_archive/configuration.rb

@@ -3,8 +3,8 @@ class ActiveArchive::Configuration
   attr_accessor :all_records_archivable, :dependent_record_window
 
   def initialize
-    @all_records_archivable  = false
+    @all_records_archivable = false
     @dependent_record_window = 3.seconds
   end
 
-end
+end

data/lib/active_archive/methods.rb

@@ -2,7 +2,7 @@ module ActiveArchive
   module Methods
 
     def archivable?
-      columns.lazy.detect { |c| c.name == 'archived_at'.freeze }
+      columns.detect { |c| c.name == "archived_at" }
     end
 
     def archive_all(conditions=nil)
@@ -10,8 +10,8 @@ module ActiveArchive
     end
 
     def unarchive_all(conditions=nil)
-      (conditions ? where(conditions) : all).to_a.lazy.each { |r| r.unarchive }
+      (conditions ? where(conditions) : all).to_a.each { |r| r.unarchive }
     end
 
   end
-end
+end

data/lib/active_archive/scopes.rb

@@ -10,4 +10,4 @@ module ActiveArchive
     end
 
   end
-end
+end

data/lib/active_archive/table_definition.rb

@@ -11,4 +11,4 @@ module ActiveRecord
 
     end
   end
-end
+end

data/lib/active_archive/version.rb

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

data/lib/generators/active_archive/install_generator.rb

@@ -1,12 +1,12 @@
-require 'rails/generators'
+require "rails/generators"
 
 module ActiveArchive
   class InstallGenerator < Rails::Generators::Base
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.expand_path("../templates", __FILE__)
 
     def copy_initializer_file
-      copy_file('install.rb'.freeze, 'config/initializers/active_archive.rb'.freeze)
+      copy_file("install.rb", "config/initializers/active_archive.rb")
     end
 
   end
-end
+end

data/lib/generators/active_archive/templates/install.rb

@@ -1,4 +1,4 @@
 ActiveArchive.configure do |config|
-  config.all_records_archivable  = false
+  config.all_records_archivable = false
   config.dependent_record_window = 3.seconds
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_archive
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Juan Gomez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-07 00:00:00.000000000 Z
+date: 2016-06-03 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.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Gem for soft-deleting ActiveRecord objects.