1 files changed, 15 insertions, 29 deletions

diff --git a/railties/lib/rails/info.rb b/railties/lib/rails/info.rb
index aacc1be2fc..5909446b66 100644
--- a/railties/lib/rails/info.rb
+++ b/railties/lib/rails/info.rb
@@ -1,11 +1,14 @@
 require "cgi"
 
 module Rails
+  # This module helps build the runtime properties used to display in the
+  # Rails::InfoController responses. Including the active Rails version, Ruby
+  # version, Rack version, and so on.
   module Info
     mattr_accessor :properties
     class << (@@properties = [])
       def names
-        map {|val| val.first }
+        map(&:first)
       end
 
       def value_for(property_name)
@@ -22,19 +25,8 @@ module Rails
       rescue Exception
       end
 
-      def frameworks
-        %w( active_record action_pack action_mailer active_support )
-      end
-
-      def framework_version(framework)
-        if Object.const_defined?(framework.classify)
-          require "#{framework}/version"
-          "#{framework.classify}::VERSION::STRING".constantize
-        end
-      end
-
       def to_s
-        column_width = properties.names.map {|name| name.length}.max
+        column_width = properties.names.map(&:length).max
         info = properties.map do |name, value|
           value = value.join(", ") if value.is_a?(Array)
           "%-#{column_width}s   %s" % [name, value]
@@ -46,7 +38,7 @@ module Rails
       alias inspect to_s
 
       def to_html
-        (table = '<table>').tap do
+        '<table>'.tap do |table|
           properties.each do |(name, value)|
             table << %(<tr><td class="name">#{CGI.escapeHTML(name.to_s)}</td>)
             formatted_value = if value.kind_of?(Array)
@@ -61,8 +53,15 @@ module Rails
       end
     end
 
-    # The Ruby version and platform, e.g. "1.8.2 (powerpc-darwin8.2.0)".
-    property 'Ruby version', "#{RUBY_VERSION} (#{RUBY_PLATFORM})"
+    # The Rails version.
+    property 'Rails version' do
+      Rails.version.to_s
+    end
+
+    # The Ruby version and platform, e.g. "2.0.0-p247 (x86_64-darwin12.4.0)".
+    property 'Ruby version' do
+      "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} (#{RUBY_PLATFORM})"
+    end
 
     # The RubyGems version, if it's installed.
     property 'RubyGems version' do
@@ -73,23 +72,10 @@ module Rails
       ::Rack.release
     end
 
-    # The Rails version.
-    property 'Rails version' do
-      Rails::VERSION::STRING
-    end
-
     property 'JavaScript Runtime' do
       ExecJS.runtime.name
     end
 
-    # Versions of each Rails framework (Active Record, Action Pack,
-    # Action Mailer, and Active Support).
-    frameworks.each do |framework|
-      property "#{framework.titlecase} version" do
-        framework_version(framework)
-      end
-    end
-
     property 'Middleware' do
       Rails.configuration.middleware.map(&:inspect)
     end