paranoia 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d26c70fbc8ac814d391639ac9d6be0596c9036dd
-  data.tar.gz: f3f88512d6c9d139577a5d7fa0038e35059b6bd9
+  metadata.gz: aab51c0ba1c7cc66a301e165f34ba63c47428180
+  data.tar.gz: 3afafc557c633dbc11e230f919c0a6f4366b5d0e
 SHA512:
-  metadata.gz: d4bef2e4aae5e399170d62330a53303155f6e7bcb9959844dd46bdca68d0658678174c3f38abca8e0e921db4e874891c7a6f335b7d5c31af98269350d61c4a1d
-  data.tar.gz: dc6c29b32942c270a997e266197be9c3d1a6e4d7208e6c9afb08261d258fee955ed72828495cc957129e785f5c32c82c5180ecd018fc651225ed650d5a216a2a
+  metadata.gz: 0e427b3d1e96e08551b0f20350dcd0f5e3739b124c8c6aba82c124055f743620bc170849525e67da16e791272ab484730a734199c358f3adac3b7ec6de0a6626
+  data.tar.gz: bf2c134c11990eb5766911fb6aba323fb2b35320bbc6dcdb700c45df60cc1fdea89827f3ee35fc4d120a6ef8a877792fe5b5f7ecc72852727792c4f5c493612e

data/.travis.yml

@@ -2,25 +2,22 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.2.6
-  - 2.3.3
+  - 2.2.7
+  - 2.3.4
   - 2.4.1
   - jruby-9.1.6.0
 
 env:
   matrix:
-    - RAILS='~> 4.2.7.1'
-    - RAILS='~> 5.0.0.1'
-    - RAILS='~> 5.1.0.rc1'
+    - RAILS='~> 4.2.0'
+    - RAILS='~> 5.0.0'
+    - RAILS='~> 5.1.0'
 
 matrix:
-  exclude:
-    - env: RAILS='~> 5.1.0.rc1'
-      rvm: 2.2.6
   allow_failures:
-    - env: RAILS='~> 4.2.7.1'
+    - env: RAILS='~> 4.2.0'
       rvm: jruby-9.1.6.0
-    - env: RAILS='~> 5.0.0.1'
+    - env: RAILS='~> 5.0.0'
       rvm: jruby-9.1.6.0
-    - env: RAILS='~> 5.1.0.rc1'
+    - env: RAILS='~> 5.1.0'
       rvm: jruby-9.1.6.0

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # paranoia Changelog
 
+## 2.4.0
+
+* [#423](https://github.com/rubysherpas/paranoia/pull/423) Add `paranoia_destroy` and `paranoia_delete` aliases
+
+  [John Hawthorn (@jhawthorn)](https://github.com/jhawthorn)
+
+* [#408](https://github.com/rubysherpas/paranoia/pull/408) Fix instance variable `@_disable_counter_cache` not initialized warning.
+
+  [Akira Matsuda (@amatsuda)](https://github.com/amatsuda)
+
+* [#412](https://github.com/rubysherpas/paranoia/pull/412) Fix `really_destroy!` behavior with `sentinel_value`
+
+  [Steve Rice (@steverice)](https://github.com/steverice)
+
 ## 2.3.1
 
 * [#397](https://github.com/rubysherpas/paranoia/pull/397) Bump active record max version to support 5.1 final

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gem 'sqlite3', platforms: [:ruby]
 
 platforms :jruby do
-  gem 'activerecord-jdbcsqlite3-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'rails-5'
+  gem 'activerecord-jdbcsqlite3-adapter'
 end
 
 platforms :rbx do
@@ -12,7 +12,7 @@ platforms :rbx do
   gem 'rubinius-developer_tools'
 end
 
-rails = ENV['RAILS'] || '~> 4.2.0'
+rails = ENV['RAILS'] || '~> 5.1.0'
 
 gem 'rails', rails
 

data/lib/paranoia.rb

@@ -14,7 +14,6 @@ module Paranoia
 
   def self.included(klazz)
     klazz.extend Query
-    klazz.extend Callbacks
   end
 
   module Query
@@ -53,31 +52,11 @@ module Paranoia
     end
   end
 
-  module Callbacks
-    def self.extended(klazz)
-      [:restore, :real_destroy].each do |callback_name|
-        klazz.define_callbacks callback_name
-
-        klazz.define_singleton_method("before_#{callback_name}") do |*args, &block|
-          set_callback(callback_name, :before, *args, &block)
-        end
-
-        klazz.define_singleton_method("around_#{callback_name}") do |*args, &block|
-          set_callback(callback_name, :around, *args, &block)
-        end
-
-        klazz.define_singleton_method("after_#{callback_name}") do |*args, &block|
-          set_callback(callback_name, :after, *args, &block)
-        end
-      end
-    end
-  end
-
-  def destroy
+  def paranoia_destroy
     transaction do
       run_callbacks(:destroy) do
         @_disable_counter_cache = deleted?
-        result = delete
+        result = paranoia_delete
         next result unless result && ActiveRecord::VERSION::STRING >= '4.2'
         each_counter_cached_associations do |association|
           foreign_key = association.reflection.foreign_key.to_sym
@@ -90,8 +69,14 @@ module Paranoia
       end
     end
   end
+  alias_method :destroy, :paranoia_destroy
 
-  def delete
+  def paranoia_destroy!
+    paranoia_destroy ||
+      raise(ActiveRecord::RecordNotDestroyed.new("Failed to destroy the record", self))
+  end
+
+  def paranoia_delete
     raise ActiveRecord::ReadOnlyRecord, "#{self.class} is marked as readonly" if readonly?
     if persisted?
       # if a transaction exists, add the record so that after_commit
@@ -103,6 +88,7 @@ module Paranoia
     end
     self
   end
+  alias_method :delete, :paranoia_delete
 
   def restore!(opts = {})
     self.class.transaction do
@@ -112,7 +98,7 @@ module Paranoia
         # This only happened on Rails versions earlier than 4.1.
         noop_if_frozen = ActiveRecord.version < Gem::Version.new("4.1")
         if within_recovery_window?(recovery_window_range) && ((noop_if_frozen && !@attributes.frozen?) || !noop_if_frozen)
-          @_disable_counter_cache = !deleted?
+          @_disable_counter_cache = !paranoia_destroyed?
           write_attribute paranoia_column, paranoia_sentinel_value
           update_columns(paranoia_restore_attributes)
           each_counter_cached_associations do |association|
@@ -149,7 +135,7 @@ module Paranoia
   def really_destroy!
     transaction do
       run_callbacks(:real_destroy) do
-        @_disable_counter_cache = deleted?
+        @_disable_counter_cache = paranoia_destroyed?
         dependent_reflections = self.class.reflections.select do |name, reflection|
           reflection.options[:dependent] == :destroy
         end
@@ -165,7 +151,7 @@ module Paranoia
             association_data.really_destroy!
           end
         end
-        write_attribute(paranoia_column, current_time_from_proper_timezone)
+        update_columns(paranoia_destroy_attributes)
         destroy_without_paranoia
       end
     end
@@ -174,7 +160,7 @@ module Paranoia
   private
 
   def each_counter_cached_associations
-    !@_disable_counter_cache && defined?(super) ? super : []
+    !(defined?(@_disable_counter_cache) && @_disable_counter_cache) ? super : []
   end
 
   def paranoia_restore_attributes
@@ -241,6 +227,8 @@ end
 ActiveSupport.on_load(:active_record) do
   class ActiveRecord::Base
     def self.acts_as_paranoid(options={})
+      define_model_callbacks :restore, :real_destroy
+
       alias_method :really_destroyed?, :destroyed?
       alias_method :really_delete, :delete
       alias_method :destroy_without_paranoia, :destroy
@@ -317,7 +305,7 @@ module ActiveRecord
     class AssociationNotSoftDestroyedValidator < ActiveModel::EachValidator
       def validate_each(record, attribute, value)
         # if association is soft destroyed, add an error
-        if value.present? && value.deleted?
+        if value.present? && value.paranoia_destroyed?
           record.errors[attribute] << 'has been soft-deleted'
         end
       end

data/lib/paranoia/version.rb

@@ -1,3 +1,3 @@
 module Paranoia
-  VERSION = '2.3.1'.freeze
+  VERSION = '2.4.0'.freeze
 end

data/test/paranoia_test.rb

@@ -5,6 +5,10 @@ require 'paranoia'
 
 test_framework = defined?(MiniTest::Test) ? MiniTest::Test : MiniTest::Unit::TestCase
 
+if ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks=)
+  ActiveRecord::Base.raise_in_transactional_callbacks = true
+end
+
 def connect!
   ActiveRecord::Base.establish_connection :adapter => 'sqlite3', database: ':memory:'
 end
@@ -546,6 +550,14 @@ class ParanoiaTest < test_framework
     assert model.instance_variable_get(:@real_destroy_callback_called)
   end
 
+  def test_really_destroy_behavior_for_active_column_model
+    model = ActiveColumnModel.new
+    model.save
+    model.really_destroy!
+
+    refute ParanoidModel.unscoped.exists?(model.id)
+  end
+
   def test_really_delete
     model = ParanoidModel.new
     model.save

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paranoia
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - radarlistener@gmail.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2017-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord