bulk_dependency_eraser 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5258d3b15269fb6bd51a5f89f949983a3cf48862cc83f26a8f189bbc11e2ae84
-  data.tar.gz: dbab67950500c1037266232592915a3c27f0b54102619092be465ded4a53024d
+  metadata.gz: 734c542b83d1cf827cadf8a8a41c30d8a86ebe7f98e539e0bdce4777f917c2e9
+  data.tar.gz: fedb350237abe9898c2d54077db57c1c500b76c99c6913431c2445f5fd49293a
 SHA512:
-  metadata.gz: 351634d20e814264885ddd4746e2fbaa7a8d27c4ab78fda5d3690e21697de51d1fd51c75d2b749e6f9a4727f79e6fa43d571617364df1e44870a55aeb0e88166
-  data.tar.gz: e8e477e1d5139bd4ac38cb3d4e4371b06688b5dc5e000d8a6a6077cc300ec998916cdd754c00d87ea1efd0b0a179479c60491450467cfc8eefbb6b0bda391690
+  metadata.gz: 5b69927dd186b6eac307ff85a5bd06783245c5173a6d890ff29a8abb42edbf8df105a3ed592cf3ae92f649c4547f32c289316b83ae7f02d19233a05d9a2a5d47
+  data.tar.gz: 9a4febdbdd779faf17bc332b8853c41bb727e722fea564ed45a8b871ee53f8e4677983c2459a4894a4304c90397a48fa927d41609e4558033ee24c43badbc4b7

data/lib/bulk_dependency_eraser/base.rb

@@ -37,17 +37,18 @@ module BulkDependencyEraser
 
     protected
 
-    def custom_scope_for_klass_name(klass)
+    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]
+        opts_c.proc_scopes_per_class_name[klass.name].call(query)
       else
         # See if non-class-mapped proc returns a value
-        non_class_name_mapped_query = opts_c.proc_scopes.call(klass.where({})) # convert klass to query
+        non_class_name_mapped_query = opts_c.proc_scopes.call(query)
         if !non_class_name_mapped_query.nil?
-          return opts_c.proc_scopes
+          return non_class_name_mapped_query
         else
           # No custom wrapper, return non-effect default
-          return self.class::DEFAULT_KLASS_MAPPED_SCOPE_WRAPPER
+          return self.class::DEFAULT_KLASS_MAPPED_SCOPE_WRAPPER.call(query)
         end
       end
     end

data/lib/bulk_dependency_eraser/builder.rb

@@ -163,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)
+    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]
+        opts_c.reading_proc_scopes_per_class_name[klass.name].call(query)
       else
-        super(klass)
+        super(query)
       end
     end
 
@@ -175,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).call(query)
+      query = custom_scope_for_query(query)
 
       query_ids = []
       read_from_db do
@@ -639,7 +640,7 @@ module BulkDependencyEraser
         return
       end
 
-      query = custom_scope_for_klass_name(query.klass).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

@@ -77,11 +77,12 @@ module BulkDependencyEraser
 
     attr_reader :class_names_and_ids
 
-    def custom_scope_for_klass_name(klass)
+    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]
+        opts_c.deletion_proc_scopes_per_class_name[klass.name].call(query)
       else
-        super(klass)
+        super(query)
       end
     end
 
@@ -96,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).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

@@ -135,11 +135,12 @@ module BulkDependencyEraser
 
     attr_reader :class_names_columns_and_ids
 
-    def custom_scope_for_klass_name(klass)
+    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]
+        opts_c.nullification_proc_scopes_per_class_name[klass.name].call(query)
       else
-        super(klass)
+        super(query)
       end
     end
 
@@ -153,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).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.1".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.1
+  version: 1.4.2
 platform: ruby
 authors:
 - benjamin.dana.software.dev@gmail.com