Add full template stack support. Closes #20

CHANGELOG.md

@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 0.3.1
+  * Add full template stack support to `glue` (fnordfish)
+
 ## 0.3.0
   * Travis integration
   * Add test for keywords used as variable names

lib/rabl-rails/renderers/base.rb

@@ -70,9 +70,7 @@ module RablRails
             end
 
             if key.to_s.start_with?('_') # glue
-              current_value.each_pair { |k, v|
+              output.merge!(render_resource(object, current_value))
-                output[k] = object.send(v)
-              }
               next output
             else # child
               object.respond_to?(:each) ? render_collection(object, current_value) : render_resource(object, current_value)

test/compiler_test.rb

@@ -132,6 +132,18 @@ class CompilerTest < ActiveSupport::TestCase
     }, t.source)
   end
 
+  test "glue accepts all dsl in its body" do
+    t = @compiler.compile_source(%{
+      glue :@user do node(:foo) { |u| u.name } end
+    })
+
+    assert_not_nil(t.source[:_glue0])
+    s = t.source[:_glue0]
+
+    assert_equal(:@user, s[:_data])
+    assert_instance_of(Proc, s[:foo])
+  end
+
   test "extends use other template source as itself" do
     template = mock('template', :source => { :id => :id })
     RablRails::Library.reset_instance

test/renderers/json_renderer_test.rb

@@ -61,6 +61,11 @@ class TestJsonRenderer < ActiveSupport::TestCase
     assert_equal %q({"name":"foobar"}), render_json_output
   end
 
+  test "render glued node" do
+    @template.source = { :_glue0 => { :_data => :@data, :foo => lambda { |u| u.name } } }
+    assert_equal(%q({"foo":"foobar"}), render_json_output)
+  end
+
   test "render collection with attributes" do
     @data = [User.new(1, 'foo', 'male'), User.new(2, 'bar', 'female')]
     @context.assigns['data'] = @data