rdoc 2.2.1 → 2.3.0

data/test/test_rdoc_parser.rb

@@ -1,13 +1,29 @@
+require 'rubygems'
+require 'minitest/unit'
 require 'rdoc/parser'
+require 'rdoc/parser/ruby'
 
-class TestRDocParser < Test::Unit::TestCase
+class TestRDocParser < MiniTest::Unit::TestCase
   def test_can_parse
     assert_equal(RDoc::Parser.can_parse(__FILE__), RDoc::Parser::Ruby)
 
     readme_file_name = File.join(File.dirname(__FILE__), "..", "README.txt")
+
+    unless File.exist? readme_file_name then # HACK for tests in trunk :/
+      readme_file_name = File.join File.dirname(__FILE__), '..', '..', 'README'
+    end
+
     assert_equal(RDoc::Parser.can_parse(readme_file_name), RDoc::Parser::Simple)
 
     binary_file_name = File.join(File.dirname(__FILE__), "binary.dat")
     assert_equal(RDoc::Parser.can_parse(binary_file_name), nil)
+
+    jtest_file_name = File.join(File.dirname(__FILE__), "test.ja.txt")
+    assert_equal(RDoc::Parser::Simple, RDoc::Parser.can_parse(jtest_file_name))
+
+    jtest_rdoc_file_name = File.join(File.dirname(__FILE__), "test.ja.rdoc")
+    assert_equal(RDoc::Parser::Simple, RDoc::Parser.can_parse(jtest_rdoc_file_name))
   end
 end
+
+MiniTest::Unit.autorun

data/test/test_rdoc_parser_c.rb

@@ -1,6 +1,7 @@
 require 'stringio'
 require 'tempfile'
-require 'test/unit'
+require 'rubygems'
+require 'minitest/unit'
 require 'rdoc/options'
 require 'rdoc/parser/c'
 
@@ -10,7 +11,7 @@ class RDoc::Parser::C
   public :do_classes, :do_constants
 end
 
-class TestRDocParserC < Test::Unit::TestCase
+class TestRDocParserC < MiniTest::Unit::TestCase
 
   def setup
     @tempfile = Tempfile.new self.class.name
@@ -20,6 +21,9 @@ class TestRDocParserC < Test::Unit::TestCase
     @fn = filename
     @options = RDoc::Options.new
     @stats = RDoc::Stats.new 0
+
+    RDoc::Parser::C.reset
+    RDoc::TopLevel.reset
   end
 
   def teardown
@@ -136,12 +140,12 @@ void Init_foo(){
 }
     EOF
 
-    parser = util_parser content
+    @parser = util_parser content
 
-    parser.do_classes
-    parser.do_constants
+    @parser.do_classes
+    @parser.do_constants
 
-    klass = parser.classes['cFoo']
+    klass = @parser.classes['cFoo']
     assert klass
 
     constants = klass.constants
@@ -222,7 +226,7 @@ VALUE foo = rb_define_class("Foo", rb_cObject);
 
     klass = util_get_class content, 'foo'
 
-    assert_equal "  \n   a comment for class Foo\n   ", klass.comment
+    assert_equal "  \n   a comment for class Foo\n   \n", klass.comment
   end
 
   def test_find_class_comment_define_class_Init_Foo
@@ -244,6 +248,56 @@ Init_Foo(void) {
     assert_equal "  \n   a comment for class Foo on Init\n   \n", klass.comment
   end
 
+  def test_find_class_comment_define_class_bogus_comment
+    content = <<-EOF
+/*
+ * a comment for other_function
+ */
+void
+other_function() {
+}
+
+void
+Init_Foo(void) {
+    VALUE foo = rb_define_class("Foo", rb_cObject);
+}
+    EOF
+
+    klass = util_get_class content, 'foo'
+
+    assert_equal '', klass.comment
+  end
+
+  def test_find_body
+    content = <<-EOF
+/*
+ * a comment for other_function
+ */
+VALUE
+other_function() {
+}
+
+void
+Init_Foo(void) {
+    VALUE foo = rb_define_class("Foo", rb_cObject);
+
+    rb_define_method(foo, "my_method", other_function, 0);
+}
+    EOF
+
+    klass = util_get_class content, 'foo'
+    other_function = klass.method_list.first
+
+    assert_equal 'my_method', other_function.name
+    assert_equal "  \n   a comment for other_function\n   \n",
+                 other_function.comment
+    assert_equal '()', other_function.params
+
+    code = other_function.token_stream.first.text
+
+    assert_equal "VALUE\nother_function() ", code
+  end
+
   def test_define_method
     content = <<-EOF
 /*Method Comment! */
@@ -272,9 +326,9 @@ Init_IO(void) {
   end
 
   def util_get_class(content, name)
-    parser = util_parser content
-    parser.scan
-    parser.classes[name]
+    @parser = util_parser content
+    @parser.scan
+    @parser.classes[name]
   end
 
   def util_parser(content)
@@ -283,3 +337,4 @@ Init_IO(void) {
 
 end
 
+MiniTest::Unit.autorun

data/test/test_rdoc_parser_perl.rb

@@ -1,10 +1,11 @@
 require 'stringio'
 require 'tempfile'
-require 'test/unit'
+require 'rubygems'
+require 'minitest/unit'
 require 'rdoc/options'
 require 'rdoc/parser/perl'
 
-class TestRdocParserPerlPOD < Test::Unit::TestCase
+class TestRdocParserPerlPOD < MiniTest::Unit::TestCase
 
   def setup
     @tempfile = Tempfile.new self.class.name
@@ -70,3 +71,4 @@ This just contains plain old documentation
 
 end
 
+MiniTest::Unit.autorun

data/test/test_rdoc_parser_ruby.rb

@@ -1,12 +1,13 @@
 require 'stringio'
 require 'tempfile'
-require 'test/unit'
+require 'rubygems'
+require 'minitest/unit'
 
 require 'rdoc/options'
 require 'rdoc/parser/ruby'
 require 'rdoc/stats'
 
-class TestRDocParserRuby < Test::Unit::TestCase
+class TestRDocParserRuby < MiniTest::Unit::TestCase
 
   def setup
     @tempfile = Tempfile.new self.class.name
@@ -23,8 +24,8 @@ class TestRDocParserRuby < Test::Unit::TestCase
   end
 
   def teardown
-    @tempfile.unlink
-    @tempfile2.unlink
+    @tempfile.close
+    @tempfile2.close
   end
 
   def test_look_for_directives_in_commented
@@ -747,3 +748,4 @@ EOF
 
 end
 
+MiniTest::Unit.autorun

data/test/test_rdoc_ri_attribute_formatter.rb

@@ -1,8 +1,9 @@
 require 'stringio'
-require 'test/unit'
+require 'rubygems'
+require 'minitest/unit'
 require 'rdoc/ri/formatter'
 
-class TestRDocRIAttributeFormatter < Test::Unit::TestCase
+class TestRDocRIAttributeFormatter < MiniTest::Unit::TestCase
 
   def setup
     @output = StringIO.new
@@ -40,3 +41,4 @@ class TestRDocRIAttributeFormatter < Test::Unit::TestCase
 
 end
 
+MiniTest::Unit.autorun

data/test/test_rdoc_ri_default_display.rb

@@ -1,10 +1,11 @@
 require 'stringio'
-require 'test/unit'
+require 'rubygems'
+require 'minitest/unit'
 require 'rdoc/ri/formatter'
 require 'rdoc/ri/display'
 require 'rdoc/ri/driver'
 
-class TestRDocRiDefaultDisplay < Test::Unit::TestCase
+class TestRDocRiDefaultDisplay < MiniTest::Unit::TestCase
 
   def setup
     @output = StringIO.new
@@ -52,11 +53,12 @@ class TestRDocRiDefaultDisplay < Test::Unit::TestCase
       'includes' => [],
       'instance_methods' => [
         { 'name' => 'instance_method' },
+        { 'name' => 'instance_method2' },
       ],
       'instance_method_extensions' => [
         { 'name' => 'instance_method_extension' },
       ],
-      'superclass_string' => 'Object'
+      'superclass' => 'Object'
 
     @dd.display_class_info klass
 
@@ -100,7 +102,7 @@ Class method extensions:
 Instance methods:
 -----------------
 
-     instance_method
+     instance_method, instance_method2
 
 
 Instance method extensions:
@@ -295,3 +297,5 @@ install an additional package, or ask the packager to enable ri generation.
   end
 
 end
+
+MiniTest::Unit.autorun

data/test/test_rdoc_ri_driver.rb

@@ -1,8 +1,9 @@
-require 'test/unit'
+require 'rubygems'
+require 'minitest/unit'
 require 'tmpdir'
 require 'rdoc/ri/driver'
 
-class TestRDocRIDriver < Test::Unit::TestCase
+class TestRDocRIDriver < MiniTest::Unit::TestCase
 
   def setup
     @tmpdir = File.join Dir.tmpdir, "test_rdoc_ri_driver_#{$$}"
@@ -90,3 +91,4 @@ class TestRDocRIDriver < Test::Unit::TestCase
 
 end
 
+MiniTest::Unit.autorun

data/test/test_rdoc_ri_formatter.rb

@@ -1,9 +1,10 @@
 require 'stringio'
-require 'test/unit'
+require 'rubygems'
+require 'minitest/unit'
 require 'rdoc/ri/formatter'
 require 'rdoc/markup/to_flow'
 
-class TestRDocRIFormatter < Test::Unit::TestCase
+class TestRDocRIFormatter < MiniTest::Unit::TestCase
 
   def setup
     @output = StringIO.new
@@ -97,7 +98,7 @@ class TestRDocRIFormatter < Test::Unit::TestCase
   end
 
   def test_display_flow_item_unknown
-    e = assert_raise RDoc::Error do
+    e = assert_raises RDoc::Error do
       @f.display_flow_item Object.new
     end
 
@@ -189,7 +190,7 @@ class TestRDocRIFormatter < Test::Unit::TestCase
     list = RDoc::Markup::Flow::LIST.new :UNKNOWN
     list << RDoc::Markup::Flow::LI.new(nil, 'a b c')
 
-    e = assert_raise ArgumentError do
+    e = assert_raises ArgumentError do
       @f.display_list list
     end
 
@@ -316,3 +317,4 @@ class TestRDocRIFormatter < Test::Unit::TestCase
 
 end
 
+MiniTest::Unit.autorun

data/test/test_rdoc_ri_overstrike_formatter.rb

@@ -1,10 +1,11 @@
 require 'stringio'
-require 'test/unit'
+require 'rubygems'
+require 'minitest/unit'
 require 'rdoc/ri/formatter'
 require 'rdoc/markup/fragments'
 require 'rdoc/markup/to_flow'
 
-class TestRDocRIOverstrikeFormatter < Test::Unit::TestCase
+class TestRDocRIOverstrikeFormatter < MiniTest::Unit::TestCase
 
   def setup
     @output = StringIO.new
@@ -67,3 +68,4 @@ class TestRDocRIOverstrikeFormatter < Test::Unit::TestCase
 
 end
 
+MiniTest::Unit.autorun

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rdoc
 version: !ruby/object:Gem::Version 
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors: 
 - Eric Hodel
@@ -10,11 +10,42 @@ authors:
 - Tony Strauss
 autorequire: 
 bindir: bin
-cert_chain: []
+cert_chain: 
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDNjCCAh6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBBMRAwDgYDVQQDDAdkcmJy
+  YWluMRgwFgYKCZImiZPyLGQBGRYIc2VnbWVudDcxEzARBgoJkiaJk/IsZAEZFgNu
+  ZXQwHhcNMDcxMjIxMDIwNDE0WhcNMDgxMjIwMDIwNDE0WjBBMRAwDgYDVQQDDAdk
+  cmJyYWluMRgwFgYKCZImiZPyLGQBGRYIc2VnbWVudDcxEzARBgoJkiaJk/IsZAEZ
+  FgNuZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCbbgLrGLGIDE76
+  LV/cvxdEzCuYuS3oG9PrSZnuDweySUfdp/so0cDq+j8bqy6OzZSw07gdjwFMSd6J
+  U5ddZCVywn5nnAQ+Ui7jMW54CYt5/H6f2US6U0hQOjJR6cpfiymgxGdfyTiVcvTm
+  Gj/okWrQl0NjYOYBpDi+9PPmaH2RmLJu0dB/NylsDnW5j6yN1BEI8MfJRR+HRKZY
+  mUtgzBwF1V4KIZQ8EuL6I/nHVu07i6IkrpAgxpXUfdJQJi0oZAqXurAV3yTxkFwd
+  g62YrrW26mDe+pZBzR6bpLE+PmXCzz7UxUq3AE0gPHbiMXie3EFE0oxnsU3lIduh
+  sCANiQ8BAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
+  BBS5k4Z75VSpdM0AclG2UvzFA/VW5DANBgkqhkiG9w0BAQUFAAOCAQEAHagT4lfX
+  kP/hDaiwGct7XPuVGbrOsKRVD59FF5kETBxEc9UQ1clKWngf8JoVuEoKD774dW19
+  bU0GOVWO+J6FMmT/Cp7nuFJ79egMf/gy4gfUfQMuvfcr6DvZUPIs9P/TlK59iMYF
+  DIOQ3DxdF3rMzztNUCizN4taVscEsjCcgW6WkUJnGdqlu3OHWpQxZBJkBTjPCoc6
+  UW6on70SFPmAy/5Cq0OJNGEWBfgD9q7rrs/X8GGwUWqXb85RXnUVi/P8Up75E0ag
+  14jEc90kN+C7oI/AGCBN0j6JnEtYIEJZibjjDJTSMWlUKKkj30kq7hlUC2CepJ4v
+  x52qPcexcYZR7w==
+  -----END CERTIFICATE-----
 
-date: 2008-09-24 00:00:00 -04:00
+date: 2009-01-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: minitest
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.3"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -23,9 +54,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 1.8.2
     version: 
-description: RDoc is an application that produces documentation for one or more Ruby source files.  RDoc includes the +rdoc+ and +ri+ tools for generating and displaying online documentation.  At this point in time, RDoc 2.x is a work in progress and may incur further API changes beyond what has been made to the RDoc 1.0.1.  Command-line tools are largely unaffected, but internal APIs may shift rapidly.  See RDoc for a description of RDoc's markup and basic use.
+description: RDoc is an application that produces documentation for one or more Ruby source files.  RDoc includes the +rdoc+ and +ri+ tools for generating and displaying online documentation.  At this point in time, RDoc 2.x is a work in progress and may incur further API changes beyond what has been made to RDoc 1.0.1.  Command-line tools are largely unaffected, but internal APIs may shift rapidly.  See RDoc for a description of RDoc's markup and basic use.
 email: 
 - drbrain@segment7.net
 - ""
@@ -41,35 +72,57 @@ extra_rdoc_files:
 - Manifest.txt
 - README.txt
 - RI.txt
+- test/test.ja.txt
 files: 
+- .document
 - History.txt
 - Manifest.txt
 - README.txt
-- Rakefile
 - RI.txt
+- Rakefile
 - bin/rdoc
 - bin/ri
 - lib/rdoc.rb
+- lib/rdoc/cache.rb
 - lib/rdoc/code_objects.rb
 - lib/rdoc/diagram.rb
 - lib/rdoc/dot.rb
 - lib/rdoc/generator.rb
-- lib/rdoc/generator/chm.rb
-- lib/rdoc/generator/chm/chm.rb
+- lib/rdoc/generator/darkfish.rb
 - lib/rdoc/generator/html.rb
 - lib/rdoc/generator/html/common.rb
-- lib/rdoc/generator/html/frameless.rb
-- lib/rdoc/generator/html/hefss.rb
 - lib/rdoc/generator/html/html.rb
-- lib/rdoc/generator/html/kilmer.rb
-- lib/rdoc/generator/html/kilmerfactory.rb
 - lib/rdoc/generator/html/one_page_html.rb
 - lib/rdoc/generator/ri.rb
-- lib/rdoc/generator/texinfo.rb
-- lib/rdoc/generator/texinfo/class.texinfo.erb
-- lib/rdoc/generator/texinfo/file.texinfo.erb
-- lib/rdoc/generator/texinfo/method.texinfo.erb
-- lib/rdoc/generator/texinfo/texinfo.erb
+- lib/rdoc/generator/template/darkfish/.document
+- lib/rdoc/generator/template/darkfish/classpage.rhtml
+- lib/rdoc/generator/template/darkfish/filepage.rhtml
+- lib/rdoc/generator/template/darkfish/images/brick.png
+- lib/rdoc/generator/template/darkfish/images/brick_link.png
+- lib/rdoc/generator/template/darkfish/images/bug.png
+- lib/rdoc/generator/template/darkfish/images/bullet_black.png
+- lib/rdoc/generator/template/darkfish/images/bullet_toggle_minus.png
+- lib/rdoc/generator/template/darkfish/images/bullet_toggle_plus.png
+- lib/rdoc/generator/template/darkfish/images/date.png
+- lib/rdoc/generator/template/darkfish/images/find.png
+- lib/rdoc/generator/template/darkfish/images/loadingAnimation.gif
+- lib/rdoc/generator/template/darkfish/images/macFFBgHack.png
+- lib/rdoc/generator/template/darkfish/images/package.png
+- lib/rdoc/generator/template/darkfish/images/page_green.png
+- lib/rdoc/generator/template/darkfish/images/page_white_text.png
+- lib/rdoc/generator/template/darkfish/images/page_white_width.png
+- lib/rdoc/generator/template/darkfish/images/plugin.png
+- lib/rdoc/generator/template/darkfish/images/ruby.png
+- lib/rdoc/generator/template/darkfish/images/tag_green.png
+- lib/rdoc/generator/template/darkfish/images/wrench.png
+- lib/rdoc/generator/template/darkfish/images/wrench_orange.png
+- lib/rdoc/generator/template/darkfish/images/zoom.png
+- lib/rdoc/generator/template/darkfish/index.rhtml
+- lib/rdoc/generator/template/darkfish/js/darkfish.js
+- lib/rdoc/generator/template/darkfish/js/jquery.js
+- lib/rdoc/generator/template/darkfish/js/quicksearch.js
+- lib/rdoc/generator/template/darkfish/js/thickbox-compressed.js
+- lib/rdoc/generator/template/darkfish/rdoc.css
 - lib/rdoc/generator/xml.rb
 - lib/rdoc/generator/xml/rdf.rb
 - lib/rdoc/generator/xml/xml.rb
@@ -109,9 +162,9 @@ files:
 - lib/rdoc/template.rb
 - lib/rdoc/tokenstream.rb
 - test/binary.dat
-- test/rdoc_markup_to_html_crossref_reference.rb
-- test/test_rdoc_info_formatting.rb
-- test/test_rdoc_info_sections.rb
+- test/test.ja.rdoc
+- test/test.ja.txt
+- test/test_attribute_manager.rb
 - test/test_rdoc_markup.rb
 - test/test_rdoc_markup_attribute_manager.rb
 - test/test_rdoc_markup_to_html.rb
@@ -143,29 +196,27 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: "1.3"
   version: 
 requirements: []
 
 rubyforge_project: rdoc
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1.1939
 signing_key: 
 specification_version: 2
 summary: RDoc is an application that produces documentation for one or more Ruby source files
 test_files: 
-- test/test_rdoc_parser.rb
+- test/test_attribute_manager.rb
+- test/test_rdoc_markup.rb
+- test/test_rdoc_markup_attribute_manager.rb
 - test/test_rdoc_markup_to_html.rb
-- test/test_rdoc_ri_default_display.rb
 - test/test_rdoc_markup_to_html_crossref.rb
-- test/test_rdoc_info_sections.rb
-- test/test_rdoc_ri_formatter.rb
+- test/test_rdoc_parser.rb
+- test/test_rdoc_parser_c.rb
 - test/test_rdoc_parser_perl.rb
-- test/test_rdoc_ri_driver.rb
-- test/test_attribute_manager.rb
 - test/test_rdoc_parser_ruby.rb
-- test/test_rdoc_ri_overstrike_formatter.rb
-- test/test_rdoc_markup_attribute_manager.rb
-- test/test_rdoc_info_formatting.rb
-- test/test_rdoc_parser_c.rb
 - test/test_rdoc_ri_attribute_formatter.rb
-- test/test_rdoc_markup.rb
+- test/test_rdoc_ri_default_display.rb
+- test/test_rdoc_ri_driver.rb
+- test/test_rdoc_ri_formatter.rb
+- test/test_rdoc_ri_overstrike_formatter.rb