hibiki_rails 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 514349fcd04fc813cc4833144b4355c56958e9055dda33aefbdc547517d73bfd
-  data.tar.gz: 1a9729ad926d72f9bdfb1b4411544893f59c3ebb40d2dd552165bed1299218e5
+  metadata.gz: dfd1da2a9d64baab573c47345a55fbe7f985c3e6781f2e0d04879043b0889dcc
+  data.tar.gz: f012a899f4c6b675b75102f217dc9e37feaa827e4c63097cc1a86de353dce543
 SHA512:
-  metadata.gz: eb8e0207e6b1281f7085e7258a9ed189f836b0427ea3172acf3711b118f80f1a0a8fa97474d5f4ff4deaf69ef0bec8d6083f3b09a3ee1178cb836335453f3d76
-  data.tar.gz: 1f4c370144b71c7baea0b3960d69d761b562f6590f281b079f1bf9a26173e7d83c415e262924030e02e4d5bd62876eab7b62c2a12b8a145298ea1d60ff2a5480
+  metadata.gz: 46110572a666ccd8f7c44114433259ebb901d50d7625ce7ff3468de7c0a34bbc6038766cf611eb977b1126d54fab8dbc018a55aa0a3aaab91553cf43fdcca048
+  data.tar.gz: 8b71c3b742e04e93b9e58707dcf7ebd1dda9319a0894108e07a5a560008f24591a43969e3ce1c4572e4c3ad76d0cf4fc025dd9fe3f518141bdf870e58261ab73

data/CHANGELOG.md

@@ -4,6 +4,25 @@ 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.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_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.13.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.13.0
 platform: ruby
 authors:
 - planetaska