sisimai 4.20.1 → 4.20.2

data/lib/sisimai/arf.rb

@@ -128,7 +128,7 @@ module Sisimai
         #      this specification is set to "1".
         #
         hasdivided.each do |e|
-          if readcursor == 0
+          if readcursor.zero?
             # Beginning of the bounce message or delivery status part
             if e =~ Re1[:begin]
               readcursor |= Indicators[:deliverystatus]
@@ -267,7 +267,7 @@ module Sisimai
           commondata[:diagnosis] += ' ' + arfheaders[:authres]
         end
 
-        if recipients == 0
+        if recipients.zero?
           # Insert pseudo recipient address when there is no valid recipient
           # address in the message.
           dscontents[-1]['recipient'] = Sisimai::Address.undisclosed(:r)

data/lib/sisimai/ced/us/amazonses.rb

@@ -64,7 +64,7 @@ module Sisimai
 
           hasdivided.each do |e|
             # Find JSON string from the message body
-            next if e.size == 0
+            next if e.size.zero?
             break if e =~ /\A[-]{2}\z/
             break if e == '__END_OF_EMAIL_MESSAGE__'
 
@@ -121,12 +121,12 @@ module Sisimai
           return nil unless argvs.key?('notificationType')
 
           require 'sisimai/rfc5322'
-          dscontents = [Sisimai::CED.DELIVERYSTATUS];
+          dscontents = [Sisimai::CED.DELIVERYSTATUS]
           rfc822head = {}   # (Hash) Check flags for headers in RFC822 part
           recipients = 0    # (Integer) The number of 'Final-Recipient' header
           labeltable = {
-              :Bounce    => 'bouncedRecipients',
-              :Complaint => 'complainedRecipients',
+            :Bounce    => 'bouncedRecipients',
+            :Complaint => 'complainedRecipients',
           }
           v = nil
 
@@ -236,7 +236,7 @@ module Sisimai
             # or "Delivery".
             return nil
           end
-          return nil if recipients == 0
+          return nil if recipients.zero?
 
           dscontents.each do |e|
             e['agent'] = Sisimai::CED::US::AmazonSES.smtpagent

data/lib/sisimai/ced/us/sendgrid.rb

@@ -65,16 +65,16 @@ module Sisimai
 
             # Generate pseudo message/rfc822 part
             rfc822head = {
-                'to'   => argvs['email'],
-                'from' => Sisimai::Address.undisclosed('s'),
-                'date' => v['date'],
+              'to'   => argvs['email'],
+              'from' => Sisimai::Address.undisclosed('s'),
+              'date' => v['date'],
             }
           else
             # The value of $argvs->{'email'} does not seems to an email address
             return nil
           end
 
-          return nil if recipients == 0
+          return nil if recipients.zero?
           return { 'ds' => dscontents, 'rfc822' => rfc822head }
         end
 

data/lib/sisimai/data.rb

@@ -152,8 +152,6 @@ module Sisimai
 
       messageobj.ds.each do |e|
         # Create parameters for new() constructor.
-        o = nil # Sisimai::Data Object
-        r = nil # Reason text
         p = {
           'catch'          => messageobj.catch  || nil,
           'lhost'          => e['lhost']        || '',
@@ -306,7 +304,7 @@ module Sisimai
           p['diagnostictype'] ||= 'X-UNIX'
         else
           unless p['reason'] =~ /\A(?:feedback|vacation)\z/
-            p['diagnostictype'] ||= 'SMTP' 
+            p['diagnostictype'] ||= 'SMTP'
           end
         end
 
@@ -362,7 +360,6 @@ module Sisimai
           # Bounce message which reason is "feedback" or "vacation" does
           # not have the value of "deliverystatus".
           softorhard = nil
-          textasargv = nil
 
           if o.softbounce.to_s.empty?
             # The value is not set yet
@@ -381,10 +378,6 @@ module Sisimai
 
           if o.deliverystatus.empty?
             # Set pseudo status code
-            pseudocode = nil  # Pseudo delivery status code
-            getchecked = nil  # Permanent error or not
-            tmpfailure = nil  # Temporary error or not
-
             textasargv = sprintf('%s %s', o.replycode, p['diagnosticcode'])
             textasargv = textasargv.gsub(/\A[ ]/, '')
 

data/lib/sisimai/data/json.rb

@@ -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/datetime.rb

@@ -203,7 +203,7 @@ module Sisimai
         elsif cr = argv1.match(/\A(\d+|\d+[.]\d+)?([#{mathconsts}])([#{unitoftime}])?\z/)
           # 1pd, 1.5pw
           n = cr[1].to_f || 1
-          n = 1 if n.to_i == 0
+          n = 1 if n.to_i.zero?
           m = MathematicalConstant[cr[2].to_sym].to_f
           u = cr[3] || 'd'
           getseconds = n * m * TimeUnit[u.to_sym].to_f

data/lib/sisimai/mail/maildir.rb

@@ -58,9 +58,9 @@ module Sisimai
             emailinode = File.stat(emailindir).ino
             next if self.inodes.key?(emailinode)
 
-            filehandle = File.open(emailindir, 'r:UTF-8')
-            readbuffer = filehandle.read
-            filehandle.close
+            File.open(emailindir, 'r:UTF-8') do |f|
+              readbuffer = f.read
+            end
 
             self.inodes[emailinode] = 1
             self.path = emailindir

data/lib/sisimai/mda.rb

@@ -94,7 +94,7 @@ module Sisimai
       def scan(mhead, mbody)
         return nil unless mhead
         return nil unless mbody
-        return nil if mhead.keys.size == 0
+        return nil if mhead.keys.size.zero?
         return nil if mbody.empty?
 
         return nil unless mhead['from'] =~ Re0[:from]
@@ -109,7 +109,7 @@ module Sisimai
           # 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.size > 0
             next unless e =~ Re2
 
             Re1.each_key do |f|

data/lib/sisimai/message.rb

@@ -26,6 +26,7 @@ module Sisimai
     # @param         [Hash] argvs       Module to be loaded
     # @options argvs [String] :data     Entire email message
     # @options argvs [Array]  :load     User defined MTA module list
+    # @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
@@ -35,6 +36,7 @@ module Sisimai
 
       email = data
       input = argvs[:input] || 'email'
+      field = argvs[:field] || []
       child = nil
 
       if input == 'email'
@@ -61,9 +63,11 @@ module Sisimai
         return nil
       end
 
-      methodargv = { 'data' => email, 'hook' => argvs[:hook] || nil }
-      datasource = nil
-
+      methodargv = {
+        'data'  => email,
+        'hook'  => argvs[:hook] || nil,
+        'field' => argvs[:field],
+      }
       [:load, :order].each do |e|
         # Order of MTA, MSP modules
         next unless argvs.key?(e)

data/lib/sisimai/message/email.rb

@@ -38,6 +38,7 @@ module Sisimai
       # @param         [Hash] argvs   Email data
       # @options argvs [String] data  Entire email message
       # @options argvs [Array]  load  User defined MTA module list
+      # @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        [Hash]         Resolved data structure
@@ -66,6 +67,7 @@ module Sisimai
         headerargv = {}
         headerargv['extheaders'] = ExtHeaders
         headerargv['tryonfirst'] = []
+        headerargv['extrafield'] = argvs['field'] || []
         processing['from']   = aftersplit['from']
         processing['header'] = Sisimai::Message::Email.headers(aftersplit['header'], headerargv)
 
@@ -214,16 +216,20 @@ module Sisimai
         allheaders = {}
         structured = {}
         extheaders = argvs['extheaders'] || []
+        extrafield = argvs['extrafield'] || []
 
         HeaderList.each { |e| structured[e] = nil  }
         HeaderList.each { |e| allheaders[e] = true }
         RFC3834Set.each { |e| allheaders[e] = true }
         MultiHeads.each_key { |e| structured[e.downcase] = [] }
         extheaders.each_key { |e| allheaders[e] = true }
+        if extrafield.size > 0
+          extrafield.each { |e| allheaders[e.downcase] = true }
+        end
 
         heads.split("\n").each do |e|
           # Convert email headers to hash
-          if cv = e.match(/\A([^ ]+?)[:][ ]*(.+?)\z/)
+          if cv = e.match(/\A([^ ]+?)[:][ ]*(.*?)\z/)
             # split the line into a header name and a header content
             lhs = cv[1]
             rhs = cv[2]
@@ -447,7 +453,7 @@ module Sisimai
         if hookmethod.is_a? Proc
           # Execute hook method
           begin
-            p = { 
+            p = {
               'datasrc' => 'email',
               'headers' => mailheader,
               'message' => bodystring,

data/lib/sisimai/mime.rb

@@ -122,7 +122,7 @@ module Sisimai
         # Decoded using unpack('M') entire body string when the boundary string
         # or "Content-Transfer-Encoding: quoted-printable" are not included in
         # the message body.
-        return argv1.unpack('M').first if boundary00.size == 0
+        return argv1.unpack('M').first if boundary00.size.zero?
         return argv1.unpack('M').first unless argv1 =~ ReE[:'quoted-print']
 
         boundary01 = Sisimai::MIME.boundary(heads['content-type'], 1)
@@ -144,7 +144,7 @@ module Sisimai
           # --=_gy7C4Gpes0RP4V5Bs9cK4o2Us2ZT57b-3OLnRN+4klS8dTmQ
           # Content-Type: text/plain; charset=iso-8859-15
           # Content-Transfer-Encoding: quoted-printable
-          if mimeinside 
+          if mimeinside
             # Quoted-Printable encoded text block
             if e =~ reboundary[:begin]
               # The next boundary string has appeared

data/lib/sisimai/msp/de/einsundeins.rb

@@ -55,7 +55,7 @@ module Sisimai
           v = nil
 
           hasdivided.each do |e|
-            if readcursor == 0
+            if readcursor.zero?
               # Beginning of the bounce message or delivery status part
               if e =~ Re1[:begin]
                 readcursor |= Indicators[:deliverystatus]
@@ -118,7 +118,7 @@ module Sisimai
               end
             end
           end
-          return nil if recipients == 0
+          return nil if recipients.zero?
           require 'sisimai/string'
 
           dscontents.map do |e|

data/lib/sisimai/msp/de/gmx.rb

@@ -57,7 +57,7 @@ module Sisimai
           v = nil
 
           hasdivided.each do |e|
-            if readcursor == 0
+            if readcursor.zero?
               # Beginning of the bounce message or delivery status part
               if e =~ Re1[:begin]
                 readcursor |= Indicators[:deliverystatus]
@@ -142,7 +142,7 @@ module Sisimai
             end
           end
 
-          return nil if recipients == 0
+          return nil if recipients.zero?
           require 'sisimai/string'
           require 'sisimai/smtp/status'
 

data/lib/sisimai/msp/jp/biglobe.rb

@@ -56,7 +56,7 @@ module Sisimai
           v = nil
 
           hasdivided.each do |e|
-            if readcursor == 0
+            if readcursor.zero?
               # Beginning of the bounce message or delivery status part
               if e =~ Re1[:begin]
                 readcursor |= Indicators[:deliverystatus]
@@ -125,7 +125,7 @@ module Sisimai
             end
           end
 
-          return nil if recipients == 0
+          return nil if recipients.zero?
           require 'sisimai/string'
 
           dscontents.map do |e|

data/lib/sisimai/msp/jp/ezweb.rb

@@ -102,7 +102,7 @@ module Sisimai
           ReFailure.each_key { |a| rxmessages.concat(ReFailure[a]) }
 
           hasdivided.each do |e|
-            if readcursor == 0
+            if readcursor.zero?
               # Beginning of the bounce message or delivery status part
               if e =~ Re1[:begin]
                 readcursor |= Indicators[:deliverystatus]
@@ -200,7 +200,7 @@ module Sisimai
               end
             end
           end
-          return nil if recipients == 0
+          return nil if recipients.zero?
 
           dscontents.map do |e|
             if e['alterrors'] && e['alterrors'].size > 0

data/lib/sisimai/msp/jp/kddi.rb

@@ -55,7 +55,7 @@ module Sisimai
           match += 1 if mhead['from']    =~ Re0[:from]
           match += 1 if mhead['reply-to'] && mhead['reply-to'] =~ Re0[:'reply-to']
           match += 1 if mhead['received'].find { |a| a =~ Re0[:received] }
-          return nil if match == 0
+          return nil if match.zero?
 
           require 'sisimai/string'
           require 'sisimai/address'
@@ -69,7 +69,7 @@ module Sisimai
           v = nil
 
           hasdivided.each do |e|
-            if readcursor == 0
+            if readcursor.zero?
               # Beginning of the bounce message or delivery status part
               if e =~ Re1[:begin]
                 readcursor |= Indicators[:deliverystatus]
@@ -128,7 +128,7 @@ module Sisimai
             end
           end
 
-          return nil if recipients == 0
+          return nil if recipients.zero?
           require 'sisimai/smtp/status'
 
           dscontents.map do |e|

data/lib/sisimai/msp/ru/mailru.rb

@@ -95,7 +95,7 @@ module Sisimai
           v = nil
 
           hasdivided.each do |e|
-            if readcursor == 0
+            if readcursor.zero?
               # Beginning of the bounce message or delivery status part
               if e =~ Re1[:begin]
                 readcursor |= Indicators[:deliverystatus]
@@ -172,7 +172,7 @@ module Sisimai
             end
           end
 
-          if recipients == 0
+          if recipients.zero?
             # Fallback for getting recipient addresses
             if mhead['x-failed-recipients']
               # X-Failed-Recipients: kijitora@example.jp
@@ -188,7 +188,7 @@ module Sisimai
               end
             end
           end
-          return nil if recipients == 0
+          return nil if recipients.zero?
 
           if mhead['received'].size > 0
             # Get the name of local MTA

data/lib/sisimai/msp/ru/yandex.rb

@@ -68,7 +68,7 @@ module Sisimai
             havepassed << e
             p = havepassed[-2]
 
-            if readcursor == 0
+            if readcursor.zero?
               # Beginning of the bounce message or delivery status part
               if e =~ Re1[:begin]
                 readcursor |= Indicators[:deliverystatus]
@@ -184,7 +184,7 @@ module Sisimai
 
             end
           end
-          return nil if recipients == 0
+          return nil if recipients.zero?
           require 'sisimai/string'
 
           dscontents.map do |e|

data/lib/sisimai/msp/uk/messagelabs.rb

@@ -73,7 +73,7 @@ module Sisimai
             havepassed << e
             p = havepassed[-2]
 
-            if readcursor == 0
+            if readcursor.zero?
               # Beginning of the bounce message or delivery status part
               if e =~ Re1[:begin]
                 readcursor |= Indicators[:deliverystatus]
@@ -187,7 +187,7 @@ module Sisimai
               end
             end
           end
-          return nil if recipients == 0
+          return nil if recipients.zero?
           require 'sisimai/string'
 
           dscontents.map do |e|

data/lib/sisimai/msp/us/amazonses.rb

@@ -55,12 +55,11 @@ module Sisimai
           return nil unless mbody
 
           match = 0
-          xmail = mhead['x-mailer'] || ''
-
           return nil if mhead['x-mailer'] =~ ReE[:'x-mailer']
+
           match += 1 if mhead['x-aws-outgoing']
           match += 1 if mhead['x-ses-outgoing']
-          return nil if match == 0
+          return nil if match.zero?
 
           dscontents = [Sisimai::MSP.DELIVERYSTATUS]
           hasdivided = mbody.split("\n")
@@ -80,7 +79,7 @@ module Sisimai
             havepassed << e
             p = havepassed[-2]
 
-            if readcursor == 0
+            if readcursor.zero?
               # Beginning of the bounce message or delivery status part
               if e =~ Re1[:begin]
                 readcursor |= Indicators[:deliverystatus]
@@ -192,7 +191,7 @@ module Sisimai
             end
           end
 
-          return nil if recipients == 0
+          return nil if recipients.zero?
           require 'sisimai/string'
           require 'sisimai/smtp/status'