bulk_dependency_eraser 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16b8469147c79e15bbd947d75f9b9e7aa243f219be6796f516967a4f134609bd
-  data.tar.gz: a7a45c24562a67a1762d120caa9b4a14ab211594245383be4b21a70fa9f5a5e0
+  metadata.gz: 10daaabe21acb05d187dcf4c76fae13bd3e3b3aee727be9c6ebd0a315d581b54
+  data.tar.gz: d07c7a1303090c9e9291c19c8b6ec9974f2e9feee050e5962f63522ffd23c623
 SHA512:
-  metadata.gz: 8ea34f3b1963b7c8d7720292a47edffb1351f18b6ecb6822e2965fe96244700044d9dcba8124cc088033d3114da0775b0a3be0c4636424af11c101e5e90fb686
-  data.tar.gz: fe4901ea4c7f99ef0e5228b94280f76b6102ef9686c2a8a6fa5fcb4da768fc0303e1da2929a1672bfea77ebcb0e42c9692c7774df21bf891d4e8054979d2c3ea
+  metadata.gz: 2152f55aab950c36636bce7e67507ef6a5a27ee7b553a60727796550dc7e2bb489e1bc364beb47e8bce4adf1e0a778b5d5d7011631a77c8734035f85d77f1ded
+  data.tar.gz: 5889cd52acbcde3642db18e60f5958c189e4ecfc8066b635b33f5dfe5eb55810141244828be8043b1c19b403e773fde73dac302de6eabcf9147008e8f6191d85

data/lib/bulk_dependency_eraser/base.rb

@@ -128,17 +128,17 @@ module BulkDependencyEraser
     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
-        # 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
+        result = opts_c.proc_scopes_per_class_name[klass.name].call(query)
+        return result unless result.nil?
       end
+
+      if opts_c.proc_scopes
+        result = opts_c.proc_scopes.call(query)
+        return result unless result.nil?
+      end
+
+      # Could just return query, but don't wnat to break backwards compatiblity
+      return self.class::DEFAULT_KLASS_MAPPED_SCOPE_WRAPPER.call(query)
     end
 
     # Create options container

data/lib/bulk_dependency_eraser/builder.rb

@@ -42,13 +42,16 @@ module BulkDependencyEraser
       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
+      # - 4th, 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
+      # - 3rd highest priority of scopes
       proc_scopes_per_class_name: {},
+      # Applied to all queries. Useful for taking advantage of specific indexes
+      # - 2nd highest priority of scopes
+      reading_proc_scopes: self::DEFAULT_SCOPE_WRAPPER,
       # Applied to reading queries
       # - 1st priority of scopes
       reading_proc_scopes_per_class_name: {},
@@ -146,11 +149,18 @@ module BulkDependencyEraser
 
     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(query)
+        result = opts_c.reading_proc_scopes_per_class_name[klass.name].call(query)
+        return result unless result.nil?
+      end
+
+      if opts_c.reading_proc_scopes
+        result = opts_c.reading_proc_scopes.call(query)
+        return result unless result.nil?
       end
+
+      super(query)
     end
 
     # @param [ActiveRecord::Relation] query

data/lib/bulk_dependency_eraser/deleter.rb

@@ -41,13 +41,16 @@ module BulkDependencyEraser
       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
+      # - 4th, 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
+      # - 3rd highest priority of scopes
       proc_scopes_per_class_name: {},
+      # Applied to all queries. Useful for taking advantage of specific indexes
+      # - 2nd highest priority of scopes
+      deletion_proc_scopes: self::DEFAULT_SCOPE_WRAPPER,
       # Applied to deletion queries
       # - 1st priority of scopes
       deletion_proc_scopes_per_class_name: {},
@@ -103,11 +106,18 @@ module BulkDependencyEraser
 
     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(query)
+        result = opts_c.deletion_proc_scopes_per_class_name[klass.name].call(query)
+        return result unless result.nil?
+      end
+
+      if opts_c.deletion_proc_scopes
+        result = opts_c.deletion_proc_scopes.call(query)
+        return result unless result.nil?
       end
+
+      return super(query)
     end
 
     def batch_size

data/lib/bulk_dependency_eraser/nullifier.rb

@@ -43,13 +43,16 @@ module BulkDependencyEraser
       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
+      # - 4th, 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
+      # - 3rd highest priority of scopes
       proc_scopes_per_class_name: {},
+      # Applied to all queries. Useful for taking advantage of specific indexes
+      # - 2nd highest priority of scopes
+      nullification_proc_scopes: self::DEFAULT_SCOPE_WRAPPER,
       # Applied to nullification queries
       # - 1st priority of scopes
       nullification_proc_scopes_per_class_name: {},
@@ -164,11 +167,18 @@ module BulkDependencyEraser
 
     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(query)
+        result = opts_c.nullification_proc_scopes_per_class_name[klass.name].call(query)
+        return result unless result.nil?
+      end
+
+      if opts_c.nullification_proc_scopes
+        result = opts_c.nullification_proc_scopes.call(query)
+        return result unless result.nil?
       end
+
+      return super(query)
     end
 
     def batch_size

data/lib/bulk_dependency_eraser/version.rb

@@ -1,3 +1,3 @@
 module BulkDependencyEraser
-  VERSION = "4.1.0".freeze
+  VERSION = "4.2.0".freeze
 end

metadata

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