brochure 0.4.0 → 0.5.0

data/README.md

@@ -1,5 +1,5 @@
-Brochure
-========
+<img src="https://github.com/downloads/sstephenson/brochure/logo.png"
+width="250" height="135" alt="Brochure">
 
 Brochure is a Rack application for serving static sites with ERB
 templates (or any of the many [template languages supported by
@@ -29,7 +29,7 @@ Sample `config.ru`:
     run Brochure.app(root)
 
 
-## URL mapping and template rendering
+## Automatic URL mapping
 
 URLs are automatically mapped to template names:
 
@@ -37,10 +37,17 @@ URLs are automatically mapped to template names:
 * `/signup` &rarr; `templates/signup.html.erb`
 * `/help/` &rarr; `templates/help/index.html.erb`
 
+
+## Partials and helpers
+
 Templates can render partials. A partial is denoted by a leading
 underscore in its filename. So `<%= render "shared/header" %>` will
 render `templates/shared/_header.html.erb` inline.
 
+Partials can `<%= yield %>` back to the templates that render
+them. You can use this technique to extract common header and footer
+markup into a single layout file, for example.
+
 Templates have access to the Rack environment via the `env` method and
 to the Brochure application via the `application`
 method. Additionally, a `Rack::Request` wrapper around the Rack

data/lib/brochure.rb

@@ -3,7 +3,7 @@ require "rack"
 require "tilt"
 
 module Brochure
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 
   autoload :Application,      "brochure/application"
   autoload :Context,          "brochure/context"

data/lib/brochure/context.rb

@@ -32,12 +32,29 @@ module Brochure
       Rack::Utils.escape_html(html)
     end
 
-    def render(logical_path, locals = {})
+    def render(logical_path, locals = {}, &block)
       if partial = application.find_partial(logical_path, template.format_extension)
-        partial.render(env, locals)
+        if block_given?
+          print partial.render(env, locals) { capture(&block) }
+        else
+          partial.render(env, locals)
+        end
       else
         raise TemplateNotFound, "no such template '#{logical_path}'"
       end
     end
+
+    def print(str)
+      @_out_buf << str
+    end
+
+    def capture
+      buf = ""
+      old_buf, @_out_buf = @_out_buf, buf
+      yield
+      buf
+    ensure
+      @_out_buf = old_buf
+    end
   end
 end

data/lib/brochure/template.rb

@@ -8,7 +8,7 @@ module Brochure
     end
 
     def template
-      @template ||= Tilt.new(path)
+      @template ||= Tilt.new(path, nil, :outvar => '@_out_buf')
     end
 
     def engine_extension
@@ -29,8 +29,8 @@ module Brochure
       end
     end
 
-    def render(env, locals = {})
-      template.render(app.context_for(self, env), locals)
+    def render(env, locals = {}, &block)
+      template.render(app.context_for(self, env), locals, &block)
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: brochure
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Sam Stephenson
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-27 00:00:00 -05:00
+date: 2010-11-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency