lib/lotus/view/rendering/layout_scope.rb in lotus-view-0.1.0 vs lib/lotus/view/rendering/layout_scope.rb in lotus-view-0.2.0

@@ -126,11 +126,11 @@
 
         private
         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
     end
   end