bulk_dependency_eraser 1.4.0 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c8e832cdb51105145cc3a1ba8487d32dab71b32d5a9f25808c84026d3f82b25
-  data.tar.gz: 556c96e6eb0a2b98aca3afbaf03ce8aad41012b793a7a45bccd4f2f459e1aaa5
+  metadata.gz: 734c542b83d1cf827cadf8a8a41c30d8a86ebe7f98e539e0bdce4777f917c2e9
+  data.tar.gz: fedb350237abe9898c2d54077db57c1c500b76c99c6913431c2445f5fd49293a
 SHA512:
-  metadata.gz: 8b23c1429318d5c56850d7fa615956f083929751b58a72a2e584d2470feff430b4c374691cd2e436beb5890619c7d1c533d64a1fa9cd1b6aa3df7776f6c73387
-  data.tar.gz: 06e3bebaf98dd80af62ca714a3c8edd92548873ac84b88569d344cad64709444464197c1e2ec7febc7c74a5c981e234677b5accfb29e4936ca1a1ec06acb44d1
+  metadata.gz: 5b69927dd186b6eac307ff85a5bd06783245c5173a6d890ff29a8abb42edbf8df105a3ed592cf3ae92f649c4547f32c289316b83ae7f02d19233a05d9a2a5d47
+  data.tar.gz: 9a4febdbdd779faf17bc332b8853c41bb727e722fea564ed45a8b871ee53f8e4677983c2459a4894a4304c90397a48fa927d41609e4558033ee24c43badbc4b7

data/lib/bulk_dependency_eraser/base.rb

@@ -1,12 +1,22 @@
 module BulkDependencyEraser
   class Base
+    # Default Custom Scope for all classes, no effect.
+    DEFAULT_SCOPE_WRAPPER = ->(query) { nil }
+    # Default Custom Scope for mapped-by-name classes, no effect.
+    DEFAULT_KLASS_MAPPED_SCOPE_WRAPPER = ->(query) { query }
+
     DEFAULT_OPTS = {
       # Applied to all queries. Useful for taking advantage of specific indexes
+      # - not indexed by klass name. Proc would handle the logic for that.
+      # - 3rd, and lowest, priority of scopes
+      # - accepts rails query as parameter
+      # - return nil if no applicable scope.
+      proc_scopes: self::DEFAULT_SCOPE_WRAPPER,
+      # Applied to all queries. Useful for taking advantage of specific indexes
+      # - 2nd highest priority of scopes
       proc_scopes_per_class_name: {},
     }.freeze
 
-    # Default Custom Scope for all classes, no effect.
-    DEFAULT_SCOPE_WRAPPER = ->(query) { query }
 
     # Default Database wrapper, no effect.
     DEFAULT_DB_WRAPPER = ->(block) { block.call }
@@ -27,12 +37,19 @@ module BulkDependencyEraser
 
     protected
 
-    def custom_scope_for_klass_name(klass_name)
-      if opts_c.proc_scopes_per_class_name.key?(klass_name)
-        opts_c.proc_scopes_per_class_name[klass_name]
+    def custom_scope_for_query(query)
+      klass = query.klass
+      if opts_c.proc_scopes_per_class_name.key?(klass.name)
+        opts_c.proc_scopes_per_class_name[klass.name].call(query)
       else
-        # No custom wrapper, return non-effect default
-        DEFAULT_SCOPE_WRAPPER
+        # See if non-class-mapped proc returns a value
+        non_class_name_mapped_query = opts_c.proc_scopes.call(query)
+        if !non_class_name_mapped_query.nil?
+          return non_class_name_mapped_query
+        else
+          # No custom wrapper, return non-effect default
+          return self.class::DEFAULT_KLASS_MAPPED_SCOPE_WRAPPER.call(query)
+        end
       end
     end
 

data/lib/bulk_dependency_eraser/builder.rb

@@ -21,8 +21,16 @@ module BulkDependencyEraser
       # A specific read batching disable option
       disable_read_batching: nil,
       # Applied to all queries. Useful for taking advantage of specific indexes
+      # - not indexed by klass name. Proc would handle the logic for that.
+      # - 3rd, and lowest, priority of scopes
+      # - accepts rails query as parameter
+      # - return nil if no applicable scope.
+      proc_scopes: self::DEFAULT_SCOPE_WRAPPER,
+      # Applied to all queries. Useful for taking advantage of specific indexes
+      # - 2nd highest priority of scopes
       proc_scopes_per_class_name: {},
-      # Applied to deletion queries
+      # Applied to reading queries
+      # - 1st priority of scopes
       reading_proc_scopes_per_class_name: {},
     }.freeze
 
@@ -155,11 +163,12 @@ module BulkDependencyEraser
     attr_reader :table_names_to_parsed_klass_names
     attr_reader :ignore_table_name_and_dependencies, :ignore_klass_name_and_dependencies
 
-    def custom_scope_for_klass_name(klass_name)
-      if opts_c.reading_proc_scopes_per_class_name.key?(klass_name)
-        opts_c.reading_proc_scopes_per_class_name[klass_name]
+    def custom_scope_for_query(query)
+      klass = query.klass
+      if opts_c.reading_proc_scopes_per_class_name.key?(klass.name)
+        opts_c.reading_proc_scopes_per_class_name[klass.name].call(query)
       else
-        super(klass_name)
+        super(query)
       end
     end
 
@@ -167,7 +176,7 @@ module BulkDependencyEraser
       # ordering shouldn't matter in these queries, and would slow it down
       # - we're ignoring default_scope ordering, but assoc-defined ordering would still take effect
       query = query.reorder('')
-      query = custom_scope_for_klass_name(query.klass.name).call(query)
+      query = custom_scope_for_query(query)
 
       query_ids = []
       read_from_db do
@@ -631,7 +640,7 @@ module BulkDependencyEraser
         return
       end
 
-      query = custom_scope_for_klass_name(query.klass.name).call(query)
+      query = custom_scope_for_query(query)
 
       foreign_ids_by_type = read_from_db do
         if batching_disabled? || !query.where({}).limit_value.nil?

data/lib/bulk_dependency_eraser/deleter.rb

@@ -13,8 +13,16 @@ module BulkDependencyEraser
       # A specific batching size for this class, overrides the batch_size
       disable_delete_batching: nil,
       # Applied to all queries. Useful for taking advantage of specific indexes
+      # - not indexed by klass name. Proc would handle the logic for that.
+      # - 3rd, and lowest, priority of scopes
+      # - accepts rails query as parameter
+      # - return nil if no applicable scope.
+      proc_scopes: self::DEFAULT_SCOPE_WRAPPER,
+      # Applied to all queries. Useful for taking advantage of specific indexes
+      # - 2nd highest priority of scopes
       proc_scopes_per_class_name: {},
       # Applied to deletion queries
+      # - 1st priority of scopes
       deletion_proc_scopes_per_class_name: {},
     }.freeze
 
@@ -69,11 +77,12 @@ module BulkDependencyEraser
 
     attr_reader :class_names_and_ids
 
-    def custom_scope_for_klass_name(klass_name)
-      if opts_c.deletion_proc_scopes_per_class_name.key?(klass_name)
-        opts_c.deletion_proc_scopes_per_class_name[klass_name]
+    def custom_scope_for_query(query)
+      klass = query.klass
+      if opts_c.deletion_proc_scopes_per_class_name.key?(klass.name)
+        opts_c.deletion_proc_scopes_per_class_name[klass.name].call(query)
       else
-        super(klass_name)
+        super(query)
       end
     end
 
@@ -88,7 +97,7 @@ module BulkDependencyEraser
     def delete_by_klass_and_ids klass, ids
       puts "Deleting #{klass.name}'s IDs: #{ids}" if opts_c.verbose
       query = klass.unscoped
-      query = custom_scope_for_klass_name(klass.name).call(query)
+      query = custom_scope_for_query(query)
 
       if batching_disabled?
         puts "Deleting without batching" if opts_c.verbose

data/lib/bulk_dependency_eraser/nullifier.rb

@@ -15,8 +15,16 @@ module BulkDependencyEraser
       # A specific batching size for this class, overrides the batch_size
       disable_nullify_batching: nil,
       # Applied to all queries. Useful for taking advantage of specific indexes
+      # - not indexed by klass name. Proc would handle the logic for that.
+      # - 3rd, and lowest, priority of scopes
+      # - accepts rails query as parameter
+      # - return nil if no applicable scope.
+      proc_scopes: self::DEFAULT_SCOPE_WRAPPER,
+      # Applied to all queries. Useful for taking advantage of specific indexes
+      # - 2nd highest priority of scopes
       proc_scopes_per_class_name: {},
-      # Applied to deletion queries
+      # Applied to nullification queries
+      # - 1st priority of scopes
       nullification_proc_scopes_per_class_name: {},
     }.freeze
 
@@ -127,11 +135,12 @@ module BulkDependencyEraser
 
     attr_reader :class_names_columns_and_ids
 
-    def custom_scope_for_klass_name(klass_name)
-      if opts_c.nullification_proc_scopes_per_class_name.key?(klass_name)
-        opts_c.nullification_proc_scopes_per_class_name[klass_name]
+    def custom_scope_for_query(query)
+      klass = query.klass
+      if opts_c.nullification_proc_scopes_per_class_name.key?(klass.name)
+        opts_c.nullification_proc_scopes_per_class_name[klass.name].call(query)
       else
-        super(klass_name)
+        super(query)
       end
     end
 
@@ -145,7 +154,7 @@ module BulkDependencyEraser
 
     def nullify_by_klass_column_and_ids klass, columns, ids
       query = klass.unscoped
-      query = custom_scope_for_klass_name(klass.name).call(query)
+      query = custom_scope_for_query(query)
 
       nullify_columns = {}
       # supporting nullification of groups of columns simultaneously

data/lib/bulk_dependency_eraser/version.rb

@@ -1,3 +1,3 @@
 module BulkDependencyEraser
-  VERSION = "1.4.0".freeze
+  VERSION = "1.4.2".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bulk_dependency_eraser
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.2
 platform: ruby
 authors:
 - benjamin.dana.software.dev@gmail.com