mail-iso-2022-jp 2.0.0.pre3 → 2.0.0

data/README.md

@@ -118,19 +118,19 @@ Remarks
 * (en)
     * NEC special characters like `①` and IBM extended characters like `髙`, `﨑`
     are allowed in the subject, recipient names and mail body.
-    * FULLWIDTH TILDE (U+FF5E) and WAVE DASH (U+301C) are converted to the fullwidth tilde `〜` (0x2141).
-    * FULLWIDTH HYPHEN MINUS (U+FF0D) and MINUS SIGN (U+2212) are converted to the fullwidth minus `−` (0x215d).
-    * EM DASH (U+2014) and HORIZONTAL BAR (U+2015) are converted to the dash sign `—` (0x213d).
-    * DOUBLE VERTICAL LINE (U+2016, '‖') and PARALLEL TO (U+2225, `∥`) to `‖` (0x2142).
+    * FULLWIDTH TILDE (U+FF5E) and WAVE DASH (U+301C, `〜`) are converted to the fullwidth tilde (0x2141, `〜`).
+    * FULLWIDTH HYPHEN MINUS (U+FF0D) and MINUS SIGN (U+2212) are converted to the fullwidth minus (0x215d, `－`).
+    * EM DASH (U+2014) and HORIZONTAL BAR (U+2015) are converted to the dash sign (0x213d, `―`).
+    * DOUBLE VERTICAL LINE (U+2016, `‖`) and PARALLEL TO (U+2225, `∥`) to the double vertical line (0x2142, `‖`).
     * Halfwidth (Hankaku) katakanas are maintained intact.
     * Characters that cannot be translated into iso-2022-jp encoding are substituted with question marks (`?`).
 
 * (ja)
     * `①` などのNEC特殊文字や `髙` や `﨑` といったIBM拡張文字を件名、宛先、本文などに含めることができます。
-    * 全角チルダ(U+FF5E)と波ダッシュ(U+301C)は、全角チルダ(2141)に変換されます。
-    * 全角ハイフンマイナス(U+ff0D)とマイナス記号(U+2212)は、全角マイナス(215D)に変換されます。
-    * 長い(em)ダッシュ(U+2014)と水平線(U+2015)は、ダッシュ(213D)に変換されます。
-    * 二重縦線(U+2016, '‖')と平行記号(U+2225, `∥`)は、`‖` (0x2142)に変換されます。
+    * 全角チルダ(U+FF5E, `～`)と波ダッシュ(U+301C, `〜`)は、全角チルダ(0x2141, `～`)に変換されます。
+    * 全角ハイフンマイナス(U+ff0D)とマイナス記号(U+2212)は、全角マイナス(0x215d, `－`)に変換されます。
+    * 長い(em)ダッシュ(U+2014, `—`)と水平線(U+2015, `―`)は、ダッシュ(0x213d, `―`)に変換されます。
+    * 二重縦線(U+2016, `‖`)と平行記号(U+2225, `∥`)は、二重縦線(0x2142, `‖`)に変換されます。
     * 半角カタカナはそのまま維持されます。
     * 変換できない文字は疑問符(`?`)で置換されます。
 
@@ -142,6 +142,7 @@ References
 * http://d.hatena.ne.jp/hichiriki/20101026#1288107706
 * http://d.hatena.ne.jp/deeeki/20111003/rails3_mailer_iso2022jp
 * http://d.hatena.ne.jp/tmtms/20090611/1244724573
+* Wikipedia [Unicode - 波ダッシュ・全角チルダ問題](http://ja.wikipedia.org/wiki/Unicode#.E6.B3.A2.E3.83.80.E3.83.83.E3.82.B7.E3.83.A5.E3.83.BB.E5.85.A8.E8.A7.92.E3.83.81.E3.83.AB.E3.83.80.E5.95.8F.E9.A1.8C)
 
 License
 -------

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

@@ -1,6 +1,7 @@
 require 'mail-iso-2022-jp/character_names'
 require 'mail-iso-2022-jp/invalid_encoding_error'
 require 'mail-iso-2022-jp/common_methods_for_field'
+require 'mail-iso-2022-jp/preprocessor'
 
 if RUBY_VERSION >= '1.9'
   require 'mail-iso-2022-jp/mail'

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

@@ -26,7 +26,7 @@ module Mail
 
     private
     def encode_with_iso_2022_jp(value, charset)
-      value = preprocess(value)
+      value = Mail::Preprocessor.process(value)
       value = Mail.encoding_to_charset(value, charset)
       value.force_encoding('ascii-8bit')
       value = b_value_encode(value)

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

@@ -11,9 +11,7 @@ module Mail
           raise ::Mail::InvalidEncodingError.new(
             "The mail body is not encoded in UTF-8 but in #{value.encoding}")
         end
-        value = value.gsub(/#{MINUS_SIGN}/, FULLWIDTH_HYPHEN_MINUS)
-        value = value.gsub(/#{EM_DASH}/, HORIZONTAL_BAR)
-        value = value.gsub(/#{DOUBLE_VERTICAL_LINE}/, PARALLEL_TO)
+        value = Mail::Preprocessor.process(value)
       end
       self.body_without_iso_2022_jp_encoding = value
     end
@@ -22,7 +20,6 @@ module Mail
 
     def process_body_raw_with_iso_2022_jp_encoding
       if @charset.to_s.downcase == 'iso-2022-jp'
-        @body_raw = @body_raw.to_s.gsub(/#{WAVE_DASH}/, FULLWIDTH_TILDE)
         @body_raw = Mail.encoding_to_charset(@body_raw, @charset)
       end
       process_body_raw_without_iso_2022_jp_encoding

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

@@ -0,0 +1,11 @@
+module Mail
+  class Preprocessor
+    def self.process(value)
+      value.to_s.
+        gsub(/#{WAVE_DASH}/, FULLWIDTH_TILDE).
+        gsub(/#{MINUS_SIGN}/, FULLWIDTH_HYPHEN_MINUS).
+        gsub(/#{EM_DASH}/, HORIZONTAL_BAR).
+        gsub(/#{DOUBLE_VERTICAL_LINE}/, PARALLEL_TO)
+    end
+  end
+end

data/lib/mail-iso-2022-jp/ruby18/field_with_iso_2022_jp_encoding.rb

@@ -33,7 +33,7 @@ module Mail
     end
 
     def encode_with_iso_2022_jp(value)
-      value = preprocess(value)
+      value = Mail::Preprocessor.process(value)
       value = NKF.nkf(NKF_OPTIONS, value)
       b_value_encode(value)
     end

data/lib/mail-iso-2022-jp/ruby18/message.rb

@@ -12,10 +12,7 @@ module Mail
 
     def process_body_raw_with_iso_2022_jp_encoding
       if @charset.to_s.downcase == 'iso-2022-jp'
-        @body_raw = @body_raw.to_s.gsub(/#{WAVE_DASH}/, FULLWIDTH_TILDE)
-        @body_raw = @body_raw.to_s.gsub(/#{MINUS_SIGN}/, FULLWIDTH_HYPHEN_MINUS)
-        @body_raw = @body_raw.to_s.gsub(/#{EM_DASH}/, HORIZONTAL_BAR)
-        @body_raw = @body_raw.to_s.gsub(/#{DOUBLE_VERTICAL_LINE}/, PARALLEL_TO)
+        @body_raw = Mail::Preprocessor.process(@body_raw)
         @body_raw = NKF.nkf(NKF_OPTIONS, @body_raw)
       end
       process_body_raw_without_iso_2022_jp_encoding

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: mail-iso-2022-jp
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre3
-  prerelease: 6
+  version: 2.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Kohei MATSUSHITA
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-02 00:00:00.000000000 Z
+date: 2013-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -87,6 +87,7 @@ files:
 - lib/mail-iso-2022-jp/subject_field.rb
 - lib/mail-iso-2022-jp/structured_fields.rb
 - lib/mail-iso-2022-jp/character_names.rb
+- lib/mail-iso-2022-jp/preprocessor.rb
 - lib/mail-iso-2022-jp/header.rb
 - lib/mail-iso-2022-jp/invalid_encoding_error.rb
 - lib/mail-iso-2022-jp/mail.rb
@@ -106,12 +107,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A set of patches that provides 'mail' gem with iso-2022-jp conversion capability.