guard_against_physical_delete 1.0.2 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 02c2548cfaa8943a5e4a5daf8346e8eb9adb291b
-  data.tar.gz: bd9b86a8934b5f991ed03ca4b3fa32afcc2e5d3d
+SHA256:
+  metadata.gz: bf3003e9c60b6e19e0f13de9cfca5c1ccf85f8a5c33cbfb327bc60ead38c9332
+  data.tar.gz: 89f4cd9c51bb7bff0712215b6a5b503d7148b982694708a7a274423e59134a1b
 SHA512:
-  metadata.gz: cc3c00bbdfa6c8c31be45d8ca7ee59f69d01cf5dda46c1931f2d3bd0301ab9e25c757281ccfe064c5d8e5882955433d723e690543388ef4ba8d566bd696cfa9b
-  data.tar.gz: 8831b00d3ac1a863ef5e0f411322cca1ea2b0a46f44b3a2010849ff699811342c893ba433adcfef4660a48b38d1ead177d21cfc4e39d61b1aa0e43a4632db004
+  metadata.gz: 55d3b887dbaf294c6b262620dc24b0d7be5cf147798ad8899137121b6cce1fdb547569acfdd1cec363a3879b3dd5758396533cf8db2bc361fcdabe7492e1b2ae
+  data.tar.gz: b8e1c3941e184465eec596f0da8e8a662135c462bf5e42b66fbb4e5c1d52261407cb71b1433a4cd935efe8cc6ed78db826d23c61137092f2e981d91347246a4e

data/.github/workflows/master_and_pr.yml

@@ -0,0 +1,30 @@
+name: master & PR
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  spec:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        rails_version:
+          - "5.0"
+          - "5.1"
+          - "5.2"
+          - "6.0"
+          - "6.1"
+    name: Test on Rails ${{ matrix.rails_version }}
+    env:
+      BUNDLE_GEMFILE: gemfiles/Gemfile_rails_${{ matrix.rails_version }}.rb
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.7
+        bundler-cache: true
+    - name: rspec
+      run: bundle exec rspec

data/.gitignore

@@ -3,4 +3,3 @@ test.db
 coverage
 pkg
 rdoc
-Gemfile.lock

data/CHANGELOG.md

@@ -0,0 +1,44 @@
+# Changelog
+
+## Unreleased
+
+## 2.1.1 - 2022-05-26
+
+### Added
+
+- Support activerecord 6.1.
+
+## 2.1.0 - 2021-12-02
+
+### Added
+
+- Support activerecord 6.0.
+
+### Fixed
+
+- Fix bug that it doesn't guard `#destroy` on activerecord 5.2.
+
+## 2.0.0 - 2021-08-04
+
+### Added
+
+- Support activerecord 5.
+
+### Removed
+
+- Drop support for ruby < 2.0.
+- Drop support for activerecord < 5.
+
+## 1.0.2 - 2017-03-16
+
+## 1.0.1 - 2017-03-09
+
+### Fixed
+
+- Fix files in gemspec.
+
+## 1.0.0 - 2017-03-09
+
+### Added
+
+- Initial release.

data/README.md

@@ -0,0 +1,50 @@
+# guard_against_physical_delete
+
+[![Gem Version](https://badge.fury.io/rb/guard_against_physical_delete.svg)](https://rubygems.org/gems/guard_against_physical_delete)
+
+A monkey patch for ActiveRecord to prevent physical deletion.
+
+## Installation
+
+Add this line to your Rails application's Gemfile:
+
+```ruby
+gem 'guard_against_physical_delete'
+```
+
+And then execute:
+
+```shell
+bundle install
+```
+
+## Usage
+
+If there is a record with a column named `deleted_at`,
+an exception is automatically raised on the methods that are likely to perform physical deletion.
+
+```ruby
+# This will raise `GuardAgainstPhysicalDelete::PhysicalDeleteError`.
+user.delete
+
+# To allow phsycal deletion, do it in `physical_delete { ... }` block.
+user.class.physical_delete do
+  user.delete
+end
+```
+
+### Configuration
+
+If you want to use a column name other than `deleted_at`,
+you can change it as follows:
+
+```ruby
+class User < ApplicationRecord
+  self.logical_delete_column = :removed_at
+end
+```
+
+## License
+
+This gem is available as open source under the terms of the MIT License.
+See [License.txt](/License.txt) for more details.

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+for path in gemfiles/Gemfile_*.rb; do
+  BUNDLE_GEMFILE="${path}" bundle install
+done

data/bin/test

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+for path in gemfiles/Gemfile_*.rb; do
+  BUNDLE_GEMFILE="${path}" bundle exec rspec
+done

data/gemfiles/Gemfile_rails_5.0.rb

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'activerecord', '~> 5.0.0'
+gem 'sqlite3', '~> 1.3.0'

data/gemfiles/Gemfile_rails_5.0.rb.lock

@@ -0,0 +1,75 @@
+PATH
+  remote: ..
+  specs:
+    guard_against_physical_delete (2.1.0)
+      activerecord (>= 5, < 6.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.0.7.2)
+      activesupport (= 5.0.7.2)
+    activerecord (5.0.7.2)
+      activemodel (= 5.0.7.2)
+      activesupport (= 5.0.7.2)
+      arel (~> 7.0)
+    activesupport (5.0.7.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (7.1.4)
+    concurrent-ruby (1.1.9)
+    countdownlatch (1.0.0)
+    database_cleaner (2.0.1)
+      database_cleaner-active_record (~> 2.0.0)
+    database_cleaner-active_record (2.0.1)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
+    diff-lcs (1.4.4)
+    docile (1.4.0)
+    i18n (1.8.11)
+      concurrent-ruby (~> 1.0)
+    minitest (5.14.4)
+    rake (13.0.6)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
+    simplecov (0.21.2)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.3)
+    sqlite3 (1.3.13)
+    thread_safe (0.3.6)
+    tzinfo (1.2.9)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  activerecord (~> 5.0.0)
+  bundler
+  countdownlatch
+  database_cleaner
+  guard_against_physical_delete!
+  rake (~> 13)
+  rspec (~> 3)
+  simplecov
+  sqlite3 (~> 1.3.0)
+
+BUNDLED WITH
+   2.2.29

data/gemfiles/Gemfile_rails_5.1.rb

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'activerecord', '~> 5.1.0'

data/gemfiles/Gemfile_rails_5.1.rb.lock

@@ -0,0 +1,75 @@
+PATH
+  remote: ..
+  specs:
+    guard_against_physical_delete (2.1.0)
+      activerecord (>= 5, < 6.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.1.7)
+      activesupport (= 5.1.7)
+    activerecord (5.1.7)
+      activemodel (= 5.1.7)
+      activesupport (= 5.1.7)
+      arel (~> 8.0)
+    activesupport (5.1.7)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (8.0.0)
+    concurrent-ruby (1.1.9)
+    countdownlatch (1.0.0)
+    database_cleaner (2.0.1)
+      database_cleaner-active_record (~> 2.0.0)
+    database_cleaner-active_record (2.0.1)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
+    diff-lcs (1.4.4)
+    docile (1.4.0)
+    i18n (1.8.11)
+      concurrent-ruby (~> 1.0)
+    minitest (5.14.4)
+    rake (13.0.6)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
+    simplecov (0.21.2)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.3)
+    sqlite3 (1.4.2)
+    thread_safe (0.3.6)
+    tzinfo (1.2.9)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  activerecord (~> 5.1.0)
+  bundler
+  countdownlatch
+  database_cleaner
+  guard_against_physical_delete!
+  rake (~> 13)
+  rspec (~> 3)
+  simplecov
+  sqlite3 (~> 1.4)
+
+BUNDLED WITH
+   2.2.29

data/gemfiles/Gemfile_rails_5.2.rb

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'activerecord', '~> 5.2.0'

data/gemfiles/Gemfile_rails_5.2.rb.lock

@@ -0,0 +1,75 @@
+PATH
+  remote: ..
+  specs:
+    guard_against_physical_delete (2.1.0)
+      activerecord (>= 5, < 6.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.2.6)
+      activesupport (= 5.2.6)
+    activerecord (5.2.6)
+      activemodel (= 5.2.6)
+      activesupport (= 5.2.6)
+      arel (>= 9.0)
+    activesupport (5.2.6)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (9.0.0)
+    concurrent-ruby (1.1.9)
+    countdownlatch (1.0.0)
+    database_cleaner (2.0.1)
+      database_cleaner-active_record (~> 2.0.0)
+    database_cleaner-active_record (2.0.1)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
+    diff-lcs (1.4.4)
+    docile (1.4.0)
+    i18n (1.8.11)
+      concurrent-ruby (~> 1.0)
+    minitest (5.14.4)
+    rake (13.0.6)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
+    simplecov (0.21.2)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.3)
+    sqlite3 (1.4.2)
+    thread_safe (0.3.6)
+    tzinfo (1.2.9)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  activerecord (~> 5.2.0)
+  bundler
+  countdownlatch
+  database_cleaner
+  guard_against_physical_delete!
+  rake (~> 13)
+  rspec (~> 3)
+  simplecov
+  sqlite3 (~> 1.4)
+
+BUNDLED WITH
+   2.2.29

data/gemfiles/Gemfile_rails_6.0.rb

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'activerecord', '~> 6.0.0'

data/gemfiles/Gemfile_rails_6.0.rb.lock

@@ -0,0 +1,75 @@
+PATH
+  remote: ..
+  specs:
+    guard_against_physical_delete (2.1.0)
+      activerecord (>= 5, < 6.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (6.0.4.1)
+      activesupport (= 6.0.4.1)
+    activerecord (6.0.4.1)
+      activemodel (= 6.0.4.1)
+      activesupport (= 6.0.4.1)
+    activesupport (6.0.4.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    concurrent-ruby (1.1.9)
+    countdownlatch (1.0.0)
+    database_cleaner (2.0.1)
+      database_cleaner-active_record (~> 2.0.0)
+    database_cleaner-active_record (2.0.1)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
+    diff-lcs (1.4.4)
+    docile (1.4.0)
+    i18n (1.8.11)
+      concurrent-ruby (~> 1.0)
+    minitest (5.14.4)
+    rake (13.0.6)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
+    simplecov (0.21.2)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.3)
+    sqlite3 (1.4.2)
+    thread_safe (0.3.6)
+    tzinfo (1.2.9)
+      thread_safe (~> 0.1)
+    zeitwerk (2.5.1)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  activerecord (~> 6.0.0)
+  bundler
+  countdownlatch
+  database_cleaner
+  guard_against_physical_delete!
+  rake (~> 13)
+  rspec (~> 3)
+  simplecov
+  sqlite3 (~> 1.4)
+
+BUNDLED WITH
+   2.2.29

data/gemfiles/Gemfile_rails_6.1.rb

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'activerecord', '~> 6.1.0'

data/gemfiles/Gemfile_rails_6.1.rb.lock

@@ -0,0 +1,74 @@
+PATH
+  remote: ..
+  specs:
+    guard_against_physical_delete (2.1.0)
+      activerecord (>= 5, < 6.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activerecord (6.1.4.1)
+      activemodel (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activesupport (6.1.4.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    concurrent-ruby (1.1.9)
+    countdownlatch (1.0.0)
+    database_cleaner (2.0.1)
+      database_cleaner-active_record (~> 2.0.0)
+    database_cleaner-active_record (2.0.1)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
+    diff-lcs (1.4.4)
+    docile (1.4.0)
+    i18n (1.8.11)
+      concurrent-ruby (~> 1.0)
+    minitest (5.14.4)
+    rake (13.0.6)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
+    simplecov (0.21.2)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.3)
+    sqlite3 (1.4.2)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.5.1)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  activerecord (~> 6.1.0)
+  bundler
+  countdownlatch
+  database_cleaner
+  guard_against_physical_delete!
+  rake (~> 13)
+  rspec (~> 3)
+  simplecov
+  sqlite3 (~> 1.4)
+
+BUNDLED WITH
+   2.2.29

data/guard_against_physical_delete.gemspec

@@ -1,28 +1,29 @@
 # -*- encoding: utf-8 -*-
 
+require_relative "lib/guard_against_physical_delete/version"
+
 Gem::Specification.new do |s|
   s.name = "guard_against_physical_delete"
-  s.version = "1.0.2"
+  s.version = GuardAgainstPhysicalDelete::VERSION
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["MORITA shingo"]
   s.date = "2012-03-06"
-  s.description = "Guard against physical delete"
   s.email = "morita@cookpad.com"
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
   s.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^spec/}) }
   s.homepage = "http://github.com/cookpad/guard_against_physical_delete"
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.15"
-  s.summary = "Guard against physical delete"
+  s.summary = "A monkey patch for ActiveRecord to prevent physical deletion."
+
+  s.metadata["changelog_uri"] = "#{s.homepage}/blob/master/CHANGELOG.md"
+  s.metadata["homepage_uri"] = s.homepage
+  s.metadata["source_code_uri"] = s.homepage
 
-  s.add_runtime_dependency "activerecord", ">= 3.0.10"
-  s.add_development_dependency "rake", "< 12.0"
-  s.add_development_dependency "rspec", "< 2.99"
-  s.add_development_dependency "sqlite3"
-  s.add_development_dependency "rdoc", "~> 3.12"
+  s.add_runtime_dependency "activerecord", ">= 5", "< 6.2"
+  s.add_development_dependency "rake", "~> 13"
+  s.add_development_dependency "rspec", "~> 3"
+  s.add_development_dependency "sqlite3", "~> 1.4"
   s.add_development_dependency "bundler"
   s.add_development_dependency "database_cleaner"
   s.add_development_dependency "simplecov"

data/lib/guard_against_physical_delete/base.rb

@@ -36,7 +36,7 @@ module GuardAgainstPhysicalDelete
       private
 
       THREAD_LOCAL_KEY = :__GuardAgainstPhysicalDelete__thread_local_permission__
-      private_constant :THREAD_LOCAL_KEY if RUBY_VERSION >= '1.9.3'
+      private_constant :THREAD_LOCAL_KEY
 
       def physical_delete_permission
         Thread.current[THREAD_LOCAL_KEY] ||= Hash.new { |h,k| h[k] = 0 }
@@ -44,6 +44,16 @@ module GuardAgainstPhysicalDelete
     end
 
     module InstanceMethods
+      if ::ActiveRecord.version >= ::Gem::Version.new('5.2')
+        def _delete_row
+          unless self.class.delete_permitted?
+            raise ::GuardAgainstPhysicalDelete::PhysicalDeleteError, self.class.name
+          end
+
+          super
+        end
+      end
+
       def hard_delete
         self.class.physical_delete { destroy }
       end

data/lib/guard_against_physical_delete/relation.rb

@@ -1,15 +1,16 @@
 module GuardAgainstPhysicalDelete
   module Relation
-    def self.included(obj)
-      obj.class_eval do
-        def delete_all_with_check_permit(conditions = nil)
-          unless @klass.delete_permitted?
-            raise GuardAgainstPhysicalDelete::PhysicalDeleteError, @klass.name
-          end
-          delete_all_without_check_permit(conditions)
+    def self.included(base)
+      base.prepend MethodOverrides
+    end
+
+    module MethodOverrides
+      def delete_all
+        unless klass.delete_permitted?
+          raise GuardAgainstPhysicalDelete::PhysicalDeleteError, klass.name
         end
 
-        alias_method_chain :delete_all, :check_permit
+        super
       end
     end
   end

data/lib/guard_against_physical_delete/support_counter_cache/associations/builder/belongs_to.rb

@@ -5,51 +5,62 @@ module GuardAgainstPhysicalDelete
         module BelongsTo
           def self.included(obj)
             class << obj
+              prepend MethodOverrides
+
               private
-              def add_counter_cache_methods_with_logical_delete(mixin)
-                add_counter_cache_methods_without_logical_delete mixin
-                add_logical_delete_counter_cache_methods(mixin)
-              end
-              alias_method_chain :add_counter_cache_methods, :logical_delete
 
               def add_logical_delete_counter_cache_methods(mixin)
                 mixin.class_eval do
-                  def belongs_to_counter_cache_after_logical_delete(reflection)
-                    cache_column = reflection.counter_cache_column
-                    delete_column = self.logical_delete_column
-                    return unless send("#{delete_column}_changed?")
-                    return unless send("#{delete_column}_was").nil?
-
-                    record = send(reflection.name)
-                    record.class.decrement_counter(cache_column, record.id) unless record.nil?
+                  def adjust_counter_caches_for_logical_deletion(reflection)
+                    if attribute_before_last_save(logical_delete_column).nil? && read_attribute(logical_delete_column)
+                      reflection.klass.decrement_counter(
+                        reflection.counter_cache_column,
+                        attribute_before_last_save(reflection.foreign_key)
+                      )
+                    elsif attribute_before_last_save(logical_delete_column) && read_attribute(logical_delete_column).nil?
+                      reflection.klass.increment_counter(
+                        reflection.counter_cache_column,
+                        attribute_before_last_save(reflection.foreign_key)
+                      )
+                    end
                   end
 
-                  def belongs_to_counter_cache_after_revive(reflection)
-                    cache_column = reflection.counter_cache_column
-                    delete_column = self.logical_delete_column
-                    return unless send("#{delete_column}_changed?")
-                    return if send("#{delete_column}_was").nil?
-                    return unless send(delete_column).nil?
-                    record = send(reflection.name)
-                    record.class.increment_counter(cache_column, record.id) unless record.nil?
+                  # Polyfill for Rails < 5.1, not that it's perfectly compatible.
+                  if ActiveRecord.version < Gem::Version.new('5.1.0')
+                    # @param [#to_s] attr_name
+                    # @return [Object]
+                    def attribute_before_last_save(attr_name)
+                      __send__("#{attr_name}_was")
+                    end
+
+                    # @param [#to_s] attr_name
+                    # @return [Boolean]
+                    def saved_change_to_attribute?(attr_name)
+                      __send__("#{attr_name}_changed?")
+                    end
                   end
                 end
+
                 mixin.redefine_method("belongs_to_counter_cache_after_update_for_#{name}") do
                   # do nothing
                 end if mixin.method_defined?("belongs_to_counter_cache_after_update_for_#{name}")
               end
+            end
+          end
+        end
 
-              def add_counter_cache_callbacks_with_logical_delete(model, reflection)
-                add_counter_cache_callbacks_without_logical_delete model, reflection
+        module MethodOverrides
+          private
 
-                return unless model.logical_delete?
+          def add_counter_cache_callbacks(model, reflection)
+            super(model, reflection)
 
-                model.after_update lambda { |record|
-                  record.belongs_to_counter_cache_after_logical_delete(reflection)
-                  record.belongs_to_counter_cache_after_revive(reflection)
-                }
-              end
-              alias_method_chain :add_counter_cache_callbacks, :logical_delete
+            return unless model.logical_delete?
+
+            add_logical_delete_counter_cache_methods(model)
+
+            model.after_update -> record do
+              record.adjust_counter_caches_for_logical_deletion(reflection)
             end
           end
         end

data/lib/guard_against_physical_delete/support_counter_cache.rb

@@ -1,12 +1 @@
-if ActiveRecord::VERSION::STRING >= "4.1"
-  require 'guard_against_physical_delete/support_counter_cache/associations/builder/belongs_to'
-  ActiveRecord::Associations::Builder::BelongsTo.send(:include, GuardAgainstPhysicalDelete::SupportCounterCache::Associations::Builder::BelongsTo)
-elsif ActiveRecord::VERSION::STRING >= "3.2"
-  require 'guard_against_physical_delete/support_counter_cache/3.2_and_4.0/associations/builder/belongs_to'
-  ActiveRecord::Associations::Builder::BelongsTo.send(:include, GuardAgainstPhysicalDelete::SupportCounterCache::Associations::Builder::BelongsTo)
-elsif ActiveRecord::VERSION::STRING == "3.0.10"
-  require 'guard_against_physical_delete/support_counter_cache/3.0.10/associations'
-  ActiveRecord::Base.send(:include, GuardAgainstPhysicalDelete::SupportCounterCache::Associations)
-else
-  raise "guard_against_physical_delete doesn't support ActiveRecord version #{ActiveRecord::VERSION::STRING}"
-end
+require 'guard_against_physical_delete/support_counter_cache/associations/builder/belongs_to'

data/lib/guard_against_physical_delete/version.rb

@@ -0,0 +1,3 @@
+module GuardAgainstPhysicalDelete
+  VERSION = "2.1.1"
+end

data/lib/guard_against_physical_delete.rb

@@ -2,10 +2,10 @@ require 'active_record'
 require 'guard_against_physical_delete/physical_delete_error'
 require 'guard_against_physical_delete/relation'
 require 'guard_against_physical_delete/base'
+require 'guard_against_physical_delete/support_counter_cache'
 
 ActiveSupport.on_load :active_record do
   ActiveRecord::Base.send(:include, GuardAgainstPhysicalDelete::Base)
   ActiveRecord::Relation.send(:include, GuardAgainstPhysicalDelete::Relation)
-
-  require 'guard_against_physical_delete/support_counter_cache'
+  ActiveRecord::Associations::Builder::BelongsTo.send(:include, GuardAgainstPhysicalDelete::SupportCounterCache::Associations::Builder::BelongsTo)
 end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: guard_against_physical_delete
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.1.1
 platform: ruby
 authors:
 - MORITA shingo
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2012-03-06 00:00:00.000000000 Z
@@ -16,70 +16,62 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.10
+        version: '5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.10
+        version: '5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  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: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -136,32 +128,45 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Guard against physical delete
+description:
 email: morita@cookpad.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.rdoc
+extra_rdoc_files: []
 files:
+- ".github/workflows/master_and_pr.yml"
 - ".gitignore"
-- ".travis.yml"
-- Gemfile
+- CHANGELOG.md
 - License.txt
-- README.rdoc
+- README.md
 - Rakefile
+- bin/setup
+- bin/test
+- gemfiles/Gemfile_rails_5.0.rb
+- gemfiles/Gemfile_rails_5.0.rb.lock
+- gemfiles/Gemfile_rails_5.1.rb
+- gemfiles/Gemfile_rails_5.1.rb.lock
+- gemfiles/Gemfile_rails_5.2.rb
+- gemfiles/Gemfile_rails_5.2.rb.lock
+- gemfiles/Gemfile_rails_6.0.rb
+- gemfiles/Gemfile_rails_6.0.rb.lock
+- gemfiles/Gemfile_rails_6.1.rb
+- gemfiles/Gemfile_rails_6.1.rb.lock
 - guard_against_physical_delete.gemspec
 - lib/guard_against_physical_delete.rb
 - lib/guard_against_physical_delete/base.rb
 - lib/guard_against_physical_delete/physical_delete_error.rb
 - lib/guard_against_physical_delete/relation.rb
 - lib/guard_against_physical_delete/support_counter_cache.rb
-- lib/guard_against_physical_delete/support_counter_cache/3.0.10/associations.rb
-- lib/guard_against_physical_delete/support_counter_cache/3.2_and_4.0/associations/builder/belongs_to.rb
 - lib/guard_against_physical_delete/support_counter_cache/associations/builder/belongs_to.rb
+- lib/guard_against_physical_delete/version.rb
 homepage: http://github.com/cookpad/guard_against_physical_delete
 licenses: []
-metadata: {}
-post_install_message: 
+metadata:
+  changelog_uri: http://github.com/cookpad/guard_against_physical_delete/blob/master/CHANGELOG.md
+  homepage_uri: http://github.com/cookpad/guard_against_physical_delete
+  source_code_uri: http://github.com/cookpad/guard_against_physical_delete
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -176,9 +181,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.2
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
-summary: Guard against physical delete
+summary: A monkey patch for ActiveRecord to prevent physical deletion.
 test_files: []

data/.travis.yml

@@ -1,7 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.4.0
-  - 2.3.3
-  - 2.2.6
-before_install: gem install bundler -v 1.14.6

data/Gemfile

@@ -1,3 +0,0 @@
-source "https://rubygems.org"
-
-gemspec

data/README.rdoc

@@ -1,17 +0,0 @@
-= guard_against_physical_delete
-
-guard_against_physical_delete is monkey patch for ActiveRecord.
-This patch prevent deleting record physically.
-set logical delete column name. (default is :deleted_at)
-  Logical.logical_delete_column = :removed_at
-  Logical.first.delete #=> raise GuardAgainstPhysicalDelete::PhysicalDeleteError
-  Logical.physical_delete { Logical.first.delete } #=> allow physical_delete
-
-== Support
-active_record 3.0.10, >= 3.2
-
-== Copyright
-
-Copyright (c) 2012 morita shingo. See License.txt for
-further details.
-

data/lib/guard_against_physical_delete/support_counter_cache/3.0.10/associations.rb

@@ -1,43 +0,0 @@
-module GuardAgainstPhysicalDelete
-  module SupportCounterCache
-    module Associations
-      def self.included(obj)
-        class << obj
-          def add_counter_cache_callbacks_with_logical_delete(reflection)
-            add_counter_cache_callbacks_without_logical_delete(reflection)
-            return unless logical_delete?
-            add_logical_delete_counter_cache_callback(reflection)
-          end
-          alias_method_chain :add_counter_cache_callbacks, :logical_delete
-
-          def add_logical_delete_counter_cache_callback(reflection)
-            cache_column = reflection.counter_cache_column
-
-            logical_delete_method_name = "belongs_to_counter_cache_before_logical_delete_for_#{reflection.name}".to_sym
-            define_method(logical_delete_method_name) do
-              delete_column = self.logical_delete_column
-              next unless send("#{delete_column}_changed?")
-              next unless send("#{delete_column}_was").nil?
-              association = send(reflection.name)
-              association.class.decrement_counter(cache_column, association.id) unless association.nil?
-            end
-
-            revive_method_name = "belongs_to_counter_cache_before_revive_for_#{reflection.name}".to_sym
-            define_method(revive_method_name) do
-              delete_column = self.logical_delete_column
-              next unless send("#{delete_column}_changed?")
-              next if send("#{delete_column}_was").nil?
-              next unless send(delete_column).nil?
-
-              clear_association_cache
-              association = send(reflection.name)
-              association.class.increment_counter(cache_column, association.id) unless association.nil?
-            end
-
-            before_update(logical_delete_method_name, revive_method_name)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/guard_against_physical_delete/support_counter_cache/3.2_and_4.0/associations/builder/belongs_to.rb

@@ -1,50 +0,0 @@
-module GuardAgainstPhysicalDelete
-  module SupportCounterCache
-    module Associations
-      module Builder
-        module BelongsTo
-          def self.included(obj)
-            obj.class_eval do
-              def add_counter_cache_callbacks_with_logical_delete(reflection)
-                add_counter_cache_callbacks_without_logical_delete(reflection)
-                return unless model.logical_delete?
-                add_logical_delete_counter_cache_callback(reflection)
-              end
-              alias_method_chain :add_counter_cache_callbacks, :logical_delete
-
-              def add_logical_delete_counter_cache_callback(reflection)
-                cache_column = reflection.counter_cache_column
-                name = self.name
-
-                logical_delete_method_name = "belongs_to_counter_cache_after_logical_delete_for_#{name}".to_sym
-                mixin.redefine_method(logical_delete_method_name) do
-                  delete_column = self.logical_delete_column
-                  next unless send("#{delete_column}_changed?")
-                  next unless send("#{delete_column}_was").nil?
-                  record = send(name)
-                  record.class.decrement_counter(cache_column, record.id) unless record.nil?
-                end
-
-                mixin.redefine_method("belongs_to_counter_cache_after_update_for_#{name}") do
-                  # do nothing
-                end if mixin.method_defined?("belongs_to_counter_cache_after_update_for_#{name}")
-
-                revive_method_name = "belongs_to_counter_cache_after_revive_for_#{name}".to_sym
-
-                mixin.redefine_method(revive_method_name) do
-                  delete_column = self.logical_delete_column
-                  next unless send("#{delete_column}_changed?")
-                  next if send("#{delete_column}_was").nil?
-                  next unless send(delete_column).nil?
-                  record = send(name)
-                  record.class.increment_counter(cache_column, record.id) unless record.nil?
-                end
-                model.after_update(logical_delete_method_name, revive_method_name)
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end