Make scaffold controller generate agnostic code and mark some hooks as required.

1 files changed, 11 insertions, 0 deletions

diff --git a/railties/lib/generators/rails/scaffold_controller/scaffold_controller_generator.rb b/railties/lib/generators/rails/scaffold_controller/scaffold_controller_generator.rb
index e7f4fdde89..181d21ba35 100644
--- a/railties/lib/generators/rails/scaffold_controller/scaffold_controller_generator.rb
+++ b/railties/lib/generators/rails/scaffold_controller/scaffold_controller_generator.rb
@@ -4,6 +4,7 @@ module Rails
       include ControllerNamedBase
 
       check_class_collision :suffix => "Controller"
+      class_option :orm, :desc => "ORM to generate the controller for", :banner => "NAME", :type => :string
       class_option :singleton, :type => :boolean, :desc => "Supply to create a singleton controller"
 
       def create_controller_files
@@ -12,6 +13,16 @@ module Rails
 
       hook_for :template_engine, :test_framework, :as => :scaffold
       invoke_if :helper
+
+      protected
+
+        def orm_class
+          @orm_class ||= "#{options[:orm].to_s.classify}::Generators::ActionORM".constantize
+        end
+
+        def orm_instance
+          @orm_instance ||= @orm_class.new(file_name)
+        end
     end
   end
 end