recourse 5.12.2 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6dde202165a7bfa0c497a0ae06b118b3108536014fe7b439c6ef0f658f2bb295
-  data.tar.gz: 17d8781fda77d53d5bdf01199146342be707f634b955259a4499969c0341fdd6
+  metadata.gz: 635ceebc330e4dabee8a5fc81f7e176039803b5b78373ffe9cb82ded4b4b2730
+  data.tar.gz: a2a57c8f1a521bd395a40a527b1ed823151df466867c618c58646aaa4de90de3
 SHA512:
-  metadata.gz: adf3b5711fd9327cde802204c2d0a3a69c8943b602e133ba66863106a621719c46dc507706de2bfedc42116e5f97dcf751fa8a333c772c8b71fa747cb4e7d087
-  data.tar.gz: 41d333d13e8e3d5645b3314c8ef2ab61137fae5cf381e4197c7598893e45c188e624a5eafb3dd1fc813e39adf504448357726bf4c9b1028e663f37f63e2d8e49
+  metadata.gz: 9ac64fa98077faa73d5a8f0d65bb041ffe447d7843f85724141c33d6d067570e927eeed245a8d95b2eda578327b0fae176fd281941dbb29638a5c4cbe118a8c5
+  data.tar.gz: ebae99455b03cf6861838da467a79f561ed159eb76be1b7112ab350a47c05d0fa9c3178476021106f3158583d7234ae86465cfc3c069d4caf3da2a096593ed96

data/CHANGELOG.md

@@ -7,6 +7,36 @@ For more information about changelogs, check [Keep a Changelog](http://keepachan
 
 ## [Unreleased]
 
+## 6.0.0 - 2026-09-19
+
+* [Change] These pages are drawn from bh
+
+  They were drawn from a package named after one company's design system, pinned by hand in
+  `Recourse::BUNDLE` and fetched from a CDN. They are drawn from `bh` now, which is the
+  Bootstrap layer under that package and is a dependency of this gem, so the version in the
+  lock file is the version on the page and nothing is fetched across a network.
+
+  `Recourse::BUNDLE` is gone. `Recourse.assets` stays, defaulting to bh's own engine, for a
+  host serving those three folders from somewhere else.
+
+  The host's `recourses/head` partial is drawn last in the head rather than before the
+  script, so a stylesheet of the host's outranks the rules above it and a module of its own
+  runs after the application this one starts.
+
+* [Change] The flash is bh's toasts
+
+  `recourses/_flash` and `FLASH_THEMES` are gone: the markup was bh's, written twice. What
+  is this gem's own stays — the row a write landed on, and the link spliced into the words
+  a message says — and rides on `toasts` through its `data:` and its block.
+
+* [Feature] Every tab wears its model's icon
+
+  A tab earned one only where the parent kept a `has_many` of that name, so a nested index
+  reached through a join, and every singular resource, read as words alone beside tabs that
+  had pictures. The icon is now looked up from the route, which is the same question the
+  sidebar and the crumbs already ask.
+
+
 ## 5.6.2 - 2026-09-18
 
 * [Fix] A kept table notices a count that changed

data/README.md

@@ -10,16 +10,16 @@ gem install recourse
 
 ```ruby
 # Gemfile
-gem 'recourse', '~> 5.0'
+gem 'recourse', '~> 6.0'
 ```
 
-`~> 5.0` follows Semantic Versioning: `bundle update` takes every 5.x and never a
+`~> 6.0` follows Semantic Versioning: `bundle update` takes every 6.x and never a
 breaking change. Rails 8.1 and Ruby 3.2 are the minimum; the pages need Turbo, which
 `turbo-rails` brings, and nothing else in the host. Everything a page is styled and
 scripted by — Bootstrap 6, its icons, Turbo, Stimulus and the controllers behind these
-screens — is linked from https://design.houseaccount.com, so a host without an asset
-pipeline gets the same screens, and a host with a Content Security Policy allows that
-origin for `style-src`, `script-src` and `font-src`.
+screens — is `bh`, which this gem depends on and whose engine serves them at `/bh/`, so a
+host without an asset pipeline gets the same screens and nothing is fetched across a
+network.
 
 ## Step 1. Edit your routes
 
@@ -344,20 +344,18 @@ The dummy app under `test/dummy` runs on SQLite; the gem names no adapter.
 
 ### Reading an unpublished bundle
 
-The pages link `houseaccount` from a CDN, pinned to `Recourse::BUNDLE`, so a stylesheet or
-a Stimulus controller that is not published yet cannot be read on a page. Two lines change
-that — one in this Gemfile, kept out of it because CI checks out this repo alone:
+The pages link bh's own files, so a stylesheet or a Stimulus controller that is not
+published yet is read by pointing the Gemfile at a checkout of it beside this one:
 
 ```bash
-echo "gem 'houseaccount', path: '../design'" >> Gemfile && bundle install
-cd test/dummy && bin/rails db:migrate && HOUSE_ASSETS=1 bin/rails server
+echo "gem 'bh', path: '../bh'" >> Gemfile && bundle install
+cd test/dummy && bin/rails db:migrate && bin/rails server
 ```
 
-`HOUSE_ASSETS` is what loads that gem and sets `Recourse.assets = ''`, so the page asks
-this app for `/css`, `/js` and `/theme` and the gem's engine answers them out of its own
-`public/`. Behind a variable because what a deployed app links is what the suite asserts,
-and because the dummy is also the stand-in for a host with no such gem at all. The dummy's
-development database is migrated on its own, which the line above is why.
+A host serving those three folders from somewhere else — a CDN, a bundle of its own
+carrying bh's layer — says so in `Recourse.assets`, and that is the whole of what it
+writes. The dummy's development database is migrated on its own, which the line above is
+why.
 
 ## License
 

data/app/views/layouts/recourses.html.erb

@@ -16,18 +16,10 @@
 
     <%= yield :head %>
 
-    <%# Everything the page is styled by, from the one place every HouseAccount app draws
-        on: Bootstrap 6, its icons and the house's own rules for this gem's markup. Served
-        from the `houseaccount` package on a CDN, pinned to a version — `Recourse.assets`
-        is where, and `Recourse::BUNDLE` is which — so a change there reaches these pages
-        when somebody moves that line and not before. Two connections opened before the
-        parser finds either tag: the stylesheet's plain one and the CORS one a module
-        script and a font are fetched over. They name the CDN outright, being a hint
-        about it and nothing more, so a host serving the bundle itself simply never uses
-        them. -%>
-    <link rel='preconnect' href='https://cdn.jsdelivr.net'>
-    <link rel='preconnect' href='https://cdn.jsdelivr.net' crossorigin>
-    <link rel='stylesheet' href='<%= Recourse.asset 'css/houseaccount.css' %>'>
+    <%# Everything the page is styled by: Bootstrap 6 and bh's rules for this gem's
+        markup, served by bh's own engine. `Recourse.assets` is where, and a host
+        serving those files from somewhere else says so there. -%>
+    <link rel='stylesheet' href='<%= Recourse.asset 'css/bh.css' %>'>
     <%# The one thing these screens set that the house's stylesheet does not: system faces
         at a compact size, for pages dense with figures. 14px as rem, so a browser's own
         text-size setting still scales it. After the stylesheet, since both are `:root`. -%>
@@ -43,15 +35,17 @@
     <%= render 'recourses/scheme' %>
     <%= primary_color_style %>
 
-    <%# The rest of the head is the host's: whatever it puts in a `recourses/head` partial
-        — the icons its tab wears, say — is drawn here, from the host's own views or from a
-        gem it loads, and nothing is guessed at where nobody has written one. -%>
-    <%= render 'recourses/head' if lookup_context.exists? 'recourses/head', [], true %>
-
     <%# Turbo, Bootstrap and a Stimulus application with every controller this markup
         names, started once under `window.Stimulus`. In the head, so a controller exists
         before the body's first `data-controller`. -%>
-    <script type='module' src='<%= Recourse.asset 'js/houseaccount.js' %>'></script>
+    <script type='module' src='<%= Recourse.asset 'js/bh.js' %>'></script>
+
+    <%# The rest of the head is the host's: whatever it puts in a `recourses/head` partial
+        — the icons its tab wears, a layer of its own over this one — is drawn here, from
+        the host's own views or from a gem it loads, and nothing is guessed at where nobody
+        has written one. Last, so a stylesheet of the host's outranks the rules above it and
+        a module of its own runs after the application this one started. -%>
+    <%= render 'recourses/head' if lookup_context.exists? 'recourses/head', [], true %>
   </head>
 
   <%# The reader's zone is told to the server here rather than from a page of its
@@ -83,6 +77,6 @@
       <%= yield %>
     </main>
 
-    <%= render 'recourses/flash' %>
+    <%= toasts(data: written_data) { |key, message| written_message key, message } %>
   </body>
 </html>

data/app/views/recourses/_combobox.html.erb

@@ -5,7 +5,7 @@
     select is named with `[]`, so the browser submits every pick the way Ransack reads a
     list predicate. -%>
 <%= tag.select name: (multiple ? "#{name}[]" : name), id: id, multiple: multiple, required: required,
-               class: class_names('form-select', 'form-select-sm': small, 'is-invalid': invalid),
+               class: class_names('form-control', 'form-control-sm': small, 'is-invalid': invalid),
                aria: { label: aria_label, describedby: described },
                data: { controller: 'combobox', combobox_placeholder_value: placeholder,
                        combobox_more_value: t('recourse.more'), combobox_all_value: all,

data/lib/recourse/assets.rb

@@ -1,28 +1,19 @@
-# Reopened for where the house bundle these pages are drawn from is served from.
+# Reopened for where the design layer these pages are drawn from is served from.
 module Recourse
-  # The release of `houseaccount` they are drawn from, named once — the layout links its
-  # stylesheet and its script, and the sidebar's toggle swaps a palette out of the same
-  # release. A published version is never written again, so the bytes behind these URLs
-  # cannot move under us, and a change to the bundle reaches these pages when somebody
-  # moves this line and not before.
-  BUNDLE = '0.17.0'
-
   class << self
-    # Where that release is served from, with no trailing slash. jsdelivr's copy of the
-    # published package by default, which is what every deployed app reads and the one
-    # place all five of them draw from.
+    # Where bh's built files answer from, with no trailing slash. Its own engine by
+    # default, which every app holding the gem already serves, so nothing is fetched
+    # across a network and no version is written down twice: the gem in the lock file
+    # is the one on the page.
     #
-    # A host that sets it to `''` serves the bundle itself, out of the `houseaccount`
-    # gem: its engine answers `/css`, `/js` and `/theme` from its own `public/`. That is
-    # how the bundle is worked on — a stylesheet or a controller can be tried on a real
-    # page before the version carrying it is published — and it is the whole of what
-    # such a host writes.
+    # A host serving those files from somewhere else — a CDN, a bundle of its own that
+    # carries bh's layer — points this at it, and that is the whole of what it writes.
     attr_accessor :assets
   end
 
-  @assets = "https://cdn.jsdelivr.net/npm/houseaccount@#{BUNDLE}/public"
+  @assets = Bh::Engine::PREFIX.chomp '/'
 
-  # One file of the bundle.
+  # One file of the design layer.
   def self.asset(path) = "#{assets}/#{path}"
 
   # And the folder one palette is read from, which three places ask for: the layout

data/lib/recourse/helpers/actions.rb

@@ -81,11 +81,11 @@ module Recourse
       def destroy_button(record)
         path = url_for controller: "/#{destroy_action_path}", action: :destroy, id: record
 
-        button_to icon_tag(ICONS[:destroy], class: 'fg-danger'), path,
-                  method: :delete, class: 'btn btn-sm btn-link btn-icon p-0',
-                  aria: { label: t('recourse.delete', model: resource_name) },
-                  form: { data: { turbo_frame: '_top',
-                                  turbo_confirm: destroy_warning(record), } }
+        confirm_button_to icon_tag(ICONS[:destroy], class: 'fg-danger'), path,
+                          confirm: destroy_warning(record), method: :delete,
+                          class: 'btn btn-sm btn-link btn-icon p-0',
+                          aria: { label: t('recourse.delete', model: resource_name) },
+                          form: { data: { turbo_frame: '_top' } }
       end
     end
   end

data/lib/recourse/helpers/counters.rb

@@ -43,7 +43,8 @@ module Recourse
         word = Recourse.model_title association.klass, count: value, lower: true
 
         safe_join [
-          tag.span(count, class: 'recourse-counter-figure', data: tooltip_on_top(title)),
+          tag.span(count, class: 'recourse-counter-figure',
+                          data: tooltip_data(title, placement: 'top')),
           tag.span("#{count} #{word}", class: 'recourse-counter-word'),
         ]
       end

data/lib/recourse/helpers/deletions.rb

@@ -18,12 +18,10 @@ module Recourse
         path = destroy_resource_path record
         return unless path
 
-        options = {
-          method: :delete, class: 'btn btn-sm btn-solid theme-danger ms-3',
-          form_class: 'd-inline-block', data: { turbo_confirm: destroy_warning(record) },
-        }
-
-        button_to t('recourse.delete', model: resource_name), path, **options
+        confirm_button_to t('recourse.delete', model: resource_name), path,
+                          confirm: destroy_warning(record), method: :delete,
+                          class: 'btn btn-sm btn-solid theme-danger ms-3',
+                          form_class: 'd-inline-block'
       end
 
       # What deleting this record takes with it, counted a level down and no further:

data/lib/recourse/helpers/flashes.rb

@@ -1,24 +1,16 @@
 module Recourse
   module Helpers
-    # What a flash message is drawn as: its toast's theme, the row it marks, and the
-    # words it leads somewhere.
+    # What a flash message is drawn as: the row it marks, and the words it leads somewhere.
     module Flashes
-      # Bootstrap theme for each flash key, so a notice and an alert read apart.
-      FLASH_THEMES = { 'notice' => 'theme-success', 'alert' => 'theme-danger' }
-
     private
 
-      # Theme for one flash entry, falling back to a neutral one for a host's key.
-      def flash_theme(key)
-        FLASH_THEMES.fetch key.to_s, 'theme-primary'
-      end
-
       # What marks the row a write just landed on, and nothing at all on a page no write
       # brought about — which is every page but the one after a create or an update.
       def written_data
         written = flash[Recourse::WRITTEN]
+        return {} if written.blank?
 
-        { controller: 'written', written_row_value: written['row'] } if written.present?
+        { controller: 'written', written_row_value: written['row'] }
       end
 
       # The message with the record it names led to that record's page, where a write

data/lib/recourse/helpers/pictures.rb

@@ -20,13 +20,7 @@ module Recourse
       # an icon alone says nothing to one, and given the tooltip that says the same
       # word to everyone else.
       def icon_heading(concept, title, **)
-        icon_tag concept, label: title, role: :img, data: tooltip_on_top(title), **
-      end
-
-      def tooltip_on_top(title)
-        # `bs_title` is what Bootstrap's tooltip reads, and the controller is what
-        # makes one: Bootstrap never wires a tooltip on its own.
-        { controller: 'tooltip', bs_placement: 'top', bs_title: title }
+        icon_tag concept, label: title, role: :img, data: tooltip_data(title, placement: 'top'), **
       end
     end
   end

data/lib/recourse/helpers/tabs.rb

@@ -14,7 +14,7 @@ module Recourse
         association = nested_association record, name if action == :index
         return association_tab_label record, association, namespace if association
 
-        routed_tab_name name, namespace, action
+        tab_label_for Recourse.known_icon(name), routed_tab_name(name, namespace, action)
       end
 
       def nested_association(record, name)
@@ -36,15 +36,19 @@ module Recourse
         [lead.presence&.upcase_first, title].compact.join ' '
       end
 
-      # The icon is the counted model's own, whatever leads the words beside it. The
-      # words are wrapped where a picture or a figure stands beside them, so a phone,
-      # which has room for neither, keeps the picture and the figure and drops the words.
-      # A figure and its words share one element: the link lays its children out with a
-      # gap, and two of them would stand a gap and a space apart.
+      # The icon is the counted model's own, whatever leads the words beside it.
       def association_tab_label(record, association, namespace)
         icon = Recourse.known_model_icon association.klass
         count = tab_count record, association
-        words = tab_words association, namespace, count
+
+        tab_label_for icon, tab_words(association, namespace, count), count
+      end
+
+      # The words with whatever stands beside them. The words are wrapped where a picture
+      # or a figure does, so a phone, which has room for neither, keeps the picture and the
+      # figure and drops the words. A figure and its words share one element: the link lays
+      # 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
 

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 = '5.12.2'
+  VERSION = '6.0.0'
 end

data/lib/recourse.rb

@@ -1,3 +1,4 @@
+require 'bh'
 require 'pagy'
 # Before searchable.rb, so its `extend` lands ahead of Ransack's own defaults.
 require 'ransack'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: recourse
 version: !ruby/object:Gem::Version
-  version: 5.12.2
+  version: 6.0.0
 platform: ruby
 authors:
 - claudiob
@@ -37,6 +37,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '8.1'
+- !ruby/object:Gem::Dependency
+  name: bh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.7'
 - !ruby/object:Gem::Dependency
   name: pagy
   requirement: !ruby/object:Gem::Requirement
@@ -144,7 +158,6 @@ files:
 - app/views/recourses/_color.html.erb
 - app/views/recourses/_combobox.html.erb
 - app/views/recourses/_fields.html.erb
-- app/views/recourses/_flash.html.erb
 - app/views/recourses/_footer.html.erb
 - app/views/recourses/_form.html.erb
 - app/views/recourses/_map.html.erb

data/app/views/recourses/_flash.html.erb

@@ -1,27 +0,0 @@
-<% if flash.any? -%>
-  <%# `data-turbo-temporary`: a toast born visible would otherwise replay from the
-      page snapshot on every Back, announcing a save that happened a page ago. -%>
-  <%# The row a write landed on rides here rather than on a toast: this exists once
-      per page, `hidden.bs.toast` bubbles up to it from whichever toast hides, and
-      `data-turbo-temporary` already takes the whole thing away on a Back. The same
-      key carries the record's words and its page, which the notice below links. -%>
-  <div class='toast-container position-fixed bottom-0 end-0 p-3' data-turbo-temporary
-       <%= tag.attributes data: written_data %>>
-    <%# Every key here becomes a toast, whoever invented it — so the one carrying the
-        written row, which is data rather than a message, is taken out first. -%>
-    <% flash.to_hash.except(Recourse::WRITTEN).each do |key, message| -%>
-      <%# `fade show` from the server: visible at first paint, before any JavaScript.
-          The `toast` controller owns the timed hide, and hovering or focusing holds
-          the toast open while someone reads it or aims for the X. -%>
-      <div class='toast fade show <%= flash_theme key %>' role='alert' aria-live='assertive' aria-atomic='true'
-           data-controller='toast'
-           data-action='mouseenter->toast#stopTimer mouseleave->toast#startTimer focusin->toast#stopTimer focusout->toast#startTimer'>
-        <div class='toast-header border-0'>
-          <span class='me-auto'><%= written_message key, message %></span>
-          <button type='button' class='btn-close' data-bs-dismiss='toast' aria-label='Close'></button>
-        </div>
-        <div class='toast-body d-none'></div>
-      </div>
-    <% end -%>
-  </div>
-<% end -%>