rdoc 3.12.2 → 4.0.0.preview2

data/test/test_rdoc_markup.rb

@@ -48,7 +48,7 @@ the time
     m = RDoc::Markup.new
     m.add_word_pair '{', '}', :STRIKE
 
-    tt = RDoc::Markup::ToTest.new m
+    tt = RDoc::Markup::ToTest.new nil, m
     tt.add_tag :STRIKE, 'STRIKE ', ' STRIKE'
 
     out = m.convert str, tt

data/test/test_rdoc_markup_attribute_manager.rb

@@ -29,8 +29,8 @@ class TestRDocMarkupAttributeManager < RDoc::TestCase
   end
 
   def crossref(text)
-    crossref_bitmap = RDoc::Markup::Attribute.bitmap_for(:_SPECIAL_) |
-                      RDoc::Markup::Attribute.bitmap_for(:CROSSREF)
+    crossref_bitmap = @am.attributes.bitmap_for(:_SPECIAL_) |
+                      @am.attributes.bitmap_for(:CROSSREF)
 
     [ @am.changed_attribute_by_name([], [:CROSSREF, :_SPECIAL_]),
       RDoc::Markup::Special.new(crossref_bitmap, text),

data/test/test_rdoc_markup_attributes.rb

@@ -0,0 +1,39 @@
+require 'rdoc/test_case'
+
+class TestRDocMarkupAttributes < RDoc::TestCase
+
+  def setup
+    super
+
+    @as = RDoc::Markup::Attributes.new
+  end
+
+  def test_bitmap_for
+    assert_equal 2, @as.bitmap_for('two')
+    assert_equal 2, @as.bitmap_for('two')
+    assert_equal 4, @as.bitmap_for('three')
+  end
+
+  def test_as_string
+    @as.bitmap_for 'two'
+    @as.bitmap_for 'three'
+
+    assert_equal 'none',          @as.as_string(0)
+    assert_equal '_SPECIAL_',     @as.as_string(1)
+    assert_equal 'two',           @as.as_string(2)
+    assert_equal '_SPECIAL_,two', @as.as_string(3)
+  end
+
+  def test_each_name_of
+    @as.bitmap_for 'two'
+    @as.bitmap_for 'three'
+
+    assert_equal %w[],          @as.each_name_of(0).to_a
+    assert_equal %w[],          @as.each_name_of(1).to_a
+    assert_equal %w[two],       @as.each_name_of(2).to_a
+    assert_equal %w[three],     @as.each_name_of(4).to_a
+    assert_equal %w[two three], @as.each_name_of(6).to_a
+  end
+
+end
+

data/test/test_rdoc_markup_document.rb

@@ -45,6 +45,21 @@ class TestRDocMarkupDocument < RDoc::TestCase
     end
   end
 
+  def test_concat
+    @d.concat [@RM::BlankLine.new, @RM::BlankLine.new]
+
+    refute_empty @d
+  end
+
+  def test_each
+    a = @RM::Document.new
+    b = @RM::Document.new(@RM::Paragraph.new('hi'))
+
+    @d.push a, b
+
+    assert_equal [a, b], @d.map { |sub_doc| sub_doc }
+  end
+
   def test_empty_eh
     assert_empty @d
 
@@ -87,7 +102,7 @@ class TestRDocMarkupDocument < RDoc::TestCase
   end
 
   def test_file_equals_top_level
-    @d.file = RDoc::TopLevel.new 'file.rb'
+    @d.file = @store.add_file 'file.rb'
 
     assert_equal 'file.rb', @d.file
   end

data/test/test_rdoc_markup_formatter.rb

@@ -5,7 +5,7 @@ class TestRDocMarkupFormatter < RDoc::TestCase
   class ToTest < RDoc::Markup::Formatter
 
     def initialize markup
-      super
+      super nil, markup
 
       add_tag :TT, '<code>', '</code>'
     end
@@ -38,11 +38,14 @@ class TestRDocMarkupFormatter < RDoc::TestCase
     @markup = @RM.new
     @markup.add_special(/[A-Z]+/, :CAPS)
 
+    @attribute_manager = @markup.attribute_manager
+    @attributes = @attribute_manager.attributes
+
     @to = ToTest.new @markup
 
-    @caps    = @RM::Attribute.bitmap_for :CAPS
-    @special = @RM::Attribute.bitmap_for :_SPECIAL_
-    @tt      = @RM::Attribute.bitmap_for :TT
+    @caps    = @attributes.bitmap_for :CAPS
+    @special = @attributes.bitmap_for :_SPECIAL_
+    @tt      = @attributes.bitmap_for :TT
   end
 
   def test_convert_tt_special

data/test/test_rdoc_markup_hard_break.rb

@@ -0,0 +1,31 @@
+require 'rdoc/test_case'
+
+class TestRDocMarkupHardBreak < RDoc::TestCase
+
+  def setup
+    super
+
+    @hb = RDoc::Markup::HardBreak.new
+  end
+
+  def test_accept
+    visitor = Object.new
+
+    def visitor.accept_hard_break(obj) @obj = obj end
+    def visitor.obj() @obj end
+
+    @hb.accept visitor
+
+    assert_same @hb, visitor.obj
+  end
+
+  def test_equals2
+    other = RDoc::Markup::HardBreak.new
+
+    assert_equal @hb, other
+
+    refute_equal @hb, Object.new
+  end
+
+end
+

data/test/test_rdoc_markup_indented_paragraph.rb

@@ -35,5 +35,19 @@ class TestRDocMarkupIndentedParagraph < RDoc::TestCase
     refute_equal one, two
   end
 
+  def test_text
+    paragraph = @IP.new(2, 'hello', ' world')
+
+    assert_equal 'hello world', paragraph.text
+  end
+
+  def test_text_break
+    paragraph = @IP.new(2, 'hello', hard_break, 'world')
+
+    assert_equal 'helloworld', paragraph.text
+
+    assert_equal "hello\n  world", paragraph.text("\n")
+  end
+
 end
 

data/test/test_rdoc_markup_paragraph.rb

@@ -11,7 +11,21 @@ class TestRDocMarkupParagraph < RDoc::TestCase
 
     paragraph.accept visitor
 
-    assert_equal paragraph, visitor.obj
+    assert_same paragraph, visitor.obj
+  end
+
+  def test_text
+    paragraph = para('hello', ' world')
+
+    assert_equal 'hello world', paragraph.text
+  end
+
+  def test_text_break
+    paragraph = para('hello', hard_break, 'world')
+
+    assert_equal 'helloworld', paragraph.text
+
+    assert_equal "hello\nworld", paragraph.text("\n")
   end
 
 end

data/test/test_rdoc_markup_parser.rb

@@ -7,13 +7,15 @@ class TestRDocMarkupParser < RDoc::TestCase
   def setup
     super
 
+    @have_byteslice = ''.respond_to? :byteslice
+
     @RMP = @RM::Parser
   end
 
   def mu_pp(obj)
     s = ''
     s = PP.pp obj, s
-    s = s.force_encoding(Encoding.default_external) if defined? Encoding
+    s = s.force_encoding(Encoding.default_external) if @have_encoding
     s.chomp
   end
 
@@ -28,6 +30,19 @@ class TestRDocMarkupParser < RDoc::TestCase
     assert_equal @RM::Heading.new(3, 'heading three'), parser.build_heading(3)
   end
 
+  def test_char_pos
+    parser = @RMP.new
+    s = parser.setup_scanner 'cät'
+
+    s.scan(/\S+/)
+
+    if @have_byteslice or @have_encoding then
+      assert_equal 3, parser.char_pos(s.pos)
+    else
+      assert_equal 4, parser.char_pos(s.pos)
+    end
+  end
+
   def test_get
     parser = util_parser
 
@@ -146,13 +161,11 @@ the time
     STR
 
     expected = [
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l1', 'l1+')),
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l2')),
-      ]),
-    ]
+      list(:BULLET,
+        item(nil,
+          para('l1 ', 'l1+')),
+        item(nil,
+          para('l2')))]
 
     assert_equal expected, @RMP.parse(str).parts
   end
@@ -189,16 +202,16 @@ the time
     STR
 
     expected = [
-      @RM::List.new(:BULLET, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l1'),
-          @RM::List.new(:BULLET, *[
-            @RM::ListItem.new(nil,
-              @RM::Paragraph.new('l1.1', 'text'),
-              @RM::Verbatim.new("code\n", "  code\n"),
-              @RM::Paragraph.new('text'))])),
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l2'))])]
+      list(:BULLET,
+        item(nil,
+          para('l1'),
+          list(:BULLET,
+            item(nil,
+              para('l1.1 ', 'text'),
+              verb("code\n", "  code\n"),
+              para('text')))),
+        item(nil,
+          para('l2')))]
 
     assert_equal expected, @RMP.parse(str).parts
   end
@@ -324,11 +337,11 @@ the time
     STR
 
     expected = [
-      @RM::List.new(:LABEL, *[
-        @RM::ListItem.new('one',
-          @RM::Paragraph.new('item one')),
-        @RM::ListItem.new('two',
-          @RM::Paragraph.new('item two'))])]
+      list(:LABEL,
+        item(%w[one],
+          para('item one')),
+        item(%w[two],
+          para('item two')))]
 
     assert_equal expected, @RMP.parse(str).parts
   end
@@ -341,19 +354,33 @@ the time
     STR
 
     expected = [
-      @RM::List.new(:LABEL, *[
-        @RM::ListItem.new('cat',
-          @RM::Paragraph.new('l1'),
-          @RM::List.new(:BULLET, *[
-            @RM::ListItem.new(nil,
-              @RM::Paragraph.new('l1.1'))])),
-        @RM::ListItem.new('dog',
-          @RM::Paragraph.new('l2'))])]
+      list(:LABEL,
+        item(%w[cat],
+          para('l1'),
+          list(:BULLET,
+            item(nil,
+              para('l1.1')))),
+        item(%w[dog],
+          para('l2')))]
+
+    assert_equal expected, @RMP.parse(str).parts
+  end
+
+  def test_parse_label_multi_label
+    str = <<-STR
+[one]
+[two] some description
+    STR
+
+    expected = [
+      list(:LABEL,
+        item(%w[one two],
+          para('some description')))]
 
     assert_equal expected, @RMP.parse(str).parts
   end
 
-  def test_parse_label_multiline
+  def test_parse_label_multi_line
     str = <<-STR
 [cat] l1
       continuation
@@ -361,11 +388,11 @@ the time
     STR
 
     expected = [
-      @RM::List.new(:LABEL, *[
-        @RM::ListItem.new('cat',
-          @RM::Paragraph.new('l1', 'continuation')),
-        @RM::ListItem.new('dog',
-          @RM::Paragraph.new('l2'))])]
+      list(:LABEL,
+        item(%w[cat],
+          para('l1 ', 'continuation')),
+        item(%w[dog],
+          para('l2')))]
 
     assert_equal expected, @RMP.parse(str).parts
   end
@@ -379,12 +406,11 @@ the time
     STR
 
     expected = [
-      @RM::List.new(:LABEL, *[
-        @RM::ListItem.new('one',
-          @RM::Paragraph.new('item one')),
-        @RM::ListItem.new('two',
-          @RM::Paragraph.new('item two')),
-    ])]
+      list(:LABEL,
+        item(%w[one],
+          para('item one')),
+        item(%w[two],
+          para('item two')))]
 
     assert_equal expected, @RMP.parse(str).parts
   end
@@ -445,9 +471,9 @@ a. 新しい機能
     str = "now is\nthe time  \nfor all"
 
     expected = [
-      @RM::Paragraph.new('now is', 'the time'),
-      @RM::BlankLine.new,
-      @RM::Paragraph.new('for all')]
+      para('now is ', 'the time'),
+      blank_line,
+      para('for all')]
 
     assert_equal expected, @RMP.parse(str).parts
   end
@@ -465,16 +491,16 @@ a. 新しい機能
     STR
 
     expected = [
-      @RM::List.new(:NUMBER, *[
-        @RM::ListItem.new(nil, *[
-          @RM::Paragraph.new('para 1'),
-          @RM::BlankLine.new,
-          @RM::List.new(:LABEL, *[
-            @RM::ListItem.new('label 1', *[
-              @RM::Paragraph.new('para 1.1'),
-              @RM::BlankLine.new,
-              @RM::Verbatim.new("code\n"),
-              @RM::Paragraph.new('para 1.2')])])])])]
+      list(:NUMBER,
+        item(nil,
+          para('para 1'),
+          blank_line,
+          list(:LABEL,
+            item(%w[label\ 1],
+              para('para 1.1'),
+              blank_line,
+              verb("code\n"),
+              para('para 1.2')))))]
 
     assert_equal expected, @RMP.parse(str).parts
   end
@@ -488,15 +514,15 @@ a. 新しい機能
     STR
 
     expected = [
-      @RM::List.new(:NUMBER, *[
-        @RM::ListItem.new(nil, *[
-          @RM::Paragraph.new('para'),
-          @RM::BlankLine.new,
-          @RM::List.new(:NOTE, *[
-            @RM::ListItem.new('label 1',
-              @RM::Paragraph.new('text 1')),
-            @RM::ListItem.new('label 2',
-              @RM::Paragraph.new('text 2'))])])])]
+      list(:NUMBER,
+        item(nil,
+          para('para'),
+          blank_line,
+          list(:NOTE,
+            item(%w[label\ 1],
+              para('text 1')),
+            item(%w[label\ 2],
+              para('text 2')))))]
 
     assert_equal expected, @RMP.parse(str).parts
   end
@@ -555,11 +581,11 @@ two:: item two
     STR
 
     expected = [
-      @RM::List.new(:NOTE, *[
-        @RM::ListItem.new('one',
-          @RM::Paragraph.new('item one')),
-        @RM::ListItem.new('two',
-          @RM::Paragraph.new('item two'))])]
+      list(:NOTE,
+        item(%w[one],
+          para('item one')),
+        item(%w[two],
+          para('item two')))]
 
     assert_equal expected, @RMP.parse(str).parts
   end
@@ -571,11 +597,9 @@ two::
     STR
 
     expected = [
-      @RM::List.new(:NOTE, *[
-        @RM::ListItem.new('one',
-          @RM::BlankLine.new),
-        @RM::ListItem.new('two',
-          @RM::BlankLine.new)])]
+      list(:NOTE,
+        item(%w[one two],
+          blank_line))]
 
     assert_equal expected, @RMP.parse(str).parts
   end
@@ -586,11 +610,11 @@ one:: two::
     STR
 
     expected = [
-      @RM::List.new(:NOTE, *[
-        @RM::ListItem.new('one',
-          @RM::List.new(:NOTE, *[
-            @RM::ListItem.new('two',
-              @RM::BlankLine.new)]))])]
+      list(:NOTE,
+        item(%w[one],
+          list(:NOTE,
+            item(%w[two],
+              blank_line))))]
 
     assert_equal expected, @RMP.parse(str).parts
   end
@@ -603,14 +627,14 @@ one:: two::
     STR
 
     expected = [
-      @RM::List.new(:NUMBER, *[
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l1'),
-          @RM::List.new(:BULLET, *[
-            @RM::ListItem.new(nil,
-              @RM::Paragraph.new('l1.1'))])),
-        @RM::ListItem.new(nil,
-          @RM::Paragraph.new('l2'))])]
+      list(:NUMBER,
+        item(nil,
+          para('l1'),
+          list(:BULLET,
+            item(nil,
+              para('l1.1')))),
+        item(nil,
+          para('l2')))]
 
     assert_equal expected, @RMP.parse(str).parts
   end
@@ -632,7 +656,7 @@ for all good men
   def test_parse_paragraph_multiline
     str = "now is the time\nfor all good men"
 
-    expected = @RM::Paragraph.new 'now is the time', 'for all good men'
+    expected = @RM::Paragraph.new 'now is the time ', 'for all good men'
     assert_equal [expected], @RMP.parse(str).parts
   end
 
@@ -1341,6 +1365,32 @@ cat::
     assert_equal expected, @RMP.tokenize(str)
   end
 
+  def test_tokenize_note_utf_8
+    skip 'Encoding not implemented' unless @have_encoding
+
+    str = <<-STR
+cät:: l1a
+      l1b
+døg:: l2a
+      l2b
+    STR
+
+    expected = [
+      [:NOTE,    'cät',   0, 0],
+      [:TEXT,    'l1a',   6, 0],
+      [:NEWLINE, "\n",    9, 0],
+      [:TEXT,    'l1b',   6, 1],
+      [:NEWLINE, "\n",    9, 1],
+      [:NOTE,    'døg',   0, 2],
+      [:TEXT,    'l2a',   6, 2],
+      [:NEWLINE, "\n",    9, 2],
+      [:TEXT,    'l2b',   6, 3],
+      [:NEWLINE, "\n",    9, 3],
+    ]
+
+    assert_equal expected, @RMP.tokenize(str)
+  end
+
   def test_tokenize_note_newline_windows
     str = <<-STR
 cat::\r
@@ -1576,6 +1626,19 @@ Example heading:
     assert_equal expected, @RMP.tokenize(str)
   end
 
+  def test_token_pos
+    parser = @RMP.new
+    s = parser.setup_scanner 'cät'
+
+    s.scan(/\S+/)
+
+    if @have_encoding or @have_byteslice then
+      assert_equal [3, 0], parser.token_pos(s.pos)
+    else
+      assert_equal [4, 0], parser.token_pos(s.pos)
+    end
+  end
+
   # HACK move to Verbatim test case
   def test_verbatim_normalize
     v = @RM::Verbatim.new "foo\n", "\n", "\n", "bar\n"