diff options
| -rw-r--r-- | railties/CHANGELOG | 3 | ||||
| -rw-r--r-- | railties/Rakefile | 6 | ||||
| -rw-r--r-- | railties/generators/controller/templates/controller.rb | 2 | ||||
| -rw-r--r-- | railties/generators/scaffold/templates/controller.rb | 2 | ||||
| -rw-r--r-- | railties/helpers/application.rb (renamed from railties/helpers/abstract_application.rb) | 3 | ||||
| -rw-r--r-- | railties/helpers/test_helper.rb | 2 | ||||
| -rw-r--r-- | railties/lib/dispatcher.rb | 4 |
7 files changed, 12 insertions, 10 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index f468fbfb77..1d1806376b 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,8 @@ *CVS* +* Renamed AbstractApplicationController and abstract_application.rb to ApplicationController and application.rb, so that it will be possible + for the framework to automatically pick up on app/views/layouts/application.rhtml and app/helpers/application.rb + * Added script/envcon that makes it even easier to start an IRB session for interacting with the domain model. Run with no-args to see help. diff --git a/railties/Rakefile b/railties/Rakefile index ba93dff6cc..91257d3dff 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -96,7 +96,7 @@ end # :link_apache_config desc "Make copies of all the default content of ties" task :copy_ties_content => [ - :copy_rootfiles, :copy_dispatches, :copy_html_files, :copy_abstract_application, + :copy_rootfiles, :copy_dispatches, :copy_html_files, :copy_application, :copy_configs, :copy_generators, :copy_binfiles, :copy_test_helpers, :copy_docs_in_public, :copy_app_doc_readme ] @@ -121,8 +121,8 @@ task :copy_html_files do File.join(PKG_DESTINATION, 'public') end -task :copy_abstract_application do - cp "helpers/abstract_application.rb", "#{PKG_DESTINATION}/app/controllers/abstract_application.rb" +task :copy_application do + cp "helpers/application.rb", "#{PKG_DESTINATION}/app/controllers/application.rb" cp "helpers/application_helper.rb", "#{PKG_DESTINATION}/app/helpers/application_helper.rb" end diff --git a/railties/generators/controller/templates/controller.rb b/railties/generators/controller/templates/controller.rb index f9800ab556..da71b5f057 100644 --- a/railties/generators/controller/templates/controller.rb +++ b/railties/generators/controller/templates/controller.rb @@ -1,4 +1,4 @@ -class <%= class_name %>Controller < AbstractApplicationController +class <%= class_name %>Controller < ApplicationController <% if options[:scaffold] -%> scaffold :<%= singular_name %> <% end -%> diff --git a/railties/generators/scaffold/templates/controller.rb b/railties/generators/scaffold/templates/controller.rb index c8706098da..83520f4794 100644 --- a/railties/generators/scaffold/templates/controller.rb +++ b/railties/generators/scaffold/templates/controller.rb @@ -1,4 +1,4 @@ -class <%= class_name %>Controller < AbstractApplicationController +class <%= class_name %>Controller < ApplicationController model :<%= singular_name %> layout 'scaffold' diff --git a/railties/helpers/abstract_application.rb b/railties/helpers/application.rb index fa26cd0399..87ca44126d 100644 --- a/railties/helpers/abstract_application.rb +++ b/railties/helpers/application.rb @@ -1,5 +1,4 @@ # The filters added to this controller will be run for all controllers in the application. # Likewise will all the methods added be available for all controllers. -class AbstractApplicationController < ActionController::Base - helper :application +class ApplicationController < ActionController::Base end
\ No newline at end of file diff --git a/railties/helpers/test_helper.rb b/railties/helpers/test_helper.rb index ce1150c606..83f4069ffd 100644 --- a/railties/helpers/test_helper.rb +++ b/railties/helpers/test_helper.rb @@ -1,6 +1,6 @@ ENV["RAILS_ENV"] ||= "test" require File.dirname(__FILE__) + "/../config/environment" -require 'abstract_application' +require 'application' require 'test/unit' require 'active_record/fixtures' diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb index abb686a469..ceb88f30ba 100644 --- a/railties/lib/dispatcher.rb +++ b/railties/lib/dispatcher.rb @@ -35,7 +35,7 @@ class Dispatcher controller_name, module_name = controller_name(request.parameters), module_name(request.parameters) - require_dependency("abstract_application") + require_dependency("application") require_dependency(controller_path(controller_name, module_name)) controller_class(controller_name).process(request, response).out @@ -43,7 +43,7 @@ class Dispatcher ActionController::Base.process_with_exception(request, response, exception).out ensure if ActionController::Base.reload_dependencies - Object.send(:remove_const, "AbstractApplicationController") if Object.const_defined?(:AbstractApplicationController) + Object.send(:remove_const, "ApplicationController") if Object.const_defined?(:ApplicationController) Object.send(:remove_const, controller_class_name(controller_name)) if Object.const_defined?(controller_class_name(controller_name)) ActiveRecord::Base.reset_associations_loaded ActiveRecord::Base.reset_column_information_and_inheritable_attributes_for_all_subclasses |