permanent_records 4.2.8 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a557f2f7f287f2cbd1990950e869d2a943e5c8593df0dbd41520790d049f3b0
-  data.tar.gz: 8ebc139901710c0599e36873217a70ad936918a1dbf93520797099b2c7e8e40d
+  metadata.gz: 6f7d5e533d3ea6f107b72b635d5c58871601a782d759b41f6c5578f7f556d54f
+  data.tar.gz: 1c1ccdac5a7812cdd3dbaec043580ba62ea82e0858d9a8b56850a58703c7e79c
 SHA512:
-  metadata.gz: 0d547b27a573c1abdc3a85c7803d56452f95c8a8a6f485476f52e18d2173ad67e25e5b9904ad4b9fe6a22fdecaf9ba57b1866a432f940917841202ace3fc9c0a
-  data.tar.gz: e4a8d014f056e37ef0e941cc52251c63acc935051e5103822dd7f8942ce9c086bbad6fc0a20ce687c0f8e35d5d48b12dd2affbf859baab89e83318c6c49f6ca1
+  metadata.gz: 42910c3d809df7cda9876f1e752da136055640053682bde499b1a33f7f9142222fe22c7fefe1fae3750ed0180179582a2eb3d6a05321ef9303be37bc93e79a3a
+  data.tar.gz: f2a06abe6da337d41c610a7e539516e4b71ede008f644bc75db3c1bd4805f43c526783ffff18275d4871cf5713619f172f4ed6e9c139080aeded2d47c001bc63

data/.github/workflows/gempush.yml

@@ -0,0 +1,28 @@
+name: Ruby Gem
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    name: gem publishing
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@master
+    - name: Set up Ruby 2.6
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6.x
+
+    - name: Publish to RubyGems
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        bin/gempush-if-changed
+      env:
+        GEM_HOST_API_KEY: ${{secrets.RUBYGEMS_AUTH_TOKEN}}

data/.github/workflows/test.yml

@@ -0,0 +1,32 @@
+name: Tests
+
+on: push
+
+jobs:
+  ci:
+    name: CI
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby:
+          - '2.3.x'
+          - '2.4.x'
+          - '2.5.x'
+          - '2.6.x'
+        rails:
+          - '5.0.7.2'
+          - '5.1.7'
+          - '5.2.3'
+    steps:
+      - name: Install system dependencies
+        run: sudo apt-get install -y libsqlite3-dev
+      - uses: actions/checkout@master
+      - name: Setup ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          architecture: 'x64'
+      - run: gem install bundler && bundle && bundle exec rake 
+        env:
+          AR_TEST_VERSION: ${{ matrix.rails }}
+

data/.rubocop.yml

@@ -1,9 +1,11 @@
+require: rubocop-performance
+
 inherit_from: .rubocop_todo.yml
 
 AllCops:
   Exclude:
     - bin/*
-  TargetRubyVersion: 2.0
+  TargetRubyVersion: 2.2
 
 Metrics/BlockLength:
   Enabled: false

data/.rubocop_todo.yml

@@ -1,12 +1,7 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-10-09 11:48:30 +0200 using RuboCop version 0.50.0.
+# on 2019-10-15 13:32:11 +0200 using RuboCop version 0.68.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 15
-Lint/AmbiguousBlockAssociation:
-  Exclude:
-    - 'spec/permanent_records_spec.rb'

data/.travis.yml

@@ -1,8 +1,11 @@
 language: ruby
 rvm:
-  - 2.0.0-p648
   - 2.2.10
   - 2.3.8
+  - 2.4.9
+  - 2.5.7
+  - 2.6.5
 env:
-  - AR_TEST_VERSION: 4.2.0
-  - AR_TEST_VERSION: 4.2.11.1
+  - AR_TEST_VERSION: 5.0.7.2
+  - AR_TEST_VERSION: 5.1.7
+  - AR_TEST_VERSION: 5.2.3

data/README.md

@@ -1,4 +1,4 @@
-# PermanentRecords (Rails 4.2)
+# PermanentRecords (Rails 5)
 
 [http://github.com/JackDanger/permanent_records/](http://github.com/JackDanger/permanent_records/)
 

data/README.rst

@@ -1,4 +1,4 @@
-PermanentRecords (Rails 4.2)
+PermanentRecords (Rails 5)
 =============================
 
 http://github.com/JackDanger/permanent_records/

data/VERSION

@@ -1 +1 @@
-4.2.8
+5.0.0

data/bin/gempush-if-changed

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -x
+if git diff --name-only HEAD..HEAD^ | egrep -q '^VERSION$'; then
+  # The VERSION file changed in the last commit, build the gem and push
+  gem build *.gemspec
+  gem push *.gem
+  version=$(cat VERSION)
+  git tag ${version}
+  git push origin ${version}
+fi

data/github-actions-test.yml

@@ -0,0 +1 @@
+.github/workflows/test.yml

data/lib/permanent_records.rb

@@ -51,7 +51,7 @@ module PermanentRecords
         if !is_permanent? || PermanentRecords.should_force_destroy?(force)
           permanently_delete_records_after { super() }
         else
-          destroy_with_permanent_records force
+          destroy_with_permanent_records(force)
         end
       end
     end
@@ -68,7 +68,7 @@ module PermanentRecords
             set_deleted_at(nil, validate)
             # increment all associated counters for counter cache
             each_counter_cache do |assoc_class, counter_cache_column, assoc_id|
-              assoc_class.increment_counter counter_cache_column, assoc_id
+              assoc_class.increment_counter(counter_cache_column, assoc_id)
             end
             true
           end
@@ -81,9 +81,9 @@ module PermanentRecords
     end
 
     # rubocop:disable Metrics/MethodLength
-    # rubocop:disable Lint/RescueWithoutErrorClass
     def set_deleted_at(value, force = nil)
       return self unless is_permanent?
+
       record = get_deleted_record
       record.deleted_at = value
       begin
@@ -98,14 +98,14 @@ module PermanentRecords
         end
 
         @attributes = record.instance_variable_get('@attributes')
-      rescue => e
+      rescue StandardError => e
         # trigger dependent record destruction (they were revived before this
         # record, which cannot be revived due to validations)
         record.destroy
         raise e
       end
     end
-    # rubocop:enable Lint/RescueWithoutErrorClass
+
     # rubocop:enable Metrics/MethodLength
 
     def each_counter_cache
@@ -116,9 +116,7 @@ module PermanentRecords
 
         associated_class = association.class
 
-        yield(associated_class,
-              reflection.counter_cache_column,
-              send(reflection.foreign_key))
+        yield(associated_class, reflection.counter_cache_column, send(reflection.foreign_key))
       end
     end
 
@@ -131,7 +129,7 @@ module PermanentRecords
           set_deleted_at(Time.now, force)
           # decrement all associated counters for counter cache
           each_counter_cache do |assoc_class, counter_cache_column, assoc_id|
-            assoc_class.decrement_counter counter_cache_column, assoc_id
+            assoc_class.decrement_counter(counter_cache_column, assoc_id)
           end
         end
         true
@@ -143,18 +141,16 @@ module PermanentRecords
     def add_record_window(_request, name, reflection)
       send(name).unscope(where: :deleted_at).where(
         [
-          "#{reflection.quoted_table_name}.deleted_at > ?" \
+          "#{reflection.klass.quoted_table_name}.deleted_at > ?" \
           ' AND ' \
-          "#{reflection.quoted_table_name}.deleted_at < ?",
+          "#{reflection.klass.quoted_table_name}.deleted_at < ?",
           deleted_at - PermanentRecords.dependent_record_window,
           deleted_at + PermanentRecords.dependent_record_window
         ]
       )
     end
 
-    # TODO: Feel free to refactor this without polluting the ActiveRecord
-    # namespace.
-    # rubocop:disable Metrics/AbcSize
+    # TODO: Feel free to refactor this without polluting the ActiveRecord namespace.
     def revive_destroyed_dependent_records(force = nil)
       destroyed_dependent_relations.each do |relation|
         relation.to_a.each { |destroyed_dependent_record| destroyed_dependent_record.try(:revive, force) }
@@ -165,15 +161,14 @@ module PermanentRecords
     # rubocop:disable Metrics/MethodLength
     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
+        case relation.macro.to_sym
+        when :has_many
           if deleted_at
             add_record_window(send(name), name, relation)
           else
             send(name).unscope(where: :deleted_at)
           end
-        when :one, :belongs_to
+        when :has_one, :belongs_to
           self.class.unscoped { Array(send(name)) }
         end
       end
@@ -194,6 +189,7 @@ module PermanentRecords
                       .reduce({}) do |records, (key, _)|
         found = Array(send(key)).compact
         next records if found.empty?
+
         records.update found.first.class => found.map(&:id)
       end
     end
@@ -218,6 +214,7 @@ module PermanentRecords
         ids.each do |id|
           record = klass.unscoped.where(klass.primary_key => id).first
           next unless record
+
           record.deleted_at = nil
           record.destroy(:force)
         end
@@ -282,5 +279,9 @@ module PermanentRecords
 end
 
 ActiveSupport.on_load(:active_record) do
-  ActiveRecord::Base.send :include, PermanentRecords::ActiveRecord
+  ActiveRecord::Base.send(:include, PermanentRecords::ActiveRecord)
+
+  if [ActiveRecord::VERSION::MAJOR, ActiveRecord::VERSION::MINOR] == [5, 2] || ActiveRecord::VERSION::MAJOR > 5
+    require 'permanent_records/active_record_5_2'
+  end
 end

data/lib/permanent_records/active_record_5_2.rb

@@ -0,0 +1,40 @@
+# rubocop:disable Metrics/AbcSize
+# Support destroy for rails belongs_to assocations.
+module HandlePermanentRecordsDestroyedInBelongsToAssociation
+  def handle_dependency
+    return unless load_target
+
+    case options[:dependent]
+    when :destroy
+      target.destroy
+      raise ActiveRecord::Rollback if target.respond_to?(:deleted?) && !target.deleted?
+    else
+      target.send(options[:dependent])
+    end
+  end
+end
+
+# rubocop:disable Metrics/MethodLength
+# rubocop:disable Metrics/CyclomaticComplexity
+# Support destroy for rails 5.2. has_on associations.
+module HandlePermanentRecordsDestroyedInHasOneAssociation
+  def delete(method = options[:dependent])
+    return unless load_target
+
+    case method
+    when :delete
+      target.delete
+    when :destroy
+      target.destroyed_by_association = reflection
+      target.destroy
+      throw(:abort) if target.respond_to?(:deleted?) && !target.deleted?
+    when :nullify
+      target.update_columns(reflection.foreign_key => nil) if target.persisted?
+    end
+  end
+end
+# rubocop:enable Metrics/CyclomaticComplexity
+# rubocop:enable Metrics/MethodLength
+# rubocop:enable Metrics/AbcSize
+ActiveRecord::Associations::BelongsToAssociation.prepend(HandlePermanentRecordsDestroyedInBelongsToAssociation)
+ActiveRecord::Associations::HasOneAssociation.prepend(HandlePermanentRecordsDestroyedInHasOneAssociation)

data/permanent_records.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.description = <<-DESCRIPTION
     Never Lose Data. Rather than deleting rows this sets Record#deleted_at and
     gives you all the scopes you need to work with your data.
-DESCRIPTION
+  DESCRIPTION
   s.email = 'github@jackcanty.com'
   s.extra_rdoc_files = [
     'LICENSE',
@@ -26,12 +26,13 @@ DESCRIPTION
   ver = ENV['AR_TEST_VERSION']
   ver = ver.dup.chomp if ver
 
-  s.add_runtime_dependency 'activerecord',  ver || '>= 4.2.0'
-  s.add_runtime_dependency 'activesupport', ver || '>= 4.2.0'
+  s.add_runtime_dependency 'activerecord',  ver || '>= 5.0.0'
+  s.add_runtime_dependency 'activesupport', ver || '>= 5.0.0'
   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', '>= 3.5.0'
-  s.add_development_dependency 'rubocop', '~> 0.50.0' # freeze to ensure ruby 2.0 compatibility
-  s.add_development_dependency 'sqlite3', '~> 1.3.6' # freeze to ensure specs are working
+  s.add_development_dependency 'rubocop', '~> 0.68.0' # freeze to ensure ruby 2.2 compatibility
+  s.add_development_dependency 'rubocop-performance'
+  s.add_development_dependency 'sqlite3', '~> 1.3.13' # freeze to ensure specs are working
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: permanent_records
 version: !ruby/object:Gem::Version
-  version: 4.2.8
+  version: 5.0.0
 platform: ruby
 authors:
 - Jack Danger Canty
@@ -17,36 +17,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-15 00:00:00.000000000 Z
+date: 2019-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.11.1
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.11.1
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.11.1
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.11.1
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -109,28 +109,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: 0.68.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: 0.68.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  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: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: 1.3.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: 1.3.13
 description: |2
       Never Lose Data. Rather than deleting rows this sets Record#deleted_at and
       gives you all the scopes you need to work with your data.
@@ -142,6 +156,8 @@ extra_rdoc_files:
 - README.md
 files:
 - ".document"
+- ".github/workflows/gempush.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
@@ -154,9 +170,12 @@ files:
 - README.rst
 - Rakefile
 - VERSION
+- bin/gempush-if-changed
 - bin/rspec
 - ci
+- github-actions-test.yml
 - lib/permanent_records.rb
+- lib/permanent_records/active_record_5_2.rb
 - permanent_records.gemspec
 homepage: https://github.com/JackDanger/permanent_records
 licenses: