recourse 7.11.1 → 7.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d5b8233bcbb5c24c4df425ab9c5a43f5db42baf5f5801b29ec118ce792871bc
-  data.tar.gz: 7c5a0bd68a7d5c22d752b2a8fdb2667d0291b6d6bbfbc376218cb5186fa5a2ed
+  metadata.gz: 9e4b4229005fd88e1617e55a5f4760da0ebb2d7b897eabd730adeac07c7eb61d
+  data.tar.gz: b84e0db179300948a05e77e9bbdbdcbaad8ef1ee794632f42abeec752b3395ad
 SHA512:
-  metadata.gz: 67e9c27e1c7489a189e9a001b1c3d191f68ef480555a06f701d68d561bbc8c97f66de6eb307939e6c1bb980fc7afd5ec1b9195f48289e28cc3450e0148de8e59
-  data.tar.gz: b0415018f1b632c3da2d61e1a77e8b96aafced9fcdbac997a4cb316821f30311805f7ed2e91e6e93d2a270ccbffae119394835f93d072becf9395f18aa159147
+  metadata.gz: 2aa90f2ea92f2370ac39c64f0351518785bf3cb3233e7fab52e61cae83d8c90df80362a8c8267d451e8869b5e6da3cf22b9bb38b59c0510d7cc7958355da07e2
+  data.tar.gz: b0c47758910fe5c03c28084afa668adec4d6a07c399894f05ea0a7fbf57983c2988a84f72fed6a2ea84cb8a49c0730f9a894240e3ddfeb85f8a1f256b9081e2e

data/CHANGELOG.md

@@ -7,6 +7,24 @@ For more information about changelogs, check [Keep a Changelog](http://keepachan
 
 ## [Unreleased]
 
+## 7.12.0 - 2026-10-02
+
+* [FEATURE] A route drawn in a module lists the model kept in that module
+
+  `scope module: :admin { recourses :users }` lists an `Admin::User`, and so does a page
+  nested under a post, `admin/posts/users`. Only an Active Record model in the module counts;
+  where there is none, the route lists the top-level class of its last word, as before, so
+  `admin/comments` still lists a `Comment`. A host keeping models in a module will want
+  `def self.use_relative_model_naming? = true` on it, so their routes and params say `user`
+  rather than `admin_user`.
+
+## 7.11.2 - 2026-09-26
+
+* [FIX] The count in a tab is delimited
+
+  `3,506 aircrafts`, not `3506 aircrafts`: the same figure the table's own count and the
+  footer already draw with delimiters.
+
 ## 7.11.1 - 2026-09-26
 
 * [FIX] A tooltip in the sidebar's foot closes when its icon is clicked

data/app/controllers/concerns/recourse/resource_resolution.rb

@@ -78,7 +78,7 @@ module Recourse
     # to match it. Private, the way `recourse_relation` beside it is: naming a model
     # adds no action.
     def recourse_model
-      Recourse.model controller_name
+      Recourse.model controller_path
     end
 
     # What the page calls one of its rows: the model's own word, or the route's for a

data/lib/recourse/helpers/resources.rb

@@ -15,7 +15,7 @@ module Recourse
       def resources_name
         return controller.controller_name.humanize if blob_resource?
 
-        Recourse.known_title controller.controller_name
+        Recourse.known_title controller.controller_path
       end
 
       # Singular, lowercase name of the resource, e.g. 'contact' — and 'photo' on a page
@@ -72,7 +72,7 @@ module Recourse
       # Resolved by the controller, which is the one that knows whether the name is a
       # model of this app's, something a record has attached, or a model a host named.
       def resource_model
-        controller_assign('recourse_model') || Recourse.model(controller.controller_name)
+        controller_assign('recourse_model') || Recourse.model(controller.controller_path)
       end
     end
   end

data/lib/recourse/helpers/tabs.rb

@@ -50,7 +50,7 @@ module Recourse
       # its children out with a gap, and two of them would stand a gap and a space apart.
       def tab_label_for(icon, words, count = nil)
         words = tag.span words, class: 'recourse-tab-word' if icon || count
-        words = tag.span safe_join([count, words], ' ') if count
+        words = tag.span safe_join([number_with_delimiter(count), words], ' ') if count
 
         safe_join [icon && tag.i(class: "bi bi-#{icon}"), words].compact, ' '
       end

data/lib/recourse/icons.rb

@@ -8,7 +8,7 @@ module Recourse
   # `Message` may be a host's own class for gathering rows rather than a table of them,
   # and asking it would raise rather than draw nothing.
   def self.known_icon(name)
-    model = name.to_s.split('/').last.classify.safe_constantize
+    model = model? name
 
     known_model_icon model if model.respond_to? :recourse_icon
   end

data/lib/recourse/routes/nested.rb

@@ -25,7 +25,7 @@ module Recourse
       # `/placeholders/:placeholder_id/bookmark`, where nothing linked to it and
       # anything reaching it raised. Asked of the constant rather than the class:
       # loading a model while the routes draw is what Rails 8.2 warns about.
-      def addressable_rows? = Object.const_defined? Recourse.model_name(parent_resource.name)
+      def addressable_rows? = Recourse.model_defined? declared_path(parent_resource.name)
 
       # The place a row of a positioned table holds, at `/teams/5/position`. Recorded
       # nowhere, for the reason the bookmark gives: a tab and a bare-action button both

data/lib/recourse/titles.rb

@@ -33,7 +33,7 @@ module Recourse
     # than a table of them, and asking it would raise rather than read.
     def known_title(name)
       segment = name.to_s.split('/').last
-      model = segment.classify.safe_constantize
+      model = model? name
 
       model.respond_to?(:model_name) ? model_title(model) : segment.humanize
     end

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 = '7.11.1'
+  VERSION = '7.12.0'
 end

data/lib/recourse.rb

@@ -71,11 +71,58 @@ module Recourse
   # action is a verb — `recourse :sweep, only: :create` — and the gem labels its button
   # from the path alone, so whether a name has a model behind it has to be a question
   # and not an accusation.
-  def self.model?(name) = model_name(name).safe_constantize
+  def self.model?(name) = namespaced_model(name) || model_name(name).safe_constantize
 
   # A namespaced resource is `admin/sources`, and the model it lists is a Source.
   def self.model_name(name) = name.to_s.split('/').last.classify
 
+  # Whether a model answers the name, asked of the constants rather than the classes:
+  # the routes ask while they draw, and loading a model then is what Rails 8.2 warns
+  # about.
+  def self.model_defined?(name)
+    namespaced_names(name).any? { |namespaced| constant namespaced, load: false } ||
+      Object.const_defined?(model_name(name))
+  end
+
+  # A model the app keeps in the route's own module, where there is one: `admin/users`
+  # lists an Admin::User, and so does `admin/posts/users`, nested under a post.
+  # Only an Active Record model counts, so a concern or a host's own class that shares
+  # the name never takes a page over; and where there is none, `admin/comments` lists a
+  # Comment as it always has.
+  private_class_method def self.namespaced_model(name)
+    namespaced_names(name).each do |namespaced|
+      model = constant namespaced
+      return model if model.is_a?(Class) && model < ActiveRecord::Base
+    end
+
+    nil
+  end
+
+  # The names a model in the route's modules goes by, innermost module first. The
+  # segment a nested route adds for its parent is a module no model lives in, so the
+  # module around it is asked next.
+  private_class_method def self.namespaced_names(name)
+    *modules, last = name.to_s.split '/'
+    modules.size.downto(1).map { |depth| [*modules[0, depth], last].join('/').classify }
+  end
+
+  # The constant a name gives, looked up one module at a time and never through Object:
+  # `safe_constantize` answers `Admin::Comment` with the top-level Comment, since a module
+  # looks its constants up there too. `load: false` stops short of the last one,
+  # answering only whether it is there.
+  private_class_method def self.constant(name, load: true)
+    *modules, last = name.split '::'
+    scope = modules.inject Object do |outer, part|
+      break unless outer.const_defined? part, false
+
+      outer.const_get part, false
+    end
+    return unless scope.is_a? Module
+    return unless scope.const_defined? last, false
+
+    load ? scope.const_get(last, false) : true
+  end
+
   # Raised for every failure the gem reports, so hosts can rescue one type.
   class Error < StandardError; end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: recourse
 version: !ruby/object:Gem::Version
-  version: 7.11.1
+  version: 7.12.0
 platform: ruby
 authors:
 - claudiob