miscellany 0.1.15 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0292657fd777bbea4bc0f5388da1bf36a8996fb289734680e659e8d454a31581'
-  data.tar.gz: '087408e70b210183a78aed078d86ea593e8810eccd3b22cc9885805de6a98c02'
+  metadata.gz: d8272b6520386bb2e45ef6a4ae8cc6c2c349e465ca8eea10867df3c42c80c7c3
+  data.tar.gz: aeb81bc5bb198c2f64589c1d416369bd101de5d1db074682e40f66247c2035d5
 SHA512:
-  metadata.gz: 243f605f61a02d0df1704fae338c395f573341a251f53ed734a43e843f6cb3619bf0ad49c399f20c70963c2a586c03783416c29247e86f740aff765afcf5ede5
-  data.tar.gz: 9839a4ecaf808730cfb587b498feb9266b3394929a0e2f7d06ca2efcab4f7715041a82a93446eedcb729b8d141b08d76a1aa1f8d9cbf1a4ddc0f7ddfc649d1a9
+  metadata.gz: 3f6ac9e74cacbdb4dd5d990a47c72608181eb005b4a9c3de81b46666bf314a246fa799c29d97753519822318740adf32fa2db63450d2d70e2abc4fb4a38c09de
+  data.tar.gz: 99f033c54af54257ef660e889f34f683e080fe4e16baeb9d1f201fcf0091561c6d2fd5d26b582a57b9ab91b2d7c0fd3c8e72f8fc8e02f7425b0a395b4bcc7e9f

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
@@ -198,7 +198,12 @@ module Miscellany
           elsif items.is_a?(ActiveRecord::Relation)
             offset, limit = slice_bounds
             limit -= offset unless limit.nil?
-            items.order(Arel.sql(sort_sql)).limit(limit).offset(offset).to_a
+
+            query = items
+            sort_clause = sort_sql
+            query = query.order(Arel.sql(sort_clause)) if sort_clause.present?
+
+            query.limit(limit).offset(offset).to_a
           elsif defined?(Miscellany::ComplexQuery) && items.is_a?(Miscellany::ComplexQuery)
             offset, limit = slice_bounds
             limit -= offset unless limit.nil?

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.15".freeze
+  VERSION = "0.1.17".freeze
 end

metadata

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