paranoia 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 722efe26008fec67396f31b78997d981323a85ded9232369e36b06f9c6a2c254
-  data.tar.gz: 4262aeee60d6beb99958ffe43032f47cab4b9ce556663daf7c6d9b34c9a17d7e
+  metadata.gz: 3e8c766fdb37e4a9137f722b1ed77a34e7776d97c0f8a5e25f448e36c77fc332
+  data.tar.gz: 96087a09f51c030e0ae8c2262f0114b465aa7986231ce0ccc6458abe16b3d248
 SHA512:
-  metadata.gz: 1e39832dc8d08052777e4c750a6481d4eb2280823561d2adfc6844426b7a23caf79eeb97fc9d98931da5f30142af0b241f6e3cc920ff82362bd5a605abc1b1f3
-  data.tar.gz: 684e92dc3ff1a24cd965ae4d03ef43b22e6ccc3c6a8cf73b41062d50d98568b1393ddfcc54a3f9e5630f65eba474b87ab202e03c9ca3613f82b470e434c5d12c
+  metadata.gz: 3d5e2a067a77de1222ba94ebf07a6f62afc22fe4c700bbf6f5a56dbe45f0de4bde673574b0441986a2db917f8c2b592542f33cf559ba227fd6c0208dfaff9af6
+  data.tar.gz: 8374654630dea1028fa7b64eee00ff6abbc7ab0cbdce6b77c1fdcf34eac9aaf7df23d96f3aaa6915bf0c222169d8eccf6ec6024a0705195d43865326ece554bb

data/.github/workflows/build.yml

@@ -16,7 +16,8 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          # - 3.0 # incompatible with rubysl
+          - 3.1
+          - '3.0'
           - 2.7
           - 2.6
           - 2.5
@@ -41,9 +42,13 @@ jobs:
           ruby: 2.5
         # Legacy Rails with newer rubies
         - rails: '~> 5.1.0'
-          ruby: 3.0
+          ruby: '3.0'
         - rails: '~> 5.2.0'
-          ruby: 3.0
+          ruby: '3.0'
+        - rails: '~> 5.1.0'
+          ruby: 3.1
+        - rails: '~> 5.2.0'
+          ruby: 3.1
 
     env:
       RAILS: ${{ matrix.rails }}

data/CHANGELOG.md

@@ -1,5 +1,27 @@
 # paranoia Changelog
 
+## 2.5.2
+
+* [#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

data/Gemfile

@@ -12,10 +12,12 @@ 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'

data/README.md

@@ -1,4 +1,5 @@
 [![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:** 
 

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.5.0'.freeze
+  VERSION = '2.5.1'.freeze
 end

data/lib/paranoia.rb

@@ -129,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?
 
@@ -242,6 +242,12 @@ 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?
@@ -293,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
 

data/paranoia.gemspec

@@ -29,7 +29,12 @@ Gem::Specification.new do |s|
   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.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - radarlistener@gmail.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-18 00:00:00.000000000 Z
+date: 2022-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -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
@@ -107,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.2.11
+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,