effective_resources 2.33.0 → 2.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f5a25c6d8a3d00de7fc80b70dacf4558f2c0dc8241294ce276f6d31eda10a21
-  data.tar.gz: a7edbeb23f0ae8a5f772227c25fd8febe75d8b277440c3f10b4de42575c85a61
+  metadata.gz: a673f073e82b66e022333d5aa269a5575dac0781dda438062842cfa2947e5e04
+  data.tar.gz: 8c69a47dcfb84b34046c56d925a5e0c325e5354f7106d9a835b2ed483556a07d
 SHA512:
-  metadata.gz: 7f44f4d9b43f1cfd93d567d3ed1ea12f68696acb2dbb328a07fa811eef0de797259912f936de1d016b333179baac47c22ec4773be3667245ea0b1bb0516bb3d9
-  data.tar.gz: 56d5924d9b63fb7b51be6b47eeb178a8ab6bb7eae501083b1e6077bb2145867750351a5233d6ff01e9ecbd8ebbcd9a80afb196aac0769d0c9e145960d3de659b
+  metadata.gz: f57d263e36acb49eae8ff7cb87da207fdb1827075006da249d4bd5d247c5b4f956bf13f0bd0b0fde52200abd927f0b52139d02aad1d00dc0e37965313b935bc2
+  data.tar.gz: b10d8fd11ad1973ba4ddd1aac85e2a5de25217cc11f7a5e001eedac1f11a30e19cdc4461eb9cb1d54152b7e82cd2d1de9ac3147b01c41fc13ec13dbb71b7c2f2

data/app/models/effective/resources/relation.rb

@@ -22,9 +22,21 @@ module Effective
       # name: sort by this column, or this relation
       # sort: when a symbol or boolean, this is the relation's column to sort by
 
-      def order(name, direction = :asc, as: nil, sort: nil, sql_column: nil, limit: nil, reorder: false)
+      # There is a sort by array (ids) syntax:
+      # This will sort the base collection.id array by the given direction
+      #
+      # Effective::Resource.new(collection).order(direction) do
+      #   collection.sort { |a, b| a.membership&.category.to_s <=> b.membership&.category.to_s }
+      # end
+
+      def order(name = nil, direction = :asc, as: nil, sort: nil, sql_column: nil, limit: nil, reorder: false, &block)
         raise 'expected relation to be present' unless relation
 
+        if block_given? && (name == :asc || name == :desc)
+          direction = name
+          name = :id
+        end
+
         sql_column ||= sql_column(name)
         sql_type = (as || sql_type(name))
 
@@ -32,6 +44,11 @@ module Effective
         sql_direction = sql_direction(direction)
         @relation = relation.reorder(nil) if reorder
 
+        if block_given?
+          ids = block.call().map { |resource| resource.try(:id) || resource }
+          return relation.order(order_by_array_position((direction == :asc) ? ids : ids.reverse, sql_column))
+        end
+
         case sql_type
         when :belongs_to
           relation

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.33.0'.freeze
+  VERSION = '2.34.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.33.0
+  version: 2.34.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-07 00:00:00.000000000 Z
+date: 2025-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails