effective_resources 2.32.0 → 2.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6ac2e641e8596cdcce840faf6fb901d7ca6394757e6f98eb7d8bbe30a30e23d
-  data.tar.gz: beb65fb3bd8397e0a347b944fddcd271cf032553a07a1f5230fac5023f92cf36
+  metadata.gz: a673f073e82b66e022333d5aa269a5575dac0781dda438062842cfa2947e5e04
+  data.tar.gz: 8c69a47dcfb84b34046c56d925a5e0c325e5354f7106d9a835b2ed483556a07d
 SHA512:
-  metadata.gz: 52920001d7999fd0fa0d4e7a6dea54193eb47ad4b0f5ea953375547292a2d06d3afc3b56f4e3355e1baf7a87406c4379b3b6b7bdb492f6047c8abe28fa37232d
-  data.tar.gz: 221e98eb7e99f98a7690c9d0684416e4e8ed63e2a9e05a9c800609c653ec007425b74b1a4e5c7f13bdfc9f7a5aba7677d23ccd4a31a912fad285918a35878c91
+  metadata.gz: f57d263e36acb49eae8ff7cb87da207fdb1827075006da249d4bd5d247c5b4f956bf13f0bd0b0fde52200abd927f0b52139d02aad1d00dc0e37965313b935bc2
+  data.tar.gz: b10d8fd11ad1973ba4ddd1aac85e2a5de25217cc11f7a5e001eedac1f11a30e19cdc4461eb9cb1d54152b7e82cd2d1de9ac3147b01c41fc13ec13dbb71b7c2f2

data/app/controllers/concerns/effective/crud_controller/dsl.rb

@@ -36,7 +36,7 @@ module Effective
       # submit :save, 'Save', success: -> { "#{resource} was saved okay!" }
       def submit(action, label, args = {})
         instance_exec do
-          before_action { _insert_submit(action, label, args) }
+          prepend_before_action { _insert_submit(action, label, args) }
         end
       end
 
@@ -49,7 +49,7 @@ module Effective
       # button :decline, false
       def button(action, label = nil, args = {})
         instance_exec do
-          before_action { _insert_button(action, label, args) }
+          prepend_before_action { _insert_button(action, label, args) }
         end
       end
 
@@ -57,7 +57,7 @@ module Effective
       # submit and buttons options will be merged ontop of these
       def on(action, args = {})
         instance_exec do
-          before_action { _insert_on(action, args) }
+          prepend_before_action { _insert_on(action, args) }
         end
       end
 

data/app/controllers/concerns/effective/wizard_controller/before_actions.rb

@@ -29,7 +29,8 @@ module Effective
       # before_action :authorize_resource, only: [:show, :update]
       # Authorize the resource
       def authorize_resource
-        EffectiveResources.authorize!(self, action_name.to_sym, resource)
+        action = (commit_action[:action] == :save ? action_name : commit_action[:action]).to_sym
+        EffectiveResources.authorize!(self, action, resource)
       end
 
       # before_action :assign_required_steps, only: [:show, :update]

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.32.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.32.0
+  version: 2.34.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-06 00:00:00.000000000 Z
+date: 2025-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails