From d73b915b1e377d10592bb189c90977943bd9b130 Mon Sep 17 00:00:00 2001 From: aycabta Date: Fri, 25 Jan 2019 23:58:30 +0900 Subject: [PATCH] Support nesting text page URL RDoc::Servlet#documentation_page replaces "/" in URL with "::" for class or module but it's also used for the replaced name on text pages. This causes a bug when text pages are in nesting directory. This commit fixes #615. --- lib/rdoc/servlet.rb | 5 ++++- test/test_rdoc_servlet.rb | 12 ++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/lib/rdoc/servlet.rb b/lib/rdoc/servlet.rb index 79550fe63b..72e6e90193 100644 --- a/lib/rdoc/servlet.rb +++ b/lib/rdoc/servlet.rb @@ -145,12 +145,15 @@ def do_GET req, res # +generator+ is used to create the page. def documentation_page store, generator, path, req, res - name = path.sub(/.html$/, '').gsub '/', '::' + text_name = path.sub /.html$/, '' + name = text_name.gsub '/', '::' if klass = store.find_class_or_module(name) then res.body = generator.generate_class klass elsif page = store.find_text_page(name.sub(/_([^_]*)$/, '.\1')) then res.body = generator.generate_page page + elsif page = store.find_text_page(text_name.sub(/_([^_]*)$/, '.\1')) then + res.body = generator.generate_page page else not_found generator, req, res end diff --git a/test/test_rdoc_servlet.rb b/test/test_rdoc_servlet.rb index 0a197a31b6..eb56360a6d 100644 --- a/test/test_rdoc_servlet.rb +++ b/test/test_rdoc_servlet.rb @@ -232,6 +232,18 @@ def test_documentation_page_page assert_match %r%]+ class="file">%, @res.body end + def test_documentation_page_page_with_nesting + store = RDoc::Store.new + + generator = @s.generator_for store + + readme = store.add_file 'nesting/README.rdoc', parser: RDoc::Parser::Simple + + @s.documentation_page store, generator, 'nesting/README_rdoc.html', @req, @res + + assert_equal 200, @res.status + end + def test_documentation_source store, path = @s.documentation_source '/ruby/Object.html'