rdoc 2.5.1 → 2.5.2

data/History.txt

@@ -1,4 +1,4 @@
-=== 2.5.1 / 2010-04-?
+=== 2.5.2 / 2010-04-09
 
 *NOTE*:
 
@@ -19,10 +19,18 @@ To have ri data for you gems you'll also need to run:
 
 If you don't want to rebuild the rdoc for `gem server`, add --no-rdoc.
 
+* 1 Minor Enhancements
+  * Imported various changes by Nobu from ruby trunk.
+* 2 Bug Fixes
+  * RDoc parses files without extensions as text files again.
+  * RDoc::Parser::Ruby parses %{ strings correctly again.
+
+=== 2.5.1 / 2010-04-06
+
 * 1 Minor Enhancement
   * RDoc::Parser::C now supports the include directive for classes and
     modules.
-* N Bug Fixes
+* 6 Bug Fixes
   * RDoc::AnyMethod params now get saved in ri data.
   * ri now displays method arguments correctly.
   * RDoc::Markup::Parser allows no space between = and header text like rdoc
@@ -33,18 +41,6 @@ If you don't want to rebuild the rdoc for `gem server`, add --no-rdoc.
 
 === 2.5 / 2010-03-31
 
-*NOTE*:
-
-You'll need to:
-
-  gem install rdoc-data
-
-then run:
-
-  rdoc-data
-
-to have ri data for core and stdlib like Array or Kernel or Date.
-
 * 9 Major Enhancements
   * Darkfish now has a "Home" button
   * ri no longer displays the value of a constant.  There's no easy way to

data/Manifest.txt

@@ -101,6 +101,7 @@ lib/rdoc/task.rb
 lib/rdoc/text.rb
 lib/rdoc/tokenstream.rb
 lib/rdoc/top_level.rb
+test/README
 test/binary.dat
 test/hidden.zip.txt
 test/test.ja.rdoc

data/lib/rdoc.rb

@@ -383,7 +383,7 @@ module RDoc
   ##
   # RDoc version you are using
 
-  VERSION = '2.5.1'
+  VERSION = '2.5.2'
 
   ##
   # Name of the dotfile that contains the description of files to be processed

data/lib/rdoc/generator/darkfish.rb

@@ -1,12 +1,6 @@
 # -*- mode: ruby; ruby-indent-level: 2; tab-width: 2 -*-
 # vim: noet ts=2 sts=8 sw=2
 
-unless File.exist? File.expand_path('../.svn', __FILE__) then
-  require 'rubygems'
-  gem 'rdoc', '>= 2.4'
-end
-
-require 'pp'
 require 'pathname'
 require 'fileutils'
 require 'erb'

data/lib/rdoc/parser.rb

@@ -73,13 +73,12 @@ class RDoc::Parser
       true
     elsif file =~ /erb\.rb$/ then
       false
-    elsif s.scan(/<%|%>/).length >= 4 then
+    elsif s.scan(/<%|%>/).length >= 4 || s.index("\x00") then
       true
-    else
-      # From ptools under the Artistic License 2.0, (c) Daniel Berger.
-      s = s.split(//)
-
-      ((s.size - s.grep(" ".."~").size) / s.size.to_f) > 0.30
+    elsif 0.respond_to? :fdiv then
+      s.count("^ -~\t\r\n").fdiv(s.size) > 0.3
+    else # HACK 1.8.6
+      (s.count("^ -~\t\r\n").to_f / s.size) > 0.3
     end
   end
 
@@ -105,7 +104,9 @@ class RDoc::Parser
     return if parser == RDoc::Parser::Simple and zip? file_name
 
     # The default parser must not parse binary files
-    return if parser == RDoc::Parser::Simple and file_name !~ /\.(txt|rdoc)$/
+    ext_name = File.extname file_name
+    return parser if ext_name.empty?
+    return if parser == RDoc::Parser::Simple and ext_name !~ /txt|rdoc/
 
     parser
   end

data/lib/rdoc/parser/c.rb

@@ -390,10 +390,10 @@ class RDoc::Parser::C < RDoc::Parser
         void\s+
         Init_#{class_name}\s*(?:_\(\s*)?\(\s*(?:void\s*)?\)}xmi then # )
       comment = $1
-    elsif @content =~ %r{Document-(?:class|module):\s+#{class_name}\s*?(?:<\s+[:,\w]+)?\n((?>.*?\*/))}m then # "
+    elsif @content =~ %r{Document-(?:class|module):\s+#{class_name}\s*?(?:<\s+[:,\w]+)?\n((?>.*?\*/))}m then
       comment = $1
     elsif @content =~ %r{((?>/\*.*?\*/\s+))
-                         ([\w\.\s]+\s* = \s+)?rb_define_(class|module).*?"(#{class_name})"}xm then
+                         ([\w\.\s]+\s* = \s+)?rb_define_(class|module).*?"(#{class_name})"}xm then # "
       comment = $1
     end
 

data/lib/rdoc/ri/paths.rb

@@ -10,9 +10,15 @@ module RDoc::RI::Paths
 
   version = RbConfig::CONFIG['ruby_version']
 
-  base    = File.join RbConfig::CONFIG['datadir'], "ri", version
+  base    = if RbConfig::CONFIG.key? 'ridir' then
+              File.join RbConfig::CONFIG['ridir'], version
+            else
+              File.join RbConfig::CONFIG['datadir'], 'ri', version
+            end
+
   SYSDIR  = File.join base, "system"
   SITEDIR = File.join base, "site"
+
   homedir = File.expand_path('~') ||
             ENV['HOME'] || ENV['USERPROFILE'] || ENV['HOMEPATH']
 

data/lib/rdoc/ruby_lex.rb

@@ -359,6 +359,8 @@ class RDoc::RubyLex
     "(" => ")"
   }
 
+  PERCENT_PAREN_REV = PERCENT_PAREN.invert
+
   Ltype2Token = {
     "\'" => TkSTRING,
     "\"" => TkSTRING,
@@ -453,7 +455,7 @@ class RDoc::RubyLex
       if @lex_state != EXPR_END && @lex_state != EXPR_CLASS &&
         (@lex_state != EXPR_ARG || @space_seen)
         c = peek(0)
-        if /\S/ =~ c && (/["'`]/ =~ c || /[\w_]/ =~ c || c == "-")
+        if /\S/ =~ c && (/["'`]/ =~ c || /\w/ =~ c || c == "-")
           tk = identify_here_document
         end
       end
@@ -1120,7 +1122,12 @@ class RDoc::RubyLex
   def identify_string(ltype, quoted = ltype)
     @ltype = ltype
     @quoted = quoted
-    str = @ltype.dup
+
+    str = if ltype == quoted then
+            ltype.dup
+          else
+            "%#{PERCENT_PAREN_REV[quoted]}"
+          end
 
     subtype = nil
     begin
@@ -1136,6 +1143,7 @@ class RDoc::RubyLex
           subtype = true
           if ch == "{" then
             str << ch << skip_inner_expression
+            next
           else
             ungetc
           end
@@ -1179,7 +1187,7 @@ class RDoc::RubyLex
   def skip_inner_expression
     res = ""
     nest = 0
-    while (ch = getc)
+    while ch = getc
       res << ch
       if ch == '}'
         break if nest.zero?

data/test/README

@@ -0,0 +1 @@
+you don't have to

data/test/test_rdoc_parser.rb

@@ -56,6 +56,9 @@ class TestRDocParser < MiniTest::Unit::TestCase
 
     jtest_rdoc_file_name = File.expand_path '../test.ja.rdoc', __FILE__
     assert_equal @RP::Simple, @RP.can_parse(jtest_rdoc_file_name)
+
+    readme_file_name = File.expand_path '../README', __FILE__
+    assert_equal @RP::Simple, @RP.can_parse(readme_file_name)
   end
 
   ##

data/test/test_rdoc_parser_ruby.rb

@@ -1246,11 +1246,19 @@ end
 
   # If you're writing code like this you're doing it wrong
 
-  def x_test_sanity_interpolation_crazy
+  def test_sanity_interpolation_crazy
     last_tk = nil
     util_parser '"#{"#{"a")}" if b}"'
 
-    assert_equal RDoc::RubyToken::TkDSTRING, tk.class
+    assert_equal '"#{"#{"a")}" if b}"', @parser.get_tk.text
+    assert_equal RDoc::RubyToken::TkNL, @parser.get_tk.class
+  end
+
+  def test_sanity_interpolation_curly
+    last_tk = nil
+    util_parser '%{ #{} }'
+
+    assert_equal '%{ #{} }', @parser.get_tk.text
     assert_equal RDoc::RubyToken::TkNL, @parser.get_tk.class
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 5
-  - 1
-  version: 2.5.1
+  - 2
+  version: 2.5.2
 platform: ruby
 authors: 
 - Eric Hodel
@@ -38,7 +38,7 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2010-04-06 00:00:00 -07:00
+date: 2010-04-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -226,6 +226,7 @@ files:
 - lib/rdoc/text.rb
 - lib/rdoc/tokenstream.rb
 - lib/rdoc/top_level.rb
+- test/README
 - test/binary.dat
 - test/hidden.zip.txt
 - test/test.ja.rdoc