derailleur 0.0.5 → 0.0.6

data/TODO

@@ -1 +1,3 @@
+* spec for get_route_silent
 * separate classes to hold handoff and grafting logic in trienodes
+* filesystem trees for non-HTTP things

data/lib/derailleur.rb

@@ -1,6 +1,6 @@
 
 module Derailleur
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
   AUTHORS = ['crapooze']
   WEBSITE = "http://github.com/crapooze/derailleur"
   LICENCE = "MIT"

data/lib/derailleur/core/application.rb

@@ -79,18 +79,31 @@ module Derailleur
     # Will (optionally) consecutively yield all the [node, chunk_name]
     # this is useful when you want to interpret the members of the path
     # as a parameter.
-    def get_route(path)
+    def get_route_silent(path)
       current_node = routes
       chunk_path(path).each do |chunk|
         unless current_node.absorbent?
           current_node = current_node.child_for_name(chunk)
-          raise NoSuchRoute, "no such path #{path}" unless current_node
+          return nil unless current_node
         end
         yield current_node, chunk if block_given?
       end
       current_node
     end
-
+    
+    # Same as get_route_silent but raise a 
+    # NoSuchRoute error if there is no matching route.
+    def get_route(path)
+      node = if block_given?
+               get_route_silent(path) do |node,chunk|
+                 yield node, chunk 
+               end
+             else
+               get_route_silent(path) 
+             end
+      raise NoSuchRoute, "no such path #{path}" unless node
+      node
+    end
 
     # Registers an handler for a given path.
     # The path will be interpreted as an absolute path prefixed by '/' .
@@ -155,6 +168,25 @@ module Derailleur
       app_node.graft!(split_node)
     end
 
+    # Similar to get route, but also interprets nodes names as keys for a hash.
+    # The values in the parameters hash are the string corresponding to the
+    # nodes in the path.
+    # A specific key is :splat, which correspond to the remaining chunks in the
+    # paths.
+    # Does NOT take care of key collisions. This should be taken care of at the
+    # application level.
+    def get_route_with_params(path)
+      params = {:splat => []}
+      route = get_route(path) do |node, val|
+        if node.wildcard?
+          params[node.name] = val 
+        elsif node.absorbent?
+          params[:splat] << val 
+        end
+      end
+      [route, params]
+    end
+
     # Method implemented to comply to the Rack specification.  see
     # http://rack.rubyforge.org/doc/files/SPEC.html to understand what to
     # return.
@@ -176,14 +208,7 @@ module Derailleur
       begin
         path = env['PATH_INFO'].sub(/\.\w+$/,'') #ignores the extension if any
         ctx = {}
-        params = {:splat => []}
-        route = get_route(path) do |node, val|
-          if node.wildcard?
-            params[node.name] = val 
-          elsif node.absorbent?
-            params[:splat] << val 
-          end
-        end
+        route, params = get_route_with_params(path)
         ctx['derailleur.node'] = route
         ctx['derailleur.params'] = params
         ctx['derailleur'] = self

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: derailleur
 version: !ruby/object:Gem::Version 
-  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - crapooze
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-12 00:00:00 +01:00
+date: 2011-03-19 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -56,7 +55,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -65,7 +63,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"