miscellany 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70a91bb987b7c99319cbe607cdfba6c32e9637a5a3fb8bec3ec38725339ea3c6
-  data.tar.gz: f9607f408e91b1abadb51e73c4238b1a1d9f378fe294461efe11f3172783d9e2
+  metadata.gz: 0c92b625438d9027f73a5cd7b5f4ef168e1ed3e083b0c13924cb9f3f0e2db6bd
+  data.tar.gz: 0a52d0877c7eea6a0c2189efdd4c30cb65a3419abf149a8ae0ce4e63467741de
 SHA512:
-  metadata.gz: f8c1ba0f079635d38ed0d3a29d3cb865899fb66112593625a2ae159061c5fd48f63cfa2300a825f671bdbd04e4e2317d6ccedd80702391bdadd7329c0a2deae9
-  data.tar.gz: a73fd773078016b440b08243c4c6dc5477ff26cdbacb054f57d8b99b77c15305af7a1741d0c94b02399c3b59af7553254a23be5441d1d30948f4f51cb53b6ccf
+  metadata.gz: 9cbc439200d8a6c1604aa0153cbed6cfeead8636eb7330880371d2e8c6d2d412739e8a2d302c5dfd1cd9b038bec9f6de663f8fc7ddfd1fb1d8c99afe029e0306
+  data.tar.gz: d4bea4b5fd11c1830a8f18302c7f6c95d6f4c3fc147faf715f675850e7dee4e02d08632b05aa3e61ce4277de494a9784e6dc3ef55c8e92f99a0a22ba9a9d4fbc

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
 

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.5".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.5
 platform: ruby
 authors:
 - Ethan Knapp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-20 00:00:00.000000000 Z
+date: 2022-07-06 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