sisimai 4.22.3-java → 4.22.4-java

data/lib/sisimai/data/json.rb

@@ -13,13 +13,13 @@ module Sisimai
           return nil unless argvs
           return nil unless argvs.is_a? Sisimai::Data
 
-          if RUBY_PLATFORM =~ /java/
+          if RUBY_PLATFORM.include?('java')
             # java-based ruby environment like JRuby.
             begin
               require 'jrjackson'
               jsonstring = JrJackson::Json.dump(argvs.damn)
             rescue StandardError => ce
-              warn '***warning: Failed to JrJackson::Json.dump: ' + ce.to_s
+              warn '***warning: Failed to JrJackson::Json.dump: ' << ce.to_s
             end
           else
             # MRI
@@ -27,7 +27,7 @@ module Sisimai
               require 'oj'
               jsonstring = Oj.dump(argvs.damn, :mode => :compat)
             rescue StandardError => ce
-              warn '***warning: Failed to Oj.dump: ' + ce.to_s
+              warn '***warning: Failed to Oj.dump: ' << ce.to_s
             end
           end
 

data/lib/sisimai/data/yaml.rb

@@ -21,7 +21,7 @@ module Sisimai
           begin
             yamlstring = ::YAML.dump(damneddata)
           rescue StandardError => ce
-            warn '***warning: Failed to YAML.dump: ' + ce.to_s
+            warn '***warning: Failed to YAML.dump: ' << ce.to_s
           end
 
           return yamlstring

data/lib/sisimai/datetime.rb

@@ -34,20 +34,17 @@ module Sisimai
       }.freeze
 
       MonthName = {
-        full: %w|January February March April May June July August September October November December|,
-        abbr: %w|Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec|,
+        full: %w[January February March April May June July August September October November December],
+        abbr: %w[Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec],
       }.freeze
 
       DayOfWeek = {
-        full: %w|Sunday Monday Tuesday Wednesday Thursday Friday Saturday|,
-        abbr: %w|Sun Mon Tue Wed Thu Fri Sat|,
+        full: %w[Sunday Monday Tuesday Wednesday Thursday Friday Saturday],
+        abbr: %w[Sun Mon Tue Wed Thu Fri Sat],
       }.freeze
 
       HourName = {
-        full: [
-          'Midnight', 1, 2, 3, 4, 5, 'Morning', 7, 8, 9, 10, 11,
-          'Noon', 13, 14, 15, 16, 17, 'Evening', 19, 20, 21, 22, 23,
-        ],
+        full: %w[Midnight 1 2 3 4 5 Morning 7 8 9 10 11 Noon 13 14 15 16 17 Evening 19 20 21 22 23],
         abbr: [0..23],
       }.freeze
 
@@ -207,10 +204,8 @@ module Sisimai
           m = MathematicalConstant[cr[2].to_sym].to_f
           u = cr[3] || 'd'
           getseconds = n * m * TimeUnit[u.to_sym].to_f
-
         else
           getseconds = 0
-
         end
 
         return getseconds
@@ -313,15 +308,12 @@ module Sisimai
             elsif MonthName[:abbr].include?(p)
               # Month name abbr.; Apr, May, ...
               v[:M] = p
-
             end
-
           elsif p =~ /\A\d{1,4}\z/
             # Year or Day; 2005, 31, 04,  1, ...
             if p.to_i > 31
               # The piece is the value of an year
               v[:Y] = p
-
             else
               # The piece is the value of a day
               if v[:d]
@@ -332,23 +324,19 @@ module Sisimai
                 v[:d] = p
               end
             end
-
           elsif cr = p.match(/\A([0-2]\d):([0-5]\d):([0-5]\d)\z/) ||
                      p.match(/\A(\d{1,2})[-:](\d{1,2})[-:](\d{1,2})\z/)
             # Time; 12:34:56, 03:14:15, ...
             # Arrival-Date: 2014-03-26 00-01-19
-
             if cr[1].to_i < 24 && cr[2].to_i < 60 && cr[3].to_i < 60
               # Valid time format, maybe...
               v[:T] = sprintf('%02d:%02d:%02d', cr[1].to_i, cr[2].to_i, cr[3].to_i)
             end
-
           elsif cr = p.match(/\A([0-2]\d):([0-5]\d)\z/)
             # Time; 12:34 => 12:34:00
             if cr[1].to_i < 24 && cr[2].to_i < 60
               v[:T] = sprintf('%02d:%02d:00', cr[1].to_i, cr[2].to_i)
             end
-
           elsif cr = p.match(/\A(\d\d?):(\d\d?)\z/)
             # Time: 1:4 => 01:04:00
             v[:T] = sprintf('%02d:%02d:00', cr[1].to_i, cr[2].to_i)
@@ -356,7 +344,6 @@ module Sisimai
           elsif p =~ /\A[APap][Mm]\z/
             # AM or PM
             afternoon1 = 1
-
           else
             # Timezone offset and others
             if p =~ /\A[-+][01]\d{3}\z/
@@ -366,7 +353,6 @@ module Sisimai
             elsif p =~ /\A[(]?[A-Z]{2,5}[)]?\z/
               # Timezone abbreviation; JST, GMT, UTC, ...
               v[:z] ||= abbr2tz(p) || '+0000'
-
             else
               # Other date format
               if cr = p.match(%r|\A(\d{4})[-/](\d{1,2})[-/](\d{1,2})\z|)
@@ -384,7 +370,6 @@ module Sisimai
                 if cr[4].to_i < 24 && cr[5].to_i < 60 && cr[6].to_i < 60
                   v[:T] = sprintf('%02d:%02d:%02d', cr[4].to_i, cr[5].to_i, cr[6].to_i)
                 end
-
               elsif cr = p.match(%r|\A(\d{1,2})/(\d{1,2})/(\d{1,2})\z|)
                 # 4/29/01 11:34:45 PM
                 v[:M]  = MonthName[:abbr][cr[1].to_i - 1]
@@ -484,7 +469,6 @@ module Sisimai
 
         elsif argv1 =~ /\A[A-Za-z]+\z/
           return tz2second(TimeZoneAbbr[argv1.to_sym])
-
         else
           return nil
         end

data/lib/sisimai/mail.rb

@@ -24,7 +24,7 @@ module Sisimai
         # Path to mail or '<STDIN>' ?
         if argv1 == '<STDIN>'
           # Sisimai::Mail.new('<STDIN>')
-          classname = sprintf('%s::STDIN', self.class)
+          classname = self.class.to_s << '::STDIN'
           parameter['type'] = 'stdin'
           parameter['path'] = $stdin
         else
@@ -33,23 +33,21 @@ module Sisimai
 
           if mediatype == 'file'
             # The argument is a file, it is an mbox or email file in Maildir/
-            classname = sprintf('%s::Mbox', self.class)
+            classname = self.class.to_s << '::Mbox'
             parameter['type'] = 'mailbox'
 
           elsif mediatype == 'directory'
             # The agument is not a file, it is a Maildir/
-            classname = sprintf('%s::Maildir', self.class)
+            classname = self.class.to_s << '::Maildir'
             parameter['type'] = 'maildir'
           end
         end
-
       elsif argv1.is_a?(IO)
         # Read from STDIN
         # The argument neither a mailbox nor a Maildir/.
-        classname = sprintf('%s::STDIN', self.class)
+        classname = self.class.to_s << '::STDIN'
         parameter['type'] = 'stdin'
       end
-
       return nil unless classname
 
       classpath = classname.gsub('::', '/').downcase

data/lib/sisimai/mail/maildir.rb

@@ -48,7 +48,7 @@ module Sisimai
             # Read each file in the directory
             next if r == '.' || r == '..'
 
-            emailindir = sprintf('%s/%s', self.dir, r)
+            emailindir = self.dir + '/' + r
             emailindir = emailindir.squeeze('/')
 
             next unless File.ftype(emailindir) == 'file'

data/lib/sisimai/mda.rb

@@ -3,10 +3,7 @@ module Sisimai
   module MDA
     # Imported from p5-Sisimail/lib/Sisimai/MDA.pm
     class << self
-      Re0 = {
-        :from => %r/\A(?:Mail Delivery Subsystem|MAILER-DAEMON|postmaster)/i,
-      }.freeze
-      Re1 = {
+      AgentNames = {
         # dovecot/src/deliver/deliver.c
         # 11: #define DEFAULT_MAIL_REJECTION_HUMAN_REASON \
         # 12: "Your message to <%t> was automatically rejected:%n%r"
@@ -17,66 +14,68 @@ module Sisimai
         :'vpopmail'   => %r/\Avdelivermail: /,
         :'vmailmgr'   => %r/\Avdeliver: /,
       }.freeze
-      Re2 = %r{\A(?>
-         Your[ ]message[ ]to[ ].+[ ]was[ ]automatically[ ]rejected:\z
-        |(?:mail[.]local|procmail|maildrop|vdelivermail|vdeliver):[ ]
-        )
-      }x
+      MarkingsOf = {
+        message: %r{\A(?>
+           Your[ ]message[ ]to[ ].+[ ]was[ ]automatically[ ]rejected:\z
+          |(?:mail[.]local|procmail|maildrop|vdelivermail|vdeliver):[ ]
+          )
+        }x
+      }.freeze
 
       # dovecot/src/deliver/mail-send.c:94
-      ReFailure = {
+      ReFailures = {
         :'dovecot' => {
-          :userunknown => %r/\AMailbox doesn't exist: /i,
+          :userunknown => %r/\Amailbox doesn't exist: /,
           :mailboxfull => %r{\A(?:
-             Quota[ ]exceeded # Dovecot 1.2 dovecot/src/plugins/quota/quota.c
-            |Quota[ ]exceeded[ ][(]mailbox[ ]for[ ]user[ ]is[ ]full[)]  # dovecot/src/plugins/quota/quota.c
-            |Not[ ]enough[ ]disk[ ]space
+             quota[ ]exceeded # Dovecot 1.2 dovecot/src/plugins/quota/quota.c
+            |quota[ ]exceeded[ ][(]mailbox[ ]for[ ]user[ ]is[ ]full[)]  # dovecot/src/plugins/quota/quota.c
+            |not[ ]enough[ ]disk[ ]space
             )
-          }xi,
+          }x,
         },
         :'mail.local' => {
           :userunknown => %r{[:][ ](?:
              unknown[ ]user[:]
-            |User[ ]unknown
-            |Invalid[ ]mailbox[ ]path
-            |User[ ]missing[ ]home[ ]directory
+            |user[ ]unknown
+            |invalid[ ]mailbox[ ]path
+            |user[ ]missing[ ]home[ ]directory
             )
-          }xi,
+          }x,
           :mailboxfull => %r{(?:
-             Disc[ ]quota[ ]exceeded
-            |Mailbox[ ]full[ ]or[ ]quota[ ]exceeded
+             disc[ ]quota[ ]exceeded
+            |mailbox[ ]full[ ]or[ ]quota[ ]exceeded
             )
-          }xi,
-          :systemerror => %r/Temporary file write error/i,
+          }x,
+          :systemerror => %r/temporary file write error/,
         },
         :'procmail' => {
-          :mailboxfull => %r/Quota exceeded while writing/i,
-          :systemfull  => %r/No space left to finish writing/i,
+          :mailboxfull => %r/quota exceeded while writing/,
+          :systemfull  => %r/no space left to finish writing/,
         },
         :'maildrop' => {
           :userunknown => %r{(?:
-             Invalid[ ]user[ ]specified[.]
+             invalid[ ]user[ ]specified[.]
             |Cannot[ ]find[ ]system[ ]user
             )
-          }xi,
-          :mailboxfull => %r/maildir over quota[.]\z/i,
+          }x,
+          :mailboxfull => %r/maildir over quota[.]\z/,
         },
         :'vpopmail' => {
-          :userunknown => %r/Sorry, no mailbox here by that name[.]/i,
+          :userunknown => %r/sorry, no mailbox here by that name[.]/,
           :filtered    => %r{(?:
              account[ ]is[ ]locked[ ]email[ ]bounced
             |user[ ]does[ ]not[ ]exist,[ ]but[ ]will[ ]deliver[ ]to[ ]
             )
-          }xi,
-          :mailboxfull => %r/(?:domain|user) is over quota/i,
+          }x,
+          :mailboxfull => %r/(?:domain|user) is over quota/,
         },
         :'vmailmgr' => {
           :userunknown => %r{(?>
-             Invalid[ ]or[ ]unknown[ ](?:base[ ]user[ ]or[ ]domain|virtual[ ]user)
-            |User[ ]name[ ]does[ ]not[ ]refer[ ]to[ ]a[ ]virtual[ ]user/
+             invalid[ ]or[ ]unknown[ ](?:base[ ]user[ ]or[ ]domain|virtual[ ]user)
+            |user[ ]name[ ]does[ ]not[ ]refer[ ]to[ ]a[ ]virtual[ ]user/
             )
-          }ix,
-          :mailboxfull => %r/Delivery failed due to system quota violation/i,
+          }x,
+          :mailboxfull => %r/delivery failed due to system quota violation/,
         },
       }.freeze
 
@@ -96,8 +95,7 @@ module Sisimai
         return nil unless mbody
         return nil if mhead.keys.size.zero?
         return nil if mbody.empty?
-
-        return nil unless mhead['from'] =~ Re0[:from]
+        return nil unless mhead['from'].downcase.start_with?('mail delivery subsystem','mailer-daemon', 'postmaster')
 
         agentname0 = ''   # [String] MDA name
         reasonname = ''   # [String] Error reason
@@ -105,16 +103,16 @@ module Sisimai
         hasdivided = mbody.split("\n")
         linebuffer = []
 
-        hasdivided.each do |e|
+        while e = hasdivided.shift do
           # Check each line with each MDA's symbol regular expression.
           if agentname0 == ''
             # Try to match with each regular expression
             next unless e.size > 0
-            next unless e =~ Re2
+            next unless e =~ MarkingsOf[:message]
 
-            Re1.each_key do |f|
+            AgentNames.each_key do |f|
               # Detect the agent name from the line
-              next unless e =~ Re1[f]
+              next unless e =~ AgentNames[f]
               agentname0 = f.to_s
               break
             end
@@ -124,15 +122,14 @@ module Sisimai
           linebuffer << e
           break unless e.size > 0
         end
-
         return nil unless agentname0.size > 0
         return nil unless linebuffer.size > 0
 
-        ReFailure[agentname0.to_sym].each_key do |e|
+        ReFailures[agentname0.to_sym].each_key do |e|
           # Detect an error reason from message patterns of the MDA.
           linebuffer.each do |f|
             # Try to match with each regular expression
-            next unless f =~ ReFailure[agentname0.to_sym][e]
+            next unless f.downcase =~ ReFailures[agentname0.to_sym][e]
             reasonname = e.to_s
             bouncemesg = f
             break

data/lib/sisimai/message.rb

@@ -50,10 +50,9 @@ module Sisimai
         # Sisimai::Message::JSON
         return nil unless email.is_a? Hash
         child = 'Sisimai::Message::JSON'
-
       else
         # Unsupported value in "input"
-        warn ' ***warning: Unsupported value in "input": ' + input.to_s
+        warn ' ***warning: Unsupported value in "input": ' << input.to_s
         return nil
       end
 
@@ -66,7 +65,7 @@ module Sisimai
       begin
         require child.gsub('::', '/').downcase
       rescue LoadError => ce
-        warn ' ***warning: Failed to load module: ' + ce.to_s
+        warn ' ***warning: Failed to load module: ' << ce.to_s
         return nil
       end
 

data/lib/sisimai/message/email.rb

@@ -16,13 +16,12 @@ module Sisimai
       @@ToBeLoaded = []
       @@TryOnFirst = []
 
+      BorderLine = '__MIME_ENCODED_BOUNDARY__'
       EndOfEmail = Sisimai::String.EOM
       RFC822Head = Sisimai::RFC5322.HEADERFIELDS
       RFC3834Set = Sisimai::RFC3834.headerlist.map(&:downcase)
-      HeaderList = [
-        'from', 'to', 'date', 'subject', 'content-type', 'reply-to', 'message-id',
-        'received', 'content-transfer-encoding', 'return-path', 'x-mailer',
-      ].freeze
+      HeaderList = %w[from to date subject content-type reply-to message-id
+                      received content-transfer-encoding return-path x-mailer].freeze
       MultiHeads = { 'received' => true }.freeze
       IgnoreList = { 'dkim-signature' => true }.freeze
       Indicators = {
@@ -64,10 +63,11 @@ module Sisimai
         return nil if aftersplit.empty?
 
         # 2. Convert email headers from text to hash reference
-        headerargv = {}
-        headerargv['extheaders'] = ExtHeaders
-        headerargv['tryonfirst'] = []
-        headerargv['extrafield'] = argvs['field'] || []
+        headerargv = {
+          'extheaders' => ExtHeaders,
+          'tryonfirst' => [],
+          'extrafield' => argvs['field'] || [],
+        }
         processing['from']   = aftersplit['from']
         processing['header'] = Sisimai::Message::Email.headers(aftersplit['header'], headerargv)
 
@@ -115,7 +115,7 @@ module Sisimai
         modulelist = []
         tobeloaded = []
 
-        %w|load order|.each do |e|
+        %w[load order].each do |e|
           # The order of MTA modules specified by user
           next unless argvs.key?(e)
           next unless argvs[e].is_a? Array
@@ -130,7 +130,7 @@ module Sisimai
             begin
               require v.to_s.gsub('::', '/').downcase
             rescue LoadError
-              warn ' ***warning: Failed to load ' + v
+              warn ' ***warning: Failed to load ' << v
               next
             end
 
@@ -159,7 +159,7 @@ module Sisimai
         return {} if email.empty?
 
         email = email.scrub('?')
-        email = email.gsub(/\r\n/, "\n")  if email =~ /\r\n/
+        email = email.gsub(/\r\n/, "\n")  if email.include?("\r\n")
         email = email.gsub(/[ \t]+$/, '') if email =~ /[ \t]+$/
 
         hasdivided = email.split("\n")
@@ -167,7 +167,6 @@ module Sisimai
 
         readcursor = 0
         aftersplit = { 'from' => '', 'header' => '', 'body' => '' }
-        pseudofrom = 'MAILER-DAEMON Tue Feb 11 00:00:00 2014'
 
         if hasdivided[0][0, 5] == 'From '
           # From MAILER-DAEMON Tue Feb 11 00:00:00 2014
@@ -176,22 +175,20 @@ module Sisimai
         end
 
         # Split email data to headers and a body part.
-        hasdivided.each do |e|
+        while e = hasdivided.shift do
           # Split email data to headers and a body part.
           if readcursor & Indicators[:endof] > 0
             # The body part of the email
-            aftersplit['body'] += e + "\n"
-
+            aftersplit['body'] << e + "\n"
           else
             # The boundary for splitting headers and a body part does not
             # appeare yet.
             if e.empty?
               # Blank line, it is a boundary of headers and a body part
               readcursor |= Indicators[:endof] if readcursor & Indicators[:begin] > 0
-
             else
               # The header part of the email
-              aftersplit['header'] += e + "\n"
+              aftersplit['header'] << e + "\n"
               readcursor |= Indicators[:begin]
             end
           end
@@ -199,7 +196,7 @@ module Sisimai
         return {} if aftersplit['header'].empty?
         return {} if aftersplit['body'].empty?
 
-        aftersplit['from'] = pseudofrom if aftersplit['from'].empty?
+        aftersplit['from'] = 'MAILER-DAEMON Tue Feb 11 00:00:00 2014' if aftersplit['from'].empty?
         return aftersplit
       end
 
@@ -211,11 +208,11 @@ module Sisimai
       def self.headers(heads, argvs = {})
         return nil unless heads
 
-        currheader = ''
         allheaders = {}
         structured = {}
         extheaders = argvs['extheaders'] || []
         extrafield = argvs['extrafield'] || []
+        hasdivided = heads.split("\n")
 
         HeaderList.each { |e| structured[e] = nil  }
         HeaderList.each { |e| allheaders[e] = true }
@@ -226,7 +223,7 @@ module Sisimai
           extrafield.each { |e| allheaders[e.downcase] = true }
         end
 
-        heads.split("\n").each do |e|
+        while e = hasdivided.shift do
           # Convert email headers to hash
           if cv = e.match(/\A([^ ]+?)[:][ ]*(.*?)\z/)
             # split the line into a header name and a header content
@@ -242,7 +239,6 @@ module Sisimai
               rhs = rhs.tr("\t", ' ')
               rhs = rhs.squeeze(' ')
               structured[currheader] << rhs
-
             else
               # Other headers except "Received" and so on
               if extheaders[currheader]
@@ -254,7 +250,6 @@ module Sisimai
               end
               structured[currheader] = rhs
             end
-
           elsif cv = e.match(/\A[ \t]+(.+?)\z/)
             # Ignore header?
             next if IgnoreList[currheader]
@@ -262,11 +257,10 @@ module Sisimai
             # Header line continued from the previous line
             if structured[currheader].is_a? Array
               # Concatenate a header which have multi-lines such as 'Received'
-              structured[currheader][-1] += ' ' + cv[1]
-
+              structured[currheader][-1] << ' ' << cv[1]
             else
               structured[currheader] ||= ''
-              structured[currheader]  += ' ' + cv[1]
+              structured[currheader] << ' ' << cv[1]
             end
           end
         end
@@ -309,10 +303,9 @@ module Sisimai
         takenapart = {}
         hasdivided = heads.split("\n")
         previousfn = '' # Previous field name
-        borderline = '__MIME_ENCODED_BOUNDARY__'
         mimeborder = {}
 
-        hasdivided.each do |e|
+        while e = hasdivided.shift do
           # Header name as a key, The value of header as a value
           if cv = e.match(/\A([-0-9A-Za-z]+?)[:][ ]*(.*)\z/)
             # Header
@@ -323,28 +316,26 @@ module Sisimai
             next unless RFC822Head.key?(lhs)
             previousfn = lhs
             takenapart[previousfn] = rhs unless takenapart[previousfn]
-
           else
             # Continued line from the previous line
-            next unless e =~ /\A[ \t]+/
+            next unless e.start_with?(' ', "\t")
             next if previousfn.empty?
 
             # Concatenate the line if it is the value of required header
             if Sisimai::MIME.is_mimeencoded(e)
               # The line is MIME-Encoded test
-              takenapart[previousfn] += if previousfn == 'subject'
+              takenapart[previousfn] << if previousfn == 'subject'
                                           # Subject: header
-                                          borderline + e
+                                          BorderLine + e
                                         else
                                           # Is not Subject header
                                           e
                                         end
               mimeborder[previousfn] = true
-
             else
               # ASCII Characters only: Not MIME-Encoded
               e = e.lstrip
-              takenapart[previousfn]  += e
+              takenapart[previousfn] << e
               mimeborder[previousfn] ||= false
             end
           end
@@ -358,13 +349,12 @@ module Sisimai
             # The value of ``Subject'' header is including multibyte character,
             # is not MIME-Encoded text.
             v = 'MULTIBYTE CHARACTERS HAVE BEEN REMOVED'
-
           else
             # MIME-Encoded subject field or ASCII characters only
             r = []
             if mimeborder['subject']
               # split the value of Subject by borderline
-              v.split(borderline).each do |m|
+              v.split(BorderLine).each do |m|
                 # Insert value to the array if the string is MIME encoded text
                 r << m if Sisimai::MIME.is_mimeencoded(m)
               end
@@ -412,7 +402,7 @@ module Sisimai
         mesgformat = (mailheader['content-type'] || '').downcase
         ctencoding = (mailheader['content-transfer-encoding'] || '').downcase
 
-        if mesgformat =~ %r{text/(?:plain|html);?}
+        if mesgformat.start_with?('text/plain', 'text/html')
           # Content-Type: text/plain; charset=UTF-8
           if ctencoding == 'base64' || ctencoding == 'quoted-printable'
             # Content-Transfer-Encoding: base64
@@ -426,23 +416,23 @@ module Sisimai
                          end
           end
 
-          if mesgformat =~ %r|text/html;?|
+          if mesgformat.start_with?('text/html;')
             # Content-Type: text/html;...
             bodystring = Sisimai::String.to_plain(bodystring, true)
           end
-
         else
           # NOT text/plain
-          if bodystring =~ ReEncoding[:'quoted-print']
+          lowercased = bodystring.downcase
+          if lowercased =~ ReEncoding[:'quoted-print']
             # Content-Transfer-Encoding: quoted-printable
             bodystring = Sisimai::MIME.qprintd(bodystring, mailheader)
           end
 
-          if bodystring =~ ReEncoding[:'7bit-encoded'] &&
-             cv = bodystring.match(ReEncoding[:'some-iso2022'])
+          if lowercased =~ ReEncoding[:'7bit-encoded'] &&
+             cv = lowercased.match(ReEncoding[:'some-iso2022'])
             # Content-Transfer-Encoding: 7bit
             # Content-Type: text/plain; charset=ISO-2022-JP
-            unless cv[1].downcase =~ /(?:us-ascii|utf[-]?8)/
+            if ! cv[1].include?('us-ascii') && ! cv[1].include?('utf-8')
               bodystring = Sisimai::String.to_utf8(bodystring, cv[1])
             end
           end
@@ -460,7 +450,7 @@ module Sisimai
             }
             havecaught = hookmethod.call(p)
           rescue StandardError => ce
-            warn sprintf(' ***warning: Something is wrong in hook method :%s', ce.to_s)
+            warn ' ***warning: Something is wrong in hook method :' << ce.to_s
           end
         end
 
@@ -468,17 +458,17 @@ module Sisimai
         # Check whether or not the message is a bounce mail.
         # Pre-Process email body if it is a forwarded bounce message.
         # Get the original text when the subject begins from 'fwd:' or 'fw:'
-        if mailheader['subject'] =~ /\A[ \t]*fwd?:/i
+        if mailheader['subject'].downcase =~ /\A[ \t]*fwd?:/
           # Delete quoted strings, quote symbols(>)
           bodystring = bodystring.gsub(/^[>]+[ ]/m, '')
           bodystring = bodystring.gsub(/^[>]$/m, '')
         end
-        bodystring += EndOfEmail
-        haveloaded  = {}
-        scannedset  = nil
+        bodystring << EndOfEmail
+        haveloaded = {}
+        scannedset = nil
 
         catch :SCANNER do
-          loop do
+          while true
             # 1. Sisimai::ARF
             # 2. User-Defined Module
             # 3. MTA Module Candidates to be tried on first
@@ -498,7 +488,7 @@ module Sisimai
               begin
                 require r.gsub('::', '/').downcase
               rescue LoadError => ce
-                warn ' ***warning: Failed to load ' + ce.to_s
+                warn ' ***warning: Failed to load ' << ce.to_s
                 next
               end
               scannedset = Module.const_get(r).scan(mailheader, bodystring)
@@ -513,7 +503,7 @@ module Sisimai
               begin
                 require r.gsub('::', '/').downcase
               rescue LoadError => ce
-                warn ' ***warning: ' + ce.to_s
+                warn ' ***warning: ' << ce.to_s
                 next
               end
               scannedset = Module.const_get(r).scan(mailheader, bodystring)
@@ -531,10 +521,9 @@ module Sisimai
                 haveloaded[r] = true
                 throw :SCANNER if scannedset
               rescue => ce
-                warn ' ***warning: ' + ce.to_s
+                warn ' ***warning: ' << ce.to_s
                 next
               end
-
             end
 
             # When the all of Sisimai::Bite::Email::* modules did not return
@@ -560,3 +549,4 @@ module Sisimai
     end
   end
 end
+