miscellany 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c92b625438d9027f73a5cd7b5f4ef168e1ed3e083b0c13924cb9f3f0e2db6bd
-  data.tar.gz: 0a52d0877c7eea6a0c2189efdd4c30cb65a3419abf149a8ae0ce4e63467741de
+  metadata.gz: 6e57424c3b049c0f32faf8cf0a7e0f7f85145de07dc8ac09e61b2c2c3b8dd926
+  data.tar.gz: 52c108a746be070473df4bc9c4bad66daf216809e72dea58a628b2c94d14923d
 SHA512:
-  metadata.gz: 9cbc439200d8a6c1604aa0153cbed6cfeead8636eb7330880371d2e8c6d2d412739e8a2d302c5dfd1cd9b038bec9f6de663f8fc7ddfd1fb1d8c99afe029e0306
-  data.tar.gz: d4bea4b5fd11c1830a8f18302c7f6c95d6f4c3fc147faf715f675850e7dee4e02d08632b05aa3e61ce4277de494a9784e6dc3ef55c8e92f99a0a22ba9a9d4fbc
+  metadata.gz: e9d8ddae9f677caa1c1c689a85abefaa64beb46cac97e9005be62c68b709ebe02bfb26791344bb58ab13cf6a557024d12bd8cbe667e88097c466cacf5148b31e
+  data.tar.gz: a8fe4f104a46d80c2af4fb0421716d34359fb0fabf35cb362b4ed33e284ee20a09054ec12fa14340127cadbf57c21e2982f6ed89459de54b7bf576eca395b501

data/lib/miscellany/active_record/batched_destruction.rb

@@ -32,7 +32,7 @@ module Miscellany
       def bulk_destroy_internal(items, **kwargs)
         options = {}
         options.merge!(kwargs)
-        ClassCallbackExector.run_callbacks(model_class, :bulk_destroy, options: options) do
+        ClassCallbackExector.run_callbacks(model_class, :bulk_destroy, { options: options }) do
           if items.respond_to?(:find_in_batches)
             items.find_in_batches do |batch|
               _destroy_batch(batch, options)
@@ -47,6 +47,7 @@ module Miscellany
         ClassCallbackExector.run_callbacks(model_class, :destroy_batch, {
           model_class: model_class,
           batch: batch,
+          options: options,
         }) do
           model_class.destroy_bulk_batch(batch, options)
         end
@@ -84,7 +85,6 @@ module Miscellany
             env[k]
           end
         end
-        @options = options
       end
 
       def self.run_callbacks(cls, callback, env={}, &blk)

data/lib/miscellany/active_record/computed_columns.rb

@@ -35,14 +35,15 @@ module Miscellany
           comp = model.get_defined_computed(k)
           raise "Undefined ComputedColum :#{k}" if comp.nil?
 
-          builder = ComputedBuilder.new(k, v, &comp)
+          builder = ComputedBuilder.new(all, k, v, &comp)
           builder.apply(query)
         end
       end
     end
 
     class ComputedBuilder
-      def initialize(key, args, &blk)
+      def initialize(relation, key, args, &blk)
+        @relation = relation
         @key = key
         @args = args.is_a?(Array) ? args : [args]
         @block = blk
@@ -55,7 +56,7 @@ module Miscellany
           raise "Must provide either a value or a block" if arg == :not_given && !blk
 
           if arg == :not_given
-            arg = blk.call
+            arg = @relation.instance_eval(&blk)
           end
 
           @compiled[m] = arg

data/lib/miscellany/version.rb

@@ -1,3 +1,3 @@
 module Miscellany
-  VERSION = "0.1.5".freeze
+  VERSION = "0.1.7".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miscellany
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Ethan Knapp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-06 00:00:00.000000000 Z
+date: 2023-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails