diff options
author | José Valim <jose.valim@gmail.com> | 2009-10-17 15:56:44 -0300 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2009-10-17 15:56:44 -0300 |
commit | 1f9d234a6b567e68d97e71da6f19bd126e7f7058 (patch) | |
tree | 601ea9ceba21bb3f90173c38b81578aa5920eb86 /railties/lib/rails/generators/resource_helpers.rb | |
parent | 03c5a0e5c4c9888c54265d6ef97136854e0ff9e4 (diff) | |
download | rails-1f9d234a6b567e68d97e71da6f19bd126e7f7058.tar.gz rails-1f9d234a6b567e68d97e71da6f19bd126e7f7058.tar.bz2 rails-1f9d234a6b567e68d97e71da6f19bd126e7f7058.zip |
By default use ActiveModel API in controller generators, unless otherwise specified [#3123 status:resolved]
Diffstat (limited to 'railties/lib/rails/generators/resource_helpers.rb')
-rw-r--r-- | railties/lib/rails/generators/resource_helpers.rb | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/railties/lib/rails/generators/resource_helpers.rb b/railties/lib/rails/generators/resource_helpers.rb index d4b0d4b945..0385581083 100644 --- a/railties/lib/rails/generators/resource_helpers.rb +++ b/railties/lib/rails/generators/resource_helpers.rb @@ -1,3 +1,5 @@ +require 'rails/generators/active_model' + module Rails module Generators # Deal with controller names on scaffold and add some helpers to deal with @@ -47,20 +49,11 @@ module Rails raise "You need to have :orm as class option to invoke orm_class and orm_instance" end - active_model = "#{options[:orm].to_s.classify}::Generators::ActiveModel" - - # If the orm was not loaded, try to load it at "generators/orm", - # for example "generators/active_record" or "generators/sequel". begin - klass = active_model.constantize - rescue NameError - require "rails/generators/#{options[:orm]}" + "#{options[:orm].to_s.classify}::Generators::ActiveModel".constantize + rescue NameError => e + Rails::Generators::ActiveModel end - - # Try once again after loading the file with success. - klass ||= active_model.constantize - rescue Exception => e - raise Error, "Could not load #{active_model}, skipping controller. Error: #{e.message}." end end |