arbre 1.1.1 → 1.2.0.rc1

data/lib/arbre/context.rb

@@ -42,7 +42,7 @@ module Arbre
       @_current_arbre_element_buffer = [self]
 
       super(self)
-      instance_eval &block if block_given?
+      instance_eval(&block) if block_given?
     end
 
     def arbre_context

data/lib/arbre/element.rb

@@ -7,12 +7,13 @@ module Arbre
   class Element
     include BuilderMethods
 
-    attr_accessor :parent
+    attr_reader :parent
     attr_reader :children, :arbre_context
 
     def initialize(arbre_context = Arbre::Context.new)
       @arbre_context = arbre_context
       @children = ElementCollection.new
+      @parent = nil
     end
 
     def assigns
@@ -177,11 +178,20 @@ module Arbre
       elsif assigns && assigns.has_key?(name)
         assigns[name]
       elsif helpers.respond_to?(name)
-        helpers.send(name, *args, &block)
+        helper_capture(name, *args, &block)
       else
         super
       end
     end
 
+    # The helper might have a block that builds Arbre elements
+    # which will be rendered (#to_s) inside ActionView::Base#capture.
+    # We do not want such elements added to self, so we push a dummy
+    # current_arbre_element.
+    def helper_capture(name, *args, &block)
+      s = ""
+      within(Element.new) { s = helpers.send(name, *args, &block) }
+      s.is_a?(Element) ? s.to_s : s
+    end
   end
 end

data/lib/arbre/element/builder_methods.rb

@@ -65,17 +65,16 @@ module Arbre
       # Returns true if the object should be converted into a text node
       # and appended into the DOM.
       def appendable_tag?(tag)
-        is_appendable = !tag.is_a?(Arbre::Element) && tag.respond_to?(:to_s)
-
-        # In ruby 1.9, Arraay.new.to_s prints out an empty array ("[]"). In
+        # Array.new.to_s prints out an empty array ("[]"). In
         # Arbre, we append the return value of blocks to the output, which
         # can cause empty arrays to show up within the output. To get
         # around this, we check if the object responds to #empty?
         if tag.respond_to?(:empty?) && tag.empty?
-          is_appendable = false
+          false
+        else
+          !tag.is_a?(Arbre::Element) && tag.respond_to?(:to_s)
         end
 
-        is_appendable
       end
     end
 

data/lib/arbre/rails/template_handler.rb

@@ -1,10 +1,30 @@
+# frozen_string_literal: true
+
+ActionView::Base.class_eval do
+  def capture(*args)
+    value = nil
+    buffer = with_output_buffer { value = yield(*args) }
+
+    # Override to handle Arbre elements inside helper blocks.
+    # See https://github.com/rails/rails/issues/17661
+    # and https://github.com/rails/rails/pull/18024#commitcomment-8975180
+    value = value.to_s if value.is_a?(Arbre::Element)
+
+    if (string = buffer.presence || value) && string.is_a?(String)
+      ERB::Util.html_escape string
+    end
+  end
+end
+
 module Arbre
   module Rails
     class TemplateHandler
-      def call(template)
+      def call(template, source = nil)
+        source = template.source unless source
+
         <<-END
         Arbre::Context.new(assigns, self) {
-          #{template.source}
+          #{source}
         }.to_s
         END
       end

data/lib/arbre/version.rb

@@ -1,3 +1,3 @@
 module Arbre
-  VERSION = "1.1.1"
+  VERSION = "1.2.0.rc1"
 end

data/spec/arbre/integration/html_spec.rb

@@ -16,11 +16,11 @@ describe Arbre do
       span do
         span "Hello World"
       end
-    }.to_s).to eq <<-HTML
-<span>
-  <span>Hello World</span>
-</span>
-HTML
+    }.to_s).to eq <<~HTML
+      <span>
+        <span>Hello World</span>
+      </span>
+    HTML
   end
 
   it "should render an unordered list" do
@@ -30,31 +30,30 @@ HTML
         li "Second"
         li "Third"
       end
-    }.to_s).to eq <<-HTML
-<ul>
-  <li>First</li>
-  <li>Second</li>
-  <li>Third</li>
-</ul>
-HTML
+    }.to_s).to eq <<~HTML
+      <ul>
+        <li>First</li>
+        <li>Second</li>
+        <li>Third</li>
+      </ul>
+    HTML
   end
 
-   it "should allow local variables inside the tags" do
-     expect(arbre {
-       first = "First"
-       second = "Second"
-       ul do
-         li first
-         li second
-       end
-     }.to_s).to eq <<-HTML
-<ul>
-  <li>First</li>
-  <li>Second</li>
-</ul>
-HTML
-   end
-
+  it "should allow local variables inside the tags" do
+    expect(arbre {
+      first = "First"
+      second = "Second"
+      ul do
+        li first
+        li second
+      end
+    }.to_s).to eq <<~HTML
+      <ul>
+        <li>First</li>
+        <li>Second</li>
+      </ul>
+    HTML
+  end
 
   it "should add children and nested" do
     expect(arbre {
@@ -64,14 +63,14 @@ HTML
           li
         end
       end
-    }.to_s).to eq <<-HTML
-<div>
-  <ul></ul>
-  <li>
-    <li></li>
-  </li>
-</div>
-HTML
+    }.to_s).to eq <<~HTML
+      <div>
+        <ul></ul>
+        <li>
+          <li></li>
+        </li>
+      </div>
+    HTML
   end
 
 
@@ -82,13 +81,13 @@ HTML
           li
         end
       end
-    }.to_s).to eq <<-HTML
-<div>
-  <ul>
-    <li></li>
-  </ul>
-</div>
-HTML
+    }.to_s).to eq <<~HTML
+      <div>
+        <ul>
+          <li></li>
+        </ul>
+      </div>
+    HTML
   end
 
 
@@ -97,15 +96,15 @@ HTML
       div do
         span(ul(li))
       end
-    }.to_s).to eq <<-HTML
-<div>
-  <span>
-    <ul>
-      <li></li>
-    </ul>
-  </span>
-</div>
-HTML
+    }.to_s).to eq <<~HTML
+      <div>
+        <span>
+          <ul>
+            <li></li>
+          </ul>
+        </span>
+      </div>
+    HTML
   end
 
   it "should add content to the parent if the element is passed into block" do
@@ -116,13 +115,13 @@ HTML
           li
         end
       end
-    }.to_s).to eq <<-HTML
-<div id="my-tag">
-  <ul>
-    <li></li>
-  </ul>
-</div>
-HTML
+    }.to_s).to eq <<~HTML
+      <div id="my-tag">
+        <ul>
+          <li></li>
+        </ul>
+      </div>
+    HTML
   end
 
   it "should have the parent set on it" do
@@ -141,9 +140,9 @@ HTML
       li do
         "Hello World"
       end
-    }.to_s).to eq <<-HTML
-<li>Hello World</li>
-HTML
+    }.to_s).to eq <<~HTML
+      <li>Hello World</li>
+    HTML
   end
 
   it "should turn string return values into text nodes" do
@@ -162,9 +161,9 @@ HTML
       tbody do
         []
       end
-    }.to_s).to eq <<-HTML
-<tbody></tbody>
-HTML
+    }.to_s).to eq <<~HTML
+      <tbody></tbody>
+    HTML
   end
 
   describe "self-closing nodes" do
@@ -202,9 +201,9 @@ HTML
     it "should escape the contents" do
       expect(arbre {
         span("<br />")
-      }.to_s).to eq <<-HTML
-<span>&lt;br /&gt;</span>
-HTML
+      }.to_s).to eq <<~HTML
+        <span>&lt;br /&gt;</span>
+      HTML
     end
 
     it "should return html safe strings" do
@@ -216,11 +215,11 @@ HTML
     it "should not escape html passed in" do
       expect(arbre {
         span(span("<br />"))
-      }.to_s).to eq <<-HTML
-<span>
-  <span>&lt;br /&gt;</span>
-</span>
-HTML
+      }.to_s).to eq <<~HTML
+        <span>
+          <span>&lt;br /&gt;</span>
+        </span>
+      HTML
     end
 
     it "should escape string contents when passed in block" do
@@ -230,19 +229,19 @@ HTML
             "<br />"
           }
         }
-      }.to_s).to eq <<-HTML
-<span>
-  <span>&lt;br /&gt;</span>
-</span>
-HTML
+      }.to_s).to eq <<~HTML
+        <span>
+          <span>&lt;br /&gt;</span>
+        </span>
+      HTML
     end
 
     it "should escape the contents of attributes" do
       expect(arbre {
         span(class: "<br />")
-      }.to_s).to eq <<-HTML
-<span class="&lt;br /&gt;"></span>
-HTML
+      }.to_s).to eq <<~HTML
+        <span class="&lt;br /&gt;"></span>
+      HTML
     end
 
   end

data/spec/arbre/unit/component_spec.rb

@@ -34,11 +34,11 @@ describe Arbre::Component do
   it "should render the object using the builder method name" do
     comp = expect(arbre {
       mock_component
-    }.to_s).to eq <<-HTML
-<div class="mock_component">
-  <h2>Hello World</h2>
-</div>
-HTML
+    }.to_s).to eq <<~HTML
+      <div class="mock_component">
+        <h2>Hello World</h2>
+      </div>
+      HTML
   end
 
 end

data/spec/changelog_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe "Changelog" do
+  subject(:changelog) do
+    path = File.join(File.dirname(__dir__), "CHANGELOG.md")
+    File.read(path)
+  end
+
+  it 'has definitions for all implicit links' do
+    implicit_link_names = changelog.scan(/\[([^\]]+)\]\[\]/).flatten.uniq
+    implicit_link_names.each do |name|
+      expect(changelog).to include("[#{name}]: https")
+    end
+  end
+
+  describe 'entry' do
+    let(:lines) { changelog.each_line }
+
+    subject(:entries) { lines.grep(/^\*/) }
+
+    it 'does not end with a punctuation' do
+      entries.each do |entry|
+        expect(entry).not_to match(/\.$/)
+      end
+    end
+  end
+end

data/spec/rails/integration/rendering_spec.rb

@@ -30,54 +30,85 @@ class TestController < ActionController::Base
     @my_instance_var = "From Instance Var"
     render "arbre/page_with_arb_partial_and_assignment"
   end
+
+  def render_page_with_helpers
+    render "arbre/page_with_helpers"
+  end
 end
 
 
 describe TestController, "Rendering with Arbre", type: :request do
   let(:body){ response.body }
 
+  before do
+    Rails.application.routes.draw do
+      get 'test/render_empty', controller: "test"
+      get 'test/render_simple_page', controller: "test"
+      get 'test/render_partial', controller: "test"
+      get 'test/render_erb_partial', controller: "test"
+      get 'test/render_with_instance_variable', controller: "test"
+      get 'test/render_partial_with_instance_variable', controller: "test"
+      get 'test/render_page_with_helpers', controller: "test"
+    end
+  end
+
+  after do
+    Rails.application.reload_routes!
+  end
+
   it "should render the empty template" do
     get "/test/render_empty"
-    expect(response).to be_success
+    expect(response).to be_successful
   end
 
   it "should render a simple page" do
     get "/test/render_simple_page"
-    expect(response).to be_success
+    expect(response).to be_successful
     expect(body).to have_selector("h1", text: "Hello World")
     expect(body).to have_selector("p", text: "Hello again!")
   end
 
   it "should render an arb partial" do
     get "/test/render_partial"
-    expect(response).to be_success
-    expect(body).to eq <<-EOS
-<h1>Before Partial</h1>
-<p>Hello from a partial</p>
-<h2>After Partial</h2>
-EOS
+    expect(response).to be_successful
+    expect(body).to eq <<~HTML
+      <h1>Before Partial</h1>
+      <p>Hello from a partial</p>
+      <h2>After Partial</h2>
+    HTML
   end
 
   it "should render an erb (or other) partial" do
     get "/test/render_erb_partial"
-    expect(response).to be_success
-    expect(body).to eq <<-EOS
-<h1>Before Partial</h1>
-<p>Hello from an erb partial</p>
-<h2>After Partial</h2>
-EOS
+    expect(response).to be_successful
+    expect(body).to eq <<~HTML
+      <h1>Before Partial</h1>
+      <p>Hello from an erb partial</p>
+      <h2>After Partial</h2>
+    HTML
   end
 
   it "should render with instance variables" do
     get "/test/render_with_instance_variable"
-    expect(response).to be_success
+    expect(response).to be_successful
     expect(body).to have_selector("h1", text: "From Instance Var")
   end
 
   it "should render an arbre partial with assignments" do
     get "/test/render_partial_with_instance_variable"
-    expect(response).to be_success
+    expect(response).to be_successful
     expect(body).to have_selector("p", text: "Partial: From Instance Var")
   end
 
+  it "should render a page with helpers" do
+    get "/test/render_page_with_helpers"
+    expect(response).to be_successful
+    expect(body).to eq <<~HTML
+      <span>before h1 link</span>
+      <h1><a href="/h1_link_path">h1 link text</a></h1>
+      <span>before link_to block</span>
+      <a href="/link_path">  <i class=\"link-class\">Link text</i>
+      </a><span>at end</span>
+    HTML
+  end
 end