brochure 0.5.0 → 0.5.1

data/lib/brochure.rb

@@ -3,14 +3,15 @@ require "rack"
 require "tilt"
 
 module Brochure
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 
-  autoload :Application,      "brochure/application"
-  autoload :Context,          "brochure/context"
-  autoload :Failsafe,         "brochure/failsafe"
-  autoload :Static,           "brochure/static"
-  autoload :Template,         "brochure/template"
-  autoload :TemplateNotFound, "brochure/errors"
+  autoload :Application,         "brochure/application"
+  autoload :CaptureNotSupported, "brochure/errors"
+  autoload :Context,             "brochure/context"
+  autoload :Failsafe,            "brochure/failsafe"
+  autoload :Static,              "brochure/static"
+  autoload :Template,            "brochure/template"
+  autoload :TemplateNotFound,    "brochure/errors"
 
   def self.app(root, options = {})
     app = Application.new(root, options)

data/lib/brochure/context.rb

@@ -1,7 +1,5 @@
 module Brochure
   class Context
-    include Tilt::CompileSite
-
     def self.for(helpers)
       context = Class.new(self)
       context.send(:include, *helpers) if helpers.any?
@@ -35,7 +33,7 @@ module Brochure
     def render(logical_path, locals = {}, &block)
       if partial = application.find_partial(logical_path, template.format_extension)
         if block_given?
-          print partial.render(env, locals) { capture(&block) }
+          concat partial.render(env, locals) { capture(&block) }
         else
           partial.render(env, locals)
         end
@@ -44,17 +42,35 @@ module Brochure
       end
     end
 
-    def print(str)
-      @_out_buf << str
+    def engine_name
+      template.engine_extension[1..-1]
+    end
+
+    def concat(str)
+      if respond_to?(method = "#{engine_name}_concat")
+        send(method, str)
+      elsif @_out_buf
+        @_out_buf << str
+      else
+        raise CaptureNotSupported, "no capture support for #{engine_name} templates"
+      end
     end
 
-    def capture
-      buf = ""
-      old_buf, @_out_buf = @_out_buf, buf
-      yield
-      buf
-    ensure
-      @_out_buf = old_buf
+    def capture(&block)
+      if respond_to?(method = "capture_#{engine_name}")
+        send(method, &block)
+      elsif @_out_buf
+        begin
+          buf = ""
+          old_buf, @_out_buf = @_out_buf, buf
+          yield
+          buf
+        ensure
+          @_out_buf = old_buf
+        end
+      else
+        raise CaptureNotSupported, "no capture support for #{engine_name} templates"
+      end
     end
   end
 end

data/lib/brochure/errors.rb

@@ -1,3 +1,5 @@
 module Brochure
-  class TemplateNotFound < StandardError; end
+  class Error     < ::StandardError; end
+  class TemplateNotFound    < Error; end
+  class CaptureNotSupported < Error; end
 end

data/lib/brochure/template.rb

@@ -8,18 +8,23 @@ module Brochure
     end
 
     def template
-      @template ||= Tilt.new(path, nil, :outvar => '@_out_buf')
+      @template ||= Tilt.new(path, nil, :outvar => '@_out_buf') if engine_extension
     end
 
-    def engine_extension
-      @engine_extension ||= File.extname(path)
+    def basename
+      @basename ||= File.basename(path)
+    end
+
+    def extensions
+      @extensions ||= basename.scan(/\.[^.]+/)
     end
 
     def format_extension
-      @format_extension ||= begin
-        ext = File.extname(File.basename(path, engine_extension))
-        ext.empty? ? ".html" : ext
-      end
+      extensions.first
+    end
+
+    def engine_extension
+      extensions[1]
     end
 
     def content_type
@@ -30,7 +35,11 @@ module Brochure
     end
 
     def render(env, locals = {}, &block)
-      template.render(app.context_for(self, env), locals, &block)
+      if template
+        template.render(app.context_for(self, env), locals, &block)
+      else
+        File.read(path)
+      end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: brochure
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Sam Stephenson
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-04 00:00:00 -05:00
+date: 2010-11-20 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 19
         segments: 
         - 0
         - 1
-        - 1
-        version: 0.1.1
+        - 4
+        version: 0.1.4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -81,6 +81,20 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: haml
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: A Rack application for serving static sites with ERB templates.
 email: 
 - sstephenson@gmail.com