miscellany 0.1.14 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 735168167aa19b15e9b56db6a20025dc7374526319744526d08238577caf4983
-  data.tar.gz: c4df4a5c364cb04632ab017f2e7393d9f8dc5f5228ba7da41303d8a7595606ea
+  metadata.gz: d919e8dffeb9e12448e4e1a65f0e3c3015b9dd759164e746a59560af0797ea32
+  data.tar.gz: dd0a2c007d8980d1dd7d5995571aa7a9e1a4346099c23c279fd4f7c853851535
 SHA512:
-  metadata.gz: 94f572010617e6295e19d0167c05cb59b683496f87502a83bb53f91c3303fb11cfb65a7c7f0a2c85c254896700c22bc9d441e02ebb09a93741cb4867e13596a3
-  data.tar.gz: 8064920b660a82326a0172ac4828c95bf072b65ec3e9e7fe87dcb842ace9ec4a11072e0095eb73e4247c8d83e5e412bd4bd62947b35edefb9b82576b1a5e9423
+  metadata.gz: 97f892b692386c7c924a2b082ddb34787a6870c9bad7cc378d426a6fe8e288a7d47f33b570596c4e948a24decc51882b9da859d8e9fef3d5cbe8ad13c49cecdf
+  data.tar.gz: 0115b26046212f6d56bbac869097a3e7b69e2c2b1756d3b33b38a02b9b361df61c478f2d930f343577e53bc1f3181b83e9cbcee1be2e188e6640a38901b8c357

data/lib/miscellany/active_record/complex_query.rb

@@ -60,11 +60,11 @@ module Miscellany
       offset = 0
       loop do
         batch = ActiveRecord::Base.connection.exec_query(
-          "SELECT * FROM #{tbl} LIMIT #{batch_size} OFFSET #{offset}",
+          "SELECT * FROM #{tbl} LIMIT #{of} OFFSET #{offset}",
         )
         augment_batch(batch)
         yield batch
-        offset += batch_size
+        offset += of
         break if batch.empty?
       end
     ensure

data/lib/miscellany/controller/sliced_response.rb

@@ -98,7 +98,7 @@ module Miscellany
             end
 
             begin
-              slice[:sort] = options[:sort_parser]&.parse(arg[:sort], ignore_errors: true)
+              slice[:sort] = options[:sort_parser]&.parse(arg[:sort], ignore_errors: true, default: true)
             rescue Miscellany::SortLang::Parser::SortParsingError => e
               raise HttpErrorHandling::HttpError, message: e.message
             end

data/lib/miscellany/sort_lang.rb

@@ -60,8 +60,8 @@ module Miscellany
         false
       end
 
-      def parse(sortstr, ignore_errors: true)
-        (sortstr || '').split(',').map do |s|
+      def parse(sortstr, ignore_errors: true, default: :true)
+        sorts = (sortstr || '').split(',').map do |s|
           m = s.strip.match(/^(\w+)(?: (ASC|DESC))?$/)
 
           if m.nil?
@@ -78,7 +78,11 @@ module Miscellany
           sort = resolved_sort.dup
           sort[:order] = m[2] if m[2].present? && !sort[:force_order]
           sort
-        end.compact.presence
+        end
+
+        sorts << self.default if default == :append || default && !sorts.compact.present?
+
+        sorts.compact.presence
       end
 
       protected

data/lib/miscellany/version.rb

@@ -1,3 +1,3 @@
 module Miscellany
-  VERSION = "0.1.14".freeze
+  VERSION = "0.1.16".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miscellany
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.16
 platform: ruby
 authors:
 - Ethan Knapp
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-07 00:00:00.000000000 Z
+date: 2023-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails