mail-iso-2022-jp 2.0.9 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 462a6c9d3234f2a8563492dc504dd0bedb8ec8d994b384119df8d648328d262c
-  data.tar.gz: 1d72a73a4e14c62417d1d5ca6c768aad57098b2f956eecb16801a85e26cc4294
+  metadata.gz: 881232b8ab8a371aa2dc66d39d277d0fc57d940774624f163a523420894185f5
+  data.tar.gz: 8963800278318508912a4ffadf55e9a66202473c2ab680266fe1783f3799f755
 SHA512:
-  metadata.gz: 7f6ffb0259fed8e9862dde967e0084cfd9078dfe2d72c1cb0e396f903d43c4a00807f1042272f908de26091b37e63b93edf6a262002ce538734538ac73b675fa
-  data.tar.gz: c5ad8bf571d5d8215ce99d0ad6a31f0278ced4a6ab2edc6de8da8a3b8d4e61855f3e4b8edb2a20438ea334d917c89679fd0c67556a4d7f77ff835200ec823239
+  metadata.gz: 38e327ec30d23b3b707b8ab7a308771b9bbaad4651ad8a24cc9ec5a0ce9e3c24f8c78c9a0aca173b79f012ea510e90c9d17619fa063a3b9b55f94d18f9fa0587
+  data.tar.gz: 9bc7298be0e38f259b064f99f69a87c89495e14c85130c9bdff19b90fab886051fe6747a304e6b5447e074a931fa9e95dba1bc180044f59a3026e6ae228ef5b1

data/Gemfile

@@ -7,7 +7,7 @@ if mail_gem_version = ENV['MAIL_GEM_VERSION']
     gem "mail", "= #{mail_gem_version}"
   end
 else
-  gem "mail", "<= 2.7.0"
+  gem "mail", "<= 2.8.1"
 end
 
 rails_version = ENV['MAIL_ISO_2022_JP_RAILS_VERSION']
@@ -18,6 +18,9 @@ group :development, :test do
   gem "activesupport"
   gem "minitest"
   gem "test-unit"
+  gem 'net-imap', '~> 0.2.2'
+  gem 'net-pop', '~> 0.1.1'
+  gem 'net-smtp', '~> 0.3.0'
   if rails_version == "edge"
     gem "actionmailer", :git => "git://github.com/rails/rails.git"
   elsif rails_version && rails_version.strip != ""

data/README.md

@@ -45,15 +45,15 @@ Requirements
 
 ### Ruby ###
 
-* 2.2, 2.3, 2.4, 2.5
+* 2.2, 2.3, 2.4, 2.5, 2.6
 
 ### Gems ###
 
-* `mail` 2.2.6 or higher, but lower than or equal to 2.7.0
+* `mail` 2.2.6 or higher, but lower than or equal to 2.7.1
 
 ### ActionMailer (Optional) ###
 
-* 3.0 or higher (including 5.x)
+* 3.0 or higher (including 6.x)
 
 Getting Start
 -------------

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

@@ -1,7 +1,7 @@
 # coding: utf-8
 
 module Mail
-  class Body
+  Body.class_eval do
     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')

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

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-module Mail
+Mail.module_eval do
   WAVE_DASH = [0x301c].pack("U")
   FULLWIDTH_TILDE = [0xff5e].pack("U")
   MINUS_SIGN = [0x2212].pack("U")

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

@@ -3,7 +3,7 @@
 require 'mail'
 
 module Mail
-  class Field
+  Field.class_eval do
     def initialize_with_iso_2022_jp_encoding(name, value = nil, charset = 'utf-8')
       if charset.to_s.downcase == 'iso-2022-jp' && value.kind_of?(String)
         unless [ 'UTF-8', 'US-ASCII' ].include?(value.encoding.to_s)

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

@@ -1,7 +1,7 @@
 # coding: utf-8
 
 module Mail
-  class Header
+  Header.class_eval do
     def encoded
       buffer = ''
       fields.each do |field|

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

@@ -1,7 +1,7 @@
 # coding: utf-8
 
 # Patches for Mail on Ruby 1.9.3 or above
-module Mail
+Mail.module_eval do
   ENCODE = { 'iso-2022-jp' => Encoding::CP50221 }
 
   def self.encoding_to_charset(str, charset)

data/lib/mail-iso-2022-jp/mail_under_280/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/mail_under_280/character_names.rb

@@ -0,0 +1,12 @@
+# coding: utf-8
+
+module Mail
+  WAVE_DASH = [0x301c].pack("U")
+  FULLWIDTH_TILDE = [0xff5e].pack("U")
+  MINUS_SIGN = [0x2212].pack("U")
+  FULLWIDTH_HYPHEN_MINUS = [0xff0d].pack("U")
+  EM_DASH = [0x2014].pack("U")
+  HORIZONTAL_BAR = [0x2015].pack("U")
+  DOUBLE_VERTICAL_LINE = [0x2016].pack("U")
+  PARALLEL_TO = [0x2225].pack("U")
+end

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

@@ -0,0 +1,54 @@
+module Mail
+  module CommonMethodsForField
+    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 b_value_encode(string)
+      string.split(' ').map do |s|
+        if s =~ /\e/ || s == "\"" || start_with_specials?(s) || end_with_specials?(s)
+          encode64(s)
+        else
+          s
+        end
+      end.join(" ")
+    end
+
+    def encode(value)
+      if charset.to_s.downcase == 'iso-2022-jp'
+        value
+      else
+        super(value)
+      end
+    end
+
+    def encode64(string)
+      if string.length > 0
+        "=?ISO-2022-JP?B?#{Base64.encode64(string).gsub("\n", "")}?="
+      else
+        string
+      end
+    end
+
+    def preprocess(value)
+      value = value.to_s.gsub(/#{WAVE_DASH}/, FULLWIDTH_TILDE)
+      value = value.to_s.gsub(/#{MINUS_SIGN}/, FULLWIDTH_HYPHEN_MINUS)
+      value = value.to_s.gsub(/#{EM_DASH}/, HORIZONTAL_BAR)
+      value = value.to_s.gsub(/#{DOUBLE_VERTICAL_LINE}/, PARALLEL_TO)
+      value
+    end
+
+    def start_with_specials?(string)
+      string =~ /\A[\(\)<>\[\]:;@\\,\."]+[a-zA-Z]+\Z/
+    end
+
+    def end_with_specials?(string)
+      string =~ /\A[a-zA-Z]+[\(\)<>\[\]:;@\\,\."]+\Z/
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+# coding: utf-8
+
+require 'mail'
+
+module Mail
+  class Field
+    def initialize_with_iso_2022_jp_encoding(name, value = nil, charset = 'utf-8')
+      if charset.to_s.downcase == '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
+        charset = 'utf-8' if value.ascii_only?
+      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/mail_under_280/field_with_iso_2022_jp_encoding.rb

@@ -0,0 +1,43 @@
+# coding: utf-8
+
+require 'mail'
+require 'base64'
+
+module Mail
+  module FieldWithIso2022JpEncoding
+    def self.included(base)
+      base.send :include, Mail::CommonMethodsForField
+      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 encode_with_iso_2022_jp(value, charset)
+      value = Mail::Preprocessor.process(value)
+      value = Mail.encoding_to_charset(value, charset)
+      value.force_encoding('ascii-8bit')
+      value = b_value_encode(value)
+      value.force_encoding('ascii-8bit')
+    end
+
+    def encode_crlf(value)
+      if charset.to_s.downcase == 'iso-2022-jp'
+        value.force_encoding('ascii-8bit')
+      end
+      super(value)
+    end
+  end
+end

data/lib/mail-iso-2022-jp/mail_under_280/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_under_280/invalid_encoding_error.rb

@@ -0,0 +1,3 @@
+module Mail
+  class InvalidEncodingError < StandardError; end
+end

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

@@ -0,0 +1,10 @@
+# coding: utf-8
+
+# Patches for Mail on Ruby 1.9.3 or above
+module Mail
+  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
+end

data/lib/mail-iso-2022-jp/mail_under_280/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
+        value = Mail::Preprocessor.process(value)
+      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 = 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/mail_under_280/preprocessor.rb

@@ -0,0 +1,11 @@
+module Mail
+  class Preprocessor
+    def self.process(value)
+      value.to_s.
+        gsub(/#{WAVE_DASH}/, FULLWIDTH_TILDE).
+        gsub(/#{MINUS_SIGN}/, FULLWIDTH_HYPHEN_MINUS).
+        gsub(/#{EM_DASH}/, HORIZONTAL_BAR).
+        gsub(/#{DOUBLE_VERTICAL_LINE}/, PARALLEL_TO)
+    end
+  end
+end

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

@@ -0,0 +1,41 @@
+# coding: utf-8
+
+require 'mail'
+
+module Mail
+  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/mail_under_280/subject_field.rb

@@ -0,0 +1,12 @@
+# coding: utf-8
+
+require 'mail'
+
+module Mail
+  class SubjectField < UnstructuredField
+    include FieldWithIso2022JpEncoding
+    def b_value_encode(string)
+      encode64(string)
+    end
+  end
+end

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

@@ -4,7 +4,7 @@ require 'mail'
 
 # Patches for Mail::Message on Ruby 1.9.x or above
 module Mail
-  class Message
+  Message.class_eval do
     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'

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

@@ -3,39 +3,9 @@
 require 'mail'
 
 module Mail
-  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
+  [FromField, SenderField, ToField, CcField, ReplyToField, ResentFromField, ResentSenderField, ResentToField, ResentCcField].each do |field_class|
+    field_class.class_eval do
+      include FieldWithIso2022JpEncoding
+    end
   end
 end

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

@@ -3,7 +3,7 @@
 require 'mail'
 
 module Mail
-  class SubjectField < UnstructuredField
+  SubjectField.class_eval do
     include FieldWithIso2022JpEncoding
     def b_value_encode(string)
       encode64(string)

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

@@ -1,20 +1,38 @@
-require 'mail-iso-2022-jp/character_names'
-require 'mail-iso-2022-jp/invalid_encoding_error'
-require 'mail-iso-2022-jp/common_methods_for_field'
-require 'mail-iso-2022-jp/preprocessor'
-
-if RUBY_VERSION >= '1.9'
+mail_gem = Gem.loaded_specs["mail"] || Gem::Specification.find_all_by_name("mail").first
+if mail_gem.version.to_s >= '2.8.0'
+  # New code
+  require 'mail-iso-2022-jp/character_names'
+  require 'mail-iso-2022-jp/invalid_encoding_error'
+  require 'mail-iso-2022-jp/common_methods_for_field'
+  require 'mail-iso-2022-jp/preprocessor'
   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'
+  require 'mail-iso-2022-jp/header'
+  require 'mail-iso-2022-jp/subject_field'
+  require 'mail-iso-2022-jp/structured_fields'
 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
+  # Old code
+  require 'mail-iso-2022-jp/mail_under_280/character_names'
+  require 'mail-iso-2022-jp/mail_under_280/invalid_encoding_error'
+  require 'mail-iso-2022-jp/mail_under_280/common_methods_for_field'
+  require 'mail-iso-2022-jp/mail_under_280/preprocessor'
 
-require 'mail-iso-2022-jp/header'
-require 'mail-iso-2022-jp/subject_field'
-require 'mail-iso-2022-jp/structured_fields'
+  if RUBY_VERSION >= '1.9'
+    require 'mail-iso-2022-jp/mail_under_280/mail'
+    require 'mail-iso-2022-jp/mail_under_280/message'
+    require 'mail-iso-2022-jp/mail_under_280/field'
+    require 'mail-iso-2022-jp/mail_under_280/field_with_iso_2022_jp_encoding'
+    require 'mail-iso-2022-jp/mail_under_280/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/mail_under_280/header'
+  require 'mail-iso-2022-jp/mail_under_280/subject_field'
+  require 'mail-iso-2022-jp/mail_under_280/structured_fields'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mail-iso-2022-jp
 version: !ruby/object:Gem::Version
-  version: 2.0.9
+  version: 2.1.0
 platform: ruby
 authors:
 - Kohei MATSUSHITA
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-04 00:00:00.000000000 Z
+date: 2024-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -20,7 +20,7 @@ dependencies:
         version: 2.2.6
     - - "<="
       - !ruby/object:Gem::Version
-        version: 2.7.1
+        version: 2.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: 2.2.6
     - - "<="
       - !ruby/object:Gem::Version
-        version: 2.7.1
+        version: 2.8.1
 - !ruby/object:Gem::Dependency
   name: actionmailer
   requirement: !ruby/object:Gem::Requirement
@@ -90,6 +90,18 @@ files:
 - lib/mail-iso-2022-jp/header.rb
 - lib/mail-iso-2022-jp/invalid_encoding_error.rb
 - lib/mail-iso-2022-jp/mail.rb
+- lib/mail-iso-2022-jp/mail_under_280/body.rb
+- lib/mail-iso-2022-jp/mail_under_280/character_names.rb
+- lib/mail-iso-2022-jp/mail_under_280/common_methods_for_field.rb
+- lib/mail-iso-2022-jp/mail_under_280/field.rb
+- lib/mail-iso-2022-jp/mail_under_280/field_with_iso_2022_jp_encoding.rb
+- lib/mail-iso-2022-jp/mail_under_280/header.rb
+- lib/mail-iso-2022-jp/mail_under_280/invalid_encoding_error.rb
+- lib/mail-iso-2022-jp/mail_under_280/mail.rb
+- lib/mail-iso-2022-jp/mail_under_280/message.rb
+- lib/mail-iso-2022-jp/mail_under_280/preprocessor.rb
+- lib/mail-iso-2022-jp/mail_under_280/structured_fields.rb
+- lib/mail-iso-2022-jp/mail_under_280/subject_field.rb
 - lib/mail-iso-2022-jp/message.rb
 - lib/mail-iso-2022-jp/preprocessor.rb
 - lib/mail-iso-2022-jp/ruby18/field_with_iso_2022_jp_encoding.rb
@@ -116,8 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.5.9
 signing_key: 
 specification_version: 4
 summary: A set of patches that provides 'mail' gem with iso-2022-jp conversion capability.