mail-iso-2022-jp 1.1.2 → 1.1.4

data/README.md

@@ -22,7 +22,7 @@ Feature
 
     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` by `NKF` module.
+    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.
 
@@ -30,7 +30,7 @@ Feature
 
     chasetヘッダの値が `ISO-2022-JP` である場合、差出人(From)、Sender、宛先(To)、Cc、Reply-To、件名(Subject)、
     Resent-From、Resent-Sender、Resent-To、Resent-Cc の各ヘッダの値および本文(Body)が
-    `NKF` モジュールによって自動的に `ISO-2022-JP` に変換されます。
+    自動的に `ISO-2022-JP` に変換されます。
     
     charsetヘッダの値が `ISO-2022-JP` でない場合、このパッチには何の効果もありません。
 
@@ -46,6 +46,10 @@ Requirements
 
 * `mail` 2.2.5 or higher
 
+### Ruby on Rails (Optional) ###
+
+* 3.0 or higher
+
 
 Getting Start
 -------------
@@ -107,7 +111,7 @@ Remarks
 -------
 
 * `①` などのNEC特殊文字や `髙` や `﨑` といったIBM拡張文字を件名、宛先、本文などに含めることができます。
-* 全角ダッシュ(U+FF5E)は波ダッシュ(U+301C)に変換されます。
+* 全角チルダ(U+FF5E)は波ダッシュ(U+301C)に変換されます。
 * 半角カタカナはそのまま維持されます。
 
 

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

@@ -6,12 +6,13 @@ require 'base64'
 module Mail
   WAVE_DASH = "〜" # U+301C
   FULLWIDTH_TILDE = "～" # U+FF5E
-  NKF_OPTIONS = "--oc=CP50220 -xj"
   if RUBY_VERSION >= '1.9'
     ENCODE = {'iso-2022-jp' => Encoding::CP50221}
     def self.encoding_to_charset(str, charset)
       str.encode(ENCODE[charset.to_s.downcase] || charset).force_encoding(charset)
     end
+  else
+    NKF_OPTIONS = "--oc=CP50220 -xj"
   end
 
   class Message
@@ -51,15 +52,10 @@ module Mail
 
     def initialize_with_iso_2022_jp_encoding(value = nil, charset = 'utf-8')
       if charset.to_s.downcase == 'iso-2022-jp'
-        value = value.to_s.gsub(/#{WAVE_DASH}/, FULLWIDTH_TILDE)
-        if RUBY_VERSION >= '1.9'
-          value = Mail.encoding_to_charset(value, charset)
-          value.force_encoding('ascii-8bit')
-          value = b_value_encode(value)
-          value.force_encoding('ascii-8bit')
+        if value.kind_of?(Array)
+          value = value.map { |e| encode_with_iso_2022_jp(e, charset) }
         else
-          value = NKF.nkf(NKF_OPTIONS, value)
-          value = b_value_encode(value)
+          value = encode_with_iso_2022_jp(value, charset)
         end
       end
       initialize_without_iso_2022_jp_encoding(value, charset)
@@ -73,6 +69,19 @@ module Mail
         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)
+      if RUBY_VERSION >= '1.9'
+        value = Mail.encoding_to_charset(value, charset)
+        value.force_encoding('ascii-8bit')
+        value = b_value_encode(value)
+        value.force_encoding('ascii-8bit')
+      else
+        value = NKF.nkf(NKF_OPTIONS, value)
+        b_value_encode(value)
+      end
+    end
 
     def b_value_encode(string)
       string.split(' ').map do |s|

metadata

@@ -1,85 +1,61 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mail-iso-2022-jp
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 1.1.4
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 2
-  version: 1.1.2
 platform: ruby
-authors: 
+authors:
 - Kohei MATSUSHITA
 - Tsutomu KURODA
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-04 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-07 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mail
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &12325840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 2
-        - 2
-        - 5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.2.5
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *12325840
 description: A patch that provides 'mail' gem with iso-2022-jp conversion capability.
 email: hermes@oiax.jp
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.md
 - Gemfile
 - Rakefile
-- lib/mail-iso-2022-jp.rb
 - lib/mail-iso-2022-jp/patches.rb
+- lib/mail-iso-2022-jp.rb
 homepage: http://github.com/kuroda/mail-iso-2022-jp
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A patch that provides 'mail' gem with iso-2022-jp conversion capability.
 test_files: []
-