rdoc 3.12.2 → 4.0.0.preview2

data/test/MarkdownTest_1.0.3/Nested blockquotes.text

@@ -0,0 +1,5 @@
+> foo
+>
+> > bar
+>
+> foo

data/test/MarkdownTest_1.0.3/Ordered and unordered lists.text

@@ -0,0 +1,131 @@
+## Unordered
+
+Asterisks tight:
+
+*	asterisk 1
+*	asterisk 2
+*	asterisk 3
+
+
+Asterisks loose:
+
+*	asterisk 1
+
+*	asterisk 2
+
+*	asterisk 3
+
+* * *
+
+Pluses tight:
+
++	Plus 1
++	Plus 2
++	Plus 3
+
+
+Pluses loose:
+
++	Plus 1
+
++	Plus 2
+
++	Plus 3
+
+* * *
+
+
+Minuses tight:
+
+-	Minus 1
+-	Minus 2
+-	Minus 3
+
+
+Minuses loose:
+
+-	Minus 1
+
+-	Minus 2
+
+-	Minus 3
+
+
+## Ordered
+
+Tight:
+
+1.	First
+2.	Second
+3.	Third
+
+and:
+
+1. One
+2. Two
+3. Three
+
+
+Loose using tabs:
+
+1.	First
+
+2.	Second
+
+3.	Third
+
+and using spaces:
+
+1. One
+
+2. Two
+
+3. Three
+
+Multiple paragraphs:
+
+1.	Item 1, graf one.
+
+	Item 2. graf two. The quick brown fox jumped over the lazy dog's
+	back.
+	
+2.	Item 2.
+
+3.	Item 3.
+
+
+
+## Nested
+
+*	Tab
+	*	Tab
+		*	Tab
+
+Here's another:
+
+1. First
+2. Second:
+	* Fee
+	* Fie
+	* Foe
+3. Third
+
+Same thing but with paragraphs:
+
+1. First
+
+2. Second:
+	* Fee
+	* Fie
+	* Foe
+
+3. Third
+
+
+This was an error in Markdown 1.0.1:
+
+*	this
+
+	*	sub
+
+	that

data/test/MarkdownTest_1.0.3/Strong and em together.text

@@ -0,0 +1,7 @@
+***This is strong and em.***
+
+So is ***this*** word.
+
+___This is strong and em.___
+
+So is ___this___ word.

data/test/MarkdownTest_1.0.3/Tabs.text

@@ -0,0 +1,21 @@
++	this is a list item
+	indented with tabs
+
++   this is a list item
+    indented with spaces
+
+Code:
+
+	this code block is indented by one tab
+
+And:
+
+		this code block is indented by two tabs
+
+And:
+
+	+	this is an example list item
+		indented with tabs
+	
+	+   this is an example list item
+	    indented with spaces

data/test/MarkdownTest_1.0.3/Tidyness.text

@@ -0,0 +1,5 @@
+> A list within a blockquote:
+> 
+> *	asterisk 1
+> *	asterisk 2
+> *	asterisk 3

data/test/test_attribute_manager.rb

@@ -5,9 +5,11 @@ class TestAttributeManager < RDoc::TestCase # HACK fix test name
   def setup
     super
 
+    @options = RDoc::Options.new
+
     @am = RDoc::Markup::AttributeManager.new
     @klass = RDoc::Markup::AttributeManager
-    @formatter = RDoc::Markup::Formatter.new
+    @formatter = RDoc::Markup::Formatter.new @options
     @formatter.add_tag :BOLD, '<B>', '</B>'
     @formatter.add_tag :EM, '<EM>', '</EM>'
     @formatter.add_tag :TT, '<CODE>', '</CODE>'
@@ -70,10 +72,11 @@ class TestAttributeManager < RDoc::TestCase # HACK fix test name
   end
 
   def test_add_special
-    @am.add_special("WikiWord", :WIKIWORD)
+    @am.add_special "WikiWord", :WIKIWORD
     specials = @am.special
-    assert_equal(1,specials.size)
-    assert(specials.has_key?("WikiWord"))
+
+    assert_equal 1, specials.size
+    assert specials.assoc "WikiWord"
   end
 
   def test_escapes

data/test/test_rdoc_any_method.rb

@@ -60,7 +60,9 @@ method(a, b) { |c, d| ... }
   end
 
   def test_marshal_dump
-    top_level = RDoc::TopLevel.new 'file.rb'
+    @store.path = Dir.tmpdir
+    top_level = @store.add_file 'file.rb'
+
     m = RDoc::AnyMethod.new nil, 'method'
     m.block_params = 'some_block'
     m.call_seq     = 'call_seq'
@@ -68,20 +70,23 @@ method(a, b) { |c, d| ... }
     m.params       = 'param'
     m.record_location top_level
 
-    cm = RDoc::ClassModule.new 'Klass'
+    cm = top_level.add_class RDoc::ClassModule, 'Klass'
     cm.add_method m
 
+    section = cm.sections.first
+
     al = RDoc::Alias.new nil, 'method', 'aliased', 'alias comment'
     al_m = m.add_alias al, cm
 
     loaded = Marshal.load Marshal.dump m
+    loaded.store = @store
 
     comment = RDoc::Markup::Document.new(
                 RDoc::Markup::Paragraph.new('this is a comment'))
 
     assert_equal m, loaded
 
-    assert_equal [al_m],         loaded.aliases
+    assert_equal [al_m.name],    loaded.aliases.map { |alas| alas.name }
     assert_equal 'some_block',   loaded.block_params
     assert_equal 'call_seq',     loaded.call_seq
     assert_equal comment,        loaded.comment
@@ -91,6 +96,8 @@ method(a, b) { |c, d| ... }
     assert_equal 'param',        loaded.params
     assert_equal nil,            loaded.singleton # defaults to nil
     assert_equal :public,        loaded.visibility
+    assert_equal cm,             loaded.parent
+    assert_equal section,        loaded.section
   end
 
   def test_marshal_load
@@ -114,28 +121,37 @@ method(a, b) { |c, d| ... }
   end
 
   def test_marshal_load_version_0
+    @store.path = Dir.tmpdir
+    top_level = @store.add_file 'file.rb'
+
     m = RDoc::AnyMethod.new nil, 'method'
-    cm = RDoc::ClassModule.new 'Klass'
+
+    cm = top_level.add_class RDoc::ClassModule, 'Klass'
     cm.add_method m
+
+    section = cm.sections.first
+
     al = RDoc::Alias.new nil, 'method', 'aliased', 'alias comment'
     al_m = m.add_alias al, cm
 
-    loaded = Marshal.load "\x04\bU:\x14RDoc::AnyMethod[\x0Fi\x00I" \
-                          "\"\vmethod\x06:\x06EF\"\x11Klass#method0:\vpublic" \
-                          "o:\eRDoc::Markup::Document\x06:\v@parts[\x06" \
-                          "o:\x1CRDoc::Markup::Paragraph\x06;\t[\x06I" \
-                          "\"\x16this is a comment\x06;\x06FI" \
-                          "\"\rcall_seq\x06;\x06FI\"\x0Fsome_block\x06;\x06F" \
-                          "[\x06[\aI\"\faliased\x06;\x06Fo;\b\x06;\t[\x06" \
-                          "o;\n\x06;\t[\x06I\"\x12alias comment\x06;\x06FI" \
+    loaded = Marshal.load "\x04\bU:\x14RDoc::AnyMethod[\x0Fi\x00I" +
+                          "\"\vmethod\x06:\x06EF\"\x11Klass#method0:\vpublic" +
+                          "o:\eRDoc::Markup::Document\x06:\v@parts[\x06" +
+                          "o:\x1CRDoc::Markup::Paragraph\x06;\t[\x06I" +
+                          "\"\x16this is a comment\x06;\x06FI" +
+                          "\"\rcall_seq\x06;\x06FI\"\x0Fsome_block\x06;\x06F" +
+                          "[\x06[\aI\"\faliased\x06;\x06Fo;\b\x06;\t[\x06" +
+                          "o;\n\x06;\t[\x06I\"\x12alias comment\x06;\x06FI" +
                           "\"\nparam\x06;\x06F"
 
+    loaded.store = @store
+
     comment = RDoc::Markup::Document.new(
                 RDoc::Markup::Paragraph.new('this is a comment'))
 
     assert_equal m, loaded
 
-    assert_equal [al_m],         loaded.aliases
+    assert_equal [al_m.name],    loaded.aliases.map { |alas| alas.name }
     assert_equal 'some_block',   loaded.block_params
     assert_equal 'call_seq',     loaded.call_seq
     assert_equal comment,        loaded.comment
@@ -145,6 +161,8 @@ method(a, b) { |c, d| ... }
     assert_equal nil,            loaded.singleton # defaults to nil
     assert_equal :public,        loaded.visibility
     assert_equal nil,            loaded.file
+    assert_equal cm,             loaded.parent
+    assert_equal section,        loaded.section
   end
 
   def test_name
@@ -244,5 +262,58 @@ method(a, b) { |c, d| ... }
     assert_equal 'C1', @c1.method_list.last.parent_name
   end
 
+  def test_store_equals
+    loaded = Marshal.load Marshal.dump(@c1.method_list.last)
+
+    loaded.store = @store
+
+    assert_equal @store, loaded.file.store
+  end
+
+  def test_superclass_method
+    m3 = RDoc::AnyMethod.new '', 'no_super'
+
+    m2 = RDoc::AnyMethod.new '', 'supers'
+    m2.calls_super = true
+
+    m1 = RDoc::AnyMethod.new '', 'supers'
+
+    c1 = RDoc::NormalClass.new 'Outer'
+    c1.store = @store
+    c1.add_method m1
+
+    c2 = RDoc::NormalClass.new 'Inner', c1
+    c2.store = @store
+    c2.add_method m2
+    c2.add_method m3
+
+    assert_nil m3.superclass_method,
+               'no superclass method for no_super'
+
+    assert_equal m1, m2.superclass_method,
+                 'superclass method missing for supers'
+  end
+
+  def test_superclass_method_multilevel
+    m2 = RDoc::AnyMethod.new '', 'supers'
+    m2.calls_super = true
+
+    m1 = RDoc::AnyMethod.new '', 'supers'
+
+    c1 = RDoc::NormalClass.new 'Outer'
+    c1.store = @store
+    c1.add_method m1
+
+    c2 = RDoc::NormalClass.new 'Middle', c1
+    c2.store = @store
+
+    c3 = RDoc::NormalClass.new 'Inner', c2
+    c3.store = @store
+    c3.add_method m2
+
+    assert_equal m1, m2.superclass_method,
+                 'superclass method missing for supers'
+  end
+
 end
 

data/test/test_rdoc_attr.rb

@@ -43,15 +43,18 @@ class TestRDocAttr < RDoc::TestCase
   end
 
   def test_marshal_dump
-    tl = RDoc::TopLevel.new 'file.rb'
+    tl = @store.add_file 'file.rb'
 
     @a.comment = 'this is a comment'
     @a.record_location tl
 
-    cm = RDoc::ClassModule.new 'Klass'
+    cm = tl.add_class RDoc::NormalClass, 'Klass'
     cm.add_attribute @a
 
+    section = cm.sections.first
+
     loaded = Marshal.load Marshal.dump @a
+    loaded.store = @store
 
     assert_equal @a, loaded
 
@@ -65,22 +68,28 @@ class TestRDocAttr < RDoc::TestCase
     assert_equal 'RW',         loaded.rw
     assert_equal false,        loaded.singleton
     assert_equal :public,      loaded.visibility
+    assert_equal tl,           loaded.file
+    assert_equal cm,           loaded.parent
+    assert_equal section,      loaded.section
   end
 
   def test_marshal_dump_singleton
-    tl = RDoc::TopLevel.new 'file.rb'
+    tl = @store.add_file 'file.rb'
 
     @a.comment = 'this is a comment'
     @a.record_location tl
 
-    cm = RDoc::ClassModule.new 'Klass'
+    cm = tl.add_class RDoc::NormalClass, 'Klass'
     cm.add_attribute @a
 
+    section = cm.sections.first
+
     @a.rw = 'R'
     @a.singleton = true
     @a.visibility = :protected
 
     loaded = Marshal.load Marshal.dump @a
+    loaded.store = @store
 
     assert_equal @a, loaded
 
@@ -93,16 +102,24 @@ class TestRDocAttr < RDoc::TestCase
     assert_equal 'R',           loaded.rw
     assert_equal true,          loaded.singleton
     assert_equal :protected,    loaded.visibility
+    assert_equal tl,            loaded.file
+    assert_equal cm,            loaded.parent
+    assert_equal section,       loaded.section
   end
 
   def test_marshal_load_version_1
-    data = "\x04\bU:\x0FRDoc::Attr[\fi\x06I\"\tattr\x06:\x06EF" \
-           "\"\x0FKlass#attrI\"\aRW\x06;\x06F:\vpublic" \
-           "o:\eRDoc::Markup::Document\x06:\v@parts[\x06" \
-           "o:\x1CRDoc::Markup::Paragraph\x06;\t[\x06I" \
+    tl = @store.add_file 'file.rb'
+    cm = tl.add_class RDoc::NormalClass, 'Klass'
+    section = cm.sections.first
+
+    data = "\x04\bU:\x0FRDoc::Attr[\fi\x06I\"\tattr\x06:\x06EF" +
+           "\"\x0FKlass#attrI\"\aRW\x06;\x06F:\vpublic" +
+           "o:\eRDoc::Markup::Document\x06:\v@parts[\x06" +
+           "o:\x1CRDoc::Markup::Paragraph\x06;\t[\x06I" +
            "\"\x16this is a comment\x06;\x06FF"
 
     loaded = Marshal.load data
+    loaded.store = @store
 
     comment = RDoc::Markup::Document.new(
                 RDoc::Markup::Paragraph.new('this is a comment'))
@@ -114,7 +131,40 @@ class TestRDocAttr < RDoc::TestCase
     assert_equal false,        loaded.singleton
     assert_equal :public,      loaded.visibility
 
-    assert_equal nil,          loaded.file # version 2
+    # version 2
+    assert_nil                 loaded.file
+
+    # version 3
+    assert_equal cm,           loaded.parent
+    assert_equal section,      loaded.section
+  end
+
+  def test_marshal_load_version_2
+    tl = @store.add_file 'file.rb'
+    cm = tl.add_class RDoc::NormalClass, 'Klass'
+    section = cm.sections.first
+
+    loaded = Marshal.load "\x04\bU:\x0FRDoc::Attr[\ri\aI\"\tattr\x06" +
+                          ":\x06ETI\"\x0FKlass#attr\x06;\x06TI\"\aRW\x06" +
+                          ";\x06T:\vpublico:\eRDoc::Markup::Document\a" +
+                          ":\v@parts[\x06o:\x1CRDoc::Markup::Paragraph\x06;" +
+                          "\t[\x06I\"\x16this is a comment\x06;\x06T:\n" +
+                          "@file0FI\"\ffile.rb\x06;\x06T"
+    loaded.store = @store
+
+    comment = doc(para('this is a comment'))
+
+    assert_equal comment,      loaded.comment
+    assert_equal 'Klass#attr', loaded.full_name
+    assert_equal 'attr',       loaded.name
+    assert_equal 'RW',         loaded.rw
+    assert_equal false,        loaded.singleton
+    assert_equal :public,      loaded.visibility
+    assert_equal tl,           loaded.file
+
+    # version 3
+    assert_equal cm,           loaded.parent
+    assert_equal section,      loaded.section
   end
 
   def test_params