Merge commit 'rails/master'

Conflicts:
	activerecord/lib/active_record/associations.rb

1 files changed, 21 insertions, 0 deletions

diff --git a/railties/lib/generators/erb/controller/controller_generator.rb b/railties/lib/generators/erb/controller/controller_generator.rb
new file mode 100644
index 0000000000..ab7b273662
--- /dev/null
+++ b/railties/lib/generators/erb/controller/controller_generator.rb
@@ -0,0 +1,21 @@
+require 'generators/erb'
+
+module Erb
+  module Generators
+    class ControllerGenerator < Base
+      argument :actions, :type => :array, :default => [], :banner => "action action"
+
+      def create_view_files
+        base_path = File.join("app/views", class_path, file_name)
+        empty_directory base_path
+
+        actions.each do |action|
+          @action = action
+          @path   = File.join(base_path, "#{action}.html.erb")
+
+          template 'view.html.erb', @path
+        end
+      end
+    end
+  end
+end