Merge branch 'master' of git://github.com/rails/rails

1 files changed, 9 insertions, 22 deletions

diff --git a/railties/guides/rails_guides.rb b/railties/guides/rails_guides.rb
index 0d9458bf0f..e6f0b694a6 100644
--- a/railties/guides/rails_guides.rb
+++ b/railties/guides/rails_guides.rb
@@ -5,40 +5,27 @@ $:.unshift pwd
 require 'rubygems'
 
 begin
+  # Guides generation in the Rails repo.
   as_lib = File.join(pwd, "../../activesupport/lib")
   ap_lib = File.join(pwd, "../../actionpack/lib")
 
-  $: << as_lib if File.directory?(as_lib)
-  $: << ap_lib if File.directory?(ap_lib)
-  
-  require "action_controller"
-  require "action_view"
+  $:.unshift as_lib if File.directory?(as_lib)
+  $:.unshift ap_lib if File.directory?(ap_lib)
 rescue LoadError
-  gem "actionpack", '>= 2.3'
-
-  require "action_controller"
-  require "action_view"
+  # Guides generation from gems.
+  gem "actionpack", '>= 3.0'
 end
 
 begin
   gem 'RedCloth', '>= 4.1.1'
+  require 'redcloth'
 rescue Gem::LoadError
   $stderr.puts %(Generating Guides requires RedCloth 4.1.1+)
   exit 1
 end
 
-require 'redcloth'
-
-module RailsGuides
-  autoload :Generator,         "rails_guides/generator"
-  autoload :Indexer,           "rails_guides/indexer"
-  autoload :Helpers,           "rails_guides/helpers"
-  autoload :TextileExtensions, "rails_guides/textile_extensions"
-  autoload :Levenshtein,       "rails_guides/levenshtein"
-end
-
+require "rails_guides/textile_extensions"
 RedCloth.send(:include, RailsGuides::TextileExtensions)
 
-if $0 == __FILE__
-  RailsGuides::Generator.new.generate
-end
+require "rails_guides/generator"
+RailsGuides::Generator.new.generate