recourse 7.11.2 → 7.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96bb337b5a0517cc5f7715b898c0cffd01c33fc6b8e7a6750f939b7361879fd4
-  data.tar.gz: e77f1f0f2f4a42955669e988302bff0df520aa98a8cb7ce0d171cda7e7bd85ea
+  metadata.gz: c3f3474232bc6f128f093102e6695f23e9579ad323bc60bba64fc5bfeb47c5c1
+  data.tar.gz: 0ae245a7fd65040853c0ce90112241b19c8a47d053a86d48a513a229e35191ec
 SHA512:
-  metadata.gz: 9d203812049cdcd045323970939f23c4aeb825e5cd904b949e511b8700bd24781ae5cb36ef83c41b7e90547665a5c255c00c4158425a3c7a1c04b86d9182a223
-  data.tar.gz: 17c113285f5c356e86fad57838069d9c42b8c272d19950649be5f992a674de2bf1b1e6a60e75be220ec77ea48e15462459127cb94b7ba6ffffe5a2c9372576da
+  metadata.gz: 1087e317accf95b332f2e97f7aee06e22275a0129a2d6d7e8d4b3e35a0cbd84a059ce69e9f265559f6ce2d0ade6bd79b344ecb6dfe1feb86c45710da62c6372d
+  data.tar.gz: 55486b544450eaf334cd99d00e81fd493139870780fe78c9d2df90299b44d9a9cd2896a3a8c3e4115a4fb8c3a3929481a7390f876dcd8ea4369f9ffcdf5227c3

data/CHANGELOG.md

@@ -7,6 +7,26 @@ For more information about changelogs, check [Keep a Changelog](http://keepachan
 
 ## [Unreleased]
 
+## 7.12.1 - 2026-10-02
+
+* [FIX] A model kept in a module is bookmarked and nested under by its route's name
+
+  The id a bookmark posts and a nested page reads its parent by is named after the route,
+  `user_id`, and no longer after the model's whole name, `admin_user_id`, which no route draws.
+  A model's default icon and the name its parent is assigned to (`@user`) drop the module too.
+  For a model at the top level, all of these read as they did.
+
+## 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

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

@@ -18,7 +18,7 @@ module Recourse
       model = path && Recourse.model?(path)
       return unless model && @recourse_parent.is_a?(model)
 
-      instance_variable_set "@#{model.model_name.singular}", @recourse_parent
+      instance_variable_set "@#{model.model_name.element}", @recourse_parent
     end
   end
 end

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

@@ -27,7 +27,7 @@ module Recourse
       model = parent && Recourse.model?(parent)
       return unless model
 
-      id = request.path_parameters[:"#{model.model_name.singular}_id"]
+      id = request.path_parameters[:"#{model.model_name.singular_route_key}_id"]
       model.find_by id: id if id
     end
 

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/bookmarks.rb

@@ -83,7 +83,7 @@ module Recourse
 
       def bookmark_url(record)
         url_for controller: "/#{resource_controller_path}/bookmarks", action: :create,
-                "#{resource_model.model_name.singular}_id": record.id
+                "#{resource_model.model_name.singular_route_key}_id": record.id
       end
     end
   end

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/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/maps.rb

@@ -18,7 +18,7 @@ module Recourse
   def self.mappable?(model) = placed?(model) || (POINT_COLUMNS - model.column_names).empty?
 
   # The layer a model's places are drawn on, or nil for a model that is no geography.
-  def self.boundary(model) = BOUNDARIES[model.model_name.singular.to_sym]
+  def self.boundary(model) = BOUNDARIES[model.model_name.element.to_sym]
 
   # Whether a model's rows keep a place ID, which an area or a pin at a place is drawn from.
   def self.placed?(model) = model.column_names.include? PLACE_COLUMN

data/lib/recourse/recoursive.rb

@@ -10,7 +10,7 @@ module Recourse
     # The concept a resource is drawn with, which Unicon names in each icon set it
     # knows. A model's own name by default — `contact` draws a rolodex, `job` a hammer
     # — and Unicon answers with a circle for a name it has never heard of.
-    def recourse_icon = model_name.singular.to_sym
+    def recourse_icon = model_name.element.to_sym
 
     # Columns the model keeps off its screens — the table, the show page, the
     # form and the search box — none by default. One name or a list:

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.2'
+  VERSION = '7.12.1'
 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.2
+  version: 7.12.1
 platform: ruby
 authors:
 - claudiob