Remove explicit loading of RailsInfo and RailsInfoController.

Move RailsInfo and RailsInfoController to Rails::Info and Rails::InfoController.
Extend load path with Railties' builtin directory to make adding support code easy.


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3981 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

3 files changed, 132 insertions, 12 deletions

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/builtin/rails_info/rails/info.rb b/railties/builtin/rails_info/rails/info.rb
new file mode 100644
index 0000000000..9ded9e0649
--- /dev/null
+++ b/railties/builtin/rails_info/rails/info.rb
@@ -0,0 +1,121 @@
+require 'rails_version'
+
+module Rails
+  module Info
+    mattr_accessor :properties
+    class << (@@properties = [])
+      def names
+        map {|(name, )| name}
+      end
+      
+      def value_for(property_name)
+        find {|(name, )| name == property_name}.last rescue nil
+      end
+    end
+  
+    class << self #:nodoc:
+      def property(name, value = nil)
+        value ||= yield
+        properties << [name, value] if value 
+      rescue Exception
+      end
+
+      def components
+        %w( active_record action_pack action_web_service action_mailer active_support )
+      end
+      
+      def component_version(component)
+        require "#{component}/version"
+        "#{component.classify}::VERSION::STRING".constantize
+      end
+    
+      def edge_rails_revision(info = svn_info)
+        info[/^Revision: (\d+)/, 1] || freeze_edge_version
+      end
+
+      def freeze_edge_version
+        if File.exists?(rails_vendor_root)
+          Dir[File.join(rails_vendor_root, 'REVISION_*')].first.scan(/_(\d+)$/).first.first rescue 'unknown'
+        end
+      end
+
+      def to_s
+        column_width = properties.names.map {|name| name.length}.max
+        ["About your application's environment", *properties.map do |property|
+          "%-#{column_width}s   %s" % property
+        end] * "\n"
+      end
+
+      alias inspect to_s
+      
+      def to_html
+        returning table = '<table>' do
+          properties.each do |(name, value)|
+            table << %(<tr><td class="name">#{CGI.escapeHTML(name)}</td>)
+            table << %(<td class="value">#{CGI.escapeHTML(value)}</td></tr>)
+          end
+          table << '</table>'
+        end
+      end
+
+      protected
+        def rails_vendor_root
+          @rails_vendor_root ||= "#{RAILS_ROOT}/vendor/rails"
+        end
+
+        def svn_info
+          env_lang, ENV['LC_ALL'] = ENV['LC_ALL'], 'C'
+          Dir.chdir(rails_vendor_root) do
+            silence_stderr { `svn info` }
+          end
+        ensure
+          ENV['LC_ALL'] = env_lang
+        end
+    end
+
+    # The Ruby version and platform, e.g. "1.8.2 (powerpc-darwin8.2.0)".
+    property 'Ruby version', "#{RUBY_VERSION} (#{RUBY_PLATFORM})"
+
+    # The RubyGems version, if it's installed.
+    property 'RubyGems version' do
+      Gem::RubyGemsVersion
+    end
+  
+    # The Rails version.
+    property 'Rails version' do
+      Rails::VERSION::STRING
+    end
+  
+    # Versions of each Rails component (Active Record, Action Pack, 
+    # Action Web Service, Action Mailer, and Active Support).
+    components.each do |component|
+      property "#{component.titlecase} version" do 
+        component_version(component)
+      end
+    end
+  
+    # The Rails SVN revision, if it's checked out into vendor/rails.
+    property 'Edge Rails revision' do
+      edge_rails_revision
+    end
+  
+    # The application's location on the filesystem.
+    property 'Application root' do
+      File.expand_path(RAILS_ROOT)
+    end
+
+    # The current Rails environment (development, test, or production).
+    property 'Environment' do
+      RAILS_ENV
+    end
+    
+    # The name of the database adapter for the current environment.
+    property 'Database adapter' do
+      ActiveRecord::Base.configurations[RAILS_ENV]['adapter']
+    end
+
+    property 'Database schema version' do
+      ActiveRecord::Migrator.current_version rescue nil
+    end
+  end
+end
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