From 946ad5d9f92af5295305069c4549de79501bdcaa Mon Sep 17 00:00:00 2001
From: Teng Siong Ong <siong1987@gmail.com>
Date: Tue, 30 Apr 2013 06:49:03 -0700
Subject: Make `rake doc:guides` works again.  Fix #10384.

Conflicts:
	railties/guides/rails_guides.rb
	railties/lib/rails/tasks/documentation.rake
---
 railties/guides/rails_guides.rb             | 2 +-
 railties/lib/rails/tasks/documentation.rake | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'railties')

diff --git a/railties/guides/rails_guides.rb b/railties/guides/rails_guides.rb
index feb5fe3937..524299fb68 100644
--- a/railties/guides/rails_guides.rb
+++ b/railties/guides/rails_guides.rb
@@ -25,7 +25,7 @@ end
 
 begin
   require 'redcloth'
-rescue Gem::LoadError
+rescue LoadError
   # This can happen if doc:guides is executed in an application.
   $stderr.puts('Generating guides requires RedCloth 4.1.1+.')
   $stderr.puts(<<ERROR) if bundler?
diff --git a/railties/lib/rails/tasks/documentation.rake b/railties/lib/rails/tasks/documentation.rake
index 1760f526e3..648af722f8 100644
--- a/railties/lib/rails/tasks/documentation.rake
+++ b/railties/lib/rails/tasks/documentation.rake
@@ -120,8 +120,8 @@ namespace :doc do
 
   # desc "Generate Rails Guides"
   task :guides do
-    # FIXME: Reaching outside lib directory is a bad idea
-    require File.expand_path('../../../../guides/rails_guides', __FILE__)
+    rails_gem_dir = Gem::Specification.find_by_name("rails").gem_dir
+    require File.expand_path(File.join(rails_gem_dir, "railties/guides/rails_guides"))
     RailsGuides::Generator.new(Rails.root.join("doc/guides")).generate
   end
 
-- 
cgit v1.2.3