homura-runtime 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 328d7e98210fb60bb229a46166aa605b2c9e2a85baca8418cac31a0ac3688311
-  data.tar.gz: 3e3c0562902a031343eddf788a078d1556649c286ec79e44295626a0be2058a3
+  metadata.gz: 6e37f705dbc9ddf448634efe039bcc390d577c1683ad1759db58fdb1fbceee02
+  data.tar.gz: 9dfa51f60c34241302354b5069f10ba560a61c51d4b70a1799893d785d2ae434
 SHA512:
-  metadata.gz: 971c5697869ed0ecc0ba57d6aa5263c6f3b36f5e2bfa0c5e6efc67efe5bb5aade01dd0b522aaa685c4226074924b5a6e8269135fd6a12bdf1f8a6592d3b120cb
-  data.tar.gz: 0ef026fa796bfedb3960b42c1f2ea6a09a1d382d9883d16fd744767d3967a3649f0ee9cb322e80f1ddff6db752f05f12da94c62b04c238fe8f43aa4143b667d8
+  metadata.gz: 0655d2c8e8f889892df7500cfadc663df079be3c7326815523b2fad12cacdce4eb729f859e145bfdc8c26f8ad0bc12bc2d5ee2dfd3acf14e71c82ffafd4057d3
+  data.tar.gz: 93c6e9c5607b995d631060f511633bd94b3fa74f9db3c9adee3806b684a1ea7134b136bde12f9c8a3fa7d1da5f3ff76c95929c253251eb7daf3f1f9685bc5342

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.1.4 (2026-04-23)
+
+- Teach the precompiled ERB runtime to support Sinatra-style layout blocks and
+  `<%= yield %>` in layout templates.
+- Keep legacy `@content` / `@docs_inner` layouts working as compatibility
+  fallbacks while apps migrate to the least-surprise Sinatra style.
+
 ## 0.1.3 (2026-04-23)
 
 - Fix binary static asset embedding so image responses preserve exact bytes on

data/exe/compile-erb

@@ -43,11 +43,21 @@ USAGE
 module HomuraERB
   module_function
 
+  def normalize_fragment(fragment)
+    stripped = fragment.strip
+    return '__homura_template_yield__' if stripped == 'yield' || stripped == 'yield()'
+
+    fragment
+  end
+
   # Compile an ERB source string to a Ruby method body that assembles
   # an HTML string in a local variable `_out`. The body references
   # `@ivars` and method calls directly, so it must be run via
   # `instance_exec` on the Sinatra instance the route was dispatched
-  # on. That gives `<%= @name %>` the usual Sinatra semantics.
+  # on. That gives `<%= @name %>` the usual Sinatra semantics. Layout
+  # templates can also write `<%= yield %>` — we rewrite that specific
+  # form to an instance helper because Ruby's `yield` keyword is not
+  # valid inside the Proc body we generate here.
   def compile(source)
     ruby = +"_out = ''\n"
     cursor = 0
@@ -75,15 +85,15 @@ module HomuraERB
       elsif inner.start_with?('==')
         # `<%== expression %>` — identical to `<%= %>` in this minimal
         # dialect (no HTML escaping yet; the author is responsible).
-        expr = inner[2..].strip
+        expr = normalize_fragment(inner[2..].strip)
         ruby << "_out = _out + ((#{expr})).to_s\n"
       elsif inner.start_with?('=')
         # `<%= expression %>`
-        expr = inner[1..].strip
+        expr = normalize_fragment(inner[1..].strip)
         ruby << "_out = _out + ((#{expr})).to_s\n"
       else
         # `<% code %>` — Ruby statement(s), emitted verbatim
-        ruby << inner.strip << "\n"
+        ruby << normalize_fragment(inner.strip) << "\n"
       end
 
       cursor = close_idx + 2
@@ -142,10 +152,16 @@ def emit_header(io, namespace)
           @templates[name.to_sym] = body
         end
 
-        def render(name, instance, locals = {})
+        def render(name, instance, locals = {}, &block)
           body = @templates[name.to_sym]
           raise "#{namespace}: no template registered for \#{name.inspect}" unless body
-          instance.instance_exec(locals, &body)
+          previous_block = instance.instance_variable_get(:@__homura_template_block__)
+          begin
+            instance.instance_variable_set(:@__homura_template_block__, block)
+            instance.instance_exec(locals, &body)
+          ensure
+            instance.instance_variable_set(:@__homura_template_block__, previous_block)
+          end
         end
 
         def registered?(name)
@@ -187,6 +203,22 @@ def emit_sinatra_patch(io, namespace)
 
     module ::Sinatra
       module Templates
+        def __homura_template_yield__
+          block = @__homura_template_block__
+          raise LocalJumpError, 'no block given' unless block
+
+          block.call
+        end
+
+        def __homura_default_template_block_for__(template)
+          case template.to_sym
+          when :layout
+            proc { @content } if defined?(@content)
+          when :layout_docs
+            proc { @docs_inner } if defined?(@docs_inner)
+          end
+        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
@@ -194,7 +226,20 @@ def emit_sinatra_patch(io, namespace)
         def erb(template, options = {}, locals = {}, &block)
           if template.is_a?(::Symbol) && ::#{namespace}.registered?(template)
             locals ||= {}
-            ::#{namespace}.render(template, self, locals)
+            block ||= __homura_default_template_block_for__(template)
+            output = ::#{namespace}.render(template, self, locals, &block)
+
+            layout = options[:layout]
+            layout = false if layout.nil? && options.include?(:layout)
+            if layout
+              layout = :layout if layout == true
+              layout = layout.to_sym
+              raise "homura: layout \#{layout.inspect} not precompiled; run bin/compile-erb" unless ::#{namespace}.registered?(layout)
+
+              return ::#{namespace}.render(layout, self, locals) { output }
+            end
+
+            output
           else
             raise "homura: erb \#{template.inspect} not precompiled; run bin/compile-erb"
           end

data/lib/cloudflare_workers/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: homura-runtime
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Kazuhiro NISHIYAMA