mail-iso-2022-jp 1.0.3 → 1.0.4

data/README.md

@@ -40,7 +40,7 @@ Requirements
 
 ### Ruby ###
 
-* 1.8.7
+* 1.8.7, 1.9.x
 
 ### Gems ###
 
@@ -106,15 +106,22 @@ or run this command:
 Remarks
 -------
 
-* Does not work with Ruby 1.9.x, currently.
 * Wave dashes (U+301C) are replaced with fullwidth tildes (U+FF5E) before converted to iso-2022-jp.
 * Special characters such as `髙` or `﨑` can't be handled correctly when they are found in the mail headers. This is a TODO. 
 
-* 現在のところ、Ruby 1.9.x では動作しません。
 * 波ダッシュ(U+301C)は、iso-2022-jpへの変換前に全角チルダ(U+FF5E)で置き換えられます。
 * `髙` や `﨑` といった特殊文字がメールヘッダにある場合は、正しく扱えません。これはTODO項目です。
 
 
+References
+----------
+
+* http://d.hatena.ne.jp/fujisan3776/20110628/1309255427
+* http://d.hatena.ne.jp/rudeboyjet/20100605/p1
+* http://d.hatena.ne.jp/hichiriki/20101026#1288107706
+* http://d.hatena.ne.jp/deeeki/20111003/rails3_mailer_iso2022jp
+
+
 License
 -------
 

data/lib/mail-iso-2022-jp/patches.rb

@@ -1,4 +1,5 @@
 # coding:utf-8
+
 module Mail
   WAVE_DASH = "〜" # U+301C
   FULLWIDTH_TILDE = "～" # U+FF5E
@@ -15,6 +16,17 @@ module Mail
     alias_method :process_body_raw, :process_body_raw_with_iso_2022_jp_encoding
   end
   
+  class Body
+    def initialize_with_iso_2022_jp_encoding(string = '')
+      if string.respond_to?(:encoding) && string.encoding.to_s == 'ISO-2022-JP'
+        string.force_encoding('US-ASCII')
+      end
+      initialize_without_iso_2022_jp_encoding(string)
+    end
+    alias_method :initialize_without_iso_2022_jp_encoding, :initialize
+    alias_method :initialize, :initialize_with_iso_2022_jp_encoding
+  end
+  
   module FieldWithIso2022JpEncoding
     def self.included(base)
       base.send :alias_method, :initialize_without_iso_2022_jp_encoding, :initialize
@@ -22,15 +34,15 @@ module Mail
       base.send :alias_method, :do_decode_without_iso_2022_jp_encoding, :do_decode
       base.send :alias_method, :do_decode, :do_decode_with_iso_2022_jp_encoding
     end
-    
+
     def initialize_with_iso_2022_jp_encoding(value = nil, charset = 'utf-8')
       if charset.to_s.downcase == 'iso-2022-jp'
         value.gsub!(/#{WAVE_DASH}/, FULLWIDTH_TILDE)
-        value = NKF.nkf('--cp932 -M', NKF.nkf('--cp932 -j', value)).gsub("\n", '').strip
+        value = NKF.nkf('--cp932 -Mj', NKF.nkf('--cp932 -j', value)).gsub("\n", '').strip
       end
       initialize_without_iso_2022_jp_encoding(value, charset)
     end
-    
+
     private
     def do_decode_with_iso_2022_jp_encoding
       if charset.to_s.downcase == 'iso-2022-jp'
@@ -40,9 +52,18 @@ module Mail
       end
     end
   end
-
+  
   class SubjectField < UnstructuredField
     include FieldWithIso2022JpEncoding
+    
+    private
+    def encode(value)
+      if charset.to_s.downcase == 'iso-2022-jp'
+        value
+      else
+        super(value)
+      end
+    end
   end
 
   class FromField < StructuredField

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mail-iso-2022-jp
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Kohei MATSUSHITA