trellis 0.0.4 → 0.0.5

data/.gitignore

@@ -0,0 +1,5 @@
+nbproject
+.DS_Store
+Thumbs.db
+**/.svn
+website

data/History.txt

@@ -1,6 +1,23 @@
-== 0.0.2 2009-09-19
+== 0.0.5
+* 2 major enhancements:
+  * template can now use erb (erubis using Processing Instructions (PI))
+  * added check for nil Rack::Session when using Cookie Store
+
+== 0.0.4
+* 1 major enhancement:
+  * tests for Renderer
+  * more routing tests
+  * request query params now available to page as instance variables
+  * cleaned up dependencies
 
-* 3 major enhancements:
+== 0.0.3
+* 1 major enhancement:
+  * stand-in pages
+
+== 0.0.2 2009-09-19
+* 5 major enhancements:
+  * code reloading
+  * template reloading
   * event subsystem revamped
   * custom routing
   * more tests!
@@ -8,4 +25,4 @@
 == 0.0.1 2009-08-29
 
 * 1 major enhancement:
-  * Initial release
+  * initial release

data/Manifest.txt

@@ -1,7 +1,9 @@
+.gitignore
 History.txt
 License.txt
 Manifest.txt
 README
+README.txt
 Rakefile
 config/hoe.rb
 config/requirements.rb
@@ -109,6 +111,7 @@ test/component_spec.rb
 test/core_extensions_spec.rb
 test/default_router_spec.rb
 test/fixtures/application_spec_applications.rb
+test/fixtures/component_spec_components.rb
 test/page_spec.rb
 test/renderer_spec.rb
 test/router_spec.rb

data/README.txt

@@ -0,0 +1,156 @@
+= Project: Trellis
+
+Trellis is a component-based Web Application Framework written in Ruby. 
+Its main goal is to bring component-driven development to the micro-framework world. 
+The framework aims to be a zero-configuration framework. 
+
+It draws inspiration from:
+
+Ruby Web Frameworks
+===================
+* Rails
+* Camping
+* Merb
+* Iowa
+* Sinatra
+
+Java Web Frameworks
+===================
+* Tapesty
+* Wicket
+* The good parts of JSF (components)
+
+Others
+======
+* Seaside
+
+== Goals 
+Accomplished goals are marked with a (*)
+- * Pure HTML templates or in-line template creation with Markaby or HAML
+- * To abstract away the request-response nature of web development and replace 
+  with events and listeners
+- * Reusable, extensible components including invisible components (behavior 
+  providers), tags (stateless components) or stateful components
+- Easy component composition and markup inheritance
+- * Multi-threading support 
+- * Heavy CoC :-) (Convention Over Configuration) ala Rails
+- * No static code generation, no generators, just a Ruby file!
+- * Component Libraries as Gems
+- * Solid Ajax support attached to the event model using a single* massively tested
+  Ajax framework/toolkit such as JQuery
+- Skinnable components a la DotNet. That is the ability to apply a theme to a 
+  page and cascade that to the contained components
+- Support for continuations in a componentized fashion (maybe)
+- CRUD behaviours for Pages/Components and using Datamapper under the covers
+- Web-based debugging and administration of the application similar to what
+  Seaside provides
+
+== Development Goals (To-do's)
+
+- Keep the core framework in a single file
+- Keep the core components in another file
+- I have not done anything about exception handling (didn't wanted to litter the
+  code base). Currently I'm always sending an HTTP 200 back or I'm just letting 
+  the app blow chuncks and showing rack's exception page
+- Radius usage is really entrenched in the current component implementation need
+  to clean it up
+- Currently Trellis uses the Mongrel Rack Adapter. In the near future the 
+  particular web server would be configurable (one of the reasons to use Rack)
+
+== Classes
+
+Trellis::Application:: Base case for all Trellis applications
+Trellis::Page:: Base class for all application Pages
+Trellis::Renderer:: Renders XML/XHTML tags in the markup using Radius 
+Trellis::Component:: Base class for all Trellis components (work in progress)
+Trellis::DefaultRouter:: Encapsulates the default routing logic
+
+== <b>Notes</b>:: 
+
+* Event model is pretty shallow right now. Basically events are just
+  a convention of how the URLs are interpreted which results on a page method
+  being invoked. A given URL contains information about the target page, event, 
+  source of the event and possible context values.This information is used to 
+  map to a single method in the page.
+* Navigation is a la Tapestry; Page methods can return the instance of a 
+  injected Page or they can return self in which case the same page is 
+  re-rendered.
+* Component can register their event handlers with the page. The page wraps the
+  event handlers of the contained components and dispatches the events to the 
+  component instance. 
+* Currently the Application is a single object, the multi-threading (which I had 
+  nothing to do with is provided by Rack) happens in the request dispatching. 
+* Trellis is not a managed framework like Tapestry, in that sense it is more like 
+  Wicket. Pages instances are just created when needed, there is no pooling, 
+  or any of the complexity involved in activating/passivating objects to a pool.
+
+== Installation
+
+* <tt>gem install trellis</tt>
+
+A Trellis application consists of the Application class; a descendant of 
+Trellis::Application and one or more pages; descendants of Trellis::Page. The
+Application at a minimum needs to declare the starting or home page:
+
+  module Hello
+    class HelloWorld < Trellis::Application
+      home :home
+    end
+
+    class Home < Trellis::Page 
+      template do html { body { h1 "Hello World!" }} end
+    end
+  end
+
+To run the above application simply add the line:
+
+  Hello::HelloWorld.new.start
+
+That will start the application on Mongrel running on port 3000 by default. To 
+run on any other port pass the port number to the start method like:
+
+  Hello::HelloWorld.new.start 8282
+
+== Required Gems
+
+rack => http://rack.rubyforge.org
+mongrel => http://mongrel.rubyforge.org
+radius => http://radius.rubyforge.org
+builder => http://builder.rubyforge.org
+paginator => http://paginator.rubyforge.org
+hpricot => http://code.whytheluckystiff.net/hpricot
+extensions => http://extensions.rubyforge.org
+haml => http://haml.hamptoncatlin.com
+markaby => http://code.whytheluckystiff.net/markaby
+
+== LICENSE:
+
+(The MIT License)
+
+Copyright &169;2001-2009 Integrallis Software, LLC.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+== Contact
+
+Author::     Brian Sam-Bodden
+Email::      bsbodden@integrallis.com
+Home Page::  http://integrallis.com
+License::    MIT Licence (http://www.opensource.org/licenses/mit-license.html)

data/Rakefile

@@ -2,3 +2,6 @@ require 'config/requirements'
 require 'config/hoe' # setup Hoe + all gem configuration
 
 Dir['tasks/**/*.rake'].each { |rake| load rake }
+
+task :default => :spec
+

data/config/hoe.rb

@@ -9,20 +9,24 @@ HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
 DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
 EXTRA_DEPENDENCIES = [
   ['paginator', '>= 1.1.1'],
-  ['rack', '>= 0.4.0'],
-  ['radius', '>= 0.5.1'],
+  ['rack', '>= 1.0.1'],
+  ['radius', '>= 0.6.1'],
   ['builder', '>= 2.1.2'],
   ['hpricot', '>= 0.6.0'],
   ['extensions', '>= 0.6.0'],
-  ['haml', '>= 2.0.3'],
-  ['RedCloth', '>= 4.0.3'],
-  ['BlueCloth', '>= 1.0.0'],
+  ['haml', '>= 2.2.9'],
+  ['RedCloth', '>= 4.2.2'],
+  ['bluecloth', '>= 2.0.5'],
   ['markaby', '>= 0.5'],
-  ['log4r', '>= 1.0.5'],
-  ['dm-core', '>= 0.9.5'],
-  ['dm-validations', '>= 0.9.5'],
-  ['dm-timestamps', '>= 0.9.5'],
-  ['english', '>= 0.2.0']  
+  ['log4r', '>= 1.1.2'],
+  ['facets', '>= 2.7.0'],
+  ['directory_watcher', '>= 1.2.0'], 
+  ['rack-cache', '>= 0.5.2'],
+  ['rack-contrib', '>= 0.9.2'],
+  ['rack-test', '>= 0.5.0'],
+  ['erubis', '>= 2.6.5'],
+  ['rspec', '>= 1.2.9'],
+  ['newgem', '>= 1.5.2']
 ]    # An array of rubygem dependencies [name, version]
 
 @config_file = "~/.rubyforge/user-config.yml"
@@ -62,18 +66,19 @@ end
 
 # Generate all the Rake tasks
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.new(GEM_NAME, VERS) do |p|
-  p.developer(AUTHOR, EMAIL)
-  p.description = DESCRIPTION
-  p.summary = DESCRIPTION
-  p.url = HOMEPATH
-  p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
-  p.test_globs = ["test/**/test_*.rb"]
-  p.clean_globs |= ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']  #An array of file patterns to delete on clean.
+$hoe = Hoe.spec GEM_NAME do
+  self.version = VERS
+  self.developer(AUTHOR, EMAIL)
+  self.description = DESCRIPTION
+  self.summary = DESCRIPTION
+  self.url = HOMEPATH
+  self.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
+  self.test_globs = ["test/**/test_*.rb"]
+  self.clean_globs |= ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']  #An array of file patterns to delete on clean.
 
   # == Optional
-  p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.extra_deps = EXTRA_DEPENDENCIES
+  self.changes = paragraphs_of("History.txt", 0..1).join("\n\n")
+  self.extra_deps = EXTRA_DEPENDENCIES
 end
 
 CHANGES = $hoe.paragraphs_of('History.txt', 0..1).join("\\n\\n")

data/lib/trellis/trellis.rb

@@ -37,9 +37,9 @@ require 'haml'
 require 'markaby'
 require 'redcloth'
 require 'bluecloth'
-require 'english/inflect'
 require 'facets'
 require 'directory_watcher'
+require 'erubis'
 
 module Trellis
 
@@ -116,7 +116,7 @@ module Trellis
 
       Application.logger.debug "request received with url_root of #{request.script_name}" if request.script_name
 
-      session = env["rack.session"]
+      session = env['rack.session'] ||= {}
 
       router = find_router_for(request)
       route = router.route(request)
@@ -239,6 +239,7 @@ module Trellis
           else
             {}
           end
+        params << request.params
         params.each_pair { |name, value| page.instance_variable_set("@#{name}".to_sym, value) }
       end
     end
@@ -315,7 +316,7 @@ module Trellis
   # components in the same page or other pages
   class Page
 
-    TEMPLATE_FORMATS = [:html, :xhtml, :haml, :textile, :markdown]
+    TEMPLATE_FORMATS = [:html, :xhtml, :haml, :textile, :markdown, :eruby]
     
     @@subclasses = Hash.new
     @@template_registry = Hash.new
@@ -342,19 +343,19 @@ module Trellis
     end  
     
     def self.template(body = nil, options = nil, &block)
-      format = options[:format] if options
+      @format = (options[:format] if options) || :html
       if block_given?
         mab = Markaby::Builder.new({}, self, &block)
         html = mab.to_s
       else
-        case format
+        case @format
         when :haml
           html = Haml::Engine.new(body).render
         when :textile  
           html = RedCloth.new(body).to_html
         when :markdown
-          html = BlueCloth.new(body).to_html
-        else # assume the body is (x)html 
+          html = "<html><body>#{BlueCloth.new(body).to_html}</body></html>"
+        else # assume the body is (x)html, also eruby is treated as (x)html at this point
           html = body
         end
       end
@@ -371,6 +372,10 @@ module Trellis
       end 
       @template
     end
+    
+    def self.format
+      @format
+    end
 
     def self.pages(*syms)
       @pages = @pages | syms
@@ -408,7 +413,7 @@ module Trellis
       unless value
         method_result = send method.to_sym
       else
-        method_result = send method.to_sym, value
+        method_result = send method.to_sym, Rack::Utils.unescape(value)
       end
 
       # determine navigation flow based on the return value of the method call
@@ -614,6 +619,8 @@ module Trellis
     def initialize(page)
       @page = page
       @context = Context.new
+      # context for erubis templates
+      @eruby_context = {} if @page.class.format == :eruby
       
       # add all instance variables in the page as values accesible from the tags
       page.instance_variables.each do |var|
@@ -621,17 +628,19 @@ 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
         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
 
       #TODO add public page methods to the context
 
-      
       # add the page to the context too
       @context.globals.page = page
+      @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|
@@ -642,7 +651,13 @@ module Trellis
     end
     
     def render
-      @parser.parse(@page.class.parsed_template.to_html)
+      unless @page.class.format == :eruby
+        @parser.parse(@page.class.parsed_template.to_html)
+      else
+        puts "eruby context is #{@eruby_context}"
+        preprocessed = Erubis::PI::Eruby.new(@page.class.parsed_template.to_html, :trim => false).evaluate(@eruby_context)
+        @parser.parse(preprocessed)
+      end
     end
     
   end # renderer

data/lib/trellis/utils.rb

@@ -24,12 +24,6 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-module Kernel
-  def with( object, &block )
-    object.instance_eval(&block); object
-  end
-end
-
 class Object #:nodoc:
   def meta_def(m,&b) #:nodoc:
     metaclass.send(:define_method,m,&b)
@@ -99,6 +93,30 @@ class Class #:nodoc:
 end
 
 class String #:nodoc:
+  
+  PLURALS = [['(quiz)$', '\1zes'],['(ox)$', '\1en'],['([m|l])ouse$', '\1ice'],['(matr|vert|ind)ix|ex$', '\1ices'],
+    ['(x|ch|ss|sh)$', '\1es'],['([^aeiouy]|qu)ies$', '\1y'],['([^aeiouy]|q)y$$', '\1ies'],['(hive)$', '\1s'],
+    ['(?:[^f]fe|([lr])f)$', '\1\2ves'],['(sis)$', 'ses'],['([ti])um$', '\1a'],['(buffal|tomat)o$', '\1oes'],['(bu)s$', '\1es'],
+    ['(alias|status)$', '\1es'],['(octop|vir)us$', '\1i'],['(ax|test)is$', '\1es'],['s$', 's'],['$', 's']]
+  SINGULARS =[['(quiz)zes$', '\1'],['(matr)ices$', '\1ix'],['(vert|ind)ices$', '\1ex'],['^(ox)en$', '\1'],['(alias|status)es$', '\1'],
+    ['(octop|vir)i$', '\1us'],['(cris|ax|test)es$', '\1is'],['(shoe)s$', '\1'],['[o]es$', '\1'],['[bus]es$', '\1'],['([m|l])ice$', '\1ouse'],
+    ['(x|ch|ss|sh)es$', '\1'],['(m)ovies$', '\1ovie'],['[s]eries$', '\1eries'],['([^aeiouy]|qu)ies$', '\1y'],['[lr]ves$', '\1f'],
+    ['(tive)s$', '\1'],['(hive]s$', '\1'],['([^f]]ves$', '\1fe'],['(^analy)ses$', '\1sis'],
+    ['([a]naly|[b]a|[d]iagno|[p]arenthe|[p]rogno|[s]ynop|[t]he)ses$', '\1\2sis'],['([ti])a$', '\1um'],['(news)$', '\1ews']]
+
+  def singular()
+    SINGULARS.each { |match_exp, replacement_exp| return gsub(Regexp.compile(match_exp), replacement_exp) unless match(Regexp.compile(match_exp)).nil?}
+  end
+
+  def plural()
+    PLURALS.each { |match_exp, replacement_exp| return gsub(Regexp.compile(match_exp), replacement_exp) unless match(Regexp.compile(match_exp)).nil? }
+  end
+
+  def plural?
+    PLURALS.each {|match_exp, replacement_exp| return true if match(Regexp.compile(match_exp))}
+    false
+  end
+
   def blank?
     self !~ /\S/
   end

data/lib/trellis/version.rb

@@ -28,7 +28,7 @@ module Trellis
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 4
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/application_spec.rb

@@ -89,7 +89,7 @@ describe Trellis::Application, " requesting a route" do
     response.body.should == '<html><body>goodbye/cruel/world</body></html>'
   end
 
-  it "should supports mixing multiple splat" do
+  it "should supports mixing multiple splats" do
     response = @request.get('/splats/bar/foo/bling/baz/boom')
     response.body.should == '<html><body>barblingbaz/boom</body></html>'
 
@@ -101,4 +101,19 @@ describe Trellis::Application, " requesting a route" do
     response = @request.get('/mixed/afoo/bar/baz')
     response.body.should == '<html><body>bar/baz-afoo</body></html>'
   end
+
+  it "should merge named params and query string params" do
+    response_mr_bean = @request.get("/hello/Bean?salutation=Mr.%20")
+    response_mr_bean.body.should == "<html><body><h2>Hello</h2>Mr. Bean</body></html>"
+  end
+
+  it "should match a dot ('.') as part of a named param" do
+    response = @request.get("/foobar/user@example.com/thebar")
+    response.body.should == "<html><body>user@example.com-thebar</body></html>"
+  end
+
+  it "should match a literal dot ('.') outside of named params" do
+    response = @request.get("/downloads/logo.gif")
+    response.body.should == "<html><body>logo-gif</body></html>"
+  end
 end

data/test/fixtures/application_spec_applications.rb

@@ -22,6 +22,10 @@ module TestApp
     def on_event3 
       @other
     end
+
+    def on_event4(value)
+      "the value is #{value}"
+    end
   end
   
   class Other < Trellis::Page    
@@ -61,7 +65,7 @@ module TestApp
       html { 
         body { 
           h2 "Hello"
-          text %[<trellis:value name="name"/>] 
+          text %[<trellis:value name="salutation"/><trellis:value name="name"/>]
         }
       } 
     end
@@ -136,4 +140,79 @@ module TestApp
     end
   end
 
+  class RoutedWithTwoParams < Trellis::Page
+    route '/foobar/:foo/:bar'
+
+    template do
+      html {
+        body {
+          text %[<trellis:value name="foo"/>]
+          text '-'
+          text %[<trellis:value name="bar"/>]
+        }
+      }
+    end
+  end
+
+  class RoutedWithImplicitDot < Trellis::Page
+    route '/downloads/:file.:ext'
+
+    template do
+      html {
+        body {
+          text %[<trellis:value name="file"/>]
+          text '-'
+          text %[<trellis:value name="ext"/>]
+        }
+      }
+    end
+  end
+
+  class SamplePage < Trellis::Page
+    attr_accessor :value
+    template do html { body { text %[<trellis:value name="value"/>] }} end
+  end
+
+  class AnotherSamplePage < Trellis::Page
+    template do html { body { text %[<trellis:value name="page_name"/>] }} end
+  end
+
+  class HamlPage < Trellis::Page
+    template %[!!! XML
+!!! Strict
+%html{ :xmlns => "http://www.w3.org/1999/xhtml" }
+  %head
+    %meta{ :content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type" }
+    %title
+      This is a HAML page
+  %body
+    %h1
+      Page Title
+    %p
+      HAML rocks!], :format => :haml
+  end
+
+  class TextilePage < Trellis::Page
+    template %[A *simple* example.], :format => :textile
+  end
+
+  class MarkDownPage < Trellis::Page
+    template "# This is the Title\n## This is the SubTitle\nThis is some text", :format => :markdown
+  end
+
+  class HTMLPage < Trellis::Page
+    template "<html><body><h1>This is just HTML</h1></body></html>"
+  end
+  
+  class ERubyPage < Trellis::Page
+    attr_reader :list
+    
+    def initialize
+      self
+      @list = ["Hey", "bud", "let's", "party!"]
+    end
+    
+    template %[<html><body><ul><?rb for item in @list ?><li>@{item}@</li><?rb end ?></ul></body></html>], :format => :eruby
+  end
+
 end

data/test/fixtures/component_spec_components.rb

@@ -0,0 +1,114 @@
+module TestComponents
+  
+  class SimpleComponent < Trellis::Component
+    tag_name "simple_component"
+
+    render do |tag|
+      "hello from simple component"
+    end
+  end
+
+  class Counter < Trellis::Component
+    is_stateful
+
+    tag_name "counter"
+
+    field :value, :persistent => true
+
+    def initialize
+      reset
+    end
+
+    render do |tag|
+      tid = tag.attr['tid']
+      page = tag.globals.page
+      counter = page.send("counter_#{tid}")
+      value = counter.value
+      href_add = Trellis::DefaultRouter.to_uri(:page => page.class.name,
+                                      :event => 'add',
+                                      :source => "counter_#{tid}")
+      href_subtract = Trellis::DefaultRouter.to_uri(:page => page.class.name,
+                                      :event => 'subtract',
+                                      :source => "counter_#{tid}")
+      builder = Builder::XmlMarkup.new
+      builder.div(:id => tid) {
+        builder.text!(value.to_s)
+        builder.a("++", :href => href_add)
+        builder.a("--", :href => href_subtract)
+      }
+    end
+
+    def on_add
+      @value = @value + 1
+    end
+
+    def on_subtract
+      @value = @value - 1
+    end
+
+    def reset
+      @value = 0
+    end
+  end
+
+  class Contributions < Trellis::Component
+    #tag_name "contributions"
+
+    # -----------------------
+    # component contributions
+    # -----------------------
+    page_contribution :style_link, "/someplace/my_styles.css"
+    page_contribution :script_link, "/someplace/my_script.js"
+    page_contribution :style, %[html { color:#555555; background-color:#303030; }], :scope => :class
+    page_contribution :style, %[/* just a comment */], :scope => :instance
+    page_contribution :script, %[alert('hello from ${tid}');], :scope => :instance
+    page_contribution :script, %[alert('hello just once');], :scope => :class
+    
+    page_contribution(:dom) {
+      at("body")['class'] = 'new_class'
+    }
+
+    render do |tag|
+      "hear ye, hear ye!"
+    end
+  end
+
+  class ApplicationWithComponents < Trellis::Application
+    home :page_with_simple_component
+  end
+
+  class PageWithSimpleComponent < Trellis::Page
+    template do html { body { text %[<trellis:simple_component/>] }} end
+  end
+
+  class PageWithStatefulComponent < Trellis::Page
+    route '/counters'
+
+    template do
+      html {
+        body {
+          text %[
+                 <trellis:counter tid="one" />
+                 <hr/>
+                 <trellis:counter tid="two" />
+                 <hr/>
+                 <trellis:counter tid="three" />
+               ]
+        }
+      }
+    end
+  end
+
+  class PageWithContributions < Trellis::Page
+    template do
+      html {
+        head {
+          title "counters"
+        }
+        body {
+          text %[<trellis:contributions tid="one"/><trellis:contributions tid="two"/>]
+        }
+      }
+    end
+  end
+end

data/test/page_spec.rb

@@ -20,11 +20,16 @@ describe Trellis::Page, " when sending an event to a page" do
     response.body.should == "just some text"
   end  
   
-  it "should redirect to the injected page as a response if the event handler returns an injected page " do
+  it "should redirect to the injected page as a response if the event handler returns an injected page" do
     response = @request.get("/home/events/event3")
     response.status.should be(302)
     response.headers['Location'].should == '/other'
   end
+
+  it "should be able to pass a value as the last element or the URL" do
+    response = @request.get("/home/events/event4/quo%20vadis")
+    response.body.should == "the value is quo vadis"
+  end
   
   it "should invoke the before_load method if provided by the page" do
     response = @request.get("/before_load")
@@ -54,3 +59,35 @@ describe Trellis::Page, " when created with a custom route" do
   end
 end
 
+describe Trellis::Page, " when given a template" do
+  before(:each) do
+    @application = TestApp::MyApp.new
+    @request = Rack::MockRequest.new(@application)
+  end
+
+  it "should rendered it correctly if it is in HAML format" do
+    response = @request.get("/haml_page")
+    response.body.should == "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n  <head>\n    <meta content=\"text/html; charset=UTF-8\" http-equiv=\"Content-Type\" />\n    <title>\n      This is a HAML page\n    </title>\n  </head>\n  <body>\n    <h1>\n      Page Title\n    </h1>\n    <p>\n      HAML rocks!\n    </p>\n  </body>\n</html>\n"
+  end
+
+  it "should rendered it correctly if it is in Textile format" do
+    response = @request.get("/textile_page")
+    response.body.should == "<p>A <strong>simple</strong> example.</p>"
+  end
+
+  it "should rendered it correctly if it is in Markdown format" do
+    response = @request.get("/mark_down_page")
+    response.body.should == "<html><body><h1>This is the Title</h1>\n\n<h2>This is the SubTitle</h2>\n\n<p>This is some text</p></body></html>"
+  end
+  
+  it "should rendered it correctly if it is in ERuby format" do
+    response = @request.get("/e_ruby_page")
+    response.body.should == "<html><body><ul><li>Hey</li><li>bud</li><li>let's</li><li>party!</li></ul></body></html>"
+  end  
+
+  it "should rendered it correctly if it is in HTML format" do
+    response = @request.get("/html_page")
+    response.body.should == "<html><body><h1>This is just HTML</h1></body></html>"
+  end
+end
+

data/test/renderer_spec.rb

@@ -1,12 +1,31 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
+require "rack"
+require_fixtures 'application_spec_applications'
+
 describe Trellis::Renderer do
-  before(:each) do
-    #@renderer = Renderer.new
+
+  it "should render a given page template" do
+    page = TestApp::Home.new
+    renderer = Trellis::Renderer.new(page)
+    result = renderer.render
+    result.should == "<html><body><h1>Hello World!</h1></body></html>"
   end
 
-  it "should desc" do
-    # TODO
+  it "should have access to page instance variables" do
+    page = TestApp::SamplePage.new
+    page.value = "chunky bacon"
+    renderer = Trellis::Renderer.new(page)
+    result = renderer.render
+    result.should == "<html><body>chunky bacon</body></html>"
   end
+
+  it "should have access to the page name" do
+    page = TestApp::AnotherSamplePage.new
+    renderer = Trellis::Renderer.new(page)
+    result = renderer.render
+    result.should == "<html><body>TestApp::AnotherSamplePage</body></html>"
+  end
+
 end
 

data/test/router_spec.rb

@@ -48,5 +48,5 @@ describe Trellis::Router, " when constructed" do
     @router = Trellis::Router.new(:path => '/*')
     @router.keys.should include('splat')
   end
-    
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: trellis
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Brian Sam-Bodden
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-06 00:00:00 -07:00
+date: 2009-11-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.4.0
+        version: 1.0.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: radius
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.1
+        version: 0.6.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: builder
@@ -80,7 +80,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.3
+        version: 2.2.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: RedCloth
@@ -90,17 +90,17 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 4.0.3
+        version: 4.2.2
     version: 
 - !ruby/object:Gem::Dependency 
-  name: BlueCloth
+  name: bluecloth
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.0
+        version: 2.0.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: markaby
@@ -120,47 +120,87 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.5
+        version: 1.1.2
     version: 
 - !ruby/object:Gem::Dependency 
-  name: dm-core
+  name: facets
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.5
+        version: 2.7.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: dm-validations
+  name: directory_watcher
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.5
+        version: 1.2.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: dm-timestamps
+  name: rack-cache
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.5
+        version: 0.5.2
     version: 
 - !ruby/object:Gem::Dependency 
-  name: english
+  name: rack-contrib
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.0
+        version: 0.9.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.5.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: erubis
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.6.5
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.9
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: newgem
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.5.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -183,13 +223,16 @@ extra_rdoc_files:
 - History.txt
 - License.txt
 - Manifest.txt
+- README.txt
 - examples/examples.txt
 - examples/hangman/html/resources/word_list.txt
 files: 
+- .gitignore
 - History.txt
 - License.txt
 - Manifest.txt
 - README
+- README.txt
 - Rakefile
 - config/hoe.rb
 - config/requirements.rb
@@ -297,6 +340,7 @@ files:
 - test/core_extensions_spec.rb
 - test/default_router_spec.rb
 - test/fixtures/application_spec_applications.rb
+- test/fixtures/component_spec_components.rb
 - test/page_spec.rb
 - test/renderer_spec.rb
 - test/router_spec.rb