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

data/README.md

@@ -22,20 +22,23 @@ Feature
 
 * (en)
 
-    If you set the `charset` header to `ISO-2022-JP`, the values of `From`, `Sender`, `To`, `Cc`,
+    * If you set the `charset` header to `ISO-2022-JP`, the values of `From`, `Sender`, `To`, `Cc`,
     `Reply-To`, `Subject`, `Resent-From`, `Resent-Sender`, `Resent-To` and `Resent-Cc` headers
     and the text of body will be automatically converted to `ISO-2022-JP`.
-    
-    When the `charset` header has other values, this patch has no effect.
+
+    * The text part of multipart mail is also encoded with iso-2022-jp.
+
+    * When the `charset` header has other values, this patch has no effect.
 
 * (ja)
 
-    chasetヘッダの値が `ISO-2022-JP` である場合、差出人(From)、Sender、宛先(To)、Cc、Reply-To、件名(Subject)、
+    * chasetヘッダの値が `ISO-2022-JP` である場合、差出人(From)、Sender、宛先(To)、Cc、Reply-To、件名(Subject)、
     Resent-From、Resent-Sender、Resent-To、Resent-Cc の各ヘッダの値および本文(Body)が
     自動的に `ISO-2022-JP` に変換されます。
-    
-    charsetヘッダの値が `ISO-2022-JP` でない場合、このパッチには何の効果もありません。
 
+    * マルチパートメールのテキストパートもiso-2022-jpでエンコードされます。
+
+    * charsetヘッダの値が `ISO-2022-JP` でない場合、このパッチには何の効果もありません。
 
 Requirements
 ------------
@@ -48,7 +51,7 @@ Requirements
 
 * `mail` 2.2.6 or higher, but lower than or equal to 2.5.3
 
-### Ruby on Rails (Optional) ###
+### ActionMailer (Optional) ###
 
 * 3.0 or higher
 
@@ -113,18 +116,19 @@ Remarks
 -------
 
 * (en)
-    * NEC special characters like `①` and IBM extended characters like `髙`, `﨑` are allowed in the subject, recipient names and mail body. 
-    * Fullwidth tildes (U+FF5E) are translated into wave dashes (U+301C).
-    * Half-width (Hankaku) katakanas are maintained intact.
+    * 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).
+    * Halfwidth (Hankaku) katakanas are maintained intact.
     * Characters that cannot be translated into iso-2022-jp encoding are substituted with question marks (`?`).
-    * The text part of multipart mail is also encoded with iso-2022-jp.
 
 * (ja)
     * `①` などのNEC特殊文字や `髙` や `﨑` といったIBM拡張文字を件名、宛先、本文などに含めることができます。
-    * 全角チルダ(U+FF5E)は波ダッシュ(U+301C)に変換されます。
+    * 全角チルダ(U+FF5E)と波ダッシュ(U+301C)は、全角チルダ(2141)に変換されます。
+    * 全角ハイフンマイナス(U+ff0D)とマイナス記号(U+2212)は、全角マイナス(215D)に変換されます。
     * 半角カタカナはそのまま維持されます。
     * 変換できない文字は疑問符(`?`)で置換されます。
-    * マルチパートメールのテキストパートもiso-2022-jpでエンコードされます。
 
 References
 ----------

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

@@ -11,4 +11,5 @@ else
 end
 
 require 'mail-iso-2022-jp/header'
-require 'mail-iso-2022-jp/fields'
+require 'mail-iso-2022-jp/subject_field'
+require 'mail-iso-2022-jp/structured_fields'

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

@@ -34,6 +34,7 @@ module Mail
 
     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 = Mail.encoding_to_charset(value, charset)
       value.force_encoding('ascii-8bit')
       value = b_value_encode(value)

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

@@ -1,9 +1,11 @@
 # coding: utf-8
 
-# Patches for Mail on Ruby 1.8.7
+# 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)

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

@@ -11,6 +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)
       end
       self.body_without_iso_2022_jp_encoding = value
     end

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

@@ -35,6 +35,7 @@ module Mail
 
     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 = NKF.nkf(NKF_OPTIONS, value)
       b_value_encode(value)
     end

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

@@ -1,9 +1,11 @@
 # coding: utf-8
 
-# Patches for Mail on Ruby 1.9.x or above
+# 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

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

@@ -15,6 +15,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 = NKF.nkf(NKF_OPTIONS, @body_raw)
       end
       process_body_raw_without_iso_2022_jp_encoding

data/lib/mail-iso-2022-jp/{fields.rb → structured_fields.rb}

@@ -3,13 +3,6 @@
 require 'mail'
 
 module Mail
-  class SubjectField < UnstructuredField
-    include FieldWithIso2022JpEncoding
-    def b_value_encode(string)
-      encode64(string)
-    end
-  end
-
   class FromField < StructuredField
     include FieldWithIso2022JpEncoding
   end

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

@@ -0,0 +1,12 @@
+# coding:utf-8
+
+require 'mail'
+
+module Mail
+  class SubjectField < UnstructuredField
+    include FieldWithIso2022JpEncoding
+    def b_value_encode(string)
+      encode64(string)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mail-iso-2022-jp
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre
+  version: 2.0.0.pre2
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-20 00:00:00.000000000 Z
+date: 2013-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -83,7 +83,8 @@ files:
 - 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/field_with_iso_2022_jp_encoding.rb
-- lib/mail-iso-2022-jp/fields.rb
+- lib/mail-iso-2022-jp/subject_field.rb
+- lib/mail-iso-2022-jp/structured_fields.rb
 - lib/mail-iso-2022-jp/header.rb
 - lib/mail-iso-2022-jp/mail.rb
 - lib/mail-iso-2022-jp.rb
@@ -107,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A set of patches that provides 'mail' gem with iso-2022-jp conversion capability.