mail-iso-2022-jp 1.1.1 → 1.1.2

data/Gemfile

@@ -2,8 +2,8 @@ source :rubygems
 
 gem "mail", ">= 2.2.5"
 
-group :test do
+group :development, :test do
   gem "rake"
   gem "bundler"
-  gem "actionmailer", "~> 3.0.0"
+  gem "actionmailer", ">= 3.0.0"
 end

data/Rakefile

@@ -14,10 +14,10 @@ Rake::TestTask.new(:test) do |t|
 end
 
 desc 'Generate documentation for the mail-iso-2022-jp library.'
-RDoc::Task.new(:rdoc) do |rdoc|
+RDoc::Task.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'MailIso2022Jp'
   rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('README.md')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

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

@@ -7,12 +7,22 @@ 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
+  end
 
   class Message
     def process_body_raw_with_iso_2022_jp_encoding
       if @charset.to_s.downcase == 'iso-2022-jp'
-        @body_raw.gsub!(/#{WAVE_DASH}/, FULLWIDTH_TILDE)
-        @body_raw = NKF.nkf(NKF_OPTIONS, @body_raw)
+        @body_raw = @body_raw.to_s.gsub(/#{WAVE_DASH}/, FULLWIDTH_TILDE)
+        if RUBY_VERSION >= '1.9'
+          @body_raw = Mail.encoding_to_charset(@body_raw, @charset)
+        else
+          @body_raw = NKF.nkf(NKF_OPTIONS, @body_raw)
+        end
       end
       process_body_raw_without_iso_2022_jp_encoding
     end
@@ -41,13 +51,14 @@ 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(NKF_OPTIONS, value)
+        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)
           value = b_value_encode(value)
         end
       end

metadata

@@ -1,61 +1,85 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: mail-iso-2022-jp
-version: !ruby/object:Gem::Version
-  version: 1.1.1
+version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: 
+  segments: 
+  - 1
+  - 1
+  - 2
+  version: 1.1.2
 platform: ruby
-authors:
+authors: 
 - Kohei MATSUSHITA
 - Tsutomu KURODA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-21 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-12-04 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: mail
-  requirement: &19552660 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 2
+        - 2
+        - 5
         version: 2.2.5
   type: :runtime
-  prerelease: false
-  version_requirements: *19552660
+  version_requirements: *id001
 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/patches.rb
 - lib/mail-iso-2022-jp.rb
+- 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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      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: []
+