Create ToHtmlSnippet correctly in Text#snippet

While ToHtmlSnippet was updated to pass an Options instance in,
Text#snippet was not.  This has been corrected by adding
RDoc::CodeObject#options which uses the store's options or creates a
default RDoc::Options instance.

This bug was missed in part due to commented-out tests for Text#snippet.

Author: drbrain

History.rdoc

@@ -24,6 +24,7 @@
     #204 by Erik Hollensbe
   * Code objects with nodoc are no longer included in the ri store.  Bug #177
     by Thomas Leitner.
+  * Text#snippet now creates a RDoc::Markup::ToHtmlSnippet correctly.
 
 === 4.0.0 / 2013-02-24
 

lib/rdoc/code_object.rb

@@ -275,6 +275,20 @@ def ignored?
     @ignored
   end
 
+  ##
+  # The options instance from the store this CodeObject is attached to, or a
+  # default options instance if the CodeObject is not attached.
+  #
+  # This is used by Text#snippet
+
+  def options
+    if @store then
+      @store.rdoc.options
+    else
+      RDoc::Options.new
+    end
+  end
+
   ##
   # Our parent CodeObject.  The parent may be missing for classes loaded from
   # legacy RI data stores.

lib/rdoc/text.rb

@@ -140,7 +140,7 @@ def parse text, format = 'rdoc'
   def snippet text, limit = 100
     document = parse text
 
-    RDoc::Markup::ToHtmlSnippet.new(limit).convert document
+    RDoc::Markup::ToHtmlSnippet.new(options, limit).convert document
   end
 
   ##

test/test_rdoc_code_object.rb

@@ -229,6 +229,14 @@ def test_offset
     assert_equal 5, @c1_m.offset
   end
 
+  def test_options
+    assert_kind_of RDoc::Options, @co.options
+
+    @co.store = @store
+
+    assert_same @options, @co.options
+  end
+
   def test_parent_file_name
     assert_equal '(unknown)', @co.parent_file_name
     assert_equal 'xref_data.rb', @c1.parent_file_name

test/test_rdoc_text.rb

@@ -261,42 +261,31 @@ def test_parse_newline
     assert_equal RDoc::Markup::Document.new, parse("\n")
   end
 
-#  def test_snippet
-#    text = <<-TEXT
-#This is one-hundred characters or more of text in a single paragraph.  This
-#paragraph will be cut off some point after the one-hundredth character.
-#    TEXT
-#
-#    expected = text.gsub(/\r?\n/, ' ').sub(/ some point.*/, '')
-#
-#    assert_equal expected, snippet(text)
-#  end
-#
-#  def test_snippet_comment
-#    c = comment 'This is a comment'
-#
-#    assert_equal 'This is a comment', snippet(c)
-#  end
-#
-#  def test_snippet_no_space
-#    text = <<-TEXT.strip
-#This is one-hundred characters or more of text in a single paragraph.  This
-#paragraph will not be cut
-#    TEXT
-#
-#    expected = <<-EXPECTED.strip.gsub(/\r?\n/, ' ')
-#This is one-hundred characters or more of text in a single paragraph.  This
-#paragraph will not be cut
-#    EXPECTED
-#
-#    assert_equal expected, snippet(text)
-#  end
-#
-#  def test_snippet_short
-#    text = 'This is a comment'
-#
-#    assert_equal text.dup, snippet(text)
-#  end
+  def test_snippet
+    text = <<-TEXT
+This is one-hundred characters or more of text in a single paragraph.  This
+paragraph will be cut off some point after the one-hundredth character.
+    TEXT
+
+    expected = <<-EXPECTED
+<p>This is one-hundred characters or more of text in a single paragraph.  This
+paragraph will be cut off \u2026
+    EXPECTED
+
+    assert_equal expected, snippet(text)
+  end
+
+  def test_snippet_comment
+    c = comment 'This is a comment'
+
+    assert_equal "<p>This is a comment\n", snippet(c)
+  end
+
+  def test_snippet_short
+    text = 'This is a comment'
+
+    assert_equal "<p>#{text}\n", snippet(text)
+  end
 
   def test_strip_hashes
     text = <<-TEXT
@@ -560,9 +549,13 @@ def test_to_html_tt_tag_mismatch
     assert_equal "mismatched <tt> tag\n", err
   end
 
-  def formatter()
+  def formatter
     RDoc::Markup::ToHtml.new @options
   end
 
+  def options
+    @options
+  end
+
 end