trellis 0.0.7 → 0.0.8

data/History.txt

@@ -1,7 +1,12 @@
+== 0.0.8
+* 1 major enhancement:
+  * implemented automatic route sorting
+
 == 0.0.7
-* 3 major enhancement:
+* 3 major enhancements:
+  * ripped out rexml/hpricot replaced with nokogiri
   * implemented page get method to override default page rendering
-  * added trellis namespace xmlns method for markaby (to prevent rexml from freaking out)
+  * added trellis namespace xmlns method for markaby
   * clean all examples to add trellis namespace
 
 == 0.0.6

data/License.txt

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright &169;2001-2008 Integrallis Software, LLC.
+Copyright &169;2001-2010 Integrallis Software, LLC.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README

@@ -1,8 +1,10 @@
 = 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. 
+Trellis is a component-based Web Application Framework written in Ruby and based on Rack. 
+Its main goal is to bring component-driven development to the micro-framework world.
+Trellis applications are composed of pages, pages have components, components emit events,
+pages and components can listen and handle events. 
+Trellis aims to be a (close to) zero-configuration framework 
 
 It draws inspiration from:
 
@@ -18,7 +20,6 @@ Java Web Frameworks
 ===================
 * Tapesty
 * Wicket
-* The good parts of JSF (components)
 
 Others
 ======
@@ -26,17 +27,17 @@ Others
 
 == Goals 
 Accomplished goals are marked with a (*)
-- * Pure HTML templates or in-line template creation with Markaby or HAML
+- * Pure HTML templates or in-line template creation with Markaby, HAML, erubis, Markdown and Textile
 - * 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
+- * 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
+- 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
@@ -62,6 +63,7 @@ Accomplished goals are marked with a (*)
 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::Router:: Encapsulated the base route for a page
 Trellis::Component:: Base class for all Trellis components (work in progress)
 Trellis::DefaultRouter:: Encapsulates the default routing logic
 
@@ -75,7 +77,7 @@ Trellis::DefaultRouter:: Encapsulates the default routing logic
 * 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
+* Components 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 
@@ -118,16 +120,19 @@ 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
+nokogiti => http://nokogiri.org/
+facets => http://facets.rubyforge.org/
+directory_watcher => http://rubyforge.org/projects/codeforpeople
+erubis => http://www.kuwata-lab.com/erubis/
 
 == LICENSE:
 
 (The MIT License)
 
-Copyright &169;2001-2009 Integrallis Software, LLC.
+Copyright &169;2001-2010 Integrallis Software, LLC.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -150,7 +155,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 == Contact
 
-Author::     Brian Sam-Bodden
+Author::     Brian Sam-Bodden & the Folks at Integrallis
 Email::      bsbodden@integrallis.com
-Home Page::  http://integrallis.com
+Home Page::  http://trellisframework.org
 License::    MIT Licence (http://www.opensource.org/licenses/mit-license.html)

data/README.txt

@@ -1,8 +1,10 @@
 = 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. 
+Trellis is a component-based Web Application Framework written in Ruby and based on Rack. 
+Its main goal is to bring component-driven development to the micro-framework world.
+Trellis applications are composed of pages, pages have components, components emit events,
+pages and components can listen and handle events. 
+Trellis aims to be a (close to) zero-configuration framework 
 
 It draws inspiration from:
 
@@ -18,7 +20,6 @@ Java Web Frameworks
 ===================
 * Tapesty
 * Wicket
-* The good parts of JSF (components)
 
 Others
 ======
@@ -26,17 +27,17 @@ Others
 
 == Goals 
 Accomplished goals are marked with a (*)
-- * Pure HTML templates or in-line template creation with Markaby or HAML
+- * Pure HTML templates or in-line template creation with Markaby, HAML, erubis, Markdown and Textile
 - * 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
+- * 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
+- 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
@@ -62,6 +63,7 @@ Accomplished goals are marked with a (*)
 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::Router:: Encapsulated the base route for a page
 Trellis::Component:: Base class for all Trellis components (work in progress)
 Trellis::DefaultRouter:: Encapsulates the default routing logic
 
@@ -75,7 +77,7 @@ Trellis::DefaultRouter:: Encapsulates the default routing logic
 * 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
+* Components 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 
@@ -118,16 +120,19 @@ 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
+nokogiti => http://nokogiri.org/
+facets => http://facets.rubyforge.org/
+directory_watcher => http://rubyforge.org/projects/codeforpeople
+erubis => http://www.kuwata-lab.com/erubis/
 
 == LICENSE:
 
 (The MIT License)
 
-Copyright &169;2001-2009 Integrallis Software, LLC.
+Copyright &169;2001-2010 Integrallis Software, LLC.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -150,7 +155,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 == Contact
 
-Author::     Brian Sam-Bodden
+Author::     Brian Sam-Bodden & the Folks at Integrallis
 Email::      bsbodden@integrallis.com
-Home Page::  http://integrallis.com
+Home Page::  http://trellisframework.org
 License::    MIT Licence (http://www.opensource.org/licenses/mit-license.html)

data/config/hoe.rb

@@ -12,12 +12,11 @@ EXTRA_DEPENDENCIES = [
   ['rack', '>= 1.0.1'],
   ['radius', '>= 0.6.1'],
   ['builder', '>= 2.1.2'],
-  ['hpricot', '>= 0.6.0'],
+  ['nokogiri', '>= 1.4.0'],
   ['extensions', '>= 0.6.0'],
   ['haml', '>= 2.2.9'],
   ['RedCloth', '>= 4.2.2'],
   ['bluecloth', '>= 2.0.5'],
-  ['markaby', '>= 0.5'],
   ['log4r', '>= 1.1.2'],
   ['facets', '>= 2.7.0'],
   ['directory_watcher', '>= 1.2.0'], 

data/lib/trellis/trellis.rb

@@ -63,6 +63,7 @@ module Trellis
       child.attr_array(:persistents)
       child.class_attr_reader(:session_config)
       child.attr_array(:static_routes)
+      child.attr_array(:routers)
       child.meta_def(:logger) { Application.logger }
       child.instance_variable_set(:@session_config, OpenStruct.new({:impl => :cookie}))
       super
@@ -148,11 +149,18 @@ module Trellis
       end
       application
     end
+    
+    def self.routers 
+      unless @routers
+        @routers = Page.subclasses.values.collect { |page| page.router }.compact.sort {|a,b| b.score <=> a.score }
+      end
+      @routers
+    end
 
     # find the first page with a suitable router, if none is found use the default router
     def find_router_for(request)
-      match = Page.subclasses.values.find { |page| page.router && page.router.matches?(request) }
-      match ? match.router : DefaultRouter.new(:application => self)
+      match = Application.routers.find { |router| router.matches?(request) }
+      match || DefaultRouter.new(:application => self)
     end
     
     # rack call interface.
@@ -334,13 +342,18 @@ module Trellis
   class Router
     EVENT_REGEX = %r{^(?:.+)/events/(?:([^/\.]+)(?:\.([^/\.]+)?)?)(?:/(?:([^\.]+)?))?}
 
-    attr_reader :application, :pattern, :keys, :path, :page
+    attr_reader :application, :pattern, :keys, :path, :page, :score
     
     def initialize(options={})
       @application = options[:application]
       @path = options[:path]
       @page = options[:page]
-      compile_path if @path
+      if @path
+        compile_path 
+        compute_score
+      else
+        @score = 3 # since "/*" scores at 2
+      end
     end
 
     def route(request = nil)
@@ -376,6 +389,10 @@ module Trellis
         params.each_pair { |name, value| page.instance_variable_set("@#{name}".to_sym, value) }
       end
     end
+    
+    def to_s
+      @path
+    end
 
     private
 
@@ -407,6 +424,18 @@ module Trellis
         raise TypeError, @path
       end
     end
+    
+    def compute_score
+      score = 0
+      parts = @path.split('/').delete_if {|part| part.empty? }
+      parts.each_index do |index| 
+        part = parts[index]
+        power = parts.size - index
+        factor = part.match('\*') ? 1 : (part.match(':') ? 2 : 3)
+        score = score + (factor * (2**index))
+      end
+      @score = score
+    end
   end
   
   # -- DefaultRouter --

data/lib/trellis/version.rb

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

data/test/router_spec.rb

@@ -51,4 +51,36 @@ describe Trellis::Router, " when constructed" do
     @router.keys.should include('splat')
   end
   
+  it "should be able to be sorted by 'matchability'" do
+    route_1 = Trellis::Router.new(:path => '/hello/:one/:two') 
+    route_2 = Trellis::Router.new(:path => '/hello/jim/:last')
+    route_3 = Trellis::Router.new(:path => '/hello/*')
+    route_4 = Trellis::Router.new(:path => '/hello/*/:foo/*')
+    
+    routes = [ route_1, route_2, route_3, route_4 ].sort {|a,b| b.score <=> a.score }
+    
+    routes[0].should be(route_4)
+    routes[1].should be(route_2)
+    routes[2].should be(route_1)
+    routes[3].should be(route_3)
+  end
+  
+  it "a catch all route should always be last when sorted with other routes" do
+    route_1 = Trellis::Router.new(:path => '/admin/login')
+    route_2 = Trellis::Router.new(:path => '/*')
+    route_3 = Trellis::Router.new(:path => '/admin/pages')
+    route_4 = Trellis::Router.new(:path => '/admin/new/page')
+    route_5 = Trellis::Router.new(:path => '/admin/page/:id')
+    route_6 = Trellis::Router.new(:path => '/admin/page/:id/delete')
+    
+    routes = [ route_1, route_2, route_3, route_4, route_5, route_6 ].sort {|a,b| b.score <=> a.score }
+    
+    routes[0].should be(route_6)
+    routes[1].should be(route_4)
+    routes[2].should be(route_5)
+    routes[3].should be(route_3)
+    routes[4].should be(route_1)
+    routes[5].should be(route_2)    
+  end
+ 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: trellis
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Brian Sam-Bodden
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-06 00:00:00 -07:00
+date: 2009-12-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,14 +53,14 @@ dependencies:
         version: 2.1.2
     version: 
 - !ruby/object:Gem::Dependency 
-  name: hpricot
+  name: nokogiri
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.0
+        version: 1.4.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: extensions
@@ -102,16 +102,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.0.5
     version: 
-- !ruby/object:Gem::Dependency 
-  name: markaby
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0.5"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: log4r
   type: :runtime