* lib/rdoc/ri/driver.rb: Fixed ri page display for files with
extensions. * test/rdoc/test_rdoc_ri_driver.rb: Test for above git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38169 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
f8f5a9eb4e
commit
ec05ade531
@ -1,3 +1,9 @@
|
|||||||
|
Tue Dec 4 08:32:10 2012 Eric Hodel <drbrain@segment7.net>
|
||||||
|
|
||||||
|
* lib/rdoc/ri/driver.rb: Fixed ri page display for files with
|
||||||
|
extensions.
|
||||||
|
* test/rdoc/test_rdoc_ri_driver.rb: Test for above
|
||||||
|
|
||||||
Tue Dec 4 04:11:50 2012 Eric Hodel <drbrain@segment7.net>
|
Tue Dec 4 04:11:50 2012 Eric Hodel <drbrain@segment7.net>
|
||||||
|
|
||||||
* .document: Add NEWS for `ri ruby:NEWS`
|
* .document: Add NEWS for `ri ruby:NEWS`
|
||||||
|
@ -1331,12 +1331,16 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
|
|||||||
elsif parts.length == 2 or parts.last =~ /::|#|\./ then
|
elsif parts.length == 2 or parts.last =~ /::|#|\./ then
|
||||||
type = parts.pop
|
type = parts.pop
|
||||||
meth = nil
|
meth = nil
|
||||||
|
elsif parts[1] == ':' then
|
||||||
|
klass = parts.shift
|
||||||
|
type = parts.shift
|
||||||
|
meth = parts.join
|
||||||
elsif parts[-2] != '::' or parts.last !~ /^[A-Z]/ then
|
elsif parts[-2] != '::' or parts.last !~ /^[A-Z]/ then
|
||||||
meth = parts.pop
|
meth = parts.pop
|
||||||
type = parts.pop
|
type = parts.pop
|
||||||
end
|
end
|
||||||
|
|
||||||
klass = parts.join
|
klass ||= parts.join
|
||||||
|
|
||||||
[klass, type, meth]
|
[klass, type, meth]
|
||||||
end
|
end
|
||||||
|
@ -747,6 +747,25 @@ Foo::Bar#bother
|
|||||||
assert_match %r%README\.md%, out
|
assert_match %r%README\.md%, out
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_display_page_extension
|
||||||
|
util_store
|
||||||
|
|
||||||
|
other = @store1.add_file 'README.EXT'
|
||||||
|
other.parser = RDoc::Parser::Simple
|
||||||
|
other.comment =
|
||||||
|
doc(
|
||||||
|
head(1, 'README.EXT'),
|
||||||
|
para('This is the other README'))
|
||||||
|
|
||||||
|
@store1.save_page other
|
||||||
|
|
||||||
|
out, = capture_io do
|
||||||
|
@driver.display_page 'home:README.EXT'
|
||||||
|
end
|
||||||
|
|
||||||
|
assert_match 'other README', out
|
||||||
|
end
|
||||||
|
|
||||||
def test_display_page_ignore_directory
|
def test_display_page_ignore_directory
|
||||||
util_store
|
util_store
|
||||||
|
|
||||||
@ -1147,6 +1166,14 @@ Foo::Bar#bother
|
|||||||
assert_equal nil, meth, 'ruby page'
|
assert_equal nil, meth, 'ruby page'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_parse_name_page_extenson
|
||||||
|
klass, type, meth = @driver.parse_name 'ruby:README.EXT'
|
||||||
|
|
||||||
|
assert_equal 'ruby', klass, 'ruby project'
|
||||||
|
assert_equal ':', type, 'ruby type'
|
||||||
|
assert_equal 'README.EXT', meth, 'ruby page'
|
||||||
|
end
|
||||||
|
|
||||||
def test_parse_name_single_class
|
def test_parse_name_single_class
|
||||||
klass, type, meth = @driver.parse_name 'Foo'
|
klass, type, meth = @driver.parse_name 'Foo'
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user