sisimai 5.2.1-java → 5.4.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f60c3a775df2f0dd9cdd6a931b41586b0fbc1e00b087ba2e706095abbd780618
-  data.tar.gz: 6f49cc78ca3a42f589c6a7fe0b984da32ae784ae7ba7089b8d65f5cfcff1dd44
+  metadata.gz: 6e7c01c8568c5c1922dc71d9948d86eb8684bf18a981243b3e476a2de4d187f6
+  data.tar.gz: 0ca7b2415f6afc00b98f9e8e25b939f9962d0aba7c08f0c1689647a26f6329ec
 SHA512:
-  metadata.gz: 38e20b232b7d07e1f834e0ce874431914ec0cfa612513500aa7e8fc4e6f70c97632e4ac00d0ebddab008d5f2791b07c82da2b7b873a813fca137f5f47a901005
-  data.tar.gz: 2a6f2b65dd799da823f1840ea89a311520b131ce126c29e974106dcd03c0a749f6f38e43a3654e4d0630e31c49776ba95cca1dc77e26d02a7d75bb21a8824b58
+  metadata.gz: 201468479dbd8c7cf75d6ac3d7560e2ec9bf9badb6d9a847c5979264138477699450a15a9553e1e919f69dd8f369c9792af6fac56e2a07eea5940daa4a943273
+  data.tar.gz: 933f217ffb3bc6092e2f338a4df40291e11ad3c59b6bdb22e56ba53d9b88368ff21ab37687d2dc87873f3ce4327aede14913616312eff1ee716768a7c960b816

data/.github/workflows/rake-test.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        cruby: ["2.4", "3.3"]
+        cruby: ["2.4", "3.3", "3.4"]
     steps:
       - name: Checkout the repository(CRuby)
         uses: actions/checkout@v4

data/ChangeLog.md

@@ -3,6 +3,30 @@ RELEASE NOTES for Ruby version of Sisimai
 - releases: "https://github.com/sisimai/rb-sisimai/releases"
 - download: "https://rubygems.org/gems/sisimai"
 
+v5.4.0
+---------------------------------------------------------------------------------------------------
+- release: "Tue,  1 Jul 2025 20:22:22 +0900 (JST)"
+- version: "5.4.0"
+- changes:
+  - #341 #342 #345 Implement the new status code `5.7.515` as `authfailure` and other undocumented
+    status codes begin with `4.4.` as `systemerror` of Microsoft in `Sisimai::Rhost::Microsoft`.
+  - #343 #346 Some internal methods do not return `nil`, standardize return values to align with
+    zero-value principle.
+  - #347 Support a frozen string literal
+  - #349 #350 Implement new status codes of Google: `4.7.40` and `5.7.32` as `authfailure`.
+
+v5.3.0
+---------------------------------------------------------------------------------------------------
+- release: "Sat, 29 Mar 2025 06:04:41 +0900 (JST)"
+- version: "5.3.0"
+- changes:
+  - Collateral update due to the Go version of Sisimai's broken module path fix.
+  - Sisimai works on Ruby 3.4
+  - SMTP reply code improvements
+    - Update the list of SMTP reply codes in `Sisimai::SMTP::Reply`
+    - Implement `Sisimai::SMTP::Reply.associatedwith`
+    - Implement `Sisimai::SMTP::Status.is_explicit`
+
 v5.2.1
 ---------------------------------------------------------------------------------------------------
 - release: "Wed, 12 Mar 2025 06:50:25 +0900 (JST)"

data/Makefile

@@ -16,6 +16,7 @@ CP    := cp
 RM    := rm -f
 
 DEPENDENCIES  = bundle rake minitest
+RUBYARGUMENT  = --enable-frozen-string-literal
 .DEFAULT_GOAL = git-status
 REPOS_TARGETS = git-status git-push git-commit-amend git-tag-list git-diff git-reset-soft \
 				git-rm-cached git-branch
@@ -58,11 +59,11 @@ release:
 test: user-test author-test
 user-test:
 	# Suppress warning messages until v5.5.0
-	rake publictest 2> /dev/null
+	RUBYOPT="$(RUBYARGUMENT)" rake publictest 2> /dev/null
 
 author-test:
 	# Suppress warning messages until v5.5.0
-	rake privatetest 2> /dev/null
+	RUBYOPT="$(RUBYARGUMENT)" rake privatetest 2> /dev/null
 
 check:
 	find lib -type f -exec grep --color -E ' $$' {} /dev/null \;

data/README-JA.md

@@ -1,6 +1,6 @@
 ![](https://libsisimai.org/static/images/logo/sisimai-x01.png)
 [![License](https://img.shields.io/badge/license-BSD%202--Clause-orange.svg)](https://github.com/sisimai/rb-sisimai/blob/master/LICENSE)
-[![Ruby](https://img.shields.io/badge/ruby-v2.4.0--v3.3.0-red.svg)](https://www.ruby-lang.org/)
+[![Ruby](https://img.shields.io/badge/ruby-v2.4.0--v3.4.0-red.svg)](https://www.ruby-lang.org/)
 [![Gem Version](https://badge.fury.io/rb/sisimai.svg)](https://badge.fury.io/rb/sisimai)
 [![codecov](https://codecov.io/github/sisimai/rb-sisimai/graph/badge.svg?token=YGkyluNWiZ)](https://codecov.io/github/sisimai/rb-sisimai)
 
@@ -23,7 +23,7 @@
 > SisimaiはPerlモジュールまたはRuby Gemですが、PHPやPython、GoやRustなどJSONを読める言語であれば
 > どのような環境においても解析結果を得ることでバウンスの発生状況を捉えるのにとても有用です。
 
-- [**README(English)**](README.md)
+- [**README(🇬🇧)**](README.md)
 - [シシマイ? | What is Sisimai](#what-is-sisimai)
     - [主な特徴的機能 | The key features](#the-key-features-of-sisimai)
     - [コマンドラインでのデモ | Command line demo](#command-line-demo)
@@ -362,7 +362,7 @@ Sisimai 5.0.0から**Ruby 2.4以上**が必要になります。
 | ソースコードの行数                                   | 10,800 行          | 9,860 行            |
 | テストフレームワーク                                 | rspec              | minitest            |
 | テスト件数(spec/またはtest/ディレクトリ)             | 311,000 件         | 410,000 件          |
-| 1秒間に解析できるバウンスメール数[^4]                | 290 通             | 360 通              |
+| 1秒間に解析できるバウンスメール数[^4]                | 620 通             | 620 通              |
 | ライセンス                                           | 2条項BSD           | 2条項BSD            |
 | 開発会社による商用サポート                           | 提供中             | 提供中              |
 
@@ -447,7 +447,7 @@ Related sites
 
 See also
 ---------------------------------------------------------------------------------------------------
-* [README.md - README.md in English](https://github.com/sisimai/rb-sisimai/blob/master/README.md)
+* [README.md - README.md in English(🇬🇧)](https://github.com/sisimai/rb-sisimai/blob/master/README.md)
 * [RFC3463 - Enhanced Mail System Status Codes](https://tools.ietf.org/html/rfc3463)
 * [RFC3464 - An Extensible Message Format for Delivery Status Notifications](https://tools.ietf.org/html/rfc3464)
 * [RFC3834 - Recommendations for Automatic Responses to Electronic Mail](https://tools.ietf.org/html/rfc3834)

data/README.md

@@ -1,6 +1,6 @@
 ![](https://libsisimai.org/static/images/logo/sisimai-x01.png)
 [![License](https://img.shields.io/badge/license-BSD%202--Clause-orange.svg)](https://github.com/sisimai/rb-sisimai/blob/master/LICENSE)
-[![Ruby](https://img.shields.io/badge/ruby-v2.4.0--v3.3.0-red.svg)](https://www.ruby-lang.org/)
+[![Ruby](https://img.shields.io/badge/ruby-v2.4.0--v3.4.0-red.svg)](https://www.ruby-lang.org/)
 [![Gem Version](https://badge.fury.io/rb/sisimai.svg)](https://badge.fury.io/rb/sisimai)
 [![codecov](https://codecov.io/github/sisimai/rb-sisimai/graph/badge.svg?token=YGkyluNWiZ)](https://codecov.io/github/sisimai/rb-sisimai)
 
@@ -25,7 +25,7 @@
 > such as PHP, Python, Go, and Rust. By obtaining the analysis results, it is very useful for understanding
 > the bounce occurrence status. 
 
-- [**README-JA(日本語)**](README-JA.md)
+- [**README-JA(🇯🇵)**](README-JA.md)
 - [What is Sisimai](#what-is-sisimai)
     - [The key features of sisimai](#the-key-features-of-sisimai)
     - [Command line demo](#command-line-demo)
@@ -57,10 +57,10 @@
 
 What is Sisimai
 ===================================================================================================
-Sisimai is a library that decodes complex and diverse bounce emails and outputs the results of the
-delivery failure, such as the reason for the bounce and the recipient email address, in structured
-data. It is also possible to output in JSON format. The Ruby version of Sisimai is ported from the
-Perl version of Sisimai at [github.com/sisimai/p5-sisimai](https://github.com/sisimai/p5-sisimai/).
+Sisimai (pronounced /ɕi.ɕi.ma.i/) is a library that decodes complex and diverse bounce emails and
+outputs the results of the delivery failure, such as the reason for the bounce and the recipient
+email address, in structured data. It is also possible to output in JSON format. The Ruby version
+of Sisimai is ported from [the Perl version of Sisimai](https://github.com/sisimai/p5-sisimai/).
 
 ![](https://libsisimai.org/static/images/figure/sisimai-overview-2.png)
 
@@ -361,7 +361,7 @@ Beginning with v5.0.0, Sisimai requires **Ruby 2.4.0 or later.**
 | Source lines of code                                 | 10,300 lines       | 9,800 lines         |
 | Test frameworks                                      | rspec              | minitest            |
 | The number of tests in spec/ or test/ directory      | 311,000 tests      | 410,000 tests       | 
-| The number of bounce emails decoded/sec (CRuby)[^4]  | 290 emails         | 360 emails          |
+| The number of bounce emails decoded/sec (CRuby)[^4]  | 620 emails         | 620 emails          |
 | License                                              | 2 Clause BSD       | 2 Caluse BSD        |
 | Commercial support                                   | Available          | Available           |
 
@@ -450,7 +450,7 @@ Related Sites
 
 See also
 ---------------------------------------------------------------------------------------------------
-* [README-JA.md - README.md in Japanese(日本語)](https://github.com/sisimai/rb-sisimai/blob/master/README-JA.md)
+* [README-JA.md - README.md in Japanese(🇯🇵)](https://github.com/sisimai/rb-sisimai/blob/master/README-JA.md)
 * [RFC3463 - Enhanced Mail System Status Codes](https://tools.ietf.org/html/rfc3463)
 * [RFC3464 - An Extensible Message Format for Delivery Status Notifications](https://tools.ietf.org/html/rfc3464)
 * [RFC3834 - Recommendations for Automatic Responses to Electronic Mail](https://tools.ietf.org/html/rfc3834)

data/lib/sisimai/address.rb

@@ -12,7 +12,7 @@ module Sisimai
       #   dtext           = NO-WS-CTL /     ; Non white space controls
       #                     %d33-90 /       ; The rest of the US-ASCII
       #                     %d94-126        ;  characters not including "[", "]", or "\"
-      re             = { rfc5322: nil, ignored: nil, domain: nil }
+      re             = {rfc5322: nil, ignored: nil, domain: nil}
       atom           = %r([a-zA-Z0-9_!#\$\%&'*+/=?\^`{}~|\-]+)o
       quoted_string  = %r/"(?:\\[^\r\n]|[^\\"])*"/o
       domain_literal = %r/\[(?:\\[\x01-\x09\x0B-\x0c\x0e-\x7f]|[\x21-\x5a\x5e-\x7e])*\]/o
@@ -33,7 +33,7 @@ module Sisimai
       :'quoted-string' => (1 << 1),    # "Neko, Nyaan"
       :'comment-block' => (1 << 2),    # (neko)
     }.freeze
-    Delimiters  = { '<' => 1, '>' => 1, '(' => 1, ')' => 1, '"' => 1, ',' => 1 }.freeze
+    Delimiters  = {'<' => 1, '>' => 1, '(' => 1, ')' => 1, '"' => 1, ',' => 1}.freeze
 
     # Return pseudo recipient or sender address
     # @param    [Symbol] argv0  Address type: true = recipient, false = sender
@@ -45,12 +45,10 @@ module Sisimai
 
     # Check that the argument is an email address or not
     # @param    [String] email  Email address string
-    # @return   [True,False]    true: is an email address
-    #                           false: is not an email address
+    # @return   [Boolean]       true: is an email address, false: is not an email address
     def self.is_emailaddress(email)
-      return false unless email.is_a?(::String)
-      return false if email =~ %r/(?:[\x00-\x1f]|\x1f)/
-      return false if email.size > 254
+      return false if email.is_a?(::String) == false
+      return false if email =~ %r/(?:[\x00-\x1f]|\x1f)/ || email.size > 254
       return true  if email =~ Re[:ignored]
       return false
     end
@@ -60,9 +58,7 @@ module Sisimai
     # @return   [True,False]    true: mailer-daemon
     #                           false: Not mailer-daemon
     def self.is_mailerdaemon(argv0 = nil)
-      return false unless argv0
-      return false unless argv0.size > 0
-      return false unless argv0.is_a?(::String)
+      return false if argv0.to_s == "" || argv0.is_a?(::String) == false
 
       email = argv0.downcase
       postmaster = [
@@ -71,8 +67,7 @@ module Sisimai
       ].freeze
 
       return true if postmaster.any? { |a| email.include?(a) }
-      return true if email == 'mailer-daemon'
-      return true if email == 'postmaster'
+      return true if email == 'mailer-daemon' || email == 'postmaster'
       return false
     end
 
@@ -87,7 +82,7 @@ module Sisimai
       #   #=> [{ address: 'neko@example.org', name: 'Neko', comment: '(nyaan)'}]
       return nil unless argv1
 
-      emailtable = { address: '', name: '', comment: '' }
+      emailtable = {address: '', name: '', comment: ''}
       addrtables = []
       readbuffer = []
       readcursor = 0
@@ -109,20 +104,20 @@ module Sisimai
               # An email address has already been picked
               if readcursor & Indicators[:'comment-block'] > 0
                 # The cursor is in the comment block (Neko, Nyaan)
-                v[:comment] << e
+                v[:comment] += e
               elsif readcursor & Indicators[:'quoted-string'] > 0
                 # "Neko, Nyaan"
-                v[:name] << e
+                v[:name] += e
               else
                 # The cursor is not in neither the quoted-string nor the comment block
                 readcursor = 0  # reset cursor position
                 readbuffer << v
-                v = { address: '', name: '', comment: '' }
+                v = {address: '', name: '', comment: ''}
                 p = ''
               end
             else
               # "Neko, Nyaan" <neko@nyaan.example.org> OR <"neko,nyaan"@example.org>
-              p.empty? ? (v[:name] << e) : (v[p] << e)
+              p.empty? ? (v[:name] += e) : (v[p] += e)
             end
             next
           end # End of if(',')
@@ -130,11 +125,11 @@ module Sisimai
           if e == '<'
             # <: The beginning of an email address or not
             if v[:address].size > 0
-              p.empty? ? (v[:name] << e) : (v[p] << e)
+              p.empty? ? (v[:name] += e) : (v[p] += e)
             else
               # <neko@nyaan.example.org>
               readcursor |= Indicators[:'email-address']
-              v[:address] << e
+              v[:address] += e
               p = :address
             end
             next
@@ -146,11 +141,11 @@ module Sisimai
             if readcursor & Indicators[:'email-address'] > 0
               # <neko@example.org>
               readcursor &= ~Indicators[:'email-address']
-              v[:address] << e
+              v[:address] += e
               p = ''
             else
               # a comment block or a display name
-              p.empty? ? (v[:name] << e) : (v[:comment] << e)
+              p.empty? ? (v[:name] == e) : (v[:comment] -= e)
             end
             next
           end # End of if('>')
@@ -161,27 +156,27 @@ module Sisimai
               # <"neko(nyaan)"@example.org> or <neko(nyaan)@example.org>
               if v[:address].include?('"')
                 # Quoted local part: <"neko(nyaan)"@example.org>
-                v[:address] << e
+                v[:address] += e
               else
                 # Comment: <neko(nyaan)@example.org>
                 readcursor |= Indicators[:'comment-block']
-                v[:comment] << ' ' if v[:comment].end_with?(')')
-                v[:comment] << e
+                v[:comment] += ' ' if v[:comment].end_with?(')')
+                v[:comment] += e
                 p = :comment
               end
             elsif readcursor & Indicators[:'comment-block'] > 0
               # Comment at the outside of an email address (...(...)
-              v[:comment] << ' ' if v[:comment].end_with?(')')
-              v[:comment] << e
+              v[:comment] += ' ' if v[:comment].end_with?(')')
+              v[:comment] += e
 
             elsif readcursor & Indicators[:'quoted-string'] > 0
               # "Neko, Nyaan(cat)", Deal as a display name
-              v[:name] << e
+              v[:name] += e
             else
               # The beginning of a comment block
               readcursor |= Indicators[:'comment-block']
-              v[:comment] << ' ' if v[:comment].end_with?(')')
-              v[:comment] << e
+              v[:comment] += ' ' if v[:comment].end_with?(')')
+              v[:comment] += e
               p = :comment
             end
             next
@@ -193,22 +188,22 @@ module Sisimai
               # <"neko(nyaan)"@example.org> OR <neko(nyaan)@example.org>
               if v[:address].include?('"')
                 # Quoted string in the local part: <"neko(nyaan)"@example.org>
-                v[:address] << e
+                v[:address] += e
               else
                 # Comment: <neko(nyaan)@example.org>
                 readcursor &= ~Indicators[:'comment-block']
-                v[:comment] << e
+                v[:comment] += e
                 p = :address
               end
             elsif readcursor & Indicators[:'comment-block'] > 0
               # Comment at the outside of an email address (...(...)
               readcursor &= ~Indicators[:'comment-block']
-              v[:comment] << e
+              v[:comment] += e
               p = ''
             else
               # Deal as a display name
               readcursor &= ~Indicators[:'comment-block']
-              v[:name] << e
+              v[:name] += e
               p = ''
             end
             next
@@ -218,10 +213,10 @@ module Sisimai
             # The beginning or the end of a quoted-string
             if p.size > 0
               # email-address or comment-block
-              v[p] << e
+              v[p] += e
             else
               # Display name like "Neko, Nyaan"
-              v[:name] << e
+              v[:name] += e
               next unless readcursor & Indicators[:'quoted-string'] > 0
               next if v[:name].end_with?(%Q|\x5c"|) # "Neko, Nyaan \"...
               readcursor &= ~Indicators[:'quoted-string']
@@ -231,7 +226,7 @@ module Sisimai
           end # End of if('"')
         else
           # The character is not a delimiter
-          p.empty? ? (v[:name] << e) : (v[p] << e)
+          p.empty? ? (v[:name] += e) : (v[p] += e)
           next
         end
       end
@@ -283,7 +278,7 @@ module Sisimai
           e.delete(:comment)
         else
           # Remove double-quotations, trailing spaces.
-          [:name, :comment].each { |f| e[f].strip! }
+          [:name, :comment].each { |f| e[f] = e[f].strip }
           e[:comment] = '' unless e[:comment] =~ /\A[(].+[)]/
           e[:name].squeeze!(' ')     unless e[:name] =~ /\A["].+["]\z/
           e[:name].sub!(/\A["]/, '') unless e[:name] =~ /\A["].+["][@]/
@@ -301,8 +296,8 @@ module Sisimai
     # @return   [String]        Email address without comment, brackets
     # @example  s3s4('<neko@example.cat>') #=> 'neko@example.cat'
     def self.s3s4(input)
-      return nil unless input
-      return input unless input.is_a? Object::String
+      return "" if input.to_s == ""
+      return "" if input.is_a?(Object::String) == false
 
       addrs = Sisimai::Address.find(input, true) || []
       return input if addrs.empty?
@@ -315,8 +310,8 @@ module Sisimai
     # @example  Expand VERP address
     #   expand_verp('bounce+neko=example.org@example.org') #=> 'neko@example.org'
     def self.expand_verp(email)
-      return nil unless email.is_a? Object::String
-      return nil unless cv = email.split('@', 2).first.match(/\A[-\w]+?[+](\w[-.\w]+\w)[=](\w[-.\w]+\w)\z/)
+      return "" unless email.is_a? Object::String
+      return "" unless cv = email.split('@', 2).first.match(/\A[-\w]+?[+](\w[-.\w]+\w)[=](\w[-.\w]+\w)\z/)
       verp0 = cv[1] + '@' + cv[2]
       return verp0 if Sisimai::Address.is_emailaddress(verp0)
     end
@@ -327,10 +322,10 @@ module Sisimai
     # @example  Expand alias
     #   expand_alias('neko+straycat@example.org') #=> 'neko@example.org'
     def self.expand_alias(email)
-      return nil unless Sisimai::Address.is_emailaddress(email)
+      return "" unless Sisimai::Address.is_emailaddress(email)
 
       local = email.split('@')
-      return nil unless cv = local[0].match(/\A([-\w]+?)[+].+\z/)
+      return "" unless cv = local[0].match(/\A([-\w]+?)[+].+\z/)
       return cv[1] + '@' + local[1]
     end
 
@@ -347,11 +342,9 @@ module Sisimai
     # Constructor of Sisimai::Address
     # @param    [Hash] argvs        Email address, name, and other elements
     # @return   [Sisimai::Address]  Object or nil when the email address was not valid.
-    # @example  new({address: 'neko@example.org', name: 'Neko', comment: '(nyaan)')} # => Sisimai::Address object
+    # @example  new(address: 'neko@example.org', name: 'Neko', comment: '(nyaan)') # => Sisimai::Address object
     def initialize(argvs)
-      return nil unless argvs.is_a? Hash
-      return nil unless argvs[:address]
-      return nil if argvs[:address].empty?
+      return nil if argvs.is_a?(Hash) == false || argvs[:address].nil? || argvs[:address].empty?
 
       heads = ['<']
       tails = ['>', ',', '.', ';']
@@ -364,10 +357,10 @@ module Sisimai
         email = Sisimai::Address.expand_verp(argvs[:address])
         aname = nil
 
-        unless email
+        if email.empty?
           # Is not VERP address, try to expand the address as an alias
-          email = Sisimai::Address.expand_alias(argvs[:address]) || ''
-          aname = true unless email.empty?
+          email = Sisimai::Address.expand_alias(argvs[:address])
+          aname = true if email.empty? == false
         end
 
         if email.include?('@')
@@ -422,15 +415,11 @@ module Sisimai
 
     # Returns the value of address as String
     # @return [String] Email address
-    def to_json(*)
-      return self.address.to_s
-    end
+    def to_json(*); return self.address.to_s; end
 
     # Returns the value of address as String
     # @return [String] Email address
-    def to_s
-      return self.address.to_s
-    end
+    def to_s; return self.address.to_s; end
 
   end
 end

data/lib/sisimai/arf.rb

@@ -53,12 +53,9 @@ module Sisimai
           end
         end
 
-        while true
-          # X-Apple-Unsubscribe: true
-          break unless heads.has_key?("x-apple-unsubscribe")
-          return true if heads["x-apple-unsubscribe"] == "true"
-          break
-        end
+        # X-Apple-Unsubscribe: true
+        return false unless heads.has_key?("x-apple-unsubscribe")
+        return true  if heads["x-apple-unsubscribe"] == "true"
         return false
       end
 
@@ -70,7 +67,7 @@ module Sisimai
       def inquire(mhead, mbody)
         return nil unless self.is_arf(mhead)
 
-        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = dscontents[-1]
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
         bodyslices = emailparts[0].split("\n")
         reportpart = false
@@ -80,7 +77,6 @@ module Sisimai
         remotehost = ""   # The value of "Source-IP" field
         reportedby = ""   # The value of "Reporting-MTA" field
         anotherone = ""   # Other fields(append to Diagnosis)
-        v = dscontents[-1]
 
         # 3.1.  Required Fields
         #
@@ -115,13 +111,12 @@ module Sisimai
               # this is an autogenerated email abuse complaint regarding your network.
               next unless Sisimai::String.aligned(r, f)
               readcursor |= Indicators[:deliverystatus]
-              v["diagnosis"] << " " + e
+              v["diagnosis"] += " #{e}"
               break
             end
             next
           end
-          next unless readcursor & Indicators[:deliverystatus] > 0
-          next if e.empty?
+          next if (readcursor & Indicators[:deliverystatus]) > 0 || e.empty?
           if e == ReportFrom then reportpart = true; next; end
 
           if reportpart
@@ -158,12 +153,12 @@ module Sisimai
               #
               # Authentication-Results: mail.example.com;
               #   spf=fail smtp.mail=somespammer@example.com
-              anotherone << e + ", "
+              anotherone += "#{e}, "
 
             elsif e.start_with?("User-Agent: ")
               # The header field MUST appear exactly once.
               # User-Agent: SomeGenerator/1.0
-              anotherone << e + ", "
+              anotherone += "#{e}, "
 
             elsif e.start_with?("Received-Date: ") || e.start_with?("Arrival-Date: ")
               # Arrival-Date header is optional and MUST NOT appear more than once.
@@ -185,11 +180,11 @@ module Sisimai
             elsif e.start_with?("Original-Mail-From: ")
               # the header is optional and MUST NOT appear more than once.
               # Original-Mail-From: <somespammer@example.net>
-              anotherone << e + ", "
+              anotherone += "#{e}, "
             end
           else
             # Messages before "Content-Type: message/feedback-report" part
-            v["diagnosis"] << " " + e
+            v["diagnosis"] += " #{e}"
           end
 
           while recipients == 0
@@ -220,7 +215,7 @@ module Sisimai
           end
           return nil if recipients == 0
 
-          anotherone = ": " + Sisimai::String.sweep(anotherone) if anotherone != ""
+          anotherone = ": #{Sisimai::String.sweep(anotherone)}" if anotherone != ""
           anotherone = anotherone.chop if anotherone[-1, 1] == ","
 
           j = -1