paranoia 2.4.2 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5558705162917407085514b9cc59f7be24f1a9aa8dfdc1d58588e4a7beb975e
-  data.tar.gz: b6e3bf484414fd2daa322bdf9fa5479d05815d3a14a312217854578ea5f19c8e
+  metadata.gz: f6122d4c46b302086def8b0beb87e3ca9c06ae7a834d117d7bb7a8b0fce11f80
+  data.tar.gz: 598b56a3af2868e8cbc8cb50f124b6d9d347dc2ca3af4a78012c01b9a6a281c0
 SHA512:
-  metadata.gz: 50af9f20d148fca67815e2786fd70d6d539fb0c0ae7013abdc3dfb5707b9c1993a56ad02032f1cdd983a8d90088950b564cba9f81a6295169d61fe35d9a574fc
-  data.tar.gz: 6f46d6a812faf1efa4e8c654289a88fdd089ddbc899a12e5432161e0460bb29fe2f0d5d5611b4b5bf69f67f41fa802af53195017d8591e7727d871078e9c8dce
+  metadata.gz: 7145f8fcc1e3a7810e96c772d92c8bc6624a30c4e3715ee85e3f34599585c3e2483c4f534790bf5031ff7f46f8c12b70d653182059f9896b5890d0e8c898a339
+  data.tar.gz: 1537f8613522860bf7f4e571026b1b3fff29f936433d8d0e841780a92173c8749e86a1f5a30800907568d0394b0d618af00ea9f555d45c15841e751ba6906fd5

data/.github/workflows/build.yml

@@ -0,0 +1,61 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: build
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - 3.1
+          - '3.0'
+          - 2.7
+          - 2.6
+          - 2.5
+          # - jruby-9.2.19.0
+          # - jruby-9.3.1.0
+        rails:
+          - '~> 5.1.0'
+          - '~> 5.2.0'
+          - '~> 6.0.0'
+          - '~> 6.1.0'
+          - '~> 7.0.0'
+          - 'edge'
+        exclude:
+        # Rails edge is now 7.x and requires ruby 2.7
+        - rails: 'edge'
+          ruby: 2.6
+        - rails: 'edge'
+          ruby: 2.5
+        - rails: '~> 7.0.0'
+          ruby: 2.6
+        - rails: '~> 7.0.0'
+          ruby: 2.5
+        # Legacy Rails with newer rubies
+        - rails: '~> 5.1.0'
+          ruby: '3.0'
+        - rails: '~> 5.2.0'
+          ruby: '3.0'
+        - rails: '~> 5.1.0'
+          ruby: 3.1
+        - rails: '~> 5.2.0'
+          ruby: 3.1
+
+    env:
+      RAILS: ${{ matrix.rails }}
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - run: bundle exec rake

data/CHANGELOG.md

@@ -1,5 +1,44 @@
 # paranoia Changelog
 
+## 2.5.2
+
+* [#526](https://github.com/rubysherpas/paranoia/pull/526) Do not include tests files in packaged gem
+
+  [Jason Fleetwood-Boldt](https://github.com/jasonfb)
+* [#492](https://github.com/rubysherpas/paranoia/pull/492) Warn if acts_as_paranoid is called more than once on the same model
+
+  [Ignatius Reza](https://github.com/ignatiusreza)
+
+## 2.5.1
+
+* [#481](https://github.com/rubysherpas/paranoia/pull/481) Replaces hard coded `deleted_at` with `paranoia_column`.
+
+  [Hassanin Ahmed](https://github.com/sas1ni69)
+
+## 2.5.0
+
+ * [#516](https://github.com/rubysherpas/paranoia/pull/516) Add support for ActiveRecord 7.0, drop support for EOL Ruby < 2.5 and Rails < 5.1
+    adding support for Rails 7
+    
+   [Mathieu Jobin](https://github.com/mathieujobin)
+ * [#515](https://github.com/rubysherpas/paranoia/pull/515) Switch from Travis CI to GitHub Actions
+
+   [Shinichi Maeshima](https://github.com/willnet)
+
+## 2.4.3
+
+* [#503](https://github.com/rubysherpas/paranoia/pull/503) Bump activerecord dependency for Rails 6.1
+
+  [Jörg Schiller](https://github.com/joergschiller)
+
+* [#483](https://github.com/rubysherpas/paranoia/pull/483) Update JRuby version to 9.2.8.0 + remove EOL Ruby 2.2 
+
+  [Uwe Kubosch](https://github.com/donv)
+
+* [#482](https://github.com/rubysherpas/paranoia/pull/482) Fix after_commit for Rails 6
+
+  [Ashwin Hegde](https://github.com/hashwin)
+
 ## 2.4.2
 
 * [#470](https://github.com/rubysherpas/paranoia/pull/470) Add support for ActiveRecord 6.0

data/Gemfile

@@ -12,15 +12,17 @@ platforms :jruby do
   gem 'activerecord-jdbcsqlite3-adapter'
 end
 
-platforms :rbx do
-  gem 'rubinius-developer_tools'
-  gem 'rubysl', '~> 2.0'
-  gem 'rubysl-test-unit'
+if RUBY_ENGINE == 'rbx'
+  platforms :rbx do
+    gem 'rubinius-developer_tools'
+    gem 'rubysl', '~> 2.0'
+    gem 'rubysl-test-unit'
+  end
 end
 
 rails = ENV['RAILS'] || '~> 5.2.0'
 
-if rails == 'master'
+if rails == 'edge'
   gem 'rails', github: 'rails/rails'
 else
   gem 'rails', rails

data/README.md

@@ -1,3 +1,6 @@
+[![Gem Version](https://badge.fury.io/rb/paranoia.svg)](https://badge.fury.io/rb/paranoia)
+[![build](https://github.com/rubysherpas/paranoia/actions/workflows/build.yml/badge.svg)](https://github.com/rubysherpas/paranoia/actions/workflows/build.yml)
+
 **Notice:** 
 
 `paranoia` has some surprising behaviour (like overriding ActiveRecord's `delete` and `destroy`) and is not recommended for new projects. See [`discard`'s README](https://github.com/jhawthorn/discard#why-not-paranoia-or-acts_as_paranoid) for more details.

data/lib/paranoia/rspec.rb

@@ -1,23 +1,26 @@
-require 'rspec/expectations'
+if Rails.env.test?
+  require 'rspec/expectations'
 
-# Validate the subject's class did call "acts_as_paranoid"
-RSpec::Matchers.define :act_as_paranoid do
-  match { |subject| subject.class.ancestors.include?(Paranoia) }
+  # Validate the subject's class did call "acts_as_paranoid"
+  RSpec::Matchers.define :act_as_paranoid do
+    match { |subject| subject.class.ancestors.include?(Paranoia) }
 
-  failure_message_proc = lambda do
-    "expected #{subject.class} to use `acts_as_paranoid`"
-  end
+    failure_message_proc = lambda do
+      "expected #{subject.class} to use `acts_as_paranoid`"
+    end
 
-  failure_message_when_negated_proc = lambda do
-    "expected #{subject.class} not to use `acts_as_paranoid`"
-  end
+    failure_message_when_negated_proc = lambda do
+      "expected #{subject.class} not to use `acts_as_paranoid`"
+    end
 
-  if respond_to?(:failure_message_when_negated)
-    failure_message(&failure_message_proc)
-    failure_message_when_negated(&failure_message_when_negated_proc)
-  else
-    # RSpec 2 compatibility:
-    failure_message_for_should(&failure_message_proc)
-    failure_message_for_should_not(&failure_message_when_negated_proc)
+    if respond_to?(:failure_message_when_negated)
+      failure_message(&failure_message_proc)
+      failure_message_when_negated(&failure_message_when_negated_proc)
+    else
+      # RSpec 2 compatibility:
+      failure_message_for_should(&failure_message_proc)
+      failure_message_for_should_not(&failure_message_when_negated_proc)
+    end
   end
-end
+
+end

data/lib/paranoia/version.rb

@@ -1,3 +1,3 @@
 module Paranoia
-  VERSION = '2.4.2'.freeze
+  VERSION = '2.5.2'.freeze
 end

data/lib/paranoia.rb

@@ -69,6 +69,7 @@ module Paranoia
           next unless send(association.reflection.name)
           association.decrement_counters
         end
+        @_trigger_destroy_callback = true
         @_disable_counter_cache = false
         result
       end
@@ -81,6 +82,10 @@ module Paranoia
       raise(ActiveRecord::RecordNotDestroyed.new("Failed to destroy the record", self))
   end
 
+  def trigger_transactional_callbacks?
+    super || @_trigger_destroy_callback && paranoia_destroyed?
+  end
+
   def paranoia_delete
     raise ActiveRecord::ReadOnlyRecord, "#{self.class} is marked as readonly" if readonly?
     if persisted?
@@ -124,16 +129,16 @@ module Paranoia
   def get_recovery_window_range(opts)
     return opts[:recovery_window_range] if opts[:recovery_window_range]
     return unless opts[:recovery_window]
-    (deleted_at - opts[:recovery_window]..deleted_at + opts[:recovery_window])
+    (deletion_time - opts[:recovery_window]..deletion_time + opts[:recovery_window])
   end
 
   def within_recovery_window?(recovery_window_range)
     return true unless recovery_window_range
-    recovery_window_range.cover?(deleted_at)
+    recovery_window_range.cover?(deletion_time)
   end
 
   def paranoia_destroyed?
-    send(paranoia_column) != paranoia_sentinel_value
+    deletion_time != paranoia_sentinel_value
   end
   alias :deleted? :paranoia_destroyed?
 
@@ -225,13 +230,24 @@ module Paranoia
       end
     end
 
-    clear_association_cache if destroyed_associations.present?
+    if ActiveRecord.version.to_s > '7'
+      # Method deleted in https://github.com/rails/rails/commit/dd5886d00a2d5f31ccf504c391aad93deb014eb8
+      @association_cache.clear if persisted? && destroyed_associations.present?
+    else
+      clear_association_cache if destroyed_associations.present?
+    end
   end
 end
 
 ActiveSupport.on_load(:active_record) do
   class ActiveRecord::Base
     def self.acts_as_paranoid(options={})
+      if included_modules.include?(Paranoia)
+        puts "[WARN] #{self.name} is calling acts_as_paranoid more than once!"
+
+        return
+      end
+
       define_model_callbacks :restore, :real_destroy
 
       alias_method :really_destroyed?, :destroyed?
@@ -283,6 +299,10 @@ ActiveSupport.on_load(:active_record) do
     def paranoia_sentinel_value
       self.class.paranoia_sentinel_value
     end
+
+    def deletion_time
+      send(paranoia_column)
+    end
   end
 end
 
@@ -311,7 +331,7 @@ module ActiveRecord
       def validate_each(record, attribute, value)
         # if association is soft destroyed, add an error
         if value.present? && value.paranoia_destroyed?
-          record.errors[attribute] << 'has been soft-deleted'
+          record.errors.add(attribute, 'has been soft-deleted')
         end
       end
     end

data/paranoia.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.license     = 'MIT'
   s.summary     = "Paranoia is a re-implementation of acts_as_paranoid for Rails 3, 4, and 5, using much, much, much less code."
   s.description = <<-DSC
-    Paranoia is a re-implementation of acts_as_paranoid for Rails 3, 4, and 5,
+    Paranoia is a re-implementation of acts_as_paranoid for Rails 4, 5, 6, and 7,
     using much, much, much less code. You would use either plugin / gem if you
     wished that when you called destroy on an Active Record object that it
     didn't actually destroy it, but just "hid" the record. Paranoia does this
@@ -22,14 +22,19 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = ">= 1.3.6"
 
-  s.required_ruby_version = '>= 2.0'
+  s.required_ruby_version = '>= 2.5'
 
-  s.add_dependency 'activerecord', '>= 4.0', '< 6.1'
+  s.add_dependency 'activerecord', '>= 5.1', '< 7.1'
 
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "rake"
 
-  s.files        = `git ls-files`.split("\n")
+
+  s.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)})  }
+    files
+  end
+
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
   s.require_path = 'lib'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paranoia
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.5.2
 platform: ruby
 authors:
 - radarlistener@gmail.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-26 00:00:00.000000000 Z
+date: 2022-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: |2
-      Paranoia is a re-implementation of acts_as_paranoid for Rails 3, 4, and 5,
+      Paranoia is a re-implementation of acts_as_paranoid for Rails 4, 5, 6, and 7,
       using much, much, much less code. You would use either plugin / gem if you
       wished that when you called destroy on an Active Record object that it
       didn't actually destroy it, but just "hid" the record. Paranoia does this
@@ -73,8 +73,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/build.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
@@ -87,7 +87,6 @@ files:
 - lib/paranoia/rspec.rb
 - lib/paranoia/version.rb
 - paranoia.gemspec
-- test/paranoia_test.rb
 homepage: https://github.com/rubysherpas/paranoia
 licenses:
 - MIT
@@ -100,14 +99,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Paranoia is a re-implementation of acts_as_paranoid for Rails 3, 4, and 5,

data/.travis.yml

@@ -1,39 +0,0 @@
-sudo: false
-language: ruby
-before_install: gem update --system
-cache: bundler
-rvm:
-  - 2.2
-  - 2.3.8
-  - 2.4.5
-  - 2.5.3
-  - 2.6.3
-  - jruby-9.1.6.0
-
-env:
-  matrix:
-    - RAILS='~> 4.2.0' SQLITE_VERSION='~> 1.3.6'
-    - RAILS='~> 5.0.0' SQLITE_VERSION='~> 1.3.6'
-    - RAILS='~> 5.1.0'
-    - RAILS='~> 5.2.0'
-    - RAILS='master'
-
-matrix:
-  allow_failures:
-    - env: RAILS='~> 4.2.0' SQLITE_VERSION='~> 1.3.6'
-      rvm: jruby-9.1.6.0
-    - env: RAILS='~> 5.0.0' SQLITE_VERSION='~> 1.3.6'
-      rvm: jruby-9.1.6.0
-    - env: RAILS='~> 5.1.0'
-      rvm: jruby-9.1.6.0
-    - env: RAILS='~> 5.2.0'
-      rvm: jruby-9.1.6.0
-    - env: RAILS='master'
-      rvm: jruby-9.1.6.0
-  exclude:
-    - rvm: 2.2
-      env: RAILS='master'
-    - rvm: 2.3.8
-      env: RAILS='master'
-    - rvm: 2.4.5
-      env: RAILS='master'