diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-23 10:57:15 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-23 10:57:25 -0700 |
commit | 0f5e3a9f6b8a5c292092fb73a5071af102242e57 (patch) | |
tree | da4b8565a96e73ae4c06f84e7a779cc6530aab17 /actionpack/lib/action_dispatch | |
parent | 6fd8346400f99c33cf207d422a22730427420dbb (diff) | |
download | rails-0f5e3a9f6b8a5c292092fb73a5071af102242e57.tar.gz rails-0f5e3a9f6b8a5c292092fb73a5071af102242e57.tar.bz2 rails-0f5e3a9f6b8a5c292092fb73a5071af102242e57.zip |
decouple the router object from the request class
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r-- | actionpack/lib/action_dispatch/journey/router.rb | 8 | ||||
-rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/actionpack/lib/action_dispatch/journey/router.rb b/actionpack/lib/action_dispatch/journey/router.rb index 6bd77925a2..a681eb830f 100644 --- a/actionpack/lib/action_dispatch/journey/router.rb +++ b/actionpack/lib/action_dispatch/journey/router.rb @@ -20,13 +20,11 @@ module ActionDispatch # :nodoc: VERSION = '2.0.0' - attr_reader :request_class, :formatter + attr_reader :formatter attr_accessor :routes - def initialize(routes, options) - @options = options - @request_class = options[:request_class] - @routes = routes + def initialize(routes) + @routes = routes end def serve(req) diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index d2366bb300..e9fb712a61 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -302,8 +302,7 @@ module ActionDispatch @finalized = false @set = Journey::Routes.new - @router = Journey::Router.new(@set, { - :request_class => request_class}) + @router = Journey::Router.new @set @formatter = Journey::Formatter.new @set end |