Commit Graph

2461 Commits

Author SHA1 Message Date
Carl Lerche
ae7ada1fde Some railties cleanup:
* Rename <framework>/rails.rb -> <framework>/railtie.rb
	* Rails::Plugin -> Rails::Railtie
	* Rails::Plugin::Vendored -> Rails::Plugin
2009-12-31 13:12:52 -08:00
Carl Lerche
e749424dfa Rename rails.rb -> rails/all.rb and rails/core.rb -> rails.rb 2009-12-31 13:12:52 -08:00
Carl Lerche
2f8643955a Raise a helpful error if config.frameworks is used 2009-12-31 11:57:59 -08:00
Carl Lerche
a23f4b6aee Add a /rails.rb for each framework for consistency 2009-12-31 11:57:59 -08:00
Carl Lerche
1e41097294 Fully remove config.frameworks in favor of requires in boot.rb 2009-12-31 11:57:59 -08:00
David Heinemeier Hansson
ea41a757aa Dont gitkeep things that are gitignored 2009-12-31 11:09:10 -05:00
Jeremy Kemper
16f1a2b573 Clarify assertion 2009-12-30 23:21:10 -08:00
David Heinemeier Hansson
96c27e4003 Merge branch 'master' of github.com:rails/rails 2009-12-31 01:15:30 -05:00
David Heinemeier Hansson
5d8342cc32 Added .gitkeep to empty directories and --skip-git to skip gitignore/gitkeep files 2009-12-31 01:14:23 -05:00
David Heinemeier Hansson
5eb3ceca01 Orphan experiment no longer needed 2009-12-30 22:55:52 -05:00
Jeremy Kemper
1fbd02e446 Revert "Add config.action_controller.include behavior to plugins."
This reverts commit 7e8b7f46bf.

Conflicts:

	railties/lib/rails/plugin.rb
2009-12-30 19:34:15 -08:00
Jeremy Kemper
d349b22097 Remove self-require 2009-12-30 19:00:12 -08:00
Jeremy Kemper
79550e8995 Revert "Add default respond_to formats to ApplicationController."
(Needs consensus that these are appropriate defaults.)

This reverts commit 66604b2e0e.
2009-12-29 19:11:00 -08:00
Carl Lerche
e5c88434db Use the correct method for eager loading autoloads 2009-12-29 19:04:37 -08:00
Jeremy Kemper
485d244eae Merge branch 'master' of github.com:rails/rails 2009-12-29 15:38:17 -08:00
José Valim
0b37572552 Clean up railties Rakefile from old responsibilities which are now part of main Rakefile 2009-12-29 23:58:44 +01:00
José Valim
1a4d909c68 Add rails app --edge and rails app --dev 2009-12-29 23:58:34 +01:00
José Valim
66604b2e0e Add default respond_to formats to ApplicationController. 2009-12-29 23:58:25 +01:00
Sam Pohlenz
468bdb3ed8 Make plugins responsible for loading their own rake tasks
Signed-off-by: Carl Lerche <carllerche@mac.com>
2009-12-29 14:47:48 -08:00
Sam Pohlenz
cbce027669 Application object should instantiate non-vendored plugins
Signed-off-by: Carl Lerche <carllerche@mac.com>
2009-12-29 14:45:43 -08:00
Carl Lerche
3cb7e04763 Finally remove rails/initializer.rb 2009-12-29 13:20:10 -08:00
Carl Lerche
aa1b32ae97 Check to see if the plugin object responds to load_tasks (vendor/plugin/* does not yet) Fixes Sam Ruby's tests. 2009-12-29 10:49:12 -08:00
Carl Lerche
4ee70643b3 Don't require initializer.rb in core.rb 2009-12-28 18:26:15 -08:00
Carl Lerche
49c800b6bd Move the ActiveRecord related rake tasks into the AR gem. 2009-12-28 17:53:05 -08:00
Carl Lerche
c02f278263 Add the ability to have plugins load rake tasks. 2009-12-28 17:53:04 -08:00
Jeremy Kemper
f95fcdd3af Fix copy/pasted test class name 2009-12-28 11:40:34 -08:00
Jeremy Kemper
4691cc43ee Fix ruby version test 2009-12-28 11:40:23 -08:00
David Heinemeier Hansson
a642edbef3 Added default .gitignore (this is just recognizing Git market share, don't throw a hissy if you use another SCM) [DHH] 2009-12-27 17:48:11 -08:00
José Valim
a176263ebc Fix generators tests.
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2009-12-27 15:19:16 -08:00
David Heinemeier Hansson
5012a1558d Merge branch 'master' of github.com:rails/rails 2009-12-27 14:44:21 -08:00
David Heinemeier Hansson
1cd949006a Fix the i18n dependency problem 2009-12-27 14:43:06 -08:00
Yehuda Katz
12e43494a7 Merge remote branch 'jose/perf' 2009-12-27 14:36:59 -08:00
José Valim
7e8b7f46bf Add config.action_controller.include behavior to plugins. 2009-12-27 13:31:36 +01:00
Jeremy Kemper
51d84eff12 Require bundled environment, if present, so Active Support can load i18n 2009-12-26 22:22:48 -08:00
Joshua Peek
bdf8ee44c5 script/server should init Rails by loading config.ru
Fixes "Rails 3.0 doesn't fucking work"
2009-12-26 18:23:48 -06:00
David Heinemeier Hansson
b9c0a16655 The new routes shortform now also works for :as 2009-12-24 16:08:03 -08:00
Carlhuda
84f1137ef8 Merge remote branch 'origin/master'
Conflicts:
	railties/lib/rails/application.rb
2009-12-23 19:18:11 -08:00
Carlhuda
c4d6d50a46 Rackup config.ru from the correct directory 2009-12-23 19:10:44 -08:00
Carlhuda
af5c3c852e Require active_support/all unless specifically requested to be left out. 2009-12-23 19:00:20 -08:00
Jeremy Kemper
7a6f73e79b Fix reference to Application#configuration to use #config 2009-12-23 17:47:38 -08:00
Carlhuda
d926fb62e8 Isolation tests intentionally avoid loading any state (because they're often testing things that have their own load path semantics that should not be polluted), so rack/test is not yet on the load path. Moving require "rack/test" into the setup means and after boot_rails means that it'll be required after the laod path has been altered to add in the Rails vendor/gems 2009-12-23 17:46:38 -08:00
Carlhuda
d2bd71a145 Finish moving config.frameworks-dependent code to the framework plugin 2009-12-23 17:23:29 -08:00
Jeremy Kemper
1ee50e58f6 Fix Rack::Lock middleware condition: use *unless* we allow concurrency 2009-12-23 17:14:21 -08:00
Jeremy Kemper
94bb331635 Shift more responsibility from application class to its singleton instance. Treat instantiation and boot as separate steps. Use app.config rather than app.configuration. 2009-12-23 17:11:17 -08:00
Carlhuda
61af34b001 Make /rails/info/properties work again. Also, the mocked up tests were passing so we added a test that actually tested this functionality. 2009-12-23 16:26:10 -08:00
Carlhuda
83be262b4b Isolation tests intentionally avoid loading any state (because they're often testing things that have their own load path semantics that should not be polluted), so rack/test is not yet on the load path. Moving require "rack/test" into the setup means and after boot_rails means that it'll be required after the laod path has been altered to add in the Rails vendor/gems 2009-12-23 16:14:34 -08:00
Carlhuda
38aeb1528c Moving out some framework specific initializers into the framework libraries. 2009-12-23 16:13:09 -08:00
Carlhuda
fa8dfc7d01 Raise an exception if an initializer is defined without a block 2009-12-23 15:16:38 -08:00
Carlhuda
dc677f7665 tests pass with requiring the frameworks in rails.rb 2009-12-23 15:16:38 -08:00
David Heinemeier Hansson
e7ef57dd0d Merge 2009-12-22 17:31:29 -08:00