rdoc 3.9 → 3.9.1

data/History.txt

@@ -1,3 +1,11 @@
+=== 3.9.1 / ??
+
+* Bug fixes
+  * Fix RDoc::Markup parser for a header followed by a non-text token.  Issue
+    #56 by Adam Tait
+  * Fix RDoc::Markup::ToHtmlCrossref#gen_url for non-<tt>rdoc-ref</tt> links.
+  * Fix bug report URL when rdoc crashes.
+
 === 3.9 / 2011-07-30
 
 * Minor enhancements

data/lib/rdoc.rb

@@ -104,7 +104,7 @@ module RDoc
   ##
   # RDoc version you are using
 
-  VERSION = '3.9'
+  VERSION = '3.9.1'
 
   ##
   # Method visibilities

data/lib/rdoc/markup/parser.rb

@@ -86,11 +86,18 @@ class RDoc::Markup::Parser
   # Builds a Heading of +level+
 
   def build_heading level
-    _, text, = get  # TEXT
-    heading = RDoc::Markup::Heading.new level, text
-    skip :NEWLINE
-
-    heading
+    type, text, = get
+
+    text = case type
+           when :TEXT then
+             skip :NEWLINE
+             text
+           else
+             unget
+             ''
+           end
+
+    RDoc::Markup::Heading.new level, text
   end
 
   ##

data/lib/rdoc/markup/to_html_crossref.rb

@@ -97,7 +97,7 @@ class RDoc::Markup::ToHtmlCrossref < RDoc::Markup::ToHtml
   # RDoc::Markup::ToHtml to handle other schemes.
 
   def gen_url url, text
-    super unless url =~ /\Ardoc-ref:/
+    return super unless url =~ /\Ardoc-ref:/
 
     cross_reference $', text
   end

data/lib/rdoc/text.rb

@@ -126,7 +126,7 @@ Ruby #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} #{RUBY_RELEASE_DATE}
 
 Please file a bug report with the above information at:
 
-http://rubyforge.org/tracker/?atid=2472&group_id=627&func=browse
+https://github.com/rdoc/rdoc/issues
 
     EOF
     raise

data/test/test_rdoc_markup_parser.rb

@@ -248,6 +248,23 @@ the time
     assert_equal expected, @RMP.parse(str).parts
   end
 
+  def test_parse_heading_empty
+    str = <<-STR
+===
+* bullet
+    STR
+
+    expected = [
+      @RM::Heading.new(3, ''),
+      @RM::BlankLine.new,
+      @RM::List.new(:BULLET, *[
+        @RM::ListItem.new(nil,
+          @RM::Paragraph.new('bullet'))]),
+    ]
+
+    assert_equal expected, @RMP.parse(str).parts
+  end
+
   def test_parse_heading_heading
     str = '= ='
 
@@ -1085,6 +1102,23 @@ the time
     assert_equal expected, @RMP.tokenize(str)
   end
 
+  def test_tokenize_heading_empty
+    str = <<-STR
+===
+* bullet
+    STR
+
+    expected = [
+      [:HEADER,  3,        0, 0],
+      [:NEWLINE, "\n",     3, 0],
+      [:BULLET,  "*",      0, 1],
+      [:TEXT,    "bullet", 2, 1],
+      [:NEWLINE, "\n",     8, 1],
+    ]
+
+    assert_equal expected, @RMP.tokenize(str)
+  end
+
   def test_tokenize_heading_heading
     str = <<-STR
 = =

data/test/test_rdoc_markup_to_html_crossref.rb

@@ -25,6 +25,14 @@ class TestRDocMarkupToHtmlCrossref < XrefTestCase
     assert_equal "\n<p><a href=\"C1.html\">C1</a></p>\n", result
   end
 
+  def test_gen_url
+    assert_equal '<a href="C1.html">Some class</a>',
+                 @to.gen_url('rdoc-ref:C1', 'Some class')
+
+    assert_equal '<a href="http://example">HTTP example</a>',
+                 @to.gen_url('http://example', 'HTTP example')
+  end
+
   def test_handle_special_CROSSREF
     assert_equal "<a href=\"C2/C3.html\">C2::C3</a>", SPECIAL('C2::C3')
   end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rdoc
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 33
   prerelease: 
   segments: 
   - 3
   - 9
-  version: "3.9"
+  - 1
+  version: 3.9.1
 platform: ruby
 authors: 
 - Eric Hodel
@@ -38,7 +39,7 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2011-07-30 00:00:00 Z
+date: 2011-07-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest