brochure 0.2.0 → 0.3.0

data/README.md

@@ -5,18 +5,14 @@ A Rack application for serving static sites with ERB templates.
 
 Sample application structure:
 
-    app/
-      helpers/
-        analytics_helper.rb
-        formatting_helper.rb
-      templates/
-        help/
-          index.html.erb
+    templates/
+      help/
         index.html.erb
-        shared/
-          _header.html.erb
-          _footer.html.erb
-        signup.html.erb
+      index.html.erb
+      shared/
+        _header.html.erb
+        _footer.html.erb
+      signup.html.erb
     config.ru
     public/
       ...
@@ -27,17 +23,13 @@ Sample `config.ru`:
     run Brochure.app(File.dirname(__FILE__))
 
 URLs are automatically mapped to template names. So `/` will render
-`app/templates/index.html.erb`, `/signup` will render
-`app/templates/signup.html.erb`, `/help/` will render
-`app/templates/help/index.html.erb`, and so on.
-
-Helpers should define a module that maps to their filename. So
-`analytics_helper.rb` defines `AnalyticsHelper`,
-`html/forms_helper.rb` defines `Html::FormsHelper`, and so on.
+`templates/index.html.erb`, `/signup` will render
+`templates/signup.html.erb`, `/help/` will render
+`templates/help/index.html.erb`, and so on.
 
 Templates can render partials. Partials are denoted by a leading
 underscore in their filename. So `<%= render "shared/header" %>` will
-render `app/templates/shared/_header.html.erb` inline.
+render `templates/shared/_header.html.erb` inline.
 
 # Installation
 

data/lib/brochure.rb

@@ -3,15 +3,15 @@ require "rack"
 require "tilt"
 
 module Brochure
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 
   autoload :Application,      "brochure/application"
   autoload :Context,          "brochure/context"
   autoload :Failsafe,         "brochure/failsafe"
   autoload :TemplateNotFound, "brochure/errors"
 
-  def self.app(root)
-    app = Application.new(root)
+  def self.app(root, options = {})
+    app = Application.new(root, options)
     if development?
       app = Rack::ShowExceptions.new(app)
     else
@@ -20,10 +20,6 @@ module Brochure
     app
   end
 
-  def self.camelize(string)
-    string.gsub(/(^|_)(\w)/) { $2.upcase }
-  end
-
   def self.development?
     ENV["RACK_ENV"] == "development"
   end

data/lib/brochure/application.rb

@@ -1,27 +1,46 @@
 module Brochure
   class Application
-    attr_reader :app_root, :helper_root, :template_root, :asset_root
+    attr_reader :app_root, :template_root, :asset_root, :plugin_root, :assigns
 
-    def initialize(root)
-      @app_root       = File.expand_path(root)
-      @helper_root    = File.join(@app_root, "app", "helpers")
-      @template_root  = File.join(@app_root, "app", "templates")
-      @asset_root     = File.join(@app_root, "public")
+    def initialize(root, options = {})
+      @app_root      = File.expand_path(root)
+      @template_root = File.join(@app_root, "templates")
+      @asset_root    = File.join(@app_root, "public")
+      @plugin_root   = File.join(@app_root, "vendor", "plugins")
 
-      @template_trail = Hike::Trail.new(@app_root)
-      @template_trail.extensions.replace(Tilt.mappings.keys.sort)
-      @template_trail.paths.push(@template_root)
+      @assigns = options[:assigns] || {}
+      helpers.push(*options[:helpers]) if options[:helpers]
+      initialize_plugins
+    end
+
+    def initialize_plugins
+      plugins.each do |plugin_root|
+        template_trail.paths.push(File.join(plugin_root, "templates"))
+      end
+    end
 
-      @context_class  = Context.for(helpers)
-      @templates      = {}
+    def template_trail
+      @template_trail ||= Hike::Trail.new(app_root).tap do |trail|
+        trail.extensions.replace(Tilt.mappings.keys.sort)
+        trail.paths.push(template_root)
+      end
+    end
+
+    def context_class
+      @context_class ||= Context.for(helpers)
+    end
+
+    def templates
+      @templates ||= {}
     end
 
     def helpers
-      @helpers ||= Dir[File.join(@helper_root, "**", "*.rb")].map do |helper_path|
-        base_name    = helper_path[(@helper_root.length + 1)..-1][/(.*?)\.rb$/, 1]
-        module_names = base_name.split("/").map { |n| Brochure.camelize(n) }
-        load helper_path
-        module_names.inject(Kernel) { |mod, name| mod.const_get(name) }
+      @helpers ||= []
+    end
+
+    def plugins
+      @plugins ||= Dir[File.join(plugin_root, "*")].select do |entry|
+        File.directory?(entry)
       end
     end
 
@@ -31,7 +50,7 @@ module Brochure
       elsif template = find_template(env["PATH_INFO"][/[^.]+/])
         success render_template(template, env)
       else
-        not_found
+        not_found(env)
       end
     end
 
@@ -53,25 +72,25 @@ module Brochure
 
     def find_template_path(logical_path)
       candidates = [logical_path + ".html", logical_path + "/index.html"]
-      @template_trail.find(*candidates)
+      template_trail.find(*candidates)
     end
 
     def find_partial_path(logical_path)
       path_parts   = logical_path.split("/")
       partial_path = (path_parts[0..-2] + ["_" + path_parts[-1]]).join("/")
-      @template_trail.find(partial_path + ".html")
+      template_trail.find(partial_path + ".html")
     end
 
     def template_for(template_path)
       if Brochure.development?
         Tilt.new(template_path)
       else
-        @templates[template_path] ||= Tilt.new(template_path)
+        templates[template_path] ||= Tilt.new(template_path)
       end
     end
 
     def render_template(template, env, locals = {})
-      context = @context_class.new(self, env)
+      context = context_class.new(self, env, assigns)
       template.render(context, locals)
     end
 
@@ -87,7 +106,15 @@ module Brochure
       respond_with 200, body
     end
 
-    def not_found
+    def not_found(env)
+      if template = find_template("404")
+        respond_with 404, render_template(template, env)
+      else
+        default_not_found
+      end
+    end
+
+    def default_not_found
       respond_with 404, <<-HTML
         <!DOCTYPE html>
         <html><head><title>Not Found</title></head>

data/lib/brochure/context.rb

@@ -10,15 +10,26 @@ module Brochure
 
     attr_accessor :application, :env
 
-    def initialize(application, env)
+    def initialize(application, env, assigns = {})
       self.application = application
       self.env = env
+      load_assigns(assigns)
+    end
+
+    def load_assigns(assigns)
+      assigns.each do |name, value|
+        instance_variable_set("@#{name}", value)
+      end
     end
 
     def request
       @_request ||= Rack::Request.new(env)
     end
 
+    def h(html)
+      Rack::Utils.escape_html(html)
+    end
+
     def render(logical_path, locals = {})
       if template = @application.find_partial(logical_path)
         @application.render_template(template, env, locals)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: brochure
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Sam Stephenson
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-16 00:00:00 -05:00
+date: 2010-10-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency