mail-iso-2022-jp 1.1.7 → 1.1.8

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

@@ -2,6 +2,7 @@
 
 require 'mail'
 require 'base64'
+require 'nkf'
 
 module Mail
   WAVE_DASH = "〜" # U+301C
@@ -15,7 +16,23 @@ module Mail
     NKF_OPTIONS = "--oc=CP50220 -xj"
   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)
@@ -51,7 +68,23 @@ module Mail
     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
@@ -79,7 +112,7 @@ 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'
@@ -96,13 +129,13 @@ module Mail
     def b_value_encode(string)
       string.split(' ').map do |s|
         if s =~ /\e/
-          "=?ISO-2022-JP?B?#{Base64.encode64(s).gsub("\n", "")}?="
+          encode64(s)
         else
           s
         end
       end.join(" ")
     end
-    
+
     private
     def encode(value)
       if charset.to_s.downcase == 'iso-2022-jp'
@@ -111,17 +144,24 @@ module Mail
         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

metadata

@@ -1,126 +1,105 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mail-iso-2022-jp
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 1.1.8
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 7
-  version: 1.1.7
 platform: ruby
-authors: 
+authors:
 - Kohei MATSUSHITA
 - Tsutomu KURODA
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-13 00:00:00 +09:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mail
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !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
     - - <=
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 4
-        - 4
+      - !ruby/object:Gem::Version
         version: 2.4.4
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: actionmailer
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.2.5
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 2.4.4
+- !ruby/object:Gem::Dependency
+  name: actionmailer
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 3
-        - 12
-        version: "3.12"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.12'
   type: :development
-  version_requirements: *id003
-description: A patch that provides 'mail' gem with iso-2022-jp conversion capability.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.12'
+description: A set of patches for mikel's mail gem. With this, you can easily send
+  and receive mails with ISO-2022-JP enconding (so-called 'JIS-CODE').
 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
-has_rdoc: true
 homepage: https://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.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: A patch that provides 'mail' gem with iso-2022-jp conversion capability.
+summary: A set of patches that provides 'mail' gem with iso-2022-jp conversion capability.
 test_files: []
-