Permalink
Browse files

constraints class does not need the request class anymore

  • Loading branch information...
1 parent 402c2af commit 7fe14432d875fdf52fe95044a38f110582227bd3 @tenderlove tenderlove committed May 27, 2014
Showing with 4 additions and 4 deletions.
  1. +4 −4 actionpack/lib/action_dispatch/routing/mapper.rb
@@ -19,7 +19,7 @@ class Mapper
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 @@ def initialize(app, constraints, request, dispatcher_p)
@dispatcher = dispatcher_p
- @app, @constraints, @request = app, constraints, request
+ @app, @constraints, = app, constraints
end
def dispatcher?; @dispatcher; end
@@ -226,11 +226,11 @@ def app
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

0 comments on commit 7fe1443

Please sign in to comment.