miscellany 0.1.16 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d919e8dffeb9e12448e4e1a65f0e3c3015b9dd759164e746a59560af0797ea32
-  data.tar.gz: dd0a2c007d8980d1dd7d5995571aa7a9e1a4346099c23c279fd4f7c853851535
+  metadata.gz: 1dea6efd8728954e80a8a249f749dd8133ecfcf71fb6b4a3b3acf248b662fca8
+  data.tar.gz: bd567ce813d303ca03d8d87f8faa4a312d2417b934bb1ee8c3d2781b99126f88
 SHA512:
-  metadata.gz: 97f892b692386c7c924a2b082ddb34787a6870c9bad7cc378d426a6fe8e288a7d47f33b570596c4e948a24decc51882b9da859d8e9fef3d5cbe8ad13c49cecdf
-  data.tar.gz: 0115b26046212f6d56bbac869097a3e7b69e2c2b1756d3b33b38a02b9b361df61c478f2d930f343577e53bc1f3181b83e9cbcee1be2e188e6640a38901b8c357
+  metadata.gz: 66f32e979d580c4297c1155f6bc87203ec808420856636724a257d07ca062ffe5d5ecd073aaa0fa0b09efb781f033affce87faa579b0007bd7f4ffe46c82fda3
+  data.tar.gz: 54210f971ad74cd8d14b4934cb36d155943626b5e66190c682c294fdcd30f3b315cf2b5dbae268ce70a1213726e294978c80b080fdf8422bd1256a4f47dd3f37

data/lib/miscellany/controller/sliced_response.rb

@@ -7,8 +7,8 @@ module Miscellany
     include HttpErrorHandling
 
     # Deprecated
-    def slice_results(queryset, **kwargs)
-      @sliced_data = sliced_json(queryset, **kwargs) { |x| x }
+    def slice_results(*args, **kwargs, &blk)
+      @sliced_data = sliced_json(*args, **kwargs, &blk)
     end
 
     def sliced_json(
@@ -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

@@ -26,7 +26,7 @@ module Miscellany
       sorts.map do |sort|
         order = sort[:order] || 'ASC'
         if sort[:column].is_a?(Proc)
-          sort[:column].call(qset, order)
+          sort[:column].call(order)
         else
           desired_nulls = (sort[:nulls] || :low).to_s.downcase.to_sym
           nulls = case desired_nulls
@@ -93,6 +93,7 @@ module Miscellany
         sorts.each do |s|
           if s.is_a?(Hash)
             s.each do |k,v|
+              k = k.to_s
               sort_hash = normalize_sort(v, key: k)
               norm_sorts[k] = sort_hash
             end

data/lib/miscellany/version.rb

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

data/spec/miscellany/sliced_response_spec.rb

@@ -129,6 +129,19 @@ describe Miscellany::SlicedResponse do
 
       expect(subject.sliced_json(ARModel.all, { page: "all" }, allow_all: true, **slice_config)).to be_a Hash
     end
+
+    context "with Hash-based valid_sorts" do
+      let(:source) { ARModel.all }
+
+      before(:each) do
+        slice_config[:valid_sorts] = [
+          title: ->(dir) { "title #{dir}" }
+        ]
+      end
+
+      include_examples "basic functionality"
+      include_examples "sortable"
+    end
   end
 
   describe "#bearcat_as_sliced_json" do

metadata

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