guard_against_physical_delete 1.0.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 02c2548cfaa8943a5e4a5daf8346e8eb9adb291b
-  data.tar.gz: bd9b86a8934b5f991ed03ca4b3fa32afcc2e5d3d
+SHA256:
+  metadata.gz: 45d992be15cebf1a69af7a5309431c76d75419b685270406b603358fd927768b
+  data.tar.gz: dcf4e518665fd15fdc6bcc69de2a8221359c2ffa87505e2ad3655f8c2c93de47
 SHA512:
-  metadata.gz: cc3c00bbdfa6c8c31be45d8ca7ee59f69d01cf5dda46c1931f2d3bd0301ab9e25c757281ccfe064c5d8e5882955433d723e690543388ef4ba8d566bd696cfa9b
-  data.tar.gz: 8831b00d3ac1a863ef5e0f411322cca1ea2b0a46f44b3a2010849ff699811342c893ba433adcfef4660a48b38d1ead177d21cfc4e39d61b1aa0e43a4632db004
+  metadata.gz: 4fbec342b295649e9b26c8ec65d0a03816c4486a79ab47a2416df21b81ea25579fb3fe28a2836f845b38f535806d56fe00c242ef68927404aebbc0a653a94e1e
+  data.tar.gz: 24a22455eecaf42ac697f4e6e53b7d5398153b8327855439c26a9b7f079c086224af9a766e756a246f9ff45fbe711a38091e722d59fd708f727d77954f086a31

data/.travis.yml

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

data/README.rdoc

@@ -8,7 +8,7 @@ set logical delete column name. (default is :deleted_at)
   Logical.physical_delete { Logical.first.delete } #=> allow physical_delete
 
 == Support
-active_record 3.0.10, >= 3.2
+active_record >= 5.0.0, < 6.0.0
 
 == Copyright
 

data/guard_against_physical_delete.gemspec

@@ -1,8 +1,10 @@
 # -*- 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"]
@@ -18,11 +20,10 @@ Gem::Specification.new do |s|
   s.rubygems_version = "1.8.15"
   s.summary = "Guard against physical delete"
 
-  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"
+  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.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

data/lib/guard_against_physical_delete/base.rb

@@ -12,6 +12,7 @@ module GuardAgainstPhysicalDelete
         set_logical_delete_column :deleted_at
       end
       obj.send(:include, InstanceMethods)
+      obj.prepend MethodOverrides if ActiveRecord.version >= Gem::Version.new('5.2.0') # #delete no longer calls Relation#delete_all
     end
 
     module ClassMethods
@@ -36,7 +37,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 }
@@ -53,5 +54,15 @@ module GuardAgainstPhysicalDelete
         self.save!
       end
     end
+
+    module MethodOverrides
+      def delete
+        unless self.class.delete_permitted?
+          raise GuardAgainstPhysicalDelete::PhysicalDeleteError, self.class.name
+        end
+
+        super
+      end
+    end
   end
 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.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/support_counter_cache/associations/builder/belongs_to.rb

@@ -5,20 +5,17 @@ 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?
+                    return unless saved_change_to_logical_delete_column?(delete_column)
+                    return unless logical_delete_column_before_last_save(delete_column).nil?
 
                     record = send(reflection.name)
                     record.class.decrement_counter(cache_column, record.id) unless record.nil?
@@ -27,29 +24,56 @@ module GuardAgainstPhysicalDelete
                   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 saved_change_to_logical_delete_column?(delete_column)
+                    return if logical_delete_column_before_last_save(delete_column).nil?
                     return unless send(delete_column).nil?
                     record = send(reflection.name)
                     record.class.increment_counter(cache_column, record.id) unless record.nil?
                   end
+
+                  if ActiveRecord.version < Gem::Version.new('5.1.0')
+                    def saved_change_to_logical_delete_column?(delete_column)
+                      __send__("#{delete_column}_changed?")
+                    end
+
+                    def logical_delete_column_before_last_save(delete_column)
+                      __send__("#{delete_column}_was")
+                    end
+                  else
+                    def saved_change_to_logical_delete_column?(delete_column)
+                      __send__("saved_change_to_#{delete_column}?")
+                    end
+
+                    def logical_delete_column_before_last_save(delete_column)
+                      __send__("#{delete_column}_before_last_save")
+                    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_methods(mixin)
+            super(mixin)
+            add_logical_delete_counter_cache_methods(mixin)
+          end
 
-                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
+          def add_counter_cache_callbacks(model, reflection)
+            super(model, reflection)
+
+            return unless model.logical_delete?
+
+            model.after_update -> record do
+              record.belongs_to_counter_cache_after_logical_delete(reflection)
+              record.belongs_to_counter_cache_after_revive(reflection)
             end
           end
         end

data/lib/guard_against_physical_delete/version.rb

@@ -0,0 +1,3 @@
+module GuardAgainstPhysicalDelete
+  VERSION = "2.0.0"
+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.0.0
 platform: ruby
 authors:
 - MORITA shingo
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2012-03-06 00:00:00.000000000 Z
@@ -14,72 +14,58 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.10
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.10
+        version: '5'
 - !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
@@ -155,13 +141,12 @@ files:
 - 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: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -176,9 +161,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.1.4
+signing_key:
 specification_version: 4
 summary: Guard against physical delete
 test_files: []

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