diff options
author | José Valim <jose.valim@gmail.com> | 2009-07-01 20:12:29 +0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2009-07-02 10:27:40 +0200 |
commit | 1a4d8aca8a675aa02cead4b1db53ba5a3f9aa326 (patch) | |
tree | 788c5de55db47408ee4e1376ba1cdc11d3923b5c /railties/lib/generators/rails/scaffold_controller | |
parent | 86ff07410145430d08e97a8296486c4cd4304cde (diff) | |
download | rails-1a4d8aca8a675aa02cead4b1db53ba5a3f9aa326.tar.gz rails-1a4d8aca8a675aa02cead4b1db53ba5a3f9aa326.tar.bz2 rails-1a4d8aca8a675aa02cead4b1db53ba5a3f9aa326.zip |
Added tests to scaffold controller.
Diffstat (limited to 'railties/lib/generators/rails/scaffold_controller')
-rw-r--r-- | railties/lib/generators/rails/scaffold_controller/scaffold_controller_generator.rb | 16 |
1 files changed, 12 insertions, 4 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 7fbbf90105..e73c139e96 100644 --- a/railties/lib/generators/rails/scaffold_controller/scaffold_controller_generator.rb +++ b/railties/lib/generators/rails/scaffold_controller/scaffold_controller_generator.rb @@ -4,11 +4,14 @@ 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" # TODO Spec me + + class_option :orm, :banner => "NAME", :type => :string, :required => true, + :desc => "ORM to generate the controller for" + + class_option :singleton, :type => :boolean, :desc => "Supply to create a singleton controller" def create_controller_files - template 'controller.rb', File.join('app/controllers', class_path, "#{file_name}_controller.rb") + template 'controller.rb', File.join('app/controllers', class_path, "#{controller_file_name}_controller.rb") end hook_for :template_engine, :test_framework, :as => :scaffold @@ -22,7 +25,12 @@ module Rails protected def orm_class - @orm_class ||= "#{options[:orm].to_s.classify}::Generators::ActionORM".constantize + @orm_class ||= begin + action_orm = "#{options[:orm].to_s.classify}::Generators::ActionORM" + action_orm.constantize + rescue NameError => e + raise Error, "Could not load #{action_orm}, skipping controller. Error: #{e.message}." + end end def orm_instance |