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

data/README.md

@@ -118,8 +118,10 @@ 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 dashe (U+301C) are converted to the fullwidth tilde (2141).
-    * Fullwidth hyphen minus (U+FF0D) and minus sign (U+2212) are converted to the fullwidth minus (215D).
+    * 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).
     * Halfwidth (Hankaku) katakanas are maintained intact.
     * Characters that cannot be translated into iso-2022-jp encoding are substituted with question marks (`?`).
 
@@ -127,6 +129,8 @@ Remarks
     * `①` などのNEC特殊文字や `髙` や `﨑` といったIBM拡張文字を件名、宛先、本文などに含めることができます。
     * 全角チルダ(U+FF5E)と波ダッシュ(U+301C)は、全角チルダ(2141)に変換されます。
     * 全角ハイフンマイナス(U+ff0D)とマイナス記号(U+2212)は、全角マイナス(215D)に変換されます。
+    * 長い(em)ダッシュ(U+2014)と水平線(U+2015)は、ダッシュ(213D)に変換されます。
+    * 二重縦線(U+2016, '‖')と平行記号(U+2225, `∥`)は、`‖` (0x2142)に変換されます。
     * 半角カタカナはそのまま維持されます。
     * 変換できない文字は疑問符(`?`)で置換されます。
 

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

@@ -1,3 +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'
+
 if RUBY_VERSION >= '1.9'
   require 'mail-iso-2022-jp/mail'
   require 'mail-iso-2022-jp/message'

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

@@ -0,0 +1,12 @@
+# coding: utf-8
+
+module Mail
+  WAVE_DASH = [0x301c].pack("U")
+  FULLWIDTH_TILDE = [0xff5e].pack("U")
+  MINUS_SIGN = [0x2212].pack("U")
+  FULLWIDTH_HYPHEN_MINUS = [0xff0d].pack("U")
+  EM_DASH = [0x2014].pack("U")
+  HORIZONTAL_BAR = [0x2015].pack("U")
+  DOUBLE_VERTICAL_LINE = [0x2016].pack("U")
+  PARALLEL_TO = [0x2225].pack("U")
+end

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

@@ -0,0 +1,42 @@
+module Mail
+  module CommonMethodsForField
+    private
+    def do_decode_with_iso_2022_jp_encoding
+      if charset.to_s.downcase == 'iso-2022-jp'
+        value
+      else
+        do_decode_without_iso_2022_jp_encoding
+      end
+    end
+
+    def b_value_encode(string)
+      string.split(' ').map do |s|
+        if s =~ /\e/
+          encode64(s)
+        else
+          s
+        end
+      end.join(" ")
+    end
+
+    def encode(value)
+      if charset.to_s.downcase == 'iso-2022-jp'
+        value
+      else
+        super(value)
+      end
+    end
+
+    def encode64(string)
+      "=?ISO-2022-JP?B?#{Base64.encode64(string).gsub("\n", "")}?="
+    end
+
+    def preprocess(value)
+      value = value.to_s.gsub(/#{WAVE_DASH}/, FULLWIDTH_TILDE)
+      value = value.to_s.gsub(/#{MINUS_SIGN}/, FULLWIDTH_HYPHEN_MINUS)
+      value = value.to_s.gsub(/#{EM_DASH}/, HORIZONTAL_BAR)
+      value = value.to_s.gsub(/#{DOUBLE_VERTICAL_LINE}/, PARALLEL_TO)
+      value
+    end
+  end
+end

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

@@ -1,4 +1,4 @@
-# coding:utf-8
+# coding: utf-8
 
 require 'mail'
 

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

@@ -1,4 +1,4 @@
-# coding:utf-8
+# coding: utf-8
 
 require 'mail'
 require 'base64'
@@ -6,6 +6,7 @@ require 'base64'
 module Mail
   module FieldWithIso2022JpEncoding
     def self.included(base)
+      base.send :include, Mail::CommonMethodsForField
       base.send :alias_method, :initialize_without_iso_2022_jp_encoding, :initialize
       base.send :alias_method, :initialize, :initialize_with_iso_2022_jp_encoding
       base.send :alias_method, :do_decode_without_iso_2022_jp_encoding, :do_decode
@@ -24,51 +25,19 @@ module Mail
     end
 
     private
-    def do_decode_with_iso_2022_jp_encoding
-      if charset.to_s.downcase == 'iso-2022-jp'
-        value
-      else
-        do_decode_without_iso_2022_jp_encoding
-      end
-    end
-
     def encode_with_iso_2022_jp(value, charset)
-      value = value.to_s.gsub(/#{WAVE_DASH}/, FULLWIDTH_TILDE)
-      value = value.to_s.gsub(/#{MINUS_SIGN}/, FULLWIDTH_HYPHEN_MINUS)
+      value = preprocess(value)
       value = Mail.encoding_to_charset(value, charset)
       value.force_encoding('ascii-8bit')
       value = b_value_encode(value)
       value.force_encoding('ascii-8bit')
     end
 
-    def b_value_encode(string)
-      string.split(' ').map do |s|
-        if s =~ /\e/
-          encode64(s)
-        else
-          s
-        end
-      end.join(" ")
-    end
-
-    private
-    def encode(value)
-      if charset.to_s.downcase == 'iso-2022-jp'
-        value
-      else
-        super(value)
-      end
-    end
-
     def encode_crlf(value)
       if charset.to_s.downcase == 'iso-2022-jp'
         value.force_encoding('ascii-8bit')
       end
       super(value)
     end
-
-    def encode64(string)
-      "=?ISO-2022-JP?B?#{Base64.encode64(string).gsub("\n", "")}?="
-    end
   end
 end

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

@@ -1,4 +1,4 @@
-# coding:utf-8
+# coding: utf-8
 
 module Mail
   class Header

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

@@ -0,0 +1,3 @@
+module Mail
+  class InvalidEncodingError < StandardError; end
+end

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

@@ -2,15 +2,9 @@
 
 # Patches for Mail on Ruby 1.9.3 or above
 module Mail
-  WAVE_DASH = "〜" # U+301C
-  FULLWIDTH_TILDE = "～" # U+FF5E
-  MINUS_SIGN = [0x2212].pack("U")
-  FULLWIDTH_HYPHEN_MINUS = [0xff0d].pack("U")
   ENCODE = { 'iso-2022-jp' => Encoding::CP50221 }
 
   def self.encoding_to_charset(str, charset)
     str.encode(ENCODE[charset.to_s.downcase] || charset, :undef => :replace).force_encoding(charset)
   end
-
-  class InvalidEncodingError < StandardError; end
 end

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

@@ -12,6 +12,8 @@ module Mail
             "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)
       end
       self.body_without_iso_2022_jp_encoding = value
     end

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

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 require 'mail'
 require 'base64'
 require 'nkf'
@@ -7,6 +5,7 @@ require 'nkf'
 module Mail
   module FieldWithIso2022JpEncoding
     def self.included(base)
+      base.send :include, Mail::CommonMethodsForField
       base.send :alias_method, :initialize_without_iso_2022_jp_encoding, :initialize
       base.send :alias_method, :initialize, :initialize_with_iso_2022_jp_encoding
       base.send :alias_method, :do_decode_without_iso_2022_jp_encoding, :do_decode
@@ -34,33 +33,9 @@ module Mail
     end
 
     def encode_with_iso_2022_jp(value)
-      value = value.to_s.gsub(/#{WAVE_DASH}/, FULLWIDTH_TILDE)
-      value = value.to_s.gsub(/#{MINUS_SIGN}/, FULLWIDTH_HYPHEN_MINUS)
+      value = preprocess(value)
       value = NKF.nkf(NKF_OPTIONS, value)
       b_value_encode(value)
     end
-
-    def b_value_encode(string)
-      string.split(' ').map do |s|
-        if s =~ /\e/
-          encode64(s)
-        else
-          s
-        end
-      end.join(" ")
-    end
-
-    private
-    def encode(value)
-      if charset.to_s.downcase == 'iso-2022-jp'
-        value
-      else
-        super(value)
-      end
-    end
-
-    def encode64(string)
-      "=?ISO-2022-JP?B?#{Base64.encode64(string).gsub("\n", "")}?="
-    end
   end
 end

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

@@ -1,12 +1,4 @@
-# coding: utf-8
-
 # Patches for Mail on Ruby 1.8.7
 module Mail
-  WAVE_DASH = "〜" # U+301C
-  FULLWIDTH_TILDE = "～" # U+FF5E
-  MINUS_SIGN = [0x2212].pack("U")
-  FULLWIDTH_HYPHEN_MINUS = [0xff0d].pack("U")
   NKF_OPTIONS = "--oc=CP50220 -xjW --fb-subchar"
-
-  class InvalidEncodingError < StandardError; end
 end

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

@@ -1,5 +1,3 @@
-# coding:utf-8
-
 require 'mail'
 require 'nkf'
 
@@ -16,6 +14,8 @@ module Mail
       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 = NKF.nkf(NKF_OPTIONS, @body_raw)
       end
       process_body_raw_without_iso_2022_jp_encoding

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

@@ -1,4 +1,4 @@
-# coding:utf-8
+# coding: utf-8
 
 require 'mail'
 

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

@@ -1,4 +1,4 @@
-# coding:utf-8
+# coding: utf-8
 
 require 'mail'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mail-iso-2022-jp
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre2
+  version: 2.0.0.pre3
   prerelease: 6
 platform: ruby
 authors:
@@ -82,10 +82,13 @@ files:
 - lib/mail-iso-2022-jp/ruby18/message.rb
 - lib/mail-iso-2022-jp/ruby18/field_with_iso_2022_jp_encoding.rb
 - lib/mail-iso-2022-jp/ruby18/mail.rb
+- lib/mail-iso-2022-jp/common_methods_for_field.rb
 - lib/mail-iso-2022-jp/field_with_iso_2022_jp_encoding.rb
 - 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/header.rb
+- lib/mail-iso-2022-jp/invalid_encoding_error.rb
 - lib/mail-iso-2022-jp/mail.rb
 - lib/mail-iso-2022-jp.rb
 homepage: https://github.com/kuroda/mail-iso-2022-jp