pancake 0.1.25 → 0.1.26

data/lib/pancake/generators/templates/micro/%stack_name%/pancake_init.rb.tt

@@ -1 +1 @@
-require File.join(File.expand_path(File.dirname(__FILE__), "<%= stack_name %>"))
+require File.join(File.expand_path(File.dirname(__FILE__)), "<%= stack_name %>")

data/lib/pancake/generators/templates/short/%stack_name%/pancake_init.rb.tt

@@ -1 +1 @@
-require ::File.join(::File.expand_path(::File.dirname(__FILE__)), "lib", "<%= stack_name %>")
+require ::File.join(::File.expand_path(::File.dirname(__FILE__)), "lib", "<%= stack_name %>")

data/lib/pancake/master.rb

@@ -119,5 +119,43 @@ module Pancake
     def logger=(logr)
       @logger = logr
     end
+
+    # The stack to use as the master stack.  Can be nil!
+    # The master stack is assumed to be the stack that is the controlling stack for the group of pancake stacks
+    # @api public
+    def master_stack
+      @master_stack
+    end
+
+    # set the master stack.  This also sets the master_templates as this stack if that hasn't yet been set.
+    # @see Pancake.master_templates
+    # @api public
+    def master_stack=(stack)
+      self.master_templates ||= stack
+      @master_stack = stack
+    end
+
+    # Used as the definitive source of shared templates for the whole pancake graph.
+    # Allows different stacks to share the same templates
+    # @see Pancake.master_templates=
+    # @api public
+    def master_templates
+      @master_templates
+    end
+
+    # Set the master templates to control the default templates for the stack
+    # @see Pancake.master_templates
+    # @api public
+    def master_templates=(stack)
+      @master_templates = stack
+    end
+
+    # provides access to the default base template via the Pancake.master_templates object
+    # @see Pancake.master_templates
+    # @api public
+    def default_base_template(opts = {})
+      raise "Master Templates not set" unless master_templates
+      master_templates.template(master_templates.base_template_name)
+    end
   end # self
 end # Pancake

data/lib/pancake/mixins/render.rb

@@ -42,7 +42,7 @@ module Pancake
           end
 
           raise TemplateNotFound unless renderer_path
-          _template_cache[name] = Template.new(name, renderer_path.join)
+          _template_cache[name] = Template.new(name, self, renderer_path.join)
         end
 
         def _view_context_cache
@@ -61,6 +61,25 @@ module Pancake
           [_find_template(template), _find_view_context_class_for(template)]
         end
 
+        def _template_name_for(name, opts = {})
+          opts[:format] ||= :html
+          "#{name}.#{opts[:format]}"
+        end
+
+        def template(name_or_template, opts = {})
+          case name_or_template
+          when String, Symbol
+            _find_template(_template_name_for(name_or_template, opts))
+          when Template
+            name_or_template
+          else
+            nil
+          end
+        end
+
+        def base_template_name
+          :base
+        end
 
       end # ClassMethods
 
@@ -109,18 +128,49 @@ module Pancake
           out
         end
 
-        def template(name_or_template)
-          case name_or_template
-          when String, Symbol
-            self.class._find_template(_template_name_for(name_or_template, {}))
-          when Template
-            name_or_template
+        def template(name_or_template, opts = {})
+          opts[:format] ||= content_type
+          self.class.template(name_or_template, opts)
+        end
+
+        def negotiate_content_type!(*allowed_types)
+          return content_type if content_type
+
+          allowed_types = allowed_types.flatten
+          opts = allowed_types.pop if allowed_types.last.kind_of?(Hash)
+          if opts[:format]
+            cont, ct, mt = Pancake::MimeTypes.negotiate_by_extension(opts[:format].to_s, allowed_types)
           else
-            nil
+            env["HTTP_ACCEPT"] ||= "*/*"
+            cont, ct, mt = Pancake::MimeTypes.negotiate_accept_type(env["HTTP_ACCEPT"], allowed_types)
           end
+
+          raise Errors::NotAcceptable unless cont
+
+          headers["Content-Type"] = ct
+          self.mime_type    = mt
+          self.content_type = cont
+          cont
+        end
+
+        def content_type
+          env['pancake.request.format']
+        end
+
+        def content_type=(format)
+          env['pancake.request.format'] = format
+        end
+
+        def mime_type
+          env['pancake.request.mime']
+        end
+
+        def mime_type=(mime)
+          env['pancake.request.mime'] = mime
         end
 
 
+
         # A place holder method for any implementor that wants
         # to configure the view context prior to rendering occuring
         # any time this method is overwritten, it should call super!
@@ -130,9 +180,9 @@ module Pancake
         end
 
         private
-        def _template_name_for(name, opts)
-          opts[:format] ||= params[:format] || :html
-          "#{name}.#{opts[:format]}"
+        def _template_name_for(name, opts = {})
+          opts[:format] ||= content_type
+          self.class._template_name_for(name, opts)
         end
 
         def _partial_template_name_for(name, opts)

data/lib/pancake/mixins/render/render.rb

@@ -48,10 +48,10 @@ module Pancake
             end
 
             if @_inherit_helper.inherits_from
-              next_template = _view_context_for.template(@_inherit_helper.inherits_from)
+              next_template = template.owner.template(@_inherit_helper.inherits_from)
               @_inherit_helper.inherits_from = nil
               result = _with_renderer next_template do
-                _current_renderer.render(self,opts)
+                render(next_template, opts)
               end
             end
             result
@@ -72,6 +72,10 @@ module Pancake
           def _current_renderer
             @_current_renderer
           end
+
+          def content_type
+            @_view_context_for.content_type
+          end
         end # Renderer
 
         module Capture
@@ -116,7 +120,26 @@ module Pancake
             @_inherit_helper = Helper.new
           end
 
-          def inherits_from(name_or_template)
+          def inherits_from(ntos, name_or_opts = nil, opts = {})
+            name_or_template = case ntos
+            when String, Symbol
+              if ntos == :default!
+                begin
+                  Pancake.default_base_template(:format => content_type)
+                rescue
+                  :base
+                end
+              else
+                ntos
+              end
+            else
+              if name_or_opts.kind_of?(Hash)
+                opts = name_or_opts
+                name_or_opts = nil
+              end
+              name_or_opts ||= ntos.base_template_name
+              ntos.template(name_or_opts, opts)
+            end
             @_inherit_helper.inherits_from = name_or_template
           end
 

data/lib/pancake/mixins/render/template.rb

@@ -5,10 +5,10 @@ module Pancake
         class UnamedTemplate < Pancake::Errors::NotFound; end
         class NotFound       < Pancake::Errors::NotFound; end
 
-        attr_reader :name, :path, :renderer
+        attr_reader :name, :path, :renderer, :owner
 
-        def initialize(name, path)
-          @name, @path = name, path
+        def initialize(name, owner, path)
+          @name, @owner, @path = name, owner, path
           raise UnamedTemplate unless name
           raise NotFound unless File.exists?(path)
           @renderer = Tilt.new(path)

data/lib/pancake/mixins/request_helper.rb

@@ -102,7 +102,7 @@ module Pancake
       # An accessor for the rack environment variable
       # @api public
       def env
-        @env
+        @env ||= {}
       end
 
       # A handy request method that gets hold of the current request

data/lib/pancake/stack/stack.rb

@@ -136,6 +136,7 @@ module Pancake
 
     # Sets this as a master stack.  This means that the "master" directory will be added to all existing stack roots
     def self.set_as_master!
+      Pancake.master_stack ||= self
       # Want to add master to the roots for this stack only
       roots.dup.each do |root|
         unless root =~ /master\/?$/
@@ -144,6 +145,14 @@ module Pancake
       end
     end
 
+    def self.template(name,opts ={})
+      raise Errors::NotImplemented, "Stack may not be used for templates until it implements a template method"
+    end
+
+    def self.base_template_name
+      raise Errors::NotImplemented, "Stack may not be used for templates until it implements a base_template_name method"
+    end
+
     # Creates a bootloader hook(s) of the given name. That are inheritable
     # This will create hooks for use in a bootloader (but will not create the bootloader itself!)
     #

data/lib/pancake/stacks/short/controller.rb

@@ -52,19 +52,11 @@ module Pancake
           raise Errors::NotFound, "No Action Found" unless allowed_action?(params["action"])
 
           @action_opts  = actions[params["action"]]
-          if params[:format]
-            @content_type, ct, @mime_type = Pancake::MimeTypes.negotiate_by_extension(params[:format].to_s, @action_opts.formats)
-          else
-            @content_type, ct, @mime_type = Pancake::MimeTypes.negotiate_accept_type(env["HTTP_ACCEPT"], @action_opts.formats)
-          end
 
-          raise Errors::NotAcceptable unless @content_type
+          negotiate_content_type!(@action_opts.formats, params)
 
           logger.info "Dispatching to #{params["action"].inspect}" if logger
 
-          # set the response header
-          headers["Content-Type"] = ct
-
           result = catch(:halt){ self.send(params['action']) }
           case result
           when Array
@@ -92,10 +84,6 @@ module Pancake
           handle_request_exception(server_error)
         end
 
-        def content_type
-          @content_type
-        end
-
         def log_http_error?(error)
           true
         end
@@ -125,10 +113,15 @@ module Pancake
           stack_class.roots
         end
 
-        def _tempate_name_for(name, opts)
-          opts[:format] ||= content_type
+        def self._template_name_for(name, opts)
+          opts[:format] ||= :html
           "#{name}.#{opts[:format]}"
         end
+
+        def _tempate_name_for(name, opts = {})
+          opts[:format] ||= content_type
+          self.class._template_name_for(name, opts)
+        end
       end # Controller
 
     end # Short

data/lib/pancake/stacks/short/stack.rb

@@ -39,6 +39,14 @@ module Pancake
         self::Controller.class_eval{ include m }
       end
 
+      def self.template(*args)
+        self::Controller.template(*args)
+      end
+
+      def self.base_template_name
+        self::Controller.base_template_name
+      end
+
       # Gets a resource at a given path
       #
       # The block should finish with the final result of the action

data/spec/helpers/helpers.rb

@@ -3,7 +3,7 @@ module Pancake
     module Helpers
       def clear_constants(*classes)
         classes.flatten.each do |klass|
-          begin            
+          begin
             Object.class_eval do
               remove_const klass
             end
@@ -11,10 +11,10 @@ module Pancake
           end
         end
       end # clear_constnat3
-      
+
       def env_for(path = "/", opts = {})
         Rack::MockRequest.env_for(path, opts)
       end
     end # Helpers
   end # Spec
-end # Pancake
+end # Pancake

data/spec/pancake/fixtures/render_templates/inherit/bar/base.html.haml

@@ -0,0 +1,4 @@
+Bar Base
+
+- content_block :content do
+  Bar Base Content

data/spec/pancake/fixtures/render_templates/inherit/bar/implicit_scope.html.haml

@@ -0,0 +1,5 @@
+- inherits_from :base
+
+- content_block :content do
+  Bar Implicit Scope Content
+  = content_block.super

data/spec/pancake/fixtures/render_templates/inherit/bar/layout.html.haml

@@ -0,0 +1,4 @@
+Bar Layout
+
+- content_block :content do
+  Bar Default Content

data/spec/pancake/fixtures/render_templates/inherit/foo/base.html.haml

@@ -0,0 +1,5 @@
+%p
+  Foo Base
+
+- content_block :content do
+  Foo Content

data/spec/pancake/fixtures/render_templates/inherit/foo/defaults.html.haml

@@ -0,0 +1,4 @@
+- inherits_from :default!
+
+- content_block :content do
+  Defaults Content

data/spec/pancake/fixtures/render_templates/inherit/foo/explicit.html.haml

@@ -0,0 +1,4 @@
+- inherits_from BarFoo, :layout
+
+- content_block :content do
+  Explicit Content

data/spec/pancake/fixtures/render_templates/inherit/foo/from_explicit.html.haml

@@ -0,0 +1,6 @@
+- inherits_from :explicit
+
+- content_block :content do
+  %p
+    From Explicit Content
+  = content_block.super

data/spec/pancake/fixtures/render_templates/inherit/foo/from_implicit_scope.html.haml

@@ -0,0 +1,5 @@
+- inherits_from BarFoo, :implicit_scope
+
+- content_block :content do
+  From Implicit Scope Content
+  = content_block.super

data/spec/pancake/fixtures/render_templates/inherit/foo/simple.html.haml

@@ -0,0 +1,4 @@
+- inherits_from :base
+
+- content_block :content do
+  Simple Foo Content

data/spec/pancake/fixtures/render_templates/view_context/inherited_haml_level_2.haml

@@ -0,0 +1,5 @@
+- inherits_from :inherited_haml_level_1
+
+- content_block :foo do
+  %p inherited haml level 2 content
+  = content_block.super

data/spec/pancake/mixins/render/template_spec.rb

@@ -14,31 +14,31 @@ describe Pancake::Mixins::Render::Template do
 
   describe "Creation" do
     it "should create a template with a name and a path" do
-      result = FooBar::Template.new(:context, File.join(@templates_path, "context.erb"))
+      result = FooBar::Template.new(:context, FooBar, File.join(@templates_path, "context.erb"))
       result.should_not be_nil
     end
 
     it "should raise an error when creating a template without a name" do
       lambda do
-        FooBar::Template.new(nil, File.join(@templates_path, "context.erb"))
+        FooBar::Template.new(nil, FooBar, File.join(@templates_path, "context.erb"))
       end.should raise_error(Pancake::Mixins::Render::Template::UnamedTemplate)
     end
 
     it "should raise an error when createing a template withouth a valid file name" do
       lambda do
-        FooBar::Template.new(:foo, "/not/a/real/file.erb")
+        FooBar::Template.new(:foo, FooBar, "/not/a/real/file.erb")
       end.should raise_error(Pancake::Mixins::Render::Template::NotFound)
     end
 
     it "should raise an error when it cannot create a rendering object for the file" do
       lambda do
-        FooBar::Template.new(:foo, "/not/registed")
+        FooBar::Template.new(:foo, FooBar, "/not/registed")
       end.should raise_error
     end
 
     describe "accessing information" do
       before do
-        @template = FooBar::Template.new(:context, File.join(@templates_path, "context.erb"))
+        @template = FooBar::Template.new(:context, FooBar, File.join(@templates_path, "context.erb"))
       end
 
       it "should provide access to it's name" do

data/spec/pancake/mixins/render/view_context_spec.rb

@@ -3,6 +3,7 @@ require File.join(File.dirname(__FILE__), "..", "..", "..", "spec_helper")
 describe Pancake::Mixins::Render::ViewContext do
 
   before do
+    @masters = [Pancake.master_stack, Pancake.master_templates]
     $captures = []
     class ::FooBar
       include Pancake::Mixins::Render
@@ -12,16 +13,20 @@ describe Pancake::Mixins::Render::ViewContext do
         @env = env
       end
 
-      def _template_name_for(name, opts)
+      def self._template_name_for(name, opts)
         "#{name}"
       end
+
       push_paths :views, "", "**/*"
 
       roots << File.join(File.expand_path(File.dirname(__FILE__)),"..","..", "fixtures", "render_templates", "view_context")
     end
+    Pancake.master_stack = FooBar
+    Pancake.master_templates = FooBar
   end
 
   after do
+    Pancake.master_stack, Pancake.master_templates = @masters
     clear_constants :FooBar, :BarFoo
   end
 
@@ -40,34 +45,6 @@ describe Pancake::Mixins::Render::ViewContext do
     it "should include the Pancake::Mixins::RequestHelper helper" do
       (Pancake::Mixins::RequestHelper > FooBar::ViewContext).should be_true
     end
-
-    #it "should allow me to setup the view context before the view is run" do
-    #  FooBar.class_eval do
-    #    def view_context_before_render(context)
-    #      super
-    #      $captures << :here
-    #    end
-    #  end
-    #  $captures.should be_blank
-    #  FooBar.new.render(:context)
-    #  $captures.should include(:here)
-    #end
-
-    #it "should execute the before render block in the instance" do
-    #  FooBar.class_eval do
-    #    def view_context_before_render(context)
-    #     super
-    #      $captures << data
-    #    end
-    #  end
-    #  foobar = FooBar.new
-    #  foobar.data = {:some => :data}
-    #  foobar.render(:context)
-    #  $captures.should include(:some => :data)
-    #  $captures.clear
-    #  FooBar.new.render(:context)
-    #  $captures.should_not include(:some => :data)
-    #end
   end
 
   describe "inheriting classes" do
@@ -178,6 +155,13 @@ describe Pancake::Mixins::Render::ViewContext do
       result.should include("inherited haml content")
     end
 
+    it "should inherit a template multiple times" do
+      result = @foo.render(:inherited_haml_level_2)
+      result.should include("inherited haml level 0")
+      result.should include("inherited haml level 1 content")
+      result.should include("inherited haml level 2 content")
+    end
+
   end
 
   describe "super blocks" do
@@ -250,6 +234,70 @@ describe Pancake::Mixins::Render::ViewContext do
     end
   end
 
+  describe "inheriting from a template object" do
+    before do
+      path = File.expand_path(File.join(File.dirname(__FILE__), "..", "..",  "fixtures", "render_templates", "inherit"))
+
+      class ::BarFoo
+        include Pancake::Mixins::Render
+        push_paths :views, "", "**/*"
+      end
+
+      class ::FooBar
+        def self._template_name_for(name, opts = {})
+          opts[:format] ||= :html
+          r = "#{name}.#{opts[:format]}"
+        end
+      end
+
+      FooBar.roots << File.join(path, "foo")
+      BarFoo.roots << File.join(path, "bar")
+      @app = FooBar.new({})
+      @bar = BarFoo.new
+      Pancake.master_templates = BarFoo
+    end
+
+    it "should inherit from it's own stack with a name" do
+      result = @app.render(:simple)
+      result.should include("Foo Base")
+      result.should include("Simple Foo Content")
+    end
+
+    it "should inherit from a stack, name pair" do
+      result = @app.render(:explicit)
+      result.should include("Bar Layout")
+      result.should include("Explicit Content")
+    end
+
+    it "should inherit from the pancake default using :defaults!" do
+      result = @app.render(:defaults)
+      result.should include("Bar Base")
+      result.should include("Defaults Content")
+    end
+
+    it "should use it's own base template when pancake does not have one set" do
+      Pancake.master_templates = nil
+      result = @app.render(:defaults)
+      result.should include("Foo Base")
+      result.should include("Defaults Content")
+    end
+
+    it "should inherit multiple levels to an explicit base template" do
+      result = @app.render(:from_explicit)
+      result.should include("Bar Layout")
+      result.should include("Explicit Content")
+      result.should include("From Explicit Content")
+    end
+
+    it "should inherit to an explicit layout that inherits to a scoped template" do
+      result = @app.render(:from_implicit_scope)
+      result.should include("Bar Base")
+      result.should include("Bar Implicit Scope Content")
+      result.should include("From Implicit Scope Content")
+    end
+
+  end
+
   describe "partials" do
     before do
       @foo = FooBar.new({})

data/spec/pancake/mixins/render_spec.rb

@@ -36,6 +36,17 @@ describe Pancake::Mixins::Render do
     @render.render(:haml_template).chomp.should == "IN HAML"
   end
 
+  it "should provide me with a template from the class" do
+    template = RenderSpecClass.template(:haml_template)
+    template.should be_a_kind_of(Pancake::Mixins::Render::Template)
+  end
+
+  it "should allow me to set the format for a given template" do
+    template = RenderSpecClass.template(:erb_template, :format => :json)
+    template.should be_a_kind_of(Pancake::Mixins::Render::Template)
+    template.name.should == "erb_template.json"
+  end
+
   it "should render erb" do
     @render.render(:erb_template).should == "IN ERB"
   end

data/spec/pancake/pancake_spec.rb

@@ -87,4 +87,56 @@ describe "pancake" do
       Pancake.default_error_handling!
     end
   end
+
+  describe "master stack" do
+    before do
+      @b4   = Pancake.master_stack
+      @tb4  = Pancake.master_templates
+    end
+
+    after do
+      Pancake.master_stack = @b4
+      Pancake.master_templates = @tb4
+    end
+
+    it "should have a master stack" do
+      Pancake.should respond_to(:master_stack)
+    end
+
+    it "should let me set a master stack" do
+      mock_stack = mock("stack", :null_object => true)
+      Pancake.master_stack = mock_stack
+      Pancake.master_stack.should == mock_stack
+    end
+
+    it "should provide master templates stack as the master stack" do
+      mock_stack = mock("stack", :null_object => true)
+      Pancake.master_stack = mock_stack
+      Pancake.master_templates.should == mock_stack
+    end
+
+    it "should let me overwrite the master_templates independantly of the master" do
+      mock_stack = mock("stack",    :null_object => true)
+      mock_ui    = mock("ui stack", :null_object => true)
+      Pancake.master_stack = mock_stack
+      Pancake.master_templates = mock_ui
+      Pancake.master_templates.should == mock_ui
+      Pancake.master_stack.should == mock_stack
+    end
+
+    it "should not change the master templates when updating the master" do
+      stack1 = mock("stack1", :null_object => true)
+      ui     = mock("ui",     :null_object => true)
+      Pancake.master_templates = ui
+      Pancake.master_stack = stack1
+    end
+
+    it "should provide me with the default template from the master_templates" do
+      ui = mock("ui")
+      ui.should_receive(:base_template_name).and_return(:fred)
+      ui.should_receive(:template).with(:fred).and_return(:template_fred)
+      Pancake.master_templates = ui
+      Pancake.default_base_template.should == :template_fred
+    end
+  end
 end

data/spec/pancake/stack/stack_spec.rb

@@ -2,13 +2,13 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe "Pancake::Stack" do
   before(:each) do
-    class ::StackSpecStack < Pancake::Stack
-    end
+    class ::StackSpecStack < Pancake::Stack; end
+    class ::OtherSpecStack < Pancake::Stack; end
     StackSpecStack.roots.clear
   end
 
   after(:each) do
-    clear_constants(:StackSpecStack, :FooSpecStack)
+    clear_constants(:StackSpecStack, :FooSpecStack, :OtherSpecStack)
   end
 
   describe "roots" do
@@ -59,6 +59,14 @@ describe "Pancake::Stack" do
     end
   # end
     describe "master stack" do
+      before do
+        @b4 = Pancake.master_stack
+      end
+
+      after do
+        Pancake.master_stack = @b4
+      end
+
       it "should set the stack to be master, and include the master dir in each root" do
         StackSpecStack.add_root(__FILE__)
         before_roots = StackSpecStack.roots.dup
@@ -66,6 +74,16 @@ describe "Pancake::Stack" do
         before_roots.each do |r|
           StackSpecStack.roots.should include(File.join(r, "master"))
         end
+        Pancake.master_stack.should == StackSpecStack
+      end
+
+      it "should not set a master stack when one has already been set" do
+        StackSpecStack.add_root(__FILE__)
+        OtherSpecStack.add_root(__FILE__)
+        StackSpecStack.stackup(:master => true)
+        Pancake.master_stack.should == StackSpecStack
+        OtherSpecStack.stackup(:master => true)
+        Pancake.master_stack.should == StackSpecStack
       end
     end
 

data/spec/pancake/stacks/short/controller_spec.rb

@@ -7,6 +7,7 @@ describe Pancake::Stacks::Short::Controller do
       add_root(__FILE__)
       add_root(File.expand_path(File.dirname(__FILE__)), "..", "fixtures", "stacks", "short", "foobar")
       class Controller
+
         def do_dispatch!
           dispatch!
         end

data/spec/pancake/stacks/short/stack_spec.rb

@@ -3,6 +3,7 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 describe Pancake::Stacks::Short do
 
   before do
+    @master_before = [Pancake.master_stack, Pancake.master_templates]
     $captures = []
     class ::ShortMiddle
       attr_accessor :app
@@ -34,16 +35,23 @@ describe Pancake::Stacks::Short do
     end
 
     @app = ShortFoo
+    Pancake.master_stack = ShortFoo
+    Pancake.master_templates = ShortFoo
   end
 
   after do
     clear_constants :ShortFoo, :ShortMiddle, :OtherFoo, "ShortFoo::Router"
+    Pancake.master_stack, Pancake.master_templates = @master_before
   end
 
   def app
     @app.stackup
   end
 
+  it "should provide access through the stack interface to the templates" do
+    ShortFoo.template(:inherited_from_base).should be_an_instance_of(Pancake::Mixins::Render::Template)
+  end
+
   it "should go through the middleware to get to the actions" do
     get "/foo"
     $captures.should == [ShortMiddle]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pancake
 version: !ruby/object:Gem::Version 
-  version: 0.1.25
+  version: 0.1.26
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -9,7 +9,7 @@ autorequire: pancake
 bindir: bin
 cert_chain: []
 
-date: 2009-11-23 00:00:00 +11:00
+date: 2009-11-28 00:00:00 +11:00
 default_executable: pancake-gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -213,6 +213,15 @@ files:
 - spec/pancake/fixtures/render_templates/erb_template.json.erb
 - spec/pancake/fixtures/render_templates/haml_template.html.haml
 - spec/pancake/fixtures/render_templates/haml_template.xml.haml
+- spec/pancake/fixtures/render_templates/inherit/bar/base.html.haml
+- spec/pancake/fixtures/render_templates/inherit/bar/implicit_scope.html.haml
+- spec/pancake/fixtures/render_templates/inherit/bar/layout.html.haml
+- spec/pancake/fixtures/render_templates/inherit/foo/base.html.haml
+- spec/pancake/fixtures/render_templates/inherit/foo/defaults.html.haml
+- spec/pancake/fixtures/render_templates/inherit/foo/explicit.html.haml
+- spec/pancake/fixtures/render_templates/inherit/foo/from_explicit.html.haml
+- spec/pancake/fixtures/render_templates/inherit/foo/from_implicit_scope.html.haml
+- spec/pancake/fixtures/render_templates/inherit/foo/simple.html.haml
 - spec/pancake/fixtures/render_templates/templates/context.erb
 - spec/pancake/fixtures/render_templates/view_context/_basic.haml
 - spec/pancake/fixtures/render_templates/view_context/_basic.html.haml
@@ -234,6 +243,7 @@ files:
 - spec/pancake/fixtures/render_templates/view_context/inherited_haml_from_erb.haml
 - spec/pancake/fixtures/render_templates/view_context/inherited_haml_level_0.haml
 - spec/pancake/fixtures/render_templates/view_context/inherited_haml_level_1.haml
+- spec/pancake/fixtures/render_templates/view_context/inherited_haml_level_2.haml
 - spec/pancake/fixtures/render_templates/view_context/nested_content_level_0.haml
 - spec/pancake/fixtures/render_templates/view_context/nested_content_level_1.haml
 - spec/pancake/fixtures/render_templates/view_context/nested_inner.erb