From ac15bcebf2d560a34286ffba7ed6a687574f2d9d Mon Sep 17 00:00:00 2001
From: Damien Mathieu <42@dmathieu.com>
Date: Sat, 2 Jul 2011 18:02:43 +0200
Subject: provide a more explicit message when using url_for with nil

This fixes the problem of having a non-explicit message when the :location option is not provided in respond_with.
---
 actionpack/lib/action_dispatch/routing/polymorphic_routes.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
index 82c4fadb50..49aef0bf72 100644
--- a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
+++ b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
@@ -182,10 +182,12 @@ module ActionDispatch
 
           if record.is_a?(Symbol) || record.is_a?(String)
             route << record
-          else
+          elsif record
             route << ActiveModel::Naming.route_key(record)
             route = [route.join("_").singularize] if inflection == :singular
             route << "index" if ActiveModel::Naming.uncountable?(record) && inflection == :plural
+          else
+            raise ArgumentError, "Nil location provided. Can't build URI."
           end
 
           route << routing_type(options)
-- 
cgit v1.2.3