sisimai 4.22.7 → 4.23.0

data/lib/sisimai/bite/email/userdefined.rb

@@ -35,9 +35,6 @@ module Sisimai::Bite::Email
       #                                   part or nil if it failed to parse or
       #                                   the arguments are missing
       def scan(mhead, mbody)
-        return nil unless mhead
-        return nil unless mbody
-
         # 1. Check some value in mhead using regular expression or "==" operator
         #    whether the bounce message should be parsed by this module or not.
         #   - Matched 1 or more values: Proceed to the step 2.
@@ -47,7 +44,7 @@ module Sisimai::Bite::Email
         match += 1 if mhead['subject'].start_with?('Error Mail Report')
         match += 1 if mhead['from'].include?('Mail System')
         match += 1 if mhead['x-some-userdefined-header']
-        return nil if match.zero?
+        return nil unless match > 0
 
         # 2. Parse message body(mbody) of the bounce message. See some modules
         #    in lib/sisimai/bite/email directory to implement codes.
@@ -59,7 +56,7 @@ module Sisimai::Bite::Email
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
 
         while e = hasdivided.shift do
-          if readcursor.zero?
+          if readcursor == 0
             # Beginning of the bounce message or delivery status part
             if e =~ MarkingsOf[:message]
               readcursor |= Indicators[:deliverystatus]
@@ -67,7 +64,7 @@ module Sisimai::Bite::Email
             end
           end
 
-          if (readcursor & Indicators[:'message-rfc822']).zero?
+          if (readcursor & Indicators[:'message-rfc822']) == 0
             # Beginning of the original message part
             if e =~ MarkingsOf[:rfc822]
               readcursor |= Indicators[:'message-rfc822']
@@ -85,7 +82,7 @@ module Sisimai::Bite::Email
             rfc822list << e
           else
             # Before "message/rfc822"
-            next if (readcursor & Indicators[:deliverystatus]).zero?
+            next if (readcursor & Indicators[:deliverystatus]) == 0
             next if e.empty?
           end
         end
@@ -105,7 +102,7 @@ module Sisimai::Bite::Email
 
         # 3. Return nil when there is no recipient address which is failed to
         #    delivery in the bounce message
-        return nil if recipients.zero?
+        return nil unless recipients > 0
 
         # 4. Return the following variable.
         rfc822part = Sisimai::RFC5322.weedout(rfc822list)

data/lib/sisimai/bite/email/v5sendmail.rb

@@ -50,9 +50,6 @@ module Sisimai::Bite::Email
       #                                   part or nil if it failed to parse or
       #                                   the arguments are missing
       def scan(mhead, mbody)
-        return nil unless mhead
-        return nil unless mbody
-
         # :from => %r/\AMail Delivery Subsystem/,
         return nil unless mhead['subject'] =~ /\AReturned mail: [A-Z]/
 
@@ -69,7 +66,7 @@ module Sisimai::Bite::Email
         v = nil
 
         while e = hasdivided.shift do
-          if readcursor.zero?
+          if readcursor == 0
             # Beginning of the bounce message or delivery status part
             if e.include?(StartingOf[:message][0])
               readcursor |= Indicators[:deliverystatus]
@@ -77,7 +74,7 @@ module Sisimai::Bite::Email
             end
           end
 
-          if (readcursor & Indicators[:'message-rfc822']).zero?
+          if (readcursor & Indicators[:'message-rfc822']) == 0
             # Beginning of the original message part
             if e =~ MarkingsOf[:rfc822]
               readcursor |= Indicators[:'message-rfc822']
@@ -95,7 +92,7 @@ module Sisimai::Bite::Email
             rfc822list << e
           else
             # Before "message/rfc822"
-            next if (readcursor & Indicators[:deliverystatus]).zero?
+            next if (readcursor & Indicators[:deliverystatus]) == 0
             next if e.empty?
 
             #    ----- Transcript of session follows -----
@@ -147,9 +144,9 @@ module Sisimai::Bite::Email
             end
           end
         end
-        return nil if (readcursor & Indicators[:'message-rfc822']).zero?
+        return nil if (readcursor & Indicators[:'message-rfc822']) == 0
 
-        if recipients.zero?
+        if recipients == 0
           # Get the recipient address from the original message
           rfc822list.each do |e|
             next unless cv = e.match(/^To: (.+)$/m)
@@ -160,10 +157,9 @@ module Sisimai::Bite::Email
             break
           end
         end
-        return nil if recipients.zero?
+        return nil unless recipients > 0
 
-        require 'sisimai/string'
-        dscontents.map do |e|
+        dscontents.each do |e|
           errorindex += 1
           e['agent']   = self.smtpagent
           e['command'] = commandset[errorindex] || ''

data/lib/sisimai/bite/email/verizon.rb

@@ -24,22 +24,17 @@ module Sisimai::Bite::Email
       #                                   part or nil if it failed to parse or
       #                                   the arguments are missing
       def scan(mhead, mbody)
-        return nil unless mhead
-        return nil unless mbody
-
         match = -1
         while true
           # Check the value of "From" header
           # :'subject' => %r/Undeliverable Message/,
-          break unless mhead['received'].find { |a| a.include?('.vtext.com (') }
+          break unless mhead['received'].any? { |a| a.include?('.vtext.com (') }
           match = 1 if mhead['from'] == 'post_master@vtext.com'
           match = 0 if mhead['from'] =~ /[<]?sysadmin[@].+[.]vzwpix[.]com[>]?\z/
           break
         end
         return nil if match < 0
 
-        require 'sisimai/mime'
-        require 'sisimai/address'
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
         rfc822list = []     # (Array) Each line in message/rfc822 part string
@@ -66,14 +61,10 @@ module Sisimai::Bite::Email
             userunknown: ['550 - Requested action not taken: no such user here'],
           }
           boundary00 = Sisimai::MIME.boundary(mhead['content-type']) || ''
-
-          if boundary00.size > 0
-            # Convert to regular expression
-            markingsof[:rfc822] = Regexp.new('\A' << Regexp.escape('--' << boundary00 << '--') << '\z')
-          end
+          markingsof[:rfc822] = Regexp.new('\A' << Regexp.escape('--' << boundary00 << '--') << '\z') unless boundary00.empty?
 
           while e = hasdivided.shift do
-            if readcursor.zero?
+            if readcursor == 0
               # Beginning of the bounce message or delivery status part
               if e =~ markingsof[:message]
                 readcursor |= Indicators[:deliverystatus]
@@ -81,7 +72,7 @@ module Sisimai::Bite::Email
               end
             end
 
-            if (readcursor & Indicators[:'message-rfc822']).zero?
+            if (readcursor & Indicators[:'message-rfc822']) == 0
               # Beginning of the original message part
               if e =~ markingsof[:rfc822]
                 readcursor |= Indicators[:'message-rfc822']
@@ -99,7 +90,7 @@ module Sisimai::Bite::Email
               rfc822list << e
             else
               # Before "message/rfc822"
-              next if (readcursor & Indicators[:deliverystatus]).zero?
+              next if (readcursor & Indicators[:deliverystatus]) == 0
               next if e.empty?
 
               # Message details:
@@ -139,14 +130,10 @@ module Sisimai::Bite::Email
           markingsof = { rfc822:  %r/\A__BOUNDARY_STRING_HERE__\z/ }
           messagesof = { userunknown: ['No valid recipients for this MM'] }
           boundary00 = Sisimai::MIME.boundary(mhead['content-type'])
-
-          if boundary00.size > 0
-            # Convert to regular expression
-            markingsof[:rfc822] = Regexp.new('\A' << Regexp.escape('--' << boundary00 << '--') << '\z')
-          end
+          markingsof[:rfc822] = Regexp.new('\A' << Regexp.escape('--' << boundary00 << '--') << '\z') unless boundary00.empty?
 
           while e = hasdivided.shift do
-            if readcursor.zero?
+            if readcursor == 0
               # Beginning of the bounce message or delivery status part
               if e.start_with?(startingof[:message][0])
                 readcursor |= Indicators[:deliverystatus]
@@ -154,7 +141,7 @@ module Sisimai::Bite::Email
               end
             end
 
-            if (readcursor & Indicators[:'message-rfc822']).zero?
+            if (readcursor & Indicators[:'message-rfc822']) == 0
               # Beginning of the original message part
               if e =~ markingsof[:rfc822]
                 readcursor |= Indicators[:'message-rfc822']
@@ -172,7 +159,7 @@ module Sisimai::Bite::Email
               rfc822list << e
             else
               # Before "message/rfc822"
-              next if (readcursor & Indicators[:deliverystatus]).zero?
+              next if (readcursor & Indicators[:deliverystatus]) == 0
               next if e.empty?
 
               # Original Message:
@@ -206,25 +193,24 @@ module Sisimai::Bite::Email
             end
           end
         end
-        return nil if recipients.zero?
+        return nil unless recipients > 0
 
-        if !rfc822list.find { |a| a.start_with?('From: ') }
+        if rfc822list.none? { |a| a.start_with?('From: ') }
           # Set the value of "MAIL FROM:" or "From:"
           rfc822list << ('From: ' << senderaddr)
 
-        elsif !rfc822list.find { |a| a.start_with?('Subject: ') }
+        elsif rfc822list.none? { |a| a.start_with?('Subject: ') }
           # Set the value of "Subject:"
           rfc822list << ('Subject: ' << subjecttxt)
         end
 
-        require 'sisimai/string'
-        dscontents.map do |e|
+        dscontents.each do |e|
           e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
           messagesof.each_key do |r|
             # Verify each regular expression of session errors
-            next unless messagesof[r].find { |a| e['diagnosis'].include?(a) }
+            next unless messagesof[r].any? { |a| e['diagnosis'].include?(a) }
             e['reason'] = r.to_s
             break
           end

data/lib/sisimai/bite/email/x1.rb

@@ -28,8 +28,6 @@ module Sisimai::Bite::Email
       #                                   part or nil if it failed to parse or
       #                                   the arguments are missing
       def scan(mhead, mbody)
-        return nil unless mhead
-        return nil unless mbody
         return nil unless mhead['subject'].start_with?('Returned Mail: ')
         return nil unless mhead['from'].start_with?('"Mail Deliver System" ')
 
@@ -43,7 +41,7 @@ module Sisimai::Bite::Email
         v = nil
 
         while e = hasdivided.shift do
-          if readcursor.zero?
+          if readcursor == 0
             # Beginning of the bounce message or delivery status part
             if e =~ MarkingsOf[:message]
               readcursor |= Indicators[:deliverystatus]
@@ -51,7 +49,7 @@ module Sisimai::Bite::Email
             end
           end
 
-          if (readcursor & Indicators[:'message-rfc822']).zero?
+          if (readcursor & Indicators[:'message-rfc822']) == 0
             # Beginning of the original message part
             if e =~ MarkingsOf[:rfc822]
               readcursor |= Indicators[:'message-rfc822']
@@ -69,7 +67,7 @@ module Sisimai::Bite::Email
             rfc822list << e
           else
             # Before "message/rfc822"
-            next if (readcursor & Indicators[:deliverystatus]).zero?
+            next if (readcursor & Indicators[:deliverystatus]) == 0
             next if e.empty?
 
             # The original message was received at Thu, 29 Apr 2010 23:34:45 +0900 (JST)
@@ -97,10 +95,9 @@ module Sisimai::Bite::Email
             end
           end
         end
-        return nil if recipients.zero?
+        return nil unless recipients > 0
 
-        require 'sisimai/string'
-        dscontents.map do |e|
+        dscontents.each do |e|
           e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
           e['date']      = datestring || ''

data/lib/sisimai/bite/email/x2.rb

@@ -28,8 +28,6 @@ module Sisimai::Bite::Email
       #                                   part or nil if it failed to parse or
       #                                   the arguments are missing
       def scan(mhead, mbody)
-        return nil unless mhead
-        return nil unless mbody
         return nil unless mhead['from'].include?('MAILER-DAEMON@')
         return nil unless mhead['subject'] =~ %r/\A(?>Delivery failure|fail(?:ure|ed) delivery)/
 
@@ -42,7 +40,7 @@ module Sisimai::Bite::Email
         v = nil
 
         while e = hasdivided.shift do
-          if readcursor.zero?
+          if readcursor == 0
             # Beginning of the bounce message or delivery status part
             if e.start_with?(StartingOf[:message][0])
               readcursor |= Indicators[:deliverystatus]
@@ -50,7 +48,7 @@ module Sisimai::Bite::Email
             end
           end
 
-          if (readcursor & Indicators[:'message-rfc822']).zero?
+          if (readcursor & Indicators[:'message-rfc822']) == 0
             # Beginning of the original message part
             if e.start_with?(StartingOf[:rfc822][0])
               readcursor |= Indicators[:'message-rfc822']
@@ -68,7 +66,7 @@ module Sisimai::Bite::Email
             rfc822list << e
           else
             # Before "message/rfc822"
-            next if (readcursor & Indicators[:deliverystatus]).zero?
+            next if (readcursor & Indicators[:deliverystatus]) == 0
             next if e.empty?
 
             # Message from example.com.
@@ -94,10 +92,9 @@ module Sisimai::Bite::Email
             end
           end
         end
-        return nil if recipients.zero?
+        return nil unless recipients > 0
 
-        require 'sisimai/string'
-        dscontents.map do |e|
+        dscontents.each do |e|
           e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
           e.each_key { |a| e[a] ||= '' }

data/lib/sisimai/bite/email/x3.rb

@@ -28,8 +28,6 @@ module Sisimai::Bite::Email
       #                                   part or nil if it failed to parse or
       #                                   the arguments are missing
       def scan(mhead, mbody)
-        return nil unless mhead
-        return nil unless mbody
         return nil unless mhead['subject'].start_with?('Delivery status notification')
         return nil unless mhead['from'].start_with?('Mail Delivery System')
 
@@ -42,7 +40,7 @@ module Sisimai::Bite::Email
         v = nil
 
         while e = hasdivided.shift do
-          if readcursor.zero?
+          if readcursor == 0
             # Beginning of the bounce message or delivery status part
             if e.start_with?(StartingOf[:message][0])
               readcursor |= Indicators[:deliverystatus]
@@ -50,7 +48,7 @@ module Sisimai::Bite::Email
             end
           end
 
-          if (readcursor & Indicators[:'message-rfc822']).zero?
+          if (readcursor & Indicators[:'message-rfc822']) == 0
             # Beginning of the original message part
             if e.start_with?(StartingOf[:rfc822][0])
               readcursor |= Indicators[:'message-rfc822']
@@ -68,7 +66,7 @@ module Sisimai::Bite::Email
             rfc822list << e
           else
             # Before "message/rfc822"
-            next if (readcursor & Indicators[:deliverystatus]).zero?
+            next if (readcursor & Indicators[:deliverystatus]) == 0
             next if e.empty?
 
             # ============================================================================
@@ -111,11 +109,9 @@ module Sisimai::Bite::Email
             end
           end
         end
-        return nil if recipients.zero?
+        return nil unless recipients > 0
 
-        require 'sisimai/string'
-        require 'sisimai/smtp/status'
-        dscontents.map do |e|
+        dscontents.each do |e|
           e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
           e['status']    = Sisimai::SMTP::Status.find(e['diagnosis'])

data/lib/sisimai/bite/email/x4.rb

@@ -135,9 +135,6 @@ module Sisimai::Bite::Email
       #                                   part or nil if it failed to parse or
       #                                   the arguments are missing
       def scan(mhead, mbody)
-        return nil unless mhead
-        return nil unless mbody
-
         # Pre process email headers and the body part of the message which generated
         # by qmail, see http://cr.yp.to/qmail.html
         #   e.g.) Received: (qmail 12345 invoked for bounce); 29 Apr 2009 12:34:56 -0000
@@ -145,8 +142,8 @@ module Sisimai::Bite::Email
         tryto  = %r/\A[(]qmail[ ]+\d+[ ]+invoked[ ]+for[ ]+bounce[)]/
         match  = 0
         match += 1 if mhead['subject'].start_with?('failure notice', 'Permanent Delivery Failure')
-        match += 1 if mhead['received'].find { |a| a =~ tryto }
-        return nil if match.zero?
+        match += 1 if mhead['received'].any? { |a| a =~ tryto }
+        return nil unless match > 0
 
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
@@ -157,7 +154,7 @@ module Sisimai::Bite::Email
         v = nil
 
         while e = hasdivided.shift do
-          if readcursor.zero?
+          if readcursor == 0
             # Beginning of the bounce message or delivery status part
             if e =~ MarkingsOf[:message]
               readcursor |= Indicators[:deliverystatus]
@@ -165,7 +162,7 @@ module Sisimai::Bite::Email
             end
           end
 
-          if (readcursor & Indicators[:'message-rfc822']).zero?
+          if (readcursor & Indicators[:'message-rfc822']) == 0
             # Beginning of the original message part
             if e.start_with?(StartingOf[:rfc822][0], StartingOf[:rfc822][1])
               readcursor |= Indicators[:'message-rfc822']
@@ -183,7 +180,7 @@ module Sisimai::Bite::Email
             rfc822list << e
           else
             # Before "message/rfc822"
-            next if (readcursor & Indicators[:deliverystatus]).zero?
+            next if (readcursor & Indicators[:deliverystatus]) == 0
             next if e.empty?
 
             # <kijitora@example.jp>:
@@ -216,10 +213,9 @@ module Sisimai::Bite::Email
             end
           end
         end
-        return nil if recipients.zero?
+        return nil unless recipients > 0
 
-        require 'sisimai/string'
-        dscontents.map do |e|
+        dscontents.each do |e|
           e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
@@ -260,12 +256,12 @@ module Sisimai::Bite::Email
                 # Verify each regular expression of session errors
                 if e['alterrors']
                   # Check the value of "alterrors"
-                  next unless MessagesOf[r].find { |a| e['alterrors'].include?(a) }
+                  next unless MessagesOf[r].any? { |a| e['alterrors'].include?(a) }
                   e['reason'] = r.to_s
                 end
                 break if e['reason']
 
-                next unless MessagesOf[r].find { |a| e['diagnosis'].include?(a) }
+                next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
                 e['reason'] = r.to_s
                 break
               end
@@ -273,7 +269,7 @@ module Sisimai::Bite::Email
               unless e['reason']
                 FailOnLDAP.each_key do |r|
                   # Verify each regular expression of LDAP errors
-                  next unless FailOnLDAP[r].find { |a| e['diagnosis'].include?(a) }
+                  next unless FailOnLDAP[r].any? { |a| e['diagnosis'].include?(a) }
                   e['reason'] = r.to_s
                   break
                 end