mailcvt 0.2.33 → 0.2.34

data/lib/encoded_word.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 require 'base64'
 require 'date'
+require 'iconv'
 
 class EncodedWord
     def initialize(inputdir)
@@ -173,17 +174,22 @@ class EncodedWord
     end
 
     def word_decode(input, out_charset = 'utf-8')
-        begin
             u8 = input.encode('utf-8', @u8_enc, :undef=>:replace, :invalid=>:replace)
             parts = u8.scan(/=\?([A-Za-z0-9_-]+)\?([BQbq])\?([^\?]+)\?=/).first
             return input unless parts and parts.length == 3
             charset = parts[0]
             enc = parts[1].upcase
             wd = parts[2].unpack({ "B"=>"m*", "Q"=>"M*" }[enc]).first
-            wd.encode(out_charset, charset, :undef=>:replace, :invalid=>:replace)
-        rescue => e
-            puts "Cannot decode #{input} because #{e}"
-            return ''
-        end
+            begin
+                return Iconv.conv(out_charset + "//IGNORE", charset, wd)
+            rescue => e
+                puts "Cannot iconv #{input} because #{e}, try encode."
+                begin
+                    return wd.encode(out_charset, charset, :undef=>:replace, :invalid=>:replace)
+                rescue => e
+                    puts "Cannot encode #{input} because #{e}"
+                end
+                return ''
+            end
     end
 end

data/lib/mailcvt/version.rb

@@ -1,3 +1,3 @@
 module Mailcvt
-  VERSION = '0.2.33'
+  VERSION = '0.2.34'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailcvt
 version: !ruby/object:Gem::Version
-  version: 0.2.33
+  version: 0.2.34
   prerelease: 
 platform: ruby
 authors:
@@ -75,6 +75,22 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.7.0
+- !ruby/object:Gem::Dependency
+  name: iconv
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.3
 description: 
 email: jiapeng.com@gmail.com
 executables: