* lib/yaml/rubytypes.rb (String#is_binary_data?): TAB would be

  usually considered to be included in text data.

* lib/rdoc/parser.rb (RDoc::Parser.binary?): blksize may be nil
  and is irrelevant to whether a file is binary.  copied from
  above since TAB and newlines would be usually considered to be
  included in text data.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23071 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 3 insertions, 9 deletions

diff --git a/lib/rdoc/parser.rb b/lib/rdoc/parser.rb
index 275d3cc8f9..bb7e0c7d81 100644
--- a/lib/rdoc/parser.rb
+++ b/lib/rdoc/parser.rb
@@ -63,17 +63,11 @@ class RDoc::Parser
   end
 
   ##
-  # Shamelessly stolen from the ptools gem (since RDoc cannot depend on
-  # the gem).
+  # Return _true_ if the +file+ seems like binary.
 
   def self.binary?(file)
-    s = (File.read(file, File.stat(file).blksize, 0, :mode => "rb") || "").split(//)
-
-    if s.size > 0 then
-      ((s.size - s.grep(" ".."~").size) / s.size.to_f) > 0.30
-    else
-      false
-    end
+    s = File.read(file, 1024)
+    s.count("^ -~\t\r\n").fdiv(s.size) > 0.3 || s.index("\x00") unless s.empty?
   end
   private_class_method :binary?