RubyGems - delete_recursively - Versions diffs - 0.9.4 → 1.0.0 - Mend

delete_recursively 0.9.4 → 1.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60b6a4cc1cae62c705d0af8656a789f8839d5356
-  data.tar.gz: 408e3ff5f591eae523ca8d4b891e96f507323164
+  metadata.gz: bc815c840d3f1514a41c2254278aa84205aa1b29
+  data.tar.gz: 144a4055f89143dbd6e3744839fa7fe4897c6300
 SHA512:
-  metadata.gz: fb4fe70e5eb85725fc696521c15d154250606a73f3104016995534c9b3610a2b6a387de67a695f73c8bbf9fd3cc9157d6572b7e576111ab1a02db00e54b79bae
-  data.tar.gz: 307924de1047c286cca034584b348954d4b90b8a4261a0fbb2e7ba6ef0dc841e8ef748750e42d66b81b565e6ad32e93ebc1830ffb750cff24daac1f6310661f2
+  metadata.gz: 91b7bc103274442ad9e424e4058b9bd7b66e460f98146ef0110e63bb6764e3f1b43fa0668ee7b017a5a3072840ca880e235f1f48324353ac2aecd7f5be440c7c
+  data.tar.gz: b07cbf652da91fcc0fe961affb61edef238097456c5fcc63cba249474b977e9631e62d93f9e5bc0e80637b798a01eb894d799f2520880ef7a61f6dd12bd1348d

data/lib/delete_recursively.rb CHANGED Viewed

@@ -1,84 +1,134 @@
-#
-# DeleteRecursively
-#
-# Adds a new dependent: option to ActiveRecord associations.
-#
-module DeleteRecursively
-  NEW_DEPENDENT_OPTION = :delete_recursively
-  # override ::valid_dependent_options to make the new
-  # dependent option available to Association::Builder classes
-  module OptionPermission
-    def valid_dependent_options
-      super + [NEW_DEPENDENT_OPTION]
-    end
-  end
-  # override Association#handle_dependency to apply the new option if it is set
-  module DependencyHandling
-    def handle_dependency
-      return super unless DeleteRecursively.enabled_for?(self)
-      if reflection.belongs_to?
-        # can't use ::dependent_ids, owner is already destroyed at this point
-        ids = load_target ? target.id : []
-      else
-        ids = DeleteRecursively.dependent_ids(owner.class, owner.id, reflection)
-      end
-      DeleteRecursively.delete_recursively(reflection, ids)
-    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)
-    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 self.enabled_for?(reflection)
-    reflection.options[:dependent] == NEW_DEPENDENT_OPTION
-  end
-  def self.destructive?(reflection)
-    [:destroy, :destroy_all].include?(reflection.options[:dependent])
-  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
-    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)
-    end
-    record_class.where(applicable_criteria).delete_all
-    record_class.reflect_on_all_associations.each do |reflection|
-      all(reflection.klass, criteria) if recurse_on?(reflection)
-    end
-  end
-end
-require 'active_record'
-%w(BelongsTo HasMany HasOne).each do |assoc_name|
-  assoc_builder = ActiveRecord::Associations::Builder.const_get(assoc_name)
-  assoc_builder.singleton_class.prepend(DeleteRecursively::OptionPermission)
-  assoc_class = ActiveRecord::Associations.const_get("#{assoc_name}Association")
-  assoc_class.prepend(DeleteRecursively::DependencyHandling)
-end
+#
+# 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
+  # dependent option available to Association::Builder classes
+  module OptionPermission
+    def valid_dependent_options
+      super + [NEW_DEPENDENT_OPTION]
+    end
+  end
+  # override Association#handle_dependency to apply the new option if it is set
+  module DependencyHandling
+    def handle_dependency
+      return super unless DeleteRecursively.enabled_for?(self)
+      if reflection.belongs_to?
+        # can't use ::dependent_ids, owner is already destroyed at this point
+        ids = load_target ? target.id : []
+      else
+        ids = DeleteRecursively.dependent_ids(owner.class, owner.id, reflection)
+      end
+      DeleteRecursively.delete_recursively(reflection, ids)
+    end
+  end
+  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|
+          dependent_ids = dependent_ids(record_class, record_ids, sub_reflection)
+          delete_recursively(sub_reflection, dependent_ids)
+        end
+      end
+      destroy_or_delete(reflection, record_class, record_ids)
+    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 recurse_on?(reflection)
+      enabled_for?(reflection) || destructive?(reflection)
+    end
+    def enabled_for?(reflection)
+      reflection.options[:dependent] == NEW_DEPENDENT_OPTION
+    end
+    def destructive?(reflection)
+      [:destroy, :destroy_all].include?(reflection.options[:dependent])
+    end
+    def deleting?(reflection)
+      [: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
+    def inverse_through_reflection(reflection)
+      through_class = reflection.through_reflection.klass
+      reflection.klass.reflect_on_all_associations
+        .map(&:through_reflection)
+        .find { |tr| tr && tr.klass == through_class }
+    end
+    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|
+  assoc_builder = ActiveRecord::Associations::Builder.const_get(assoc_name)
+  assoc_builder.singleton_class.prepend(DeleteRecursively::OptionPermission)
+  assoc_class = ActiveRecord::Associations.const_get("#{assoc_name}Association")
+  assoc_class.prepend(DeleteRecursively::DependencyHandling)
+end

metadata CHANGED Viewed

@@ -1,71 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: delete_recursively
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Janosch Müller
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-07-05 00:00:00.000000000 Z
+date: 2017-05-15 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: '5.0'
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.14
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 6.0.0
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.0'
 - !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: '5.0'
+        version: 6.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: '5.0'
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '11.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '11.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -136,9 +162,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.6.11
 signing_key:
 specification_version: 4
 summary: Delete ActiveRecords efficiently
 test_files: []
-has_rdoc: