permanent_records 4.1.7 → 4.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20dcb9aa315fd6a5ef68fe0085e48ae281302553
-  data.tar.gz: 630fbfcca7864a15dd4153a5ae43e5f608f8113b
+  metadata.gz: 4bdca6f3d0ced279ab4cad8b9d83bd23cb2e2725
+  data.tar.gz: c9c53f6405d8a4146872ec0f52bee8f8b8741ea0
 SHA512:
-  metadata.gz: d82a489616bb8429db6850d05108a4f5af30ac2cef7f1971d10340d36b361d859fd59e51d02aaccddda3e44670c327d960d907e6645e790ef2c617e424ab0c01
-  data.tar.gz: bca5df4208d994416d08df2fda5911761eb72953e39e3e385d30e17a50c593ed59e2451c90c7666c213493e583cc936ab61b91580411c10f9da1d9e1b8a27469
+  metadata.gz: c672b6118fbc111d523d6f3e5a252610383a9a9c8ffb3e047920c4c9c3dcb0d68a418f87c27c4b5c6891f4107f77d95a8612e343f64df80bd31b4ee388a3f311
+  data.tar.gz: 61e651908d6acf7674661c5fd3e0b3b2140efd89686ee1e089a7664a5dcc4da1019a5d9beb3ebd9add1a13b0de392557e733a367e1df2e7e694c743109f4a4ec

data/.rubocop.yml

@@ -1,3 +1,9 @@
 AllCops:
   Exclude:
     - bin/*
+
+Metrics/LineLength:
+  Max: 120
+
+Style/BlockDelimiters:
+  Enabled: false

data/Rakefile

@@ -33,13 +33,13 @@ RSpec::Core::RakeTask.new(:rspec) do |t|
   t.rspec_opts = '-f d -c'
 end
 
-task :publish do
+task publish: [:rubocop, :rspec] do
   # Ensure the gem builds
   system('gem build permanent_records.gemspec') &&
-  # And we didn't leave anything (aside from the gem) uncommitted
-  !system('git status -s | egrep -v .') &&
-  system('git push') &&
-  system("gem push permanent_records-#{version}.gem")
+    # And we didn't leave anything (aside from the gem) uncommitted
+    !system('git status -s | egrep -v .') &&
+    system('git push') &&
+    system("gem push permanent_records-#{version}.gem")
 end
 
 task default: [:rspec, :rubocop]

data/VERSION

@@ -1 +1 @@
-4.1.7
+4.2.7

data/lib/permanent_records.rb

@@ -151,24 +151,25 @@ module PermanentRecords
     # namespace.
     # rubocop:disable Metrics/AbcSize
     def revive_destroyed_dependent_records(force = nil)
-      PermanentRecords.dependent_permanent_reflections(self.class)
-                      .each do |name, reflection|
-        cardinality = reflection.macro.to_s.gsub('has_', '').to_sym
+      destroyed_dependent_relations.each do |relation|
+        relation.to_a.each { |destroyed_dependent_record| destroyed_dependent_record.try(:revive, force) }
+      end
+      reload
+    end
+
+    def destroyed_dependent_relations
+      PermanentRecords.dependent_permanent_reflections(self.class).map do |name, relation|
+        cardinality = relation.macro.to_s.gsub('has_', '').to_sym
         case cardinality
         when :many
           if deleted_at
-            add_record_window(send(name), name, reflection)
+            add_record_window(send(name), name, relation)
           else
-            send(name)
+            send(name).unscope(where: :deleted_at)
           end
         when :one, :belongs_to
           self.class.unscoped { Array(send(name)) }
-        end.to_a.flatten.compact.each do |dependent|
-          dependent.revive(force)
         end
-
-        # and update the reflection cache
-        send(name, :reload)
       end
     end
 

data/permanent_records.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
 
   s.authors = ['Jack Danger Canty', 'David Sulc', 'Joe Nelson',
                'Trond Arve Nordheim', 'Josh Teneycke', 'Maximilian Herold',
-               'Hugh Evans', 'Sergey Gnuskov', 'aq']
+               'Hugh Evans', 'Sergey Gnuskov', 'aq', 'Joel AZEMAR']
   s.summary = 'Soft-delete your ActiveRecord records'
   s.description = <<-EOS
 Never Lose Data. Rather than deleting rows this sets Record#deleted_at and
@@ -32,7 +32,7 @@ EOS
   s.add_development_dependency('database_cleaner', '>= 1.5.1')
   s.add_development_dependency('pry-byebug')
   s.add_development_dependency('rake') # For Travis-ci
-  s.add_development_dependency('rspec', '~> 2.14.1')
-  s.add_development_dependency('rubocop', '0.39.0')
+  s.add_development_dependency('rspec', '~> 3.5.0')
+  s.add_development_dependency('rubocop', '0.42.0')
   s.add_development_dependency('sqlite3')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: permanent_records
 version: !ruby/object:Gem::Version
-  version: 4.1.7
+  version: 4.2.7
 platform: ruby
 authors:
 - Jack Danger Canty
@@ -13,10 +13,11 @@ authors:
 - Hugh Evans
 - Sergey Gnuskov
 - aq
+- Joel AZEMAR
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-07 00:00:00.000000000 Z
+date: 2016-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -94,28 +95,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.39.0
+        version: 0.42.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.39.0
+        version: 0.42.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -179,3 +180,4 @@ signing_key:
 specification_version: 4
 summary: Soft-delete your ActiveRecord records
 test_files: []
+has_rdoc: