rdoc 4.1.2 → 4.2.0

data/test/test_rdoc_parser_changelog.rb

@@ -12,7 +12,7 @@ class TestRDocParserChangeLog < RDoc::TestCase
   end
 
   def teardown
-    @tempfile.close
+    @tempfile.close!
   end
 
   def test_class_can_parse

data/test/test_rdoc_parser_markdown.rb

@@ -19,7 +19,7 @@ class TestRDocParserMarkdown < RDoc::TestCase
   def teardown
     super
 
-    @tempfile.close
+    @tempfile.close!
   end
 
   def test_file

data/test/test_rdoc_parser_rd.rb

@@ -19,7 +19,7 @@ class TestRDocParserRd < RDoc::TestCase
   def teardown
     super
 
-    @tempfile.close
+    @tempfile.close!
   end
 
   def test_file

data/test/test_rdoc_parser_ruby.rb

@@ -29,8 +29,8 @@ class TestRDocParserRuby < RDoc::TestCase
   def teardown
     super
 
-    @tempfile.close
-    @tempfile2.close
+    @tempfile.close!
+    @tempfile2.close!
   end
 
   def test_collect_first_comment
@@ -788,7 +788,7 @@ end
     assert_equal 2, foo.method_list.length
   end
 
-  def test_parse_const_fail_w_meta_method
+  def test_parse_const_fail_w_meta
     util_parser <<-CLASS
 class ConstFailMeta
   ##
@@ -810,27 +810,6 @@ end
     assert_equal 1, const_fail_meta.attributes.length
   end
 
-  def test_parse_const_third_party
-    util_parser <<-CLASS
-class A
-  true if B::C
-  true if D::E::F
-end
-    CLASS
-
-    tk = @parser.get_tk
-
-    @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
-    a = @top_level.classes.first
-    assert_equal 'A', a.full_name
-
-    visible = @store.all_modules.reject { |mod| mod.suppressed? }
-    visible = visible.map { |mod| mod.full_name }
-
-    assert_empty visible
-  end
-
   def test_parse_class_nested_superclass
     foo = @top_level.add_module RDoc::NormalModule, 'Foo'
 
@@ -3266,7 +3245,25 @@ end
     c_b = c.find_method_named 'b'
 
     assert_equal :private, c_b.visibility
-    refute c_b.singleton
+    assert c_b.singleton
+  end
+
+  def test_singleton_method_via_eigenclass
+    util_parser <<-RUBY
+class C
+   class << self
+     def a() end
+   end
+end
+    RUBY
+
+    @parser.scan
+
+    c   = @store.find_class_named 'C'
+    c_a = c.find_method_named 'a'
+
+    assert_equal :public, c_a.visibility
+    assert c_a.singleton
   end
 
   def test_stopdoc_after_comment

data/test/test_rdoc_parser_simple.rb

@@ -17,7 +17,7 @@ class TestRDocParserSimple < RDoc::TestCase
   def teardown
     super
 
-    @tempfile.close
+    @tempfile.close!
   end
 
   def test_initialize_metadata

data/test/test_rdoc_rd_block_parser.rb

@@ -153,7 +153,7 @@ class TestRDocRdBlockParser < RDoc::TestCase
         blank_line,
         blank_line)
 
-    Tempfile.open %w[parse_include .rd] do |io|
+    tf = Tempfile.open %w[parse_include .rd] do |io|
       io.puts "=begin\ninclude ((*worked*))\n=end"
       io.flush
 
@@ -162,7 +162,9 @@ class TestRDocRdBlockParser < RDoc::TestCase
       STR
 
       assert_equal expected, parse(str)
+      io
     end
+    tf.close! if tf.respond_to? :close!
   end
 
   def test_parse_heading

data/test/test_rdoc_rdoc.rb

@@ -252,14 +252,16 @@ class TestRDocRDoc < RDoc::TestCase
     @rdoc.options.encoding = Encoding::ISO_8859_1
     @rdoc.store = RDoc::Store.new
 
-    Tempfile.open 'test.txt' do |io|
+    tf = Tempfile.open 'test.txt' do |io|
       io.write 'hi'
       io.rewind
 
       top_level = @rdoc.parse_file io.path
 
       assert_equal Encoding::ISO_8859_1, top_level.absolute_name.encoding
+      io
     end
+    tf.close! if tf.respond_to? :close!
   end
 
   def test_parse_file_forbidden
@@ -267,7 +269,7 @@ class TestRDocRDoc < RDoc::TestCase
 
     @rdoc.store = RDoc::Store.new
 
-    Tempfile.open 'test.txt' do |io|
+    tf = Tempfile.open 'test.txt' do |io|
       io.write 'hi'
       io.rewind
 
@@ -286,7 +288,9 @@ class TestRDocRDoc < RDoc::TestCase
       ensure
         File.chmod 0400, io.path
       end
+      io
     end
+    tf.close! if tf.respond_to? :close!
   end
 
   def test_remove_unparseable
@@ -382,7 +386,7 @@ class TestRDocRDoc < RDoc::TestCase
   end
 
   def test_setup_output_dir_exists_file
-    Tempfile.open 'test_rdoc_rdoc' do |tempfile|
+    tf = Tempfile.open 'test_rdoc_rdoc' do |tempfile|
       path = tempfile.path
 
       e = assert_raises RDoc::Error do
@@ -391,7 +395,9 @@ class TestRDocRDoc < RDoc::TestCase
 
       assert_match(%r%#{Regexp.escape path} exists and is not a directory%,
                    e.message)
+      tempfile
     end
+    tf.close! if tf.respond_to? :close!
   end
 
   def test_setup_output_dir_exists_not_rdoc
@@ -430,5 +436,20 @@ class TestRDocRDoc < RDoc::TestCase
     end
   end
 
+  def test_normalized_file_list_removes_created_rid_dir
+    temp_dir do |d|
+      FileUtils.mkdir "doc"
+      flag_file = @rdoc.output_flag_file "doc"
+      file = File.join "doc", "test"
+      FileUtils.touch flag_file
+      FileUtils.touch file
+
+      file_list = ["doc"]
+
+      output = @rdoc.normalized_file_list file_list
+
+      assert_empty output
+    end
+  end
 end
 

data/test/test_rdoc_ruby_lex.rb

@@ -231,6 +231,17 @@ U
     assert_equal expected, tokens
   end
 
+  def test_class_tokenize_percent_w_quote
+    tokens = RDoc::RubyLex.tokenize '%w"hi"', nil
+
+    expected = [
+      @TK::TkDSTRING.new( 0, 1,  0, '%w"hi"'),
+      @TK::TkNL     .new( 6, 1, 6, "\n"),
+    ]
+
+    assert_equal expected, tokens
+  end
+
   def test_class_tokenize_regexp
     tokens = RDoc::RubyLex.tokenize "/hay/", nil
 

data/test/test_rdoc_rubygems_hook.rb

@@ -138,9 +138,6 @@ class TestRDocRubygemsHook < Gem::TestCase
     @a.loaded_from =
       File.join Gem::Specification.default_specifications_dir, 'a.gemspec'
 
-    FileUtils.mkdir_p @a.doc_dir
-    FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
     @hook.generate
 
     refute @hook.rdoc_installed?

data/test/test_rdoc_single_class.rb

@@ -1,11 +1,19 @@
-require File.expand_path '../xref_test_case', __FILE__
+require 'rdoc/test_case'
 
-class TestRDocSingleClass < XrefTestCase
+class TestRDocSingleClass < RDoc::TestCase
 
-  def test_definition
-    c = RDoc::SingleClass.new 'C'
+  def setup
+    super
+
+    @c = RDoc::SingleClass.new 'C'
+  end
 
-    assert_equal 'class << C', c.definition
+  def test_aref_prefix
+    assert_equal 'sclass', @c.aref_prefix
+  end
+
+  def test_definition
+    assert_equal 'class << C', @c.definition
   end
 
 end

data/test/test_rdoc_stats.rb

@@ -663,5 +663,60 @@ m(a, b) { |c, d| ... }
     RDoc::Markup::ToRdoc.new
   end
 
+  def test_undoc_params
+    method = RDoc::AnyMethod.new [], 'm'
+    method.params = '(a)'
+    method.comment = comment 'comment'
+
+    total, undoc = @s.undoc_params method
+
+    assert_equal 1,     total
+    assert_equal %w[a], undoc
+  end
+
+  def test_undoc_params_block
+    method = RDoc::AnyMethod.new [], 'm'
+    method.params = '(&a)'
+    method.comment = comment '+a+'
+
+    total, undoc = @s.undoc_params method
+
+    assert_equal 1, total
+    assert_empty    undoc
+  end
+
+  def test_undoc_params_documented
+    method = RDoc::AnyMethod.new [], 'm'
+    method.params = '(a)'
+    method.comment = comment '+a+'
+
+    total, undoc = @s.undoc_params method
+
+    assert_equal 1, total
+    assert_empty    undoc
+  end
+
+  def test_undoc_params_keywords
+    method = RDoc::AnyMethod.new [], 'm'
+    method.params = '(**a)'
+    method.comment = comment '+a+'
+
+    total, undoc = @s.undoc_params method
+
+    assert_equal 1, total
+    assert_empty    undoc
+  end
+
+  def test_undoc_params_splat
+    method = RDoc::AnyMethod.new [], 'm'
+    method.params = '(*a)'
+    method.comment = comment '+a+'
+
+    total, undoc = @s.undoc_params method
+
+    assert_equal 1, total
+    assert_empty    undoc
+  end
+
 end
 

data/test/test_rdoc_task.rb

@@ -46,6 +46,7 @@ class TestRDocTask < RDoc::TestCase
     assert Rake::Task[:rdoc]
     assert Rake::Task[:clobber_rdoc]
     assert Rake::Task[:rerdoc]
+    assert_equal ["html/created.rid"], Rake::Task[:rdoc].prerequisites
   end
 
   def test_tasks_creation_with_custom_name_symbol

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdoc
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 4.2.0
 platform: ruby
 authors:
 - Eric Hodel
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-10 00:00:00.000000000 Z
+date: 2014-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -95,14 +95,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.13'
 description: |-
   RDoc produces HTML and command-line documentation for Ruby projects.  RDoc
   includes the +rdoc+ and +ri+ tools for generating and displaying documentation
@@ -169,6 +169,7 @@ files:
 - lib/rdoc/generator/darkfish.rb
 - lib/rdoc/generator/json_index.rb
 - lib/rdoc/generator/markup.rb
+- lib/rdoc/generator/pot.rb
 - lib/rdoc/generator/ri.rb
 - lib/rdoc/generator/template/darkfish/.document
 - lib/rdoc/generator/template/darkfish/_footer.rhtml
@@ -187,7 +188,8 @@ 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/css/fonts.css
+- lib/rdoc/generator/template/darkfish/css/rdoc.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
@@ -224,7 +226,6 @@ files:
 - lib/rdoc/generator/template/darkfish/js/jquery.js
 - lib/rdoc/generator/template/darkfish/js/search.js
 - lib/rdoc/generator/template/darkfish/page.rhtml
-- lib/rdoc/generator/template/darkfish/rdoc.css
 - lib/rdoc/generator/template/darkfish/servlet_not_found.rhtml
 - lib/rdoc/generator/template/darkfish/servlet_root.rhtml
 - lib/rdoc/generator/template/darkfish/table_of_contents.rhtml
@@ -366,7 +367,12 @@ files:
 - test/test_rdoc_generator_darkfish.rb
 - test/test_rdoc_generator_json_index.rb
 - test/test_rdoc_generator_markup.rb
+- test/test_rdoc_generator_pot.rb
+- test/test_rdoc_generator_pot_po.rb
+- test/test_rdoc_generator_pot_po_entry.rb
 - test/test_rdoc_generator_ri.rb
+- test/test_rdoc_i18n_locale.rb
+- test/test_rdoc_i18n_text.rb
 - test/test_rdoc_include.rb
 - test/test_rdoc_markdown.rb
 - test/test_rdoc_markdown_test.rb
@@ -456,7 +462,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '1.3'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: RDoc produces HTML and command-line documentation for Ruby projects
@@ -476,7 +482,12 @@ test_files:
 - test/test_rdoc_generator_darkfish.rb
 - test/test_rdoc_generator_json_index.rb
 - test/test_rdoc_generator_markup.rb
+- test/test_rdoc_generator_pot.rb
+- test/test_rdoc_generator_pot_po.rb
+- test/test_rdoc_generator_pot_po_entry.rb
 - test/test_rdoc_generator_ri.rb
+- test/test_rdoc_i18n_locale.rb
+- test/test_rdoc_i18n_text.rb
 - test/test_rdoc_include.rb
 - test/test_rdoc_markdown.rb
 - test/test_rdoc_markdown_test.rb