diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 482e4d44..21c7ef8e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,7 +18,6 @@ jobs: - '3.1' - '3.2' - 'ruby-head' - - 'truffleruby-head' steps: - uses: actions/checkout@v1 diff --git a/lib/rdoc/generator/template/rails/class.rhtml b/lib/rdoc/generator/template/rails/class.rhtml index 205c5e2a..18d4b1bf 100644 --- a/lib/rdoc/generator/template/rails/class.rhtml +++ b/lib/rdoc/generator/template/rails/class.rhtml @@ -4,7 +4,7 @@ <%= page_title @context.full_name %> - <%= render "_head.rhtml", { :tree_keys => @context.full_name.split('::') } %> + <% inline "_head.rhtml", { :tree_keys => @context.full_name.split('::') } %> @@ -13,14 +13,14 @@ Skip to Content Skip to Search - <%= render "_panel.rhtml" %> + <% inline "_panel.rhtml" %>

<%= @context.type %> <%= module_breadcrumbs @context %>

- <%= render "_context.rhtml" %> + <% inline "_context.rhtml" %>
Definition files
<%= more_less_ul @context.in_files.map { |file| link_to file }, 5..9 %> diff --git a/lib/rdoc/generator/template/rails/file.rhtml b/lib/rdoc/generator/template/rails/file.rhtml index c2a5637b..e0802e37 100644 --- a/lib/rdoc/generator/template/rails/file.rhtml +++ b/lib/rdoc/generator/template/rails/file.rhtml @@ -4,7 +4,7 @@ <%= page_title @context.name %> - <%= render "_head.rhtml", { :tree_keys => [] } %> + <% inline "_head.rhtml", { :tree_keys => [] } %> @@ -13,7 +13,7 @@ Skip to Content Skip to Search - <%= render "_panel.rhtml" %> + <% inline "_panel.rhtml" %>
@@ -26,7 +26,7 @@

<%= link_to_external "View on GitHub", source_url %>

<% end %> - <%= render "_context.rhtml" %> + <% inline "_context.rhtml" %>
diff --git a/lib/rdoc/generator/template/rails/index.rhtml b/lib/rdoc/generator/template/rails/index.rhtml index 88ac6c42..e17b1008 100644 --- a/lib/rdoc/generator/template/rails/index.rhtml +++ b/lib/rdoc/generator/template/rails/index.rhtml @@ -4,17 +4,17 @@ <%= page_title %> - <%= render "_head.rhtml", {tree_keys: []} %> + <% inline "_head.rhtml", {tree_keys: []} %> Skip to Content Skip to Search - <%= render "_panel.rhtml" %> + <% inline "_panel.rhtml" %>
- <%= render "_context.rhtml" %> + <% inline "_context.rhtml" %>
diff --git a/lib/sdoc/renderer.rb b/lib/sdoc/renderer.rb index 774df17c..da4cf3b8 100644 --- a/lib/sdoc/renderer.rb +++ b/lib/sdoc/renderer.rb @@ -7,18 +7,29 @@ class SDoc::Renderer def self.compile_erb(path) @compiled_erb ||= {} @compiled_erb[path] ||= begin - erb = ERB.new(File.read(path), trim_mode: "<>") + erb = ERB.new(File.read(path), trim_mode: "<>", eoutvar: "self.buffer") erb.filename = path erb end end + attr_reader :buffer + def buffer=(*); end # Ignore buffer reset from ERB itself. + def initialize(context, rdoc_options) @context = context @options = rdoc_options + @buffer = nil + end + + def render(...) + original_buffer, @buffer = @buffer, +"" + inline(...) + ensure + @buffer = original_buffer end - def render(template_path, local_assigns = {}) + def inline(template_path, local_assigns = {}) template_path = File.expand_path(template_path, @options.template_dir) _binding = binding local_assigns.each { |name, value| _binding.local_variable_set(name, value) } diff --git a/spec/renderer_spec.rb b/spec/renderer_spec.rb index 3e417f1f..2b3dcc7c 100644 --- a/spec/renderer_spec.rb +++ b/spec/renderer_spec.rb @@ -51,5 +51,56 @@ def create_template(name, erb) _(SDoc::Renderer.new(nil, @rdoc_options).render("foo.erb")). must_equal "foo & bar" end + + it "is reentrant" do + create_template "foo.erb", %(1 + 1 = <%= render "two.erb" %>) + create_template "two.erb", %(<%= 1 + 1 %>) + + _(SDoc::Renderer.new(nil, @rdoc_options).render("foo.erb")). + must_equal "1 + 1 = 2" + end + end + + describe "#inline" do + it "supports isolated local variables" do + create_template "outer.erb", %(<%= foo %> <% inline "inner.erb", bar: "BAR" %> <%= foo %>) + create_template "inner.erb", %(<%= foo = bar %>) + + _(SDoc::Renderer.new(nil, @rdoc_options).render("outer.erb", { foo: "FOO" })). + must_equal "FOO BAR FOO" + end + + it "provides access to the same non-local values as #render" do + create_template "outer.erb", %(<% inline "inner.erb" %>) + create_template "inner.erb", %(<%= h @context[:foobar] %>) + + _(SDoc::Renderer.new({ foobar: "foo & bar" }, @rdoc_options).render("outer.erb")). + must_equal "foo & bar" + end + + it "supports yield" do + create_template "outer.erb", '1 <% inline("inner.erb") { 3 } %> 5' + create_template "inner.erb", %(2 <%= yield %> 4) + + _(SDoc::Renderer.new(nil, @rdoc_options).render("outer.erb")). + must_equal "1 2 3 4 5" + end + + it "supports interleaved rendering" do + create_template "outer.erb", '1 <% inline("inner.erb") do %>3<% end %> 5' + create_template "inner.erb", %(2 <% yield %> 4) + + _(SDoc::Renderer.new(nil, @rdoc_options).render("outer.erb")). + must_equal "1 2 3 4 5" + end + + it "supports interleaved rendering with nested #inline calls" do + create_template "outer.erb", '1 <% inline("middle.erb") { inline("inner.erb") } %> 5' + create_template "middle.erb", %(2 <% yield %> 4) + create_template "inner.erb", %(3) + + _(SDoc::Renderer.new(nil, @rdoc_options).render("outer.erb")). + must_equal "1 2 3 4 5" + end end end