rdoc 2.4.3 → 2.5

data/test/test_rdoc_top_level.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'minitest/unit'
+require 'minitest/autorun'
 require 'test/xref_test_case'
 
 class TestRDocTopLevel < XrefTestCase
@@ -11,13 +11,20 @@ class TestRDocTopLevel < XrefTestCase
   end
 
   def test_class_all_classes_and_modules
-    assert_equal %w[C1 C2 C2::C3 C2::C3::H1 C3 C3::H1 C3::H2 C4 C4::C4 M1],
+    expected = %w[
+      C1 C2 C2::C3 C2::C3::H1 C3 C3::H1 C3::H2 C4 C4::C4 C5 C5::C1 M1 M1::M2
+    ]
+
+    assert_equal expected,
                  RDoc::TopLevel.all_classes_and_modules.map { |m| m.full_name }.sort
   end
 
   def test_class_classes
-    assert_equal %w[C1 C2 C2::C3 C2::C3::H1 C3 C3::H1 C3::H2 C4 C4::C4],
-                 RDoc::TopLevel.classes.map { |m| m.full_name }.sort
+    expected = %w[
+      C1 C2 C2::C3 C2::C3::H1 C3 C3::H1 C3::H2 C4 C4::C4 C5 C5::C1
+    ]
+
+    assert_equal expected, RDoc::TopLevel.classes.map { |m| m.full_name }.sort
   end
 
   def test_class_files
@@ -27,6 +34,22 @@ class TestRDocTopLevel < XrefTestCase
 
   def test_class_find_class_named
     assert_equal @c1, RDoc::TopLevel.find_class_named('C1')
+
+    assert_equal @c2_c3, RDoc::TopLevel.find_class_named('C2::C3')
+  end
+
+  def test_class_find_class_named_from
+    assert_equal @c5_c1, RDoc::TopLevel.find_class_named_from('C1', 'C5')
+
+    assert_equal @c1,    RDoc::TopLevel.find_class_named_from('C1', 'C4')
+  end
+
+  def test_class_find_class_or_module
+    assert_equal @m1, RDoc::TopLevel.find_class_or_module('M1')
+    assert_equal @c1, RDoc::TopLevel.find_class_or_module('C1')
+
+    assert_equal @m1, RDoc::TopLevel.find_class_or_module('::M1')
+    assert_equal @c1, RDoc::TopLevel.find_class_or_module('::C1')
   end
 
   def test_class_find_file_named
@@ -34,11 +57,12 @@ class TestRDocTopLevel < XrefTestCase
   end
 
   def test_class_find_module_named
-    assert_equal @m1, RDoc::TopLevel.find_module_named('M1')
+    assert_equal @m1,    RDoc::TopLevel.find_module_named('M1')
+    assert_equal @m1_m2, RDoc::TopLevel.find_module_named('M1::M2')
   end
 
   def test_class_modules
-    assert_equal %w[M1],
+    assert_equal %w[M1 M1::M2],
                  RDoc::TopLevel.modules.map { |m| m.full_name }.sort
   end
 
@@ -54,9 +78,11 @@ class TestRDocTopLevel < XrefTestCase
     assert_equal 'top_level.rb', @top_level.base_name
   end
 
-  def test_find_class_or_module_named
-    assert_equal @c1, @xref_data.find_class_or_module_named('C1')
-    assert_equal @c4, @xref_data.find_class_or_module_named('C4')
+  def test_find_class_or_module
+    assert_equal @c1,    @xref_data.find_class_or_module('C1')
+    assert_equal @c2_c3, @xref_data.find_class_or_module('C2::C3')
+    assert_equal @c4,    @xref_data.find_class_or_module('C4')
+    assert_equal @m1_m2, @xref_data.find_class_or_module('M1::M2')
   end
 
   def test_full_name

data/test/xref_data.rb

@@ -31,7 +31,7 @@ class C3
   class H1
   end
 
-  class H2
+  class H2 < H1
   end
 end
 
@@ -40,7 +40,15 @@ class C4
   end
 end
 
+class C5
+  class C1
+  end
+end
+
 module M1
 end
+
+module M1::M2
+end
 XREF_DATA
 

data/test/xref_test_case.rb

@@ -1,5 +1,8 @@
+ENV['RDOC_TEST'] = 'yes'
+
 require 'rubygems'
-require 'minitest/unit'
+require 'minitest/autorun'
+require 'rdoc'
 require 'rdoc/stats'
 require 'rdoc/options'
 require 'rdoc/code_objects'
@@ -38,11 +41,13 @@ class XrefTestCase < MiniTest::Unit::TestCase
     @c3    = @xref_data.find_module_named 'C3'
     @c4    = @xref_data.find_module_named 'C4'
     @c4_c4 = @xref_data.find_module_named 'C4::C4'
+    @c5_c1 = @xref_data.find_module_named 'C5::C1'
+    @c3_h1 = @xref_data.find_module_named 'C3::H1'
+    @c3_h2 = @xref_data.find_module_named 'C3::H2'
 
     @m1    = @xref_data.find_module_named 'M1'
+    @m1_m2 = @xref_data.find_module_named 'M1::M2'
   end
 
 end
 
-MiniTest::Unit.autorun
-

metadata

@@ -1,7 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: rdoc
 version: !ruby/object:Gem::Version 
-  version: 2.4.3
+  prerelease: false
+  segments: 
+  - 2
+  - 5
+  version: "2.5"
 platform: ruby
 authors: 
 - Eric Hodel
@@ -33,29 +37,64 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2009-04-01 00:00:00 -07:00
+date: 2010-03-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: minitest
+  name: rubyforge
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 3
+        version: 2.0.3
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: gemcutter
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 0
+        version: 0.5.0
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: minitest
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
         version: "1.3"
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.12.1
-    version: 
+        segments: 
+        - 2
+        - 5
+        - 0
+        version: 2.5.0
+  type: :development
+  version_requirements: *id004
 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
@@ -78,6 +117,7 @@ extensions: []
 
 extra_rdoc_files: 
 - History.txt
+- LICENSE.txt
 - Manifest.txt
 - README.txt
 - RI.txt
@@ -85,6 +125,7 @@ files:
 - .autotest
 - .document
 - History.txt
+- LICENSE.txt
 - Manifest.txt
 - README.txt
 - RI.txt
@@ -96,14 +137,12 @@ files:
 - lib/rdoc/anon_class.rb
 - lib/rdoc/any_method.rb
 - lib/rdoc/attr.rb
-- lib/rdoc/cache.rb
 - lib/rdoc/class_module.rb
 - lib/rdoc/code_object.rb
 - lib/rdoc/code_objects.rb
 - lib/rdoc/constant.rb
 - lib/rdoc/context.rb
-- lib/rdoc/diagram.rb
-- lib/rdoc/dot.rb
+- lib/rdoc/gauntlet.rb
 - lib/rdoc/generator.rb
 - lib/rdoc/generator/darkfish.rb
 - lib/rdoc/generator/markup.rb
@@ -142,17 +181,25 @@ files:
 - lib/rdoc/known_classes.rb
 - lib/rdoc/markup.rb
 - lib/rdoc/markup/attribute_manager.rb
+- lib/rdoc/markup/blank_line.rb
+- lib/rdoc/markup/document.rb
 - lib/rdoc/markup/formatter.rb
-- lib/rdoc/markup/fragments.rb
+- lib/rdoc/markup/formatter_test_case.rb
+- lib/rdoc/markup/heading.rb
 - lib/rdoc/markup/inline.rb
-- lib/rdoc/markup/lines.rb
+- lib/rdoc/markup/list.rb
+- lib/rdoc/markup/list_item.rb
+- lib/rdoc/markup/paragraph.rb
+- lib/rdoc/markup/parser.rb
 - lib/rdoc/markup/preprocess.rb
-- lib/rdoc/markup/to_flow.rb
+- lib/rdoc/markup/rule.rb
+- lib/rdoc/markup/to_ansi.rb
+- lib/rdoc/markup/to_bs.rb
 - lib/rdoc/markup/to_html.rb
 - lib/rdoc/markup/to_html_crossref.rb
-- lib/rdoc/markup/to_latex.rb
+- lib/rdoc/markup/to_rdoc.rb
 - lib/rdoc/markup/to_test.rb
-- lib/rdoc/markup/to_texinfo.rb
+- lib/rdoc/markup/verbatim.rb
 - lib/rdoc/meta_method.rb
 - lib/rdoc/normal_class.rb
 - lib/rdoc/normal_module.rb
@@ -161,50 +208,61 @@ files:
 - lib/rdoc/parser/c.rb
 - lib/rdoc/parser/perl.rb
 - lib/rdoc/parser/ruby.rb
+- lib/rdoc/parser/ruby_tools.rb
 - lib/rdoc/parser/simple.rb
 - lib/rdoc/rdoc.rb
 - lib/rdoc/require.rb
 - lib/rdoc/ri.rb
-- lib/rdoc/ri/cache.rb
-- lib/rdoc/ri/descriptions.rb
-- lib/rdoc/ri/display.rb
 - lib/rdoc/ri/driver.rb
 - lib/rdoc/ri/formatter.rb
 - lib/rdoc/ri/paths.rb
-- lib/rdoc/ri/reader.rb
-- lib/rdoc/ri/util.rb
-- lib/rdoc/ri/writer.rb
+- lib/rdoc/ri/store.rb
+- lib/rdoc/ruby_lex.rb
+- lib/rdoc/ruby_token.rb
 - lib/rdoc/single_class.rb
 - lib/rdoc/stats.rb
 - lib/rdoc/task.rb
+- lib/rdoc/text.rb
 - lib/rdoc/tokenstream.rb
 - lib/rdoc/top_level.rb
 - test/binary.dat
+- test/hidden.zip.txt
 - test/test.ja.rdoc
 - test/test.ja.txt
 - test/test_attribute_manager.rb
 - test/test_rdoc_any_method.rb
+- test/test_rdoc_attr.rb
+- test/test_rdoc_class_module.rb
 - test/test_rdoc_code_object.rb
 - test/test_rdoc_constant.rb
 - test/test_rdoc_context.rb
+- test/test_rdoc_generator_ri.rb
 - test/test_rdoc_include.rb
 - test/test_rdoc_markup.rb
 - test/test_rdoc_markup_attribute_manager.rb
+- test/test_rdoc_markup_document.rb
+- test/test_rdoc_markup_paragraph.rb
+- test/test_rdoc_markup_parser.rb
+- test/test_rdoc_markup_to_ansi.rb
+- test/test_rdoc_markup_to_bs.rb
 - test/test_rdoc_markup_to_html.rb
 - test/test_rdoc_markup_to_html_crossref.rb
+- test/test_rdoc_markup_to_rdoc.rb
+- test/test_rdoc_normal_class.rb
 - test/test_rdoc_normal_module.rb
+- test/test_rdoc_options.rb
 - test/test_rdoc_parser.rb
 - test/test_rdoc_parser_c.rb
 - test/test_rdoc_parser_perl.rb
 - test/test_rdoc_parser_ruby.rb
+- test/test_rdoc_parser_simple.rb
+- test/test_rdoc_rdoc.rb
 - test/test_rdoc_require.rb
-- test/test_rdoc_ri_attribute_formatter.rb
-- test/test_rdoc_ri_default_display.rb
 - test/test_rdoc_ri_driver.rb
-- test/test_rdoc_ri_formatter.rb
-- test/test_rdoc_ri_html_formatter.rb
-- test/test_rdoc_ri_overstrike_formatter.rb
+- test/test_rdoc_ri_paths.rb
+- test/test_rdoc_ri_store.rb
 - test/test_rdoc_task.rb
+- test/test_rdoc_text.rb
 - test/test_rdoc_top_level.rb
 - test/xref_data.rb
 - test/xref_test_case.rb
@@ -222,43 +280,57 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
       version: "1.3"
-  version: 
 requirements: []
 
 rubyforge_project: rdoc
-rubygems_version: 1.3.1.2113
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: RDoc is an application that produces documentation for one or more Ruby source files
 test_files: 
 - test/test_attribute_manager.rb
 - test/test_rdoc_any_method.rb
+- test/test_rdoc_attr.rb
+- test/test_rdoc_class_module.rb
 - test/test_rdoc_code_object.rb
 - test/test_rdoc_constant.rb
 - test/test_rdoc_context.rb
+- test/test_rdoc_generator_ri.rb
 - test/test_rdoc_include.rb
 - test/test_rdoc_markup.rb
 - test/test_rdoc_markup_attribute_manager.rb
+- test/test_rdoc_markup_document.rb
+- test/test_rdoc_markup_paragraph.rb
+- test/test_rdoc_markup_parser.rb
+- test/test_rdoc_markup_to_ansi.rb
+- test/test_rdoc_markup_to_bs.rb
 - test/test_rdoc_markup_to_html.rb
 - test/test_rdoc_markup_to_html_crossref.rb
+- test/test_rdoc_markup_to_rdoc.rb
+- test/test_rdoc_normal_class.rb
 - test/test_rdoc_normal_module.rb
+- test/test_rdoc_options.rb
 - test/test_rdoc_parser.rb
 - test/test_rdoc_parser_c.rb
 - test/test_rdoc_parser_perl.rb
 - test/test_rdoc_parser_ruby.rb
+- test/test_rdoc_parser_simple.rb
+- test/test_rdoc_rdoc.rb
 - test/test_rdoc_require.rb
-- test/test_rdoc_ri_attribute_formatter.rb
-- test/test_rdoc_ri_default_display.rb
 - test/test_rdoc_ri_driver.rb
-- test/test_rdoc_ri_formatter.rb
-- test/test_rdoc_ri_html_formatter.rb
-- test/test_rdoc_ri_overstrike_formatter.rb
+- test/test_rdoc_ri_paths.rb
+- test/test_rdoc_ri_store.rb
 - test/test_rdoc_task.rb
+- test/test_rdoc_text.rb
 - test/test_rdoc_top_level.rb

data/lib/rdoc/cache.rb

@@ -1,41 +0,0 @@
-require 'thread'
-require 'singleton'
-
-##
-# A generic, thread-safe in-memory cache. It's used for caching
-# RDoc::TemplatePage objects when generating RDoc output.
-
-class RDoc::Cache
-
-  include Singleton
-
-  ##
-  # Creates a new, empty cache
-
-  def initialize
-    @contents = {}
-    @lock = Mutex.new
-  end
-
-  ##
-  # Checks whether there's a value in the cache with key +key+. If so, then
-  # that value will be returned. Otherwise, the given block will be run, and
-  # its return value will be put into the cache, and returned.
-
-  def cache(key)
-    @lock.synchronize do
-      @contents[key] ||= yield
-    end
-  end
-
-  ##
-  # Clears the contents of the cache
-
-  def clear
-    @lock.synchronize do
-      @contents.clear
-    end
-  end
-
-end
-