hanami-view 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3551aaf55b76ccc3396f09f954804be884cad50f774f8ae68b980799d9699de4
-  data.tar.gz: '08012b7065f9b8015cf2f274d595b7d6f6830c8071d23285ba268bc7ca7e99b7'
+  metadata.gz: cfd4f5b396df91cbef8969c45d2619115365a83856411998e92f9bf9ba35d027
+  data.tar.gz: fd73d60f403a32f11a4261caf786dc33ba7f53c891edbf50dfcfe44f2445fb5c
 SHA512:
-  metadata.gz: eb475608c10965166e12c6477793e6b47241f7888b4800f84b3e10075ae6f6a3d14494df18c607e0ce6f8514be450c201eaea5f4cb46203d6fea8af1e5073315
-  data.tar.gz: 11f2b19132241ce7ce76c928ef5be1f4a11dc849411b20d90197fa7c7168c3c2068da219d63150a6bac21d64244b6edd167eeced1442315eeaa7db8be07c335f
+  metadata.gz: c7958b7d98292e6595c0abde96ce7ba136d2ac75d2036d415668ded39a6a44435349b5fa6ea0bf87486e3a7c55ff54bce5be971a62bc7b70e5d2cad18dad4ff9
+  data.tar.gz: 4baa7d74944594e1af1357ed042b1cae7cc1577200e026f9da575142ac199824dece54a67158bf1a3e1f1a698ac72774e01433d20052d306fa8d3a0a670d08e4

data/CHANGELOG.md

@@ -19,7 +19,18 @@ and this project adheres to [Break Versioning](https://www.taoensso.com/break-ve
 
 ### Security
 
-[Unreleased]: https://github.com/hanami/view/compare/v3.0.0...HEAD
+[Unreleased]: https://github.com/hanami/view/compare/v3.0.1...HEAD
+
+## [3.0.1] - 2026-08-14
+
+### Fixed
+
+- Report the calling template as the current template name inside blocks passed to `render`, instead of the partial the block is yielded into. (@timriley in #281)
+- Look up bare-named partials in the directory containing the template that renders them, instead of a same-named directory at the root. (@timriley in #282)
+
+    Previously, a partial rendered via a relative path (e.g. `render("shared/fields")` from `posts/show`) would look for its own bare-named partials under `shared/` at the root, rather than `posts/shared/`.
+
+[3.0.1]: https://github.com/hanami/view/compare/v3.0.0...v3.0.1
 
 ## [3.0.0] - 2026-06-30
 

data/lib/hanami/view/renderer.rb

@@ -16,7 +16,7 @@ module Hanami
     #   rendered, its parent directory (e.g. `"users"` for `"users/index"`) is pushed onto the stack
     #   so that a partial referenced by its bare name (e.g. `render("form")` from inside
     #   `users/index.html.erb`) can be found alongside the template that renders it. The stack is
-    #    snapshot-and-restored around each render via `ensure`.
+    #   snapshot-and-restored around each render via `ensure`.
     #
     # `#lookup` tries every combination of a path and a prefix, joining each pair with the
     # requested name to find a matching file. `paths` are checked in configured order; an earlier
@@ -48,20 +48,21 @@ module Hanami
 
       def template(name, format, scope, &block)
         old_prefixes = @prefixes.dup
+        old_template_names = @current_template_names
 
         result = lookup(name, format)
         raise TemplateNotFoundError.new(name, format, config_data.paths) unless result
 
         template_path, relative_path = result
 
-        new_prefix = File.dirname(name)
+        new_prefix = File.dirname(relative_path)
         @prefixes << new_prefix unless @prefixes.include?(new_prefix)
-        @current_template_names << resolve_template_name(relative_path)
+        @current_template_names = old_template_names + [resolve_template_name(relative_path)]
 
-        render(template_path, scope, &block)
+        render(template_path, scope, &yielded_block(block, old_template_names))
       ensure
         @prefixes = old_prefixes
-        @current_template_names.pop if result
+        @current_template_names = old_template_names
       end
 
       def partial(name, format, scope, &block)
@@ -107,6 +108,28 @@ module Hanami
         }
       end
 
+      # Wraps a block yielded into a template so that, while it runs, `#current_template_name`
+      # reports the template that _wrote_ the block, not the one yielding to it.
+      #
+      # A block passed to `render` is written inside the calling template, so its contents belong to
+      # that template even though they're evaluated during the rendering of another.
+      #
+      # @return [Proc, nil]
+      def yielded_block(block, caller_template_names)
+        return nil unless block
+
+        proc { |*args|
+          yielding_template_names = @current_template_names
+          @current_template_names = caller_template_names
+
+          begin
+            block.call(*args)
+          ensure
+            @current_template_names = yielding_template_names
+          end
+        }
+      end
+
       # Derives the rendered template's name from its relative path, suitable for tracking on
       # `@current_template_names` and surfacing via `#current_template_name`.
       #

data/lib/hanami/view/version.rb

@@ -3,6 +3,6 @@
 module Hanami
   class View
     # @api public
-    VERSION = "3.0.0"
+    VERSION = "3.0.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hanami-view
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Hanakai team