vmail 2.7.0 → 2.7.1

data/README.markdown

@@ -75,7 +75,8 @@ The `.vmailrc` file should look something like this. Substitute your own values.
       -- 
       Sent from Vmail. http://danielchoi.com/software/vmail.html
 
-This file should be formatted in [YAML syntax][1].
+This file should be formatted in [YAML syntax][1]. If you have any unsual
+characters in a string value, try putting quotes around that value.
 
 [1]:http://www.yaml.org/spec/1.2/spec.html
 

data/lib/vmail.rb

@@ -2,8 +2,6 @@ require 'vmail/version'
 require 'vmail/options'
 require 'vmail/query'
 require 'vmail/message_formatter'
-
-require 'iconv'
 require 'versionomy'
 
 module Vmail

data/lib/vmail/message_formatter.rb

@@ -1,6 +1,5 @@
 require 'mail'
 require 'open3'
-require 'iconv'
 
 module Vmail
   class MessageFormatter
@@ -82,7 +81,7 @@ module Vmail
       output = "[vmail: html part translated into plaintext by '#{html_tool}']\n\n" + stdout.read
       charset = part.content_type_parameters && part.content_type_parameters['charset']
       if charset && charset != 'UTF-8'
-        Iconv.conv('UTF-8//TRANSLIT//IGNORE', charset, output) 
+        output.encode!('utf-8', charset, undef: :replace, invalid: :replace)
       else
         output
       end
@@ -109,12 +108,12 @@ module Vmail
     def utf8(string, this_encoding = encoding)
       return '' unless string
       out = if this_encoding && this_encoding.upcase != 'UTF-8' 
-              Iconv.conv('UTF-8//TRANSLIT/IGNORE', this_encoding, string)
+              string.encode!('utf-8', this_encoding, undef: :replace, invalid: :replace)
             elsif this_encoding.upcase == 'UTF-8' 
               string 
             else
-              # assume UTF-8
-              Iconv.conv('US-ASCII//TRANSLIT/IGNORE', 'UTF-8', string)
+              # assume UTF-8 and convert to ascii
+              string.encode!('us-ascii', 'utf-8', undef: :replace, invalid: :replace)
             end
       out
     rescue

data/lib/vmail/showing_headers.rb

@@ -1,5 +1,3 @@
-require 'iconv'
-
 module Vmail
 
   module ShowingHeaders

data/lib/vmail/showing_message.rb

@@ -70,11 +70,9 @@ module Vmail
       # [\w-]+ matches charsets like ISO-8851
       if /charset=([\w-]+)/.match(parts_list)
         conv_from = /charset=([\w-]+)/.match(parts_list)[1].strip
-        body.force_encoding conv_from
-        body = body.encode!('utf-8', undef: :replace, invalid: :replace)
+        body = body.encode!('utf-8', conv_from, undef: :replace, invalid: :replace)
       else
-        body.force_encoding "utf-8"
-        body = body.encode!('us-ascii', undef: :replace, invalid: :replace)
+        body = body.encode!('us-ascii', 'utf-8', undef: :replace, invalid: :replace)
       end
       message_text = <<-EOF
 #{message_id} #{number_to_human_size message.size} #{message.flags} #{parts_list}
@@ -86,8 +84,7 @@ EOF
       # 2 calls so we can see more fine grained exceptions
       message.update(:rfc822 => rfc822)
       if !message_text.valid_encoding?
-        ic = Iconv.new('UTF-8//IGNORE', 'UTF-8')
-        message_text = ic.iconv(message_text)
+        message_text.encode!('utf-8', undef: :replace, invalid: :replace)
       end
 
       begin

data/lib/vmail/version.rb

@@ -1,3 +1,3 @@
 module Vmail
-  VERSION = '2.7.0'
+  VERSION = '2.7.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vmail
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.1
   prerelease: 
 platform: ruby
 authors: