Merge pull request #708 from aycabta/support-nesting-text-page-url

aycabta · web-flow · commit f43b13166d5d · 2019-03-29T15:56:21.000+09:00
Support nesting text page URL
diff --git 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
@@ -232,6 +232,18 @@ def test_documentation_page_page
     assert_match %r%<body [^>]+ 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'
 
