rack-router 0.1.0 → 0.2.0

data/.rvmrc

@@ -0,0 +1 @@
+rvm 1.9.3@rack-router --create

data/README.md

@@ -1,6 +1,6 @@
 # Rack::Router
 
-A simple router for rack apps
+A simple router for rack apps.  Requires Ruby 1.9+.
 
 ## Installation
 

data/config.ru

@@ -3,7 +3,7 @@ require 'rack/lobster'
 
 router = Rack::Router.new do
   get "/hello/:name" => proc{|env| [200, { "Content-Type" => "text/html" }, ["<h1>Hello, #{env['rack.route_params'][:name]}</h1>"] ] }
-  get "/lobster" => Rack::Lobster.new
+  get "/lobster" => Rack::Lobster.new, :as => "lobster"
 end
 
 run router

data/lib/rack/route.rb

@@ -1,7 +1,7 @@
 module Rack
   class Route
 
-    attr_accessor :pattern, :app, :constraints
+    attr_accessor :pattern, :app, :constraints, :name
 
     PATH_INFO = 'PATH_INFO'.freeze
     DEFAULT_WILDCARD_NAME = :paths
@@ -10,7 +10,7 @@ module Rack
     NAMED_SEGMENTS_REPLACEMENT_PATTERN = /\/:([^$\/]+)/.freeze
     DOT = '.'.freeze
 
-    def initialize(pattern, app, constraints=nil)
+    def initialize(pattern, app, options={})
       if pattern.to_s.strip.empty?
         raise ArgumentError.new("pattern cannot be blank")
       end
@@ -21,7 +21,8 @@ module Rack
 
       @pattern = pattern
       @app = app
-      @constraints = constraints
+      @constraints = options && options[:constraints]
+      @name = options && options[:as]
     end
 
     def regexp

data/lib/rack/router.rb

@@ -21,9 +21,14 @@ module Rack
 
     def initialize(&block)
       @routes = {}
+      @named_routes = {}
       routes(&block)
     end
 
+    def [](route_name)
+      @named_routes[route_name]
+    end
+
     def routes(&block)
       instance_eval(&block) if block
       @routes
@@ -46,9 +51,13 @@ module Rack
     end
 
     def route(method, route_spec)
-      route = Route.new(route_spec.first.first, route_spec.first.last)
+      route = Route.new(route_spec.first.first, route_spec.first.last, route_spec.reject{|k,_| k == route_spec.first.first })
       @routes[method] ||= []
       @routes[method] << route
+      if route_spec && route_spec[:as]
+        # Using ||= so the first route with that name will be returned
+        @named_routes[route_spec[:as].to_sym] ||= route_spec.first.first
+      end
       route
     end
 

data/rack-router.gemspec

@@ -11,5 +11,5 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "rack-router"
   gem.require_paths = ["lib"]
-  gem.version       = "0.1.0"
+  gem.version       = "0.2.0"
 end

data/test/route_test.rb

@@ -30,9 +30,11 @@ class RouteTest < Test::Unit::TestCase
 
   def test_match_with_constraints
     r = route("/posts/:year/:month/:day/:slug",
-              :year => /\A\d{4}\Z/,
-              :month => /\A\d{1,2}\Z/,
-              :day => /\A\d{1,2}\Z/)
+              :constraints => {
+                :year => /\A\d{4}\Z/,
+                :month => /\A\d{1,2}\Z/,
+                :day => /\A\d{1,2}\Z/},
+              :as => "article")
     assert_equal({
       :year => "2012",
       :month => "9",
@@ -41,6 +43,7 @@ class RouteTest < Test::Unit::TestCase
     }, r.match("/posts/2012/9/20/test"))
     assert_equal(nil, r.match("/posts/2012/9/20"))
     assert_equal(nil, r.match("/posts/2012/x/20/test"))
+    assert_equal "article", r.name
   end
 
   def test_eql
@@ -51,8 +54,8 @@ class RouteTest < Test::Unit::TestCase
   end
 
   private
-  def route(path, constraints=nil)
-    Rack::Route.new(path, lambda{|env| [200, {}, [""]] }, constraints)
+  def route(path, options={})
+    Rack::Route.new(path, lambda{|env| [200, {}, [""]] }, options)
   end
 
   def match(pattern, path, params)

data/test/router_test.rb

@@ -7,8 +7,8 @@ class RouterTest < Test::Unit::TestCase
     app2  = lambda{|env| [200, {}, ["2"]] }
 
     router = Rack::Router.new do
-      post "/stuff" => app2
-      put "/it" => app2
+      post "/stuff" => app2, :as => "stuff"
+      put "/it" => app2, :as => :it
       delete "/remove" => app2
       get "/:id" => app1
     end
@@ -21,6 +21,8 @@ class RouterTest < Test::Unit::TestCase
     }, router.routes)
 
     assert_equal ["42"], router.call("REQUEST_METHOD" => "GET", "PATH_INFO" => "/42").last
+    assert_equal "/stuff", router[:stuff]
+    assert_equal "/it", router[:it]
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-router
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-12 00:00:00.000000000 Z
+date: 2012-10-18 00:00:00.000000000 Z
 dependencies: []
 description: A simple router for Rack apps
 email:
@@ -19,6 +19,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rvmrc
 - Gemfile
 - LICENSE
 - README.md
@@ -50,7 +51,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: A simple router for rack apps