effective_resources 2.33.0 → 2.34.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f5a25c6d8a3d00de7fc80b70dacf4558f2c0dc8241294ce276f6d31eda10a21
-  data.tar.gz: a7edbeb23f0ae8a5f772227c25fd8febe75d8b277440c3f10b4de42575c85a61
+  metadata.gz: a60b02f68659a941b3671d2d4315ea3bf0dcd5c868beed6dc6bf764ed01a2e0c
+  data.tar.gz: 17b12f3276ae89de4967dd10318ee3e4bfd6f2b10e1431d0180c23ad6c1bda2d
 SHA512:
-  metadata.gz: 7f44f4d9b43f1cfd93d567d3ed1ea12f68696acb2dbb328a07fa811eef0de797259912f936de1d016b333179baac47c22ec4773be3667245ea0b1bb0516bb3d9
-  data.tar.gz: 56d5924d9b63fb7b51be6b47eeb178a8ab6bb7eae501083b1e6077bb2145867750351a5233d6ff01e9ecbd8ebbcd9a80afb196aac0769d0c9e145960d3de659b
+  metadata.gz: eceef728e4c2fc86434f46da1c4b5d5f5502c91c804c2ecf09341552da771976e5a861fe7e3046dd461f752fabbf7f798958eeeb0adfd4fe812373c00a728dc0
+  data.tar.gz: '07391feec22d26e5bdafddfa272c35ce8e2531323dd84aada5cc50d3fab28b8b4ff81f01f1bd41604e6c5438f074ed3452e2a1fa251c7faf3f186919af8e688d'

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.1'.freeze
 end

data/lib/effective_resources.rb

@@ -120,6 +120,8 @@ module EffectiveResources
   end
 
   def self.truthy?(value)
+    return true if (value == true || value == 'true')
+
     return true if value.kind_of?(String) && ['yes', 'true'].include?(value.downcase)
     return false if value.kind_of?(String) && ['no', 'false'].include?(value.downcase)
 
@@ -131,6 +133,7 @@ module EffectiveResources
   end
 
   def self.falsey?(value)
+    return true if (value == false || value == 'false')
     !truthy?(value)
   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.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-07 00:00:00.000000000 Z
+date: 2025-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails