active_archive 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 870fb2643b79b471095f5e3c621c56019628cf93
-  data.tar.gz: 5811d3442ada47fc1ddafea1f2acab79212d584d
+  metadata.gz: 726842f1049b5fc85b6b45b9f8413b232d50b84d
+  data.tar.gz: efde2e4235ae487258d60dde82a95dfb289f5252
 SHA512:
-  metadata.gz: 213c9daf7f511404a5f92eea6f31a1e978feeb03cbcb32e0b5da70c93906f48332f8c02e2359aa71a8d0611071b6ebdea24049d56ff013f709c7b6cf27c9f29e
-  data.tar.gz: af77de6275006aa877d1326f695fb161b72ce46986c6e39fa5554b7455bf41513a1cc9f69b0bc40b7e9a7331e6b0bf9522446b594e775e6587f30c20035495d3
+  metadata.gz: 2e0694e823e05e21e6844fc67c50f498a83ae71a335dbda1f47544fdbb454b57a1d2301a1cc29dee8784e2763ccac8fe9daef275e996c9c13ff6f20fcaee378e
+  data.tar.gz: e0d91693520e3da56a6e1f7c2c7144d276361b1d49ee66ceb6066f93fb345b4de92ea13956083968d8be5ba91d76f52574afdd78204e44ef5bcc169939c6d24e

data/.reek

@@ -1,9 +1,12 @@
 ---
 Attribute:
   enabled: false
+BooleanParameter:
+  enabled: false
+ControlParameter:
+  enabled: false
 FeatureEnvy:
-  exclude:
-    - 'ActiveArchive::Base#retrieve_dependent_records'
+  enabled: false
 IrresponsibleModule:
   enabled: false
 NilCheck:
@@ -12,6 +15,8 @@ ManualDispatch:
   enabled: false
 NestedIterators:
   max_allowed_nesting: 2
+PrimaDonnaMethod:
+  enabled: false
 TooManyStatements:
   max_statements: 10
   exclude:

data/.rubocop.yml

@@ -2,11 +2,11 @@ AllCops:
   DisplayCopNames: true
   DisplayStyleGuide: true
   TargetRubyVersion: 2.3
+  Exclude:
+    - 'spec/**/**/*'
 LineLength:
-  Max: 120
-Rails/Delegate:
-  Enabled: false
-Rails/Output:
+  Max: 100
+Metrics/ModuleLength:
   Enabled: false
 Style/Alias:
   EnforcedStyle: prefer_alias_method
@@ -22,11 +22,15 @@ Style/EmptyLinesAroundClassBody:
   Enabled: false
 Style/EmptyLinesAroundModuleBody:
   Enabled: false
+Style/HashSyntax:
+  Enabled: false
 Style/FirstParameterIndentation:
   Enabled: false
 Style/FrozenStringLiteralComment:
   Enabled: false
 Style/MultilineMethodCallIndentation:
   EnforcedStyle: aligned
+Style/NumericLiterals:
+  Enabled: false
 Style/RescueModifier:
   Enabled: false

data/README.md

@@ -30,15 +30,10 @@ Or install it yourself as:
 
 ## Configurations
 
-**Options:**
- * all_records_archivable
- * dependent_record_window
-
-`rails generate active_archive:install` will generate the following `active_archive.rb` file:
+`rails generate active_archive:install` will generate the following file:
+`../config/initalizers/active_archive.rb`
 
 ```ruby
-# Path: ../config/initalizers/active_archive.rb
-
 ActiveArchive::Settings.configure do |config|
   config.all_records_archivable = false
   config.dependent_record_window = 3.seconds
@@ -48,42 +43,42 @@ end
 ## Methods
 
 **Options:**
- * archive
- * destroy
- * destroy_all
- * delete
- * delete_all
- * unarchive
- * unarchive_all
+ * `archive`
+ * `destroy`
+ * `destroy_all`
+ * `delete`
+ * `delete_all`
+ * `unarchive`
+ * `unarchive_all`
 
 ```ruby
-User.first.archive         #=> archives User record and dependents
-User.first.destroy         #=> archives User record and dependents
-User.first.delete          #=> deletes User record and dependents
-User.first.unarchive       #=> unarchives User record and dependents
+User.first.archive          #=> archives User record and dependents
+User.first.destroy          #=> archives User record and dependents
+User.first.delete           #=> deletes User record and dependents
+User.first.unarchive        #=> unarchives User record and dependents
 
-User.first.to_archival     #=> returns archival state string
+User.first.to_archival      #=> returns archival state string
 
-User.first.archive(:force) #=> destroys User record and dependents
-User.first.destroy(:force) #=> destroys User record and dependents
+User.first.archive(:force)  #=> destroys User record and dependents
+User.first.destroy(:force)  #=> destroys User record and dependents
 
-User.archive_all           #=> archives all User records and dependents
-User.destroy_all           #=> archives all User records and dependents
-User.delete_all            #=> deletes all User records and dependents
-User.unarchive_all         #=> unarchives all User record and dependents
+User.archive_all            #=> archives all User records and dependents
+User.destroy_all            #=> archives all User records and dependents
+User.delete_all             #=> deletes all User records and dependents
+User.unarchive_all          #=> unarchives all User record and dependents
 ```
 
 ## Scopes
 
 **Options:**
- * default
- * archived
- * unarchived
+ * `default`
+ * `archived`
+ * `unarchived`
 
 ```ruby
-User.all            #=> returns all records
-User.archived.all   #=> returns only archived record
-User.unarchived.all #=> returns only unarchived record
+User.all                    #=> returns all records
+User.archived.all           #=> returns only archived record
+User.unarchived.all         #=> returns only unarchived record
 ```
 
 ## Contributing

data/active_archive.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   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 = %w(lib support)
+  spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'rails'
   spec.add_runtime_dependency 'dry-configurable'
@@ -29,7 +29,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'database_cleaner'
   spec.add_development_dependency 'generator_spec'
   spec.add_development_dependency 'fasterer'
-  spec.add_development_dependency 'flay'
   spec.add_development_dependency 'reek'
   spec.add_development_dependency 'rubocop'
 end

data/lib/active_archive/base.rb

@@ -35,7 +35,9 @@ module ActiveArchive
 
     def unarchive(opts = nil)
       with_transaction_returning_status do
-        (should_unarchive_parent_first?(opts) ? unarchival.reverse : unarchival).each { |record| record.call(opts) }
+        records = should_unarchive_parent_first?(opts) ? unarchival.reverse : unarchival
+        records.each { |record| record.call(opts) }
+
         self
       end
     end
@@ -69,6 +71,7 @@ module ActiveArchive
       self.class.unscoped.find(id)
     end
 
+    # rubocop:disable Metrics/AbcSize
     def retrieve_dependent_records
       dependent_records = {}
 
@@ -85,6 +88,7 @@ module ActiveArchive
 
       dependent_records
     end
+    # rubocop:enable Metrics/AbcSize
 
     def permanently_delete_records(dependent_records)
       dependent_records.each do |klass, ids|
@@ -131,9 +135,9 @@ module ActiveArchive
 
     def unarchive_destroyed_dependent_records(force = nil)
       self.class.reflections
-          .select { |_, reflection| 'destroy' == reflection.options[:dependent].to_s && reflection.klass.archivable? }
-          .each do |name, reflection|
-            dependent_records_for_unarchival(name, reflection).each { |record| record.unarchive(force) }
+          .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) }
           end
     end
 
@@ -155,12 +159,10 @@ module ActiveArchive
       quoted_table_name = reflection.quoted_table_name
       window = ActiveArchive::Settings.config.dependent_record_window
 
+      query = "#{quoted_table_name}.archived_at > ? AND #{quoted_table_name}.archived_at < ?"
+
       send(name).unscope(where: :archived_at)
-                .where([
-                         "#{quoted_table_name}.archived_at > ? AND #{quoted_table_name}.archived_at < ?",
-                         archived_at - window,
-                         archived_at + window
-                       ])
+                .where([query, archived_at - window, archived_at + window])
     end
 
     def should_force_destroy?(force)

data/lib/active_archive/version.rb

@@ -1,3 +1,3 @@
 module ActiveArchive
-  VERSION = '4.0.0'.freeze
+  VERSION = '4.0.1'.freeze
 end

data/lib/active_archive.rb

@@ -1,9 +1,7 @@
 require 'rails'
-require 'active_archive/version'
-require 'active_archive/railtie'
-require 'active_archive/settings'
-require 'active_archive/table_definition'
-require 'active_archive/methods'
-require 'active_archive/scopes'
-require 'active_archive/base'
+
+%w(version railtie settings table_definition methods scopes base).each do |file_name|
+  require "active_archive/#{file_name}"
+end
+
 require 'generators/active_archive/install_generator'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_archive
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Juan Gomez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -150,20 +150,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: flay
-  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: reek
   requirement: !ruby/object:Gem::Requirement
@@ -199,9 +185,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".DS_Store"
 - ".coveralls.yml"
 - ".fasterer.yml"
-- ".flayignore"
 - ".gitignore"
 - ".reek"
 - ".rspec"
@@ -216,7 +202,9 @@ files:
 - bin/rake
 - bin/setup
 - config/locales/en.yml
+- lib/.DS_Store
 - lib/active_archive.rb
+- lib/active_archive/.DS_Store
 - lib/active_archive/base.rb
 - lib/active_archive/methods.rb
 - lib/active_archive/railtie.rb
@@ -233,7 +221,6 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
-- support
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.flayignore

@@ -1,2 +0,0 @@
-./spec/lib/active_archive/*.rb
-./spec/support/db/*.rb