diff options
Diffstat (limited to 'railties')
-rw-r--r-- | railties/Rakefile | 50 | ||||
-rwxr-xr-x | railties/bin/rails | 18 | ||||
-rw-r--r-- | railties/builtin/rails_info/rails/info.rb | 2 | ||||
-rw-r--r-- | railties/guides/source/rails_on_rack.textile | 11 | ||||
-rw-r--r-- | railties/lib/generators/rails/app/templates/dispatchers/config.ru | 7 | ||||
-rw-r--r-- | railties/lib/rails.rb | 1 | ||||
-rw-r--r-- | railties/lib/rails/application.rb | 29 | ||||
-rw-r--r-- | railties/lib/rails/backtrace_cleaner.rb | 2 | ||||
-rw-r--r-- | railties/lib/rails/code_statistics.rb (renamed from railties/lib/code_statistics.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/commands.rb (renamed from railties/lib/commands.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/commands/about.rb (renamed from railties/lib/commands/about.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/commands/console.rb (renamed from railties/lib/commands/console.rb) | 6 | ||||
-rw-r--r-- | railties/lib/rails/commands/dbconsole.rb (renamed from railties/lib/commands/dbconsole.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/commands/destroy.rb (renamed from railties/lib/commands/destroy.rb) | 0 | ||||
-rwxr-xr-x | railties/lib/rails/commands/generate.rb (renamed from railties/lib/commands/generate.rb) | 0 | ||||
-rwxr-xr-x | railties/lib/rails/commands/ncgi/listener (renamed from railties/lib/commands/ncgi/listener) | 0 | ||||
-rwxr-xr-x | railties/lib/rails/commands/ncgi/tracker (renamed from railties/lib/commands/ncgi/tracker) | 0 | ||||
-rw-r--r-- | railties/lib/rails/commands/performance/benchmarker.rb (renamed from railties/lib/commands/performance/benchmarker.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/commands/performance/profiler.rb (renamed from railties/lib/commands/performance/profiler.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/commands/plugin.rb (renamed from railties/lib/commands/plugin.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/commands/runner.rb (renamed from railties/lib/commands/runner.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/commands/server.rb (renamed from railties/lib/commands/server.rb) | 39 | ||||
-rw-r--r-- | railties/lib/rails/commands/update.rb (renamed from railties/lib/commands/update.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/configuration.rb | 12 | ||||
-rw-r--r-- | railties/lib/rails/console_app.rb (renamed from railties/lib/console_app.rb) | 7 | ||||
-rw-r--r-- | railties/lib/rails/console_sandbox.rb (renamed from railties/lib/console_sandbox.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/console_with_helpers.rb (renamed from railties/lib/console_with_helpers.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/core.rb | 8 | ||||
-rw-r--r-- | railties/lib/rails/dispatcher.rb (renamed from railties/lib/dispatcher.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/fcgi_handler.rb (renamed from railties/lib/fcgi_handler.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators.rb (renamed from railties/lib/generators.rb) | 6 | ||||
-rw-r--r-- | railties/lib/rails/generators/actions.rb (renamed from railties/lib/generators/actions.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/active_model.rb (renamed from railties/lib/generators/active_model.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/active_record.rb (renamed from railties/lib/generators/active_record.rb) | 6 | ||||
-rw-r--r-- | railties/lib/rails/generators/active_record/migration/migration_generator.rb (renamed from railties/lib/generators/active_record/migration/migration_generator.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/active_record/migration/templates/migration.rb (renamed from railties/lib/generators/active_record/migration/templates/migration.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/active_record/model/model_generator.rb (renamed from railties/lib/generators/active_record/model/model_generator.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/active_record/model/templates/migration.rb (renamed from railties/lib/generators/active_record/model/templates/migration.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/active_record/model/templates/model.rb (renamed from railties/lib/generators/active_record/model/templates/model.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/active_record/observer/observer_generator.rb (renamed from railties/lib/generators/active_record/observer/observer_generator.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/active_record/observer/templates/observer.rb (renamed from railties/lib/generators/active_record/observer/templates/observer.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/active_record/session_migration/session_migration_generator.rb (renamed from railties/lib/generators/active_record/session_migration/session_migration_generator.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/active_record/session_migration/templates/migration.rb (renamed from railties/lib/generators/active_record/session_migration/templates/migration.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/base.rb (renamed from railties/lib/generators/base.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/erb.rb (renamed from railties/lib/generators/erb.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/erb/controller/controller_generator.rb (renamed from railties/lib/generators/erb/controller/controller_generator.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/erb/controller/templates/view.html.erb (renamed from railties/lib/generators/erb/controller/templates/view.html.erb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/erb/mailer/mailer_generator.rb (renamed from railties/lib/generators/erb/mailer/mailer_generator.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/erb/mailer/templates/view.erb (renamed from railties/lib/generators/erb/mailer/templates/view.erb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb (renamed from railties/lib/generators/erb/scaffold/scaffold_generator.rb) | 4 | ||||
-rw-r--r-- | railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb (renamed from railties/lib/generators/erb/scaffold/templates/_form.html.erb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/erb/scaffold/templates/edit.html.erb (renamed from railties/lib/generators/erb/scaffold/templates/edit.html.erb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/erb/scaffold/templates/index.html.erb (renamed from railties/lib/generators/erb/scaffold/templates/index.html.erb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/erb/scaffold/templates/layout.html.erb (renamed from railties/lib/generators/erb/scaffold/templates/layout.html.erb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/erb/scaffold/templates/new.html.erb (renamed from railties/lib/generators/erb/scaffold/templates/new.html.erb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/erb/scaffold/templates/show.html.erb (renamed from railties/lib/generators/erb/scaffold/templates/show.html.erb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/generated_attribute.rb (renamed from railties/lib/generators/generated_attribute.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/migration.rb (renamed from railties/lib/generators/migration.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/named_base.rb (renamed from railties/lib/generators/named_base.rb) | 4 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/USAGE (renamed from railties/lib/generators/rails/app/USAGE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/app_generator.rb (renamed from railties/lib/generators/rails/app/app_generator.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/README (renamed from railties/lib/generators/rails/app/templates/README) | 0 | ||||
-rwxr-xr-x | railties/lib/rails/generators/rails/app/templates/Rakefile (renamed from railties/lib/generators/rails/app/templates/Rakefile) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/app/controllers/application_controller.rb (renamed from railties/lib/generators/rails/app/templates/app/controllers/application_controller.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/app/helpers/application_helper.rb (renamed from railties/lib/generators/rails/app/templates/app/helpers/application_helper.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/app/models/.empty_directory (renamed from railties/lib/generators/rails/app/templates/app/models/.empty_directory) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/app/views/layouts/.empty_directory (renamed from railties/lib/generators/rails/app/templates/app/views/layouts/.empty_directory) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config.ru | 5 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/boot.rb (renamed from railties/lib/generators/rails/app/templates/config/boot.rb) | 47 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/databases/frontbase.yml (renamed from railties/lib/generators/rails/app/templates/config/databases/frontbase.yml) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml (renamed from railties/lib/generators/rails/app/templates/config/databases/ibm_db.yml) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml (renamed from railties/lib/generators/rails/app/templates/config/databases/mysql.yml) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml (renamed from railties/lib/generators/rails/app/templates/config/databases/oracle.yml) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml (renamed from railties/lib/generators/rails/app/templates/config/databases/postgresql.yml) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml (renamed from railties/lib/generators/rails/app/templates/config/databases/sqlite3.yml) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/environment.rb (renamed from railties/lib/generators/rails/app/templates/config/environment.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/environments/development.rb (renamed from railties/lib/generators/rails/app/templates/config/environments/development.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/environments/production.rb (renamed from railties/lib/generators/rails/app/templates/config/environments/production.rb) | 6 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/environments/test.rb (renamed from railties/lib/generators/rails/app/templates/config/environments/test.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/initializers/backtrace_silencers.rb (renamed from railties/lib/generators/rails/app/templates/config/initializers/backtrace_silencers.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/initializers/inflections.rb (renamed from railties/lib/generators/rails/app/templates/config/initializers/inflections.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/initializers/mime_types.rb (renamed from railties/lib/generators/rails/app/templates/config/initializers/mime_types.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/initializers/new_rails_defaults.rb (renamed from railties/lib/generators/rails/app/templates/config/initializers/new_rails_defaults.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt (renamed from railties/lib/generators/rails/app/templates/config/initializers/session_store.rb.tt) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/locales/en.yml (renamed from railties/lib/generators/rails/app/templates/config/locales/en.yml) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/routes.rb (renamed from railties/lib/generators/rails/app/templates/config/routes.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/db/seeds.rb (renamed from railties/lib/generators/rails/app/templates/db/seeds.rb) | 0 | ||||
-rwxr-xr-x | railties/lib/rails/generators/rails/app/templates/dispatchers/dispatch.fcgi (renamed from railties/lib/generators/rails/app/templates/dispatchers/dispatch.fcgi) | 0 | ||||
-rwxr-xr-x | railties/lib/rails/generators/rails/app/templates/dispatchers/dispatch.rb (renamed from railties/lib/generators/rails/app/templates/dispatchers/dispatch.rb) | 0 | ||||
-rwxr-xr-x | railties/lib/rails/generators/rails/app/templates/dispatchers/gateway.cgi (renamed from railties/lib/generators/rails/app/templates/dispatchers/gateway.cgi) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/doc/README_FOR_APP (renamed from railties/lib/generators/rails/app/templates/doc/README_FOR_APP) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/public/404.html (renamed from railties/lib/generators/rails/app/templates/public/404.html) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/public/422.html (renamed from railties/lib/generators/rails/app/templates/public/422.html) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/public/500.html (renamed from railties/lib/generators/rails/app/templates/public/500.html) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/public/favicon.ico (renamed from railties/lib/generators/rails/app/templates/public/favicon.ico) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/public/images/rails.png (renamed from railties/lib/generators/rails/app/templates/public/images/rails.png) | bin | 6646 -> 6646 bytes | |||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/public/index.html (renamed from railties/lib/generators/rails/app/templates/public/index.html) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/public/javascripts/application.js (renamed from railties/lib/generators/rails/app/templates/public/javascripts/application.js) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/public/javascripts/controls.js (renamed from railties/lib/generators/rails/app/templates/public/javascripts/controls.js) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/public/javascripts/dragdrop.js (renamed from railties/lib/generators/rails/app/templates/public/javascripts/dragdrop.js) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/public/javascripts/effects.js (renamed from railties/lib/generators/rails/app/templates/public/javascripts/effects.js) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/public/javascripts/prototype.js (renamed from railties/lib/generators/rails/app/templates/public/javascripts/prototype.js) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/public/robots.txt (renamed from railties/lib/generators/rails/app/templates/public/robots.txt) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/public/stylesheets/.empty_directory (renamed from railties/lib/generators/rails/app/templates/public/stylesheets/.empty_directory) | 0 | ||||
-rwxr-xr-x | railties/lib/rails/generators/rails/app/templates/script/about.tt (renamed from railties/lib/generators/rails/app/templates/script/about.tt) | 2 | ||||
-rwxr-xr-x | railties/lib/rails/generators/rails/app/templates/script/console.tt (renamed from railties/lib/generators/rails/app/templates/script/console.tt) | 2 | ||||
-rwxr-xr-x | railties/lib/rails/generators/rails/app/templates/script/dbconsole.tt (renamed from railties/lib/generators/rails/app/templates/script/dbconsole.tt) | 2 | ||||
-rwxr-xr-x | railties/lib/rails/generators/rails/app/templates/script/destroy.tt (renamed from railties/lib/generators/rails/app/templates/script/destroy.tt) | 2 | ||||
-rwxr-xr-x | railties/lib/rails/generators/rails/app/templates/script/generate.tt (renamed from railties/lib/generators/rails/app/templates/script/generate.tt) | 2 | ||||
-rwxr-xr-x | railties/lib/rails/generators/rails/app/templates/script/performance/benchmarker.tt (renamed from railties/lib/generators/rails/app/templates/script/performance/benchmarker.tt) | 2 | ||||
-rwxr-xr-x | railties/lib/rails/generators/rails/app/templates/script/performance/profiler.tt (renamed from railties/lib/generators/rails/app/templates/script/performance/profiler.tt) | 2 | ||||
-rwxr-xr-x | railties/lib/rails/generators/rails/app/templates/script/plugin.tt (renamed from railties/lib/generators/rails/app/templates/script/plugin.tt) | 2 | ||||
-rwxr-xr-x | railties/lib/rails/generators/rails/app/templates/script/runner.tt (renamed from railties/lib/generators/rails/app/templates/script/runner.tt) | 2 | ||||
-rwxr-xr-x | railties/lib/rails/generators/rails/app/templates/script/server.tt (renamed from railties/lib/generators/rails/app/templates/script/server.tt) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/test/fixtures/.empty_directory (renamed from railties/lib/generators/rails/app/templates/test/fixtures/.empty_directory) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/test/functional/.empty_directory (renamed from railties/lib/generators/rails/app/templates/test/functional/.empty_directory) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/test/integration/.empty_directory (renamed from railties/lib/generators/rails/app/templates/test/integration/.empty_directory) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/test/performance/browsing_test.rb (renamed from railties/lib/generators/rails/app/templates/test/performance/browsing_test.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/test/test_helper.rb (renamed from railties/lib/generators/rails/app/templates/test/test_helper.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/test/unit/.empty_directory (renamed from railties/lib/generators/rails/app/templates/test/unit/.empty_directory) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/controller/USAGE (renamed from railties/lib/generators/rails/controller/USAGE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/controller/controller_generator.rb (renamed from railties/lib/generators/rails/controller/controller_generator.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/controller/templates/controller.rb (renamed from railties/lib/generators/rails/controller/templates/controller.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/generator/USAGE (renamed from railties/lib/generators/rails/generator/USAGE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/generator/generator_generator.rb (renamed from railties/lib/generators/rails/generator/generator_generator.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/generator/templates/%file_name%_generator.rb.tt (renamed from railties/lib/generators/rails/generator/templates/%file_name%_generator.rb.tt) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/generator/templates/USAGE.tt (renamed from railties/lib/generators/rails/generator/templates/USAGE.tt) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/generator/templates/templates/.empty_directory (renamed from railties/lib/generators/rails/generator/templates/templates/.empty_directory) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/helper/USAGE (renamed from railties/lib/generators/rails/helper/USAGE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/helper/helper_generator.rb (renamed from railties/lib/generators/rails/helper/helper_generator.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/helper/templates/helper.rb (renamed from railties/lib/generators/rails/helper/templates/helper.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/integration_test/USAGE (renamed from railties/lib/generators/rails/integration_test/USAGE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/integration_test/integration_test_generator.rb (renamed from railties/lib/generators/rails/integration_test/integration_test_generator.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/mailer/USAGE (renamed from railties/lib/generators/rails/mailer/USAGE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/mailer/mailer_generator.rb (renamed from railties/lib/generators/rails/mailer/mailer_generator.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/mailer/templates/mailer.rb (renamed from railties/lib/generators/rails/mailer/templates/mailer.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/metal/USAGE (renamed from railties/lib/generators/rails/metal/USAGE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/metal/metal_generator.rb (renamed from railties/lib/generators/rails/metal/metal_generator.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/metal/templates/metal.rb (renamed from railties/lib/generators/rails/metal/templates/metal.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/migration/USAGE (renamed from railties/lib/generators/rails/migration/USAGE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/migration/migration_generator.rb (renamed from railties/lib/generators/rails/migration/migration_generator.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/model/USAGE (renamed from railties/lib/generators/rails/model/USAGE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/model/model_generator.rb (renamed from railties/lib/generators/rails/model/model_generator.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/model_subclass/model_subclass_generator.rb (renamed from railties/lib/generators/rails/model_subclass/model_subclass_generator.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/observer/USAGE (renamed from railties/lib/generators/rails/observer/USAGE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/observer/observer_generator.rb (renamed from railties/lib/generators/rails/observer/observer_generator.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/performance_test/USAGE (renamed from railties/lib/generators/rails/performance_test/USAGE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/performance_test/performance_test_generator.rb (renamed from railties/lib/generators/rails/performance_test/performance_test_generator.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/plugin/USAGE (renamed from railties/lib/generators/rails/plugin/USAGE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/plugin/plugin_generator.rb (renamed from railties/lib/generators/rails/plugin/plugin_generator.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/plugin/templates/MIT-LICENSE (renamed from railties/lib/generators/rails/plugin/templates/MIT-LICENSE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/plugin/templates/README (renamed from railties/lib/generators/rails/plugin/templates/README) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/plugin/templates/Rakefile (renamed from railties/lib/generators/rails/plugin/templates/Rakefile) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/plugin/templates/init.rb (renamed from railties/lib/generators/rails/plugin/templates/init.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/plugin/templates/install.rb (renamed from railties/lib/generators/rails/plugin/templates/install.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/plugin/templates/lib/%file_name%.rb.tt (renamed from railties/lib/generators/rails/plugin/templates/lib/%file_name%.rb.tt) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/plugin/templates/tasks/%file_name%_tasks.rake.tt (renamed from railties/lib/generators/rails/plugin/templates/tasks/%file_name%_tasks.rake.tt) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/plugin/templates/uninstall.rb (renamed from railties/lib/generators/rails/plugin/templates/uninstall.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/resource/USAGE (renamed from railties/lib/generators/rails/resource/USAGE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/resource/resource_generator.rb (renamed from railties/lib/generators/rails/resource/resource_generator.rb) | 4 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/scaffold/USAGE (renamed from railties/lib/generators/rails/scaffold/USAGE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb (renamed from railties/lib/generators/rails/scaffold/scaffold_generator.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/scaffold_controller/USAGE (renamed from railties/lib/generators/rails/scaffold_controller/USAGE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb (renamed from railties/lib/generators/rails/scaffold_controller/scaffold_controller_generator.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb (renamed from railties/lib/generators/rails/scaffold_controller/templates/controller.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/session_migration/USAGE (renamed from railties/lib/generators/rails/session_migration/USAGE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/session_migration/session_migration_generator.rb (renamed from railties/lib/generators/rails/session_migration/session_migration_generator.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/stylesheets/USAGE (renamed from railties/lib/generators/rails/stylesheets/USAGE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/stylesheets/stylesheets_generator.rb (renamed from railties/lib/generators/rails/stylesheets/stylesheets_generator.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/stylesheets/templates/scaffold.css (renamed from railties/lib/generators/rails/stylesheets/templates/scaffold.css) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/resource_helpers.rb (renamed from railties/lib/generators/resource_helpers.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit.rb (renamed from railties/lib/generators/test_unit.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/controller/controller_generator.rb (renamed from railties/lib/generators/test_unit/controller/controller_generator.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/controller/templates/functional_test.rb (renamed from railties/lib/generators/test_unit/controller/templates/functional_test.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/helper/helper_generator.rb (renamed from railties/lib/generators/test_unit/helper/helper_generator.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/helper/templates/helper_test.rb (renamed from railties/lib/generators/test_unit/helper/templates/helper_test.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/integration/integration_generator.rb (renamed from railties/lib/generators/test_unit/integration/integration_generator.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/integration/templates/integration_test.rb (renamed from railties/lib/generators/test_unit/integration/templates/integration_test.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb (renamed from railties/lib/generators/test_unit/mailer/mailer_generator.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/mailer/templates/fixture (renamed from railties/lib/generators/test_unit/mailer/templates/fixture) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/mailer/templates/unit_test.rb (renamed from railties/lib/generators/test_unit/mailer/templates/unit_test.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/model/model_generator.rb (renamed from railties/lib/generators/test_unit/model/model_generator.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/model/templates/fixtures.yml (renamed from railties/lib/generators/test_unit/model/templates/fixtures.yml) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/model/templates/unit_test.rb (renamed from railties/lib/generators/test_unit/model/templates/unit_test.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/observer/observer_generator.rb (renamed from railties/lib/generators/test_unit/observer/observer_generator.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/observer/templates/unit_test.rb (renamed from railties/lib/generators/test_unit/observer/templates/unit_test.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/performance/performance_generator.rb (renamed from railties/lib/generators/test_unit/performance/performance_generator.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/performance/templates/performance_test.rb (renamed from railties/lib/generators/test_unit/performance/templates/performance_test.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/plugin/plugin_generator.rb (renamed from railties/lib/generators/test_unit/plugin/plugin_generator.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/plugin/templates/%file_name%_test.rb.tt (renamed from railties/lib/generators/test_unit/plugin/templates/%file_name%_test.rb.tt) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/plugin/templates/test_helper.rb (renamed from railties/lib/generators/test_unit/plugin/templates/test_helper.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb (renamed from railties/lib/generators/test_unit/scaffold/scaffold_generator.rb) | 4 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb (renamed from railties/lib/generators/test_unit/scaffold/templates/functional_test.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/initializer.rb (renamed from railties/lib/initializer.rb) | 87 | ||||
-rw-r--r-- | railties/lib/rails/initializer_old.rb (renamed from railties/lib/initializer_old.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/performance_test_help.rb (renamed from railties/lib/performance_test_help.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/rack/static.rb | 47 | ||||
-rw-r--r-- | railties/lib/rails/railties_path.rb (renamed from railties/lib/railties_path.rb) | 2 | ||||
-rw-r--r-- | railties/lib/rails/ruby_version_check.rb (renamed from railties/lib/ruby_version_check.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/rubyprof_ext.rb (renamed from railties/lib/rubyprof_ext.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/source_annotation_extractor.rb (renamed from railties/lib/source_annotation_extractor.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/tasks.rb (renamed from railties/lib/tasks/rails.rb) | 18 | ||||
-rw-r--r-- | railties/lib/rails/tasks/annotations.rake (renamed from railties/lib/tasks/annotations.rake) | 2 | ||||
-rw-r--r-- | railties/lib/rails/tasks/databases.rake (renamed from railties/lib/tasks/databases.rake) | 4 | ||||
-rw-r--r-- | railties/lib/rails/tasks/documentation.rake (renamed from railties/lib/tasks/documentation.rake) | 0 | ||||
-rw-r--r-- | railties/lib/rails/tasks/framework.rake (renamed from railties/lib/tasks/framework.rake) | 2 | ||||
-rw-r--r-- | railties/lib/rails/tasks/gems.rake (renamed from railties/lib/tasks/gems.rake) | 0 | ||||
-rw-r--r-- | railties/lib/rails/tasks/log.rake (renamed from railties/lib/tasks/log.rake) | 0 | ||||
-rw-r--r-- | railties/lib/rails/tasks/middleware.rake (renamed from railties/lib/tasks/middleware.rake) | 4 | ||||
-rw-r--r-- | railties/lib/rails/tasks/misc.rake (renamed from railties/lib/tasks/misc.rake) | 0 | ||||
-rw-r--r-- | railties/lib/rails/tasks/routes.rake (renamed from railties/lib/tasks/routes.rake) | 0 | ||||
-rw-r--r-- | railties/lib/rails/tasks/statistics.rake (renamed from railties/lib/tasks/statistics.rake) | 2 | ||||
-rw-r--r-- | railties/lib/rails/tasks/testing.rake (renamed from railties/lib/tasks/testing.rake) | 0 | ||||
-rw-r--r-- | railties/lib/rails/tasks/tmp.rake (renamed from railties/lib/tasks/tmp.rake) | 0 | ||||
-rw-r--r-- | railties/lib/rails/test_help.rb (renamed from railties/lib/test_help.rb) | 4 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/LICENSE (renamed from railties/lib/vendor/bundler/LICENSE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/README.markdown (renamed from railties/lib/vendor/bundler/README.markdown) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/Rakefile (renamed from railties/lib/vendor/bundler/Rakefile) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/lib/bundler.rb (renamed from railties/lib/vendor/bundler/lib/bundler.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/lib/bundler/cli.rb (renamed from railties/lib/vendor/bundler/lib/bundler/cli.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/lib/bundler/commands/bundle_command.rb (renamed from railties/lib/vendor/bundler/lib/bundler/commands/bundle_command.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/lib/bundler/commands/exec_command.rb (renamed from railties/lib/vendor/bundler/lib/bundler/commands/exec_command.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/lib/bundler/dependency.rb (renamed from railties/lib/vendor/bundler/lib/bundler/dependency.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/lib/bundler/dsl.rb (renamed from railties/lib/vendor/bundler/lib/bundler/dsl.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/lib/bundler/environment.rb (renamed from railties/lib/vendor/bundler/lib/bundler/environment.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/lib/bundler/finder.rb (renamed from railties/lib/vendor/bundler/lib/bundler/finder.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/lib/bundler/gem_bundle.rb (renamed from railties/lib/vendor/bundler/lib/bundler/gem_bundle.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/lib/bundler/gem_ext.rb (renamed from railties/lib/vendor/bundler/lib/bundler/gem_ext.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/lib/bundler/repository.rb (renamed from railties/lib/vendor/bundler/lib/bundler/repository.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/lib/bundler/repository/directory_repository.rb (renamed from railties/lib/vendor/bundler/lib/bundler/repository/directory_repository.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/lib/bundler/repository/gem_repository.rb (renamed from railties/lib/vendor/bundler/lib/bundler/repository/gem_repository.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/lib/bundler/resolver.rb (renamed from railties/lib/vendor/bundler/lib/bundler/resolver.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/lib/bundler/runtime.rb (renamed from railties/lib/vendor/bundler/lib/bundler/runtime.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/lib/bundler/source.rb (renamed from railties/lib/vendor/bundler/lib/bundler/source.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/lib/bundler/templates/app_script.erb (renamed from railties/lib/vendor/bundler/lib/bundler/templates/app_script.erb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/bundler/lib/bundler/templates/environment.erb (renamed from railties/lib/vendor/bundler/lib/bundler/templates/environment.erb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/CHANGELOG.rdoc (renamed from railties/lib/vendor/thor-0.11.6/CHANGELOG.rdoc) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/LICENSE (renamed from railties/lib/vendor/thor-0.11.6/LICENSE) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/README.rdoc (renamed from railties/lib/vendor/thor-0.11.6/README.rdoc) | 0 | ||||
-rwxr-xr-x | railties/lib/rails/vendor/thor-0.11.6/bin/rake2thor (renamed from railties/lib/vendor/thor-0.11.6/bin/rake2thor) | 0 | ||||
-rwxr-xr-x | railties/lib/rails/vendor/thor-0.11.6/bin/thor (renamed from railties/lib/vendor/thor-0.11.6/bin/thor) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/actions.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/actions.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/actions/create_file.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/actions/create_file.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/actions/directory.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/actions/directory.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/actions/empty_directory.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/actions/empty_directory.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/actions/file_manipulation.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/actions/file_manipulation.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/actions/inject_into_file.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/actions/inject_into_file.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/base.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/base.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/core_ext/hash_with_indifferent_access.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/core_ext/hash_with_indifferent_access.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/core_ext/ordered_hash.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/core_ext/ordered_hash.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/error.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/error.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/group.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/group.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/invocation.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/invocation.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/parser.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/parser.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/parser/argument.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/parser/argument.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/parser/arguments.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/parser/arguments.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/parser/option.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/parser/option.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/parser/options.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/parser/options.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/rake_compat.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/rake_compat.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/runner.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/runner.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/shell.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/shell.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/shell/basic.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/shell/basic.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/shell/color.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/shell/color.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/task.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/task.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/vendor/thor-0.11.6/lib/thor/util.rb (renamed from railties/lib/vendor/thor-0.11.6/lib/thor/util.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/webrick_server.rb (renamed from railties/lib/webrick_server.rb) | 0 | ||||
-rw-r--r-- | railties/rails.gemspec | 72 | ||||
-rw-r--r-- | railties/test/abstract_unit.rb | 4 | ||||
-rw-r--r-- | railties/test/application/load_test.rb | 51 | ||||
-rw-r--r-- | railties/test/backtrace_cleaner_test.rb | 6 | ||||
-rw-r--r-- | railties/test/boot_test.rb | 17 | ||||
-rw-r--r-- | railties/test/console_app_test.rb | 19 | ||||
-rw-r--r-- | railties/test/fcgi_dispatcher_test.rb | 8 | ||||
-rw-r--r-- | railties/test/fixtures/lib/generators/active_record/fixjour/fixjour_generator.rb | 2 | ||||
-rw-r--r-- | railties/test/fixtures/public/foo/bar.html | 1 | ||||
-rw-r--r-- | railties/test/fixtures/public/foo/index.html | 1 | ||||
-rw-r--r-- | railties/test/fixtures/public/index.html | 1 | ||||
-rw-r--r-- | railties/test/generators/actions_test.rb | 2 | ||||
-rw-r--r-- | railties/test/generators/app_generator_test.rb | 4 | ||||
-rw-r--r-- | railties/test/generators/controller_generator_test.rb | 2 | ||||
-rw-r--r-- | railties/test/generators/generator_generator_test.rb | 2 | ||||
-rw-r--r-- | railties/test/generators/generators_test_helper.rb | 2 | ||||
-rw-r--r-- | railties/test/generators/helper_generator_test.rb | 2 | ||||
-rw-r--r-- | railties/test/generators/integration_test_generator_test.rb | 2 | ||||
-rw-r--r-- | railties/test/generators/mailer_generator_test.rb | 2 | ||||
-rw-r--r-- | railties/test/generators/metal_generator_test.rb | 2 | ||||
-rw-r--r-- | railties/test/generators/migration_generator_test.rb | 2 | ||||
-rw-r--r-- | railties/test/generators/model_generator_test.rb | 2 | ||||
-rw-r--r-- | railties/test/generators/named_base_test.rb | 2 | ||||
-rw-r--r-- | railties/test/generators/observer_generator_test.rb | 2 | ||||
-rw-r--r-- | railties/test/generators/performance_test_generator_test.rb | 2 | ||||
-rw-r--r-- | railties/test/generators/plugin_generator_test.rb | 2 | ||||
-rw-r--r-- | railties/test/generators/resource_generator_test.rb | 2 | ||||
-rw-r--r-- | railties/test/generators/scaffold_controller_generator_test.rb | 4 | ||||
-rw-r--r-- | railties/test/generators/scaffold_generator_test.rb | 2 | ||||
-rw-r--r-- | railties/test/generators/session_migration_generator_test.rb | 2 | ||||
-rw-r--r-- | railties/test/generators/stylesheets_generator_test.rb | 2 | ||||
-rw-r--r-- | railties/test/generators_test.rb | 4 | ||||
-rw-r--r-- | railties/test/initializer/boot_test.rb | 16 | ||||
-rw-r--r-- | railties/test/initializer/check_ruby_version_test.rb | 7 | ||||
-rw-r--r-- | railties/test/initializer/install_gem_spec_stubs_test.rb | 86 | ||||
-rw-r--r-- | railties/test/initializer/path_test.rb | 35 | ||||
-rw-r--r-- | railties/test/initializer/root/app/controllers/.keep | 0 | ||||
-rw-r--r-- | railties/test/initializer/root/app/helpers/.keep | 0 | ||||
-rw-r--r-- | railties/test/initializer/root/app/metal/.keep | 0 | ||||
-rw-r--r-- | railties/test/initializer/root/app/models/.keep | 0 | ||||
-rw-r--r-- | railties/test/initializer/root/app/views/.keep | 0 | ||||
-rw-r--r-- | railties/test/initializer/root/config/database.yml | 4 | ||||
-rw-r--r-- | railties/test/initializer/root/config/environments/.keep | 0 | ||||
-rw-r--r-- | railties/test/initializer/root/config/locales/.keep | 0 | ||||
-rw-r--r-- | railties/test/initializer/root/config/routes.rb | 0 | ||||
-rw-r--r-- | railties/test/initializer/root/lib/.keep | 0 | ||||
-rw-r--r-- | railties/test/initializer/root/tmp/.keep | 0 | ||||
-rw-r--r-- | railties/test/initializer/root/tmp/cache/.keep | 0 | ||||
-rw-r--r-- | railties/test/initializer/root/vendor/.keep | 0 | ||||
-rw-r--r-- | railties/test/initializer/test_helper.rb | 51 | ||||
-rw-r--r-- | railties/test/initializer_test.rb | 4 | ||||
-rw-r--r-- | railties/test/isolation/abstract_unit.rb | 131 | ||||
-rw-r--r-- | railties/test/metal_test.rb | 2 | ||||
-rw-r--r-- | railties/test/new_initializer_test.rb | 2 | ||||
-rw-r--r-- | railties/test/plugin_test_helper.rb | 2 | ||||
-rw-r--r-- | railties/test/rack_static_test.rb | 46 | ||||
-rw-r--r-- | railties/test/rails_info_controller_test.rb | 1 | ||||
-rw-r--r-- | railties/test/rails_info_test.rb | 8 |
325 files changed, 563 insertions, 584 deletions
diff --git a/railties/Rakefile b/railties/Rakefile index 6ebb11dbb5..e36930af4f 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -9,7 +9,7 @@ require 'rbconfig' require File.join(File.dirname(__FILE__), 'lib/rails', 'version') PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' -PKG_NAME = 'rails' +PKG_NAME = ENV['PKG_NAME'] || 'rails' PKG_VERSION = Rails::VERSION::STRING + PKG_BUILD PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}" PKG_DESTINATION = ENV["RAILS_PKG_DESTINATION"] || "../#{PKG_NAME}" @@ -81,7 +81,7 @@ end task :create_rails do require File.join(File.dirname(__FILE__), 'lib', 'generators') - require 'generators/rails/app/app_generator' + require 'rails/generators/rails/app/app_generator' Rails::Generators::AppGenerator.start [ File.basename(PKG_DESTINATION), "--quiet" ], :destination_root => File.expand_path(File.dirname(PKG_DESTINATION)) end @@ -137,56 +137,12 @@ Rake::RDocTask.new { |rdoc| # Generate GEM ---------------------------------------------------------------------------- -PKG_FILES = FileList[ - '[a-zA-Z]*', - 'bin/**/*', - 'builtin/**/*', - 'guides/**/*', - 'lib/**/{*,.[a-z]*}' -] - [ 'test' ] - -spec = Gem::Specification.new do |s| - s.platform = Gem::Platform::RUBY - s.name = 'rails' - s.version = PKG_VERSION - s.summary = "Web-application framework with template engine, control-flow layer, and ORM." - s.description = <<-EOF - Rails is a framework for building web-application using CGI, FCGI, mod_ruby, or WEBrick - on top of either MySQL, PostgreSQL, SQLite, DB2, SQL Server, or Oracle with eRuby- or Builder-based templates. - EOF - - s.add_dependency('rake', '>= 0.8.3') - s.add_dependency('activesupport', '= 3.0.pre' + PKG_BUILD) - s.add_dependency('activerecord', '= 3.0.pre' + PKG_BUILD) - s.add_dependency('actionpack', '= 3.0.pre' + PKG_BUILD) - s.add_dependency('actionmailer', '= 3.0.pre' + PKG_BUILD) - s.add_dependency('activeresource', '= 3.0.pre' + PKG_BUILD) - - s.rdoc_options << '--exclude' << '.' - s.has_rdoc = false - - s.files = PKG_FILES.to_a.delete_if {|f| f =~ %r{\.svn|guides/output}} - s.require_path = 'lib' - s.bindir = "bin" # Use these for applications. - s.executables = ["rails"] - s.default_executable = "rails" - - s.author = "David Heinemeier Hansson" - s.email = "david@loudthinking.com" - s.homepage = "http://www.rubyonrails.org" - s.rubyforge_project = "rails" -end +spec = eval(File.read('rails.gemspec')) Rake::GemPackageTask.new(spec) do |pkg| pkg.gem_spec = spec end -task :gemspec do - File.open(File.join(File.dirname(__FILE__), "#{spec.name}.gemspec"), "w") do |file| - file.puts spec.to_ruby - end -end - # Publishing ------------------------------------------------------- desc "Publish the rails gem" diff --git a/railties/bin/rails b/railties/bin/rails index 538d0cbc84..e743aa83f1 100755 --- a/railties/bin/rails +++ b/railties/bin/rails @@ -1,7 +1,17 @@ -require File.dirname(__FILE__) + '/../lib/ruby_version_check' +begin + require 'rails/ruby_version_check' +rescue LoadError + # If people are not using gems, the load path must still + # be correct. + # TODO: Remove the begin / rescue block somehow + $:.unshift File.dirname(__FILE__) + '/../lib' + $:.unshift File.dirname(__FILE__) + '/../../activesupport/lib' + retry +end + Signal.trap("INT") { puts; exit } -require File.dirname(__FILE__) + '/../lib/rails/version' +require 'rails/version' if %w(--version -v).include? ARGV.first puts "Rails #{Rails::VERSION::STRING}" exit(0) @@ -9,7 +19,7 @@ end ARGV << "--help" if ARGV.empty? -require File.dirname(__FILE__) + '/../lib/generators' -require 'generators/rails/app/app_generator' +require 'rails/generators' +require 'rails/generators/rails/app/app_generator' Rails::Generators::AppGenerator.start diff --git a/railties/builtin/rails_info/rails/info.rb b/railties/builtin/rails_info/rails/info.rb index aabe976d4e..48d89ad06a 100644 --- a/railties/builtin/rails_info/rails/info.rb +++ b/railties/builtin/rails_info/rails/info.rb @@ -114,7 +114,7 @@ module Rails end property 'Middleware' do - ActionController::Dispatcher.middleware.active.map {|middle| middle.inspect } + Rails.configuration.middleware.active.map { |middle| middle.inspect } end # The Rails Git revision, if it's checked out into vendor/rails. diff --git a/railties/guides/source/rails_on_rack.textile b/railties/guides/source/rails_on_rack.textile index 8d9df9e6ef..df93580e89 100644 --- a/railties/guides/source/rails_on_rack.textile +++ b/railties/guides/source/rails_on_rack.textile @@ -40,11 +40,8 @@ Here's how +script/server+ creates an instance of +Rack::Builder+ app = Rack::Builder.new { use Rails::Rack::LogTailer unless options[:detach] use Rails::Rack::Debugger if options[:debugger] - - map "/" do - use Rails::Rack::Static - run ActionController::Dispatcher.new - end + use ActionDispatch::Static + run ActionController::Dispatcher.new }.to_app </ruby> @@ -52,7 +49,7 @@ Middlewares used in the code above are primarily useful only in the development |_.Middleware|_.Purpose| |+Rails::Rack::LogTailer+|Appends log file output to console| -|+Rails::Rack::Static+|Serves static files inside +RAILS_ROOT/public+ directory| +|+ActionDispatch::Static+|Serves static files inside +RAILS_ROOT/public+ directory| |+Rails::Rack::Debugger+|Starts Debugger| h4. +rackup+ @@ -64,7 +61,7 @@ To use +rackup+ instead of Rails' +script/server+, you can put the following ins require "config/environment" use Rails::Rack::LogTailer -use Rails::Rack::Static +use ActionDispatch::Static run ActionController::Dispatcher.new </ruby> diff --git a/railties/lib/generators/rails/app/templates/dispatchers/config.ru b/railties/lib/generators/rails/app/templates/dispatchers/config.ru deleted file mode 100644 index acbfe4e9ae..0000000000 --- a/railties/lib/generators/rails/app/templates/dispatchers/config.ru +++ /dev/null @@ -1,7 +0,0 @@ -# Rack Dispatcher - -# Require your environment file to bootstrap Rails -require File.dirname(__FILE__) + '/config/environment' - -# Dispatch the request -run ActionController::Dispatcher.new diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb new file mode 100644 index 0000000000..43ece14a49 --- /dev/null +++ b/railties/lib/rails.rb @@ -0,0 +1 @@ +require 'rails/initializer' diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb new file mode 100644 index 0000000000..6139e20e95 --- /dev/null +++ b/railties/lib/rails/application.rb @@ -0,0 +1,29 @@ +module Rails + class Application + + def self.config + @config ||= Configuration.new + end + + def self.config=(config) + @config = config + end + + def config + self.class.config + end + + def routes + ActionController::Routing::Routes + end + + def middleware + config.middleware + end + + def call(env) + @app ||= middleware.build(routes) + @app.call(env) + end + end +end diff --git a/railties/lib/rails/backtrace_cleaner.rb b/railties/lib/rails/backtrace_cleaner.rb index 1605429e8b..9ff8367807 100644 --- a/railties/lib/rails/backtrace_cleaner.rb +++ b/railties/lib/rails/backtrace_cleaner.rb @@ -32,7 +32,7 @@ module Rails private def add_gem_filters - Gem.path.each do |path| + (Gem.path + [Gem.default_dir]).uniq.each do |path| # http://gist.github.com/30430 add_filter { |line| line.sub(/(#{path})\/gems\/([a-z]+)-([0-9.]+)\/(.*)/, '\2 (\3) \4')} end diff --git a/railties/lib/code_statistics.rb b/railties/lib/rails/code_statistics.rb index 740d8a1767..740d8a1767 100644 --- a/railties/lib/code_statistics.rb +++ b/railties/lib/rails/code_statistics.rb diff --git a/railties/lib/commands.rb b/railties/lib/rails/commands.rb index 841e98a0dc..841e98a0dc 100644 --- a/railties/lib/commands.rb +++ b/railties/lib/rails/commands.rb diff --git a/railties/lib/commands/about.rb b/railties/lib/rails/commands/about.rb index bc2cfcb948..bc2cfcb948 100644 --- a/railties/lib/commands/about.rb +++ b/railties/lib/rails/commands/about.rb diff --git a/railties/lib/commands/console.rb b/railties/lib/rails/commands/console.rb index 63df834639..31448bdf1a 100644 --- a/railties/lib/commands/console.rb +++ b/railties/lib/rails/commands/console.rb @@ -13,9 +13,9 @@ end libs = " -r irb/completion" libs << %( -r "#{RAILS_ROOT}/config/environment") -libs << " -r console_app" -libs << " -r console_sandbox" if options[:sandbox] -libs << " -r console_with_helpers" +libs << " -r rails/console_app" +libs << " -r rails/console_sandbox" if options[:sandbox] +libs << " -r rails/console_with_helpers" if options[:debugger] begin diff --git a/railties/lib/commands/dbconsole.rb b/railties/lib/rails/commands/dbconsole.rb index e6f11a45db..e6f11a45db 100644 --- a/railties/lib/commands/dbconsole.rb +++ b/railties/lib/rails/commands/dbconsole.rb diff --git a/railties/lib/commands/destroy.rb b/railties/lib/rails/commands/destroy.rb index 5013d30b83..5013d30b83 100644 --- a/railties/lib/commands/destroy.rb +++ b/railties/lib/rails/commands/destroy.rb diff --git a/railties/lib/commands/generate.rb b/railties/lib/rails/commands/generate.rb index 32cabcab10..32cabcab10 100755 --- a/railties/lib/commands/generate.rb +++ b/railties/lib/rails/commands/generate.rb diff --git a/railties/lib/commands/ncgi/listener b/railties/lib/rails/commands/ncgi/listener index 7079ef78a6..7079ef78a6 100755 --- a/railties/lib/commands/ncgi/listener +++ b/railties/lib/rails/commands/ncgi/listener diff --git a/railties/lib/commands/ncgi/tracker b/railties/lib/rails/commands/ncgi/tracker index 4ca12d779b..4ca12d779b 100755 --- a/railties/lib/commands/ncgi/tracker +++ b/railties/lib/rails/commands/ncgi/tracker diff --git a/railties/lib/commands/performance/benchmarker.rb b/railties/lib/rails/commands/performance/benchmarker.rb index e8804fe1bf..e8804fe1bf 100644 --- a/railties/lib/commands/performance/benchmarker.rb +++ b/railties/lib/rails/commands/performance/benchmarker.rb diff --git a/railties/lib/commands/performance/profiler.rb b/railties/lib/rails/commands/performance/profiler.rb index 7df840f197..7df840f197 100644 --- a/railties/lib/commands/performance/profiler.rb +++ b/railties/lib/rails/commands/performance/profiler.rb diff --git a/railties/lib/commands/plugin.rb b/railties/lib/rails/commands/plugin.rb index 159db707e7..159db707e7 100644 --- a/railties/lib/commands/plugin.rb +++ b/railties/lib/rails/commands/plugin.rb diff --git a/railties/lib/commands/runner.rb b/railties/lib/rails/commands/runner.rb index 510128318a..510128318a 100644 --- a/railties/lib/commands/runner.rb +++ b/railties/lib/rails/commands/runner.rb diff --git a/railties/lib/commands/server.rb b/railties/lib/rails/commands/server.rb index 823916b1dc..c138cbc9bf 100644 --- a/railties/lib/commands/server.rb +++ b/railties/lib/rails/commands/server.rb @@ -9,8 +9,7 @@ options = { :environment => (ENV['RAILS_ENV'] || "development").dup, :config => RAILS_ROOT + "/config.ru", :detach => false, - :debugger => false, - :path => nil + :debugger => false } ARGV.clone.options do |opts| @@ -25,7 +24,6 @@ ARGV.clone.options do |opts| opts.on("-e", "--environment=name", String, "Specifies the environment to run this server under (test/development/production).", "Default: #{options[:environment]}") { |v| options[:environment] = v } - opts.on("-P", "--path=/path", String, "Runs Rails app mounted at a specific path.", "Default: #{options[:path]}") { |v| options[:path] = v } opts.separator "" @@ -44,11 +42,7 @@ unless server end puts "=> Booting #{ActiveSupport::Inflector.demodulize(server)}" -puts "=> Rails #{Rails.version} application starting on http://#{options[:Host]}:#{options[:Port]}#{options[:path]}" - -%w(cache pids sessions sockets).each do |dir_to_make| - FileUtils.mkdir_p(File.join(RAILS_ROOT, 'tmp', dir_to_make)) -end +puts "=> Rails #{Rails.version} application starting on http://#{options[:Host]}:#{options[:Port]}}" if options[:detach] Process.daemon @@ -60,37 +54,10 @@ end ENV["RAILS_ENV"] = options[:environment] RAILS_ENV.replace(options[:environment]) if defined?(RAILS_ENV) -if File.exist?(options[:config]) - config = options[:config] - if config =~ /\.ru$/ - cfgfile = File.read(config) - if cfgfile[/^#\\(.*)/] - opts.parse!($1.split(/\s+/)) - end - inner_app = eval("Rack::Builder.new {( " + cfgfile + "\n )}.to_app", nil, config) - else - require config - inner_app = Object.const_get(File.basename(config, '.rb').capitalize) - end -else - require RAILS_ROOT + "/config/environment" - inner_app = ActionController::Dispatcher.new -end - -if options[:path].nil? - map_path = "/" -else - ActionController::Base.relative_url_root = options[:path] - map_path = options[:path] -end - app = Rack::Builder.new { use Rails::Rack::LogTailer unless options[:detach] use Rails::Rack::Debugger if options[:debugger] - map map_path do - use Rails::Rack::Static - run inner_app - end + run ActionDispatch::Utils.parse_config(options[:config]) }.to_app puts "=> Call with -d to detach" diff --git a/railties/lib/commands/update.rb b/railties/lib/rails/commands/update.rb index f3b3ad0775..f3b3ad0775 100644 --- a/railties/lib/commands/update.rb +++ b/railties/lib/rails/commands/update.rb diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb index 2b362a9c50..4a70a4800e 100644 --- a/railties/lib/rails/configuration.rb +++ b/railties/lib/rails/configuration.rb @@ -10,7 +10,7 @@ module Rails :log_path, :log_level, :logger, :preload_frameworks, :database_configuration_file, :cache_store, :time_zone, :view_path, :metals, :controller_paths, :routes_configuration_file, - :eager_load_paths, :dependency_loading, :paths + :eager_load_paths, :dependency_loading, :paths, :serve_static_assets def initialize set_root_path! @@ -35,6 +35,7 @@ module Rails @controller_paths = default_controller_paths @routes_configuration_file = default_routes_configuration_file @database_configuration_file = default_database_configuration_file + @serve_static_assets = default_serve_static_assets for framework in default_frameworks self.send("#{framework}=", Rails::OrderedOptions.new) @@ -107,10 +108,9 @@ module Rails defined?(::RAILS_FRAMEWORK_ROOT) ? ::RAILS_FRAMEWORK_ROOT : "#{root_path}/vendor/rails" end - # TODO: Fix this when there is an application object def middleware - require 'action_controller' - ActionController::Dispatcher.middleware + require 'action_dispatch' + @middleware ||= ActionDispatch::MiddlewareStack.new end # Loads and returns the contents of the #database_configuration_file. The @@ -225,6 +225,10 @@ module Rails i18n end + def default_serve_static_assets + true + end + # Adds a single Gem dependency to the rails application. By default, it will require # the library with the same name as the gem. Use :lib to specify a different name. # diff --git a/railties/lib/console_app.rb b/railties/lib/rails/console_app.rb index 75e6f11ea3..1ad62e5058 100644 --- a/railties/lib/console_app.rb +++ b/railties/lib/rails/console_app.rb @@ -17,7 +17,8 @@ end # create a new session. If a block is given, the new session will be yielded # to the block before being returned. def new_session - session = ActionController::Integration::Session.new + app = ActionController::Dispatcher.new + session = ActionController::Integration::Session.new(app) yield session if block_given? session end @@ -25,7 +26,7 @@ end #reloads the environment def reload! puts "Reloading..." - ActionController::Dispatcher.new - ActionController::Dispatcher.router.reload + ActionDispatch::Callbacks.new(lambda {}, true) + ActionController::Routing::Routes.reload true end diff --git a/railties/lib/console_sandbox.rb b/railties/lib/rails/console_sandbox.rb index 65a3d68619..65a3d68619 100644 --- a/railties/lib/console_sandbox.rb +++ b/railties/lib/rails/console_sandbox.rb diff --git a/railties/lib/console_with_helpers.rb b/railties/lib/rails/console_with_helpers.rb index 039db667c4..039db667c4 100644 --- a/railties/lib/console_with_helpers.rb +++ b/railties/lib/rails/console_with_helpers.rb diff --git a/railties/lib/rails/core.rb b/railties/lib/rails/core.rb index 33695a27b9..4be90de792 100644 --- a/railties/lib/rails/core.rb +++ b/railties/lib/rails/core.rb @@ -5,6 +5,14 @@ module Rails # --- # TODO: w0t? class << self + def application + @@application + end + + def application=(application) + @@application = application + end + # The Configuration instance used to configure the Rails environment def configuration @@configuration diff --git a/railties/lib/dispatcher.rb b/railties/lib/rails/dispatcher.rb index 7f9a6221d9..7f9a6221d9 100644 --- a/railties/lib/dispatcher.rb +++ b/railties/lib/rails/dispatcher.rb diff --git a/railties/lib/fcgi_handler.rb b/railties/lib/rails/fcgi_handler.rb index 0cd2dc51c6..ef6f3b094c 100644 --- a/railties/lib/fcgi_handler.rb +++ b/railties/lib/rails/fcgi_handler.rb @@ -1,6 +1,6 @@ require 'fcgi' require 'logger' -require 'dispatcher' +require 'rails/dispatcher' require 'rbconfig' class RailsFCGIHandler diff --git a/railties/lib/generators.rb b/railties/lib/rails/generators.rb index 2a196f65ea..0419a4e36c 100644 --- a/railties/lib/generators.rb +++ b/railties/lib/rails/generators.rb @@ -8,10 +8,10 @@ require 'active_support/core_ext/hash' require 'active_support/core_ext/module/attribute_accessors' require 'active_support/core_ext/string/inflections' -$LOAD_PATH.unshift(File.dirname(__FILE__)) +# TODO: Do not always push on vendored thor $LOAD_PATH.unshift("#{File.dirname(__FILE__)}/vendor/thor-0.11.6/lib") -require 'generators/base' -require 'generators/named_base' +require 'rails/generators/base' +require 'rails/generators/named_base' module Rails module Generators diff --git a/railties/lib/generators/actions.rb b/railties/lib/rails/generators/actions.rb index c4552dd399..c4552dd399 100644 --- a/railties/lib/generators/actions.rb +++ b/railties/lib/rails/generators/actions.rb diff --git a/railties/lib/generators/active_model.rb b/railties/lib/rails/generators/active_model.rb index 1a849a0e02..1a849a0e02 100644 --- a/railties/lib/generators/active_model.rb +++ b/railties/lib/rails/generators/active_model.rb diff --git a/railties/lib/generators/active_record.rb b/railties/lib/rails/generators/active_record.rb index ff3093f356..c03ea59c1b 100644 --- a/railties/lib/generators/active_record.rb +++ b/railties/lib/rails/generators/active_record.rb @@ -1,6 +1,6 @@ -require 'generators/named_base' -require 'generators/migration' -require 'generators/active_model' +require 'rails/generators/named_base' +require 'rails/generators/migration' +require 'rails/generators/active_model' module ActiveRecord module Generators diff --git a/railties/lib/generators/active_record/migration/migration_generator.rb b/railties/lib/rails/generators/active_record/migration/migration_generator.rb index 7939977f72..f6159deeeb 100644 --- a/railties/lib/generators/active_record/migration/migration_generator.rb +++ b/railties/lib/rails/generators/active_record/migration/migration_generator.rb @@ -1,4 +1,4 @@ -require 'generators/active_record' +require 'rails/generators/active_record' module ActiveRecord module Generators diff --git a/railties/lib/generators/active_record/migration/templates/migration.rb b/railties/lib/rails/generators/active_record/migration/templates/migration.rb index bbb7c53d86..bbb7c53d86 100644 --- a/railties/lib/generators/active_record/migration/templates/migration.rb +++ b/railties/lib/rails/generators/active_record/migration/templates/migration.rb diff --git a/railties/lib/generators/active_record/model/model_generator.rb b/railties/lib/rails/generators/active_record/model/model_generator.rb index 2641083e0d..3e72fbeca8 100644 --- a/railties/lib/generators/active_record/model/model_generator.rb +++ b/railties/lib/rails/generators/active_record/model/model_generator.rb @@ -1,4 +1,4 @@ -require 'generators/active_record' +require 'rails/generators/active_record' module ActiveRecord module Generators diff --git a/railties/lib/generators/active_record/model/templates/migration.rb b/railties/lib/rails/generators/active_record/model/templates/migration.rb index 1f68487304..1f68487304 100644 --- a/railties/lib/generators/active_record/model/templates/migration.rb +++ b/railties/lib/rails/generators/active_record/model/templates/migration.rb diff --git a/railties/lib/generators/active_record/model/templates/model.rb b/railties/lib/rails/generators/active_record/model/templates/model.rb index 21ae29e9f2..21ae29e9f2 100644 --- a/railties/lib/generators/active_record/model/templates/model.rb +++ b/railties/lib/rails/generators/active_record/model/templates/model.rb diff --git a/railties/lib/generators/active_record/observer/observer_generator.rb b/railties/lib/rails/generators/active_record/observer/observer_generator.rb index a6b57423b8..c1c0e3f25b 100644 --- a/railties/lib/generators/active_record/observer/observer_generator.rb +++ b/railties/lib/rails/generators/active_record/observer/observer_generator.rb @@ -1,4 +1,4 @@ -require 'generators/active_record' +require 'rails/generators/active_record' module ActiveRecord module Generators diff --git a/railties/lib/generators/active_record/observer/templates/observer.rb b/railties/lib/rails/generators/active_record/observer/templates/observer.rb index b9a3004161..b9a3004161 100644 --- a/railties/lib/generators/active_record/observer/templates/observer.rb +++ b/railties/lib/rails/generators/active_record/observer/templates/observer.rb diff --git a/railties/lib/generators/active_record/session_migration/session_migration_generator.rb b/railties/lib/rails/generators/active_record/session_migration/session_migration_generator.rb index 59c4792066..afcda2a98a 100644 --- a/railties/lib/generators/active_record/session_migration/session_migration_generator.rb +++ b/railties/lib/rails/generators/active_record/session_migration/session_migration_generator.rb @@ -1,4 +1,4 @@ -require 'generators/active_record' +require 'rails/generators/active_record' module ActiveRecord module Generators diff --git a/railties/lib/generators/active_record/session_migration/templates/migration.rb b/railties/lib/rails/generators/active_record/session_migration/templates/migration.rb index 919822af7b..919822af7b 100644 --- a/railties/lib/generators/active_record/session_migration/templates/migration.rb +++ b/railties/lib/rails/generators/active_record/session_migration/templates/migration.rb diff --git a/railties/lib/generators/base.rb b/railties/lib/rails/generators/base.rb index cb6a129264..720caa5b3f 100644 --- a/railties/lib/generators/base.rb +++ b/railties/lib/rails/generators/base.rb @@ -1,5 +1,5 @@ require 'thor' -require 'generators/actions' +require 'rails/generators/actions' module Rails module Generators diff --git a/railties/lib/generators/erb.rb b/railties/lib/rails/generators/erb.rb index 43d47109c7..d468d012dc 100644 --- a/railties/lib/generators/erb.rb +++ b/railties/lib/rails/generators/erb.rb @@ -1,4 +1,4 @@ -require 'generators/named_base' +require 'rails/generators/named_base' module Erb module Generators diff --git a/railties/lib/generators/erb/controller/controller_generator.rb b/railties/lib/rails/generators/erb/controller/controller_generator.rb index ab7b273662..f8780d9c33 100644 --- a/railties/lib/generators/erb/controller/controller_generator.rb +++ b/railties/lib/rails/generators/erb/controller/controller_generator.rb @@ -1,4 +1,4 @@ -require 'generators/erb' +require 'rails/generators/erb' module Erb module Generators diff --git a/railties/lib/generators/erb/controller/templates/view.html.erb b/railties/lib/rails/generators/erb/controller/templates/view.html.erb index cd54d13d83..cd54d13d83 100644 --- a/railties/lib/generators/erb/controller/templates/view.html.erb +++ b/railties/lib/rails/generators/erb/controller/templates/view.html.erb diff --git a/railties/lib/generators/erb/mailer/mailer_generator.rb b/railties/lib/rails/generators/erb/mailer/mailer_generator.rb index 4ec2f4c9f4..5266259e2f 100644 --- a/railties/lib/generators/erb/mailer/mailer_generator.rb +++ b/railties/lib/rails/generators/erb/mailer/mailer_generator.rb @@ -1,4 +1,4 @@ -require 'generators/erb' +require 'rails/generators/erb' module Erb module Generators diff --git a/railties/lib/generators/erb/mailer/templates/view.erb b/railties/lib/rails/generators/erb/mailer/templates/view.erb index fcce7bd805..fcce7bd805 100644 --- a/railties/lib/generators/erb/mailer/templates/view.erb +++ b/railties/lib/rails/generators/erb/mailer/templates/view.erb diff --git a/railties/lib/generators/erb/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb index d51dc7d725..de5b0e9c5d 100644 --- a/railties/lib/generators/erb/scaffold/scaffold_generator.rb +++ b/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb @@ -1,5 +1,5 @@ -require 'generators/erb' -require 'generators/resource_helpers' +require 'rails/generators/erb' +require 'rails/generators/resource_helpers' module Erb module Generators diff --git a/railties/lib/generators/erb/scaffold/templates/_form.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb index d02028d983..d02028d983 100644 --- a/railties/lib/generators/erb/scaffold/templates/_form.html.erb +++ b/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb diff --git a/railties/lib/generators/erb/scaffold/templates/edit.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/edit.html.erb index 5bc507ffc8..5bc507ffc8 100644 --- a/railties/lib/generators/erb/scaffold/templates/edit.html.erb +++ b/railties/lib/rails/generators/erb/scaffold/templates/edit.html.erb diff --git a/railties/lib/generators/erb/scaffold/templates/index.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/index.html.erb index 5e6a4af9e0..5e6a4af9e0 100644 --- a/railties/lib/generators/erb/scaffold/templates/index.html.erb +++ b/railties/lib/rails/generators/erb/scaffold/templates/index.html.erb diff --git a/railties/lib/generators/erb/scaffold/templates/layout.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/layout.html.erb index 6460e5b599..6460e5b599 100644 --- a/railties/lib/generators/erb/scaffold/templates/layout.html.erb +++ b/railties/lib/rails/generators/erb/scaffold/templates/layout.html.erb diff --git a/railties/lib/generators/erb/scaffold/templates/new.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/new.html.erb index 9a1c489331..9a1c489331 100644 --- a/railties/lib/generators/erb/scaffold/templates/new.html.erb +++ b/railties/lib/rails/generators/erb/scaffold/templates/new.html.erb diff --git a/railties/lib/generators/erb/scaffold/templates/show.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/show.html.erb index 25567957be..25567957be 100644 --- a/railties/lib/generators/erb/scaffold/templates/show.html.erb +++ b/railties/lib/rails/generators/erb/scaffold/templates/show.html.erb diff --git a/railties/lib/generators/generated_attribute.rb b/railties/lib/rails/generators/generated_attribute.rb index e962308585..e962308585 100644 --- a/railties/lib/generators/generated_attribute.rb +++ b/railties/lib/rails/generators/generated_attribute.rb diff --git a/railties/lib/generators/migration.rb b/railties/lib/rails/generators/migration.rb index 0a9151ecdf..0a9151ecdf 100644 --- a/railties/lib/generators/migration.rb +++ b/railties/lib/rails/generators/migration.rb diff --git a/railties/lib/generators/named_base.rb b/railties/lib/rails/generators/named_base.rb index b6ac05f482..0e5976f915 100644 --- a/railties/lib/generators/named_base.rb +++ b/railties/lib/rails/generators/named_base.rb @@ -1,5 +1,5 @@ -require 'generators/base' -require 'generators/generated_attribute' +require 'rails/generators/base' +require 'rails/generators/generated_attribute' module Rails module Generators diff --git a/railties/lib/generators/rails/app/USAGE b/railties/lib/rails/generators/rails/app/USAGE index 36d6061a59..36d6061a59 100644 --- a/railties/lib/generators/rails/app/USAGE +++ b/railties/lib/rails/generators/rails/app/USAGE diff --git a/railties/lib/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index 24c9a969f9..b2322f90b4 100644 --- a/railties/lib/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -56,6 +56,7 @@ module Rails::Generators def create_root_files copy_file "Rakefile" copy_file "README" + copy_file "config.ru" end def create_app_files @@ -114,7 +115,6 @@ module Rails::Generators def create_dispatch_files return unless options[:with_dispatchers] - copy_file "dispatchers/config.ru", "config.ru" template "dispatchers/dispatch.rb", "public/dispatch.rb" chmod "public/dispatch.rb", 0755, :verbose => false diff --git a/railties/lib/generators/rails/app/templates/README b/railties/lib/rails/generators/rails/app/templates/README index 37ec8ea211..37ec8ea211 100644 --- a/railties/lib/generators/rails/app/templates/README +++ b/railties/lib/rails/generators/rails/app/templates/README diff --git a/railties/lib/generators/rails/app/templates/Rakefile b/railties/lib/rails/generators/rails/app/templates/Rakefile index 3bb0e8592a..bd4dec5389 100755 --- a/railties/lib/generators/rails/app/templates/Rakefile +++ b/railties/lib/rails/generators/rails/app/templates/Rakefile @@ -7,4 +7,4 @@ require 'rake' require 'rake/testtask' require 'rake/rdoctask' -require 'tasks/rails' +require 'rails/tasks' diff --git a/railties/lib/generators/rails/app/templates/app/controllers/application_controller.rb b/railties/lib/rails/generators/rails/app/templates/app/controllers/application_controller.rb index 6635a3f487..6635a3f487 100644 --- a/railties/lib/generators/rails/app/templates/app/controllers/application_controller.rb +++ b/railties/lib/rails/generators/rails/app/templates/app/controllers/application_controller.rb diff --git a/railties/lib/generators/rails/app/templates/app/helpers/application_helper.rb b/railties/lib/rails/generators/rails/app/templates/app/helpers/application_helper.rb index 22a7940eb2..22a7940eb2 100644 --- a/railties/lib/generators/rails/app/templates/app/helpers/application_helper.rb +++ b/railties/lib/rails/generators/rails/app/templates/app/helpers/application_helper.rb diff --git a/railties/lib/generators/rails/app/templates/app/models/.empty_directory b/railties/lib/rails/generators/rails/app/templates/app/models/.empty_directory index e69de29bb2..e69de29bb2 100644 --- a/railties/lib/generators/rails/app/templates/app/models/.empty_directory +++ b/railties/lib/rails/generators/rails/app/templates/app/models/.empty_directory diff --git a/railties/lib/generators/rails/app/templates/app/views/layouts/.empty_directory b/railties/lib/rails/generators/rails/app/templates/app/views/layouts/.empty_directory index e69de29bb2..e69de29bb2 100644 --- a/railties/lib/generators/rails/app/templates/app/views/layouts/.empty_directory +++ b/railties/lib/rails/generators/rails/app/templates/app/views/layouts/.empty_directory diff --git a/railties/lib/rails/generators/rails/app/templates/config.ru b/railties/lib/rails/generators/rails/app/templates/config.ru new file mode 100644 index 0000000000..50ee033d44 --- /dev/null +++ b/railties/lib/rails/generators/rails/app/templates/config.ru @@ -0,0 +1,5 @@ +# Require your environment file to bootstrap Rails +require ::File.dirname(__FILE__) + '/config/environment' + +# Dispatch the request +run Rails.application.new diff --git a/railties/lib/generators/rails/app/templates/config/boot.rb b/railties/lib/rails/generators/rails/app/templates/config/boot.rb index dd5e3b6916..52086fbc7d 100644 --- a/railties/lib/generators/rails/app/templates/config/boot.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/boot.rb @@ -4,6 +4,11 @@ RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT) module Rails + # Mark the version of Rails that generated the boot.rb file. This is + # a temporary solution and will most likely be removed as Rails 3.0 + # comes closer. + BOOTSTRAP_VERSION = "3.0" + class << self def boot! unless booted? @@ -36,23 +41,57 @@ module Rails class Boot def run load_initializer - Rails::Initializer.run(:set_load_path) + set_load_paths + end + + def set_load_paths + %w( + railties + railties/lib + activesupport/lib + actionpack/lib + activerecord/lib + actionmailer/lib + activeresource/lib + actionwebservice/lib + ).reverse_each do |path| + path = "#{framework_root_path}/#{path}" + $LOAD_PATH.unshift(path) if File.directory?(path) + $LOAD_PATH.uniq! + end + end + + def framework_root_path + defined?(::RAILS_FRAMEWORK_ROOT) ? ::RAILS_FRAMEWORK_ROOT : "#{RAILS_ROOT}/vendor/rails" end end class VendorBoot < Boot def load_initializer - require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer" - Rails::Initializer.run(:install_gem_spec_stubs) + $:.unshift("#{framework_root_path}/railties/lib") + require "rails" + install_gem_spec_stubs Rails::GemDependency.add_frozen_gem_path end + + def install_gem_spec_stubs + begin; require "rubygems"; rescue LoadError; return; end + + %w(rails activesupport activerecord actionpack actionmailer activeresource).each do |stub| + Gem.loaded_specs[stub] ||= Gem::Specification.new do |s| + s.name = stub + s.version = Rails::VERSION::STRING + s.loaded_from = "" + end + end + end end class GemBoot < Boot def load_initializer self.class.load_rubygems load_rails_gem - require 'initializer' + require 'rails' end def load_rails_gem diff --git a/railties/lib/generators/rails/app/templates/config/databases/frontbase.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/frontbase.yml index c0c3588be1..c0c3588be1 100644 --- a/railties/lib/generators/rails/app/templates/config/databases/frontbase.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/frontbase.yml diff --git a/railties/lib/generators/rails/app/templates/config/databases/ibm_db.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml index a9716ddb44..a9716ddb44 100644 --- a/railties/lib/generators/rails/app/templates/config/databases/ibm_db.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml diff --git a/railties/lib/generators/rails/app/templates/config/databases/mysql.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml index 6bf2f7b1fd..6bf2f7b1fd 100644 --- a/railties/lib/generators/rails/app/templates/config/databases/mysql.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml diff --git a/railties/lib/generators/rails/app/templates/config/databases/oracle.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml index a1883f6256..a1883f6256 100644 --- a/railties/lib/generators/rails/app/templates/config/databases/oracle.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml diff --git a/railties/lib/generators/rails/app/templates/config/databases/postgresql.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml index f600e054cf..f600e054cf 100644 --- a/railties/lib/generators/rails/app/templates/config/databases/postgresql.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml diff --git a/railties/lib/generators/rails/app/templates/config/databases/sqlite3.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml index 025d62a8d8..025d62a8d8 100644 --- a/railties/lib/generators/rails/app/templates/config/databases/sqlite3.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml diff --git a/railties/lib/generators/rails/app/templates/config/environment.rb b/railties/lib/rails/generators/rails/app/templates/config/environment.rb index adb3a3060a..adb3a3060a 100644 --- a/railties/lib/generators/rails/app/templates/config/environment.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/environment.rb diff --git a/railties/lib/generators/rails/app/templates/config/environments/development.rb b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb index 85c9a6080e..85c9a6080e 100644 --- a/railties/lib/generators/rails/app/templates/config/environments/development.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb diff --git a/railties/lib/generators/rails/app/templates/config/environments/production.rb b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb index 1fc9f6b923..377b9207c7 100644 --- a/railties/lib/generators/rails/app/templates/config/environments/production.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb @@ -17,6 +17,10 @@ config.action_controller.perform_caching = true # Use a different cache store in production # config.cache_store = :mem_cache_store +# Disable Rails's static asset server +# In production, Apache or nginx will already do this +config.serve_static_assets = false + # Enable serving of images, stylesheets, and javascripts from an asset server # config.action_controller.asset_host = "http://assets.example.com" @@ -24,4 +28,4 @@ config.action_controller.perform_caching = true # config.action_mailer.raise_delivery_errors = false # Enable threaded mode -# config.threadsafe!
\ No newline at end of file +# config.threadsafe! diff --git a/railties/lib/generators/rails/app/templates/config/environments/test.rb b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb index 496eb9572b..496eb9572b 100644 --- a/railties/lib/generators/rails/app/templates/config/environments/test.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb diff --git a/railties/lib/generators/rails/app/templates/config/initializers/backtrace_silencers.rb b/railties/lib/rails/generators/rails/app/templates/config/initializers/backtrace_silencers.rb index 839d4cde19..839d4cde19 100644 --- a/railties/lib/generators/rails/app/templates/config/initializers/backtrace_silencers.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/backtrace_silencers.rb diff --git a/railties/lib/generators/rails/app/templates/config/initializers/inflections.rb b/railties/lib/rails/generators/rails/app/templates/config/initializers/inflections.rb index d531b8bb82..d531b8bb82 100644 --- a/railties/lib/generators/rails/app/templates/config/initializers/inflections.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/inflections.rb diff --git a/railties/lib/generators/rails/app/templates/config/initializers/mime_types.rb b/railties/lib/rails/generators/rails/app/templates/config/initializers/mime_types.rb index 72aca7e441..72aca7e441 100644 --- a/railties/lib/generators/rails/app/templates/config/initializers/mime_types.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/mime_types.rb diff --git a/railties/lib/generators/rails/app/templates/config/initializers/new_rails_defaults.rb b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_rails_defaults.rb index 8ec3186c84..8ec3186c84 100644 --- a/railties/lib/generators/rails/app/templates/config/initializers/new_rails_defaults.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_rails_defaults.rb diff --git a/railties/lib/generators/rails/app/templates/config/initializers/session_store.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt index 4499ab84b6..4499ab84b6 100644 --- a/railties/lib/generators/rails/app/templates/config/initializers/session_store.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt diff --git a/railties/lib/generators/rails/app/templates/config/locales/en.yml b/railties/lib/rails/generators/rails/app/templates/config/locales/en.yml index f265c068d8..f265c068d8 100644 --- a/railties/lib/generators/rails/app/templates/config/locales/en.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/locales/en.yml diff --git a/railties/lib/generators/rails/app/templates/config/routes.rb b/railties/lib/rails/generators/rails/app/templates/config/routes.rb index ea14ce1bfc..ea14ce1bfc 100644 --- a/railties/lib/generators/rails/app/templates/config/routes.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/routes.rb diff --git a/railties/lib/generators/rails/app/templates/db/seeds.rb b/railties/lib/rails/generators/rails/app/templates/db/seeds.rb index bc8695e6f0..bc8695e6f0 100644 --- a/railties/lib/generators/rails/app/templates/db/seeds.rb +++ b/railties/lib/rails/generators/rails/app/templates/db/seeds.rb diff --git a/railties/lib/generators/rails/app/templates/dispatchers/dispatch.fcgi b/railties/lib/rails/generators/rails/app/templates/dispatchers/dispatch.fcgi index f5b3b71875..f5b3b71875 100755 --- a/railties/lib/generators/rails/app/templates/dispatchers/dispatch.fcgi +++ b/railties/lib/rails/generators/rails/app/templates/dispatchers/dispatch.fcgi diff --git a/railties/lib/generators/rails/app/templates/dispatchers/dispatch.rb b/railties/lib/rails/generators/rails/app/templates/dispatchers/dispatch.rb index 48e888113a..48e888113a 100755 --- a/railties/lib/generators/rails/app/templates/dispatchers/dispatch.rb +++ b/railties/lib/rails/generators/rails/app/templates/dispatchers/dispatch.rb diff --git a/railties/lib/generators/rails/app/templates/dispatchers/gateway.cgi b/railties/lib/rails/generators/rails/app/templates/dispatchers/gateway.cgi index bdc1055a22..bdc1055a22 100755 --- a/railties/lib/generators/rails/app/templates/dispatchers/gateway.cgi +++ b/railties/lib/rails/generators/rails/app/templates/dispatchers/gateway.cgi diff --git a/railties/lib/generators/rails/app/templates/doc/README_FOR_APP b/railties/lib/rails/generators/rails/app/templates/doc/README_FOR_APP index fe41f5cc24..fe41f5cc24 100644 --- a/railties/lib/generators/rails/app/templates/doc/README_FOR_APP +++ b/railties/lib/rails/generators/rails/app/templates/doc/README_FOR_APP diff --git a/railties/lib/generators/rails/app/templates/public/404.html b/railties/lib/rails/generators/rails/app/templates/public/404.html index 88ee108e90..88ee108e90 100644 --- a/railties/lib/generators/rails/app/templates/public/404.html +++ b/railties/lib/rails/generators/rails/app/templates/public/404.html diff --git a/railties/lib/generators/rails/app/templates/public/422.html b/railties/lib/rails/generators/rails/app/templates/public/422.html index 9c3c96670b..9c3c96670b 100644 --- a/railties/lib/generators/rails/app/templates/public/422.html +++ b/railties/lib/rails/generators/rails/app/templates/public/422.html diff --git a/railties/lib/generators/rails/app/templates/public/500.html b/railties/lib/rails/generators/rails/app/templates/public/500.html index f71c86e652..f71c86e652 100644 --- a/railties/lib/generators/rails/app/templates/public/500.html +++ b/railties/lib/rails/generators/rails/app/templates/public/500.html diff --git a/railties/lib/generators/rails/app/templates/public/favicon.ico b/railties/lib/rails/generators/rails/app/templates/public/favicon.ico index e69de29bb2..e69de29bb2 100644 --- a/railties/lib/generators/rails/app/templates/public/favicon.ico +++ b/railties/lib/rails/generators/rails/app/templates/public/favicon.ico diff --git a/railties/lib/generators/rails/app/templates/public/images/rails.png b/railties/lib/rails/generators/rails/app/templates/public/images/rails.png Binary files differindex d5edc04e65..d5edc04e65 100644 --- a/railties/lib/generators/rails/app/templates/public/images/rails.png +++ b/railties/lib/rails/generators/rails/app/templates/public/images/rails.png diff --git a/railties/lib/generators/rails/app/templates/public/index.html b/railties/lib/rails/generators/rails/app/templates/public/index.html index ff2dfd3193..ff2dfd3193 100644 --- a/railties/lib/generators/rails/app/templates/public/index.html +++ b/railties/lib/rails/generators/rails/app/templates/public/index.html diff --git a/railties/lib/generators/rails/app/templates/public/javascripts/application.js b/railties/lib/rails/generators/rails/app/templates/public/javascripts/application.js index fe4577696b..fe4577696b 100644 --- a/railties/lib/generators/rails/app/templates/public/javascripts/application.js +++ b/railties/lib/rails/generators/rails/app/templates/public/javascripts/application.js diff --git a/railties/lib/generators/rails/app/templates/public/javascripts/controls.js b/railties/lib/rails/generators/rails/app/templates/public/javascripts/controls.js index ca29aefdd1..ca29aefdd1 100644 --- a/railties/lib/generators/rails/app/templates/public/javascripts/controls.js +++ b/railties/lib/rails/generators/rails/app/templates/public/javascripts/controls.js diff --git a/railties/lib/generators/rails/app/templates/public/javascripts/dragdrop.js b/railties/lib/rails/generators/rails/app/templates/public/javascripts/dragdrop.js index 07229f986f..07229f986f 100644 --- a/railties/lib/generators/rails/app/templates/public/javascripts/dragdrop.js +++ b/railties/lib/rails/generators/rails/app/templates/public/javascripts/dragdrop.js diff --git a/railties/lib/generators/rails/app/templates/public/javascripts/effects.js b/railties/lib/rails/generators/rails/app/templates/public/javascripts/effects.js index 5a639d2dea..5a639d2dea 100644 --- a/railties/lib/generators/rails/app/templates/public/javascripts/effects.js +++ b/railties/lib/rails/generators/rails/app/templates/public/javascripts/effects.js diff --git a/railties/lib/generators/rails/app/templates/public/javascripts/prototype.js b/railties/lib/rails/generators/rails/app/templates/public/javascripts/prototype.js index dfe8ab4e13..dfe8ab4e13 100644 --- a/railties/lib/generators/rails/app/templates/public/javascripts/prototype.js +++ b/railties/lib/rails/generators/rails/app/templates/public/javascripts/prototype.js diff --git a/railties/lib/generators/rails/app/templates/public/robots.txt b/railties/lib/rails/generators/rails/app/templates/public/robots.txt index 085187fa58..085187fa58 100644 --- a/railties/lib/generators/rails/app/templates/public/robots.txt +++ b/railties/lib/rails/generators/rails/app/templates/public/robots.txt diff --git a/railties/lib/generators/rails/app/templates/public/stylesheets/.empty_directory b/railties/lib/rails/generators/rails/app/templates/public/stylesheets/.empty_directory index e69de29bb2..e69de29bb2 100644 --- a/railties/lib/generators/rails/app/templates/public/stylesheets/.empty_directory +++ b/railties/lib/rails/generators/rails/app/templates/public/stylesheets/.empty_directory diff --git a/railties/lib/generators/rails/app/templates/script/about.tt b/railties/lib/rails/generators/rails/app/templates/script/about.tt index afbab8b533..1220676c08 100755 --- a/railties/lib/generators/rails/app/templates/script/about.tt +++ b/railties/lib/rails/generators/rails/app/templates/script/about.tt @@ -1,4 +1,4 @@ <%= shebang %> require File.expand_path('../../config/boot', __FILE__) $LOAD_PATH.unshift "#{RAILTIES_PATH}/builtin/rails_info" -require 'commands/about' +require 'rails/commands/about' diff --git a/railties/lib/generators/rails/app/templates/script/console.tt b/railties/lib/rails/generators/rails/app/templates/script/console.tt index 2f8b95c923..5aec193853 100755 --- a/railties/lib/generators/rails/app/templates/script/console.tt +++ b/railties/lib/rails/generators/rails/app/templates/script/console.tt @@ -1,3 +1,3 @@ <%= shebang %> require File.expand_path('../../config/boot', __FILE__) -require 'commands/console' +require 'rails/commands/console' diff --git a/railties/lib/generators/rails/app/templates/script/dbconsole.tt b/railties/lib/rails/generators/rails/app/templates/script/dbconsole.tt index 7dce6d16dd..632563f470 100755 --- a/railties/lib/generators/rails/app/templates/script/dbconsole.tt +++ b/railties/lib/rails/generators/rails/app/templates/script/dbconsole.tt @@ -1,3 +1,3 @@ <%= shebang %> require File.expand_path('../../config/boot', __FILE__) -require 'commands/dbconsole' +require 'rails/commands/dbconsole' diff --git a/railties/lib/generators/rails/app/templates/script/destroy.tt b/railties/lib/rails/generators/rails/app/templates/script/destroy.tt index 053d3dea39..c5f94862c3 100755 --- a/railties/lib/generators/rails/app/templates/script/destroy.tt +++ b/railties/lib/rails/generators/rails/app/templates/script/destroy.tt @@ -1,3 +1,3 @@ <%= shebang %> require File.expand_path('../../config/boot', __FILE__) -require 'commands/destroy' +require 'rails/commands/destroy' diff --git a/railties/lib/generators/rails/app/templates/script/generate.tt b/railties/lib/rails/generators/rails/app/templates/script/generate.tt index ea4a0efd43..d466c94767 100755 --- a/railties/lib/generators/rails/app/templates/script/generate.tt +++ b/railties/lib/rails/generators/rails/app/templates/script/generate.tt @@ -1,3 +1,3 @@ <%= shebang %> require File.expand_path('../../config/boot', __FILE__) -require 'commands/generate' +require 'rails/commands/generate' diff --git a/railties/lib/generators/rails/app/templates/script/performance/benchmarker.tt b/railties/lib/rails/generators/rails/app/templates/script/performance/benchmarker.tt index da9df7fab9..3e03aaa767 100755 --- a/railties/lib/generators/rails/app/templates/script/performance/benchmarker.tt +++ b/railties/lib/rails/generators/rails/app/templates/script/performance/benchmarker.tt @@ -1,3 +1,3 @@ <%= shebang %> require File.expand_path('../../../config/boot', __FILE__) -require 'commands/performance/benchmarker' +require 'rails/commands/performance/benchmarker' diff --git a/railties/lib/generators/rails/app/templates/script/performance/profiler.tt b/railties/lib/rails/generators/rails/app/templates/script/performance/profiler.tt index 5a0e2b0c28..deada2f561 100755 --- a/railties/lib/generators/rails/app/templates/script/performance/profiler.tt +++ b/railties/lib/rails/generators/rails/app/templates/script/performance/profiler.tt @@ -1,3 +1,3 @@ <%= shebang %> require File.expand_path('../../../config/boot', __FILE__) -require 'commands/performance/profiler' +require 'rails/commands/performance/profiler' diff --git a/railties/lib/generators/rails/app/templates/script/plugin.tt b/railties/lib/rails/generators/rails/app/templates/script/plugin.tt index 68b2148bba..f4081f56b6 100755 --- a/railties/lib/generators/rails/app/templates/script/plugin.tt +++ b/railties/lib/rails/generators/rails/app/templates/script/plugin.tt @@ -1,3 +1,3 @@ <%= shebang %> require File.expand_path('../../config/boot', __FILE__) -require 'commands/plugin' +require 'rails/commands/plugin' diff --git a/railties/lib/generators/rails/app/templates/script/runner.tt b/railties/lib/rails/generators/rails/app/templates/script/runner.tt index a2b313fa32..60c8c0bba1 100755 --- a/railties/lib/generators/rails/app/templates/script/runner.tt +++ b/railties/lib/rails/generators/rails/app/templates/script/runner.tt @@ -1,3 +1,3 @@ <%= shebang %> require File.expand_path('../../config/boot', __FILE__) -require 'commands/runner' +require 'rails/commands/runner' diff --git a/railties/lib/generators/rails/app/templates/script/server.tt b/railties/lib/rails/generators/rails/app/templates/script/server.tt index c8868155f3..54e3346bec 100755 --- a/railties/lib/generators/rails/app/templates/script/server.tt +++ b/railties/lib/rails/generators/rails/app/templates/script/server.tt @@ -1,3 +1,3 @@ <%= shebang %> require File.expand_path('../../config/boot', __FILE__) -require 'commands/server' +require 'rails/commands/server' diff --git a/railties/lib/generators/rails/app/templates/test/fixtures/.empty_directory b/railties/lib/rails/generators/rails/app/templates/test/fixtures/.empty_directory index e69de29bb2..e69de29bb2 100644 --- a/railties/lib/generators/rails/app/templates/test/fixtures/.empty_directory +++ b/railties/lib/rails/generators/rails/app/templates/test/fixtures/.empty_directory diff --git a/railties/lib/generators/rails/app/templates/test/functional/.empty_directory b/railties/lib/rails/generators/rails/app/templates/test/functional/.empty_directory index e69de29bb2..e69de29bb2 100644 --- a/railties/lib/generators/rails/app/templates/test/functional/.empty_directory +++ b/railties/lib/rails/generators/rails/app/templates/test/functional/.empty_directory diff --git a/railties/lib/generators/rails/app/templates/test/integration/.empty_directory b/railties/lib/rails/generators/rails/app/templates/test/integration/.empty_directory index e69de29bb2..e69de29bb2 100644 --- a/railties/lib/generators/rails/app/templates/test/integration/.empty_directory +++ b/railties/lib/rails/generators/rails/app/templates/test/integration/.empty_directory diff --git a/railties/lib/generators/rails/app/templates/test/performance/browsing_test.rb b/railties/lib/rails/generators/rails/app/templates/test/performance/browsing_test.rb index 4b60558b43..4b60558b43 100644 --- a/railties/lib/generators/rails/app/templates/test/performance/browsing_test.rb +++ b/railties/lib/rails/generators/rails/app/templates/test/performance/browsing_test.rb diff --git a/railties/lib/generators/rails/app/templates/test/test_helper.rb b/railties/lib/rails/generators/rails/app/templates/test/test_helper.rb index b9fe2517c8..a16f587d8b 100644 --- a/railties/lib/generators/rails/app/templates/test/test_helper.rb +++ b/railties/lib/rails/generators/rails/app/templates/test/test_helper.rb @@ -1,6 +1,6 @@ ENV["RAILS_ENV"] = "test" require File.expand_path(File.dirname(__FILE__) + "/../config/environment") -require 'test_help' +require 'rails/test_help' class ActiveSupport::TestCase # Transactional fixtures accelerate your tests by wrapping each test method diff --git a/railties/lib/generators/rails/app/templates/test/unit/.empty_directory b/railties/lib/rails/generators/rails/app/templates/test/unit/.empty_directory index e69de29bb2..e69de29bb2 100644 --- a/railties/lib/generators/rails/app/templates/test/unit/.empty_directory +++ b/railties/lib/rails/generators/rails/app/templates/test/unit/.empty_directory diff --git a/railties/lib/generators/rails/controller/USAGE b/railties/lib/rails/generators/rails/controller/USAGE index 6ed4b2edfc..6ed4b2edfc 100644 --- a/railties/lib/generators/rails/controller/USAGE +++ b/railties/lib/rails/generators/rails/controller/USAGE diff --git a/railties/lib/generators/rails/controller/controller_generator.rb b/railties/lib/rails/generators/rails/controller/controller_generator.rb index 91470be833..91470be833 100644 --- a/railties/lib/generators/rails/controller/controller_generator.rb +++ b/railties/lib/rails/generators/rails/controller/controller_generator.rb diff --git a/railties/lib/generators/rails/controller/templates/controller.rb b/railties/lib/rails/generators/rails/controller/templates/controller.rb index cda2659e69..cda2659e69 100644 --- a/railties/lib/generators/rails/controller/templates/controller.rb +++ b/railties/lib/rails/generators/rails/controller/templates/controller.rb diff --git a/railties/lib/generators/rails/generator/USAGE b/railties/lib/rails/generators/rails/generator/USAGE index ca7d3f62d0..ca7d3f62d0 100644 --- a/railties/lib/generators/rails/generator/USAGE +++ b/railties/lib/rails/generators/rails/generator/USAGE diff --git a/railties/lib/generators/rails/generator/generator_generator.rb b/railties/lib/rails/generators/rails/generator/generator_generator.rb index 5b5d1884bc..5b5d1884bc 100644 --- a/railties/lib/generators/rails/generator/generator_generator.rb +++ b/railties/lib/rails/generators/rails/generator/generator_generator.rb diff --git a/railties/lib/generators/rails/generator/templates/%file_name%_generator.rb.tt b/railties/lib/rails/generators/rails/generator/templates/%file_name%_generator.rb.tt index 675f00043f..675f00043f 100644 --- a/railties/lib/generators/rails/generator/templates/%file_name%_generator.rb.tt +++ b/railties/lib/rails/generators/rails/generator/templates/%file_name%_generator.rb.tt diff --git a/railties/lib/generators/rails/generator/templates/USAGE.tt b/railties/lib/rails/generators/rails/generator/templates/USAGE.tt index ea9f4f12cc..ea9f4f12cc 100644 --- a/railties/lib/generators/rails/generator/templates/USAGE.tt +++ b/railties/lib/rails/generators/rails/generator/templates/USAGE.tt diff --git a/railties/lib/generators/rails/generator/templates/templates/.empty_directory b/railties/lib/rails/generators/rails/generator/templates/templates/.empty_directory index e69de29bb2..e69de29bb2 100644 --- a/railties/lib/generators/rails/generator/templates/templates/.empty_directory +++ b/railties/lib/rails/generators/rails/generator/templates/templates/.empty_directory diff --git a/railties/lib/generators/rails/helper/USAGE b/railties/lib/rails/generators/rails/helper/USAGE index 531c9b390a..531c9b390a 100644 --- a/railties/lib/generators/rails/helper/USAGE +++ b/railties/lib/rails/generators/rails/helper/USAGE diff --git a/railties/lib/generators/rails/helper/helper_generator.rb b/railties/lib/rails/generators/rails/helper/helper_generator.rb index ad66388591..ad66388591 100644 --- a/railties/lib/generators/rails/helper/helper_generator.rb +++ b/railties/lib/rails/generators/rails/helper/helper_generator.rb diff --git a/railties/lib/generators/rails/helper/templates/helper.rb b/railties/lib/rails/generators/rails/helper/templates/helper.rb index 3fe2ecdc74..3fe2ecdc74 100644 --- a/railties/lib/generators/rails/helper/templates/helper.rb +++ b/railties/lib/rails/generators/rails/helper/templates/helper.rb diff --git a/railties/lib/generators/rails/integration_test/USAGE b/railties/lib/rails/generators/rails/integration_test/USAGE index b76c35a702..b76c35a702 100644 --- a/railties/lib/generators/rails/integration_test/USAGE +++ b/railties/lib/rails/generators/rails/integration_test/USAGE diff --git a/railties/lib/generators/rails/integration_test/integration_test_generator.rb b/railties/lib/rails/generators/rails/integration_test/integration_test_generator.rb index 363a327fcb..363a327fcb 100644 --- a/railties/lib/generators/rails/integration_test/integration_test_generator.rb +++ b/railties/lib/rails/generators/rails/integration_test/integration_test_generator.rb diff --git a/railties/lib/generators/rails/mailer/USAGE b/railties/lib/rails/generators/rails/mailer/USAGE index c56095b2c8..c56095b2c8 100644 --- a/railties/lib/generators/rails/mailer/USAGE +++ b/railties/lib/rails/generators/rails/mailer/USAGE diff --git a/railties/lib/generators/rails/mailer/mailer_generator.rb b/railties/lib/rails/generators/rails/mailer/mailer_generator.rb index 33f1665b83..33f1665b83 100644 --- a/railties/lib/generators/rails/mailer/mailer_generator.rb +++ b/railties/lib/rails/generators/rails/mailer/mailer_generator.rb diff --git a/railties/lib/generators/rails/mailer/templates/mailer.rb b/railties/lib/rails/generators/rails/mailer/templates/mailer.rb index 90e0b712d6..90e0b712d6 100644 --- a/railties/lib/generators/rails/mailer/templates/mailer.rb +++ b/railties/lib/rails/generators/rails/mailer/templates/mailer.rb diff --git a/railties/lib/generators/rails/metal/USAGE b/railties/lib/rails/generators/rails/metal/USAGE index 123ec6c03f..123ec6c03f 100644 --- a/railties/lib/generators/rails/metal/USAGE +++ b/railties/lib/rails/generators/rails/metal/USAGE diff --git a/railties/lib/generators/rails/metal/metal_generator.rb b/railties/lib/rails/generators/rails/metal/metal_generator.rb index fe4f945cad..fe4f945cad 100644 --- a/railties/lib/generators/rails/metal/metal_generator.rb +++ b/railties/lib/rails/generators/rails/metal/metal_generator.rb diff --git a/railties/lib/generators/rails/metal/templates/metal.rb b/railties/lib/rails/generators/rails/metal/templates/metal.rb index e94982b69a..e94982b69a 100644 --- a/railties/lib/generators/rails/metal/templates/metal.rb +++ b/railties/lib/rails/generators/rails/metal/templates/metal.rb diff --git a/railties/lib/generators/rails/migration/USAGE b/railties/lib/rails/generators/rails/migration/USAGE index d91127aac3..d91127aac3 100644 --- a/railties/lib/generators/rails/migration/USAGE +++ b/railties/lib/rails/generators/rails/migration/USAGE diff --git a/railties/lib/generators/rails/migration/migration_generator.rb b/railties/lib/rails/generators/rails/migration/migration_generator.rb index 39fa5b63b1..39fa5b63b1 100644 --- a/railties/lib/generators/rails/migration/migration_generator.rb +++ b/railties/lib/rails/generators/rails/migration/migration_generator.rb diff --git a/railties/lib/generators/rails/model/USAGE b/railties/lib/rails/generators/rails/model/USAGE index b056d5df8b..b056d5df8b 100644 --- a/railties/lib/generators/rails/model/USAGE +++ b/railties/lib/rails/generators/rails/model/USAGE diff --git a/railties/lib/generators/rails/model/model_generator.rb b/railties/lib/rails/generators/rails/model/model_generator.rb index 629d5eed3f..629d5eed3f 100644 --- a/railties/lib/generators/rails/model/model_generator.rb +++ b/railties/lib/rails/generators/rails/model/model_generator.rb diff --git a/railties/lib/generators/rails/model_subclass/model_subclass_generator.rb b/railties/lib/rails/generators/rails/model_subclass/model_subclass_generator.rb index 4649709780..4649709780 100644 --- a/railties/lib/generators/rails/model_subclass/model_subclass_generator.rb +++ b/railties/lib/rails/generators/rails/model_subclass/model_subclass_generator.rb diff --git a/railties/lib/generators/rails/observer/USAGE b/railties/lib/rails/generators/rails/observer/USAGE index 9a20f55a89..9a20f55a89 100644 --- a/railties/lib/generators/rails/observer/USAGE +++ b/railties/lib/rails/generators/rails/observer/USAGE diff --git a/railties/lib/generators/rails/observer/observer_generator.rb b/railties/lib/rails/generators/rails/observer/observer_generator.rb index f5cedee91f..f5cedee91f 100644 --- a/railties/lib/generators/rails/observer/observer_generator.rb +++ b/railties/lib/rails/generators/rails/observer/observer_generator.rb diff --git a/railties/lib/generators/rails/performance_test/USAGE b/railties/lib/rails/generators/rails/performance_test/USAGE index ee82578cdb..ee82578cdb 100644 --- a/railties/lib/generators/rails/performance_test/USAGE +++ b/railties/lib/rails/generators/rails/performance_test/USAGE diff --git a/railties/lib/generators/rails/performance_test/performance_test_generator.rb b/railties/lib/rails/generators/rails/performance_test/performance_test_generator.rb index d1c71ab8ed..d1c71ab8ed 100644 --- a/railties/lib/generators/rails/performance_test/performance_test_generator.rb +++ b/railties/lib/rails/generators/rails/performance_test/performance_test_generator.rb diff --git a/railties/lib/generators/rails/plugin/USAGE b/railties/lib/rails/generators/rails/plugin/USAGE index 8a17fa4dec..8a17fa4dec 100644 --- a/railties/lib/generators/rails/plugin/USAGE +++ b/railties/lib/rails/generators/rails/plugin/USAGE diff --git a/railties/lib/generators/rails/plugin/plugin_generator.rb b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb index ee785caf7d..bc614bc5d3 100644 --- a/railties/lib/generators/rails/plugin/plugin_generator.rb +++ b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb @@ -1,4 +1,4 @@ -require 'generators/rails/generator/generator_generator' +require 'rails/generators/rails/generator/generator_generator' module Rails module Generators diff --git a/railties/lib/generators/rails/plugin/templates/MIT-LICENSE b/railties/lib/rails/generators/rails/plugin/templates/MIT-LICENSE index 8717df053d..8717df053d 100644 --- a/railties/lib/generators/rails/plugin/templates/MIT-LICENSE +++ b/railties/lib/rails/generators/rails/plugin/templates/MIT-LICENSE diff --git a/railties/lib/generators/rails/plugin/templates/README b/railties/lib/rails/generators/rails/plugin/templates/README index 702db07cb1..702db07cb1 100644 --- a/railties/lib/generators/rails/plugin/templates/README +++ b/railties/lib/rails/generators/rails/plugin/templates/README diff --git a/railties/lib/generators/rails/plugin/templates/Rakefile b/railties/lib/rails/generators/rails/plugin/templates/Rakefile index 85e8ff1834..85e8ff1834 100644 --- a/railties/lib/generators/rails/plugin/templates/Rakefile +++ b/railties/lib/rails/generators/rails/plugin/templates/Rakefile diff --git a/railties/lib/generators/rails/plugin/templates/init.rb b/railties/lib/rails/generators/rails/plugin/templates/init.rb index 3c19a743c9..3c19a743c9 100644 --- a/railties/lib/generators/rails/plugin/templates/init.rb +++ b/railties/lib/rails/generators/rails/plugin/templates/init.rb diff --git a/railties/lib/generators/rails/plugin/templates/install.rb b/railties/lib/rails/generators/rails/plugin/templates/install.rb index f7732d3796..f7732d3796 100644 --- a/railties/lib/generators/rails/plugin/templates/install.rb +++ b/railties/lib/rails/generators/rails/plugin/templates/install.rb diff --git a/railties/lib/generators/rails/plugin/templates/lib/%file_name%.rb.tt b/railties/lib/rails/generators/rails/plugin/templates/lib/%file_name%.rb.tt index d8d908a959..d8d908a959 100644 --- a/railties/lib/generators/rails/plugin/templates/lib/%file_name%.rb.tt +++ b/railties/lib/rails/generators/rails/plugin/templates/lib/%file_name%.rb.tt diff --git a/railties/lib/generators/rails/plugin/templates/tasks/%file_name%_tasks.rake.tt b/railties/lib/rails/generators/rails/plugin/templates/tasks/%file_name%_tasks.rake.tt index 72920a9d3a..72920a9d3a 100644 --- a/railties/lib/generators/rails/plugin/templates/tasks/%file_name%_tasks.rake.tt +++ b/railties/lib/rails/generators/rails/plugin/templates/tasks/%file_name%_tasks.rake.tt diff --git a/railties/lib/generators/rails/plugin/templates/uninstall.rb b/railties/lib/rails/generators/rails/plugin/templates/uninstall.rb index 9738333463..9738333463 100644 --- a/railties/lib/generators/rails/plugin/templates/uninstall.rb +++ b/railties/lib/rails/generators/rails/plugin/templates/uninstall.rb diff --git a/railties/lib/generators/rails/resource/USAGE b/railties/lib/rails/generators/rails/resource/USAGE index 936619b0db..936619b0db 100644 --- a/railties/lib/generators/rails/resource/USAGE +++ b/railties/lib/rails/generators/rails/resource/USAGE diff --git a/railties/lib/generators/rails/resource/resource_generator.rb b/railties/lib/rails/generators/rails/resource/resource_generator.rb index 9abb8bbeaf..e49f9aea1b 100644 --- a/railties/lib/generators/rails/resource/resource_generator.rb +++ b/railties/lib/rails/generators/rails/resource/resource_generator.rb @@ -1,5 +1,5 @@ -require 'generators/rails/model/model_generator' -require 'generators/resource_helpers' +require 'rails/generators/rails/model/model_generator' +require 'rails/generators/resource_helpers' module Rails module Generators diff --git a/railties/lib/generators/rails/scaffold/USAGE b/railties/lib/rails/generators/rails/scaffold/USAGE index 71edd2f469..71edd2f469 100644 --- a/railties/lib/generators/rails/scaffold/USAGE +++ b/railties/lib/rails/generators/rails/scaffold/USAGE diff --git a/railties/lib/generators/rails/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb index fdea5bf52b..779f933785 100644 --- a/railties/lib/generators/rails/scaffold/scaffold_generator.rb +++ b/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb @@ -1,4 +1,4 @@ -require 'generators/rails/resource/resource_generator' +require 'rails/generators/rails/resource/resource_generator' module Rails module Generators diff --git a/railties/lib/generators/rails/scaffold_controller/USAGE b/railties/lib/rails/generators/rails/scaffold_controller/USAGE index d60a3c3680..d60a3c3680 100644 --- a/railties/lib/generators/rails/scaffold_controller/USAGE +++ b/railties/lib/rails/generators/rails/scaffold_controller/USAGE diff --git a/railties/lib/generators/rails/scaffold_controller/scaffold_controller_generator.rb b/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb index 228cdecb14..e544e29892 100644 --- a/railties/lib/generators/rails/scaffold_controller/scaffold_controller_generator.rb +++ b/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb @@ -1,4 +1,4 @@ -require 'generators/resource_helpers' +require 'rails/generators/resource_helpers' module Rails module Generators diff --git a/railties/lib/generators/rails/scaffold_controller/templates/controller.rb b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb index 3cc8bbf8e7..3cc8bbf8e7 100644 --- a/railties/lib/generators/rails/scaffold_controller/templates/controller.rb +++ b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb diff --git a/railties/lib/generators/rails/session_migration/USAGE b/railties/lib/rails/generators/rails/session_migration/USAGE index e106f6ecc8..e106f6ecc8 100644 --- a/railties/lib/generators/rails/session_migration/USAGE +++ b/railties/lib/rails/generators/rails/session_migration/USAGE diff --git a/railties/lib/generators/rails/session_migration/session_migration_generator.rb b/railties/lib/rails/generators/rails/session_migration/session_migration_generator.rb index 258cc5b4a0..258cc5b4a0 100644 --- a/railties/lib/generators/rails/session_migration/session_migration_generator.rb +++ b/railties/lib/rails/generators/rails/session_migration/session_migration_generator.rb diff --git a/railties/lib/generators/rails/stylesheets/USAGE b/railties/lib/rails/generators/rails/stylesheets/USAGE index d6a81e51d0..d6a81e51d0 100644 --- a/railties/lib/generators/rails/stylesheets/USAGE +++ b/railties/lib/rails/generators/rails/stylesheets/USAGE diff --git a/railties/lib/generators/rails/stylesheets/stylesheets_generator.rb b/railties/lib/rails/generators/rails/stylesheets/stylesheets_generator.rb index ce68443c39..ce68443c39 100644 --- a/railties/lib/generators/rails/stylesheets/stylesheets_generator.rb +++ b/railties/lib/rails/generators/rails/stylesheets/stylesheets_generator.rb diff --git a/railties/lib/generators/rails/stylesheets/templates/scaffold.css b/railties/lib/rails/generators/rails/stylesheets/templates/scaffold.css index d9fa2cf2dc..d9fa2cf2dc 100644 --- a/railties/lib/generators/rails/stylesheets/templates/scaffold.css +++ b/railties/lib/rails/generators/rails/stylesheets/templates/scaffold.css diff --git a/railties/lib/generators/resource_helpers.rb b/railties/lib/rails/generators/resource_helpers.rb index ba1444652d..d4b0d4b945 100644 --- a/railties/lib/generators/resource_helpers.rb +++ b/railties/lib/rails/generators/resource_helpers.rb @@ -54,7 +54,7 @@ module Rails begin klass = active_model.constantize rescue NameError - require "generators/#{options[:orm]}" + require "rails/generators/#{options[:orm]}" end # Try once again after loading the file with success. diff --git a/railties/lib/generators/test_unit.rb b/railties/lib/rails/generators/test_unit.rb index 2763feb017..62b9afaa2c 100644 --- a/railties/lib/generators/test_unit.rb +++ b/railties/lib/rails/generators/test_unit.rb @@ -1,4 +1,4 @@ -require 'generators/named_base' +require 'rails/generators/named_base' module TestUnit module Generators diff --git a/railties/lib/generators/test_unit/controller/controller_generator.rb b/railties/lib/rails/generators/test_unit/controller/controller_generator.rb index b57a6e794f..39816d9990 100644 --- a/railties/lib/generators/test_unit/controller/controller_generator.rb +++ b/railties/lib/rails/generators/test_unit/controller/controller_generator.rb @@ -1,4 +1,4 @@ -require 'generators/test_unit' +require 'rails/generators/test_unit' module TestUnit module Generators diff --git a/railties/lib/generators/test_unit/controller/templates/functional_test.rb b/railties/lib/rails/generators/test_unit/controller/templates/functional_test.rb index 62fa5d86fd..62fa5d86fd 100644 --- a/railties/lib/generators/test_unit/controller/templates/functional_test.rb +++ b/railties/lib/rails/generators/test_unit/controller/templates/functional_test.rb diff --git a/railties/lib/generators/test_unit/helper/helper_generator.rb b/railties/lib/rails/generators/test_unit/helper/helper_generator.rb index 9ecfaa45ab..4ea80bf7be 100644 --- a/railties/lib/generators/test_unit/helper/helper_generator.rb +++ b/railties/lib/rails/generators/test_unit/helper/helper_generator.rb @@ -1,4 +1,4 @@ -require 'generators/test_unit' +require 'rails/generators/test_unit' module TestUnit module Generators diff --git a/railties/lib/generators/test_unit/helper/templates/helper_test.rb b/railties/lib/rails/generators/test_unit/helper/templates/helper_test.rb index 591e40900e..591e40900e 100644 --- a/railties/lib/generators/test_unit/helper/templates/helper_test.rb +++ b/railties/lib/rails/generators/test_unit/helper/templates/helper_test.rb diff --git a/railties/lib/generators/test_unit/integration/integration_generator.rb b/railties/lib/rails/generators/test_unit/integration/integration_generator.rb index d9d9b3bf1d..32d0fac029 100644 --- a/railties/lib/generators/test_unit/integration/integration_generator.rb +++ b/railties/lib/rails/generators/test_unit/integration/integration_generator.rb @@ -1,4 +1,4 @@ -require 'generators/test_unit' +require 'rails/generators/test_unit' module TestUnit module Generators diff --git a/railties/lib/generators/test_unit/integration/templates/integration_test.rb b/railties/lib/rails/generators/test_unit/integration/templates/integration_test.rb index 2c57158b1c..2c57158b1c 100644 --- a/railties/lib/generators/test_unit/integration/templates/integration_test.rb +++ b/railties/lib/rails/generators/test_unit/integration/templates/integration_test.rb diff --git a/railties/lib/generators/test_unit/mailer/mailer_generator.rb b/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb index ef350a6224..7353e5d61a 100644 --- a/railties/lib/generators/test_unit/mailer/mailer_generator.rb +++ b/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb @@ -1,4 +1,4 @@ -require 'generators/test_unit' +require 'rails/generators/test_unit' module TestUnit module Generators diff --git a/railties/lib/generators/test_unit/mailer/templates/fixture b/railties/lib/rails/generators/test_unit/mailer/templates/fixture index fcce7bd805..fcce7bd805 100644 --- a/railties/lib/generators/test_unit/mailer/templates/fixture +++ b/railties/lib/rails/generators/test_unit/mailer/templates/fixture diff --git a/railties/lib/generators/test_unit/mailer/templates/unit_test.rb b/railties/lib/rails/generators/test_unit/mailer/templates/unit_test.rb index 4de94076e9..4de94076e9 100644 --- a/railties/lib/generators/test_unit/mailer/templates/unit_test.rb +++ b/railties/lib/rails/generators/test_unit/mailer/templates/unit_test.rb diff --git a/railties/lib/generators/test_unit/model/model_generator.rb b/railties/lib/rails/generators/test_unit/model/model_generator.rb index 469306e6c5..609b815683 100644 --- a/railties/lib/generators/test_unit/model/model_generator.rb +++ b/railties/lib/rails/generators/test_unit/model/model_generator.rb @@ -1,4 +1,4 @@ -require 'generators/test_unit' +require 'rails/generators/test_unit' module TestUnit module Generators diff --git a/railties/lib/generators/test_unit/model/templates/fixtures.yml b/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml index c21035113e..c21035113e 100644 --- a/railties/lib/generators/test_unit/model/templates/fixtures.yml +++ b/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml diff --git a/railties/lib/generators/test_unit/model/templates/unit_test.rb b/railties/lib/rails/generators/test_unit/model/templates/unit_test.rb index 3e0bc29d3a..3e0bc29d3a 100644 --- a/railties/lib/generators/test_unit/model/templates/unit_test.rb +++ b/railties/lib/rails/generators/test_unit/model/templates/unit_test.rb diff --git a/railties/lib/generators/test_unit/observer/observer_generator.rb b/railties/lib/rails/generators/test_unit/observer/observer_generator.rb index 14181f4e49..6cc1158c21 100644 --- a/railties/lib/generators/test_unit/observer/observer_generator.rb +++ b/railties/lib/rails/generators/test_unit/observer/observer_generator.rb @@ -1,4 +1,4 @@ -require 'generators/test_unit' +require 'rails/generators/test_unit' module TestUnit module Generators diff --git a/railties/lib/generators/test_unit/observer/templates/unit_test.rb b/railties/lib/rails/generators/test_unit/observer/templates/unit_test.rb index 03f6d5666e..03f6d5666e 100644 --- a/railties/lib/generators/test_unit/observer/templates/unit_test.rb +++ b/railties/lib/rails/generators/test_unit/observer/templates/unit_test.rb diff --git a/railties/lib/generators/test_unit/performance/performance_generator.rb b/railties/lib/rails/generators/test_unit/performance/performance_generator.rb index 0d9c646b26..99edda5461 100644 --- a/railties/lib/generators/test_unit/performance/performance_generator.rb +++ b/railties/lib/rails/generators/test_unit/performance/performance_generator.rb @@ -1,4 +1,4 @@ -require 'generators/test_unit' +require 'rails/generators/test_unit' module TestUnit module Generators diff --git a/railties/lib/generators/test_unit/performance/templates/performance_test.rb b/railties/lib/rails/generators/test_unit/performance/templates/performance_test.rb index 27c91b0fca..27c91b0fca 100644 --- a/railties/lib/generators/test_unit/performance/templates/performance_test.rb +++ b/railties/lib/rails/generators/test_unit/performance/templates/performance_test.rb diff --git a/railties/lib/generators/test_unit/plugin/plugin_generator.rb b/railties/lib/rails/generators/test_unit/plugin/plugin_generator.rb index 05adf58c4f..4d65cd7d89 100644 --- a/railties/lib/generators/test_unit/plugin/plugin_generator.rb +++ b/railties/lib/rails/generators/test_unit/plugin/plugin_generator.rb @@ -1,4 +1,4 @@ -require 'generators/test_unit' +require 'rails/generators/test_unit' module TestUnit module Generators diff --git a/railties/lib/generators/test_unit/plugin/templates/%file_name%_test.rb.tt b/railties/lib/rails/generators/test_unit/plugin/templates/%file_name%_test.rb.tt index 3e0bc29d3a..3e0bc29d3a 100644 --- a/railties/lib/generators/test_unit/plugin/templates/%file_name%_test.rb.tt +++ b/railties/lib/rails/generators/test_unit/plugin/templates/%file_name%_test.rb.tt diff --git a/railties/lib/generators/test_unit/plugin/templates/test_helper.rb b/railties/lib/rails/generators/test_unit/plugin/templates/test_helper.rb index 348ec33582..348ec33582 100644 --- a/railties/lib/generators/test_unit/plugin/templates/test_helper.rb +++ b/railties/lib/rails/generators/test_unit/plugin/templates/test_helper.rb diff --git a/railties/lib/generators/test_unit/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb index a8f9c8bd79..c0315c7fe6 100644 --- a/railties/lib/generators/test_unit/scaffold/scaffold_generator.rb +++ b/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb @@ -1,5 +1,5 @@ -require 'generators/test_unit' -require 'generators/resource_helpers' +require 'rails/generators/test_unit' +require 'rails/generators/resource_helpers' module TestUnit module Generators diff --git a/railties/lib/generators/test_unit/scaffold/templates/functional_test.rb b/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb index e4bf4035da..e4bf4035da 100644 --- a/railties/lib/generators/test_unit/scaffold/templates/functional_test.rb +++ b/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb diff --git a/railties/lib/initializer.rb b/railties/lib/rails/initializer.rb index d882a6714a..2d63ac4d39 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/rails/initializer.rb @@ -1,7 +1,7 @@ require "pathname" -$LOAD_PATH.unshift File.dirname(__FILE__) -require 'railties_path' +require 'rails/application' +require 'rails/railties_path' require 'rails/version' require 'rails/gem_dependency' require 'rails/rack' @@ -30,7 +30,7 @@ module Rails end def config - @@config + @@config || Configuration.new end alias configuration config @@ -104,46 +104,35 @@ module Rails end def self.run(initializer = nil, config = nil) - default.config = config if config - default.config ||= Configuration.new - yield default.config if block_given? - default.run(initializer) + # TODO: Clean this all up + if initializer + default.config = config + default.run(initializer) + else + Rails.application = Class.new(Application) + yield Rails.application.config if block_given? + default.config = Rails.application.config + default.run + end end end # Check for valid Ruby version (1.8.2 or 1.8.4 or higher). This is done in an # external file, so we can use it from the `rails` program as well without duplication. Initializer.default.add :check_ruby_version do - require 'ruby_version_check' + require 'rails/ruby_version_check' end - # If Rails is vendored and RubyGems is available, install stub GemSpecs - # for Rails, Active Support, Active Record, Action Pack, Action Mailer, and - # Active Resource. This allows Gem plugins to depend on Rails even when - # the Gem version of Rails shouldn't be loaded. - Initializer.default.add :install_gem_spec_stubs do - unless Rails.respond_to?(:vendor_rails?) + # Bail if boot.rb is outdated + Initializer.default.add :freak_out_if_boot_rb_is_outdated do + unless defined?(Rails::BOOTSTRAP_VERSION) abort %{Your config/boot.rb is outdated: Run "rake rails:update".} end - - if Rails.vendor_rails? - begin; require "rubygems"; rescue LoadError; return; end - - %w(rails activesupport activerecord actionpack actionmailer activeresource).each do |stub| - Gem.loaded_specs[stub] ||= Gem::Specification.new do |s| - s.name = stub - s.version = Rails::VERSION::STRING - s.loaded_from = "" - end - end - end end # Set the <tt>$LOAD_PATH</tt> based on the value of # Configuration#load_paths. Duplicates are removed. Initializer.default.add :set_load_path do - # TODO: Think about unifying this with the general Rails paths - configuration.framework_paths.reverse_each { |dir| $LOAD_PATH.unshift(dir) if File.directory?(dir) } configuration.paths.add_to_load_path $LOAD_PATH.uniq! end @@ -192,6 +181,13 @@ module Rails plugin_loader.add_plugin_load_paths end + # Create tmp directories + Initializer.default.add :ensure_tmp_directories_exist do + %w(cache pids sessions sockets).each do |dir_to_make| + FileUtils.mkdir_p(File.join(configuration.root_path, 'tmp', dir_to_make)) + end + end + # Loads the environment specified by Configuration#environment_path, which # is typically one of development, test, or production. Initializer.default.add :load_environment do @@ -259,6 +255,25 @@ module Rails end end + # Include middleware to serve up static assets + Initializer.default.add :initialize_static_server do + if configuration.frameworks.include?(:action_controller) && configuration.serve_static_assets + configuration.middleware.use(ActionDispatch::Static, Rails.public_path) + end + end + + Initializer.default.add :initialize_middleware_stack do + if configuration.frameworks.include?(:action_controller) + configuration.middleware.use(::Rack::Lock) unless ActionController::Base.allow_concurrency + configuration.middleware.use(ActionDispatch::ShowExceptions, ActionController::Base.consider_all_requests_local) + configuration.middleware.use(ActionDispatch::Callbacks, ActionController::Dispatcher.prepare_each_request) + configuration.middleware.use(lambda { ActionController::Base.session_store }, lambda { ActionController::Base.session_options }) + configuration.middleware.use(ActionDispatch::ParamsParser) + configuration.middleware.use(::Rack::MethodOverride) + configuration.middleware.use(::Rack::Head) + end + end + Initializer.default.add :initialize_cache do unless defined?(RAILS_CACHE) silence_warnings { Object.const_set "RAILS_CACHE", ActiveSupport::Cache.lookup_store(configuration.cache_store) } @@ -446,18 +461,6 @@ Run `rake gems:build` to build the unbuilt gems. plugin_loader.load_plugins end - # - # # pick up any gems that plugins depend on - Initializer.default.add :add_gem_load_paths do - require 'rails/gem_dependency' - # TODO: This seems extraneous - Rails::GemDependency.add_frozen_gem_path - unless config.gems.empty? - require "rubygems" - config.gems.each { |gem| gem.add_load_paths } - end - end - # TODO: Figure out if this needs to run a second time # load_gems @@ -507,7 +510,7 @@ Run `rake gems:install` to install the missing gems. # # Setup database middleware after initializers have run Initializer.default.add :initialize_database_middleware do if configuration.frameworks.include?(:active_record) - if configuration.frameworks.include?(:action_controller) && + if configuration.frameworks.include?(:action_controller) && ActionController::Base.session_store && ActionController::Base.session_store.name == 'ActiveRecord::SessionStore' configuration.middleware.insert_before :"ActiveRecord::SessionStore", ActiveRecord::ConnectionAdapters::ConnectionManagement configuration.middleware.insert_before :"ActiveRecord::SessionStore", ActiveRecord::QueryCache @@ -523,7 +526,7 @@ Run `rake gems:install` to install the missing gems. # # Prepare dispatcher callbacks and run 'prepare' callbacks Initializer.default.add :prepare_dispatcher do next unless configuration.frameworks.include?(:action_controller) - require 'dispatcher' unless defined?(::Dispatcher) + require 'rails/dispatcher' unless defined?(::Dispatcher) Dispatcher.define_dispatcher_callbacks(configuration.cache_classes) end diff --git a/railties/lib/initializer_old.rb b/railties/lib/rails/initializer_old.rb index cee5c7bcb6..cee5c7bcb6 100644 --- a/railties/lib/initializer_old.rb +++ b/railties/lib/rails/initializer_old.rb diff --git a/railties/lib/performance_test_help.rb b/railties/lib/rails/performance_test_help.rb index 2aaa21e85f..4ac38981d0 100644 --- a/railties/lib/performance_test_help.rb +++ b/railties/lib/rails/performance_test_help.rb @@ -1,5 +1,3 @@ -require 'action_controller/testing/performance_test' - ActionController::Base.perform_caching = true ActiveSupport::Dependencies.mechanism = :require Rails.logger.level = ActiveSupport::BufferedLogger::INFO diff --git a/railties/lib/rails/rack/static.rb b/railties/lib/rails/rack/static.rb index f07c6beb5e..d6b8face27 100644 --- a/railties/lib/rails/rack/static.rb +++ b/railties/lib/rails/rack/static.rb @@ -1,46 +1,5 @@ -require 'rack/utils' +require 'action_dispatch' -module Rails - module Rack - class Static - FILE_METHODS = %w(GET HEAD).freeze - - def initialize(app) - @app = app - @file_server = ::Rack::File.new(File.join(RAILS_ROOT, "public")) - end - - def call(env) - path = env['PATH_INFO'].chomp('/') - method = env['REQUEST_METHOD'] - - if FILE_METHODS.include?(method) - if file_exist?(path) - return @file_server.call(env) - else - cached_path = directory_exist?(path) ? "#{path}/index" : path - cached_path += ::ActionController::Base.page_cache_extension - - if file_exist?(cached_path) - env['PATH_INFO'] = cached_path - return @file_server.call(env) - end - end - end - - @app.call(env) - end - - private - def file_exist?(path) - full_path = File.join(@file_server.root, ::Rack::Utils.unescape(path)) - File.file?(full_path) && File.readable?(full_path) - end - - def directory_exist?(path) - full_path = File.join(@file_server.root, ::Rack::Utils.unescape(path)) - File.directory?(full_path) && File.readable?(full_path) - end - end - end +module Rails::Rack + Static = Deprecation::DeprecatedConstantProxy.new('Rails::Rack::Static', ActionDispatch::Static) end diff --git a/railties/lib/railties_path.rb b/railties/lib/rails/railties_path.rb index b729c095c8..e291fc23ea 100644 --- a/railties/lib/railties_path.rb +++ b/railties/lib/rails/railties_path.rb @@ -1 +1 @@ -RAILTIES_PATH = File.expand_path(File.join(File.dirname(__FILE__), '..')) +RAILTIES_PATH = File.expand_path(File.join(File.dirname(__FILE__), '..', '..')) diff --git a/railties/lib/ruby_version_check.rb b/railties/lib/rails/ruby_version_check.rb index 68d3acc876..68d3acc876 100644 --- a/railties/lib/ruby_version_check.rb +++ b/railties/lib/rails/ruby_version_check.rb diff --git a/railties/lib/rubyprof_ext.rb b/railties/lib/rails/rubyprof_ext.rb index f6e90357ce..f6e90357ce 100644 --- a/railties/lib/rubyprof_ext.rb +++ b/railties/lib/rails/rubyprof_ext.rb diff --git a/railties/lib/source_annotation_extractor.rb b/railties/lib/rails/source_annotation_extractor.rb index 591fd6f6bd..591fd6f6bd 100644 --- a/railties/lib/source_annotation_extractor.rb +++ b/railties/lib/rails/source_annotation_extractor.rb diff --git a/railties/lib/tasks/rails.rb b/railties/lib/rails/tasks.rb index 8c2b7f9bde..aad965306c 100644 --- a/railties/lib/tasks/rails.rb +++ b/railties/lib/rails/tasks.rb @@ -1,8 +1,24 @@ $VERBOSE = nil # Load Rails rakefile extensions -Dir["#{File.dirname(__FILE__)}/*.rake"].each { |ext| load ext } +%w( + annotations + databases + documentation + framework + gems + log + middleware + misc + routes + statistics + testing + tmp +).each do |task| + load "rails/tasks/#{task}.rake" +end # Load any custom rakefile extensions +# TODO: Don't hardcode these paths. Dir["#{RAILS_ROOT}/vendor/plugins/*/**/tasks/**/*.rake"].sort.each { |ext| load ext } Dir["#{RAILS_ROOT}/lib/tasks/**/*.rake"].sort.each { |ext| load ext } diff --git a/railties/lib/tasks/annotations.rake b/railties/lib/rails/tasks/annotations.rake index 48ac40099a..79973b3145 100644 --- a/railties/lib/tasks/annotations.rake +++ b/railties/lib/rails/tasks/annotations.rake @@ -1,4 +1,4 @@ -require 'source_annotation_extractor' +require 'rails/source_annotation_extractor' desc "Enumerate all annotations" task :notes do diff --git a/railties/lib/tasks/databases.rake b/railties/lib/rails/tasks/databases.rake index 8401cf0590..ed015e7a67 100644 --- a/railties/lib/tasks/databases.rake +++ b/railties/lib/rails/tasks/databases.rake @@ -426,8 +426,8 @@ namespace :db do desc "Creates a sessions migration for use with ActiveRecord::SessionStore" task :create => :environment do raise "Task unavailable to this database (no migration support)" unless ActiveRecord::Base.connection.supports_migrations? - require 'generators' - require 'generators/rails/session_migration/session_migration_generator' + require 'rails/generators' + require 'rails/generators/rails/session_migration/session_migration_generator' Rails::Generators::SessionMigrationGenerator.start [ ENV["MIGRATION"] || "add_sessions_table" ] end diff --git a/railties/lib/tasks/documentation.rake b/railties/lib/rails/tasks/documentation.rake index db1939c45f..db1939c45f 100644 --- a/railties/lib/tasks/documentation.rake +++ b/railties/lib/rails/tasks/documentation.rake diff --git a/railties/lib/tasks/framework.rake b/railties/lib/rails/tasks/framework.rake index a084af7e11..17e16f26fd 100644 --- a/railties/lib/tasks/framework.rake +++ b/railties/lib/rails/tasks/framework.rake @@ -93,7 +93,7 @@ namespace :rails do namespace :update do def invoke_from_app_generator(method) require 'generators' - require 'generators/rails/app/app_generator' + require 'rails/generators/rails/app/app_generator' generator = Rails::Generators::AppGenerator.new ["rails"], { :with_dispatchers => true }, :destination_root => RAILS_ROOT diff --git a/railties/lib/tasks/gems.rake b/railties/lib/rails/tasks/gems.rake index f1c34c7cca..f1c34c7cca 100644 --- a/railties/lib/tasks/gems.rake +++ b/railties/lib/rails/tasks/gems.rake diff --git a/railties/lib/tasks/log.rake b/railties/lib/rails/tasks/log.rake index 6e1334692e..6e1334692e 100644 --- a/railties/lib/tasks/log.rake +++ b/railties/lib/rails/tasks/log.rake diff --git a/railties/lib/tasks/middleware.rake b/railties/lib/rails/tasks/middleware.rake index 05f159184e..e1ab309157 100644 --- a/railties/lib/tasks/middleware.rake +++ b/railties/lib/rails/tasks/middleware.rake @@ -1,7 +1,7 @@ desc 'Prints out your Rack middleware stack' task :middleware => :environment do - ActionController::Dispatcher.middleware.active.each do |middleware| + Rails.configuration.middleware.active.each do |middleware| puts "use #{middleware.inspect}" end - puts "run ActionController::Dispatcher.new" + puts "run ActionController::Routing::Routes" end diff --git a/railties/lib/tasks/misc.rake b/railties/lib/rails/tasks/misc.rake index fb2fc31dc1..fb2fc31dc1 100644 --- a/railties/lib/tasks/misc.rake +++ b/railties/lib/rails/tasks/misc.rake diff --git a/railties/lib/tasks/routes.rake b/railties/lib/rails/tasks/routes.rake index abbf3258c1..abbf3258c1 100644 --- a/railties/lib/tasks/routes.rake +++ b/railties/lib/rails/tasks/routes.rake diff --git a/railties/lib/tasks/statistics.rake b/railties/lib/rails/tasks/statistics.rake index 5ab27a0f62..2dcc7bdf9d 100644 --- a/railties/lib/tasks/statistics.rake +++ b/railties/lib/rails/tasks/statistics.rake @@ -12,6 +12,6 @@ STATS_DIRECTORIES = [ desc "Report code statistics (KLOCs, etc) from the application" task :stats do - require 'code_statistics' + require 'rails/code_statistics' CodeStatistics.new(*STATS_DIRECTORIES).to_s end diff --git a/railties/lib/tasks/testing.rake b/railties/lib/rails/tasks/testing.rake index fd5e52a05b..fd5e52a05b 100644 --- a/railties/lib/tasks/testing.rake +++ b/railties/lib/rails/tasks/testing.rake diff --git a/railties/lib/tasks/tmp.rake b/railties/lib/rails/tasks/tmp.rake index fea15058bb..fea15058bb 100644 --- a/railties/lib/tasks/tmp.rake +++ b/railties/lib/rails/tasks/tmp.rake diff --git a/railties/lib/test_help.rb b/railties/lib/rails/test_help.rb index 53f28264e8..8bd4475c7b 100644 --- a/railties/lib/test_help.rb +++ b/railties/lib/rails/test_help.rb @@ -4,13 +4,11 @@ silence_warnings { RAILS_ENV = "test" } require 'rubygems' gem "rack", "~> 1.0.0" -gem "rack-test", "~> 0.4.2" +gem "rack-test", "~> 0.5.0" require 'test/unit' require 'active_support/core_ext/kernel/requires' -require 'action_controller/testing/test_case' require 'action_view/test_case' -require 'action_controller/testing/integration' require 'action_mailer/test_case' if defined?(ActionMailer) if defined?(ActiveRecord) diff --git a/railties/lib/vendor/bundler/LICENSE b/railties/lib/rails/vendor/bundler/LICENSE index 41decca113..41decca113 100644 --- a/railties/lib/vendor/bundler/LICENSE +++ b/railties/lib/rails/vendor/bundler/LICENSE diff --git a/railties/lib/vendor/bundler/README.markdown b/railties/lib/rails/vendor/bundler/README.markdown index 26863e96f2..26863e96f2 100644 --- a/railties/lib/vendor/bundler/README.markdown +++ b/railties/lib/rails/vendor/bundler/README.markdown diff --git a/railties/lib/vendor/bundler/Rakefile b/railties/lib/rails/vendor/bundler/Rakefile index dc4c3d6d46..dc4c3d6d46 100644 --- a/railties/lib/vendor/bundler/Rakefile +++ b/railties/lib/rails/vendor/bundler/Rakefile diff --git a/railties/lib/vendor/bundler/lib/bundler.rb b/railties/lib/rails/vendor/bundler/lib/bundler.rb index 1ede3517dd..1ede3517dd 100644 --- a/railties/lib/vendor/bundler/lib/bundler.rb +++ b/railties/lib/rails/vendor/bundler/lib/bundler.rb diff --git a/railties/lib/vendor/bundler/lib/bundler/cli.rb b/railties/lib/rails/vendor/bundler/lib/bundler/cli.rb index df9181fbc4..df9181fbc4 100644 --- a/railties/lib/vendor/bundler/lib/bundler/cli.rb +++ b/railties/lib/rails/vendor/bundler/lib/bundler/cli.rb diff --git a/railties/lib/vendor/bundler/lib/bundler/commands/bundle_command.rb b/railties/lib/rails/vendor/bundler/lib/bundler/commands/bundle_command.rb index a1f9590f75..a1f9590f75 100644 --- a/railties/lib/vendor/bundler/lib/bundler/commands/bundle_command.rb +++ b/railties/lib/rails/vendor/bundler/lib/bundler/commands/bundle_command.rb diff --git a/railties/lib/vendor/bundler/lib/bundler/commands/exec_command.rb b/railties/lib/rails/vendor/bundler/lib/bundler/commands/exec_command.rb index 228aa60619..228aa60619 100644 --- a/railties/lib/vendor/bundler/lib/bundler/commands/exec_command.rb +++ b/railties/lib/rails/vendor/bundler/lib/bundler/commands/exec_command.rb diff --git a/railties/lib/vendor/bundler/lib/bundler/dependency.rb b/railties/lib/rails/vendor/bundler/lib/bundler/dependency.rb index b627b58662..b627b58662 100644 --- a/railties/lib/vendor/bundler/lib/bundler/dependency.rb +++ b/railties/lib/rails/vendor/bundler/lib/bundler/dependency.rb diff --git a/railties/lib/vendor/bundler/lib/bundler/dsl.rb b/railties/lib/rails/vendor/bundler/lib/bundler/dsl.rb index d9a86ee1fd..d9a86ee1fd 100644 --- a/railties/lib/vendor/bundler/lib/bundler/dsl.rb +++ b/railties/lib/rails/vendor/bundler/lib/bundler/dsl.rb diff --git a/railties/lib/vendor/bundler/lib/bundler/environment.rb b/railties/lib/rails/vendor/bundler/lib/bundler/environment.rb index f07a9e2c6f..f07a9e2c6f 100644 --- a/railties/lib/vendor/bundler/lib/bundler/environment.rb +++ b/railties/lib/rails/vendor/bundler/lib/bundler/environment.rb diff --git a/railties/lib/vendor/bundler/lib/bundler/finder.rb b/railties/lib/rails/vendor/bundler/lib/bundler/finder.rb index b77ca65709..b77ca65709 100644 --- a/railties/lib/vendor/bundler/lib/bundler/finder.rb +++ b/railties/lib/rails/vendor/bundler/lib/bundler/finder.rb diff --git a/railties/lib/vendor/bundler/lib/bundler/gem_bundle.rb b/railties/lib/rails/vendor/bundler/lib/bundler/gem_bundle.rb index 80d7710683..80d7710683 100644 --- a/railties/lib/vendor/bundler/lib/bundler/gem_bundle.rb +++ b/railties/lib/rails/vendor/bundler/lib/bundler/gem_bundle.rb diff --git a/railties/lib/vendor/bundler/lib/bundler/gem_ext.rb b/railties/lib/rails/vendor/bundler/lib/bundler/gem_ext.rb index 155ad04c7e..155ad04c7e 100644 --- a/railties/lib/vendor/bundler/lib/bundler/gem_ext.rb +++ b/railties/lib/rails/vendor/bundler/lib/bundler/gem_ext.rb diff --git a/railties/lib/vendor/bundler/lib/bundler/repository.rb b/railties/lib/rails/vendor/bundler/lib/bundler/repository.rb index 1a1dc7497d..1a1dc7497d 100644 --- a/railties/lib/vendor/bundler/lib/bundler/repository.rb +++ b/railties/lib/rails/vendor/bundler/lib/bundler/repository.rb diff --git a/railties/lib/vendor/bundler/lib/bundler/repository/directory_repository.rb b/railties/lib/rails/vendor/bundler/lib/bundler/repository/directory_repository.rb index e97dd38dd5..e97dd38dd5 100644 --- a/railties/lib/vendor/bundler/lib/bundler/repository/directory_repository.rb +++ b/railties/lib/rails/vendor/bundler/lib/bundler/repository/directory_repository.rb diff --git a/railties/lib/vendor/bundler/lib/bundler/repository/gem_repository.rb b/railties/lib/rails/vendor/bundler/lib/bundler/repository/gem_repository.rb index 90de49d83d..90de49d83d 100644 --- a/railties/lib/vendor/bundler/lib/bundler/repository/gem_repository.rb +++ b/railties/lib/rails/vendor/bundler/lib/bundler/repository/gem_repository.rb diff --git a/railties/lib/vendor/bundler/lib/bundler/resolver.rb b/railties/lib/rails/vendor/bundler/lib/bundler/resolver.rb index 2a6a6371c2..2a6a6371c2 100644 --- a/railties/lib/vendor/bundler/lib/bundler/resolver.rb +++ b/railties/lib/rails/vendor/bundler/lib/bundler/resolver.rb diff --git a/railties/lib/vendor/bundler/lib/bundler/runtime.rb b/railties/lib/rails/vendor/bundler/lib/bundler/runtime.rb index 27e0254966..27e0254966 100644 --- a/railties/lib/vendor/bundler/lib/bundler/runtime.rb +++ b/railties/lib/rails/vendor/bundler/lib/bundler/runtime.rb diff --git a/railties/lib/vendor/bundler/lib/bundler/source.rb b/railties/lib/rails/vendor/bundler/lib/bundler/source.rb index 37828ca316..37828ca316 100644 --- a/railties/lib/vendor/bundler/lib/bundler/source.rb +++ b/railties/lib/rails/vendor/bundler/lib/bundler/source.rb diff --git a/railties/lib/vendor/bundler/lib/bundler/templates/app_script.erb b/railties/lib/rails/vendor/bundler/lib/bundler/templates/app_script.erb index 3e47a53ca8..3e47a53ca8 100644 --- a/railties/lib/vendor/bundler/lib/bundler/templates/app_script.erb +++ b/railties/lib/rails/vendor/bundler/lib/bundler/templates/app_script.erb diff --git a/railties/lib/vendor/bundler/lib/bundler/templates/environment.erb b/railties/lib/rails/vendor/bundler/lib/bundler/templates/environment.erb index 21f3de8854..21f3de8854 100644 --- a/railties/lib/vendor/bundler/lib/bundler/templates/environment.erb +++ b/railties/lib/rails/vendor/bundler/lib/bundler/templates/environment.erb diff --git a/railties/lib/vendor/thor-0.11.6/CHANGELOG.rdoc b/railties/lib/rails/vendor/thor-0.11.6/CHANGELOG.rdoc index dba25b7205..dba25b7205 100644 --- a/railties/lib/vendor/thor-0.11.6/CHANGELOG.rdoc +++ b/railties/lib/rails/vendor/thor-0.11.6/CHANGELOG.rdoc diff --git a/railties/lib/vendor/thor-0.11.6/LICENSE b/railties/lib/rails/vendor/thor-0.11.6/LICENSE index 98722da459..98722da459 100644 --- a/railties/lib/vendor/thor-0.11.6/LICENSE +++ b/railties/lib/rails/vendor/thor-0.11.6/LICENSE diff --git a/railties/lib/vendor/thor-0.11.6/README.rdoc b/railties/lib/rails/vendor/thor-0.11.6/README.rdoc index f1106f02b6..f1106f02b6 100644 --- a/railties/lib/vendor/thor-0.11.6/README.rdoc +++ b/railties/lib/rails/vendor/thor-0.11.6/README.rdoc diff --git a/railties/lib/vendor/thor-0.11.6/bin/rake2thor b/railties/lib/rails/vendor/thor-0.11.6/bin/rake2thor index 50c7410d80..50c7410d80 100755 --- a/railties/lib/vendor/thor-0.11.6/bin/rake2thor +++ b/railties/lib/rails/vendor/thor-0.11.6/bin/rake2thor diff --git a/railties/lib/vendor/thor-0.11.6/bin/thor b/railties/lib/rails/vendor/thor-0.11.6/bin/thor index eaf849fb4a..eaf849fb4a 100755 --- a/railties/lib/vendor/thor-0.11.6/bin/thor +++ b/railties/lib/rails/vendor/thor-0.11.6/bin/thor diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor.rb index 3b45c4e9b7..3b45c4e9b7 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/actions.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/actions.rb index d561ccb2aa..d561ccb2aa 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/actions.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/actions.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/actions/create_file.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/actions/create_file.rb index 8f6badee27..8f6badee27 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/actions/create_file.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/actions/create_file.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/actions/directory.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/actions/directory.rb index be5eb822ac..be5eb822ac 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/actions/directory.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/actions/directory.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/actions/empty_directory.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/actions/empty_directory.rb index 03c1fe4af1..03c1fe4af1 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/actions/empty_directory.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/actions/empty_directory.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/actions/file_manipulation.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/actions/file_manipulation.rb index d77d90d448..d77d90d448 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/actions/file_manipulation.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/actions/file_manipulation.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/actions/inject_into_file.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/actions/inject_into_file.rb index 0636ec6591..0636ec6591 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/actions/inject_into_file.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/actions/inject_into_file.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/base.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/base.rb index 700d794123..700d794123 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/base.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/base.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/core_ext/hash_with_indifferent_access.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/core_ext/hash_with_indifferent_access.rb index 78bc5cf4bf..78bc5cf4bf 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/core_ext/hash_with_indifferent_access.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/core_ext/hash_with_indifferent_access.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/core_ext/ordered_hash.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/core_ext/ordered_hash.rb index 27fea5bb35..27fea5bb35 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/core_ext/ordered_hash.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/core_ext/ordered_hash.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/error.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/error.rb index f9b31a35d1..f9b31a35d1 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/error.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/error.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/group.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/group.rb index 1e59df2313..1e59df2313 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/group.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/group.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/invocation.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/invocation.rb index 32e6a72454..32e6a72454 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/invocation.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/invocation.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/parser.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/parser.rb index 57a3f6e1a5..57a3f6e1a5 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/parser.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/parser.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/parser/argument.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/parser/argument.rb index aa8ace4719..aa8ace4719 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/parser/argument.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/parser/argument.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/parser/arguments.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/parser/arguments.rb index fb5d965e06..fb5d965e06 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/parser/arguments.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/parser/arguments.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/parser/option.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/parser/option.rb index 9e40ec73fa..9e40ec73fa 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/parser/option.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/parser/option.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/parser/options.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/parser/options.rb index 75092308b5..75092308b5 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/parser/options.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/parser/options.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/rake_compat.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/rake_compat.rb index 3ab6bb21f5..3ab6bb21f5 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/rake_compat.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/rake_compat.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/runner.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/runner.rb index 43da09b336..43da09b336 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/runner.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/runner.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/shell.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/shell.rb index 0d3f4d5951..0d3f4d5951 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/shell.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/shell.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/shell/basic.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/shell/basic.rb index ea9665380b..ea9665380b 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/shell/basic.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/shell/basic.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/shell/color.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/shell/color.rb index 24704f7885..24704f7885 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/shell/color.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/shell/color.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/task.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/task.rb index 91c7564d3f..91c7564d3f 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/task.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/task.rb diff --git a/railties/lib/vendor/thor-0.11.6/lib/thor/util.rb b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/util.rb index fd820d7462..fd820d7462 100644 --- a/railties/lib/vendor/thor-0.11.6/lib/thor/util.rb +++ b/railties/lib/rails/vendor/thor-0.11.6/lib/thor/util.rb diff --git a/railties/lib/webrick_server.rb b/railties/lib/rails/webrick_server.rb index 2f60151b22..2f60151b22 100644 --- a/railties/lib/webrick_server.rb +++ b/railties/lib/rails/webrick_server.rb diff --git a/railties/rails.gemspec b/railties/rails.gemspec index 67893e4347..659d6727ea 100644 --- a/railties/rails.gemspec +++ b/railties/rails.gemspec @@ -1,51 +1,31 @@ -# -*- encoding: utf-8 -*- - Gem::Specification.new do |s| - s.name = %q{rails} - s.version = "3.0.pre" - - s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version= - s.authors = ["David Heinemeier Hansson"] - s.date = %q{2009-09-01} - s.default_executable = %q{rails} - s.description = %q{ Rails is a framework for building web-application using CGI, FCGI, mod_ruby, or WEBrick + s.platform = Gem::Platform::RUBY + s.name = 'rails' + s.version = '3.0.pre' + s.summary = "Web-application framework with template engine, control-flow layer, and ORM." + s.description = <<-EOF + Rails is a framework for building web-application using CGI, FCGI, mod_ruby, or WEBrick on top of either MySQL, PostgreSQL, SQLite, DB2, SQL Server, or Oracle with eRuby- or Builder-based templates. -} - s.email = %q{david@loudthinking.com} - s.executables = ["rails"] - s.files = ["bin", "builtin", "CHANGELOG", "guides", "lib", "MIT-LICENSE", "pkg", "rails.gemspec", "Rakefile", "README", "bin/rails", "builtin/rails_info", "builtin/rails_info/rails", "builtin/rails_info/rails/info.rb", "builtin/rails_info/rails/info_controller.rb", "builtin/rails_info/rails/info_helper.rb", "builtin/rails_info/rails_info_controller.rb", "guides/files", "guides/files/javascripts", "guides/files/javascripts/code_highlighter.js", "guides/files/javascripts/guides.js", "guides/files/javascripts/highlighters.js", "guides/files/stylesheets", "guides/files/stylesheets/main.css", "guides/files/stylesheets/print.css", "guides/files/stylesheets/reset.css", "guides/files/stylesheets/style.css", "guides/files/stylesheets/syntax.css", "guides/images", "guides/images/belongs_to.png", "guides/images/book_icon.gif", "guides/images/bullet.gif", "guides/images/chapters_icon.gif", "guides/images/check_bullet.gif", "guides/images/credits_pic_blank.gif", "guides/images/csrf.png", "guides/images/customized_error_messages.png", "guides/images/error_messages.png", "guides/images/feature_tile.gif", "guides/images/footer_tile.gif", "guides/images/fxn.png", "guides/images/grey_bullet.gif", "guides/images/habtm.png", "guides/images/has_many.png", "guides/images/has_many_through.png", "guides/images/has_one.png", "guides/images/has_one_through.png", "guides/images/header_backdrop.png", "guides/images/header_tile.gif", "guides/images/i18n", "guides/images/i18n/demo_localized_pirate.png", "guides/images/i18n/demo_translated_en.png", "guides/images/i18n/demo_translated_pirate.png", "guides/images/i18n/demo_translation_missing.png", "guides/images/i18n/demo_untranslated.png", "guides/images/icons", "guides/images/icons/callouts", "guides/images/icons/callouts/1.png", "guides/images/icons/callouts/10.png", "guides/images/icons/callouts/11.png", "guides/images/icons/callouts/12.png", "guides/images/icons/callouts/13.png", "guides/images/icons/callouts/14.png", "guides/images/icons/callouts/15.png", "guides/images/icons/callouts/2.png", "guides/images/icons/callouts/3.png", "guides/images/icons/callouts/4.png", "guides/images/icons/callouts/5.png", "guides/images/icons/callouts/6.png", "guides/images/icons/callouts/7.png", "guides/images/icons/callouts/8.png", "guides/images/icons/callouts/9.png", "guides/images/icons/caution.png", "guides/images/icons/example.png", "guides/images/icons/home.png", "guides/images/icons/important.png", "guides/images/icons/next.png", "guides/images/icons/note.png", "guides/images/icons/prev.png", "guides/images/icons/README", "guides/images/icons/tip.png", "guides/images/icons/up.png", "guides/images/icons/warning.png", "guides/images/nav_arrow.gif", "guides/images/polymorphic.png", "guides/images/posts_index.png", "guides/images/rails_guides_logo.gif", "guides/images/rails_logo_remix.gif", "guides/images/rails_welcome.png", "guides/images/session_fixation.png", "guides/images/tab_grey.gif", "guides/images/tab_info.gif", "guides/images/tab_note.gif", "guides/images/tab_red.gif", "guides/images/tab_yellow.gif", "guides/images/tab_yellow.png", "guides/images/validation_error_messages.png", "guides/rails_guides", "guides/rails_guides/generator.rb", "guides/rails_guides/helpers.rb", "guides/rails_guides/indexer.rb", "guides/rails_guides/levenshtein.rb", "guides/rails_guides/textile_extensions.rb", "guides/rails_guides.rb", "guides/source", "guides/source/2_2_release_notes.textile", "guides/source/2_3_release_notes.textile", "guides/source/action_controller_overview.textile", "guides/source/action_mailer_basics.textile", "guides/source/action_view_overview.textile", "guides/source/active_record_basics.textile", "guides/source/active_record_querying.textile", "guides/source/active_support_overview.textile", "guides/source/activerecord_validations_callbacks.textile", "guides/source/ajax_on_rails.textile", "guides/source/association_basics.textile", "guides/source/caching_with_rails.textile", "guides/source/command_line.textile", "guides/source/configuring.textile", "guides/source/contribute.textile", "guides/source/contributing_to_rails.textile", "guides/source/credits.erb.textile", "guides/source/debugging_rails_applications.textile", "guides/source/form_helpers.textile", "guides/source/getting_started.textile", "guides/source/i18n.textile", "guides/source/index.erb.textile", "guides/source/layout.html.erb", "guides/source/layouts_and_rendering.textile", "guides/source/migrations.textile", "guides/source/nested_model_forms.textile", "guides/source/performance_testing.textile", "guides/source/plugins.textile", "guides/source/rails_application_templates.textile", "guides/source/rails_on_rack.textile", "guides/source/routing.textile", "guides/source/security.textile", "guides/source/testing.textile", "lib/code_statistics.rb", "lib/commands", "lib/commands/about.rb", "lib/commands/console.rb", "lib/commands/dbconsole.rb", "lib/commands/destroy.rb", "lib/commands/generate.rb", "lib/commands/ncgi", "lib/commands/ncgi/listener", "lib/commands/ncgi/tracker", "lib/commands/performance", "lib/commands/performance/benchmarker.rb", "lib/commands/performance/profiler.rb", "lib/commands/plugin.rb", "lib/commands/runner.rb", "lib/commands/server.rb", "lib/commands/update.rb", "lib/commands.rb", "lib/console_app.rb", "lib/console_sandbox.rb", "lib/console_with_helpers.rb", "lib/dispatcher.rb", "lib/fcgi_handler.rb", "lib/generators", "lib/generators/actions.rb", "lib/generators/active_model.rb", "lib/generators/active_record", "lib/generators/active_record/migration", "lib/generators/active_record/migration/migration_generator.rb", "lib/generators/active_record/migration/templates", "lib/generators/active_record/migration/templates/migration.rb", "lib/generators/active_record/model", "lib/generators/active_record/model/model_generator.rb", "lib/generators/active_record/model/templates", "lib/generators/active_record/model/templates/migration.rb", "lib/generators/active_record/model/templates/model.rb", "lib/generators/active_record/observer", "lib/generators/active_record/observer/observer_generator.rb", "lib/generators/active_record/observer/templates", "lib/generators/active_record/observer/templates/observer.rb", "lib/generators/active_record/session_migration", "lib/generators/active_record/session_migration/session_migration_generator.rb", "lib/generators/active_record/session_migration/templates", "lib/generators/active_record/session_migration/templates/migration.rb", "lib/generators/active_record.rb", "lib/generators/base.rb", "lib/generators/erb", "lib/generators/erb/controller", "lib/generators/erb/controller/controller_generator.rb", "lib/generators/erb/controller/templates", "lib/generators/erb/controller/templates/view.html.erb", "lib/generators/erb/mailer", "lib/generators/erb/mailer/mailer_generator.rb", "lib/generators/erb/mailer/templates", "lib/generators/erb/mailer/templates/view.erb", "lib/generators/erb/scaffold", "lib/generators/erb/scaffold/scaffold_generator.rb", "lib/generators/erb/scaffold/templates", "lib/generators/erb/scaffold/templates/_form.html.erb", "lib/generators/erb/scaffold/templates/edit.html.erb", "lib/generators/erb/scaffold/templates/index.html.erb", "lib/generators/erb/scaffold/templates/layout.html.erb", "lib/generators/erb/scaffold/templates/new.html.erb", "lib/generators/erb/scaffold/templates/show.html.erb", "lib/generators/erb.rb", "lib/generators/generated_attribute.rb", "lib/generators/migration.rb", "lib/generators/named_base.rb", "lib/generators/rails", "lib/generators/rails/app", "lib/generators/rails/app/app_generator.rb", "lib/generators/rails/app/templates", "lib/generators/rails/app/templates/app", "lib/generators/rails/app/templates/app/controllers", "lib/generators/rails/app/templates/app/controllers/application_controller.rb", "lib/generators/rails/app/templates/app/helpers", "lib/generators/rails/app/templates/app/helpers/application_helper.rb", "lib/generators/rails/app/templates/app/models", "lib/generators/rails/app/templates/app/views", "lib/generators/rails/app/templates/app/views/layouts", "lib/generators/rails/app/templates/config", "lib/generators/rails/app/templates/config/boot.rb", "lib/generators/rails/app/templates/config/databases", "lib/generators/rails/app/templates/config/databases/frontbase.yml", "lib/generators/rails/app/templates/config/databases/ibm_db.yml", "lib/generators/rails/app/templates/config/databases/mysql.yml", "lib/generators/rails/app/templates/config/databases/oracle.yml", "lib/generators/rails/app/templates/config/databases/postgresql.yml", "lib/generators/rails/app/templates/config/databases/sqlite3.yml", "lib/generators/rails/app/templates/config/environment.rb", "lib/generators/rails/app/templates/config/environments", "lib/generators/rails/app/templates/config/environments/development.rb", "lib/generators/rails/app/templates/config/environments/production.rb", "lib/generators/rails/app/templates/config/environments/test.rb", "lib/generators/rails/app/templates/config/initializers", "lib/generators/rails/app/templates/config/initializers/backtrace_silencers.rb", "lib/generators/rails/app/templates/config/initializers/inflections.rb", "lib/generators/rails/app/templates/config/initializers/mime_types.rb", "lib/generators/rails/app/templates/config/initializers/new_rails_defaults.rb", "lib/generators/rails/app/templates/config/initializers/session_store.rb.tt", "lib/generators/rails/app/templates/config/locales", "lib/generators/rails/app/templates/config/locales/en.yml", "lib/generators/rails/app/templates/config/routes.rb", "lib/generators/rails/app/templates/db", "lib/generators/rails/app/templates/db/seeds.rb", "lib/generators/rails/app/templates/dispatchers", "lib/generators/rails/app/templates/dispatchers/config.ru", "lib/generators/rails/app/templates/dispatchers/dispatch.fcgi", "lib/generators/rails/app/templates/dispatchers/dispatch.rb", "lib/generators/rails/app/templates/dispatchers/gateway.cgi", "lib/generators/rails/app/templates/doc", "lib/generators/rails/app/templates/doc/README_FOR_APP", "lib/generators/rails/app/templates/public", "lib/generators/rails/app/templates/public/404.html", "lib/generators/rails/app/templates/public/422.html", "lib/generators/rails/app/templates/public/500.html", "lib/generators/rails/app/templates/public/favicon.ico", "lib/generators/rails/app/templates/public/images", "lib/generators/rails/app/templates/public/images/rails.png", "lib/generators/rails/app/templates/public/index.html", "lib/generators/rails/app/templates/public/javascripts", "lib/generators/rails/app/templates/public/javascripts/application.js", "lib/generators/rails/app/templates/public/javascripts/controls.js", "lib/generators/rails/app/templates/public/javascripts/dragdrop.js", "lib/generators/rails/app/templates/public/javascripts/effects.js", "lib/generators/rails/app/templates/public/javascripts/prototype.js", "lib/generators/rails/app/templates/public/robots.txt", "lib/generators/rails/app/templates/public/stylesheets", "lib/generators/rails/app/templates/Rakefile", "lib/generators/rails/app/templates/README", "lib/generators/rails/app/templates/script", "lib/generators/rails/app/templates/script/about.tt", "lib/generators/rails/app/templates/script/console.tt", "lib/generators/rails/app/templates/script/dbconsole.tt", "lib/generators/rails/app/templates/script/destroy.tt", "lib/generators/rails/app/templates/script/generate.tt", "lib/generators/rails/app/templates/script/performance", "lib/generators/rails/app/templates/script/performance/benchmarker.tt", "lib/generators/rails/app/templates/script/performance/profiler.tt", "lib/generators/rails/app/templates/script/plugin.tt", "lib/generators/rails/app/templates/script/runner.tt", "lib/generators/rails/app/templates/script/server.tt", "lib/generators/rails/app/templates/test", "lib/generators/rails/app/templates/test/fixtures", "lib/generators/rails/app/templates/test/functional", "lib/generators/rails/app/templates/test/integration", "lib/generators/rails/app/templates/test/performance", "lib/generators/rails/app/templates/test/performance/browsing_test.rb", "lib/generators/rails/app/templates/test/test_helper.rb", "lib/generators/rails/app/templates/test/unit", "lib/generators/rails/app/USAGE", "lib/generators/rails/controller", "lib/generators/rails/controller/controller_generator.rb", "lib/generators/rails/controller/templates", "lib/generators/rails/controller/templates/controller.rb", "lib/generators/rails/controller/USAGE", "lib/generators/rails/generator", "lib/generators/rails/generator/generator_generator.rb", "lib/generators/rails/generator/templates", "lib/generators/rails/generator/templates/%file_name%_generator.rb.tt", "lib/generators/rails/generator/templates/templates", "lib/generators/rails/generator/templates/USAGE.tt", "lib/generators/rails/generator/USAGE", "lib/generators/rails/helper", "lib/generators/rails/helper/helper_generator.rb", "lib/generators/rails/helper/templates", "lib/generators/rails/helper/templates/helper.rb", "lib/generators/rails/helper/USAGE", "lib/generators/rails/integration_test", "lib/generators/rails/integration_test/integration_test_generator.rb", "lib/generators/rails/integration_test/USAGE", "lib/generators/rails/mailer", "lib/generators/rails/mailer/mailer_generator.rb", "lib/generators/rails/mailer/templates", "lib/generators/rails/mailer/templates/mailer.rb", "lib/generators/rails/mailer/USAGE", "lib/generators/rails/metal", "lib/generators/rails/metal/metal_generator.rb", "lib/generators/rails/metal/templates", "lib/generators/rails/metal/templates/metal.rb", "lib/generators/rails/metal/USAGE", "lib/generators/rails/migration", "lib/generators/rails/migration/migration_generator.rb", "lib/generators/rails/migration/USAGE", "lib/generators/rails/model", "lib/generators/rails/model/model_generator.rb", "lib/generators/rails/model/USAGE", "lib/generators/rails/model_subclass", "lib/generators/rails/model_subclass/model_subclass_generator.rb", "lib/generators/rails/observer", "lib/generators/rails/observer/observer_generator.rb", "lib/generators/rails/observer/USAGE", "lib/generators/rails/performance_test", "lib/generators/rails/performance_test/performance_test_generator.rb", "lib/generators/rails/performance_test/USAGE", "lib/generators/rails/plugin", "lib/generators/rails/plugin/plugin_generator.rb", "lib/generators/rails/plugin/templates", "lib/generators/rails/plugin/templates/init.rb", "lib/generators/rails/plugin/templates/install.rb", "lib/generators/rails/plugin/templates/lib", "lib/generators/rails/plugin/templates/lib/%file_name%.rb.tt", "lib/generators/rails/plugin/templates/MIT-LICENSE", "lib/generators/rails/plugin/templates/Rakefile", "lib/generators/rails/plugin/templates/README", "lib/generators/rails/plugin/templates/tasks", "lib/generators/rails/plugin/templates/tasks/%file_name%_tasks.rake.tt", "lib/generators/rails/plugin/templates/uninstall.rb", "lib/generators/rails/plugin/USAGE", "lib/generators/rails/resource", "lib/generators/rails/resource/resource_generator.rb", "lib/generators/rails/resource/USAGE", "lib/generators/rails/scaffold", "lib/generators/rails/scaffold/scaffold_generator.rb", "lib/generators/rails/scaffold/USAGE", "lib/generators/rails/scaffold_controller", "lib/generators/rails/scaffold_controller/scaffold_controller_generator.rb", "lib/generators/rails/scaffold_controller/templates", "lib/generators/rails/scaffold_controller/templates/controller.rb", "lib/generators/rails/scaffold_controller/USAGE", "lib/generators/rails/session_migration", "lib/generators/rails/session_migration/session_migration_generator.rb", "lib/generators/rails/session_migration/USAGE", "lib/generators/rails/stylesheets", "lib/generators/rails/stylesheets/stylesheets_generator.rb", "lib/generators/rails/stylesheets/templates", "lib/generators/rails/stylesheets/templates/scaffold.css", "lib/generators/rails/stylesheets/USAGE", "lib/generators/resource_helpers.rb", "lib/generators/test_unit", "lib/generators/test_unit/controller", "lib/generators/test_unit/controller/controller_generator.rb", "lib/generators/test_unit/controller/templates", "lib/generators/test_unit/controller/templates/functional_test.rb", "lib/generators/test_unit/helper", "lib/generators/test_unit/helper/helper_generator.rb", "lib/generators/test_unit/helper/templates", "lib/generators/test_unit/helper/templates/helper_test.rb", "lib/generators/test_unit/integration", "lib/generators/test_unit/integration/integration_generator.rb", "lib/generators/test_unit/integration/templates", "lib/generators/test_unit/integration/templates/integration_test.rb", "lib/generators/test_unit/mailer", "lib/generators/test_unit/mailer/mailer_generator.rb", "lib/generators/test_unit/mailer/templates", "lib/generators/test_unit/mailer/templates/fixture", "lib/generators/test_unit/mailer/templates/unit_test.rb", "lib/generators/test_unit/model", "lib/generators/test_unit/model/model_generator.rb", "lib/generators/test_unit/model/templates", "lib/generators/test_unit/model/templates/fixtures.yml", "lib/generators/test_unit/model/templates/unit_test.rb", "lib/generators/test_unit/observer", "lib/generators/test_unit/observer/observer_generator.rb", "lib/generators/test_unit/observer/templates", "lib/generators/test_unit/observer/templates/unit_test.rb", "lib/generators/test_unit/performance", "lib/generators/test_unit/performance/performance_generator.rb", "lib/generators/test_unit/performance/templates", "lib/generators/test_unit/performance/templates/performance_test.rb", "lib/generators/test_unit/plugin", "lib/generators/test_unit/plugin/plugin_generator.rb", "lib/generators/test_unit/plugin/templates", "lib/generators/test_unit/plugin/templates/%file_name%_test.rb.tt", "lib/generators/test_unit/plugin/templates/test_helper.rb", "lib/generators/test_unit/scaffold", "lib/generators/test_unit/scaffold/scaffold_generator.rb", "lib/generators/test_unit/scaffold/templates", "lib/generators/test_unit/scaffold/templates/functional_test.rb", "lib/generators/test_unit.rb", "lib/generators.rb", "lib/initializer.rb", "lib/initializer_old.rb", "lib/performance_test_help.rb", "lib/rails", "lib/rails/backtrace_cleaner.rb", "lib/rails/configuration.rb", "lib/rails/core.rb", "lib/rails/gem_builder.rb", "lib/rails/gem_dependency.rb", "lib/rails/paths.rb", "lib/rails/plugin", "lib/rails/plugin/loader.rb", "lib/rails/plugin/locator.rb", "lib/rails/plugin.rb", "lib/rails/rack", "lib/rails/rack/debugger.rb", "lib/rails/rack/log_tailer.rb", "lib/rails/rack/metal.rb", "lib/rails/rack/static.rb", "lib/rails/rack.rb", "lib/rails/vendor_gem_source_index.rb", "lib/rails/version.rb", "lib/railties_path.rb", "lib/ruby_version_check.rb", "lib/rubyprof_ext.rb", "lib/source_annotation_extractor.rb", "lib/tasks", "lib/tasks/annotations.rake", "lib/tasks/databases.rake", "lib/tasks/documentation.rake", "lib/tasks/framework.rake", "lib/tasks/gems.rake", "lib/tasks/log.rake", "lib/tasks/middleware.rake", "lib/tasks/misc.rake", "lib/tasks/rails.rb", "lib/tasks/routes.rake", "lib/tasks/statistics.rake", "lib/tasks/testing.rake", "lib/tasks/tmp.rake", "lib/test_help.rb", "lib/vendor", "lib/vendor/bundler", "lib/vendor/bundler/bin", "lib/vendor/bundler/bin/gem_bundler", "lib/vendor/bundler/lib", "lib/vendor/bundler/lib/bundler", "lib/vendor/bundler/lib/bundler/cli.rb", "lib/vendor/bundler/lib/bundler/dependency.rb", "lib/vendor/bundler/lib/bundler/finder.rb", "lib/vendor/bundler/lib/bundler/gem_bundle.rb", "lib/vendor/bundler/lib/bundler/gem_specification.rb", "lib/vendor/bundler/lib/bundler/installer.rb", "lib/vendor/bundler/lib/bundler/manifest.rb", "lib/vendor/bundler/lib/bundler/resolver", "lib/vendor/bundler/lib/bundler/resolver/builders.rb", "lib/vendor/bundler/lib/bundler/resolver/engine.rb", "lib/vendor/bundler/lib/bundler/resolver/inspect.rb", "lib/vendor/bundler/lib/bundler/resolver/search.rb", "lib/vendor/bundler/lib/bundler/resolver/stack.rb", "lib/vendor/bundler/lib/bundler/resolver/state.rb", "lib/vendor/bundler/lib/bundler/resolver.rb", "lib/vendor/bundler/lib/bundler/runtime.rb", "lib/vendor/bundler/lib/bundler.rb", "lib/vendor/bundler/LICENSE", "lib/vendor/bundler/Rakefile", "lib/vendor/thor-0.11.5", "lib/vendor/thor-0.11.5/lib", "lib/vendor/thor-0.11.6", "lib/vendor/thor-0.11.6/bin", "lib/vendor/thor-0.11.6/bin/rake2thor", "lib/vendor/thor-0.11.6/bin/thor", "lib/vendor/thor-0.11.6/CHANGELOG.rdoc", "lib/vendor/thor-0.11.6/lib", "lib/vendor/thor-0.11.6/lib/thor", "lib/vendor/thor-0.11.6/lib/thor/actions", "lib/vendor/thor-0.11.6/lib/thor/actions/create_file.rb", "lib/vendor/thor-0.11.6/lib/thor/actions/directory.rb", "lib/vendor/thor-0.11.6/lib/thor/actions/empty_directory.rb", "lib/vendor/thor-0.11.6/lib/thor/actions/file_manipulation.rb", "lib/vendor/thor-0.11.6/lib/thor/actions/inject_into_file.rb", "lib/vendor/thor-0.11.6/lib/thor/actions.rb", "lib/vendor/thor-0.11.6/lib/thor/base.rb", "lib/vendor/thor-0.11.6/lib/thor/core_ext", "lib/vendor/thor-0.11.6/lib/thor/core_ext/hash_with_indifferent_access.rb", "lib/vendor/thor-0.11.6/lib/thor/core_ext/ordered_hash.rb", "lib/vendor/thor-0.11.6/lib/thor/error.rb", "lib/vendor/thor-0.11.6/lib/thor/group.rb", "lib/vendor/thor-0.11.6/lib/thor/invocation.rb", "lib/vendor/thor-0.11.6/lib/thor/parser", "lib/vendor/thor-0.11.6/lib/thor/parser/argument.rb", "lib/vendor/thor-0.11.6/lib/thor/parser/arguments.rb", "lib/vendor/thor-0.11.6/lib/thor/parser/option.rb", "lib/vendor/thor-0.11.6/lib/thor/parser/options.rb", "lib/vendor/thor-0.11.6/lib/thor/parser.rb", "lib/vendor/thor-0.11.6/lib/thor/rake_compat.rb", "lib/vendor/thor-0.11.6/lib/thor/runner.rb", "lib/vendor/thor-0.11.6/lib/thor/shell", "lib/vendor/thor-0.11.6/lib/thor/shell/basic.rb", "lib/vendor/thor-0.11.6/lib/thor/shell/color.rb", "lib/vendor/thor-0.11.6/lib/thor/shell.rb", "lib/vendor/thor-0.11.6/lib/thor/task.rb", "lib/vendor/thor-0.11.6/lib/thor/util.rb", "lib/vendor/thor-0.11.6/lib/thor.rb", "lib/vendor/thor-0.11.6/LICENSE", "lib/vendor/thor-0.11.6/README.rdoc", "lib/webrick_server.rb", "lib/generators/rails/app/templates/app/models/.empty_directory", "lib/generators/rails/app/templates/app/views/layouts/.empty_directory", "lib/generators/rails/app/templates/public/stylesheets/.empty_directory", "lib/generators/rails/app/templates/test/fixtures/.empty_directory", "lib/generators/rails/app/templates/test/functional/.empty_directory", "lib/generators/rails/app/templates/test/integration/.empty_directory", "lib/generators/rails/app/templates/test/unit/.empty_directory", "lib/generators/rails/generator/templates/templates/.empty_directory"] - s.homepage = %q{http://www.rubyonrails.org} - s.rdoc_options = ["--exclude", "."] - s.require_paths = ["lib"] - s.rubyforge_project = %q{rails} - s.rubygems_version = %q{1.3.5} - s.summary = %q{Web-application framework with template engine, control-flow layer, and ORM.} + EOF - if s.respond_to? :specification_version then - current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION - s.specification_version = 3 + s.add_dependency('rake', '>= 0.8.3') + s.add_dependency('activesupport', '= 3.0.pre') + s.add_dependency('activerecord', '= 3.0.pre') + s.add_dependency('actionpack', '= 3.0.pre') + s.add_dependency('actionmailer', '= 3.0.pre') + s.add_dependency('activeresource', '= 3.0.pre') + + s.rdoc_options << '--exclude' << '.' + s.has_rdoc = false + + s.files = Dir['CHANGELOG', 'README', 'bin/**/*', 'builtin/**/*', 'guides/**/*', 'lib/**/*'] + s.require_path = 'lib' + s.bindir = "bin" + s.executables = ["rails"] + s.default_executable = "rails" - if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then - s.add_runtime_dependency(%q<rake>, [">= 0.8.3"]) - s.add_runtime_dependency(%q<activesupport>, ["= 3.0.pre"]) - s.add_runtime_dependency(%q<activerecord>, ["= 3.0.pre"]) - s.add_runtime_dependency(%q<actionpack>, ["= 3.0.pre"]) - s.add_runtime_dependency(%q<actionmailer>, ["= 3.0.pre"]) - s.add_runtime_dependency(%q<activeresource>, ["= 3.0.pre"]) - else - s.add_dependency(%q<rake>, [">= 0.8.3"]) - s.add_dependency(%q<activesupport>, ["= 3.0.pre"]) - s.add_dependency(%q<activerecord>, ["= 3.0.pre"]) - s.add_dependency(%q<actionpack>, ["= 3.0.pre"]) - s.add_dependency(%q<actionmailer>, ["= 3.0.pre"]) - s.add_dependency(%q<activeresource>, ["= 3.0.pre"]) - end - else - s.add_dependency(%q<rake>, [">= 0.8.3"]) - s.add_dependency(%q<activesupport>, ["= 3.0.pre"]) - s.add_dependency(%q<activerecord>, ["= 3.0.pre"]) - s.add_dependency(%q<actionpack>, ["= 3.0.pre"]) - s.add_dependency(%q<actionmailer>, ["= 3.0.pre"]) - s.add_dependency(%q<activeresource>, ["= 3.0.pre"]) - end + s.author = "David Heinemeier Hansson" + s.email = "david@loudthinking.com" + s.homepage = "http://www.rubyonrails.org" + s.rubyforge_project = "rails" end diff --git a/railties/test/abstract_unit.rb b/railties/test/abstract_unit.rb index ea6ed01c7d..4510e6241c 100644 --- a/railties/test/abstract_unit.rb +++ b/railties/test/abstract_unit.rb @@ -2,7 +2,7 @@ ORIG_ARGV = ARGV.dup require 'rubygems' gem 'rack', '~> 1.0.0' -gem 'rack-test', '~> 0.4.2' +gem 'rack-test', '~> 0.5.0' $:.unshift File.dirname(__FILE__) + "/../../activesupport/lib" $:.unshift File.dirname(__FILE__) + "/../../activerecord/lib" @@ -18,6 +18,8 @@ require 'test/unit' require 'active_support' require 'active_support/test_case' +require 'action_controller' + if defined?(RAILS_ROOT) RAILS_ROOT.replace File.dirname(__FILE__) else diff --git a/railties/test/application/load_test.rb b/railties/test/application/load_test.rb new file mode 100644 index 0000000000..5158abdbb4 --- /dev/null +++ b/railties/test/application/load_test.rb @@ -0,0 +1,51 @@ +require "isolation/abstract_unit" +# require "rails" +# require 'action_dispatch' + +module ApplicationTests + class LoadTest < Test::Unit::TestCase + include ActiveSupport::Testing::Isolation + + def rackup + config = "#{app_path}/config.ru" + # Copied from ActionDispatch::Utils.parse_config + # ActionDispatch is not necessarily available at this point. + require 'rack' + if config =~ /\.ru$/ + cfgfile = ::File.read(config) + if cfgfile[/^#\\(.*)/] + opts.parse! $1.split(/\s+/) + end + inner_app = eval "Rack::Builder.new {( " + cfgfile + "\n )}.to_app", + nil, config + else + require config + inner_app = Object.const_get(::File.basename(config, '.rb').capitalize) + end + end + + def setup + build_app + boot_rails + end + + test "rails app is present" do + assert File.exist?(app_path("config")) + end + + test "config.ru can be racked up" do + @app = rackup + assert_welcome get("/") + end + + test "Rails.application is available after config.ru has been racked up" do + rackup + assert Rails.application.new.is_a?(Rails::Application) + end + + test "the config object is available on the application object" do + rackup + assert_equal 'UTC', Rails.application.config.time_zone + end + end +end diff --git a/railties/test/backtrace_cleaner_test.rb b/railties/test/backtrace_cleaner_test.rb index 7a1b361440..c3e4f970fe 100644 --- a/railties/test/backtrace_cleaner_test.rb +++ b/railties/test/backtrace_cleaner_test.rb @@ -1,6 +1,6 @@ require 'abstract_unit' -require 'initializer' +require 'rails/initializer' require 'rails/backtrace_cleaner' if defined? Test::Unit::Util::BacktraceFilter @@ -14,13 +14,13 @@ if defined? Test::Unit::Util::BacktraceFilter @test = TestWithBacktrace.new @backtrace = [ './test/rails/benchmark_test.rb', './test/rails/dependencies.rb', '/opt/local/lib/ruby/kernel.rb' ] end - + test "test with backtrace should use the rails backtrace cleaner to clean" do Rails.stubs(:backtrace_cleaner).returns(stub(:clean)) Rails.backtrace_cleaner.expects(:clean).with(@backtrace, nil) @test.filter_backtrace(@backtrace) end - + test "filter backtrace should have the same arity as Test::Unit::Util::BacktraceFilter" do assert_nothing_raised do @test.filter_backtrace(@backtrace, '/opt/local/lib') diff --git a/railties/test/boot_test.rb b/railties/test/boot_test.rb index 7bf420d4f2..1280d27ffe 100644 --- a/railties/test/boot_test.rb +++ b/railties/test/boot_test.rb @@ -1,6 +1,6 @@ require 'abstract_unit' -require 'initializer' -require "#{File.dirname(__FILE__)}/../lib/generators/rails/app/templates/config/boot" +require 'rails/initializer' +require "#{File.dirname(__FILE__)}/../lib/rails/generators/rails/app/templates/config/boot" require 'rails/gem_dependency' class BootTest < Test::Unit::TestCase @@ -48,13 +48,6 @@ class BootTest < Test::Unit::TestCase Rails::GemBoot.any_instance.expects(:run).returns('result') assert_equal 'result', Rails.boot! end - - def test_run_loads_initializer_and_sets_load_path - boot = Rails::Boot.new - boot.expects(:load_initializer) - Rails::Initializer.expects(:run).with(:set_load_path) - boot.run - end end class VendorBootTest < Test::Unit::TestCase @@ -62,8 +55,8 @@ class VendorBootTest < Test::Unit::TestCase def test_load_initializer_requires_from_vendor_rails boot = VendorBoot.new - boot.expects(:require).with("#{RAILS_ROOT}/vendor/rails/railties/lib/initializer") - Rails::Initializer.expects(:run).with(:install_gem_spec_stubs) + boot.expects(:require).with("rails") + boot.expects(:install_gem_spec_stubs) Rails::GemDependency.expects(:add_frozen_gem_path) boot.load_initializer end @@ -76,7 +69,7 @@ class GemBootTest < Test::Unit::TestCase boot = GemBoot.new GemBoot.expects(:load_rubygems) boot.expects(:load_rails_gem) - boot.expects(:require).with('initializer') + boot.expects(:require).with('rails') boot.load_initializer end diff --git a/railties/test/console_app_test.rb b/railties/test/console_app_test.rb index f11de087e3..1437e6d885 100644 --- a/railties/test/console_app_test.rb +++ b/railties/test/console_app_test.rb @@ -2,13 +2,14 @@ require 'abstract_unit' require 'action_controller' # console_app uses 'action_controller/integration' -unless defined? ApplicationController - class ApplicationController < ActionController::Base; end - ActionController::Base.session_store = nil -end +require 'rails/dispatcher' +require 'rails/console_app' -require 'dispatcher' -require 'console_app' +module Rails + def self.application + ActionController::Routing::Routes + end +end # console_app sets Test::Unit.run to work around the at_exit hook in test/unit, which kills IRB if Test::Unit.respond_to?(:run=) @@ -27,9 +28,9 @@ if Test::Unit.respond_to?(:run=) def test_reload_should_fire_preparation_callbacks a = b = c = nil - Dispatcher.to_prepare { a = b = c = 1 } - Dispatcher.to_prepare { b = c = 2 } - Dispatcher.to_prepare { c = 3 } + ActionDispatch::Callbacks.to_prepare { a = b = c = 1 } + ActionDispatch::Callbacks.to_prepare { b = c = 2 } + ActionDispatch::Callbacks.to_prepare { c = 3 } ActionController::Routing::Routes.expects(:reload) reload! diff --git a/railties/test/fcgi_dispatcher_test.rb b/railties/test/fcgi_dispatcher_test.rb index c7a7f77118..4d77a321a0 100644 --- a/railties/test/fcgi_dispatcher_test.rb +++ b/railties/test/fcgi_dispatcher_test.rb @@ -3,9 +3,13 @@ require 'abstract_unit' uses_gem "fcgi", "0.8.7" do require 'action_controller' -require 'fcgi_handler' +require 'rails/fcgi_handler' -Dispatcher.middleware.clear +module Rails + def self.application + ActionController::Routing::Routes + end +end class RailsFCGIHandlerTest < Test::Unit::TestCase def setup diff --git a/railties/test/fixtures/lib/generators/active_record/fixjour/fixjour_generator.rb b/railties/test/fixtures/lib/generators/active_record/fixjour/fixjour_generator.rb index 7a4edb8bcb..a7d079a1bc 100644 --- a/railties/test/fixtures/lib/generators/active_record/fixjour/fixjour_generator.rb +++ b/railties/test/fixtures/lib/generators/active_record/fixjour/fixjour_generator.rb @@ -1,4 +1,4 @@ -require 'generators/active_record' +require 'rails/generators/active_record' module ActiveRecord module Generators diff --git a/railties/test/fixtures/public/foo/bar.html b/railties/test/fixtures/public/foo/bar.html deleted file mode 100644 index 9a35646205..0000000000 --- a/railties/test/fixtures/public/foo/bar.html +++ /dev/null @@ -1 +0,0 @@ -/foo/bar.html
\ No newline at end of file diff --git a/railties/test/fixtures/public/foo/index.html b/railties/test/fixtures/public/foo/index.html deleted file mode 100644 index 497a2e898f..0000000000 --- a/railties/test/fixtures/public/foo/index.html +++ /dev/null @@ -1 +0,0 @@ -/foo/index.html
\ No newline at end of file diff --git a/railties/test/fixtures/public/index.html b/railties/test/fixtures/public/index.html deleted file mode 100644 index 525950ba6b..0000000000 --- a/railties/test/fixtures/public/index.html +++ /dev/null @@ -1 +0,0 @@ -/index.html
\ No newline at end of file diff --git a/railties/test/generators/actions_test.rb b/railties/test/generators/actions_test.rb index fdaef6d9cb..f226e184d1 100644 --- a/railties/test/generators/actions_test.rb +++ b/railties/test/generators/actions_test.rb @@ -1,6 +1,6 @@ require 'abstract_unit' require 'generators/generators_test_helper' -require 'generators/rails/app/app_generator' +require 'rails/generators/rails/app/app_generator' class ActionsTest < GeneratorsTestCase def setup diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 19e41c15c8..afc0585fba 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -1,6 +1,6 @@ require 'abstract_unit' require 'generators/generators_test_helper' -require 'generators/rails/app/app_generator' +require 'rails/generators/rails/app/app_generator' class AppGeneratorTest < GeneratorsTestCase @@ -55,14 +55,12 @@ class AppGeneratorTest < GeneratorsTestCase def test_dispatchers_are_not_added_by_default run_generator - assert_no_file "config.ru" assert_no_file "public/dispatch.cgi" assert_no_file "public/dispatch.fcgi" end def test_dispatchers_are_added_if_required run_generator ["--with-dispatchers"] - assert_file "config.ru" assert_file "public/dispatch.cgi" assert_file "public/dispatch.fcgi" end diff --git a/railties/test/generators/controller_generator_test.rb b/railties/test/generators/controller_generator_test.rb index 850b9e632d..56bc688ad0 100644 --- a/railties/test/generators/controller_generator_test.rb +++ b/railties/test/generators/controller_generator_test.rb @@ -1,6 +1,6 @@ require 'abstract_unit' require 'generators/generators_test_helper' -require 'generators/rails/controller/controller_generator' +require 'rails/generators/rails/controller/controller_generator' class ControllerGeneratorTest < GeneratorsTestCase diff --git a/railties/test/generators/generator_generator_test.rb b/railties/test/generators/generator_generator_test.rb index b1ebe5f1b5..aea3f4da51 100644 --- a/railties/test/generators/generator_generator_test.rb +++ b/railties/test/generators/generator_generator_test.rb @@ -1,6 +1,6 @@ require 'abstract_unit' require 'generators/generators_test_helper' -require 'generators/rails/generator/generator_generator' +require 'rails/generators/rails/generator/generator_generator' class GeneratorGeneratorTest < GeneratorsTestCase diff --git a/railties/test/generators/generators_test_helper.rb b/railties/test/generators/generators_test_helper.rb index 2a9d680c6a..d917812383 100644 --- a/railties/test/generators/generators_test_helper.rb +++ b/railties/test/generators/generators_test_helper.rb @@ -9,7 +9,7 @@ else end $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../lib" -require 'generators' +require 'rails/generators' require 'rubygems' $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../../activerecord/lib" diff --git a/railties/test/generators/helper_generator_test.rb b/railties/test/generators/helper_generator_test.rb index 3d655016f1..f8bfc517a2 100644 --- a/railties/test/generators/helper_generator_test.rb +++ b/railties/test/generators/helper_generator_test.rb @@ -1,6 +1,6 @@ require 'abstract_unit' require 'generators/generators_test_helper' -require 'generators/rails/helper/helper_generator' +require 'rails/generators/rails/helper/helper_generator' ObjectHelper = Class.new AnotherObjectHelperTest = Class.new diff --git a/railties/test/generators/integration_test_generator_test.rb b/railties/test/generators/integration_test_generator_test.rb index 190b28012c..6a504ceea2 100644 --- a/railties/test/generators/integration_test_generator_test.rb +++ b/railties/test/generators/integration_test_generator_test.rb @@ -1,6 +1,6 @@ require 'abstract_unit' require 'generators/generators_test_helper' -require 'generators/rails/integration_test/integration_test_generator' +require 'rails/generators/rails/integration_test/integration_test_generator' class IntegrationTestGeneratorTest < GeneratorsTestCase diff --git a/railties/test/generators/mailer_generator_test.rb b/railties/test/generators/mailer_generator_test.rb index 9e74859c3a..251474ad16 100644 --- a/railties/test/generators/mailer_generator_test.rb +++ b/railties/test/generators/mailer_generator_test.rb @@ -1,6 +1,6 @@ require 'abstract_unit' require 'generators/generators_test_helper' -require 'generators/rails/mailer/mailer_generator' +require 'rails/generators/rails/mailer/mailer_generator' class MailerGeneratorTest < GeneratorsTestCase diff --git a/railties/test/generators/metal_generator_test.rb b/railties/test/generators/metal_generator_test.rb index 97e892cefb..80bf342892 100644 --- a/railties/test/generators/metal_generator_test.rb +++ b/railties/test/generators/metal_generator_test.rb @@ -1,6 +1,6 @@ require 'abstract_unit' require 'generators/generators_test_helper' -require 'generators/rails/metal/metal_generator' +require 'rails/generators/rails/metal/metal_generator' class MetalGeneratorTest < GeneratorsTestCase diff --git a/railties/test/generators/migration_generator_test.rb b/railties/test/generators/migration_generator_test.rb index a4335068e6..35172a8be4 100644 --- a/railties/test/generators/migration_generator_test.rb +++ b/railties/test/generators/migration_generator_test.rb @@ -1,6 +1,6 @@ require 'abstract_unit' require 'generators/generators_test_helper' -require 'generators/rails/migration/migration_generator' +require 'rails/generators/rails/migration/migration_generator' class MigrationGeneratorTest < GeneratorsTestCase diff --git a/railties/test/generators/model_generator_test.rb b/railties/test/generators/model_generator_test.rb index 501c7d10c6..e073b11e1e 100644 --- a/railties/test/generators/model_generator_test.rb +++ b/railties/test/generators/model_generator_test.rb @@ -1,6 +1,6 @@ require 'abstract_unit' require 'generators/generators_test_helper' -require 'generators/rails/model/model_generator' +require 'rails/generators/rails/model/model_generator' class ModelGeneratorTest < GeneratorsTestCase diff --git a/railties/test/generators/named_base_test.rb b/railties/test/generators/named_base_test.rb index 3a5c58ab32..98cbf9b8f6 100644 --- a/railties/test/generators/named_base_test.rb +++ b/railties/test/generators/named_base_test.rb @@ -1,6 +1,6 @@ require 'abstract_unit' require 'generators/generators_test_helper' -require 'generators/rails/scaffold_controller/scaffold_controller_generator' +require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator' # Mock out what we need from AR::Base. module ActiveRecord diff --git a/railties/test/generators/observer_generator_test.rb b/railties/test/generators/observer_generator_test.rb index a556731e16..6fed2998dd 100644 --- a/railties/test/generators/observer_generator_test.rb +++ b/railties/test/generators/observer_generator_test.rb @@ -1,6 +1,6 @@ require 'abstract_unit' require 'generators/generators_test_helper' -require 'generators/rails/observer/observer_generator' +require 'rails/generators/rails/observer/observer_generator' class ObserverGeneratorTest < GeneratorsTestCase diff --git a/railties/test/generators/performance_test_generator_test.rb b/railties/test/generators/performance_test_generator_test.rb index 74c9c20c4c..d19128f79a 100644 --- a/railties/test/generators/performance_test_generator_test.rb +++ b/railties/test/generators/performance_test_generator_test.rb @@ -1,6 +1,6 @@ require 'abstract_unit' require 'generators/generators_test_helper' -require 'generators/rails/performance_test/performance_test_generator' +require 'rails/generators/rails/performance_test/performance_test_generator' class PerformanceTestGeneratorTest < GeneratorsTestCase diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb index 3982586bc3..f5b8b6ffb6 100644 --- a/railties/test/generators/plugin_generator_test.rb +++ b/railties/test/generators/plugin_generator_test.rb @@ -1,6 +1,6 @@ require 'abstract_unit' require 'generators/generators_test_helper' -require 'generators/rails/plugin/plugin_generator' +require 'rails/generators/rails/plugin/plugin_generator' class PluginGeneratorTest < GeneratorsTestCase diff --git a/railties/test/generators/resource_generator_test.rb b/railties/test/generators/resource_generator_test.rb index 876ddbf84e..dcae81c204 100644 --- a/railties/test/generators/resource_generator_test.rb +++ b/railties/test/generators/resource_generator_test.rb @@ -1,6 +1,6 @@ require 'abstract_unit' require 'generators/generators_test_helper' -require 'generators/rails/resource/resource_generator' +require 'rails/generators/rails/resource/resource_generator' class ResourceGeneratorTest < GeneratorsTestCase diff --git a/railties/test/generators/scaffold_controller_generator_test.rb b/railties/test/generators/scaffold_controller_generator_test.rb index 834e43e776..f555725eb8 100644 --- a/railties/test/generators/scaffold_controller_generator_test.rb +++ b/railties/test/generators/scaffold_controller_generator_test.rb @@ -1,6 +1,6 @@ require 'abstract_unit' require 'generators/generators_test_helper' -require 'generators/rails/scaffold_controller/scaffold_controller_generator' +require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator' class ScaffoldControllerGeneratorTest < GeneratorsTestCase @@ -100,7 +100,7 @@ class ScaffoldControllerGeneratorTest < GeneratorsTestCase def test_error_is_shown_if_orm_does_not_provide_interface error = capture(:stderr){ run_generator ["User", "--orm=unknown"] } assert_equal "Could not load Unknown::Generators::ActiveModel, skipping controller. " << - "Error: no such file to load -- generators/unknown.\n", error + "Error: no such file to load -- rails/generators/unknown.\n", error end protected diff --git a/railties/test/generators/scaffold_generator_test.rb b/railties/test/generators/scaffold_generator_test.rb index 63559a8a01..c0652c034f 100644 --- a/railties/test/generators/scaffold_generator_test.rb +++ b/railties/test/generators/scaffold_generator_test.rb @@ -1,6 +1,6 @@ require 'abstract_unit' require 'generators/generators_test_helper' -require 'generators/rails/scaffold/scaffold_generator' +require 'rails/generators/rails/scaffold/scaffold_generator' class ScaffoldGeneratorTest < GeneratorsTestCase diff --git a/railties/test/generators/session_migration_generator_test.rb b/railties/test/generators/session_migration_generator_test.rb index 293b903b87..34fb996b7f 100644 --- a/railties/test/generators/session_migration_generator_test.rb +++ b/railties/test/generators/session_migration_generator_test.rb @@ -1,6 +1,6 @@ require 'abstract_unit' require 'generators/generators_test_helper' -require 'generators/rails/session_migration/session_migration_generator' +require 'rails/generators/rails/session_migration/session_migration_generator' class SessionMigrationGeneratorTest < GeneratorsTestCase diff --git a/railties/test/generators/stylesheets_generator_test.rb b/railties/test/generators/stylesheets_generator_test.rb index 02082d5cc8..15263d4bb8 100644 --- a/railties/test/generators/stylesheets_generator_test.rb +++ b/railties/test/generators/stylesheets_generator_test.rb @@ -1,6 +1,6 @@ require 'abstract_unit' require 'generators/generators_test_helper' -require 'generators/rails/stylesheets/stylesheets_generator' +require 'rails/generators/rails/stylesheets/stylesheets_generator' class StylesheetsGeneratorTest < GeneratorsTestCase diff --git a/railties/test/generators_test.rb b/railties/test/generators_test.rb index 4cc0b33521..7e6b7b183c 100644 --- a/railties/test/generators_test.rb +++ b/railties/test/generators_test.rb @@ -1,6 +1,6 @@ require File.join(File.dirname(__FILE__), 'generators', 'generators_test_helper') -require 'generators/rails/model/model_generator' -require 'generators/test_unit/model/model_generator' +require 'rails/generators/rails/model/model_generator' +require 'rails/generators/test_unit/model/model_generator' require 'mocha' class GeneratorsTest < GeneratorsTestCase diff --git a/railties/test/initializer/boot_test.rb b/railties/test/initializer/boot_test.rb new file mode 100644 index 0000000000..5ee3c45b21 --- /dev/null +++ b/railties/test/initializer/boot_test.rb @@ -0,0 +1,16 @@ +require "isolation/abstract_unit" + +module BootTests + class GemBooting < Test::Unit::TestCase + include ActiveSupport::Testing::Isolation + + def setup + # build_app + # boot_rails + end + + test "booting rails sets the load paths correctly" do + # This test is pending reworking the boot process + end + end +end
\ No newline at end of file diff --git a/railties/test/initializer/check_ruby_version_test.rb b/railties/test/initializer/check_ruby_version_test.rb index 68feba058e..1852fea4df 100644 --- a/railties/test/initializer/check_ruby_version_test.rb +++ b/railties/test/initializer/check_ruby_version_test.rb @@ -1,9 +1,14 @@ -require "initializer/test_helper" +require "isolation/abstract_unit" module InitializerTests class PathsTest < Test::Unit::TestCase include ActiveSupport::Testing::Isolation + def setup + build_app + boot_rails + end + test "rails does not initialize with ruby version 1.8.1" do assert_rails_does_not_boot "1.8.1" end diff --git a/railties/test/initializer/install_gem_spec_stubs_test.rb b/railties/test/initializer/install_gem_spec_stubs_test.rb deleted file mode 100644 index cfb12d7405..0000000000 --- a/railties/test/initializer/install_gem_spec_stubs_test.rb +++ /dev/null @@ -1,86 +0,0 @@ -require "initializer/test_helper" - -module InitializerTests - class GemSpecStubsTest < Test::Unit::TestCase - include ActiveSupport::Testing::Isolation - - def setup - $stderr = StringIO.new - end - - test "user has an old boot.rb (defined by having no Rails.vendor_rails?)" do - class << Rails - undef vendor_rails? - end - - assert_stderr(/outdated/) do - assert_raises(SystemExit) do - Rails::Initializer.run { |c| c.frameworks = [] } - end - end - end - - test "requires rubygems" do - Kernel.module_eval do - alias old_require require - def require(name) - $rubygems_required = true if name == "rubygems" - old_require(name) - end - end - - Rails.vendor_rails = true - Rails::Initializer.run { |c| c.frameworks = [] } - assert $rubygems_required - end - - # Pending until we're further along - # test "does not fail if rubygems does not exist" do - # Kernel.module_eval do - # alias old_require require - # def require(name) - # raise LoadError if name == "rubygems" - # old_require(name) - # end - # end - # - # assert_nothing_raised do - # Rails::Initializer.run { |c| c.frameworks = [] } - # end - # end - - test "adds fake Rubygems stubs if a framework is not loaded in Rubygems and we've vendored" do - Rails.vendor_rails = true - - Rails::Initializer.run { |c| c.frameworks = [] } - - %w(rails activesupport activerecord actionpack actionmailer activeresource).each do |stub| - gem_spec = Gem.loaded_specs[stub] - assert_equal Gem::Version.new(Rails::VERSION::STRING), gem_spec.version - assert_equal stub, gem_spec.name - assert_equal "", gem_spec.loaded_from - end - end - - test "doesn't replace gem specs that are already loaded" do - Rails.vendor_rails = true - - Gem.loaded_specs["rails"] = Gem::Specification.new do |s| - s.name = "rails" - s.version = Rails::VERSION::STRING - s.loaded_from = "/foo/bar/baz" - end - - Rails::Initializer.run { |c| c.frameworks = [] } - - assert_equal "/foo/bar/baz", Gem.loaded_specs["rails"].loaded_from - - %w(activesupport activerecord actionpack actionmailer activeresource).each do |stub| - gem_spec = Gem.loaded_specs[stub] - assert_equal Gem::Version.new(Rails::VERSION::STRING), gem_spec.version - assert_equal stub, gem_spec.name - assert_equal "", gem_spec.loaded_from - end - end - end -end
\ No newline at end of file diff --git a/railties/test/initializer/path_test.rb b/railties/test/initializer/path_test.rb index 8de3161546..a4264bc31c 100644 --- a/railties/test/initializer/path_test.rb +++ b/railties/test/initializer/path_test.rb @@ -1,26 +1,36 @@ -require "initializer/test_helper" +require "isolation/abstract_unit" class PathsTest < Test::Unit::TestCase include ActiveSupport::Testing::Isolation - def self.setup + def setup + build_app + boot_rails Rails::Initializer.run do |config| config.frameworks = [:action_controller, :action_view, :action_mailer, :active_record] + config.after_initialize do + ActionController::Base.session_store = nil + end end - end - - def setup @paths = Rails::Initializer.default.config.paths end def root(*path) - File.expand_path(File.join(File.dirname(__FILE__), "root", *path)) + app_path(*path).to_s end def assert_path(paths, *dir) assert_equal [root(*dir)], paths.paths end + def assert_in_load_path(*path) + assert $:.any? { |p| File.expand_path(p) == root(*path) }, "Load path does not include '#{root(*path)}'. They are:\n-----\n #{$:.join("\n")}\n-----" + end + + def assert_not_in_load_path(*path) + assert !$:.any? { |p| File.expand_path(p) == root(*path) }, "Load path includes '#{root(*path)}'. They are:\n-----\n #{$:.join("\n")}\n-----" + end + test "booting up Rails yields a valid paths object" do assert_path @paths.app, "app" assert_path @paths.app.metals, "app", "metal" @@ -36,8 +46,7 @@ class PathsTest < Test::Unit::TestCase assert_path @paths.config.locales, "config", "locales" assert_path @paths.config.environments, "config", "environments" - assert_equal Pathname.new(File.dirname(__FILE__)).join("root", "app", "controllers").expand_path, - Pathname.new(@paths.app.controllers.to_a.first).expand_path + assert_equal root("app", "controllers"), @paths.app.controllers.to_a.first assert_equal Pathname.new(File.dirname(__FILE__)).join("..", "..", "builtin", "rails_info").expand_path, Pathname.new(@paths.app.controllers.to_a[1]).expand_path end @@ -53,24 +62,16 @@ class PathsTest < Test::Unit::TestCase assert_equal "#{RAILS_ENV}.rb", @paths.config.environments.glob end - def assert_in_load_path(*path) - assert $:.any? { |p| File.expand_path(p) == root(*path) }, "Load path does not include '#{root(*path)}'. They are:\n-----\n #{$:.join("\n")}\n-----" - end - - def assert_not_in_load_path(*path) - assert !$:.any? { |p| File.expand_path(p) == root(*path) }, "Load path includes '#{root(*path)}'. They are:\n-----\n #{$:.join("\n")}\n-----" - end - test "load path includes each of the paths in config.paths as long as the directories exist" do assert_in_load_path "app" assert_in_load_path "app", "controllers" - assert_in_load_path "app", "metal" assert_in_load_path "app", "models" assert_in_load_path "app", "helpers" assert_in_load_path "lib" assert_in_load_path "vendor" assert_not_in_load_path "app", "views" + assert_not_in_load_path "app", "metal" assert_not_in_load_path "app", "services" assert_not_in_load_path "config" assert_not_in_load_path "config", "locales" diff --git a/railties/test/initializer/root/app/controllers/.keep b/railties/test/initializer/root/app/controllers/.keep deleted file mode 100644 index e69de29bb2..0000000000 --- a/railties/test/initializer/root/app/controllers/.keep +++ /dev/null diff --git a/railties/test/initializer/root/app/helpers/.keep b/railties/test/initializer/root/app/helpers/.keep deleted file mode 100644 index e69de29bb2..0000000000 --- a/railties/test/initializer/root/app/helpers/.keep +++ /dev/null diff --git a/railties/test/initializer/root/app/metal/.keep b/railties/test/initializer/root/app/metal/.keep deleted file mode 100644 index e69de29bb2..0000000000 --- a/railties/test/initializer/root/app/metal/.keep +++ /dev/null diff --git a/railties/test/initializer/root/app/models/.keep b/railties/test/initializer/root/app/models/.keep deleted file mode 100644 index e69de29bb2..0000000000 --- a/railties/test/initializer/root/app/models/.keep +++ /dev/null diff --git a/railties/test/initializer/root/app/views/.keep b/railties/test/initializer/root/app/views/.keep deleted file mode 100644 index e69de29bb2..0000000000 --- a/railties/test/initializer/root/app/views/.keep +++ /dev/null diff --git a/railties/test/initializer/root/config/database.yml b/railties/test/initializer/root/config/database.yml deleted file mode 100644 index ce3356be0c..0000000000 --- a/railties/test/initializer/root/config/database.yml +++ /dev/null @@ -1,4 +0,0 @@ -development: - adapter: sqlite3 - database: db/railties.db - timeout: 5000
\ No newline at end of file diff --git a/railties/test/initializer/root/config/environments/.keep b/railties/test/initializer/root/config/environments/.keep deleted file mode 100644 index e69de29bb2..0000000000 --- a/railties/test/initializer/root/config/environments/.keep +++ /dev/null diff --git a/railties/test/initializer/root/config/locales/.keep b/railties/test/initializer/root/config/locales/.keep deleted file mode 100644 index e69de29bb2..0000000000 --- a/railties/test/initializer/root/config/locales/.keep +++ /dev/null diff --git a/railties/test/initializer/root/config/routes.rb b/railties/test/initializer/root/config/routes.rb deleted file mode 100644 index e69de29bb2..0000000000 --- a/railties/test/initializer/root/config/routes.rb +++ /dev/null diff --git a/railties/test/initializer/root/lib/.keep b/railties/test/initializer/root/lib/.keep deleted file mode 100644 index e69de29bb2..0000000000 --- a/railties/test/initializer/root/lib/.keep +++ /dev/null diff --git a/railties/test/initializer/root/tmp/.keep b/railties/test/initializer/root/tmp/.keep deleted file mode 100644 index e69de29bb2..0000000000 --- a/railties/test/initializer/root/tmp/.keep +++ /dev/null diff --git a/railties/test/initializer/root/tmp/cache/.keep b/railties/test/initializer/root/tmp/cache/.keep deleted file mode 100644 index e69de29bb2..0000000000 --- a/railties/test/initializer/root/tmp/cache/.keep +++ /dev/null diff --git a/railties/test/initializer/root/vendor/.keep b/railties/test/initializer/root/vendor/.keep deleted file mode 100644 index e69de29bb2..0000000000 --- a/railties/test/initializer/root/vendor/.keep +++ /dev/null diff --git a/railties/test/initializer/test_helper.rb b/railties/test/initializer/test_helper.rb deleted file mode 100644 index f6a2547efc..0000000000 --- a/railties/test/initializer/test_helper.rb +++ /dev/null @@ -1,51 +0,0 @@ -# This is a test helper file that simulates a rails application being -# boot from scratch in vendored mode. This file should really only be -# required in test cases that use the isolation helper so that requires -# can be reset correctly. -RAILS_ROOT = "#{File.dirname(__FILE__)}/root" -RAILS_FRAMEWORK_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../..") - -require 'rubygems' -gem 'rack', '~> 1.0.0' - -require "test/unit" -# We are purposely avoiding adding things to the load path to catch bugs that only happen in the genuine article -require "#{RAILS_FRAMEWORK_ROOT}/activesupport/lib/active_support/testing/isolation" -require "#{RAILS_FRAMEWORK_ROOT}/activesupport/lib/active_support/testing/declarative" - -class Test::Unit::TestCase - extend ActiveSupport::Testing::Declarative - - def assert_stderr(match) - $stderr = StringIO.new - yield - $stderr.rewind - err = $stderr.read - assert_match match, err - ensure - $stderr = STDERR - end -end - -# Fake boot.rb -module Rails - class << self - attr_accessor :vendor_rails - - def vendor_rails? - @vendor_rails - end - - def boot! - # Require the initializer - require "#{RAILS_FRAMEWORK_ROOT}/railties/lib/initializer" - # Run the initializer the same way boot.rb does it - Rails::Initializer.run(:install_gem_spec_stubs) - Rails::GemDependency.add_frozen_gem_path - Rails::Initializer.run(:set_load_path) - end - end -end - -# All that for this: -Rails.boot! diff --git a/railties/test/initializer_test.rb b/railties/test/initializer_test.rb index 5bbd060962..b67db9c835 100644 --- a/railties/test/initializer_test.rb +++ b/railties/test/initializer_test.rb @@ -1,6 +1,6 @@ require 'abstract_unit' -require 'initializer' -require 'generators' +require 'rails/initializer' +require 'rails/generators' require 'action_view' require 'action_mailer' diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb new file mode 100644 index 0000000000..869e8429cf --- /dev/null +++ b/railties/test/isolation/abstract_unit.rb @@ -0,0 +1,131 @@ +# Note: +# It is important to keep this file as light as possible +# the goal for tests that require this is to test booting up +# rails from an empty state, so anything added here could +# hide potential failures +# +# It is also good to know what is the bare minimum to get +# Rails booted up. + +# TODO: Remove rubygems when possible +require 'rubygems' +require 'test/unit' + +# TODO: Remove setting this magic constant +RAILS_FRAMEWORK_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../..") + +# These files do not require any others and are needed +# to run the tests +require "#{RAILS_FRAMEWORK_ROOT}/activesupport/lib/active_support/testing/isolation" +require "#{RAILS_FRAMEWORK_ROOT}/activesupport/lib/active_support/testing/declarative" + +module TestHelpers + module Paths + module_function + + def tmp_path(*args) + File.expand_path(File.join(File.dirname(__FILE__), *%w[.. .. tmp] + args)) + end + + def app_path(*args) + tmp_path(*%w[app] + args) + end + end + + module Rack + def extract_body(response) + "".tap do |body| + response[2].each {|chunk| body << chunk } + end + end + + def get(path) + @app.call(::Rack::MockRequest.env_for(path)) + end + + def assert_welcome(resp) + assert_equal 200, resp[0] + assert resp[1]["Content-Type"] = "text/html" + assert extract_body(resp).match(/Welcome aboard/) + end + + def assert_success(resp) + assert_equal 202, resp[0] + end + + def assert_missing(resp) + assert_equal 404, resp[0] + end + + def assert_header(key, value, resp) + assert_equal value, resp[1][key.to_s] + end + + def assert_body(expected, resp) + assert_equal expected, extract_body(resp) + end + end + + module Generation + def build_app(options = {}) + FileUtils.rm_rf(app_path) + FileUtils.cp_r(tmp_path('app_template'), app_path) + + # Delete the initializers unless requested + unless options[:initializers] + Dir["#{app_path}/config/initializers/*.rb"].each do |initializer| + File.delete(initializer) + end + end + + environment = File.read("#{app_path}/config/environment.rb") + if environment =~ /(\n\s*end\s*)\Z/ + File.open("#{app_path}/config/environment.rb", 'w') do |f| + f.puts $` + %'\nconfig.action_controller.session = { :key => "_myapp_session", :secret => "bac838a849c1d5c4de2e6a50af826079" }\n' + $1 + end + end + end + + def app_file(path, contents) + File.open(app_path(path), 'w') do |f| + f.puts contents + end + end + + def controller(name, contents) + app_file("app/controllers/#{name}_controller.rb", contents) + end + + def boot_rails + # TMP mega hax to prevent boot.rb from actually booting + Object.class_eval <<-RUBY, __FILE__, __LINE__+1 + module Rails + Initializer = 'lol' + require "#{app_path}/config/boot" + remove_const(:Initializer) + booter = VendorBoot.new + booter.run + end + RUBY + end + end +end + +class Test::Unit::TestCase + include TestHelpers::Paths + include TestHelpers::Rack + include TestHelpers::Generation + extend ActiveSupport::Testing::Declarative +end + +# Create a scope and build a fixture rails app +Module.new do + extend TestHelpers::Paths + # Build a rails app + if File.exist?(tmp_path) + FileUtils.rm_rf(tmp_path) + end + + FileUtils.mkdir(tmp_path) + `#{Gem.ruby} #{RAILS_FRAMEWORK_ROOT}/railties/bin/rails #{tmp_path('app_template')}` +end diff --git a/railties/test/metal_test.rb b/railties/test/metal_test.rb index c79a819a76..6864254e4c 100644 --- a/railties/test/metal_test.rb +++ b/railties/test/metal_test.rb @@ -1,5 +1,5 @@ require 'abstract_unit' -require 'initializer' +require 'rails/initializer' class MetalTest < Test::Unit::TestCase def test_metals_should_return_list_of_found_metal_apps diff --git a/railties/test/new_initializer_test.rb b/railties/test/new_initializer_test.rb index 8d9ef7bee3..67b66fb088 100644 --- a/railties/test/new_initializer_test.rb +++ b/railties/test/new_initializer_test.rb @@ -1,6 +1,6 @@ require 'abstract_unit' require 'active_support/ruby/shim' -require 'initializer' +require 'rails/initializer' class InitializerRunnerTest < ActiveSupport::TestCase diff --git a/railties/test/plugin_test_helper.rb b/railties/test/plugin_test_helper.rb index 893095fa66..93004e0ddf 100644 --- a/railties/test/plugin_test_helper.rb +++ b/railties/test/plugin_test_helper.rb @@ -3,7 +3,7 @@ $:.unshift File.dirname(__FILE__) + "/../../activesupport/lib" require 'test/unit' require 'active_support' -require 'initializer' +require 'rails/initializer' require 'abstract_unit' # We need to set RAILS_ROOT if it isn't already set diff --git a/railties/test/rack_static_test.rb b/railties/test/rack_static_test.rb deleted file mode 100644 index ad673f6f19..0000000000 --- a/railties/test/rack_static_test.rb +++ /dev/null @@ -1,46 +0,0 @@ -require 'abstract_unit' - -require 'action_controller' -require 'rails/rack' - -class RackStaticTest < ActiveSupport::TestCase - def setup - FileUtils.cp_r "#{RAILS_ROOT}/fixtures/public", "#{RAILS_ROOT}/public" - end - - def teardown - FileUtils.rm_rf "#{RAILS_ROOT}/public" - end - - DummyApp = lambda { |env| - [200, {"Content-Type" => "text/plain"}, ["Hello, World!"]] - } - App = Rails::Rack::Static.new(DummyApp) - - test "serves dynamic content" do - assert_equal "Hello, World!", get("/nofile") - end - - test "serves static index at root" do - assert_equal "/index.html", get("/index.html") - assert_equal "/index.html", get("/index") - assert_equal "/index.html", get("/") - end - - test "serves static file in directory" do - assert_equal "/foo/bar.html", get("/foo/bar.html") - assert_equal "/foo/bar.html", get("/foo/bar/") - assert_equal "/foo/bar.html", get("/foo/bar") - end - - test "serves static index file in directory" do - assert_equal "/foo/index.html", get("/foo/index.html") - assert_equal "/foo/index.html", get("/foo/") - assert_equal "/foo/index.html", get("/foo") - end - - private - def get(path) - Rack::MockRequest.new(App).request("GET", path).body - end -end diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb index 6a60908859..99cf9168e1 100644 --- a/railties/test/rails_info_controller_test.rb +++ b/railties/test/rails_info_controller_test.rb @@ -1,6 +1,5 @@ require 'abstract_unit' require 'action_controller' -require 'action_controller/testing/process' require 'rails/info' require 'rails/info_controller' diff --git a/railties/test/rails_info_test.rb b/railties/test/rails_info_test.rb index 568e2a9972..dcf9966c0d 100644 --- a/railties/test/rails_info_test.rb +++ b/railties/test/rails_info_test.rb @@ -80,11 +80,11 @@ EOS end end - def test_middleware_property - assert property_defined?('Middleware') - end - def test_html_includes_middleware + Rails::Info.module_eval do + property 'Middleware', ['Rack::Lock', 'Rack::Static'] + end + html = Rails::Info.to_html assert html.include?('<tr><td class="name">Middleware</td>') properties.value_for('Middleware').each do |value| |