From 7fe14432d875fdf52fe95044a38f110582227bd3 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Tue, 27 May 2014 13:44:58 -0700 Subject: constraints class does not need the request class anymore --- actionpack/lib/action_dispatch/routing/mapper.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'actionpack/lib/action_dispatch') diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index 0c3581db32..cabaa26e44 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -19,7 +19,7 @@ module ActionDispatch class Constraints < Endpoint #:nodoc: attr_reader :app, :constraints - def initialize(app, constraints, request, dispatcher_p) + def initialize(app, constraints, dispatcher_p) # Unwrap Constraints objects. I don't actually think it's possible # to pass a Constraints object to this constructor, but there were # multiple places that kept testing children of this object. I @@ -31,7 +31,7 @@ module ActionDispatch @dispatcher = dispatcher_p - @app, @constraints, @request = app, constraints, request + @app, @constraints, = app, constraints end def dispatcher?; @dispatcher; end @@ -226,11 +226,11 @@ module ActionDispatch if Redirect === to to else - Constraints.new(to, blocks, @set.request_class, false) + Constraints.new(to, blocks, false) end else if blocks.any? - Constraints.new(dispatcher, blocks, @set.request_class, true) + Constraints.new(dispatcher, blocks, true) else dispatcher end -- cgit v1.2.3