This project is archived and is in readonly mode.

Changeset [23a9455962f0362cf242ffa96db7a9e7fdb0804b] by José Valim

Revision 23a9455962f0362cf242ffa96db7a9e7fdb0804b, committed by José Valim · September 3rd, 2010 @ 11:31 PM

This commit merges most of the work done by Piotr Sarnacki in his Ruby Summer of Code project.

His work brings several capabilities from app to engines, as routes, middleware stack, asset handling and much more. Please check Rails::Engine documentation for more refenrences.

Merge remote branch 'drogus/engines'
http://github.com/rails/rails/commit/23a9455962f0362cf242ffa96db7a9...

75 changed files

A actionpack/lib/abstract_controller/railties/routes_helpers.rb
A actionpack/lib/abstract_controller/url_for.rb
A actionpack/lib/action_controller/railties/paths.rb
A actionpack/lib/action_dispatch/routing/routes_proxy.rb
A actionpack/test/dispatch/prefix_generation_test.rb
A actionpack/test/fixtures/blog_public/.gitignore
A actionpack/test/fixtures/blog_public/blog.html
A actionpack/test/fixtures/blog_public/index.html
A actionpack/test/fixtures/blog_public/subdir/index.html
A activemodel/test/models/blog_post.rb
A activerecord/test/migrations/empty/.gitkeep
A activerecord/test/migrations/to_copy/1_people_have_hobbies.rb
A activerecord/test/migrations/to_copy/2_people_have_descriptions.rb
A activerecord/test/migrations/to_copy_with_timestamps/20090101010101_people_have_hobbies.rb
A activerecord/test/migrations/to_copy_with_timestamps/20090101010202_people_have_descriptions.rb
A activerecord/test/migrations/valid_with_timestamps/20100101010101_people_have_last_names.rb
A activerecord/test/migrations/valid_with_timestamps/20100201010101_we_need_reminders.rb
A activerecord/test/migrations/valid_with_timestamps/20100301010101_innocent_jointable.rb
A railties/lib/rails/engine/railties.rb
A railties/test/railties/mounted_engine_test.rb
R railties/lib/rails/application/configurable.rb
R railties/lib/rails/engine/configurable.rb
M actionmailer/lib/action_mailer/base.rb
M actionmailer/lib/action_mailer/railtie.rb
M actionpack/lib/abstract_controller.rb
M actionpack/lib/abstract_controller/rendering.rb
M actionpack/lib/action_controller/base.rb
M actionpack/lib/action_controller/metal.rb
M actionpack/lib/action_controller/metal/helpers.rb
M actionpack/lib/action_controller/metal/url_for.rb
M actionpack/lib/action_controller/railtie.rb
M actionpack/lib/action_dispatch/middleware/stack.rb
M actionpack/lib/action_dispatch/middleware/static.rb
M actionpack/lib/action_dispatch/routing.rb
M actionpack/lib/action_dispatch/routing/mapper.rb
M actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
M actionpack/lib/action_dispatch/routing/route_set.rb
M actionpack/lib/action_dispatch/routing/url_for.rb
M actionpack/lib/action_dispatch/testing/test_request.rb
M actionpack/lib/action_view/helpers/asset_tag_helper.rb
M actionpack/lib/action_view/helpers/form_helper.rb
M actionpack/lib/action_view/helpers/url_helper.rb
M actionpack/test/activerecord/polymorphic_routes_test.rb
M actionpack/test/dispatch/routing_test.rb
M actionpack/test/dispatch/static_test.rb
M actionpack/test/dispatch/url_generation_test.rb
M actionpack/test/lib/controller/fake_models.rb
M actionpack/test/template/asset_tag_helper_test.rb
M actionpack/test/template/form_helper_test.rb
M actionpack/test/template/test_test.rb
M activemodel/lib/active_model/naming.rb
M activemodel/test/cases/naming_test.rb
M activerecord/lib/active_record/migration.rb
M activerecord/lib/active_record/railties/databases.rake
M activerecord/lib/rails/generators/active_record.rb
M activerecord/test/cases/helper.rb
M activerecord/test/cases/migration_test.rb
M railties/lib/rails.rb
M railties/lib/rails/application.rb
M railties/lib/rails/application/bootstrap.rb
M railties/lib/rails/application/configuration.rb
M railties/lib/rails/application/railties.rb
M railties/lib/rails/configuration.rb
M railties/lib/rails/engine.rb
M railties/lib/rails/engine/configuration.rb
M railties/lib/rails/plugin.rb
M railties/lib/rails/railtie.rb
M railties/lib/rails/railtie/configurable.rb
M railties/lib/rails/railtie/configuration.rb
M railties/test/application/configuration_test.rb
M railties/test/application/initializers/frameworks_test.rb
M railties/test/application/loading_test.rb
M railties/test/railties/engine_test.rb
M railties/test/railties/railtie_test.rb
M railties/test/railties/shared_tests.rb