homura-runtime 0.2.18 → 0.2.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bd6f3a366405aeb0ba2673c4827c7d34d8bef757d9194c64e71ca881bfe821f
-  data.tar.gz: 1ccc18ce83b42969bac914ecda37c21cdbfe79fd86971a1de1df1b25c3014302
+  metadata.gz: c353eae6d02619f499bf359610f28d12c0824415cc584e835dd0440d6807cff6
+  data.tar.gz: 998317164a89b71d98f01275a20dd1482d7ccf464c8ebef1095555db669765be
 SHA512:
-  metadata.gz: 777ce1497af06f6a5168bef5e195576fcdbd216a7da25b5d0eda657fea4757f074fb48f873f28eb3f6c5854c5ce98bf1f01dfa870b31a067eab93ef7dd8b9dce
-  data.tar.gz: 6a9e88cbfea6b27e46dc35c1bdb24bc02cdba8899839066d9d547057e18d9d67a319fdabed88a4ad36f852af49fd97bf41ef3aad964b720333bdd29c5c1438f6
+  metadata.gz: f6b0a9a1f4d55913deb468056980e70c3913ef7397603f1b9ee156241cf6d55cdd7eb6cb94cf54513c1d293816a9f69d455e36731f013c648a4716bec49f0972
+  data.tar.gz: 19e6c31d9e1fee24749b91a8d3caadb6789d9d05652d76ce2addc9642b892d47ac8fa8fffad7ff9862d309c34d994af9cc5da718b20d6b96bb2e38ce7e492d74

data/exe/compile-erb

@@ -415,6 +415,25 @@ def emit_sinatra_patch(io, namespace)
           end
         end
 
+        # A template is "layout-like" if its name is `:layout` or starts
+        # with `layout_` (e.g. `:layout_docs`). The auto-layout pass in
+        # `erb` skips wrapping such templates in `:layout` so that
+        # rendering `:layout_docs` doesn't end up nested inside `:layout`,
+        # which would otherwise produce a duplicate header / nav.
+        def __homura_layout_template?(template)
+          name = template.to_sym
+          name == :layout || name.to_s.start_with?('layout_')
+        end
+
+        # Rails-/Sinatra-flavoured partial convention: a template name
+        # starting with `_` is treated as a partial (e.g. `_docs_nav`),
+        # so the auto-layout pass leaves it alone. Without this, calling
+        # `<%= erb :_docs_nav %>` from inside a layout template would
+        # rewrap the partial in `:layout`, doubling header/nav output.
+        def __homura_partial_template?(template)
+          template.to_s.start_with?('_')
+        end
+
         # homura patch: dispatch to precompiled templates when we
         # have one. Unknown symbols raise a clear message instead of
         # wandering into upstream Tilt, which would blow up on
@@ -432,7 +451,10 @@ def emit_sinatra_patch(io, namespace)
 
             layout = options[:layout]
             layout = false if layout.nil? && options.include?(:layout)
-            if layout.nil? && template.to_sym != :layout && ::#{namespace}.registered?(:layout)
+            if layout.nil? &&
+               !__homura_layout_template?(template) &&
+               !__homura_partial_template?(template) &&
+               ::#{namespace}.registered?(:layout)
               layout = :layout
             end
             if layout

data/lib/cloudflare_workers/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CloudflareWorkers
-  VERSION = '0.2.18'
+  VERSION = '0.2.20'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: homura-runtime
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.20
 platform: ruby
 authors:
 - Kazuhiro Homma