From 66e338aa98d8ccdbeb9ca261886edd1d0c9747b6 Mon Sep 17 00:00:00 2001
From: Andrew White <andyw@pixeltrix.co.uk>
Date: Thu, 10 May 2012 22:13:04 +0100
Subject: Don't ignore nil positional arguments for url helpers - fixes #6196.

---
 .../lib/action_dispatch/routing/route_set.rb       |  2 +-
 actionpack/test/dispatch/routing_test.rb           | 34 ++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 8e7c997dc6..cde6cb20cc 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -178,7 +178,7 @@ module ActionDispatch
                 options = args.extract_options!
                 result = #{options.inspect}
 
-                if args.any?
+                if args.size > 0
                   result[:_positional_args] = args
                   result[:_positional_keys] = #{route.segment_keys.inspect}
                 end
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 5a6be058ec..6a592acc35 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -2721,3 +2721,37 @@ class TestConstraintsAccessingParameters < ActionDispatch::IntegrationTest
     assert_equal "bar", @request.params[:bar]
   end
 end
+
+class TestNamedRouteUrlHelpers < ActionDispatch::IntegrationTest
+  class CategoriesController < ActionController::Base
+    def show
+      render :text => "categories#show"
+    end
+  end
+
+  class ProductsController < ActionController::Base
+    def show
+      render :text => "products#show"
+    end
+  end
+
+  Routes = ActionDispatch::Routing::RouteSet.new.tap do |app|
+    app.draw do
+      scope :module => "test_named_route_url_helpers" do
+        get "/categories/:id" => 'categories#show', :as => :category
+        get "/products/:id" => 'products#show', :as => :product
+      end
+    end
+  end
+
+  def app; Routes end
+
+  include Routes.url_helpers
+
+  test "url helpers do not ignore nil parameters" do
+    get "/categories/1"
+    assert_response :success
+    assert_raises(ActionController::RoutingError) { product_path(nil) }
+  end
+end
+
-- 
cgit v1.2.3