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

data/README.md

@@ -1,5 +1,7 @@
+mail-iso-2022-jp
+================
+
 A patch that provides 'mail' gem with iso-2022-jp conversion capability.
-========================================================================
 
 Overview
 --------
@@ -110,11 +112,19 @@ or run this command:
 Remarks
 -------
 
-* `①` などのNEC特殊文字や `髙` や `﨑` といったIBM拡張文字を件名、宛先、本文などに含めることができます。
-* 全角チルダ(U+FF5E)は波ダッシュ(U+301C)に変換されます。
-* 半角カタカナはそのまま維持されます。
-* 変換できない文字は疑問符(?)で置換されます。
-* マルチパートメールのテキストパートもiso-2022-jpでエンコードされます。
+* (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.
+    * 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)に変換されます。
+    * 半角カタカナはそのまま維持されます。
+    * 変換できない文字は疑問符(`?`)で置換されます。
+    * マルチパートメールのテキストパートもiso-2022-jpでエンコードされます。
 
 References
 ----------

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

@@ -1 +1,14 @@
-require 'mail-iso-2022-jp/patches'
+if RUBY_VERSION >= '1.9'
+  require 'mail-iso-2022-jp/mail'
+  require 'mail-iso-2022-jp/message'
+  require 'mail-iso-2022-jp/field'
+  require 'mail-iso-2022-jp/field_with_iso_2022_jp_encoding'
+  require 'mail-iso-2022-jp/body'
+else
+  require 'mail-iso-2022-jp/ruby18/mail'
+  require 'mail-iso-2022-jp/ruby18/message'
+  require 'mail-iso-2022-jp/ruby18/field_with_iso_2022_jp_encoding'
+end
+
+require 'mail-iso-2022-jp/header'
+require 'mail-iso-2022-jp/fields'

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

@@ -0,0 +1,14 @@
+# coding: utf-8
+
+module Mail
+  class Body
+    def initialize_with_iso_2022_jp_encoding(string = '')
+      if string.respond_to?(:encoding) && string.encoding.to_s == 'ISO-2022-JP'
+        string.force_encoding('US-ASCII')
+      end
+      initialize_without_iso_2022_jp_encoding(string)
+    end
+    alias_method :initialize_without_iso_2022_jp_encoding, :initialize
+    alias_method :initialize, :initialize_with_iso_2022_jp_encoding
+  end
+end

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

@@ -0,0 +1,19 @@
+# coding:utf-8
+
+require 'mail'
+
+module Mail
+  class Field
+    def initialize_with_iso_2022_jp_encoding(name, value = nil, charset = 'utf-8')
+      if charset == 'ISO-2022-JP' && value.kind_of?(String)
+        unless [ 'UTF-8', 'US-ASCII' ].include?(value.encoding.to_s)
+          raise ::Mail::InvalidEncodingError.new(
+            "The '#{name}' field is not encoded in UTF-8 nor in US-ASCII but in #{value.encoding}")
+        end
+      end
+      initialize_without_iso_2022_jp_encoding(name, value, charset)
+    end
+    alias_method :initialize_without_iso_2022_jp_encoding, :initialize
+    alias_method :initialize, :initialize_with_iso_2022_jp_encoding
+  end
+end

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

@@ -0,0 +1,73 @@
+# coding:utf-8
+
+require 'mail'
+require 'base64'
+
+module Mail
+  module FieldWithIso2022JpEncoding
+    def self.included(base)
+      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
+      base.send :alias_method, :do_decode, :do_decode_with_iso_2022_jp_encoding
+    end
+
+    def initialize_with_iso_2022_jp_encoding(value = nil, charset = 'utf-8')
+      if charset.to_s.downcase == 'iso-2022-jp'
+        if value.kind_of?(Array)
+          value = value.map { |e| encode_with_iso_2022_jp(e, charset) }
+        else
+          value = encode_with_iso_2022_jp(value, charset)
+        end
+      end
+      initialize_without_iso_2022_jp_encoding(value, charset)
+    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 = 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/fields.rb

@@ -0,0 +1,48 @@
+# coding:utf-8
+
+require 'mail'
+
+module Mail
+  class SubjectField < UnstructuredField
+    include FieldWithIso2022JpEncoding
+    def b_value_encode(string)
+      encode64(string)
+    end
+  end
+
+  class FromField < StructuredField
+    include FieldWithIso2022JpEncoding
+  end
+
+  class SenderField < StructuredField
+    include FieldWithIso2022JpEncoding
+  end
+
+  class ToField < StructuredField
+    include FieldWithIso2022JpEncoding
+  end
+
+  class CcField < StructuredField
+    include FieldWithIso2022JpEncoding
+  end
+
+  class ReplyToField < StructuredField
+    include FieldWithIso2022JpEncoding
+  end
+
+  class ResentFromField < StructuredField
+    include FieldWithIso2022JpEncoding
+  end
+
+  class ResentSenderField < StructuredField
+    include FieldWithIso2022JpEncoding
+  end
+
+  class ResentToField < StructuredField
+    include FieldWithIso2022JpEncoding
+  end
+
+  class ResentCcField < StructuredField
+    include FieldWithIso2022JpEncoding
+  end
+end

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

@@ -0,0 +1,13 @@
+# coding:utf-8
+
+module Mail
+  class Header
+    def encoded
+      buffer = ''
+      fields.each do |field|
+        buffer << field.encoded rescue Encoding::CompatibilityError
+      end
+      buffer
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+# coding: utf-8
+
+# Patches for Mail on Ruby 1.8.7
+module Mail
+  WAVE_DASH = "〜" # U+301C
+  FULLWIDTH_TILDE = "～" # U+FF5E
+  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

@@ -0,0 +1,39 @@
+# coding: utf-8
+
+require 'mail'
+
+# Patches for Mail::Message on Ruby 1.9.x or above
+module Mail
+  class Message
+    def body_with_iso_2022_jp_encoding=(value)
+      if @charset.to_s.downcase == 'iso-2022-jp'
+        if value.respond_to?(:encoding) && value.encoding.to_s != 'UTF-8'
+          raise ::Mail::InvalidEncodingError.new(
+            "The mail body is not encoded in UTF-8 but in #{value.encoding}")
+        end
+      end
+      self.body_without_iso_2022_jp_encoding = value
+    end
+    alias_method :body_without_iso_2022_jp_encoding=, :body=
+    alias_method :body=, :body_with_iso_2022_jp_encoding=
+
+    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 = Mail.encoding_to_charset(@body_raw, @charset)
+      end
+      process_body_raw_without_iso_2022_jp_encoding
+    end
+    alias_method :process_body_raw_without_iso_2022_jp_encoding, :process_body_raw
+    alias_method :process_body_raw, :process_body_raw_with_iso_2022_jp_encoding
+
+    def text_part_with_iso_2022_jp_encoding=(msg = nil)
+      if @charset.to_s.downcase == 'iso-2022-jp' && msg && msg.charset.nil?
+        msg.charset = @charset
+      end
+      self.text_part_without_iso_2022_jp_encoding = msg
+    end
+    alias_method :text_part_without_iso_2022_jp_encoding=, :text_part=
+    alias_method :text_part=, :text_part_with_iso_2022_jp_encoding=
+  end
+end

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

@@ -0,0 +1,65 @@
+# coding: utf-8
+
+require 'mail'
+require 'base64'
+require 'nkf'
+
+module Mail
+  module FieldWithIso2022JpEncoding
+    def self.included(base)
+      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
+      base.send :alias_method, :do_decode, :do_decode_with_iso_2022_jp_encoding
+    end
+
+    def initialize_with_iso_2022_jp_encoding(value = nil, charset = 'utf-8')
+      if charset.to_s.downcase == 'iso-2022-jp'
+        if value.kind_of?(Array)
+          value = value.map { |e| encode_with_iso_2022_jp(e) }
+        else
+          value = encode_with_iso_2022_jp(value)
+        end
+      end
+      initialize_without_iso_2022_jp_encoding(value, charset)
+    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)
+      value = value.to_s.gsub(/#{WAVE_DASH}/, FULLWIDTH_TILDE)
+      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

@@ -0,0 +1,10 @@
+# coding: utf-8
+
+# Patches for Mail on Ruby 1.9.x or above
+module Mail
+  WAVE_DASH = "〜" # U+301C
+  FULLWIDTH_TILDE = "～" # U+FF5E
+  NKF_OPTIONS = "--oc=CP50220 -xjW --fb-subchar"
+
+  class InvalidEncodingError < StandardError; end
+end

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

@@ -0,0 +1,34 @@
+# coding:utf-8
+
+require 'mail'
+require 'nkf'
+
+# Patches for Mail::Message on Ruby 1.8.7
+module Mail
+  class Message
+    def body_with_iso_2022_jp_encoding=(value)
+      self.body_without_iso_2022_jp_encoding = value
+    end
+    alias_method :body_without_iso_2022_jp_encoding=, :body=
+    alias_method :body=, :body_with_iso_2022_jp_encoding=
+
+    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 = NKF.nkf(NKF_OPTIONS, @body_raw)
+      end
+      process_body_raw_without_iso_2022_jp_encoding
+    end
+    alias_method :process_body_raw_without_iso_2022_jp_encoding, :process_body_raw
+    alias_method :process_body_raw, :process_body_raw_with_iso_2022_jp_encoding
+
+    def text_part_with_iso_2022_jp_encoding=(msg = nil)
+      if @charset.to_s.downcase == 'iso-2022-jp' && msg && msg.charset.nil?
+        msg.charset = @charset
+      end
+      self.text_part_without_iso_2022_jp_encoding = msg
+    end
+    alias_method :text_part_without_iso_2022_jp_encoding=, :text_part=
+    alias_method :text_part=, :text_part_with_iso_2022_jp_encoding=
+  end
+end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: mail-iso-2022-jp
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.0.0.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Kohei MATSUSHITA
@@ -14,6 +15,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -24,6 +26,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +37,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +45,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +53,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +61,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,29 +76,39 @@ files:
 - README.md
 - Gemfile
 - Rakefile
-- lib/mail-iso-2022-jp/patches.rb
+- lib/mail-iso-2022-jp/field.rb
+- lib/mail-iso-2022-jp/body.rb
+- lib/mail-iso-2022-jp/message.rb
+- 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/field_with_iso_2022_jp_encoding.rb
+- lib/mail-iso-2022-jp/fields.rb
+- lib/mail-iso-2022-jp/header.rb
+- lib/mail-iso-2022-jp/mail.rb
 - lib/mail-iso-2022-jp.rb
 homepage: https://github.com/kuroda/mail-iso-2022-jp
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0.preview2
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A set of patches that provides 'mail' gem with iso-2022-jp conversion capability.
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: 3b3f589971254d037f705a5c403463be2f42dd61
-  data.tar.gz: 73ec4eb877b7de25cce0822679fca797aa1f192a
-!binary "U0hBNTEy":
-  metadata.gz: e155386001bfa04d7152e2b2fed11ec8f4d94fbc2896cdfec023c349d74c84a365c706b15237f9ce3b7cfdfdee6dfbd6a8a1911fbc1c6e1177827c3decf7f49a
-  data.tar.gz: 3dd6d7de6a208007432ab558e5b9256ac2848f4ec45aa00d3653af19437c777a78127e4ad093c17724a2f29310927a0d3a92c5a484140beac4a3ef64726c68bd

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

@@ -1,211 +0,0 @@
-# coding:utf-8
-
-require 'mail'
-require 'base64'
-require 'nkf'
-
-module Mail
-  WAVE_DASH = "〜" # U+301C
-  FULLWIDTH_TILDE = "～" # U+FF5E
-  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, :undef => :replace).force_encoding(charset)
-    end
-  else
-    NKF_OPTIONS = "--oc=CP50220 -xjW --fb-subchar"
-  end
-
-  class InvalidEncodingError < StandardError; end
-
-  class Message
-    def body_with_iso_2022_jp_encoding=(value)
-      if @charset.to_s.downcase == 'iso-2022-jp'
-        if RUBY_VERSION >= '1.9'
-          if value.respond_to?(:encoding) && value.encoding.to_s != 'UTF-8'
-            raise ::Mail::InvalidEncodingError.new(
-              "The mail body is not encoded in UTF-8 but in #{value.encoding}")
-          end
-        end
-      end
-      self.body_without_iso_2022_jp_encoding = value
-    end
-    alias_method :body_without_iso_2022_jp_encoding=, :body=
-    alias_method :body=, :body_with_iso_2022_jp_encoding=
-
-    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)
-        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
-    alias_method :process_body_raw_without_iso_2022_jp_encoding, :process_body_raw
-    alias_method :process_body_raw, :process_body_raw_with_iso_2022_jp_encoding
-
-    def text_part_with_iso_2022_jp_encoding=(msg = nil)
-      if @charset.to_s.downcase == 'iso-2022-jp' && msg && msg.charset.nil?
-        msg.charset = @charset
-      end
-      self.text_part_without_iso_2022_jp_encoding = msg
-    end
-    alias_method :text_part_without_iso_2022_jp_encoding=, :text_part=
-    alias_method :text_part=, :text_part_with_iso_2022_jp_encoding=
-  end
-
-  class Header
-    def encoded
-      buffer = ''
-      fields.each do |field|
-        buffer << field.encoded rescue Encoding::CompatibilityError;
-      end
-      buffer
-    end
-  end
-
-  class Body
-    def initialize_with_iso_2022_jp_encoding(string = '')
-      if string.respond_to?(:encoding) && string.encoding.to_s == 'ISO-2022-JP'
-        string.force_encoding('US-ASCII')
-      end
-      initialize_without_iso_2022_jp_encoding(string)
-    end
-    alias_method :initialize_without_iso_2022_jp_encoding, :initialize
-    alias_method :initialize, :initialize_with_iso_2022_jp_encoding
-  end
-
-  class Field
-    def initialize_with_iso_2022_jp_encoding(name, value = nil, charset = 'utf-8')
-      if charset == 'ISO-2022-JP' && value.kind_of?(String)
-        if RUBY_VERSION >= '1.9'
-          unless [ 'UTF-8', 'US-ASCII' ].include?(value.encoding.to_s)
-            raise ::Mail::InvalidEncodingError.new(
-              "The '#{name}' field is not encoded in UTF-8 nor in US-ASCII but in #{value.encoding}")
-          end
-        end
-      end
-      initialize_without_iso_2022_jp_encoding(name, value, charset)
-    end
-    alias_method :initialize_without_iso_2022_jp_encoding, :initialize
-    alias_method :initialize, :initialize_with_iso_2022_jp_encoding
-  end
-
-  module FieldWithIso2022JpEncoding
-    def self.included(base)
-      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
-      base.send :alias_method, :do_decode, :do_decode_with_iso_2022_jp_encoding
-    end
-
-    def initialize_with_iso_2022_jp_encoding(value = nil, charset = 'utf-8')
-      if charset.to_s.downcase == 'iso-2022-jp'
-        if value.kind_of?(Array)
-          value = value.map { |e| encode_with_iso_2022_jp(e, charset) }
-        else
-          value = encode_with_iso_2022_jp(value, charset)
-        end
-      end
-      initialize_without_iso_2022_jp_encoding(value, charset)
-    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)
-      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|
-        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 RUBY_VERSION >= '1.9' && 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
-
-  class SubjectField < UnstructuredField
-    include FieldWithIso2022JpEncoding
-    def b_value_encode(string)
-      encode64(string)
-    end
-  end
-
-  class FromField < StructuredField
-    include FieldWithIso2022JpEncoding
-  end
-
-  class SenderField < StructuredField
-    include FieldWithIso2022JpEncoding
-  end
-
-  class ToField < StructuredField
-    include FieldWithIso2022JpEncoding
-  end
-
-  class CcField < StructuredField
-    include FieldWithIso2022JpEncoding
-  end
-
-  class ReplyToField < StructuredField
-    include FieldWithIso2022JpEncoding
-  end
-
-  class ResentFromField < StructuredField
-    include FieldWithIso2022JpEncoding
-  end
-
-  class ResentSenderField < StructuredField
-    include FieldWithIso2022JpEncoding
-  end
-
-  class ResentToField < StructuredField
-    include FieldWithIso2022JpEncoding
-  end
-
-  class ResentCcField < StructuredField
-    include FieldWithIso2022JpEncoding
-  end
-end