Component#build now renders in correct context

Before this patch, Component#build's (and any other Element really)
contents were being rendered within the parent context instead of the
child context.

I also refactored and simplified the tag insertion code.

Author: gregbell

lib/arbre/element/builder_methods.rb

@@ -23,21 +23,12 @@ def build_tag(klass, *args, &block)
         tag = klass.new(arbre_context)
         tag.parent = current_arbre_element
 
-        # If you passed in a block and want the object
-        if block_given? && block.arity > 0
-          # Set out context to the tag, and pass responsibility to the tag
-          with_current_arbre_element tag do
+        with_current_arbre_element tag do
+          if block_given? && block.arity > 0
             tag.build(*args, &block)
-          end
-        else
-          # Build the tag
-          tag.build(*args)
-
-          # Render the blocks contents
-          if block_given?
-            with_current_arbre_element tag do
-              append_return_block(yield)
-            end
+          else
+            tag.build(*args)
+            append_return_block(yield) if block_given?
           end
         end
 

spec/arbre/unit/component.rb renamed to spec/arbre/unit/component_spec.rb

@@ -1,10 +1,21 @@
 require 'spec_helper'
 
 # A mock subclass to play with
-class MockComponent < Arbre::Component; end
+class MockComponent < Arbre::Component
+
+  builder_method :mock_component
+
+  def build
+    h2 "Hello World"
+  end
+
+end
 
 describe Arbre::Component do
 
+  let(:assigns) { {} }
+  let(:helpers) { nil }
+
   let(:component_class){ MockComponent }
   let(:component){ component_class.new }
 
@@ -20,4 +31,14 @@ class MockComponent < Arbre::Component; end
     component.class_list.should include("mock_component")
   end
 
+  it "should render the object using the builder method name" do
+    comp = arbre {
+      mock_component
+    }.to_s.should == <<-HTML
+<div class="mock_component">
+  <h2>Hello World</h2>
+</div>
+HTML
+  end
+
 end