3 files changed, 11 insertions, 9 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index e43e897783..25d099d83e 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1327,7 +1327,7 @@ module ActionDispatch
             msg += @draw_paths.map { |_path| " * #{_path}" }.join("\n")
             raise ArgumentError, msg
           end
-          
+
           route_path = "#{path}/#{name}.rb"
           instance_eval(File.read(route_path), route_path.to_s)
         end
diff --git a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
index 8fde667108..86ce7a83b9 100644
--- a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
+++ b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
@@ -95,7 +95,7 @@ module ActionDispatch
         end
 
         record = extract_record(record_or_hash_or_array)
-        record = record.to_model if record.respond_to?(:to_model)
+        record = convert_to_model(record)
 
         args = Array === record_or_hash_or_array ?
           record_or_hash_or_array.dup :
@@ -122,6 +122,8 @@ module ActionDispatch
           args.last.kind_of?(Hash) ? args.last.merge!(url_options) : args << url_options
         end
 
+        args.collect! { |a| convert_to_model(a) }
+
         (proxy || self).send(named_route, *args)
       end
 
@@ -152,6 +154,10 @@ module ActionDispatch
           options[:action] ? "#{options[:action]}_" : ''
         end
 
+        def convert_to_model(object)
+          object.respond_to?(:to_model) ? object.to_model : object
+        end
+
         def routing_type(options)
           options[:routing_type] || :url
         end
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 7872f4007e..64b1d58ae9 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -252,15 +252,11 @@ module ActionDispatch
         self.draw_paths = []
 
         self.request_class = request_class
-        @valid_conditions = {}
-
+        @valid_conditions = { :controller => true, :action => true }
         request_class.public_instance_methods.each { |m|
-          @valid_conditions[m.to_sym] = true
+          @valid_conditions[m] = true
         }
-        @valid_conditions[:controller] = true
-        @valid_conditions[:action] = true
-
-        self.valid_conditions.delete(:id)
+        @valid_conditions.delete(:id)
 
         @append                     = []
         @prepend                    = []