Layout methods fix/235

lib/lotus/view/rendering/layout_scope.rb

@@ -203,8 +203,8 @@ def respond_to_missing?(m, include_all)
         def method_missing(m, *args, &blk)
           if @scope.respond_to?(m)
             @scope.__send__(m, *args, &blk)
-          elsif @layout.respond_to?(m)
-            @layout.__send__(m, *args, &blk)
+          elsif layout.respond_to?(m)
+            layout.__send__(m, *args, &blk)
           else
             super
           end
@@ -228,6 +228,10 @@ def _options(options)
             opts[:locals].merge!(options.fetch(:locals){ ::Hash.new })
           end
         end
+
+        def layout
+          @layout || @layout.class.layout.new(@scope, "")
+        end
       end
     end
   end

lib/lotus/view/rendering/scope.rb

@@ -21,7 +21,7 @@ class Scope < LayoutScope
         # @api private
         # @since 0.1.0
         def initialize(view, locals = {})
-          @view, @locals = view, locals
+          @view, @locals, @layout = view, locals, layout
         end
 
         # Returns an inspect String
@@ -70,6 +70,15 @@ def method_missing(m, *args, &block)
             end
           )
         end
+
+        private
+        def layout
+          if @view.class.respond_to?(:layout)
+            @view.class.layout.new(self, "")
+          else
+            nil
+          end
+        end
       end
     end
   end

test/fixtures.rb

@@ -326,6 +326,10 @@ class StoreLayout
       def head
         %(<meta name="lotusrb-version" content="0.3.1">)
       end
+
+      def user_name
+        "Joe Blogs"
+      end
     end
 
     module Home

test/fixtures/templates/store/templates/home/index.html.erb

@@ -1 +1,2 @@
+<%= user_name %>
 yeah

test/layout_test.rb

@@ -27,6 +27,11 @@ class MissingLayout
     rendered.must_match %(yeah)
   end
 
+  it 'methods defined in layout are available from the view' do
+    rendered = Store::Views::Home::Index.render(format: :html)
+    rendered.must_match %(Joe Blogs)
+  end
+
   it 'renders content to return value from view' do
     rendered = Store::Views::Products::Show.render(format: :html)
     rendered.must_match %(Product)