sisimai 4.22.3 → 4.22.4

data/lib/sisimai/reason/contenterror.rb

@@ -11,9 +11,7 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/ContentError.pm
       class << self
         def text; return 'contenterror'; end
-        def description
-          return 'Email rejected due to a header format of the email'
-        end
+        def description; return 'Email rejected due to a header format of the email'; end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
@@ -29,12 +27,12 @@ module Sisimai
               )
             |routing[ ]loop[ ]detected[ ][-][-][ ]too[ ]many[ ]received:[ ]headers
             |this[ ]message[ ]contains?[ ](?:
-               invalid[ ]MIME[ ]headers
+               invalid[ ]mime[ ]headers
               |improperly[-]formatted[ ]binary[ ]content
               |text[ ]that[ ]uses[ ]unnecessary[ ]base64[ ]encoding
               )
             )
-          }xi
+          }x
 
           return true if argv1 =~ regex
           return false
@@ -45,9 +43,7 @@ module Sisimai
         # @return   [True,False]            true: rejected due to content error
         #                                   false: is not content error
         # @see      http://www.ietf.org/rfc/rfc2822.txt
-        def true(_argvs)
-          return nil
-        end
+        def true(_argvs); return nil; end
 
       end
     end

data/lib/sisimai/reason/delivered.rb

@@ -15,9 +15,7 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/Delivered.pm
       class << self
         def text; return 'delivered'; end
-        def description
-          return 'Email delivered successfully'
-        end
+        def description; return 'Email delivered successfully'; end
         def match;   return nil; end
         def true(*); return nil; end
       end

data/lib/sisimai/reason/exceedlimit.rb

@@ -10,9 +10,7 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/ExceedLimit.pm
       class << self
         def text; return 'exceedlimit'; end
-        def description
-          return 'Email rejected due to an email exceeded the limit'
-        end
+        def description; return 'Email rejected due to an email exceeded the limit'; end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
@@ -20,7 +18,7 @@ module Sisimai
         #                           true: Matched
         def match(argv1)
           return nil unless argv1
-          regex = %r/message too large/i
+          regex = %r/message too large/
 
           return true if argv1 =~ regex
           return false
@@ -35,25 +33,17 @@ module Sisimai
           return nil unless argvs
           return nil unless argvs.is_a? Sisimai::Data
           return nil unless argvs.deliverystatus.size > 0
-          return true if argvs.reason == Sisimai::Reason::ExceedLimit.text
+          return true if argvs.reason == 'exceedlimit'
 
+          # Delivery status code points exceedlimit.
+          # Status: 5.2.3
+          # Diagnostic-Code: SMTP; 552 5.2.3 Message size exceeds fixed maximum message size
           require 'sisimai/smtp/status'
-          diagnostic = argvs.diagnosticcode || ''
-          statuscode = argvs.deliverystatus
-          reasontext = Sisimai::Reason::ExceedLimit.text
-          v = false
-
-          if Sisimai::SMTP::Status.name(statuscode) == reasontext
-            # Delivery status code points exceedlimit.
-            # Status: 5.2.3
-            # Diagnostic-Code: SMTP; 552 5.2.3 Message size exceeds fixed maximum message size
-            v = true
-          else
-            # Check the value of Diagnosic-Code: header with patterns
-            v = true if Sisimai::Reason::ExceedLimit.match(diagnostic)
-          end
+          return true if Sisimai::SMTP::Status.name(argvs.deliverystatus) == 'exceedlimit'
 
-          return v
+          # Check the value of Diagnosic-Code: header with patterns
+          return true if match(argvs.diagnosticcode.downcase)
+          return false
         end
 
       end

data/lib/sisimai/reason/expired.rb

@@ -10,9 +10,7 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/Expired.pm
       class << self
         def text; return 'expired'; end
-        def description
-          return 'Delivery time has expired due to a connection failure'
-        end
+        def description; return 'Delivery time has expired due to a connection failure'; end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
@@ -24,7 +22,7 @@ module Sisimai
              connection[ ]timed[ ]out
             |could[ ]not[ ]find[ ]a[ ]gateway[ ]for
             |delivery[ ]time[ ]expired
-            |Failed[ ]to[ ]deliver[ ]to[ ]domain[ ].+[ ]after[ ]\d+[ ]tries
+            |failed[ ]to[ ]deliver[ ]to[ ]domain[ ].+[ ]after[ ]\d+[ ]tries
             |giving[ ]up[ ]on
             |it[ ]has[ ]not[ ]been[ ]collected[ ]after
             |message[ ](?:
@@ -35,9 +33,9 @@ module Sisimai
             |server[ ]did[ ]not[ ]respond
             |this[ ]message[ ]has[ ]been[ ]in[ ]the[ ]queue[ ]too[ ]long
             |was[ ]not[ ]reachable[ ]within[ ]the[ ]allowed[ ]queue[ ]period
-            |Your[ ]message[ ]could[ ]not[ ]be[ ]delivered[ ]for[ ]more[ ]than
+            |your[ ]message[ ]could[ ]not[ ]be[ ]delivered[ ]for[ ]more[ ]than
             )
-          }ix
+          }x
 
           return true if argv1 =~ regex
           return false
@@ -48,9 +46,7 @@ module Sisimai
         # @return   [True,False]            true: is expired
         #                                   false: is not expired
         # @see      http://www.ietf.org/rfc/rfc2822.txt
-        def true(_argvs)
-          return nil
-        end
+        def true(_argvs); return nil; end
 
       end
     end

data/lib/sisimai/reason/feedback.rb

@@ -6,9 +6,7 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/Feedback.pm
       class << self
         def text; return 'feedback'; end
-        def description
-          return 'Email forwarded to the sender as a complaint message from your mailbox provider'
-        end
+        def description; return 'Email forwarded to the sender as a complaint message from your mailbox provider'; end
         def match;   return nil; end
         def true(*); return nil; end
       end

data/lib/sisimai/reason/filtered.rb

@@ -13,9 +13,7 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/Filtered.pm
       class << self
         def text; return 'filtered'; end
-        def description
-          return 'Email rejected due to a header content after SMTP DATA command'
-        end
+        def description; return 'Email rejected due to a header content after SMTP DATA command'; end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
@@ -26,15 +24,15 @@ module Sisimai
           regex = %r{(?>
              because[ ]the[ ]recipient[ ]is[ ]only[ ]accepting[ ]mail[ ]from[ ]
               specific[ ]email[ ]addresses    # AOL Phoenix
-            |Bounced[ ]Address  # SendGrid|a message to an address has previously been Bounced.
+            |bounced[ ]address  # SendGrid|a message to an address has previously been Bounced.
             |due[ ]to[ ]extended[ ]inactivity[ ]new[ ]mail[ ]is[ ]not[ ]currently[ ]
               being[ ]accepted[ ]for[ ]this[ ]mailbox
-            |has[ ]restricted[ ]SMS[ ]e-mail    # AT&T
+            |has[ ]restricted[ ]sms[ ]e-mail    # AT&T
             |http://postmaster[.]facebook[.]com/.+refused[ ]due[ ]to[ ]recipient[ ]preferences # Facebook
-            |IS[ ]NOT[ ]ACCEPTING[ ]ANY[ ]MAIL
+            |is[ ]not[ ]accepting[ ]any[ ]mail
             |permanent[ ]failure[ ]for[ ]one[ ]or[ ]more[ ]recipients[ ][(].+:blocked[)]
-            |RESOLVER[.]RST[.]NotAuthorized # Microsoft Exchange
-            |This[ ]account[ ]is[ ]protected[ ]by
+            |resolver[.]rst[.]notauthorized # Microsoft Exchange
+            |this[ ]account[ ]is[ ]protected[ ]by
             |user[ ](?:
               not[ ]found  # Filter on MAIL.RU
              |reject
@@ -42,8 +40,8 @@ module Sisimai
             |we[ ]failed[ ]to[ ]deliver[ ]mail[ ]because[ ]the[ ]following[ ]address
                 [ ]recipient[ ]id[ ]refuse[ ]to[ ]receive[ ]mail    # Willcom
             )
-            |You[ ]have[ ]been[ ]blocked[ ]by[ ]the[ ]recipient
-          }ix
+            |you[ ]have[ ]been[ ]blocked[ ]by[ ]the[ ]recipient
+          }x
 
           return true if argv1 =~ regex
           return false
@@ -57,42 +55,26 @@ module Sisimai
         def true(argvs)
           return nil unless argvs
           return nil unless argvs.is_a? Sisimai::Data
-          return true if argvs.reason == Sisimai::Reason::Filtered.text
+          return true if argvs.reason == 'filtered'
 
           require 'sisimai/smtp/status'
           require 'sisimai/reason/userunknown'
           commandtxt = argvs.smtpcommand || ''
-          statuscode = argvs.deliverystatus || ''
-          diagnostic = argvs.diagnosticcode || ''
-          tempreason = Sisimai::SMTP::Status.name(statuscode)
-          reasontext = Sisimai::Reason::Filtered.text
-          v = false
+          diagnostic = argvs.diagnosticcode.downcase || ''
+          tempreason = Sisimai::SMTP::Status.name(argvs.deliverystatus)
+          alterclass = Sisimai::Reason::UserUnknown
 
           return false if tempreason == 'suspend'
-
-          if tempreason == reasontext
+          if tempreason == 'filtered'
             # Delivery status code points "filtered".
-            if Sisimai::Reason::UserUnknown.match(diagnostic) ||
-               Sisimai::Reason::Filtered.match(diagnostic)
-              v = true
-            end
-          else
-            # Check the value of Diagnostic-Code and the last SMTP command
-            if commandtxt != 'RCPT' && commandtxt != 'MAIL'
-              # Check the last SMTP command of the session.
-              if Sisimai::Reason::Filtered.match(diagnostic)
-                # Matched with a pattern in this class
-                v = true
+            return true if alterclass.match(diagnostic) || match(diagnostic)
 
-              else
-                # Did not match with patterns in this class,
-                # Check the value of "Diagnostic-Code" with other error patterns.
-                v = true if Sisimai::Reason::UserUnknown.match(diagnostic)
-              end
-            end
+          elsif commandtxt != 'RCPT' && commandtxt != 'MAIL'
+            # Check the value of Diagnostic-Code and the last SMTP command
+            return true if match(diagnostic)
+            return true if alterclass.match(diagnostic)
           end
-
-          return v
+          return false
         end
 
       end
@@ -100,4 +82,3 @@ module Sisimai
   end
 end
 
-

data/lib/sisimai/reason/hasmoved.rb

@@ -10,9 +10,7 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/HasMoved.pm
       class << self
         def text; return 'hasmoved'; end
-        def description
-          return "Email rejected due to user's mailbox has moved and is not forwarded automatically"
-        end
+        def description; return "Email rejected due to user's mailbox has moved and is not forwarded automatically"; end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
@@ -20,7 +18,7 @@ module Sisimai
         #                           true: Matched
         def match(argv1)
           return nil unless argv1
-          regex = %r/address[ ].+[ ]has[ ]been[ ]replaced[ ]by[ ]/ix
+          regex = %r/address[ ].+ has been replaced by /
 
           return true if argv1 =~ regex
           return false
@@ -34,8 +32,9 @@ module Sisimai
         def true(argvs)
           return nil unless argvs
           return nil unless argvs.is_a? Sisimai::Data
-          return true if argvs.reason == Sisimai::Reason::HasMoved.text
-          return true if Sisimai::Reason::HasMoved.match(argvs.diagnosticcode)
+
+          return true if argvs.reason == 'hasmoved'
+          return true if match(argvs.diagnosticcode.downcase)
           return false
         end
 
@@ -44,5 +43,3 @@ module Sisimai
   end
 end
 
-
-

data/lib/sisimai/reason/hostunknown.rb

@@ -9,9 +9,7 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/HostUnknown.pm
       class << self
         def text; return 'hostunknown'; end
-        def description
-          return "Delivery failed due to a domain part of a recipient's email address does not exist"
-        end
+        def description; return "Delivery failed due to a domain part of a recipient's email address does not exist"; end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
@@ -31,18 +29,18 @@ module Sisimai
               |unknown
               |unreachable
               )
-            |Mail[ ]domain[ ]mentioned[ ]in[ ]email[ ]address[ ]is[ ]unknown
+            |mail[ ]domain[ ]mentioned[ ]in[ ]email[ ]address[ ]is[ ]unknown
             |name[ ]or[ ]service[ ]not[ ]known
             |no[ ]such[ ]domain
             |recipient[ ](?:
                address[ ]rejected:[ ]unknown[ ]domain[ ]name
               |domain[ ]must[ ]exist
               )
-            |The[ ]account[ ]or[ ]domain[ ]may[ ]not[ ]exist
+            |the[ ]account[ ]or[ ]domain[ ]may[ ]not[ ]exist
             |unknown[ ]host
-            |Unrouteable[ ]address
+            |unrouteable[ ]address
             )
-          }ix
+          }x
 
           return true if argv1 =~ regex
           return false
@@ -56,26 +54,23 @@ module Sisimai
         def true(argvs)
           return nil unless argvs
           return nil unless argvs.is_a? Sisimai::Data
-          return true if argvs.reason == Sisimai::Reason::HostUnknown.text
+          return true if argvs.reason == 'hostunknown'
 
           require 'sisimai/smtp/status'
-          diagnostic = argvs.diagnosticcode || ''
+          diagnostic = argvs.diagnosticcode.downcase || ''
           statuscode = argvs.deliverystatus || ''
-          tempreason = Sisimai::SMTP::Status.name(statuscode)
-          reasontext = Sisimai::Reason::HostUnknown.text
-          v = false
 
-          if tempreason == reasontext
+          if Sisimai::SMTP::Status.name(statuscode) == 'hostunknown'
             # Status: 5.1.2
             # Diagnostic-Code: SMTP; 550 Host unknown
             require 'sisimai/reason/networkerror'
-            v = true unless Sisimai::Reason::NetworkError.match(diagnostic)
+            return true unless Sisimai::Reason::NetworkError.match(diagnostic)
           else
             # Check the value of Diagnosic-Code: header with patterns
-            v = true if Sisimai::Reason::HostUnknown.match(diagnostic)
+            return true if match(diagnostic)
           end
 
-          return v
+          return false
         end
 
       end
@@ -83,5 +78,3 @@ module Sisimai
   end
 end
 
-
-

data/lib/sisimai/reason/mailboxfull.rb

@@ -10,9 +10,7 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/MailboxFull.pm
       class << self
         def text; return 'mailboxfull'; end
-        def description
-          return "Email rejected due to a recipient's mailbox is full"
-        end
+        def description; return "Email rejected due to a recipient's mailbox is full"; end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
@@ -21,13 +19,13 @@ module Sisimai
         def match(argv1)
           return nil unless argv1
           regex = %r{(?>
-             Account[ ]disabled[ ]temporarly[ ]for[ ]exceeding[ ]receiving[ ]limits
+             account[ ]disabled[ ]temporarly[ ]for[ ]exceeding[ ]receiving[ ]limits
             |account[ ]is[ ](?:
                exceeding[ ]their[ ]quota
               |over[ ]quota
               |temporarily[ ]over[ ]quota
               )
-            |Boite[ ]du[ ]destinataire[ ]pleine.+[A-Z]{3}.+417
+            |boite[ ]du[ ]destinataire[ ]pleine.+[a-z]{3}.+417
             |delivery[ ]failed:[ ]over[ ]quota
             |disc[ ]quota[ ]exceeded
             |does[ ]not[ ]have[ ]enough[ ]space
@@ -52,7 +50,7 @@ module Sisimai
               |size[ ]limit[ ]exceeded
               )
             |maildir[ ](?:
-               delivery[ ]failed:[ ](?:User|Domain)disk[ ]quota[ ]?.*[ ]exceeded
+               delivery[ ]failed:[ ](?:user|domain)disk[ ]quota[ ]?.*[ ]exceeded
               |over[ ]quota
               )
             |mailfolder[ ]is[ ]full
@@ -66,7 +64,7 @@ module Sisimai
                reached[ ]disk[ ]quota
               |rejected:[ ]mailbox[ ]would[ ]exceed[ ]maximum[ ]allowed[ ]storage
               )
-            |The[ ](?:
+            |the[ ](?:
                recipient[ ]mailbox[ ]has[ ]exceeded[ ]its[ ]disk[ ]space[ ]limit
               |user[']s[ ]space[ ]has[ ]been[ ]used[ ]up
               |user[ ]you[ ]are[ ]trying[ ]to[ ]reach[ ]is[ ]over[ ]quota
@@ -84,7 +82,7 @@ module Sisimai
             |was[ ]automatically[ ]rejected:[ ]quota[ ]exceeded
             |would[ ]be[ ]over[ ]the[ ]allowed[ ]quota
             )
-          }ix
+          }x
 
           return true if argv1 =~ regex
           return false
@@ -99,25 +97,17 @@ module Sisimai
           return nil unless argvs
           return nil unless argvs.is_a? Sisimai::Data
           return nil unless argvs.deliverystatus.size > 0
-          return true if argvs.reason == Sisimai::Reason::MailboxFull.text
+          return true if argvs.reason == 'mailboxfull'
 
+          # Delivery status code points "mailboxfull".
+          # Status: 4.2.2
+          # Diagnostic-Code: SMTP; 450 4.2.2 <***@example.jp>... Mailbox Full
           require 'sisimai/smtp/status'
-          statuscode = argvs.deliverystatus
-          diagnostic = argvs.diagnosticcode || ''
-          reasontext = Sisimai::Reason::MailboxFull.text
-          v = false
-
-          if Sisimai::SMTP::Status.name(statuscode) == reasontext
-            # Delivery status code points "mailboxfull".
-            # Status: 4.2.2
-            # Diagnostic-Code: SMTP; 450 4.2.2 <***@example.jp>... Mailbox Full
-            v = true
-          else
-            # Check the value of Diagnosic-Code: header with patterns
-            v = true if Sisimai::Reason::MailboxFull.match(diagnostic)
-          end
+          return true if Sisimai::SMTP::Status.name(argvs.deliverystatus) == 'mailboxfull'
 
-          return v
+          # Check the value of Diagnosic-Code: header with patterns
+          return true if match(argvs.diagnosticcode.downcase)
+          return false
         end
 
       end