sisimai 4.22.7 → 4.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e01dd134b0c8f9d55656ad506db438535c823b3
-  data.tar.gz: c0128b71dbe0e35ede76cbb36a05d2d361ea92fe
+  metadata.gz: 124512b04d19c1929badc41c4554e3b84d3ffd5d
+  data.tar.gz: 24cdb80d3079432a26ef72ef022e2eaba31dfb5a
 SHA512:
-  metadata.gz: a04b755a4f2bba636f2032f2f2f1c8b1f05a29e788a97b4497f62344e77019228f67bead30b01146642b064564f8cf60d060d0ebca04da1980ea266678e04707
-  data.tar.gz: 771e73f4af59f9e64cc8a2b44605092dfe611819ad7559cabf583fa048c928fea545be6f9a942952fc10f38927aabd62ab4c706067e85f6e8164556336b5fd7d
+  metadata.gz: 6365ec7dfc91737be04c9e61b8e735ef59f9c384cfe6e67cca83a864cbbd36e6fbde05772d1088bf0432f5f756f7596636da2ccba8561e5014d1752b6584b751
+  data.tar.gz: 9a62227d405f0c0f15a3a8a7d3ad3c5bfc95b7cc1af24be2fb8b5bdd8a6ad966cd5981554f912987d211642e9877f0351f5a74ed754ec3336a9dc17ca1b551bf

data/ChangeLog.md

@@ -3,6 +3,21 @@ RELEASE NOTES for Ruby version of Sisimai
 - releases: "https://github.com/sisimai/rb-Sisimai/releases"
 - download: "https://rubygems.org/gems/sisimai"
 
+v4.23.0
+--------------------------------------------------------------------------------
+- release: ""
+- version: "4.23.0"
+- changes:
+  - #124 Implement Sisimai::Mail::Memory class for reading bounce messages from
+    memory(variable).
+  - Update regular expression in Sisimai::Bite::Email::Office365 for detecting
+    failure on SMTP RCPT.
+  - #126 Fix awful bugs(NoMethodError) in Sisimai::Bite::Email::Biglobe, EZweb,
+    and KDDI. Thanks to @rinmu.
+  - #128 Less method calls: use method chain, bang method.
+  - Import commit  sisimai/p5-Sisimai@cccb4ef Some test code have been loosened
+    for UTC+13(Pacific/Tongatapu), UTC+14(Pacific/Kiritimati).
+
 v4.22.7
 --------------------------------------------------------------------------------
 - release: "Mon, 16 Jul 2018 13:02:54 +0900 (JST)"

data/README-JA.md

@@ -80,10 +80,10 @@ Install
 
 ```shell
 $ sudo gem install sisimai
-Fetching: sisimai-4.22.2.gem (100%)
-Successfully installed sisimai-4.22.2
-Parsing documentation for sisimai-4.22.2
-Installing ri documentation for sisimai-4.22.2
+Fetching: sisimai-4.23.0.gem (100%)
+Successfully installed sisimai-4.23.0
+Parsing documentation for sisimai-4.23.0
+Installing ri documentation for sisimai-4.23.0
 Done installing documentation for sisimai after 6 seconds
 1 gem installed
 ```
@@ -99,8 +99,8 @@ gem install bundle rake rspec coveralls
 ...
 4 gems installed
 bundle exec rake install
-sisimai 4.22.2 built to pkg/sisimai-4.22.2.gem.
-sisimai (4.22.2) installed.
+sisimai 4.23.0 built to pkg/sisimai-4.23.0.gem.
+sisimai (4.23.0) installed.
 ```
 
 Usage
@@ -116,6 +116,11 @@ Basic usage
 require 'sisimai'
 v = Sisimai.make('/path/to/mbox')       # or path to Maildir/
 
+# Beginning with v4.23.0, both make() and dump() method of Sisimai class can
+# read bounce messages from variable instead of a path to mailbox
+f = File.open('/path/to/mbox', 'r');    # or path to Maildir/
+v = Sisimai.make(f.read)
+
 # If you want to get bounce records which reason is "delivered", set "delivered"
 # option to make() method like the following:
 v = Sisimai.make('/path/to/mbox', delivered: true)
@@ -239,8 +244,8 @@ Differences between Ruby version and Perl version
 | メール解析速度(1000通のメール)              | 3.75秒[2]      | 1.70秒        |
 | インストール方法                            | gem install    | cpanm, cpm    |
 | 依存モジュール数(コアモジュールを除く)      | 1モジュール    | 2モジュール   |
-| LOC:ソースコードの行数                      | 12000行        | 8600行        |
-| テスト件数(spec/,t/,xt/ディレクトリ)        | 217000件       | 235000件      |
+| LOC:ソースコードの行数                      | 11700行        | 8500行        |
+| テスト件数(spec/,t/,xt/ディレクトリ)        | 218000件       | 236000件      |
 | ライセンス                                  | 二条項BSD      | 二条項BSD     |
 | 開発会社によるサポート契約                  | 準備中         | 提供中        |
 

data/README.md

@@ -85,10 +85,10 @@ Install
 
 ```shell
 $ sudo gem install sisimai
-Fetching: sisimai-4.22.2.gem (100%)
-Successfully installed sisimai-4.22.2
-Parsing documentation for sisimai-4.22.2
-Installing ri documentation for sisimai-4.22.2
+Fetching: sisimai-4.23.0.gem (100%)
+Successfully installed sisimai-4.23.0
+Parsing documentation for sisimai-4.23.0
+Installing ri documentation for sisimai-4.23.0
 Done installing documentation for sisimai after 6 seconds
 1 gem installed
 ```
@@ -104,8 +104,8 @@ gem install bundle rake rspec coveralls
 ...
 4 gems installed
 bundle exec rake install
-sisimai 4.22.2 built to pkg/sisimai-4.22.2.gem.
-sisimai (4.22.2) installed.
+sisimai 4.23.0 built to pkg/sisimai-4.23.0.gem.
+sisimai (4.23.0) installed.
 ```
 
 Usage
@@ -121,6 +121,11 @@ messages like following.
 require 'sisimai'
 v = Sisimai.make('/path/to/mbox')       # or path to Maildir/
 
+# Beginning with v4.23.0, both make() and dump() method of Sisimai class can
+# read bounce messages from variable instead of a path to mailbox
+f = File.open('/path/to/mbox', 'r');    # or path to Maildir/
+v = Sisimai.make(f.read)
+
 # If you want to get bounce records which reason is "delivered", set "delivered"
 # option to make() method like the following:
 v = Sisimai.make('/path/to/mbox', delivered: true)
@@ -222,7 +227,7 @@ Output example
 ![](https://libsisimai.org/static/images/demo/sisimai-dump-02.gif)
 
 ```json
-[{"recipient": "kijitora@example.jp", "addresser": "shironeko@1jo.example.org", "feedbacktype": "", "action": "failed", "subject": "Nyaaaaan", "smtpcommand": "DATA", "diagnosticcode": "550 Unknown user kijitora@example.jp", "listid": "", "destination": "example.jp", "smtpagent": "Email::Courier", "lhost": "1jo.example.org", "deliverystatus": "5.0.0", "timestamp": 1291954879, "messageid": "201012100421.oBA4LJFU042012@1jo.example.org", "diagnostictype": "SMTP", "timezoneoffset": "+0900", "reason": "filtered", "token": "ce999a4c869e3f5e4d8a77b2e310b23960fb32ab", "alias": "", "senderdomain": "1jo.example.org", "rhost": "mfsmax.example.jp"}, {"diagnostictype": "SMTP", "timezoneoffset": "+0900", "reason": "userunknown", "timestamp": 1381900535, "messageid": "E1C50F1B-1C83-4820-BC36-AC6FBFBE8568@example.org", "token": "9fe754876e9133aae5d20f0fd8dd7f05b4e9d9f0", "alias": "", "senderdomain": "example.org", "rhost": "mx.bouncehammer.jp", "action": "failed", "addresser": "kijitora@example.org", "recipient": "userunknown@bouncehammer.jp", "feedbacktype": "", "smtpcommand": "DATA", "subject": "バウンスメールのテスト(日本語)", "destination": "bouncehammer.jp", "listid": "", "diagnosticcode": "550 5.1.1 <userunknown@bouncehammer.jp>... User Unknown", "deliverystatus": "5.1.1", "lhost": "p0000-ipbfpfx00kyoto.kyoto.example.co.jp", "smtpagent": "Email::Sendmail"}]
+[{"action": "failed", "subject": "Nyaan", "catch": null, "token": "08acf78323edc7923a783c04749dd547ab45c433", "alias": "", "messageid": "201806090556.w595u8GZ093276@neko.example.jp", "listid": "", "smtpcommand": "MAIL", "smtpagent": "Email::Sendmail", "lhost": "localhost", "timezoneoffset": "+0900", "feedbacktype": "", "senderdomain": "neko.example.jp", "diagnostictype": "SMTP", "softbounce": 1, "deliverystatus": "5.0.0", "addresser": "kijitora@neko.example.jp", "diagnosticcode": "550 Unauthenticated senders not allowed", "timestamp": 1528523769, "destination": "example.com", "recipient": "sironeko@example.com", "reason": "securityerror", "replycode": "550", "rhost": "neko.example.jp"}]
 ```
 
 Sisimai Specification
@@ -243,8 +248,8 @@ and bounceHammer are available at
 | The speed of parsing email(1000 emails)     | 3.75s[2]       | 1.70s         |
 | How to install                              | gem install    | cpanm, cpm    |
 | Dependencies (Except core modules)          | 1 module       | 2 modules     |
-| LOC:Source lines of code                    | 12000 lines    | 8600 lines    |
-| The number of tests(spec/,t/,xt/) directory | 217000 tests   | 235000 tests  |
+| LOC:Source lines of code                    | 11700 lines    | 8500 lines    |
+| The number of tests(spec/,t/,xt/) directory | 218000 tests   | 236000 tests  |
 | License                                     | BSD 2-Clause   | BSD 2-Clause  |
 | Support Contract provided by Developer      | Coming soon    | Available     |
 

data/lib/sisimai.rb

@@ -26,20 +26,17 @@ module Sisimai
     def make(argv0, **argv1)
       return nil unless argv0
 
-      require 'sisimai/data'
-      require 'sisimai/message'
-
       input = argv1[:input] || nil
       field = argv1[:field] || []
       raise ' ***error: "field" accepts an array only' unless field.is_a? Array
 
       unless input
+        klass = argv0.class
         # "input" did not specified, try to detect automatically.
-        if argv0.is_a?(::String) || argv0.is_a?(IO)
-          # The argument may be a path to email
+        if klass == ::String || klass == IO
+          # The argument may be a path to email OR an email text
           input = 'email'
-
-        elsif argv0.is_a?(Array) || argv0.is_a?(Hash)
+        elsif klass == Array || klass == Hash
           # The argument may be a decoded JSON object
           input = 'json'
         end
@@ -49,6 +46,8 @@ module Sisimai
       hookmethod = argv1[:hook] || nil
       bouncedata = []
 
+      require 'sisimai/data'
+      require 'sisimai/message'
       if input == 'email'
         # Path to mailbox or Maildir/, or STDIN: 'input' => 'email'
         require 'sisimai/mail'
@@ -64,7 +63,7 @@ module Sisimai
           methodargv = { data: mesg, hook: hookmethod, input: 'email', delivered: delivered1 }
           data = Sisimai::Data.make(methodargv)
           next unless data
-          bouncedata.concat(data) if data.size > 0
+          bouncedata += data unless data.empty?
         end
 
       elsif input == 'json'
@@ -90,14 +89,14 @@ module Sisimai
           data = Sisimai::Data.make(methodargv)
 
           next unless data
-          bouncedata.concat(data) if data.size > 0
+          bouncedata += data unless data.empty?
         end
       else
         # The value of "input" neither "email" nor "json"
         raise ' ***error: invalid value of "input"'
       end
 
-      return nil if bouncedata.size.zero?
+      return nil if bouncedata.empty?
       return bouncedata
     end
 
@@ -159,8 +158,8 @@ module Sisimai
       names = Sisimai::Reason.index
 
       # These reasons are not included in the results of Sisimai::Reason.index
-      names.concat(%w[Delivered Feedback Undefined Vacation])
-      names.each do |e|
+      names += %w[Delivered Feedback Undefined Vacation]
+      while e = names.shift do
         # Call .description() method of Sisimai::Reason::*
         r = 'Sisimai::Reason::' << e
         require r.gsub('::', '/').downcase

data/lib/sisimai/address.rb

@@ -8,7 +8,6 @@ module Sisimai
       :'quoted-string' => (1 << 1),    # "Neko, Nyaan"
       :'comment-block' => (1 << 2),    # (neko)
     }
-
     @@undisclosed = 'libsisimai.org.invalid'
 
     # Return pseudo recipient or sender address
@@ -67,7 +66,7 @@ module Sisimai
 
       while e = characters.shift do
         # Check each characters
-        if %w[< > ( ) " ,].detect { |r| r == e }
+        if %w[< > ( ) " ,].any? { |r| r == e }
           # The character is a delimiter character
           if e == ','
             # Separator of email addresses or not
@@ -88,7 +87,7 @@ module Sisimai
               end
             else
               # "Neko, Nyaan" <neko@nyaan.example.org> OR <"neko,nyaan"@example.org>
-              p.size > 0 ? (v[p] << e) : (v[:name] << e)
+              p.empty? ? (v[:name] << e) : (v[p] << e)
             end
             next
           end # End of if(',')
@@ -96,7 +95,7 @@ module Sisimai
           if e == '<'
             # <: The beginning of an email address or not
             if v[:address].size > 0
-              p.size > 0 ? (v[p] << e) : (v[:name] << e)
+              p.empty?  ? (v[:name] << e) : (v[p] << e)
             else
               # <neko@nyaan.example.org>
               readcursor |= Indicators[:'email-address']
@@ -116,7 +115,7 @@ module Sisimai
               p = ''
             else
               # a comment block or a display name
-              p.size > 0 ? (v[:comment] << e) : (v[:name] << e)
+              p.empty? ? (v[:name] << e) : (v[:comment] << e)
             end
             next
           end # End of if('>')
@@ -201,7 +200,7 @@ module Sisimai
           end # End of if('"')
         else
           # The character is not a delimiter
-          p.size > 0 ? (v[p] << e) : (v[:name] << e)
+          p.empty? ? (v[:name] << e) : (v[p] << e)
           next
         end
       end
@@ -220,7 +219,7 @@ module Sisimai
           v[:address] = v[:name]
         end
 
-        if v[:address].size > 0
+        unless v[:address].empty?
           # Remove the comment from the address
           if cv = v[:address].match(/(.*)([(].+[)])(.*)/)
             # (nyaan)nekochan@example.org, nekochan(nyaan)cat@example.org or
@@ -243,15 +242,9 @@ module Sisimai
 
         # Remove angle brackets, other brackets, and quotations: []<>{}'`
         # except a domain part is an IP address like neko@[192.0.2.222]
-        e[:address] = e[:address].sub(/\A[\[<{('`]/, '')
-        e[:address] = e[:address].sub(/['`>})]\z/, '')
-        e[:address] = e[:address].chomp(']') unless e[:address] =~ /[@]\[[0-9A-Za-z:\.]+\]\z/
-
-        unless e[:address] =~ /\A["].+["][@]/
-          # Remove double-quotations
-          e[:address] = e[:address].sub(/\A["]/, '')
-          e[:address] = e[:address].chomp('"')
-        end
+        e[:address] = e[:address].sub(/\A[\[<{('`]/, '').sub(/['`>})]\z/, '')
+        e[:address].chomp!(']') unless e[:address] =~ /[@]\[[0-9A-Za-z:\.]+\]\z/
+        e[:address] = e[:address].sub(/\A["]/, '').chomp('"') unless e[:address] =~ /\A["].+["][@]/
 
         if addrs
           # Almost compatible with parse() method, returns email address only
@@ -259,14 +252,11 @@ module Sisimai
           e.delete(:comment)
         else
           # Remove double-quotations, trailing spaces.
-          [:name, :comment].each do |f|
-            e[f] = e[f].strip
-          end
+          [:name, :comment].each { |f| e[f].strip! }
           e[:comment] = '' unless e[:comment] =~ /\A[(].+[)]/
-
-          e[:name] = e[:name].squeeze(' ')     unless e[:name] =~ /\A["].+["]\z/
-          e[:name] = e[:name].sub(/\A["]/, '') unless e[:name] =~ /\A["].+["][@]/
-          e[:name] = e[:name].chomp('"')
+          e[:name].squeeze!(' ')     unless e[:name] =~ /\A["].+["]\z/
+          e[:name].sub!(/\A["]/, '') unless e[:name] =~ /\A["].+["][@]/
+          e[:name].chomp!('"')
         end
         addrtables << e
       end

data/lib/sisimai/arf.rb

@@ -4,7 +4,6 @@ module Sisimai
     # Imported from p5-Sisimail/lib/Sisimai/ARF.pm
     class << self
       require 'sisimai/bite/email'
-      require 'sisimai/rfc5322'
 
       # http://tools.ietf.org/html/rfc5965
       # http://en.wikipedia.org/wiki/Feedback_loop_(email)
@@ -50,9 +49,9 @@ module Sisimai
           # Microsoft (Hotmail, MSN, Live, Outlook) uses its own report format.
           # Amazon SES Complaints bounces
           mfrom = %r{(?:
-             staff[@]hotmail[.]com\z
-            |complaints[@]email-abuse[.]amazonses[.]com\z
-            )
+             staff[@]hotmail[.]com
+            |complaints[@]email-abuse[.]amazonses[.]com
+            )\z
           }x
           if heads['from'] =~ mfrom && heads['subject'].include?('complaint about message from ')
             # From: staff@hotmail.com
@@ -78,7 +77,6 @@ module Sisimai
       def scan(mhead, mbody)
         return nil unless self.is_arf(mhead)
 
-        require 'sisimai/address'
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
         rfc822part = ''   # (String) message/rfc822-headers part
@@ -121,7 +119,7 @@ module Sisimai
         #      this specification is set to "1".
         #
         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]
@@ -129,7 +127,7 @@ module Sisimai
             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']
@@ -169,13 +167,13 @@ module Sisimai
             elsif e.start_with?(' ', "\t")
               # Continued line from the previous line
               rfc822part << e + "\n" if LongFields.key?(previousfn)
-              next if e.size > 0
+              next unless e.empty?
               rcptintext << e if previousfn == 'to'
             end
           else
             # Before "message/rfc822"
             next unless readcursor & Indicators[:deliverystatus] > 0
-            next unless e.size > 0
+            next if e.empty?
 
             # Feedback-Type: abuse
             # User-Agent: SomeGenerator/1.0
@@ -255,7 +253,7 @@ module Sisimai
           commondata[:diagnosis] << ' ' << arfheaders[:authres]
         end
 
-        if recipients.zero?
+        unless recipients > 0
           # Insert pseudo recipient address when there is no valid recipient
           # address in the message.
           dscontents[-1]['recipient'] = Sisimai::Address.undisclosed(:r)
@@ -265,7 +263,7 @@ module Sisimai
         unless rfc822part =~ /\bFrom: [^ ]+[@][^ ]+\b/
           # There is no "From:" header in the original message
           # Append the value of "Original-Mail-From" value as a sender address.
-          rfc822part << 'From: ' << commondata[:from] + "\n" if commondata[:from].size > 0
+          rfc822part << 'From: ' << commondata[:from] + "\n" unless commondata[:from].empty?
         end
 
         if cv = mhead['subject'].match(/complaint about message from (\d{1,3}[.]\d{1,3}[.]\d{1,3}[.]\d{1,3})/)
@@ -275,7 +273,7 @@ module Sisimai
             'This is a Microsoft email abuse report for an email message received from IP' << arfheaders[:rhost] + ' on ' << mhead['date']
         end
 
-        dscontents.map do |e|
+        dscontents.each do |e|
           if e['recipient'] =~ /\A[^ ]+[@]\z/
             # AOL = http://forums.cpanel.net/f43/aol-brutal-work-71473.html
             e['recipient'] = Sisimai::Address.s3s4(rcptintext)

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

@@ -29,9 +29,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/\A"MAILER-DAEMON"/,
         # :subject => %r/FAILURE NOTICE :/,
         return nil unless mhead['x-ahmailid']
@@ -45,7 +42,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 == StartingOf[:message][0]
               readcursor |= Indicators[:deliverystatus]
@@ -53,7 +50,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 == StartingOf[:rfc822][0]
               readcursor |= Indicators[:'message-rfc822']
@@ -71,7 +68,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 following addresses had permanent fatal errors -----
@@ -100,10 +97,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['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
           e['agent']     = self.smtpagent
           e.each_key { |a| e[a] ||= '' }

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

@@ -36,9 +36,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/\AMAILER-DAEMON[@]email[-]bounces[.]amazonses[.]com\z/,
         # :subject => %r/\ADelivery Status Notification [(]Failure[)]\z/,
         return nil if mhead['x-mailer'].to_s.start_with?('Amazon WorkMail')
@@ -46,7 +43,7 @@ module Sisimai::Bite::Email
         match  = 0
         match += 1 if mhead['x-aws-outgoing']
         match += 1 if mhead['x-ses-outgoing']
-        return nil if match.zero?
+        return nil unless match > 0
 
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
@@ -66,7 +63,7 @@ module Sisimai::Bite::Email
           havepassed << e
           p = havepassed[-2]
 
-          if readcursor.zero?
+          if readcursor == 0
             # Beginning of the bounce message or delivery status part
             if e.start_with?(StartingOf[:message][0], StartingOf[:message][1])
               readcursor |= Indicators[:deliverystatus]
@@ -74,7 +71,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 == StartingOf[:rfc822][0]
               readcursor |= Indicators[:'message-rfc822']
@@ -93,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?
 
             if connvalues == connheader.keys.size
@@ -165,7 +162,7 @@ module Sisimai::Bite::Email
               #
               if cv = e.match(/\AReporting-MTA:[ ]*[DNSdns]+;[ ]*(.+)\z/)
                 # Reporting-MTA: dns; mx.example.jp
-                next if connheader['lhost'].size > 0
+                next unless connheader['lhost'].empty?
                 connheader['lhost'] = cv[1].downcase
                 connvalues += 1
               end
@@ -174,7 +171,7 @@ module Sisimai::Bite::Email
           end
         end
 
-        if recipients.zero? && mbody =~ /notificationType/
+        if recipients == 0 && mbody =~ /notificationType/
           # Try to parse with Sisimai::Bite::JSON::AmazonSES module
           require 'sisimai/bite/json/amazonses'
           j = Sisimai::Bite::JSON::AmazonSES.scan(mhead, mbody)
@@ -185,17 +182,14 @@ module Sisimai::Bite::Email
             recipients = j['ds'].size
           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|
           # Set default values if each value is empty.
           connheader.each_key { |a| e[a] ||= connheader[a] || '' }
 
-          e['agent']     = self.smtpagent
-          e['diagnosis'] = e['diagnosis'].to_s.gsub(/\\n/, ' ')
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
+          e['agent'] = self.smtpagent
+          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'].to_s.gsub(/\\n/, ' '))
 
           if e['status'].to_s.start_with?('5.0.0', '5.1.0', '4.0.0', '4.1.0')
             # Get other D.S.N. value from the error message
@@ -206,12 +200,12 @@ module Sisimai::Bite::Email
               errormessage = cv[1]
             end
             pseudostatus = Sisimai::SMTP::Status.find(errormessage)
-            e['status'] = pseudostatus if pseudostatus.size > 0
+            e['status'] = pseudostatus unless pseudostatus.empty?
           end
 
           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