hibiki_rails 0.12.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 514349fcd04fc813cc4833144b4355c56958e9055dda33aefbdc547517d73bfd
-  data.tar.gz: 1a9729ad926d72f9bdfb1b4411544893f59c3ebb40d2dd552165bed1299218e5
+  metadata.gz: 6b163c0d20f8fcca4839e8cfcae98316cae9b8d01bd4f81eece18e02a9ae39be
+  data.tar.gz: bf61ca3db0cd1ad769a7f5ee931a06362124841e4d62ba0bd55856d892511b85
 SHA512:
-  metadata.gz: eb8e0207e6b1281f7085e7258a9ed189f836b0427ea3172acf3711b118f80f1a0a8fa97474d5f4ff4deaf69ef0bec8d6083f3b09a3ee1178cb836335453f3d76
-  data.tar.gz: 1f4c370144b71c7baea0b3960d69d761b562f6590f281b079f1bf9a26173e7d83c415e262924030e02e4d5bd62876eab7b62c2a12b8a145298ea1d60ff2a5480
+  metadata.gz: 317d9a267de7853075cc35f089099f5f5fc89060afa2db3afd298d8b955f5dd441fdd90d1d2780be561280c6a9e514f827901112ede534a6dd82f06cf763e9a3
+  data.tar.gz: 2623fa07782f9d5264592c4bc3e977cb229967b1810f1b05c121bd16dbbc546335c420fd855751ae0dda71e6a148b648623a010344dbec21283f764f76d9f813

data/CHANGELOG.md

@@ -4,6 +4,48 @@ The gem and the npm package are released in lockstep and share these version
 numbers — `app/assets/javascripts/hibiki.js` is a single copy served both ways,
 so importmap and bundler apps always resolve identical client code.
 
+## 0.14.0 — 2026-09-07
+
+### Changed
+
+**The infinite-scroll Load-more control has a degraded path.** Under
+`--infinite-scroll` the scaffold emitted one button that answered both a
+click and the `visible` sentinel event, and gave it no `fallback:` on
+purpose: a sentinel that navigates on a dead socket would make scrolling
+navigate. Without JavaScript the button rendered and did nothing. The control
+is now two elements. The wrapper (`books_load_more`, the same id) is the
+sentinel and carries only `visible`. A link inside it is the click path, with
+`fallback: true` and a real href: the query already reads `?page=N` as a
+growing window, so a degraded click shows every window up to N, and the
+link's fragment lands on the last row the reader had already seen. The JS
+client is unchanged.
+
+- Both view layers. The Phlex component uses a bare `a`, so no `LinkTo`
+  include; `page_url` is now emitted in both pagination modes.
+- Regenerating an app changes only `_list.html.erb` / `list.rb`. A system
+  test that clicked `#books_load_more button` now clicks the `a`.
+- Docs: the fallback contract in [The JS client] gains the rule — never give
+  a `visible` control a `fallback:`; split it as the scaffold does.
+
+## 0.13.0 — 2026-09-07
+
+### Changed
+
+**The scaffold's query object lives in `app/queries`.** `hibiki:rails:scaffold`
+and `scaffold_controller` write `app/queries/book_query.rb` where they wrote
+`app/models/book_query.rb`. The constant is unchanged. `app/queries` is the
+directory the query-object gems (ARQO, querifier, query_delegator) already
+generate into, so a query one of them writes for the same model meets ours as
+a file conflict instead of a second `BookQuery` that Rails loads first. The
+move costs no extra restart: the scaffold already creates `app/forms`, and one
+restart picks up both.
+
+- Apps scaffolded earlier need nothing. Move the file with `git mv` when
+  convenient; `hibiki:rails:multiselect` and `upload_field` find it in either
+  place.
+- A `--force` re-run writes `app/queries`. Rails autoloads `app/models` first,
+  so the post-install output asks you to delete the old file.
+
 ## 0.12.0 — 2026-09-06
 
 ### Added

data/README.md

@@ -112,8 +112,8 @@ once per app, shared by every generated resource, and wired into your stylesheet
 or layout automatically — the post-install output says which, or gives you the
 line to add when it cannot tell.
 
-Restart the server afterwards: `app/forms/` is new, and Rails works out its
-autoload paths at boot.
+Restart the server afterwards: `app/forms/` and `app/queries/` are new, and
+Rails works out its autoload paths at boot.
 
 ### Render the reactive component
 

data/lib/generators/hibiki/rails/multiselect_injections.rb

@@ -98,7 +98,7 @@ module Hibiki
 
         # Rows are strict_loading, so the display line raises without these.
         def inject_query_preload
-          inject_includes query_path,
+          inject_includes existing_query_path,
                           with_existing: /matched_scope\.includes\(([^)]*)\)/,
                           without: "apply_sort(matched_scope)",
                           wrapped: "apply_sort(matched_scope.includes(:#{association_name}))"

data/lib/generators/hibiki/rails/scaffold/USAGE

@@ -18,7 +18,7 @@ Example:
     This will create:
         db/migrate/XXXXXXXXXXXX_create_books.rb
         app/models/book.rb
-        app/models/book_query.rb
+        app/queries/book_query.rb
         app/channels/books_channel.rb
         app/channels/book_channel.rb
         app/forms/book_form.rb
@@ -28,7 +28,8 @@ Example:
     And add to config/routes.rb:
         resources :books
 
-    Restart the server afterwards if it is running — app/forms is new.
+    Restart the server afterwards if it is running — app/forms and
+    app/queries are new.
 
     Pass --phlex to emit Phlex components under app/views/books/*.rb instead of
     ERB templates. The view layer is the only thing it changes; it needs the

data/lib/generators/hibiki/rails/scaffold_controller/USAGE

@@ -17,7 +17,7 @@ Example:
     bin/rails generate hibiki:rails:scaffold_controller Book
 
     This will create:
-        app/models/book_query.rb
+        app/queries/book_query.rb
         app/channels/books_channel.rb
         app/channels/book_channel.rb
         app/forms/book_form.rb

data/lib/generators/hibiki/rails/scaffold_controller/scaffold_controller_generator.rb

@@ -86,7 +86,7 @@ module Hibiki
           # Captured BEFORE anything is written, so post_install can tell which
           # app/* directories are new — Rails computes autoload paths from that
           # glob at boot, and a new one needs a restart.
-          @new_app_dirs = %w[app/forms app/channels app/models app/views].reject { exists?(it) }
+          @new_app_dirs = %w[app/forms app/queries app/channels app/models app/views].reject { exists?(it) }
         end
 
         # One file per app, not per resource, and the only thing this generator

data/lib/generators/hibiki/rails/scaffold_controller/templates/phlex/shared/views/list.rb.tt

@@ -61,10 +61,11 @@ class <%= view_class_name(:list) %> < Views::Base
     pages = <%= query_class_name %>.page_numbers(page: @page, page_count: @page_count)
 <%= render_call(:pagination, ["page: @page", "page_count: @page_count", "pages: pages", %(anchor: "##{list_dom_id}"), "id: id", "url: page_url"], indent: 4, shared: true) %>
   end
+<% end -%>
 
-  # Real pagination hrefs carrying the current query state — the channel
-  # re-renders them with url_params fresh, so the fallback URLs stay
-  # truthful as the live state moves.
+  # Real hrefs for the <%= infinite? ? "Load-more link" : "page links" %>, carrying the current query
+  # state — the channel re-renders them with url_params fresh, so the
+  # fallback URLs stay truthful as the live state moves.
   def page_url
     ->(n) do
       query = @url_params.except(:page)
@@ -72,19 +73,22 @@ class <%= view_class_name(:list) %> < Views::Base
       <%= index_helper(type: :path) %>(**query)
     end
   end
-<% end -%>
 <% if infinite? -%>
 
-  # `visible` is a pseudo-event backed by an IntersectionObserver, so this
-  # button doubles as the infinite-scroll sentinel. The client stamps
-  # data-hibiki-busy on it while the next page is in flight.
+  # `visible` is a pseudo-event backed by an IntersectionObserver: the wrapper
+  # is the scroll sentinel, the link inside it is the click path and its href
+  # the fallback. A sentinel must never fall back — scrolling into view on a
+  # dead socket would navigate.
   def load_more
-    div<%= arg_list(%(id: "#{load_more_dom_id}"), *css_args(:load_more_wrap)) %> do
-      button<%= arg_list(%(type: "button"), *css_args(:btn_wide), "**on(:go_to_page, event: %i[click visible], with: { page: @page + 1 })", indent: 13) %> do
+    div<%= arg_list(%(id: "#{load_more_dom_id}"), *css_args(:load_more_wrap), "**on(:go_to_page, event: :visible, with: { page: @page + 1 })", indent: 8) %> do
+      # The STRING "false", not the boolean — Phlex omits false-valued attributes.
+      a<%= arg_list("href: load_more_href", *css_args(:btn_wide), "data: { turbo: \"false\" }.merge(on(:go_to_page, with: { page: @page + 1 },\n#{' ' * 42}fallback: true)[:data])", indent: 8) %> do
         plain "Load more"
         span<%= arg_list(*css_args(:muted_inline)) %> { " · #{@remaining} remaining" }
       end
     end
   end
+
+  def load_more_href = "#{page_url.(@page + 1)}#<%= row_dom_id_prefix %>_#{@<%= controller_file_name %>.last.id}"
 <% end -%>
 end

data/lib/generators/hibiki/rails/scaffold_controller/templates/shared/views/_list.html.erb.tt

@@ -3,16 +3,14 @@
 <%%# locals: (<%= list_locals_signature %>) -%>
 <%%# The island's re-rendered fragment. Its root id is the broadcast target —
     deliberately not the island root, which carries the stream source. %>
-<% unless infinite? -%>
-<%%# Real pagination hrefs carrying the current query state — the channel
-    re-renders them with url_params fresh, so the fallback URLs stay
-    truthful as the live state moves. %>
+<%%# Real hrefs for the <%= infinite? ? "Load-more link" : "page links" %>, carrying the current query
+    state — the channel re-renders them with url_params fresh, so the
+    fallback URLs stay truthful as the live state moves. %>
 <%% page_url = ->(n) do
      query = url_params.except(:page)
      query[:page] = n unless n == 1
      <%= index_helper(type: :path) %>(**query)
    end %>
-<% end -%>
 <div id="<%= list_dom_id %>"<%= css_attr(:list) %>>
 <% if inline_create? -%>
   <%%# The inline create form — only the channel ever renders it (the New
@@ -44,20 +42,25 @@
   <%% end %>
 
 <% if infinite? -%>
-  <%%# `visible` is a pseudo-event backed by an IntersectionObserver, so this
-      button doubles as the infinite-scroll sentinel. The client stamps
-      data-hibiki-busy on it while the next page is in flight. %>
+  <%%# `visible` is a pseudo-event backed by an IntersectionObserver: the wrapper
+      is the scroll sentinel, the link inside it is the click path and its href
+      the fallback. A sentinel must never fall back — scrolling into view on a
+      dead socket would navigate. %>
   <%% if remaining.positive? %>
-    <div id="<%= load_more_dom_id %>"<%= css_attr(:load_more_wrap) %>>
-      <%%= tag.button(type: "button",
+    <%%= tag.div(id: "<%= load_more_dom_id %>",
 <% if css? -%>
-                     class: "<%= css(:btn_wide) %>",
+                class: "<%= css(:load_more_wrap) %>",
 <% end -%>
-                     **on(:go_to_page, event: %i[click visible],
-                                       with: { page: page + 1 })) do %>
+                **on(:go_to_page, event: :visible, with: { page: page + 1 })) do %>
+      <%%= link_to "#{page_url.(page + 1)}#<%= row_dom_id_prefix %>_#{<%= controller_file_name %>.last.id}",
+<% if css? -%>
+                  class: "<%= css(:btn_wide) %>",
+<% end -%>
+                  data: { turbo: false }.merge(on(:go_to_page, with: { page: page + 1 },
+                                                  fallback: true)[:data]) do %>
         Load more<span<%= css_attr(:muted_inline) %>>&nbsp;·&nbsp;<%%= remaining %> remaining</span>
       <%% end %>
-    </div>
+    <%% end %>
   <%% end %>
 <% else -%>
   <%%= render "shared/pagination", page: page, page_count: page_count, pages: pages,

data/lib/generators/hibiki/rails/scaffold_helpers.rb

@@ -49,19 +49,26 @@ module Hibiki
         def scaffold_controller_class_name = "#{controller_class_name}Controller"
 
         # ---- destinations ----------------------------------------------------
-        #
-        # The query object goes in app/models, NOT a new app/queries: Rails
-        # computes autoload paths from the app/* glob at boot, so a new
-        # top-level directory is not autoloadable until a server restart.
-        # app/forms already costs one restart; two would be gratuitous.
 
         def view_dir = File.join("app/views", controller_file_path)
         def collection_channel_path = File.join("app/channels", "#{controller_file_path}_channel.rb")
         def member_channel_path = File.join("app/channels", *class_path, "#{file_name}_channel.rb")
         def model_path = File.join("app/models", *class_path, "#{file_name}.rb")
-        def query_path = File.join("app/models", *class_path, "#{file_name}_query.rb")
+        def query_path = File.join("app/queries", *class_path, "#{file_name}_query.rb")
         def form_path = File.join("app/forms", *class_path, "#{file_name}_form.rb")
 
+        # Scaffolds before 0.13.0 wrote the query object to app/models. The
+        # add-on generators read existing_query_path so their injections land
+        # in the file the app loads; the scaffold itself always writes query_path.
+        def legacy_query_path = File.join("app/models", *class_path, "#{file_name}_query.rb")
+
+        def existing_query_path
+          return query_path if File.exist?(File.join(destination_root, query_path))
+          return legacy_query_path if File.exist?(File.join(destination_root, legacy_query_path))
+
+          query_path
+        end
+
         def scaffold_controller_path
           File.join("app/controllers", "#{controller_file_path}_controller.rb")
         end

data/lib/generators/hibiki/rails/scaffold_post_install.rb

@@ -23,6 +23,7 @@ module Hibiki
         # stylesheet, a leftover file. None of them is about the resource.
         def app_notices
           restart_notice
+          stale_query_notice
           # These live with the code that chose their branch, like
           # parent_notices — the outcomes are those modules' vocabulary.
           stylesheet_notice
@@ -49,6 +50,16 @@ module Hibiki
                                "Please restart if the server is running.", :yellow
         end
 
+        # Scaffolds before 0.13.0 wrote the query object to app/models, which
+        # autoloads ahead of app/queries: until the old copy goes, it is the one
+        # the app loads. A generator never deletes.
+        def stale_query_notice
+          return unless exists?(legacy_query_path)
+
+          say_status :stale, "#{legacy_query_path} has moved to #{query_path}. " \
+                             "Please delete the old file.", :yellow
+        end
+
         def rebuild_css_notice
           return unless css?
 

data/lib/generators/hibiki/rails/upload_field_injections.rb

@@ -103,13 +103,14 @@ module Hibiki
         # Rows are strict_loading and frozen, so the thumbnail raises without
         # these — on the index AND on show-page repaints (the member channel).
         def inject_query_preload
-          return if wired?(query_path, /\.#{with_attached}\b/)
+          path = existing_query_path
+          return if wired?(path, /\.#{with_attached}\b/)
 
-          unless wired?(query_path, QUERY_WINDOW_SCOPE)
-            return manual_wiring(query_path, "  # preload the attachment:\n  .#{with_attached}")
+          unless wired?(path, QUERY_WINDOW_SCOPE)
+            return manual_wiring(path, "  # preload the attachment:\n  .#{with_attached}")
           end
 
-          gsub_file(query_path, QUERY_WINDOW_SCOPE) do |match|
+          gsub_file(path, QUERY_WINDOW_SCOPE) do |match|
             head, scope, tail = match.match(QUERY_WINDOW_SCOPE).captures
             "#{head}#{scope}.#{with_attached}#{tail}"
           end

data/lib/hibiki/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Hibiki
   module Rails
-    VERSION = "0.12.0"
+    VERSION = "0.14.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hibiki_rails
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.14.0
 platform: ruby
 authors:
 - planetaska