提交 6d48d979 编写于 作者: A Aaron Patterson

glob_param is never used, so rm

this also changes the constructor.  We don't need to pass more options
than "defaults" (whatever defaults are, ugh. probably another hash of
stupid stuff).
上级 7abde136
......@@ -301,7 +301,7 @@ def endpoint
end
def dispatcher
Routing::RouteSet::Dispatcher.new(:defaults => defaults)
Routing::RouteSet::Dispatcher.new(defaults)
end
def to
......
......@@ -21,9 +21,8 @@ class RouteSet #:nodoc:
PARAMETERS_KEY = 'action_dispatch.request.path_parameters'
class Dispatcher #:nodoc:
def initialize(options={})
@defaults = options[:defaults]
@glob_param = options.delete(:glob)
def initialize(defaults)
@defaults = defaults
@controller_class_names = ThreadSafe::Cache.new
end
......@@ -53,7 +52,6 @@ def call(env)
def prepare_params!(params)
normalize_controller!(params)
merge_default_action!(params)
split_glob_param!(params) if @glob_param
end
# If this is a default_controller (i.e. a controller specified by the user)
......@@ -89,10 +87,6 @@ def normalize_controller!(params)
def merge_default_action!(params)
params[:action] ||= 'index'
end
def split_glob_param!(params)
params[@glob_param] = params[@glob_param].split('/').map { |v| URI.parser.unescape(v) }
end
end
# A NamedRouteCollection instance is a collection of named routes, and also
......
......@@ -5,7 +5,11 @@ module ActionDispatch
module Journey
class TestRouter < ActiveSupport::TestCase
# TODO : clean up routing tests so we don't need this hack
class StubDispatcher < Routing::RouteSet::Dispatcher; end
class StubDispatcher < Routing::RouteSet::Dispatcher
def initialize
super({})
end
end
attr_reader :routes
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册