Raise correct exception now Journey is integrated.

Now that Journey has been integrated into ActionDispatch we can raise
the exception ActionController::UrlGenerationError directly rather than
raising the internal Journey::Router::RoutingError and then have
ActionDispatch::Routing::RouteSet#generate re-raise the exception.

1 files changed, 6 insertions, 1 deletions

diff --git a/actionpack/lib/action_dispatch/journey/formatter.rb b/actionpack/lib/action_dispatch/journey/formatter.rb
index cf755bfbeb..82c55660ea 100644
--- a/actionpack/lib/action_dispatch/journey/formatter.rb
+++ b/actionpack/lib/action_dispatch/journey/formatter.rb
@@ -1,3 +1,5 @@
+require 'action_controller/metal/exceptions'
+
 module ActionDispatch
   module Journey
     # The Formatter class is used for formatting URLs. For example, parameters
@@ -27,7 +29,10 @@ module ActionDispatch
           return [route.format(parameterized_parts), params]
         end
 
-        raise Router::RoutingError.new "missing required keys: #{missing_keys}"
+        message = "No route matches #{constraints.inspect}"
+        message << " missing required keys: #{missing_keys.inspect}" if name
+
+        raise ActionController::UrlGenerationError, message
       end
 
       def clear