diff options
Diffstat (limited to 'railties')
-rw-r--r-- | railties/CHANGELOG | 6 | ||||
-rw-r--r-- | railties/builtin/controllers/rails_info_controller.rb | 12 | ||||
-rw-r--r-- | railties/builtin/rails_info/rails/info.rb (renamed from railties/lib/rails_info.rb) | 1 | ||||
-rw-r--r-- | railties/builtin/rails_info/rails/info_controller.rb | 11 | ||||
-rw-r--r-- | railties/html/index.html | 2 | ||||
-rw-r--r-- | railties/lib/initializer.rb | 10 |
6 files changed, 23 insertions, 19 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 6009c6b584..ef1144b546 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,11 @@ *SVN* +* Remove explicit loading of RailsInfo and RailsInfoController. [Nicholas Seckar] + +* Move RailsInfo and RailsInfoController to Rails::Info and Rails::InfoController. [Nicholas Seckar] + +* Extend load path with Railties' builtin directory to make adding support code easy. [Nicholas Seckar] + * Fix the rails_info controller by explicitly loading it, and marking it as not reloadable. [Nicholas Seckar] * Fixed rails:freeze:gems for Windows #3274 [paul@paulbutcher.com] diff --git a/railties/builtin/controllers/rails_info_controller.rb b/railties/builtin/controllers/rails_info_controller.rb deleted file mode 100644 index ff943b130a..0000000000 --- a/railties/builtin/controllers/rails_info_controller.rb +++ /dev/null @@ -1,12 +0,0 @@ -class RailsInfoController < ActionController::Base - - def self.reloadable?() false end - - def properties - if local_request? - render :inline => Rails::Info.to_html - else - render :text => '<p>For security purposes, this information is only available to local requests.</p>', :status => 500 - end - end -end diff --git a/railties/lib/rails_info.rb b/railties/builtin/rails_info/rails/info.rb index 86c3fec841..9ded9e0649 100644 --- a/railties/lib/rails_info.rb +++ b/railties/builtin/rails_info/rails/info.rb @@ -1,5 +1,4 @@ require 'rails_version' -require File.join(File.dirname(File.dirname(__FILE__)), 'builtin/controllers/rails_info_controller') module Rails module Info diff --git a/railties/builtin/rails_info/rails/info_controller.rb b/railties/builtin/rails_info/rails/info_controller.rb new file mode 100644 index 0000000000..7534447043 --- /dev/null +++ b/railties/builtin/rails_info/rails/info_controller.rb @@ -0,0 +1,11 @@ +module Rails + class InfoController < ActionController::Base + def properties + if local_request? + render :inline => Rails::Info.to_html + else + render :text => '<p>For security purposes, this information is only available to local requests.</p>', :status => 500 + end + end + end +end
\ No newline at end of file diff --git a/railties/html/index.html b/railties/html/index.html index 1f5e62bb16..d739d4b27e 100644 --- a/railties/html/index.html +++ b/railties/html/index.html @@ -183,7 +183,7 @@ <script type="text/javascript"> function about() { if (Element.empty('about-content')) { - new Ajax.Updater('about-content', 'rails_info/properties', { + new Ajax.Updater('about-content', 'rails/info/properties', { method: 'get', onFailure: function() {Element.classNames('about-content').add('failure')}, onComplete: function() {new Effect.BlindDown('about-content', {duration: 0.25})} diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index 6a2e765dbf..132c70cd21 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -96,7 +96,7 @@ module Rails # the individual base class configurations. load_environment - load_framework_info + add_support_load_paths load_plugins @@ -129,10 +129,10 @@ module Rails configuration.frameworks.each { |framework| require(framework.to_s) } end - # Loads Rails::VERSION and Rails::Info. - # TODO: Make this work via dependencies.rb/const_missing instead. - def load_framework_info - require 'rails_info' + # Add the load paths used by support functions such as the info controller + def add_support_load_paths + builtins = File.join(File.dirname(File.dirname(__FILE__)), 'builtin', '*') + $LOAD_PATH.concat(Dir[builtins]) end # Loads all plugins in <tt>config.plugin_paths</tt>. <tt>plugin_paths</tt> |