Ensure outermost locals to not shadow innermost inside templates/part…

…ials. Closes #3

lib/lotus/view/rendering/layout_scope.rb

@@ -128,8 +128,8 @@ def renderer(options)
         def _options(options)
           options.dup.tap do |opts|
             opts.merge!(format: format)
-            opts[:locals] ||= {}
-            opts[:locals].merge!(locals)
+            opts[:locals] = locals
+            opts[:locals].merge!(options.fetch(:locals){ Hash[] })
           end
         end
       end

test/fixtures.rb

@@ -70,10 +70,6 @@ def errors
     end
   end
 
-  class AlternativeNew
-    include Lotus::View
-  end
-
   class Create
     include Lotus::View
     template 'articles/new'
@@ -185,3 +181,9 @@ class Show
     include Lotus::View
   end
 end
+
+module Nodes
+  class Parent
+    include Lotus::View
+  end
+end

test/fixtures/templates/nodes/child.html.erb

@@ -0,0 +1 @@
+<li><%= node.name %></li>

test/fixtures/templates/nodes/parent.html.erb

@@ -0,0 +1,6 @@
+<h1><%= node.name %></h1>
+<ul>
+  <% node.children.each do |child| %>
+    <%= render template: 'nodes/child', locals: { node: child } %>
+  <% end %>
+</ul>

test/rendering_test.rb

@@ -78,13 +78,20 @@
       rendered.must_match %(<input type="hidden" name="secret" value="23" />)
     end
 
+    # @issue https://github.com/lotus/view/issues/3
     it 'renders a template within another template' do
-      article = OpenStruct.new(title: nil)
+      parent = OpenStruct.new(children: [], name: 'parent')
+      child1 = OpenStruct.new(children: [], name: 'child1')
+      child2 = OpenStruct.new(children: [], name: 'child2')
 
-      rendered = Articles::AlternativeNew.render(format: :html, article: article)
+      parent.children.push(child1)
+      parent.children.push(child2)
 
-      rendered.must_match %(<h1>New Article</h1>)
-      rendered.must_match %(<input type="hidden" name="secret" value="23" />)
+      rendered = Nodes::Parent.render(format: :html, node: parent)
+
+      rendered.must_match %(<h1>parent</h1>)
+      rendered.must_match %(<li>child1</li>)
+      rendered.must_match %(<li>child2</li>)
     end
 
     it 'uses HAML engine' do