miscellany 0.1.4 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70a91bb987b7c99319cbe607cdfba6c32e9637a5a3fb8bec3ec38725339ea3c6
-  data.tar.gz: f9607f408e91b1abadb51e73c4238b1a1d9f378fe294461efe11f3172783d9e2
+  metadata.gz: 6e57424c3b049c0f32faf8cf0a7e0f7f85145de07dc8ac09e61b2c2c3b8dd926
+  data.tar.gz: 52c108a746be070473df4bc9c4bad66daf216809e72dea58a628b2c94d14923d
 SHA512:
-  metadata.gz: f8c1ba0f079635d38ed0d3a29d3cb865899fb66112593625a2ae159061c5fd48f63cfa2300a825f671bdbd04e4e2317d6ccedd80702391bdadd7329c0a2deae9
-  data.tar.gz: a73fd773078016b440b08243c4c6dc5477ff26cdbacb054f57d8b99b77c15305af7a1741d0c94b02399c3b59af7553254a23be5441d1d30948f4f51cb53b6ccf
+  metadata.gz: e9d8ddae9f677caa1c1c689a85abefaa64beb46cac97e9005be62c68b709ebe02bfb26791344bb58ab13cf6a557024d12bd8cbe667e88097c466cacf5148b31e
+  data.tar.gz: a8fe4f104a46d80c2af4fb0421716d34359fb0fabf35cb362b4ed33e284ee20a09054ec12fa14340127cadbf57c21e2982f6ed89459de54b7bf576eca395b501

data/lib/miscellany/active_record/batched_destruction.rb

@@ -16,7 +16,6 @@ module Miscellany
 
     class_methods do
       def bulk_destroy(**kwargs)
-        return to_sql
         bulk_destroy_internal(self, **kwargs)
       end
 
@@ -33,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)
@@ -48,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
@@ -85,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/batch_processor.rb

@@ -8,12 +8,15 @@ module Miscellany
   #   enumerator_of_some_kind.each { |item| batches << item }
   #   batches.flush
   class BatchProcessor
-    attr_reader :batch_size
+    attr_reader :batch_size, :ensure_once
 
-    def initialize(of: 1000, &blk)
+    def initialize(of: 1000, ensure_once: false, &blk)
       @batch_size = of
       @block = blk
+      @ensure_once = ensure_once
       @current_batch = []
+
+      @flush_count = 0
     end
 
     def <<(item)
@@ -28,7 +31,7 @@ module Miscellany
     end
 
     def flush
-      process_batch if @current_batch.present?
+      process_batch if @current_batch.present? || (@flush_count.zero? && ensure_once)
     end
 
     protected
@@ -36,6 +39,7 @@ module Miscellany
     def process_batch
       @block.call(@current_batch)
       @current_batch = []
+      @flush_count += 1
     end
   end
 end

data/lib/miscellany/controller/sliced_response.rb

@@ -17,7 +17,9 @@ module Miscellany
       default_sort: nil, valid_sorts: nil,
       &blk
     )
-      normalized_sorts = normalize_sort_options(valid_sorts || queryset.column_names, default: default_sort)
+      valid_sorts ||= queryset.column_names if queryset.respond_to?(:column_names)
+      valid_sorts ||= []
+      normalized_sorts = normalize_sort_options(valid_sorts, default: default_sort)
 
       slice = Slice.build(
         queryset, slice_params,
@@ -85,7 +87,9 @@ module Miscellany
 
     def normalize_sort(sort, key: nil)
       sort = sort.to_s if sort.is_a?(Symbol)
-      if sort.is_a?(String)
+      if sort.is_a?(Array)
+        sort = { **normalize_sort(sort[0]), **(sort[1] || {}) }
+      elsif sort.is_a?(String)
         m = sort.match(/^([\w\.]+)(?: (ASC|DESC)(!?))?$/)
         sort = { column: m[1], order: m[2], force_order: m[3].present? }.compact
       elsif sort.is_a?(Proc)
@@ -234,7 +238,12 @@ module Miscellany
       def sliced_items
         @sliced_items ||= begin
           if items.is_a?(Array)
-            items
+            start, finish = slice_bounds
+            if start && finish
+              items[start...finish]
+            else
+              items
+            end
           elsif items.is_a?(Proc)
             items.call(self)
           elsif items.is_a?(ActiveRecord::Relation)
@@ -255,10 +264,20 @@ module Miscellany
           sorts << options[:valid_sorts][:default] if options.dig(:valid_sorts, :default).present?
 
           sorts.reduce(qset) do |qset, sort|
+            order = sort[:order] || 'ASC'
             if sort[:column].is_a?(Proc)
-              sort[:column].call(qset, sort[:order] || 'ASC')
+              sort[:column].call(qset, order)
             else
-              qset.order(sort[:column] => sort[:order] || 'ASC')
+              desired_nulls = (sort[:nulls] || :low).to_s.downcase.to_sym
+              nulls = case desired_nulls
+              when :last
+                'LAST'
+              when :first
+                'FIRST'
+              else
+                (desired_nulls == :high) == (order.to_s.upcase == 'DESC') ? 'FIRST' : 'LAST'
+              end
+              qset.order("#{sort[:column]} #{order} NULLS #{nulls}")
             end
           end
         else

data/lib/miscellany/param_validator.rb

@@ -124,7 +124,7 @@ module Miscellany
               if blk.is_a?(Hash)
                 pv = ParamValidator.new(nil, self.context, params[pk])
                 pv.parameter(i, **blk)
-                ers = pv.errors
+                errs = pv.errors.store_for(i)
               else
                 errs = ParamValidator.check(params[pk][i], context: context, &blk)
               end

data/lib/miscellany/version.rb

@@ -1,3 +1,3 @@
 module Miscellany
-  VERSION = "0.1.4".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.4
+  version: 0.1.7
 platform: ruby
 authors:
 - Ethan Knapp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-20 00:00:00.000000000 Z
+date: 2023-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Gem for a bunch of random, re-usable Rails Concerns & Helpers