benchmarks/bootup.rb @@ -2,6 +2,7 @@ $LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib require "rubygems" require "rack" require "rack/router" +require "rack/router/optimizations" require "rbench" # For comparison purposes require "merb-core" # Merb benchmarks/setup.rb @@ -42,7 +42,7 @@ class Rack::Router::Builder request_conditions[:request_method] = upcase_method(method) if method - route = Rack::Router::Route.new(options[:to], options[:at], request_conditions, segment_conditions, options[:with] || {}, !options[:anchor]) + route = Rack::Router::Route.new(options[:to], request_conditions, segment_conditions, options[:with] || {}, !options[:anchor]) route.name = options[:name].to_sym if options[:name] @routes << route lib/rack/router/builders/simple.rb @@ -65,9 +65,8 @@ class Rack::Router # mount_point<Boolean>:: # # :api: plugin - def initialize(app, path_info, request_conditions, segment_conditions, params, mount_point = true) + def initialize(app, request_conditions, segment_conditions, params, mount_point = true) @app = app - @path_info = path_info @request_conditions = request_conditions @segment_conditions = segment_conditions @params = params @@ -158,9 +157,7 @@ class Rack::Router # :api: private def shift_path_info(env, params, matched) - new_path_info = @path_info.dup if @path_info - new_path_info ||= env["PATH_INFO"].sub(/^#{Regexp.escape(matched)}/, '') - new_path_info.gsub!(SEGMENT_REGEXP) { |s| params[$2.to_sym] } + new_path_info = env["PATH_INFO"].sub(/^#{Regexp.escape(matched)}/, '') env["SCRIPT_NAME"] = Utils.normalize(env["SCRIPT_NAME"] + matched) env["PATH_INFO"] = Utils.normalize(new_path_info) end lib/rack/router/route.rb @@ -12,7 +12,7 @@ describe "When recognizing requests" do end end - it "matches the path and return the paramters passed in" do + it "matches the path and return the parameters passed in" do route_for("/").should have_route(FooApp, :action => "root") route_for("/info").should have_route(FooApp, :action => "info") route_for("/info/bar").should have_route(FooApp, :action => "bar") spec/recognition/conditions_spec.rb @@ -88,7 +88,7 @@ describe Rack::Router do def put(opts) raise "FAIL!" unless opts[:so_that] == "you can route while you route" - @routes << Rack::Router::Route.new(opts[:a], nil, { :path_info => opts[:in_your] }, {}, { :yo_dawg => true }, false) + @routes << Rack::Router::Route.new(opts[:a], { :path_info => opts[:in_your] }, {}, { :yo_dawg => true }, false) end end spec/router_spec.rb spec/recognition/rewriting_spec.rb 10f6080b3d578a8956073173aaacb5ec8d940ca0 Carl Lerche carllerche@mac.com http://github.com/carllerche/rack-router/commit/1861d1904c08a02ac8f94d38ee042bc7c5a56a5a 1861d1904c08a02ac8f94d38ee042bc7c5a56a5a 2009-05-05T11:27:53-07:00 2009-05-05T11:27:53-07:00 Removed path rewriting, it's stupid for the router to do this and should be separate middleware d7f165b28794029ca994de8f3833ab8bab1757f0 Carl Lerche carllerche@mac.com