From 0f5e3a9f6b8a5c292092fb73a5071af102242e57 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Fri, 23 May 2014 10:57:15 -0700
Subject: decouple the router object from the request class

---
 actionpack/lib/action_dispatch/journey/router.rb    | 8 +++-----
 actionpack/lib/action_dispatch/routing/route_set.rb | 3 +--
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'actionpack/lib/action_dispatch')

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
 
-- 
cgit v1.2.3