phlex-hanami 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bb01643b7c075e6b220c2d7ad70e885caba136346380f4236f716350ff7de98
-  data.tar.gz: fc0766f20a6709feae68138171b2f0e15723c59c30adf90fcfaa4dfef8bc8986
+  metadata.gz: af266b5dd1d9a3b34563f84a472fe71d4e49cd1d2ea4e64982c61631bed12730
+  data.tar.gz: 88d3d2d0fa2aae7942f8d1d6c11386dcc06d7cae3ad7a8cff0de4647e0addbe2
 SHA512:
-  metadata.gz: d30170e3f93a92fdde6d70db733abc97a3384673e9bffa8629737a972aacf2194f1791fe8335a1889c8ed69ec05796c87e8c503e248bc77f3ff2bffb8c46d213
-  data.tar.gz: 12d33fe3ddf6952ea5714be91db82b954db1848d2bad93e74bbaa8c5b1643c66ec68bf5ad9e3e9c1db0a02ca7f5ee4822c3863c899b6d2d9f1345dbf2f7457e2
+  metadata.gz: 74cef7af6b2d42741c0d900c1772c3cf8a58a07ed3a5eac60fb4e8a1da72b57b0ba3a613f3be2bba92db3aa35fd3c93b914b222b724384edfc7c1843d42c2d90
+  data.tar.gz: 0e9b852908aa28e2f236637093642ad2d4b8f22c4e6a9711fea40d7f7789e406a3aacb85c9fc0109d2d19a7a217e3951a34f6e8823c6db5172d9e14ebe7c4931

data/CHANGELOG.md

@@ -7,6 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v0.3.0] - 2026-10-07
+
+### Changed
+
+- A view's `routes`, `path` and `url` now use the app's routes, even in a slice with a routes file of its own. That
+  slice's own routes knew only its own names and dropped the prefix it is mounted at, so `path(:posts)` in a slice
+  mounted at `/blog` gave `"/posts"`. A view now names the route the way an action does: `path(:blog_posts)` gives
+  `"/blog/posts"`. Slices mounted at `"/"` keep their names. With hanami-view bundled, Hanami builds the context, so
+  the fix comes with Hanami's next release. ([#7](https://github.com/aaronmallen/phlex-hanami/issues/7))
+
+### Fixed
+
+- Mail views and layouts follow `config.actions.view_name_inference_base`. A slice that sets it to `"ui.views"` now
+  finds `ui.views.mailers.welcome`, `ui.views.layout` and `ui.views.mailers.layout`, where before it looked only
+  under `views`. ([#6](https://github.com/aaronmallen/phlex-hanami/issues/6))
+
 ## [v0.2.2] - 2026-09-26
 
 ### Added
@@ -130,7 +146,8 @@ Initial alpha release by the new maintainer [@aaronmallen](https://github.com/aa
 
 Initial release, by the previous maintainer [@stephannv](https://github.com/stephannv).
 
-[Unreleased]: https://github.com/aaronmallen/phlex-hanami/compare/0.2.2...HEAD
+[Unreleased]: https://github.com/aaronmallen/phlex-hanami/compare/0.3.0...HEAD
+[v0.3.0]: https://github.com/aaronmallen/phlex-hanami/compare/0.2.2...0.3.0
 [v0.2.2]: https://github.com/aaronmallen/phlex-hanami/compare/0.2.1...0.2.2
 [v0.2.1]: https://github.com/aaronmallen/phlex-hanami/compare/0.2.0...0.2.1
 [v0.2.0]: https://github.com/aaronmallen/phlex-hanami/compare/0.2.0-alpha.3...0.2.0

data/lib/phlex/hanami/extensions/mailer.rb

@@ -42,8 +42,10 @@ module Phlex
           #
           # The key is derived the way hanami-mailer derives a template name: underscore the class
           # name and drop the slice's own segment, so `MyApp::Mailers::Welcome` looks up
-          # `views.mailers.welcome`. Resolved through the container on every call rather than
-          # memoized, so code reloading is not defeated.
+          # `views.mailers.welcome`. The `views` is the slice's
+          # `config.actions.view_name_inference_base`, so mail views live where action views do.
+          # Resolved through the container on every call rather than memoized, so code reloading is
+          # not defeated.
           #
           # @return [Class, nil]
           #
@@ -56,7 +58,7 @@ module Phlex
             mailer_slice = slice
             return nil unless mailer_slice && name
 
-            key = "views.#{view_name(mailer_slice)}"
+            key = Extensions::Slice.view_key(mailer_slice, view_name(mailer_slice))
             return nil unless mailer_slice.key?(key)
 
             view = mailer_slice[key]

data/lib/phlex/hanami/extensions/slice.rb

@@ -109,6 +109,26 @@ module Phlex
             define_view_context(slice)
           end
 
+          # The container key for a view, under the base Hanami pairs an action's view with.
+          #
+          # Reads `config.actions.view_name_inference_base`, so a slice that keeps its views under
+          # `ui.views` finds its layouts and mail views there too. Falls back to `views` when
+          # hanami-action is not bundled, because Hanami has no such setting then.
+          #
+          # @example
+          #   Slice.view_key(MyApp::App, "mailers.welcome") # => "views.mailers.welcome"
+          #
+          # @return [String]
+          #
+          # @api private
+          # @since 0.3.0
+          #: (singleton(::Hanami::Slice), String) -> String
+          def view_key(slice, name)
+            actions = slice.config.actions
+            base = actions.respond_to?(:view_name_inference_base) ? actions.view_name_inference_base : "views"
+            [base, name].compact.join(".")
+          end
+
           private
 
           #: (singleton(::Hanami::Slice)) -> Module

data/lib/phlex/hanami/mailer/renderable.rb

@@ -59,7 +59,8 @@ module Phlex
 
           private
 
-          # A slice's conventional mail layout: `Views::Mailers::Layout`, if it defines one.
+          # A slice's conventional mail layout: `views.mailers.layout` in its container, if it has
+          # one, under whatever base the slice pairs action views with.
           #
           # The web layout is the wrong one for an email — it carries the stylesheets, scripts and
           # page chrome no mail client wants — so mail looks for its own, and renders without a
@@ -67,13 +68,9 @@ module Phlex
           #: () -> singleton(::Phlex::SGML)?
           def default_layout
             return nil unless slice
-            return nil unless slice.namespace.const_defined?(:Views, false)
 
-            views = slice.namespace.const_get(:Views, false)
-            return nil unless views.const_defined?(:Mailers, false)
-
-            mailers = views.const_get(:Mailers, false)
-            mailers.const_get(:Layout, false) if mailers.const_defined?(:Layout, false)
+            key = Extensions::Slice.view_key(slice, "mailers.layout")
+            slice[key] if slice.key?(key)
           end
 
           # The slice's view context, built without a request.

data/lib/phlex/hanami/renderable.rb

@@ -140,15 +140,15 @@ module Phlex
           input.slice(*parameters.filter_map { |type, name| name if KEYWORD_TYPES.include?(type) })
         end
 
-        # The slice's conventional layout: `Views::Layout` in the slice's namespace, if it defines
-        # one. Resolved on each call rather than memoized, so code reloading is not defeated.
+        # The slice's conventional layout: `views.layout` in its container, if it has one, under
+        # whatever base the slice pairs action views with. Resolved on each call rather than
+        # memoized, so code reloading is not defeated.
         #: () -> singleton(::Phlex::SGML)?
         def default_layout
           return nil unless slice
-          return nil unless slice.namespace.const_defined?(:Views, false)
 
-          views = slice.namespace.const_get(:Views, false)
-          views.const_get(:Layout, false) if views.const_defined?(:Layout, false)
+          key = Extensions::Slice.view_key(slice, "layout")
+          slice[key] if slice.key?(key)
         end
       end
     end

data/lib/phlex/hanami/slice_configured_context.rb

@@ -69,9 +69,12 @@ module Phlex
         slice["i18n"] if slice.key?("i18n")
       end
 
+      # Resolves from the app, not the slice. A slice with its own routes file registers its own
+      # "routes", which knows only that slice's names and none of the prefix it is mounted at.
+      # Actions resolve the app's, so this keeps a view and an action in the same slice in step.
       #: () -> ::Hanami::Slice::RoutesHelper?
       def resolve_routes
-        slice["routes"] if slice.key?("routes")
+        slice.app["routes"] if slice.app.key?("routes")
       end
     end
   end

data/sig/phlex/hanami/extensions/slice.rbs

@@ -14,6 +14,8 @@ module Phlex
 
         def self.view_context_class: (singleton(::Hanami::Slice)) -> (singleton(::Hanami::View::Context) | singleton(Context))
 
+        def self.view_key: (singleton(::Hanami::Slice), String) -> String
+
         private def self.views_namespace: (singleton(::Hanami::Slice)) -> Module
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phlex-hanami
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Aaron Allen