mailcvt 0.2.22 → 0.2.23

data/lib/encoded_word.rb

@@ -15,7 +15,10 @@ class EncodedWord
         Dir.glob(File.join(@inputdir, File.join('**', '*.mlog'))).select do |f|
             puts f
             File.open(f + '.plain', 'w') do |out|
-            File.readlines(f).each do |line|
+            File.open(f) do |file|
+            f.each_line do |line|
+                line = line.encode('utf-8', file.external_encoding.name, 
+                    :undef=>:replace, :invalid=>:replace)
                 parts = mysplit(line)
                 newparts = []
                 newparts << format_date(parts[0]) #date
@@ -28,6 +31,7 @@ class EncodedWord
                 out.puts newparts.join("\t")
             end
             end
+            end
         end
     end
 
@@ -106,17 +110,13 @@ class EncodedWord
 
     def mime_decode(input, out_charset = 'utf-8')
         return '' unless input and input.length > 0
-        begin
-            ret = input.sub!(/=\?([A-Za-z0-9_-]+)\?([BQbq])\?([^\?]+)\?=/) {
-                charset = $1
-                enc = $2.upcase
-                word = $3
-                word = word.unpack({ "B"=>"m*", "Q"=>"M*" }[enc]).first
-                word.encode(out_charset, charset, :undef=>:replace, :invalid=>:replace)
-            }
-            return ret ? mime_decode(input) : input
-        rescue
-            return input
-        end
+        ret = input.sub!(/=\?([A-Za-z0-9_-]+)\?([BQbq])\?([^\?]+)\?=/) {
+            charset = $1
+            enc = $2.upcase
+            word = $3
+            word = word.unpack({ "B"=>"m*", "Q"=>"M*" }[enc]).first
+            word.encode(out_charset, charset, :undef=>:replace, :invalid=>:replace)
+        }
+        return ret ? mime_decode(input) : input
    end
 end

data/lib/mailcvt/version.rb

@@ -1,3 +1,3 @@
 module Mailcvt
-  VERSION = '0.2.22'
+  VERSION = '0.2.23'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailcvt
 version: !ruby/object:Gem::Version
-  version: 0.2.22
+  version: 0.2.23
   prerelease: 
 platform: ruby
 authors: