rdoc 4.0.1 → 4.1.0.preview.3

data/test/test_rdoc_store.rb

@@ -9,6 +9,7 @@ class TestRDocStore < XrefTestCase
 
     @tmpdir = File.join Dir.tmpdir, "test_rdoc_ri_store_#{$$}"
     @s = RDoc::RI::Store.new @tmpdir
+    @s.rdoc = @rdoc
 
     @top_level = @s.add_file 'file.rb'
 
@@ -71,13 +72,6 @@ class TestRDocStore < XrefTestCase
     FileUtils.rm_rf @tmpdir
   end
 
-  def mu_pp obj
-    s = ''
-    s = PP.pp obj, s
-    s.force_encoding Encoding.default_external if defined? Encoding
-    s.chomp
-  end
-
   def assert_cache imethods, cmethods, attrs, modules,
                    ancestors = {}, pages = [], main = nil, title = nil
     imethods ||= { 'Object' => %w[method method! method_bang] }
@@ -106,18 +100,6 @@ class TestRDocStore < XrefTestCase
     assert_equal expected, @s.cache
   end
 
-  def assert_directory path
-    assert File.directory?(path), "#{path} is not a directory"
-  end
-
-  def assert_file path
-    assert File.file?(path), "#{path} is not a file"
-  end
-
-  def refute_file path
-    refute File.exist?(path), "#{path} exists"
-  end
-
   def test_add_c_enclosure
     @s.add_c_enclosure 'cC1', @c1
 
@@ -249,6 +231,16 @@ class TestRDocStore < XrefTestCase
     refute_empty a1.aliases
   end
 
+  def test_complete_nodoc
+    c_nodoc = @top_level.add_class RDoc::NormalClass, 'Nodoc'
+    c_nodoc.record_location @top_level
+    c_nodoc.document_self = nil
+
+    @s.complete :nodoc
+
+    assert_includes @s.classes_hash.keys, 'Nodoc'
+  end
+
   def test_find_c_enclosure
     assert_nil @s.find_c_enclosure 'cC1'
 

data/test/test_rdoc_text.rb

@@ -14,13 +14,6 @@ class TestRDocText < RDoc::TestCase
     @top_level = @store.add_file 'file.rb'
   end
 
-  def mu_pp obj
-    s = ''
-    s = PP.pp obj, s
-    s = s.force_encoding Encoding.default_external if defined? Encoding
-    s.chomp
-  end
-
   def test_self_encode_fallback
     skip "Encoding not implemented" unless Object.const_defined? :Encoding
 

data/test/test_rdoc_tom_doc.rb

@@ -11,13 +11,6 @@ class TestRDocTomDoc < RDoc::TestCase
     @td = @TD.new
   end
 
-  def mu_pp obj
-    s = ''
-    s = PP.pp obj, s
-    s = s.force_encoding Encoding.default_external if defined? Encoding
-    s.chomp
-  end
-
   def test_class_add_post_processor
     RDoc::TomDoc.add_post_processor
 
@@ -135,6 +128,17 @@ here - something
     assert_equal expected, @TD.parse(text)
   end
 
+  def test_parse_multiline_paragraph
+    text = "Public: Do some stuff\n"
+    text << "On a new line\n"
+
+    expected =
+      doc(
+        para('Do some stuff', ' ', 'On a new line'))
+
+    assert_equal expected, @TD.parse(text)
+  end
+
   def test_parse_arguments
     text = <<-TEXT
 Create new Arg object.
@@ -188,7 +192,7 @@ foo - A comment goes here
         blank_line,
         list(:NOTE,
           item(%w[foo],
-            para('A comment goes here', 'and is more than one line'))))
+            para('A comment goes here', ' ', 'and is more than one line'))))
 
     assert_equal expected, @TD.parse(text)
   end
@@ -279,13 +283,19 @@ Signature
 Do some stuff
 
 Returns a thing
+
+Returns another thing
     TEXT
 
     expected =
-      @RM::Document.new(
-        @RM::Paragraph.new('Do some stuff'),
-        @RM::BlankLine.new,
-        @RM::Paragraph.new('Returns a thing'))
+      doc(
+        para('Do some stuff'),
+        blank_line,
+        head(3, 'Returns'),
+        blank_line,
+        para('Returns a thing'),
+        blank_line,
+        para('Returns another thing'))
 
     assert_equal expected, @TD.parse(text)
   end
@@ -299,10 +309,12 @@ Returns a thing
     TEXT
 
     expected =
-      @RM::Document.new(
-        @RM::Paragraph.new('Do some stuff'),
-        @RM::BlankLine.new,
-        @RM::Paragraph.new('Returns a thing', 'that is multiline'))
+      doc(
+        para('Do some stuff'),
+        blank_line,
+        head(3, 'Returns'),
+        blank_line,
+        para('Returns a thing', ' ', 'that is multiline'))
 
     assert_equal expected, @TD.parse(text)
   end
@@ -338,6 +350,22 @@ Signature
     assert_equal expected, @td.tokens
   end
 
+  def test_tokenize_multiline_paragraph
+    text = "Public: Do some stuff\n"
+    text << "On a new line\n"
+
+    @td.tokenize text
+
+    expected = [
+      [:TEXT,     "Do some stuff",   0, 0],
+      [:NEWLINE,  "\n",             13, 0],
+      [:TEXT,     "On a new line",   0, 1],
+      [:NEWLINE,  "\n",             13, 1]
+    ]
+
+    assert_equal expected, @td.tokens
+  end
+
   def test_tokenize_arguments
     @td.tokenize <<-TEXT
 Create new Arg object.

data/test/xref_test_case.rb

@@ -11,6 +11,8 @@ class XrefTestCase < RDoc::TestCase
     @options = RDoc::Options.new
     @options.quiet = true
 
+    @rdoc.options = @options
+
     @file_name = 'xref_data.rb'
     @xref_data = @store.add_file @file_name
     @top_level = @xref_data

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdoc
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.1.0.preview.3
 platform: ruby
 authors:
 - Eric Hodel
@@ -33,7 +33,7 @@ cert_chain:
   KDyY1VIazVgoC8XvR4h/95/iScPiuglzA+DBG1hip1xScAtw05BrXyUNrc9CEMYU
   wgF94UVoHRp6ywo8I7NP3HcwFQDFNEZPNGXsng==
   -----END CERTIFICATE-----
-date: 2013-03-27 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -69,28 +69,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: racc
   requirement: !ruby/object:Gem::Requirement
@@ -98,6 +98,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
+    - - '!='
+      - !ruby/object:Gem::Version
+        version: 1.4.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -105,34 +108,23 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: ZenTest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
+    - - '!='
       - !ruby/object:Gem::Version
-        version: '4'
+        version: 1.4.10
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
 description: |-
   RDoc produces HTML and command-line documentation for Ruby projects.  RDoc
   includes the +rdoc+ and +ri+ tools for generating and displaying documentation
@@ -147,8 +139,10 @@ executables:
 - ri
 extensions: []
 extra_rdoc_files:
+- CONTRIBUTING.rdoc
 - CVE-2013-0256.rdoc
-- DEVELOPERS.rdoc
+- ExampleMarkdown.md
+- ExampleRDoc.rdoc
 - History.rdoc
 - LEGAL.rdoc
 - LICENSE.rdoc
@@ -156,13 +150,14 @@ extra_rdoc_files:
 - README.rdoc
 - RI.rdoc
 - TODO.rdoc
-- bin/rdoc
 - Rakefile
 files:
 - .autotest
 - .document
+- CONTRIBUTING.rdoc
 - CVE-2013-0256.rdoc
-- DEVELOPERS.rdoc
+- ExampleMarkdown.md
+- ExampleRDoc.rdoc
 - History.rdoc
 - LEGAL.rdoc
 - LICENSE.rdoc
@@ -213,6 +208,13 @@ files:
 - lib/rdoc/generator/template/darkfish/_sidebar_sections.rhtml
 - lib/rdoc/generator/template/darkfish/_sidebar_table_of_contents.rhtml
 - lib/rdoc/generator/template/darkfish/class.rhtml
+- lib/rdoc/generator/template/darkfish/fonts.css
+- lib/rdoc/generator/template/darkfish/fonts/Lato-Light.ttf
+- lib/rdoc/generator/template/darkfish/fonts/Lato-LightItalic.ttf
+- lib/rdoc/generator/template/darkfish/fonts/Lato-Regular.ttf
+- lib/rdoc/generator/template/darkfish/fonts/Lato-RegularItalic.ttf
+- lib/rdoc/generator/template/darkfish/fonts/SourceCodePro-Bold.ttf
+- lib/rdoc/generator/template/darkfish/fonts/SourceCodePro-Regular.ttf
 - lib/rdoc/generator/template/darkfish/images/add.png
 - lib/rdoc/generator/template/darkfish/images/arrow_up.png
 - lib/rdoc/generator/template/darkfish/images/brick.png
@@ -299,6 +301,7 @@ files:
 - lib/rdoc/markup/verbatim.rb
 - lib/rdoc/meta_method.rb
 - lib/rdoc/method_attr.rb
+- lib/rdoc/mixin.rb
 - lib/rdoc/normal_class.rb
 - lib/rdoc/normal_module.rb
 - lib/rdoc/options.rb
@@ -369,7 +372,6 @@ files:
 - test/test.ja.rdoc
 - test/test.ja.txt
 - test/test.txt
-- test/test_attribute_manager.rb
 - test/test_rdoc_alias.rb
 - test/test_rdoc_any_method.rb
 - test/test_rdoc_attr.rb
@@ -476,12 +478,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '1.3'
 requirements: []
 rubyforge_project: rdoc
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: RDoc produces HTML and command-line documentation for Ruby projects
 test_files:
-- test/test_attribute_manager.rb
 - test/test_rdoc_alias.rb
 - test/test_rdoc_any_method.rb
 - test/test_rdoc_attr.rb

data/test/test_attribute_manager.rb

@@ -1,120 +0,0 @@
-require 'rdoc/test_case'
-
-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 @options
-    @formatter.add_tag :BOLD, '<B>', '</B>'
-    @formatter.add_tag :EM, '<EM>', '</EM>'
-    @formatter.add_tag :TT, '<CODE>', '</CODE>'
-  end
-
-  def test_convert_attrs_ignores_code
-    assert_equal 'foo <CODE>__send__</CODE> bar', output('foo <code>__send__</code> bar')
-  end
-
-  def test_convert_attrs_ignores_tt
-    assert_equal 'foo <CODE>__send__</CODE> bar', output('foo <tt>__send__</tt> bar')
-  end
-
-  def test_convert_attrs_preserves_double
-    assert_equal 'foo.__send__ :bar', output('foo.__send__ :bar')
-    assert_equal 'use __FILE__ to', output('use __FILE__ to')
-  end
-
-  def test_convert_attrs_does_not_ignore_after_tt
-    assert_equal 'the <CODE>IF:</CODE><EM>key</EM> directive', output('the <tt>IF:</tt>_key_ directive')
-  end
-
-  def test_initial_word_pairs
-    word_pairs = @am.matching_word_pairs
-    assert word_pairs.is_a?(Hash)
-    assert_equal(3, word_pairs.size)
-  end
-
-  def test_initial_html
-    html_tags = @am.html_tags
-    assert html_tags.is_a?(Hash)
-    assert_equal(5, html_tags.size)
-  end
-
-  def test_add_matching_word_pair
-    @am.add_word_pair("x","x", :TEST)
-    word_pairs = @am.matching_word_pairs
-    assert_equal(4,word_pairs.size)
-    assert(word_pairs.has_key?("x"))
-  end
-
-  def test_add_invalid_word_pair
-    assert_raises ArgumentError do
-      @am.add_word_pair("<", "<", :TEST)
-    end
-  end
-
-  def test_add_word_pair_map
-    @am.add_word_pair("x", "y", :TEST)
-    word_pair_map = @am.word_pair_map
-    assert_equal(1,word_pair_map.size)
-    assert_equal(word_pair_map. keys.first.source, "(x)(\\S+)(y)")
-  end
-
-  def test_add_html_tag
-    @am.add_html("Test", :TEST)
-    tags = @am.html_tags
-    assert_equal(6, tags.size)
-    assert(tags.has_key?("test"))
-  end
-
-  def test_add_special
-    @am.add_special "WikiWord", :WIKIWORD
-    specials = @am.special
-
-    assert_equal 1, specials.size
-    assert specials.assoc "WikiWord"
-  end
-
-  def test_escapes
-    assert_equal '<CODE>text</CODE>',   output('<tt>text</tt>')
-    assert_equal '<tt>text</tt>',       output('\\<tt>text</tt>')
-    assert_equal '<tt>',                output('\\<tt>')
-    assert_equal '<CODE><tt></CODE>',   output('<tt>\\<tt></tt>')
-    assert_equal '<CODE>\\<tt></CODE>', output('<tt>\\\\<tt></tt>')
-    assert_equal '<B>text</B>',         output('*text*')
-    assert_equal '*text*',              output('\\*text*')
-    assert_equal '\\',                  output('\\')
-    assert_equal '\\text',              output('\\text')
-    assert_equal '\\\\text',            output('\\\\text')
-    assert_equal 'text \\ text',        output('text \\ text')
-
-    assert_equal 'and <CODE>\\s</CODE> matches space',
-                 output('and <tt>\\s</tt> matches space')
-    assert_equal 'use <CODE><tt>text</CODE></tt> for code',
-                 output('use <tt>\\<tt>text</tt></tt> for code')
-    assert_equal 'use <CODE><tt>text</tt></CODE> for code',
-                 output('use <tt>\\<tt>text\\</tt></tt> for code')
-    assert_equal 'use <tt><tt>text</tt></tt> for code',
-                 output('use \\<tt>\\<tt>text</tt></tt> for code')
-    assert_equal 'use <tt><CODE>text</CODE></tt> for code',
-                 output('use \\<tt><tt>text</tt></tt> for code')
-    assert_equal 'use <CODE>+text+</CODE> for code',
-                 output('use <tt>\\+text+</tt> for code')
-    assert_equal 'use <tt><CODE>text</CODE></tt> for code',
-                 output('use \\<tt>+text+</tt> for code')
-    assert_equal 'illegal <tag>not</tag> changed',
-                 output('illegal <tag>not</tag> changed')
-    assert_equal 'unhandled <p>tag</p> unchanged',
-                 output('unhandled <p>tag</p> unchanged')
-  end
-
-  def output str
-    @formatter.convert_flow @am.flow str
-  end
-
-end
-