1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* lib/rdoc/servlet.rb: Fixed root search paths, filesystem paths

instead of HTTP paths were returned.
* test/rdoc/test_rdoc_servlet.rb:  Test for above.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39071 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
drbrain 2013-02-05 08:24:20 +00:00
parent 627a08251c
commit bd5efa7ff6
3 changed files with 24 additions and 14 deletions

View file

@ -1,3 +1,9 @@
Tue Feb 5 17:24:02 2013 Eric Hodel <drbrain@segment7.net>
* lib/rdoc/servlet.rb: Fixed root search paths, filesystem paths
instead of HTTP paths were returned.
* test/rdoc/test_rdoc_servlet.rb: Test for above.
Tue Feb 5 16:37:00 2013 Eric Hodel <drbrain@segment7.net>
* lib/rubygems/config_file.rb: Ignore permissions check on windows.

View file

@ -326,21 +326,25 @@ version. If you're viewing Ruby's documentation, include the version of ruby.
search_index << name
comment = case type
when :gem
gemspec = path.gsub(%r%/doc/([^/]*?)/ri$%,
'/specifications/\1.gemspec')
case type
when :gem
gemspec = path.gsub(%r%/doc/([^/]*?)/ri$%,
'/specifications/\1.gemspec')
spec = Gem::Specification.load gemspec
spec = Gem::Specification.load gemspec
spec.summary
when :system then
'Documentation for the Ruby standard library'
when :site then
'Documentation for non-gem libraries'
when :home then
'Documentation from your home directory'
end
path = spec.full_name
comment = spec.summary
when :system then
path = 'ruby'
comment = 'Documentation for the Ruby standard library'
when :site then
path = 'site'
comment = 'Documentation for non-gem libraries'
when :home then
path = 'home'
comment = 'Documentation from your home directory'
end
info << [name, '', path, '', comment]
end

View file

@ -365,7 +365,7 @@ class TestRDocServlet < RDoc::TestCase
Ruby\ Documentation
],
'info' => [
['Ruby Documentation', '', @system_dir, '',
['Ruby Documentation', '', 'ruby', '',
'Documentation for the Ruby standard library'],
],
}