arbre 1.0.0.rc1 → 1.0.0.rc2

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+## 1.0.0.rc2
+
+  * Fixed bug where Component's build methods were being rendered within the
+    parent context.
+
+## 1.0.0.rc1
+
+Initial release and extraction from Active Admin

data/lib/arbre/element/builder_methods.rb

@@ -23,21 +23,12 @@ module Arbre
         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
 

data/lib/arbre/version.rb

@@ -1,3 +1,3 @@
 module Arbre
-  VERSION = "1.0.0.rc1"
+  VERSION = "1.0.0.rc2"
 end

data/spec/arbre/unit/{component.rb → 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 @@ describe Arbre::Component do
     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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arbre
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70148646136380 !ruby/object:Gem::Requirement
+  requirement: &70272484758820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70148646136380
+  version_requirements: *70272484758820
 description: An Object Oriented DOM Tree in Ruby
 email:
 - gregdbell@gmail.com
@@ -31,6 +31,7 @@ extra_rdoc_files: []
 files:
 - .DS_Store
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - README.rdoc
 - Rakefile
@@ -54,7 +55,7 @@ files:
 - lib/arbre/rails/template_handler.rb
 - lib/arbre/version.rb
 - spec/arbre/integration/html_spec.rb
-- spec/arbre/unit/component.rb
+- spec/arbre/unit/component_spec.rb
 - spec/arbre/unit/context_spec.rb
 - spec/arbre/unit/element_finder_methods_spec.rb
 - spec/arbre/unit/element_spec.rb
@@ -104,7 +105,7 @@ specification_version: 3
 summary: An Object Oriented DOM Tree in Ruby
 test_files:
 - spec/arbre/integration/html_spec.rb
-- spec/arbre/unit/component.rb
+- spec/arbre/unit/component_spec.rb
 - spec/arbre/unit/context_spec.rb
 - spec/arbre/unit/element_finder_methods_spec.rb
 - spec/arbre/unit/element_spec.rb