From a28d0ea33e04cd7bf785c26a95e74f78dff82ce0 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 10 Nov 2009 19:12:54 -0600
Subject: [PATCH] Remove rackmount const usage

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

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index ebfb4c9be2..7d770dedd0 100644
--- 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
index 28e5b806da..c28df76f3f 100644
--- 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'
-- 
GitLab