couple more fixes for ruby 1.9

[booh] / lib / booh / booh-lib.rb

diff --git a/lib/booh/booh-lib.rb b/lib/booh/booh-lib.rb
index cbead63b3ac86891af414a05223789e448c2fd37..08578da8e8556c502a9cbdff8d5f08f414b2a567 100644 (file)
--- a/lib/booh/booh-lib.rb
+++ b/lib/booh/booh-lib.rb
@@ -107,14 +107,14 @@ module Booh
         #- we remove non alphanumeric characters but need to do that
         #- cleverly to not end up with two similar dest filenames. we won't
         #- urlencode because urldecode might happen in the browser.
-        return orig_filename.unpack("C*").collect { |v| v.chr =~ /[a-zA-Z\-_0-9\.\/]/ ? v.chr : sprintf("%2X", v) }.to_s
+        return orig_filename.unpack("C*").collect { |v| v.chr =~ /[a-zA-Z\-_0-9\.\/]/ ? v.chr : sprintf("%2X", v) }.join
     end
 
     def make_dest_filename(orig_filename)
         #- we remove non alphanumeric characters but need to do that
         #- cleverly to not end up with two similar dest filenames. we won't
         #- urlencode because urldecode might happen in the browser.
-        return orig_filename.unpack("C*").collect { |v| v.chr =~ /[a-zA-Z\-_0-9\.\/]/ ? v.chr : sprintf("~%02X", v) }.to_s
+        return orig_filename.unpack("C*").collect { |v| v.chr =~ /[a-zA-Z\-_0-9\.\/]/ ? v.chr : sprintf("~%02X", v) }.join
     end
 
     def msg(verbose_level, msg)
@@ -535,7 +535,7 @@ module Booh
     def substInFile(name)
         newcontent = IO.readlines(name).collect { |l| yield l }
         ios = File.open(name, "w")
-        ios.write(newcontent)
+        ios.write(newcontent.join)
         ios.close
     end