Remove rackmount const usage

rails · Nov 13, 2009 · a28d0ea · a28d0ea
1 parent 2da432d
commit a28d0ea
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -195,9 +195,9 @@ def call(env)
 
           @constraints.each { |constraint|
             if constraint.respond_to?(:matches?) && !constraint.matches?(req)
-              return Rack::Mount::Const::EXPECTATION_FAILED_RESPONSE
+              return [417, {}, []]
             elsif constraint.respond_to?(:call) && !constraint.call(req)
-              return Rack::Mount::Const::EXPECTATION_FAILED_RESPONSE
+              return [417, {}, []]
             end
           }
 

diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -5,7 +5,7 @@ module ActionDispatch
   module Routing
     class RouteSet #:nodoc:
       NotFound = lambda { |env|
-        raise ActionController::RoutingError, "No route matches #{env[::Rack::Mount::Const::PATH_INFO].inspect} with #{env.inspect}"
+        raise ActionController::RoutingError, "No route matches #{env['PATH_INFO'].inspect} with #{env.inspect}"
       }
 
       PARAMETERS_KEY = 'action_dispatch.request.path_parameters'