sisimai 4.22.1 → 4.22.2

data/lib/sisimai/mail.rb

@@ -15,7 +15,7 @@ module Sisimai
 
     # Constructor of Sisimai::Mail
     # @param    [String] argv1        Path to mbox or Maildir/
-    # @return   [Sisimai::Mail, Nil]  Object or Undef if the argument was wrong
+    # @return   [Sisimai::Mail, Nil]  Object or nil if the argument was wrong
     def initialize(argv1)
       classname = nil
       parameter = { 'path' => argv1, 'type' => nil, 'mail' => nil }

data/lib/sisimai/mail/stdin.rb

@@ -13,8 +13,8 @@ module Sisimai
         :offset,  # [Integer]  Offset position for seeking
         :handle,  # [IO::File] File handle
       ]
-      @@roaccessors.each do |e| attr_reader   e end
-      @@rwaccessors.each do |e| attr_accessor e end
+      @@roaccessors.each { |e| attr_reader   e }
+      @@rwaccessors.each { |e| attr_accessor e }
 
       # Constructor of Sisimai::Mail::STDIN
       # @param    [IO::STDIN] stdin      Standard-In

data/lib/sisimai/mda.rb

@@ -5,7 +5,7 @@ module Sisimai
     class << self
       Re0 = {
         :from => %r/\A(?:Mail Delivery Subsystem|MAILER-DAEMON|postmaster)/i,
-      }
+      }.freeze
       Re1 = {
         # dovecot/src/deliver/deliver.c
         # 11: #define DEFAULT_MAIL_REJECTION_HUMAN_REASON \
@@ -16,7 +16,7 @@ module Sisimai
         :'maildrop'   => %r/\Amaildrop: /,
         :'vpopmail'   => %r/\Avdelivermail: /,
         :'vmailmgr'   => %r/\Avdeliver: /,
-      }
+      }.freeze
       Re2 = %r{\A(?>
          Your[ ]message[ ]to[ ].+[ ]was[ ]automatically[ ]rejected:\z
         |(?:mail[.]local|procmail|maildrop|vdelivermail|vdeliver):[ ]
@@ -78,7 +78,7 @@ module Sisimai
           }ix,
           :mailboxfull => %r/Delivery failed due to system quota violation/i,
         },
-      }
+      }.freeze
 
       # Parse message body and return reason and text
       # @param         [Hash] mhead       Message header of a bounce email
@@ -89,7 +89,7 @@ module Sisimai
       # @options mhead [String] others    Other required headers
       # @param         [String] mbody     Message body of a bounce email
       # @return        [Hash, Nil]        Bounce data list and message/rfc822 part
-      #                                   or Undef if it failed to parse or the
+      #                                   or nil if it failed to parse or the
       #                                   arguments are missing
       def scan(mhead, mbody)
         return nil unless mhead

data/lib/sisimai/message.rb

@@ -29,7 +29,7 @@ module Sisimai
     # @options argvs [Array]  :field    Email header names to be captured
     # @options argvs [Array]  :order    The order of MTA modules
     # @options argvs [Code]   :hook     Reference to callback method
-    # @return        [Sisimai::Message] Structured email data or Undef if each
+    # @return        [Sisimai::Message] Structured email data or nil if each
     #                                   value of the arguments are missing
     def initialize(data: '', **argvs)
       return nil if data.empty?

data/lib/sisimai/message/email.rb

@@ -1,9 +1,9 @@
 module Sisimai
-  # Sisimai::Message::Email convert bounce email text to data structure. It
-  # resolves an email text into an UNIX From line, the header part of the mail,
-  # delivery status, and RFC822 header part. When the email given as a argument
-  # of "new" method is not a bounce email, the method returns nil.
   class Message
+    # Sisimai::Message::Email convert bounce email text to data structure. It
+    # resolves an email text into an UNIX From line, the header part of the mail,
+    # delivery status, and RFC822 header part. When the email given as a argument
+    # of "new" method is not a bounce email, the method returns nil.
     class Email
       # Imported from p5-Sisimail/lib/Sisimai/Message/Email.pm
       require 'sisimai/arf'
@@ -18,17 +18,17 @@ module Sisimai
 
       EndOfEmail = Sisimai::String.EOM
       RFC822Head = Sisimai::RFC5322.HEADERFIELDS
-      RFC3834Set = Sisimai::RFC3834.headerlist.map { |e| e.downcase }
+      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',
-      ]
-      MultiHeads = { 'received' => true }
-      IgnoreList = { 'dkim-signature' => true }
+      ].freeze
+      MultiHeads = { 'received' => true }.freeze
+      IgnoreList = { 'dkim-signature' => true }.freeze
       Indicators = {
         :begin => (1 << 1),
         :endof => (1 << 2),
-      }
+      }.freeze
       DefaultSet = Sisimai::Order::Email.another
       SubjectTab = Sisimai::Order::Email.by('subject')
       ExtHeaders = Sisimai::Order::Email.headers
@@ -95,14 +95,13 @@ module Sisimai
         rfc822part = bouncedata['rfc822']
         rfc822part = aftersplit['body'] if rfc822part.empty?
 
-        if rfc822part.is_a? ::String
-          # The value returned from Sisimai::Bite::Email::* modules
-          processing['rfc822'] = Sisimai::Message::Email.takeapart(rfc822part)
-        else
-          # The value returned from Sisimai::Bite::JSON::* modules
-          processing['rfc822'] = rfc822part
-        end
-
+        processing['rfc822'] = if rfc822part.is_a? ::String
+                                 # The value returned from Sisimai::Bite::Email::* modules
+                                 Sisimai::Message::Email.takeapart(rfc822part)
+                               else
+                                 # The value returned from Sisimai::Bite::JSON::* modules
+                                 rfc822part
+                               end
         return processing
       end
 
@@ -333,14 +332,13 @@ module Sisimai
             # Concatenate the line if it is the value of required header
             if Sisimai::MIME.is_mimeencoded(e)
               # The line is MIME-Encoded test
-              if previousfn == 'subject'
-                # Subject: header
-                takenapart[previousfn] += borderline + e
-
-              else
-                # Is not Subject header
-                takenapart[previousfn] += e
-              end
+              takenapart[previousfn] += if previousfn == 'subject'
+                                          # Subject: header
+                                          borderline + e
+                                        else
+                                          # Is not Subject header
+                                          e
+                                        end
               mimeborder[previousfn] = true
 
             else
@@ -365,7 +363,7 @@ module Sisimai
             # MIME-Encoded subject field or ASCII characters only
             r = []
             if mimeborder['subject']
-              # split the value of Subject by $borderline
+              # split the value of Subject by borderline
               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)
@@ -419,14 +417,13 @@ module Sisimai
           if ctencoding == 'base64' || ctencoding == 'quoted-printable'
             # Content-Transfer-Encoding: base64
             # Content-Transfer-Encoding: quoted-printable
-            if ctencoding == 'base64'
-              # Content-Transfer-Encoding: base64
-              bodystring = Sisimai::MIME.base64d(bodystring)
-
-            else
-              # Content-Transfer-Encoding: quoted-printable
-              bodystring = Sisimai::MIME.qprintd(bodystring)
-            end
+            bodystring = if ctencoding == 'base64'
+                           # Content-Transfer-Encoding: base64
+                           Sisimai::MIME.base64d(bodystring)
+                         else
+                           # Content-Transfer-Encoding: quoted-printable
+                           Sisimai::MIME.qprintd(bodystring)
+                         end
           end
 
           if mesgformat =~ %r|text/html;?|
@@ -463,7 +460,7 @@ module Sisimai
             }
             havecaught = hookmethod.call(p)
           rescue StandardError => ce
-            warn sprintf(" ***warning: Something is wrong in hook method :%s", ce.to_s)
+            warn sprintf(' ***warning: Something is wrong in hook method :%s', ce.to_s)
           end
         end
 

data/lib/sisimai/message/json.rb

@@ -1,7 +1,7 @@
 module Sisimai
-  # Sisimai::Message::JSON convert from a bounce object (decoded JSON) which is
-  # retrieved from some Cloud Email Deliveries API to data structure.
   class Message
+    # Sisimai::Message::JSON convert from a bounce object (decoded JSON) which is
+    # retrieved from some Cloud Email Deliveries API to data structure.
     class JSON
       # Imported from p5-Sisimail/lib/Sisimai/Message/JSON.pm
       require 'sisimai/order/json'
@@ -134,7 +134,7 @@ module Sisimai
             }
             havecaught = hookmethod.call(p)
           rescue StandardError => ce
-            warn sprintf(" ***warning: Something is wrong in hook method :%s", ce.to_s)
+            warn sprintf(' ***warning: Something is wrong in hook method :%s', ce.to_s)
           end
         end
 

data/lib/sisimai/mime.rb

@@ -13,7 +13,7 @@ module Sisimai
         :'with-charset' => %r/^Content[-]Type:[ ]*.+[;][ ]*charset=['"]?(.+?)['"]?$/i,
         :'only-charset' => %r/^[\s\t]+charset=['"]?(.+?)['"]?$/i,
         :'html-message' => %r|^Content-Type:[ ]*text/html;|mi,
-      }
+      }.freeze
 
       # Make MIME-Encoding and Content-Type related headers regurlar expression
       # @return   [Array] Regular expressions related to MIME encoding
@@ -64,7 +64,7 @@ module Sisimai
 
         argvs.each do |e|
           # Check and decode each element
-          e = e.lstrip.rstrip
+          e = e.strip
           e = e.delete('"')
 
           if self.is_mimeencoded(e)
@@ -98,9 +98,9 @@ module Sisimai
 
         if characterset && encodingname
           # utf8 => UTF-8
-          characterset = 'UTF-8' if characterset.upcase == 'UTF8'
+          characterset = 'UTF-8' if characterset.casecmp('UTF8').zero?
 
-          if characterset.upcase != 'UTF-8'
+          unless characterset.casecmp('UTF-8').zero?
             # Characterset is not UTF-8
             begin
               decodedtext1 = decodedtext1.encode('UTF-8', characterset)
@@ -182,8 +182,7 @@ module Sisimai
                   :until => Regexp.new(Regexp.escape(boundary01) + '\z')
                 }
               end
-            elsif cv = e.match(ReE[:'with-charset']) ||
-                  cv = e.match(ReE[:'only-charset'])
+            elsif cv = e.match(ReE[:'with-charset']) || e.match(ReE[:'only-charset'])
               # Content-Type: text/plain; charset=ISO-2022-JP
               encodename = cv[1]
               mimeinside = true if ctencoding

data/lib/sisimai/order/email.rb

@@ -1,9 +1,9 @@
 module Sisimai
-  # Sisimai::Order::Email makes optimized order list which include MTA modules
-  # to be loaded on first from MTA specific headers in the bounce mail headers
-  # such as X-Failed-Recipients.
-  # This module are called from only Sisimai::Message::Email.
   module Order
+    # Sisimai::Order::Email makes optimized order list which include MTA modules
+    # to be loaded on first from MTA specific headers in the bounce mail headers
+    # such as X-Failed-Recipients.
+    # This module are called from only Sisimai::Message::Email.
     module Email
       # Imported from p5-Sisimail/lib/Sisimai/Order/Email.pm
       class << self
@@ -14,14 +14,14 @@ module Sisimai
           # which is hard to code as regular expression
           'Sisimai::Bite::Email::Exim',
           'Sisimai::Bite::Email::Exchange2003',
-        ]
+        ].freeze
         EngineOrder2 = [
           # These modules have no MTA specific header and did not listed in the
           # following subject header based regular expressions.
           'Sisimai::Bite::Email::Exchange2007',
           'Sisimai::Bite::Email::Facebook',
           'Sisimai::Bite::Email::KDDI',
-        ]
+        ].freeze
         EngineOrder3 = [
           # These modules have no MTA specific header but listed in the following
           # subject header based regular expressions.
@@ -39,7 +39,7 @@ module Sisimai
           'Sisimai::Bite::Email::SendGrid',
           'Sisimai::Bite::Email::Bigfoot',
           'Sisimai::Bite::Email::X4',
-        ]
+        ].freeze
         EngineOrder4 = [
           # These modules have no MTA specific headers and there are few samples or
           # too old MTA
@@ -54,7 +54,7 @@ module Sisimai
           'Sisimai::Bite::Email::X2',
           'Sisimai::Bite::Email::X1',
           'Sisimai::Bite::Email::V5sendmail',
-        ]
+        ].freeze
         EngineOrder5 = [
           # These modules have one or more MTA specific headers but other headers
           # also required for detecting MTA name
@@ -64,7 +64,7 @@ module Sisimai
           'Sisimai::Bite::Email::MessageLabs',
           'Sisimai::Bite::Email::MailMarshalSMTP',
           'Sisimai::Bite::Email::MFILTER',
-        ]
+        ].freeze
         EngineOrder9 = [
           # These modules have one or more MTA specific headers
           'Sisimai::Bite::Email::Aol',
@@ -79,7 +79,7 @@ module Sisimai
           'Sisimai::Bite::Email::McAfee',
           'Sisimai::Bite::Email::Activehunter',
           'Sisimai::Bite::Email::SurfControl',
-        ]
+        ].freeze
 
         # This variable don't hold MTA name which have one or more MTA specific
         # header such as X-AWS-Outgoing, X-Yandex-Uniq.
@@ -148,7 +148,7 @@ module Sisimai
               'Sisimai::Bite::Email::Exim',
             ],
           },
-        }
+        }.freeze
 
         make_default_order = lambda do
           # Make default order of MTA modules to be loaded

data/lib/sisimai/order/json.rb

@@ -1,7 +1,7 @@
 module Sisimai
-  # Sisimai::Order::JSON - Make optimized order list for calling MTA modules
-  # for JSON formatted bounce objects
   module Order
+    # Sisimai::Order::JSON - Make optimized order list for calling MTA modules
+    # for JSON formatted bounce objects
     module JSON
       # Imported from p5-Sisimail/lib/Sisimai/Order/JSON.pm
       class << self
@@ -13,7 +13,7 @@ module Sisimai
               'Sisimai::Bite::JSON::AmazonSES',
             ],
           },
-        }
+        }.freeze
 
         make_default_order = lambda do
           # Make default order of MTA(JSON) modules to be loaded

data/lib/sisimai/reason.rb

@@ -86,7 +86,7 @@ module Sisimai
 
       # Detect the other bounce reason, fall back method for get()
       # @param    [Sisimai::Data] argvs   Parsed email object
-      # @return   [String, Undef]         Bounce reason or Undef if the argument
+      # @return   [String, Nil]           Bounce reason or nli if the argument
       #                                   is missing or invalid object
       # @see get
       def anotherone(argvs)
@@ -207,7 +207,7 @@ module Sisimai
         end
 
         if reasontext.empty?
-          # Check the value of $typestring
+          # Check the value of typestring
           if typestring == 'X-UNIX'
             # X-Unix; ...
             reasontext = 'mailererror'

data/lib/sisimai/reason/userunknown.rb

@@ -167,11 +167,10 @@ module Sisimai
                 next
               end
 
-              if r.match(diagnostic)
-                # Match with reason defined in Sisimai::Reason::* except UserUnknown.
-                matchother = true
-                break
-              end
+              next unless r.match(diagnostic)
+              # Match with reason defined in Sisimai::Reason::* except UserUnknown.
+              matchother = true
+              break
             end
 
             # Did not match with other message patterns

data/lib/sisimai/rfc3464.rb

@@ -19,7 +19,7 @@ module Sisimai
           |Warning:[ ]
           )
         }xi,
-      }
+      }.freeze
       Re1 = {
         :begin   => %r{\A(?>
            Content-Type:[ ]*(?:
@@ -40,7 +40,7 @@ module Sisimai
         }xi,
         :error   => %r/\A(?:[45]\d\d[ \t]+|[<][^@]+[@][^@]+[>]:?[ \t]+)/i,
         :command => %r/[ ](RCPT|MAIL|DATA)[ ]+command\b/,
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; 'Fallback Module for MTAs'; end
@@ -57,7 +57,7 @@ module Sisimai
       # @options mhead [String] others    Other required headers
       # @param         [String] mbody     Message body of a bounce email
       # @return        [Hash, Nil]        Bounce data list and message/rfc822 part
-      #                                   or Undef if it failed to parse or the
+      #                                   or nil if it failed to parse or the
       def scan(mhead, mbody)
         return nil unless mhead
         return nil unless mbody
@@ -95,7 +95,7 @@ module Sisimai
             end
           end
 
-          if readcursor & Indicators[:'message-rfc822'] == 0
+          if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
             if e =~ Re1[:rfc822]
               readcursor |= Indicators[:'message-rfc822']
@@ -429,19 +429,17 @@ module Sisimai
           # Try to get a recipient address from email headers
           rfc822list.each do |e|
             # Check To: header in the original message
-            if cv = e.match(/\ATo:\s*(.+)\z/)
-              r = Sisimai::Address.find(cv[1], true)
-              b = nil
-              next if r.empty?
+            next unless cv = e.match(/\ATo:\s*(.+)\z/)
+            r = Sisimai::Address.find(cv[1], true)
+            next if r.empty?
 
-              if dscontents.size == recipients
-                dscontents << Sisimai::Bite::Email.DELIVERYSTATUS
-              end
-              b = dscontents[-1]
-              b['recipient'] = r[0][:address]
-              b['agent'] = Sisimai::RFC3464.smtpagent + '::Fallback'
-              recipients += 1
+            if dscontents.size == recipients
+              dscontents << Sisimai::Bite::Email.DELIVERYSTATUS
             end
+            b = dscontents[-1]
+            b['recipient'] = r[0][:address]
+            b['agent'] = Sisimai::RFC3464.smtpagent + '::Fallback'
+            recipients += 1
           end
         end
 
@@ -456,7 +454,7 @@ module Sisimai
           if e.key?('alterrors') && e['alterrors'].size > 0
             # Copy alternative error message
             e['diagnosis'] ||= e['alterrors']
-            if e['diagnosis'] =~ /\A[-]+/ || e['diagnosis'] =~ /__\z/
+            if e['diagnosis'] =~ /\A[-]+/ || e['diagnosis'].end_with?('__')
               # Override the value of diagnostic code message
               e['diagnosis'] = e['alterrors'] if e['alterrors'].size > 0
             end

data/lib/sisimai/rfc3834.rb

@@ -15,8 +15,8 @@ module Sisimai
             |Out[ ]of[ ]Office:
           )
         /xi,
-      }
-      Re1 = { :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/ }
+      }.freeze
+      Re1 = { :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/ }.freeze
       Re2 = {
         :subject => %r/(?:
              SECURITY[ ]information[ ]for  # sudo
@@ -25,7 +25,7 @@ module Sisimai
         /x,
         :from    => %r/(?:root|postmaster|mailer-daemon)[@]/i,
         :to      => %r/root[@]/,
-      }
+      }.freeze
 
       def description; 'Detector for auto replied message'; end
       def smtpagent;   'RFC3834'; end
@@ -46,8 +46,8 @@ module Sisimai
       # @options mhead [Array]  received  Received headers
       # @options mhead [String] others    Other required headers
       # @param         [String] mbody     Message body of a bounce email
-      # @return        [Hash, Undef]      Bounce data list and message/rfc822 part
-      #                                   or Undef if it failed to parse or the
+      # @return        [Hash, Nil]        Bounce data list and message/rfc822 part
+      #                                   or nil if it failed to parse or the
       #                                   arguments are missing
       def scan(mhead, mbody)
         return nil unless mhead