mail-iso-2022-jp 1.0.4 → 1.0.5

data/README.md

@@ -107,10 +107,10 @@ Remarks
 -------
 
 * 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. 
+* Special characters such as `髙` or `﨑` are handled correctly. 
 
 * 波ダッシュ(U+301C)は、iso-2022-jpへの変換前に全角チルダ(U+FF5E)で置き換えられます。
-* `髙` や `﨑` といった特殊文字がメールヘッダにある場合は、正しく扱えません。これはTODO項目です。
+* `髙` や `﨑` 等のIBM拡張文字も扱えます。
 
 
 References

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

@@ -1,5 +1,7 @@
 # coding:utf-8
 
+require 'base64'
+
 module Mail
   WAVE_DASH = "〜" # U+301C
   FULLWIDTH_TILDE = "～" # U+FF5E
@@ -38,7 +40,10 @@ module Mail
     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 -Mj', NKF.nkf('--cp932 -j', value)).gsub("\n", '').strip
+        value = NKF.nkf('--cp932 -j', value)
+        value.force_encoding('ascii-8bit') if RUBY_VERSION >= '1.9'
+        value = b_value_encode(value)
+        value.force_encoding('ascii-8bit') if RUBY_VERSION >= '1.9'
       end
       initialize_without_iso_2022_jp_encoding(value, charset)
     end
@@ -51,6 +56,16 @@ module Mail
         do_decode_without_iso_2022_jp_encoding
       end
     end
+
+    def b_value_encode(string)
+      string.split(' ').map do |s|
+        if s =~ /^\e/
+          "=?ISO-2022-JP?B?#{Base64.encode64(s).gsub("\n", "")}?="
+        else
+          s
+        end
+      end.join(" ")
+    end
   end
   
   class SubjectField < UnstructuredField

metadata

@@ -1,48 +1,34 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mail-iso-2022-jp
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 1.0.5
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 4
-  version: 1.0.4
 platform: ruby
-authors: 
+authors:
 - Kohei MATSUSHITA
 - Tsutomu KURODA
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-20 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mail
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &8477100 !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: *8477100
 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
@@ -50,36 +36,26 @@ files:
 - lib/mail-iso-2022-jp/patches.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: []
-