RubyGems - trellis - Versions diffs - 0.0.6 → 0.0.7 - Mend

trellis 0.0.6 → 0.0.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (27) hide show

data/History.txt +6 -0
data/examples/crud_components/html/address_view_edit.xhtml +3 -1
data/examples/crud_components/html/addresses.xhtml +3 -1
data/examples/flickr/source/flickr.rb +1 -1
data/examples/guest_book/source/guest_book.rb +2 -1
data/examples/hangman/html/game_over.xhtml +3 -1
data/examples/hangman/html/guess.xhtml +3 -1
data/examples/hangman/html/start.xhtml +3 -1
data/examples/hilo/html/game_over.xhtml +3 -1
data/examples/hilo/html/guess.xhtml +3 -1
data/examples/hilo/html/start.xhtml +3 -1
data/examples/routing/source/routing.rb +1 -1
data/examples/simplest/source/simplest.rb +1 -1
data/examples/stateful_counters/html/counters.xhtml +4 -2
data/lib/trellis/component_library/core_components.rb +19 -3
data/lib/trellis/trellis.rb +284 -48
data/lib/trellis/utils.rb +22 -0
data/lib/trellis/version.rb +1 -1
data/test/application_spec.rb +150 -41
data/test/component_spec.rb +4 -4
data/test/core_extensions_spec.rb +27 -5
data/test/fixtures/application_spec_applications.rb +220 -13
data/test/fixtures/component_spec_components.rb +4 -4
data/test/page_spec.rb +109 -36
data/test/renderer_spec.rb +3 -3
data/test/router_spec.rb +2 -0
metadata +2 -2

data/History.txt CHANGED

@@ -1,3 +1,9 @@
+== 0.0.7
+* 3 major enhancement:
+  * implemented page get method to override default page rendering
+  * added trellis namespace xmlns method for markaby (to prevent rexml from freaking out)
+  * clean all examples to add trellis namespace
 == 0.0.6
 * 2 major enhancement:
   * added dup.call for thread safety

data/examples/crud_components/html/address_view_edit.xhtml CHANGED

@@ -5,7 +5,9 @@
     Author     : bsbodden
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xml:lang="en" lang="en"
+      xmlns:trellis="http://trellisframework.org/schema/trellis_1_0_0.xsd"
+      xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <link rel="stylesheet" type="text/css" href="/style/trellis.css" />

data/examples/crud_components/html/addresses.xhtml CHANGED

@@ -5,7 +5,9 @@
     Author     : bsbodden
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xml:lang="en" lang="en"
+      xmlns:trellis="http://trellisframework.org/schema/trellis_1_0_0.xsd"
+      xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <link rel="stylesheet" type="text/css" href="/style/trellis.css" />

data/examples/flickr/source/flickr.rb CHANGED

@@ -64,7 +64,7 @@ module Flickr
   class Home < Page
     template do
-      xhtml_strict {
+      thtml {
         head {
           title "Trellis Flickr Component Test"
         }

data/examples/guest_book/source/guest_book.rb CHANGED

@@ -36,7 +36,8 @@ module GuestBookApp
     template(%[
 !!! XML
 !!! Strict
-%html{ :xmlns => "http://www.w3.org/1999/xhtml" }
+%html{ :xmlns => "http://www.w3.org/1999/xhtml",
+       "xmlns:trellis" => "http://trellisframework.org/schema/trellis_1_0_0.xsd" }
   %head
     %title
       Trellis Guest Book

data/examples/hangman/html/game_over.xhtml CHANGED

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xml:lang="en" lang="en"
+      xmlns:trellis="http://trellisframework.org/schema/trellis_1_0_0.xsd"
+      xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <link rel="stylesheet" type="text/css" href="/style/hangman.css" />

data/examples/hangman/html/guess.xhtml CHANGED

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:trellis="http://labs.integralis.org/schema/trellis_1_0_0.xsd">
+<html xml:lang="en" lang="en"
+      xmlns:trellis="http://trellisframework.org/schema/trellis_1_0_0.xsd"
+      xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <link rel="stylesheet" type="text/css" href="/style/hangman.css" />

data/examples/hangman/html/start.xhtml CHANGED

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xml:lang="en" lang="en"
+      xmlns:trellis="http://trellisframework.org/schema/trellis_1_0_0.xsd"
+      xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <link rel="stylesheet" type="text/css" href="/style/hangman.css" />

data/examples/hilo/html/game_over.xhtml CHANGED

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xml:lang="en" lang="en"
+      xmlns:trellis="http://trellisframework.org/schema/trellis_1_0_0.xsd"
+      xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <title>Game Over!</title>

data/examples/hilo/html/guess.xhtml CHANGED

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xml:lang="en" lang="en"
+      xmlns:trellis="http://trellisframework.org/schema/trellis_1_0_0.xsd"
+      xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <title>Guess A Number</title>

data/examples/hilo/html/start.xhtml CHANGED

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xml:lang="en" lang="en"
+      xmlns:trellis="http://trellisframework.org/schema/trellis_1_0_0.xsd"
+      xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <title>Hi/Lo Game Start Page</title>

data/examples/routing/source/routing.rb CHANGED

@@ -32,7 +32,7 @@ module Routing
     end
     template do
-      html {
+      thtml {
         body {
           h2 {
             text %[Date <trellis:value name="page.parse_date"/>]

data/examples/simplest/source/simplest.rb CHANGED

@@ -17,7 +17,7 @@ module Simplest
     end
     template do # using Markaby
-      xhtml_strict {
+      thtml {
         head { title "Simplest Trellis Application" }
         body {
           h1 "Simplest Trellis Application"

data/examples/stateful_counters/html/counters.xhtml CHANGED

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<html xml:lang="en" lang="en"
+      xmlns:trellis="http://trellisframework.org/schema/trellis_1_0_0.xsd"
+      xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <title>Trellis: Multi Counter</title>
         <link rel="stylesheet" type="text/css" media="all" href="style/main.css"/>
@@ -46,4 +48,4 @@
             </div>
         </div>
     </body>
-</html>
+</html>

data/lib/trellis/component_library/core_components.rb CHANGED

@@ -230,13 +230,29 @@ module Trellis
         on_behalf = tag.attr['on_behalf']
         method = tag.attr['method'] || 'GET'
         tag.locals.form_name = form_name
-        target_page = tag.globals.page.class.name
+        value = tag.attr['value']
+        if value
+          eval_value = tag.locals.instance_eval(value) || tag.globals.instance_eval(value)
+        end
+        path = (tag.globals.page.path.nil? || tag.globals.page.path.empty?) ? nil : tag.globals.page.path
+        class_name = tag.globals.page.class.name
+        target_page = path || class_name
         href = Trellis::DefaultRouter.to_uri(:url_root => url_root,
                                              :page => target_page,
                                              :event => "submit",
-                                             :source => "#{(on_behalf ? on_behalf : form_name)}")
+                                             :source => "#{(on_behalf ? on_behalf : form_name)}",
+                                             :value => eval_value)
+        attrs = tag.attr.exclude_keys('tid', 'on_behalf', 'method')
+        attrs["name"] = form_name
+        attrs["action"] = href
+        attrs["method"] = method
         builder = Builder::XmlMarkup.new
-        builder.form("name" => form_name, "action" => href, "method" => method) do |form|
+        builder.form(attrs) do |form|
           form << tag.expand
         end
       end

data/lib/trellis/trellis.rb CHANGED

@@ -30,8 +30,7 @@ require 'rubygems'
 require 'rack'
 require 'radius'
 require 'builder'
-require 'hpricot'
-require 'rexml/document'
+require 'nokogiri'
 require 'extensions/string'
 require 'haml'
 require 'markaby'
@@ -43,6 +42,8 @@ require 'erubis'
 require 'ostruct'
 module Trellis
+  TEMPLATE_FORMATS = [:html, :xhtml, :haml, :textile, :markdown, :eruby]
   # -- Application --
   # Represents a Trellis Web Application. An application can define one or more
@@ -50,11 +51,16 @@ module Trellis
   class Application
     include Logging
     include Rack::Utils
+    include Nokogiri::XML
+    @@partials = Hash.new
+    @@layouts = Hash.new
     # descendant application classes get a singleton class level instances for
     # holding homepage, dependent pages, static resource routing paths
     def self.inherited(child) #:nodoc:
       child.class_attr_reader(:homepage)
+      child.attr_array(:persistents)
       child.class_attr_reader(:session_config)
       child.attr_array(:static_routes)
       child.meta_def(:logger) { Application.logger }
@@ -77,10 +83,33 @@ module Trellis
       @static_routes << {:urls => urls, :root => root}
     end
+    # application-wide persistent fields
+    def self.persistent(*fields)
+      instance_attr_accessor fields
+      @persistents = @persistents | fields
+    end
+    def self.partials
+      @@partials
+    end
+    def self.partial(name, body = nil, options = nil, &block)
+      store_template(name, :partial, body, options, &block)
+    end
+    def self.layouts
+      @@layouts
+    end
+    def self.layout(name, body = nil, options = nil, &block)
+      store_template(name, :layout, body, options, &block)
+    end
     # bootstrap the application
     def start(port = 3000)
       Application.logger.info "Starting Trellis Application #{self.class} on port #{port}"
+      # only in development mode
       directory_watcher = configure_directory_watcher
       directory_watcher.start
@@ -99,7 +128,7 @@ module Trellis
       # configure rack middleware
       application = Rack::ShowStatus.new(self)
       application = Rack::ShowExceptions.new(application)
-      application = Rack::Reloader.new(application)
+      application = Rack::Reloader.new(application) # only in development mode
       application = Rack::CommonLogger.new(application, Application.logger)
       # configure rack session
@@ -126,7 +155,7 @@ module Trellis
       match ? match.router : DefaultRouter.new(:application => self)
     end
-    # Rack call interface.
+    # rack call interface.
     def call(env)
       dup.call!(env)
     end
@@ -145,6 +174,9 @@ module Trellis
       page = route.destination.new if route.destination
       if page
+        load_persistent_fields_data(session)
+        page.application = self
         page.class.url_root = request.script_name
         page.path = request.path_info.sub(/^\//, '')
         page.inject_dependent_pages
@@ -156,9 +188,16 @@ module Trellis
         result = route.event ? page.process_event(route.event, route.value, route.source, session) : page
         Application.logger.debug "response is #{result} an instance of #{result.class}"
+        # -------------------------
         # prepare the http response
-        if (request.post? || route.event) && result.kind_of?(Trellis::Page)
+        # -------------------------
+        if result.kind_of?(Trellis::Redirect)
+          # redirect short circuits
+          result.apply_to(request, response)
+          Application.logger.debug "redirecting to ==> #{request.script_name}/#{result.target}"
+        elsif (request.post? || route.event) && result.kind_of?(Trellis::Page)
           # for action events of posts then use redirect after post pattern
           # remove the events path and just return to the page
           path = result.path ? result.path.gsub(/\/events\/.*/, '') : result.class.class_to_sym
@@ -166,17 +205,89 @@ module Trellis
           response.headers["Location"] = "#{request.script_name}/#{path}"
           Application.logger.debug "redirecting to ==> #{request.script_name}/#{path}"
         else
-          # for render requests simply render the page
-          response.body = result.kind_of?(Trellis::Page) ? result.render : result
-          response.status = 200
+          # handle the get method
+          if result.kind_of?(Trellis::Page) && result.respond_to?(:get)
+            get = result.get
+            if get.kind_of?(Trellis::Redirect)
+              # redirect short circuits
+              get.apply_to(request, response)
+              Application.logger.debug "redirecting to ==> #{request.script_name}/#{get.target}"
+            elsif (get.class == result.class) || !get.kind_of?(Trellis::Page)
+              response.body = get.kind_of?(Trellis::Page) ? get.render : get
+              response.status = 200
+            else
+              path = get.path ? get.path.gsub(/\/events\/.*/, '') : get.class.class_to_sym
+              response.status = 302
+              response.headers["Location"] = "#{request.script_name}/#{path}"
+              Application.logger.debug "redirecting to ==> #{request.script_name}/#{path}"
+            end
+          else
+            # for render requests simply render the page
+            response.body = result.kind_of?(Trellis::Page) ? result.render : result
+            response.status = 200
+          end
         end
       else
         response.status = 404
       end
+      save_persistent_fields_data(session)
       response.finish
     end
     private
+    def self.store_template(name, type, body = nil, options = nil, &block)
+      format = (options[:format] if options) || :html
+      if block_given?
+        mab = Markaby::Builder.new({}, self, &block)
+        html = mab.to_s
+      else
+        case format
+        when :haml
+          html = Haml::Engine.new(body).render
+        when :textile
+          html = RedCloth.new(body).to_html
+        when :markdown
+          if type == :partial
+            html = BlueCloth.new(body).to_html
+          else
+            html = Markaby.build { thtml { body { text "#{BlueCloth.new(body).to_html}" } }}
+          end
+        else # assume the body is (x)html, also eruby is treated as (x)html at this point
+          html = body
+        end
+      end
+      template = Nokogiri::XML(html)
+      case type
+      when :layout
+        @@layouts[name] = OpenStruct.new({:name => name,
+                                          :template => template,
+                                          :to_xml => template.to_xml,
+                                          :format => format})
+      when :partial
+        @@partials[name] = OpenStruct.new({:name => name,
+                                           :template => template,
+                                           :to_xml => template.to_xml(:save_with => Node::SaveOptions::NO_DECLARATION),
+                                           :format => format})
+      end
+    end
+    def load_persistent_fields_data(session)
+      self.class.persistents.each do |persistent_field|
+        field = "@#{persistent_field}".to_sym
+        current_value = instance_variable_get(field)
+        new_value = session[persistent_field]
+        if current_value != new_value && new_value != nil
+          instance_variable_set(field, new_value)
+        end
+      end
+    end
+    def save_persistent_fields_data(session)
+      self.class.persistents.each do |persistent_field|
+        session[persistent_field] = instance_variable_get("@#{persistent_field}".to_sym)
+      end
+    end
     def configure_directory_watcher(directory = nil)
       # set directory watcher to reload templates
@@ -316,20 +427,47 @@ module Trellis
     end
     def self.to_uri(options={})
+      # get options
       url_root = options[:url_root]
       page = options[:page]
       event = options[:event]
       source = options[:source]
       value = options[:value]
-      destination = page.kind_of?(Trellis::Page) ? (page.path || page.class.class_to_sym) : page
-      url_root = page.kind_of?(Trellis::Page) && page.class.url_root ? "/#{page.class.url_root}" : '/' unless url_root
+      destination = page
+      url_root = "/"
+      if page.kind_of?(Trellis::Page)
+        destination = page.path || page.class.class_to_sym
+        root = page.class.url_root
+        url_root = (root && !root.empty?) ? "/#{root}" : '/'
+      end
       source = source ? ".#{source}" : ''
       value = value ? "/#{value}" : ''
       event_info = event ? "/events/#{event}#{source}#{value}" : ''
       "#{url_root}#{destination}#{event_info}"
     end
   end
+  # -- Redirect --
+  # Encapsulates an HTTP redirect (is the object returned by Page#redirect method)
+  class Redirect
+    attr_reader :target, :status
+    def initialize(target, status=nil)
+      status = 302 unless status
+      raise ArgumentError.new("#{status} is not a valid redirect status") unless status >= 300 && status < 400
+      @target, @status = target, status
+    end
+    def apply_to(request, response)
+      response.status = status
+      response["Location"] = "#{request.script_name}#{target.starts_with?('/') ? '' : '/'}#{target}"
+    end
+  end
   # -- Page --
   # Represents a Web Page in a Trellis Application. A Page can contain multiple
   # components and it defines a template or view either as an external file
@@ -337,13 +475,12 @@ module Trellis
   # A Trellis Page contains listener methods to respond to events trigger by
   # components in the same page or other pages
   class Page
-    TEMPLATE_FORMATS = [:html, :xhtml, :haml, :textile, :markdown, :eruby]
+    include Nokogiri::XML
     @@subclasses = Hash.new
     @@template_registry = Hash.new
-    attr_accessor :params, :path, :logger
+    attr_accessor :application, :params, :path, :logger
     def self.inherited(child) #:nodoc:
       sym = child.class_to_sym
@@ -357,15 +494,19 @@ module Trellis
       child.class_attr_accessor :url_root
       child.class_attr_accessor :name
       child.class_attr_accessor :router
-      child.class_attr_accessor :layout
       child.meta_def(:add_stateful_component) { |tid,clazz| @stateful_components << [tid,clazz] }
       locate_template child
       super
     end
+    def self.layout
+      @layout
+    end
     def self.template(body = nil, options = nil, &block)
       @format = (options[:format] if options) || :html
+      @layout = (options[:layout] if options)
       if block_given?
         mab = Markaby::Builder.new({}, self, &block)
         html = mab.to_s
@@ -376,16 +517,27 @@ module Trellis
         when :textile
           html = RedCloth.new(body).to_html
         when :markdown
-          html = "<html><body>#{BlueCloth.new(body).to_html}</body></html>"
+          if @layout
+            html = BlueCloth.new(body).to_html
+          else
+            html = Markaby.build { thtml { body { text "#{BlueCloth.new(body).to_html}" } }}
+          end
         else # assume the body is (x)html, also eruby is treated as (x)html at this point
           html = body
         end
       end
-      @template = Hpricot.XML(html)
+      # hack to prevent nokogiri form stripping namespace prefix on xml fragments
+      if @layout
+        html = %[<div id="trellis_remove" xmlns:trellis="http://trellisframework.org/schema/trellis_1_0_0.xsd">#{html}</div>]
+      end
+      @template = Nokogiri::XML(html)
       find_components
     end
-    def self.parsed_template
+    def self.dom
       # try to reload the template if it wasn't found on during inherited
       # since it could have failed if the app was not mounted as root
       unless @template
@@ -395,6 +547,10 @@ module Trellis
       @template
     end
+    def self.to_xml(options = {})
+      options[:no_declaration] ? dom.to_xml(:save_with => Node::SaveOptions::NO_DECLARATION) : dom.to_xml
+    end
     def self.format
       @format
     end
@@ -421,22 +577,22 @@ module Trellis
       @@subclasses
     end
-    def initialize # TODO this is Ugly.... should no do it in initialize since it'll require super in child classes
+    def initialize # TODO this is Ugly.... should not do it in initialize since it'll require super in child classes
       self.class.stateful_components.each do |id_component|
         id_component[1].enhance_page(self, id_component[0])
       end
       @logger = Application.logger
     end
+    def redirect(path, status=nil)
+      Redirect.new(path, status)
+    end
     def process_event(event, value, source, session)
       method = source ? "on_#{event}_from_#{source}" : "on_#{event}"
-      # execute the method passing the value if necessary
-      unless value
-        method_result = send method.to_sym
-      else
-        method_result = send method.to_sym, Rack::Utils.unescape(value)
-      end
+      # execute the method passing the value if necessary
+      method_result = value ? send(method.to_sym, Rack::Utils.unescape(value)) : send(method.to_sym)
       # determine navigation flow based on the return value of the method call
       if method_result
@@ -474,6 +630,10 @@ module Trellis
       result
     end
+    def render_partial(name, locals={})
+      Renderer.new(self).render_partial(name, locals)
+    end
     # inject an instance of each of the injected pages classes as instance variables
     # of the current page
     def inject_dependent_pages
@@ -498,7 +658,7 @@ module Trellis
             end
             template do
-              xhtml_strict {
+              thtml {
                 head { title "Stand-in Page" }
                 body { h1 { text %[Stand-in Page for <trellis:value name="page_name"/>] }}
               }
@@ -550,9 +710,8 @@ module Trellis
     def self.find_components
       @components.clear
       classes_processed = []
-      doc = REXML::Document.new(@template.to_html)
       # look for component declarations in the template
-      doc.elements.each('//trellis:*') do |element|
+      @template.xpath("//trellis:*", 'trellis' => "http://trellisframework.org/schema/trellis_1_0_0.xsd").each do |element|
         # retrieve the component class
         component = Component.get_component(element.name.to_sym)
         # for components that are contained in other components
@@ -561,13 +720,13 @@ module Trellis
           parent = nil
           # loop over all the container types until we find the matching parent
           component.containers.each do |container|
-            parent = REXML::XPath.first(element, "ancestor::trellis:#{container}")
+            parent = element.xpath("ancestor::trellis:#{container}", 'trellis' => "http://trellisframework.org/schema/trellis_1_0_0.xsd").first
             break if parent
           end
-          element.attributes['parent_tid'] = parent.attributes['tid'] if parent
+          element['parent_tid'] = parent['tid'] if parent
         end
-        tid = element.attributes['tid']
+        tid = element['tid']
         unless component
           Application.logger.info "could not find #{element.name} in component hash"
         else
@@ -638,11 +797,14 @@ module Trellis
   class Renderer
     include Radius
+    SKIP_METHODS = ['before_load', 'after_load', 'before_render', 'after_render', 'get']
+    INCLUDE_METHODS = ['render_partial']
     def initialize(page)
       @page = page
       @context = Context.new
       # context for erubis templates
-      @eruby_context = {} if @page.class.format == :eruby
+      @eruby_context = Erubis::Context.new #if @page.class.format == :eruby
       # add all instance variables in the page as values accesible from the tags
       page.instance_variables.each do |var|
@@ -650,19 +812,50 @@ module Trellis
         unless value.kind_of?(Trellis::Page)
           sym = "#{var}=".split('@').last.to_sym
           @context.globals.send(sym, value)
-          @eruby_context["#{var}".split('@').last] = value if @eruby_context
+          @eruby_context["#{var}".split('@').last] = value #if @eruby_context
         end
       end
       # add other useful values to the tag context
       @context.globals.send(:page_name=, page.class.to_s)
-      @eruby_context[:page_name] = page.class.to_s if @eruby_context
+      @eruby_context[:page_name] = page.class.to_s #if @eruby_context
-      #TODO add public page methods to the context
+      # add public page methods to the context
+      page.public_methods(false).each do |method_name|
+        # skip event handlers and the 'get' method
+        unless method_name.starts_with?('on_') || SKIP_METHODS.include?(method_name)
+          @eruby_context.meta_def(method_name) do |*args|
+            page.send(method_name.to_sym, *args)
+          end #if @eruby_context
+          @context.globals.meta_def(method_name) do |*args|
+            page.send(method_name.to_sym, *args)
+          end
+        end
+      end
+      # add page helper methods to the context
+      INCLUDE_METHODS.each do |method_name|
+        @eruby_context.meta_def(method_name) do |*args|
+          page.send(method_name.to_sym, *args)
+        end #if @eruby_context
+        @context.globals.meta_def(method_name) do |*args|
+          page.send(method_name.to_sym, *args)
+        end
+      end
+      # add public application methods to the context
+      page.application.public_methods(false).each do |method_name|
+        @eruby_context.meta_def(method_name) do |*args|
+          page.application.send(method_name.to_sym, *args)
+        end #if @eruby_context
+        @context.globals.meta_def(method_name) do |*args|
+          page.application.send(method_name.to_sym, *args)
+        end
+      end
       # add the page to the context too
       @context.globals.page = page
-      @eruby_context[:page] = page if @eruby_context
+      @eruby_context[:page] = page #if @eruby_context
       # register the components contained in the page with the renderer's context
       page.class.components.each do |component|
@@ -673,11 +866,54 @@ module Trellis
     end
     def render
-      unless @page.class.format == :eruby
-        @parser.parse(@page.class.parsed_template.to_html)
+      preprocessed = ""
+      layout_id = @page.class.layout
+      template = layout_id ? @page.class.to_xml(:no_declaration => true) : @page.class.to_xml
+      if layout_id
+        # page has a layout
+        # retrieve the layout from the application
+        layout = Application.layouts[layout_id]
+        # render the page template to a variable
+        if @page.class.format == :eruby
+          body = Erubis::PI::Eruby.new(template, :trim => false).evaluate(@eruby_context)
+          @eruby_context[:body] = body
+        else
+          @eruby_context[:body] = template
+        end
+        # render the layout around the page template
+        preprocessed = Erubis::PI::Eruby.new(layout.to_xml, :trim => false).evaluate(@eruby_context)
+        # clean up nokogiri namespace hack, see Page#template
+        doc = Nokogiri::XML(preprocessed)
+        to_be_removed = doc.at_css(%[div[id="trellis_remove"]])
+        parent = to_be_removed.parent
+        to_be_removed.children.each { |child| child.parent = parent }
+        to_be_removed.remove
+        preprocessed = doc.to_xml
       else
-        preprocessed = Erubis::PI::Eruby.new(@page.class.parsed_template.to_html, :trim => false).evaluate(@eruby_context)
-        @parser.parse(preprocessed)
+        # page has no layout
+        if @page.class.format == :eruby
+          preprocessed = Erubis::PI::Eruby.new(template, :trim => false).evaluate(@eruby_context)
+        else
+          preprocessed = template
+        end
+      end
+      # radius parsing
+      @parser.parse(preprocessed)
+    end
+    def render_partial(name, locals={})
+      partial = Application.partials[name]
+      if partial
+        if partial.format == :eruby
+          locals.each_pair { |n,v| @eruby_context[n] = v }
+          preprocessed = Erubis::PI::Eruby.new(partial.to_xml, :trim => false).evaluate(@eruby_context)
+          @parser.parse(preprocessed)
+        else
+          @parser.parse(partial.to_xml)
+        end
       end
     end
@@ -762,7 +998,7 @@ module Trellis
         href = href.replace_ant_style_properties(attributes) if attributes
         builder = Builder::XmlMarkup.new
         link = builder.link(:rel => "stylesheet", :type => "text/css", :href => href)
-        page.parsed_template.at("html/head").containers.last.after("\n#{link}")
+        page.dom.at_css("html/head").children.last.after("\n#{link}")
       end
     end
@@ -771,7 +1007,7 @@ module Trellis
         src = src.replace_ant_style_properties(attributes) if attributes
         builder = Builder::XmlMarkup.new
         script = builder.script('', :type => "text/javascript", :src => src)
-        page.parsed_template.at("html/head").containers.last.after("\n#{script}")
+        page.dom.at_css("html/head").children.last.after("\n#{script}")
       end
     end
@@ -782,7 +1018,7 @@ module Trellis
         style = builder.style(:type => "text/css") do |builder|
           builder << body
         end
-        page.parsed_template.at("html/head").containers.last.after("\n#{style}")
+        page.dom.at_css("html/head").children.last.after("\n#{style}")
       end
     end
@@ -793,7 +1029,7 @@ module Trellis
         script = builder.script(:type => "text/javascript") do |builder|
           builder << body
         end
-        page.parsed_template.at("html/body").containers.last.after("\n#{script}")
+        page.dom.at_css("html/body").children.last.after("\n#{script}")
       end
     end
@@ -804,7 +1040,7 @@ module Trellis
         style = builder.style(:type => "text/css") do |builder|
           builder << body
         end
-        page.parsed_template.at("html/head").containers.last.after("\n#{style}")
+        page.dom.at_css("html/head").children.last.after("\n#{style}")
       end
     end
@@ -815,13 +1051,13 @@ module Trellis
         script = builder.script(:type => "text/javascript") do |builder|
           builder << body
         end
-        page.parsed_template.at("html/body").containers.last.after("\n#{script}")
+        page.dom.at_css("html/body").children.last.after("\n#{script}")
       end
     end
     def self.add_document_modifications_to_page(page)
       document_modifications.each do |block|
-        page.parsed_template.instance_eval(&block)
+        page.dom.instance_eval(&block)
       end
     end
@@ -926,4 +1162,4 @@ module Trellis
   require 'trellis/component_library/core_components'
   require 'trellis/component_library/grid'
   require 'trellis/component_library/object_editor'
-end
+end