Merge branch 'master' of git://github.com/rails/rails

2 files changed, 27 insertions, 1 deletions

diff --git a/railties/lib/rails/tasks/framework.rake b/railties/lib/rails/tasks/framework.rake
index 738f7f5301..063a393bfc 100644
--- a/railties/lib/rails/tasks/framework.rake
+++ b/railties/lib/rails/tasks/framework.rake
@@ -30,6 +30,28 @@ namespace :rails do
     generator.apply template, :verbose => false
   end
 
+  namespace :templates do
+    desc "Copy all the templates from rails to the application directory for customization. Already existing local copies will be overwritten"
+    task :copy do
+      generators_lib = File.expand_path("../../generators", __FILE__)
+      project_templates = "#{Rails.root}/lib/templates"
+
+      default_templates = { "erb"   => %w{controller mailer scaffold},
+                            "rails" => %w{controller helper metal scaffold_controller stylesheets} }
+
+      default_templates.each do |type, names|
+        local_template_type_dir = File.join(project_templates, type)
+        FileUtils.mkdir_p local_template_type_dir
+
+        names.each do |name|
+          dst_name = File.join(local_template_type_dir, name)
+          src_name = File.join(generators_lib, type, name, "templates")
+          FileUtils.cp_r src_name, dst_name
+        end
+      end
+     end
+  end
+
   namespace :update do
     def invoke_from_app_generator(method)
       app_generator.invoke(method)
diff --git a/railties/lib/rails/tasks/routes.rake b/railties/lib/rails/tasks/routes.rake
index 42e01d5e51..41619bc1f8 100644
--- a/railties/lib/rails/tasks/routes.rake
+++ b/railties/lib/rails/tasks/routes.rake
@@ -3,7 +3,11 @@ task :routes => :environment do
   Rails::Application.reload_routes!
   all_routes = ENV['CONTROLLER'] ? Rails.application.routes.routes.select { |route| route.defaults[:controller] == ENV['CONTROLLER'] } : Rails.application.routes.routes
   routes = all_routes.collect do |route|
-    name = Rails.application.routes.named_routes.routes.index(route).to_s
+    # TODO: The :index method is deprecated in 1.9 in favor of :key
+    # but we don't have :key in 1.8.7. We can remove this check when
+    # stop supporting 1.8.x
+    key_method = Hash.method_defined?('key') ? 'key' : 'index'
+    name = Rails.application.routes.named_routes.routes.send(key_method, route).to_s
     reqs = route.requirements.empty? ? "" : route.requirements.inspect
     {:name => name, :verb => route.verb.to_s, :path => route.path, :reqs => reqs}
   end