rack-router 0.3.0 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c67f53c99d9372515a3c78af3d35750437ce2464
+  data.tar.gz: 568d4a2e57f583839652a74e7c8978243764b930
+SHA512:
+  metadata.gz: a311a6448794f53522e8c0fc4858414277c18a07cb3b27c3e716d9c32c2c91f6852561b4bff724bed6121eae5da2af65d1ec6b450d3f3c8eb138d54a3d8cd655
+  data.tar.gz: be6af03eb657e91d2e7b4c2a633eb95eea3463c07c356fd0f6d3c46ca5c626f61eabd9bd41e7d8cc4d1c4386f5a0138e386e235f133dd189e9b8bbc6effb7e48

data/README.md

@@ -18,7 +18,38 @@ Or install it yourself as:
 
 ## Usage
 
-See [config.ru](http://github.com/pjb3/rack-router/tree/master/config.ru)
+Here's an example showing a simple rack app that prints the value of a route parameter:
+
+``` ruby
+require 'rack/router'
+require 'rack/lobster'
+
+hello = ->(env) do
+  [
+    200,
+    { "Content-Type" => "text/html" },
+    ["<h1>Hello, #{env['rack.route_params'][:name]}</h1>"]
+  ]
+end
+
+router = Rack::Router.new do
+  get "/hello/:name" => hello
+  get "/lobster" => Rack::Lobster.new, :as => "lobster"
+end
+
+run router
+```
+
+In this example, `hello` is just a rack app defined inline, in order to give us something to route to.  The route to our hello app includes a parameter `:name`.  The hello rack app is able to access that parameter via the rack env.
+
+This is a valid Rackup file, so if you put this in a file named `config.ru` and run `rackup`, you will be app to hit the application like this:
+
+    $ curl http://localhost:9292/hello/paul
+    <h1>Hello, paul</h1>
+
+Don't forget to try the lobster!
+
+    $ open http://localhost:9292/lobster
 
 ## Contributing
 

data/config.ru

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

data/lib/rack/route.rb

@@ -1,7 +1,6 @@
 module Rack
   class Route
-
-    attr_accessor :pattern, :app, :constraints, :name
+    attr_accessor :request_method, :pattern, :app, :constraints, :name
 
     PATH_INFO = 'PATH_INFO'.freeze
     DEFAULT_WILDCARD_NAME = :paths
@@ -10,7 +9,7 @@ module Rack
     NAMED_SEGMENTS_REPLACEMENT_PATTERN = /\/:([^$\/]+)/.freeze
     DOT = '.'.freeze
 
-    def initialize(pattern, app, options={})
+    def initialize(request_method, pattern, app, options={})
       if pattern.to_s.strip.empty?
         raise ArgumentError.new("pattern cannot be blank")
       end
@@ -19,6 +18,7 @@ module Rack
         raise ArgumentError.new("app must be callable")
       end
 
+      @request_method = request_method
       @pattern = pattern
       @app = app
       @constraints = options && options[:constraints]
@@ -48,7 +48,11 @@ module Rack
       Regexp.new("\\A#{src}\\Z")
     end
 
-    def match(path)
+    def match(request_method, path)
+      unless request_method == self.request_method
+        return nil
+      end
+
       if path.to_s.strip.empty?
         raise ArgumentError.new("path is required")
       end
@@ -81,6 +85,7 @@ module Rack
 
     def eql?(o)
       o.is_a?(self.class) &&
+        o.request_method == request_method &&
         o.pattern == pattern &&
         o.app == app &&
         o.constraints == constraints
@@ -88,7 +93,7 @@ module Rack
     alias == eql?
 
     def hash
-      pattern.hash ^ app.hash ^ constraints.hash
+      request_method.hash ^ pattern.hash ^ app.hash ^ constraints.hash
     end
   end
 end

data/lib/rack/router.rb

@@ -1,9 +1,9 @@
 require 'rack/route'
-require 'rack/version'
 
 module Rack
 
   class Router
+    VERSION = "0.4.0"
 
     HEAD = 'HEAD'.freeze
     GET = 'GET'.freeze
@@ -15,7 +15,6 @@ module Rack
     ROUTE_PARAMS = 'rack.route_params'.freeze
 
     def initialize(&block)
-      @routes = {}
       @named_routes = {}
       routes(&block)
     end
@@ -46,9 +45,9 @@ module Rack
     end
 
     def route(method, route_spec)
-      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
+      route = Route.new(method, route_spec.first.first, route_spec.first.last, route_spec.reject{|k,_| k == route_spec.first.first })
+      @routes ||= []
+      @routes << 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
@@ -67,15 +66,13 @@ module Rack
     def match(env)
       request_method = env[REQUEST_METHOD]
       request_method = GET if request_method == HEAD
-      if method_routes = @routes[request_method]
-        method_routes.each do |route|
-          if params = route.match(env[PATH_INFO])
-            env[ROUTE_PARAMS] = params
-            return route.app
-          end
+      routes.each do |route|
+        if params = route.match(request_method, env[PATH_INFO])
+          env[ROUTE_PARAMS] = params
+          return route.app
         end
-        nil
       end
+      nil
     end
 
     def not_found(env)

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.3.0"
+  gem.version       = "0.4.0"
 end

data/test/route_test.rb

@@ -30,7 +30,7 @@ class RouteTest < Test::Unit::TestCase
   end
 
   def test_match_with_constraints
-    r = route("/posts/:year/:month/:day/:slug",
+    r = route('GET', "/posts/:year/:month/:day/:slug",
               :constraints => {
                 :year => /\A\d{4}\Z/,
                 :month => /\A\d{1,2}\Z/,
@@ -41,22 +41,23 @@ class RouteTest < Test::Unit::TestCase
       :month => "9",
       :day => "20",
       :slug => "test"
-    }, 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"))
+    }, r.match('GET', "/posts/2012/9/20/test"))
+    assert_equal(nil, r.match('POST', "/posts/2012/9/20/test"))
+    assert_equal(nil, r.match('GET', "/posts/2012/9/20"))
+    assert_equal(nil, r.match('GET', "/posts/2012/x/20/test"))
     assert_equal "article", r.name
   end
 
   def test_eql
     app  = lambda{|env| [200, {}, [""]] }
     assert_equal(
-      Rack::Route.new("/", app),
-      Rack::Route.new("/", app))
+      Rack::Route.new('GET', "/", app),
+      Rack::Route.new('GET', "/", app))
   end
 
   private
-  def route(path, options={})
-    Rack::Route.new(path, lambda{|env| [200, {}, [""]] }, options)
+  def route(request_method, path, options={})
+    Rack::Route.new(request_method, path, lambda{|env| [200, {}, [""]] }, options)
   end
 
   def match(pattern, path, params)
@@ -66,7 +67,7 @@ class RouteTest < Test::Unit::TestCase
     else
       msg << "no match #{path}"
     end
-    assert_equal(params, route(pattern).match(path), msg)
+    assert_equal(params, route('GET', pattern).match('GET', path), msg)
   end
 end
 

data/test/router_test.rb

@@ -13,12 +13,12 @@ class RouterTest < Test::Unit::TestCase
       get "/:id" => app1
     end
 
-    assert_equal({
-      "POST" => [Rack::Route.new("/stuff", app2)],
-      "PUT" => [Rack::Route.new("/it", app2)],
-      "DELETE" => [Rack::Route.new("/remove", app2)],
-      "GET"  => [Rack::Route.new("/:id", app1)]
-    }, router.routes)
+    assert_equal([
+      Rack::Route.new('POST', '/stuff', app2),
+      Rack::Route.new('PUT', '/it', app2),
+      Rack::Route.new('DELETE', '/remove', app2),
+      Rack::Route.new('GET', '/:id', app1)
+    ], router.routes)
 
     assert_equal ["42"], router.call("REQUEST_METHOD" => "GET", "PATH_INFO" => "/42").last
     assert_equal ["<h1>Not Found</h1><p>No route matches GET /not/found</p>"], router.call("REQUEST_METHOD" => "GET", "PATH_INFO" => "/not/found").last

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-router
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors:
 - Paul Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2013-05-16 00:00:00.000000000 Z
 dependencies: []
 description: A simple router for Rack apps
 email:
@@ -28,35 +27,34 @@ files:
 - lib/rack-router.rb
 - lib/rack/route.rb
 - lib/rack/router.rb
-- lib/rack/version.rb
 - lib/rack_router.rb
 - rack-router.gemspec
 - test/route_test.rb
 - test/router_test.rb
 homepage: https://github.com/pjb3/rack-router
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A simple router for Rack apps
 test_files:
 - test/route_test.rb
 - test/router_test.rb
+has_rdoc: 

data/lib/rack/version.rb

@@ -1,5 +0,0 @@
-module Rack
-  class Router
-    VERSION = "0.3.0"
-  end
-end