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.

3 files changed, 12 insertions, 9 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
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index b1959e388c..931ad372a8 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -527,12 +527,10 @@ module ActionDispatch
           recall[:action] = options.delete(:action) if options[:action] == 'index'
         end
 
-        # Generates a path from routes, returns [path, params]
-        # if no path is returned the formatter will raise Journey::Router::RoutingError
+        # Generates a path from routes, returns [path, params].
+        # If no route is generated the formatter will raise ActionController::UrlGenerationError
         def generate
           @set.formatter.generate(:path_info, named_route, options, recall, PARAMETERIZE)
-        rescue Journey::Router::RoutingError => e
-          raise ActionController::UrlGenerationError, "No route matches #{options.inspect} #{e.message}"
         end
 
         def different_controller?
diff --git a/actionpack/test/journey/router_test.rb b/actionpack/test/journey/router_test.rb
index 27bdb0108a..3d52b2e9ee 100644
--- a/actionpack/test/journey/router_test.rb
+++ b/actionpack/test/journey/router_test.rb
@@ -155,7 +155,7 @@ module ActionDispatch
           Router::Strexp.new("/foo/:id", { :id => /\d/ }, ['/', '.', '?'], false)
         ]
 
-        assert_raises(Router::RoutingError) do
+        assert_raises(ActionController::UrlGenerationError) do
           @formatter.generate(:path_info, nil, { :id => '10' }, { })
         end
       end
@@ -168,7 +168,7 @@ module ActionDispatch
         path, _ = @formatter.generate(:path_info, nil, { :id => '10' }, { })
         assert_equal '/foo/10', path
 
-        assert_raises(Router::RoutingError) do
+        assert_raises(ActionController::UrlGenerationError) do
           @formatter.generate(:path_info, nil, { :id => 'aa' }, { })
         end
       end
@@ -194,11 +194,11 @@ module ActionDispatch
         path = Path::Pattern.new pattern
         @router.routes.add_route nil, path, {}, {}, route_name
 
-        error = assert_raises(Router::RoutingError) do
+        error = assert_raises(ActionController::UrlGenerationError) do
           @formatter.generate(:path_info, route_name, { }, { })
         end
 
-        assert_match(/required keys: \[:id\]/, error.message)
+        assert_match(/missing required keys: \[:id\]/, error.message)
       end
 
       def test_X_Cascade