miscellany 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8272b6520386bb2e45ef6a4ae8cc6c2c349e465ca8eea10867df3c42c80c7c3
-  data.tar.gz: aeb81bc5bb198c2f64589c1d416369bd101de5d1db074682e40f66247c2035d5
+  metadata.gz: 1dea6efd8728954e80a8a249f749dd8133ecfcf71fb6b4a3b3acf248b662fca8
+  data.tar.gz: bd567ce813d303ca03d8d87f8faa4a312d2417b934bb1ee8c3d2781b99126f88
 SHA512:
-  metadata.gz: 3f6ac9e74cacbdb4dd5d990a47c72608181eb005b4a9c3de81b46666bf314a246fa799c29d97753519822318740adf32fa2db63450d2d70e2abc4fb4a38c09de
-  data.tar.gz: 99f033c54af54257ef660e889f34f683e080fe4e16baeb9d1f201fcf0091561c6d2fd5d26b582a57b9ab91b2d7c0fd3c8e72f8fc8e02f7425b0a395b4bcc7e9f
+  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(

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.17".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.17
+  version: 0.1.18
 platform: ruby
 authors:
 - Ethan Knapp
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-29 00:00:00.000000000 Z
+date: 2023-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails