pakada-render 0.3.0 → 0.3.1

data/lib/pakada-render.rb

@@ -1 +1 @@
-require "pakada/theming"
+require "pakada/render"

data/lib/pakada/render.rb

@@ -12,6 +12,8 @@ require "pakada/render/version"
 class Pakada::Render
   include Pakada::Module
   
+  LAYOUT_HEADER = "X-Pakada-Render-Layout"
+  
   attr_reader :load_path, :template_map
   
   def initialize
@@ -21,7 +23,7 @@ class Pakada::Render
   def hooks
     if Pakada[:dispatch]
       Pakada[:dispatch].after :create_controller, method(:make_renderable)
-      Pakada[:dispatch].around :request, method(:render_layout)
+      Pakada[:dispatch].after :request, method(:render_layout)
     end
   end
   
@@ -38,7 +40,7 @@ class Pakada::Render
   
   def render_controller(controller)
     unless controller.options[:layout]
-      controller.request.env["pakada.render.layout"] = false
+      controller.response.headers[LAYOUT_HEADER] = "no"
     end
     
     if controller.options[:render]
@@ -46,17 +48,14 @@ class Pakada::Render
     end
   end
   
-  def render_layout(request, env)
-    key = "pakada.render.layout"
-    request.call(env).tap {|response|
-      env[key] = true unless env.key? key
-      if env[key]
-        response[1].delete "Content-Length"
-        content = []
-        response[2].each {|chunk| content << chunk }
-        response[2] = [render!(:layout, :content => content)]
-      end
-    }
+  def render_layout(response)
+    if !response[1].key?(LAYOUT_HEADER) || response[1][LAYOUT_HEADER] == "yes"
+      response[1].delete "Content-Length"
+      
+      content = []
+      response[2].each {|chunk| content << chunk }
+      response[2] = [render!(:layout, :content => content)]
+    end
   end
   
   def boot

data/lib/pakada/render/rendering.rb

@@ -1,8 +1,15 @@
 class Pakada::Render
   module Rendering
-    def render(template, locals = {})
-      engine = Pakada[:render].template_map[template.to_sym]
-      raise ArgumentError, "Unknown template #{template.inspect}" unless engine
+    def render(templates, locals = {})
+      templates, engine = Array(templates), nil
+      templates.each {|template|
+        e = Pakada[:render].template_map[template.to_sym]
+        engine = e if e
+      }
+      
+      unless engine
+        raise ArgumentError, "Unknown template #{templates.join(",")}"
+      end
       
       Pakada.safety(Pakada::Render::Renderer).new engine, locals
     end

data/lib/pakada/render/version.rb

@@ -1,5 +1,5 @@
 class Pakada
   class Render
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/spec/render_spec.rb

@@ -19,19 +19,11 @@ describe Pakada::Render do
       dispatch.stub :after
     }
     
-    it "hooks Pakada::Dispatch#request with #render_layout" do
-      dispatch.should_receive(:around) {|method, block|
-        method.should equal(:request)
-        block.should == render.method(:render_layout)
-      }
-      render.hooks
-    end
-    
-    it "hooks Pakada::Dispatch#create_controller with #make_renderable" do
-      dispatch.should_receive(:after) {|method, block|
-        method.should equal(:create_controller)
-        block.should == render.method(:make_renderable)
-      }
+    it "hooks Pakada::Dispatch#request and #create_controller" do
+      dispatch.should_receive(:after).with :request,
+                                           render.method(:render_layout)
+      dispatch.should_receive(:after).with :create_controller,
+                                           render.method(:make_renderable)
       render.hooks
     end
   end
@@ -183,16 +175,17 @@ describe Pakada::Render do
   context "#render_controller(controller)" do
     let(:env) { {} }
     let(:controller) { Pakada[:dispatch].create_controller {}.new env }
+    let(:headers) { controller.response.headers }
     
-    it "sets env[pakada.render.layout] to false if :layout option is false" do
+    it "sets the layout header to 'no' if :layout option is false" do
       controller.options[:layout] = false
       render.render_controller controller
-      controller.request.env["pakada.render.layout"].should be_false
+      headers["X-Pakada-Render-Layout"].should == "no"
       
-      controller.request.env["pakada.render.layout"] = true
+      headers["X-Pakada-Render-Layout"] = "yes"
       controller.options[:layout] = true
       render.render_controller controller
-      controller.request.env["pakada.render.layout"].should be_true
+      headers["X-Pakada-Render-Layout"].should == "yes"
     end
     
     let(:rendered_controller) { stub "rendered controller" }
@@ -216,28 +209,11 @@ describe Pakada::Render do
     let(:env) { {} }
     let(:request) { proc {|env| response } }
     let(:response) { [200, {"Content-Length" => "123"}, []] }
-    
-    before { render.boot }
-    
-    it "defaults env[pakada.render.layout] to true" do
-      render.render_layout request, env
-      env["pakada.render.layout"].should be_true
-    end
-    
-    it "doesn't render if env[pakada.render.layout] is false" do
-      render.should_not_receive :render
-      env["pakada.render.layout"] = false
-      render.render_layout request, env
-    end
-    
-    it "deletes the Content-Length header" do
-      render.render_layout request, env
-      response[1].key?("Content-Length").should be_false
-    end
-    
     let(:content) { stub "content" }
     let(:renderer) { stub "renderer" }
     
+    before { render.boot }
+    
     it "renders the layout passing the response body as :content local" do
       render.should_receive(:render!) {|template, locals|
         template.should equal(:layout)
@@ -246,8 +222,30 @@ describe Pakada::Render do
       }
       response[2] = [content]
       
-      render.render_layout request, env
+      render.render_layout response
       response[2].should == [renderer]
     end
+    
+    it "renders if the layout header isn't set" do
+      render.should_receive :render
+      render.render_layout response
+    end
+    
+    it "renders if the layout header is 'yes'" do
+      render.should_receive :render
+      response[1]["X-Pakada-Render-Layout"] = "yes"
+      render.render_layout response
+    end
+    
+    it "doesn't render if the layout header is 'no'" do
+      render.should_not_receive :render
+      response[1]["X-Pakada-Render-Layout"] = "no"
+      render.render_layout response
+    end
+    
+    it "deletes the Content-Length header" do
+      render.render_layout response
+      response[1].key?("Content-Length").should be_false
+    end
   end
 end

data/spec/rendering_spec.rb

@@ -25,18 +25,29 @@ describe Pakada::Render::Rendering do
     end
     
     it "returns a Renderer for the specified template and locals" do
-      Pakada.safety(Pakada::Render::Renderer).should_receive(:new) {|ngin, lcls|
+      Pakada.safety(Pakada::Render::Renderer).should_receive(:new) {|ngin, locls|
         ngin.should equal(engine)
-        lcls.should equal(locals)
+        locls.should equal(locals)
         renderer
       }
       obj.render(:foo, locals).should equal(renderer)
     end
     
+    it "will choose the first existing template if supplied with a list" do
+      Pakada.safety(Pakada::Render::Renderer).should_receive(:new) {|ngin, locls|
+        ngin.should equal(engine)
+      }
+      obj.render [:i_dont_exist, :i_also_dont_exist, :foo, :me_neither]
+      
+      expect {
+        obj.render [:i_dont_exist, :i_also_dont_exist]
+      }.to raise_error(ArgumentError)
+    end
+    
     it "defaults locals to an empty Hash" do
-      Pakada.safety(Pakada::Render::Renderer).should_receive(:new) {|ngin, lcls|
-        lcls.should be_a(Hash)
-        lcls.should be_empty
+      Pakada.safety(Pakada::Render::Renderer).should_receive(:new) {|ngin, locls|
+        locls.should be_a(Hash)
+        locls.should be_empty
         renderer
       }
       obj.render(:foo).should equal(renderer)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pakada-render
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-11 00:00:00.000000000Z
+date: 2011-09-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pakada
-  requirement: &74264980 !ruby/object:Gem::Requirement
+  requirement: &71560660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74264980
+  version_requirements: *71560660
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &74264710 !ruby/object:Gem::Requirement
+  requirement: &71560130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74264710
+  version_requirements: *71560130
 - !ruby/object:Gem::Dependency
   name: hike
-  requirement: &74264400 !ruby/object:Gem::Requirement
+  requirement: &71559780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74264400
+  version_requirements: *71559780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &74263580 !ruby/object:Gem::Requirement
+  requirement: &71559410 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74263580
+  version_requirements: *71559410
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &74263070 !ruby/object:Gem::Requirement
+  requirement: &71559120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74263070
+  version_requirements: *71559120
 description: 
 email:
 - lars.gierth@gmail.com