recourse 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48a53c1e56600fb74f444c4cd101c9927562a1571a7d3b31e0837f46e0d894af
-  data.tar.gz: cdd8ae93dbddeb9bbf3b0467ae7ee33c927a4692d1c70b59e5f157c7a49a3843
+  metadata.gz: 4258e3870b7a65f742563e24f02f45e2c2716bcc22666fbbb63867f70b656e71
+  data.tar.gz: 5d2ae92ccde9995457f78060fd9f22d74fd3971bae0c5de68ec7aa022e290603
 SHA512:
-  metadata.gz: d70d2a2d28bc6a44cf2f3b138dbf088a2390a316e7baa74ff554d477d48cf561612f3c06fc6760a48a4fa950f4a0e85f555f4d8b050bae81d78228cdd90b179a
-  data.tar.gz: 2e736d79aaecff3ecec5f9f0881a049456e6eb3a99072a4bea6a484152c889569d77e5c39b118449e0c6595eab190654640df12b2a9e570c36d8fa99e639d88c
+  metadata.gz: 343ca9a2eba9663618236339649c017f00934d3d01cf8741e6b152a8cc6c6bf17036eff91ea63f46acf5cf804e65ae7f59b68ffdf541ae1bd06e9c5dd1332793
+  data.tar.gz: 5f5946a02e7d397bec49ac1089912933f730758215ea4e18559f003a5a13522e5de587db0abb9c75d00a9fab5ba7978a73858a634bfda05956d0267c70617df0

data/CHANGELOG.md

@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
 For more information about changelogs, check [Keep a Changelog](http://keepachangelog.com) and
 [Vandamme](http://tech-angels.github.io/vandamme).
 
+## 4.1.0 - 2026-09-08
+
+* [Feature] Rows with nothing in the sorted column come last
+
+  Whichever way a table is ordered — by the model's own `recourse_order`, or by the
+  heading a reader clicked — the rows with nothing in that column now come after every
+  row that has something, where the database's default put them first on a descending
+  sort. A `recourse_order` given as a Symbol or a Hash earns this; a SQL string a host
+  wrote is still taken as written, so `'size desc nulls last'` and `{ size: :desc }` now
+  say the same thing.
+
 ## 4.0.0 - 2026-09-08
 
 Version 4 is a rewrite, developed under the working name `drive` and released here

data/README.md

@@ -95,7 +95,7 @@ module Market::Recoursive extend ActiveSupport::Concern
     def recourse_label = :slug                     # what a menu and a cell call one
     def recourse_hidden = %i[callback_url payload] # off every screen
     def recourse_displayed = :created_at           # back on the table
-    def recourse_order = 'size desc nulls last'    # how the index sorts
+    def recourse_order = { size: :desc }           # how the index sorts
     def recourse_icon = :question                  # a Unicon concept
   end
 end
@@ -106,7 +106,7 @@ end
 | [`recourse_label`](https://rubydoc.info/gems/recourse/Recourse/Recoursive#recourse_label-instance_method) | `:name` | the column a combobox shows and a foreign-key cell reads; typed rather than picked where it has a length validator |
 | [`recourse_hidden`](https://rubydoc.info/gems/recourse/Recourse/Recoursive#recourse_hidden-instance_method) | `[]` | columns kept off the table, the page, the form and the search |
 | [`recourse_displayed`](https://rubydoc.info/gems/recourse/Recourse/Recoursive#recourse_displayed-instance_method) | `[]` | columns a table draws that it would leave off: encrypted ones, the id, timestamps, JSON |
-| [`recourse_order`](https://rubydoc.info/gems/recourse/Recourse/Recoursive#recourse_order-instance_method) | `:id` | the index's order, in any shape `order` takes |
+| [`recourse_order`](https://rubydoc.info/gems/recourse/Recourse/Recoursive#recourse_order-instance_method) | `:id` | the index's order, a Symbol or a Hash; rows with nothing in the column come last |
 | [`recourse_icon`](https://rubydoc.info/gems/recourse/Recourse/Recoursive#recourse_icon-instance_method) | the model's name | the icon on the sidebar, the crumbs and the tabs |
 
 What needs no hook, being read off the model:

data/lib/recourse/orders.rb

@@ -0,0 +1,21 @@
+# Reopened for the order an index lists its rows in.
+module Recourse
+  # What `recourse_order` comes to as Arel, every column ending in NULLS LAST: a row
+  # with nothing in the column is what a reader is least looking for, whichever way
+  # the rows run. Extended onto `Recourse`, so this is `Recourse.nulls_last`.
+  module Orders
+    # A Symbol is that column ascending and a Hash is each column in its direction,
+    # both with the empty rows last. Anything else — a SQL string a host wrote — is
+    # taken as written.
+    def nulls_last(model, order)
+      directions = order.is_a?(Symbol) ? { order => :asc } : order
+      return [*order] unless directions.is_a? Hash
+
+      directions.map do |column, direction|
+        model.arel_table[column].public_send(direction).nulls_last
+      end
+    end
+  end
+
+  extend Orders
+end

data/lib/recourse/search.rb

@@ -19,11 +19,9 @@ module Recourse
       @query = relation.ransack conditions(params)
     end
 
-    # The relation the index lists. Ransack has already ordered it where a heading
-    # asked, so the model's own order only applies when nothing did.
+    # The relation the index lists, in the order a heading asked for or the model's own.
     def scope
-      scope = @query.result
-      scope = scope.order(*kept_first, @model.recourse_order) if @query.sorts.empty?
+      scope = @query.result.reorder(*ordering)
       includes = @model.recourse_includes
       return scope if includes.blank?
 
@@ -32,6 +30,16 @@ module Recourse
 
   private
 
+    # A heading's sort or the model's own order, each column with its empty rows last.
+    # Ransack has ordered the relation already where a heading asked, but as the bare
+    # column; the same sort is written again here so it ends the way every order does.
+    def ordering
+      sorts = @query.sorts.map { |sort| sort.attr.public_send(sort.dir).nulls_last }
+      return sorts if sorts.any?
+
+      kept_first + Recourse.nulls_last(@model, @model.recourse_order)
+    end
+
     # The rows this viewer has kept, ahead of whatever the model orders by — but only
     # where nobody clicked a heading, which is the same word `recourse_order` answers
     # to. A semi-join rather than an outer one: it cannot multiply a row, and it

data/lib/recourse/version.rb

@@ -1,4 +1,4 @@
 module Recourse
   # Version of the gem, read by the gemspec and by hosts checking compatibility.
-  VERSION = '4.0.0'
+  VERSION = '4.1.0'
 end

data/lib/recourse.rb

@@ -12,6 +12,7 @@ require_relative 'recourse/icons'
 require_relative 'recourse/controllers'
 require_relative 'recourse/helpers'
 require_relative 'recourse/limits'
+require_relative 'recourse/orders'
 require_relative 'recourse/writes'
 require_relative 'recourse/zones'
 require_relative 'recourse/broadcasting'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: recourse
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - claudiob
@@ -220,6 +220,7 @@ files:
 - lib/recourse/helpers/zones.rb
 - lib/recourse/icons.rb
 - lib/recourse/limits.rb
+- lib/recourse/orders.rb
 - lib/recourse/recoursive.rb
 - lib/recourse/registry.rb
 - lib/recourse/routes.rb