delete_recursively 0.9.3 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 87a42e8c61f945033a7d70c5be9b5d08e1002f47
-  data.tar.gz: 72ce8ee5ddbd3812f4613508f2025e843b1b37ca
+SHA256:
+  metadata.gz: 8dd51a14780db543c8f623dcc7d65a1c64a0711c43e9f903b2dd2c1003290145
+  data.tar.gz: ccaac450fe4293eb267bc0570cc055b097bf78d7f179349a351798578c828e57
 SHA512:
-  metadata.gz: 9834aae07555564f02a5e4b3f971404f56503652185c3f5c1e33a5931ca3622c973ad20d0291232fe4d58794dd5a19e8526ad035121ad2a92e9fb03c653472a2
-  data.tar.gz: 9fa49fa62dbabe053bcb983840f7b2f514adaf53aa33145f8459f0c155583150a49ad8a8b6605245b16e31e51cf9a92abe5d66f87b3cddf91ea9da118dac97cf
+  metadata.gz: 604ba86881bd30346afa016ff584e1f94b8fa100ea5157e58750e3ff4fce9eb29ba24202b2c84ea1e3bcb0ddcfcac4abf0c5f60f093c6359bc121a952442dc87
+  data.tar.gz: 61307162f1cf6f673371d04c32d75b6c920a653254c6d54d3e6806abfc059336a17437b2bd523acd8669de0a9e77506275bb341cd88ce8e84221ee1486832f68

data/lib/delete_recursively/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module DeleteRecursively
+  VERSION = '1.0.2'
+end

data/lib/delete_recursively.rb

@@ -1,9 +1,13 @@
+# frozen_string_literal: true
+
 #
 # DeleteRecursively
 #
 # Adds a new dependent: option to ActiveRecord associations.
 #
 module DeleteRecursively
+  require_relative File.join('delete_recursively', 'version')
+
   NEW_DEPENDENT_OPTION = :delete_recursively
 
   # override ::valid_dependent_options to make the new
@@ -28,54 +32,103 @@ module DeleteRecursively
     end
   end
 
-  def self.delete_recursively(reflection, record_ids)
-    record_class = reflection.klass
-    record_class.reflect_on_all_associations.each do |sub_reflection|
-      next unless recurse_on?(sub_reflection)
-      dependent_ids = dependent_ids(record_class, record_ids, sub_reflection)
-      delete_recursively(sub_reflection, dependent_ids)
+  class << self
+    def delete_recursively(reflection, record_ids)
+      record_class = reflection.klass
+      if recurse_on?(reflection)
+        record_class.reflect_on_all_associations.each do |sub_reflection|
+          sub_ref_ids = dependent_ids(record_class, record_ids, sub_reflection)
+          delete_recursively(sub_reflection, sub_ref_ids)
+        end
+      end
+      destroy_or_delete(reflection, record_class, record_ids)
     end
-    record_class.delete(record_ids) if enabled_for?(reflection)
-    record_class.destroy(record_ids) if destructive?(reflection)
-  end
 
-  def self.recurse_on?(reflection)
-    enabled_for?(reflection) || destructive?(reflection)
-  end
+    def destroy_or_delete(reflection, record_class, record_ids)
+      if destructive?(reflection)
+        record_class.destroy(record_ids)
+      elsif enabled_for?(reflection) || deleting?(reflection)
+        record_class.delete(record_ids)
+      end
+    end
 
-  def self.enabled_for?(reflection)
-    reflection.options[:dependent] == NEW_DEPENDENT_OPTION
-  end
+    def recurse_on?(reflection)
+      enabled_for?(reflection) || destructive?(reflection)
+    end
 
-  def self.destructive?(reflection)
-    [:destroy, :destroy_all].include?(reflection.options[:dependent])
-  end
+    def enabled_for?(reflection)
+      reflection.options[:dependent] == NEW_DEPENDENT_OPTION
+    end
 
-  def self.dependent_ids(owner_class, owner_ids, reflection)
-    if reflection.belongs_to?
-      owners_arel = owner_class.where(owner_class.primary_key => owner_ids)
-      owners_arel.pluck(reflection.association_foreign_key).compact
-    else
-      custom_foreign_key = reflection.options[:foreign_key]
-      foreign_key = custom_foreign_key || owner_class.to_s.foreign_key
-      reflection.klass.where(foreign_key => owner_ids).ids
+    def destructive?(reflection)
+      %i[destroy destroy_all].include?(reflection.options[:dependent])
+    end
+
+    def deleting?(reflection)
+      %i[delete delete_all].include?(reflection.options[:dependent])
+    end
+
+    def dependent_ids(owner_class, owner_ids, reflection)
+      if reflection.belongs_to?
+        owners_arel = owner_class.where(owner_class.primary_key => owner_ids)
+        owners_arel.pluck(reflection.association_foreign_key).compact
+      elsif reflection.through_reflection
+        dependent_ids_with_through_option(owner_class, owner_ids, reflection)
+      else
+        owner_foreign_key = foreign_key(owner_class, reflection)
+        reflection.klass.where(owner_foreign_key => owner_ids).ids
+      end
+    end
+
+    def dependent_ids_with_through_option(owner_class, owner_ids, reflection)
+      through_reflection = reflection.through_reflection
+      owner_foreign_key = foreign_key(owner_class, through_reflection)
+
+      dependent_class = reflection.klass
+      dependent_through_reflection = inverse_through_reflection(reflection)
+      dependent_foreign_key =
+        foreign_key(dependent_class, dependent_through_reflection)
+
+      through_reflection.klass
+                        .where(owner_foreign_key => owner_ids)
+                        .pluck(dependent_foreign_key)
     end
-  end
 
-  def self.all(record_class, criteria = {})
-    applicable_criteria = criteria.select do |column_name, _value|
-      record_class.column_names.include?(column_name.to_s)
+    def inverse_through_reflection(reflection)
+      through_class = reflection.through_reflection.klass
+      reflection.klass.reflect_on_all_associations
+                .map(&:through_reflection)
+                .find { |thr_ref| thr_ref && thr_ref.klass == through_class }
     end
-    record_class.delete_all(applicable_criteria)
-    record_class.reflect_on_all_associations.each do |reflection|
-      all(reflection.klass, criteria) if recurse_on?(reflection)
+
+    def foreign_key(owner_class, reflection)
+      custom_foreign_key = reflection && reflection.options[:foreign_key]
+      custom_foreign_key || owner_class.to_s.foreign_key
+    end
+
+    def all(record_class, criteria = {})
+      record_class.reflect_on_all_associations.each do |reflection|
+        if recurse_on?(reflection)
+          all(reflection.klass, criteria)
+        elsif deleting?(reflection)
+          delete_with_applicable_criteria(reflection.klass, criteria)
+        end
+      end
+      delete_with_applicable_criteria(record_class, criteria)
+    end
+
+    def delete_with_applicable_criteria(record_class, criteria)
+      applicable_criteria = criteria.select do |column_name, _value|
+        record_class.column_names.include?(column_name.to_s)
+      end
+      record_class.where(applicable_criteria).delete_all
     end
   end
 end
 
 require 'active_record'
 
-%w(BelongsTo HasMany HasOne).each do |assoc_name|
+%w[BelongsTo HasMany HasOne].each do |assoc_name|
   assoc_builder = ActiveRecord::Associations::Builder.const_get(assoc_name)
   assoc_builder.singleton_class.prepend(DeleteRecursively::OptionPermission)
 

metadata

@@ -1,113 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: delete_recursively
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 1.0.2
 platform: ruby
 authors:
 - Janosch Müller
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-13 00:00:00.000000000 Z
+date: 2021-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.14
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 8.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 4.1.14
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 8.0.0
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: codecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.14
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 8.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.14
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 8.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 description: Adds a new :dependent option for ActiveRecord associations that recursively
   deletes all dependent records without instantiating them.
 email: janosch84@gmail.com
@@ -116,11 +142,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/delete_recursively.rb
-homepage: https://github.com/janosch-x/delete_recursively
+- lib/delete_recursively/version.rb
+homepage: https://github.com/jaynetics/delete_recursively
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -135,10 +162,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Delete ActiveRecords efficiently
 test_files: []
-has_rdoc: