@@ -572,16 +572,30 @@ class File < IO # # File.join("usr", "mail", "gumby") #=> "usr/mail/gumby" def self.join(*args) - args.map! { |o| - o = o.to_str unless Array === o || String === o - o - } rescue raise TypeError - - # let join/split deal with all the recursive array complexities - # one small hack is to replace URI header with \0 and swap back later - result = args.join(SEPARATOR).gsub(/\:\//, "\0").split(/#{SEPARATOR}+/o) - result << '' if args.empty? || args.last.empty? || args.last[-1] == SEPARATOR[0] - result.join(SEPARATOR).gsub(/\0/, ':/') + return '' if args.empty? + + ret = '' + args.each_with_index do |el, i| + value = nil + recursion = Thread.detect_recursion(el) do + if el.kind_of? Array + value = join(*el) + else + value = el.to_str rescue raise(TypeError) + end + end + raise ArgumentError, "recursive array" if recursion + + if i > 0 + if value =~ /^#{SEPARATOR}/ + ret.gsub!(/#{SEPARATOR}+$/, '') + elsif not ret =~ /#{SEPARATOR}$/ + ret << SEPARATOR + end + end + ret << value + end + ret end ## kernel/common/file.rb spec/tags/frozen/core/file/join_tags.txt 8286cacbcd0221903f537fa06d8baf80598bf3ee Cezar Sa Espinola cezarsa cezarsa@gmail.com http://github.com/evanphx/rubinius/commit/a400264b8efa3074ee6e0441231a529f5cadd215 a400264b8efa3074ee6e0441231a529f5cadd215 2009-07-02T14:59:43-07:00 2009-07-02T14:28:08-07:00 Fixing File.join, all specs now passing. 899d25f990a12877e0cb4fff5a57459c7198116c Cezar Sa Espinola cezarsa cezarsa@gmail.com