Made named route helpers compatible with Rails 2.3 optional formats

ianwhite · Dec 11, 2008 · ff25e2d · ff25e2d
1 parent 768fcf7
commit ff25e2d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/ardes/resources_controller/named_route_helper.rb b/lib/ardes/resources_controller/named_route_helper.rb
@@ -124,7 +124,7 @@ def define_resource_named_route_helper_method_for_name_prefix(method)
         name_prefix = method.to_s.sub(/^.*_for_/,'')
         if resource_method =~ /enclosing_resource/
           route, route_method = *route_and_method_from_enclosing_resource_method_and_name_prefix(resource_method, name_prefix)
-          required_args = route.significant_keys.reject{|k| [:controller, :action].include?(k)}.size
+          required_args = (route.significant_keys - [:controller, :action, :format]).size
 
           self.class.send :module_eval, <<-end_eval, __FILE__, __LINE__
             def #{method}(*args)
@@ -137,7 +137,7 @@ def #{method}(*args)
 
         else
           route, route_method = *route_and_method_from_resource_method_and_name_prefix(resource_method, name_prefix)
-          required_args = route.significant_keys.reject{|k| [:controller, :action].include?(k)}.size
+          required_args = (route.significant_keys - [:controller, :action, :format]).size
 
           self.class.send :module_eval, <<-end_eval, __FILE__, __LINE__
             def #{method}(*args)