sisimai 4.24.1-java → 4.25.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b6e18c24dda8b7ef86cf3636cf29c047d246f66
-  data.tar.gz: 1be9f5d335e41784268a89d0c3faf6b85e64b731
+  metadata.gz: 7aa5cc01306c3b0f700213220f61eb69664fbbe3
+  data.tar.gz: 605434fbe0db77535056d60f02fbe09437bd30c7
 SHA512:
-  metadata.gz: ceed8b7a6205c853dfec0bd0424890d88cf517261d1096dccff8fe0686383d5ea069441df8478d2e065837c25973bbf4dea75abece7a8dbcff5ef427dff1121c
-  data.tar.gz: a2365ad31d835a608ef97ac4804edca085ef59cce3fd43214f64f4fa876bd3780d165a5dead4a8aa6e99365db65f69668ad89326ee6ac32b7a830eed2cf551a0
+  metadata.gz: b4cad32a42fc61d64af6b20e59e0219e5e43877b1e902e5be98c4e09f3cc9a42441a8023a7e4db588133f47a6e9a2daa7a0216e10bda0b6589290de6c25f6a4e
+  data.tar.gz: 34cb8665b9892423a33dc0ba86ed31e7dd5fb3d0b136bd66cdc98e7ce12cb7b641453dec532f7cf6ec3941995a98dc309bf7f12886be049a32242c7713101b50

data/.travis.yml

@@ -5,8 +5,9 @@ rvm:
   - 2.3.0
   - 2.4.0
   - 2.5.0
-  - jruby-9.0.5.0
-  - jruby-9.1.9.0
+  - 2.6.0
+# - jruby-9.0.5.0
+# - jruby-9.1.9.0
 before_install:
 script:
   - rake spec

data/ANALYTICAL-PRECISION

@@ -1,18 +1,8 @@
-for v in `ls -1 ./lib/Sisimai/Bite/Email/*.pm | grep -v UserDefined`; do \
-		MTA=`echo $v | cut -d/ -f6 | tr '[A-Z]' '[a-z]' | sed 's/.pm//g'` ;\
-		mkdir -p tmp/emails-for-precision/email-$MTA ;\
-		cp set-of-emails/maildir/bsd/email-$MTA-*.eml tmp/emails-for-precision/email-$MTA/ ;\
-		cp set-of-emails/private/email-$MTA/* tmp/emails-for-precision/email-$MTA/ ;\
-	done
-for v in arf rfc3464 rfc3834; do \
-		mkdir -p tmp/emails-for-precision/$v ;\
-		cp set-of-emails/maildir/bsd/$v*.eml tmp/emails-for-precision/$v/ ;\
-		cp set-of-emails/private/$v/* tmp/emails-for-precision/$v/ ;\
-	done
  bounceHammer 2.7.13p3
  MTA MODULE NAME          CAN PARSE   RATIO   NOTES
 --------------------------------------------------------------------------------
 Email::Activehunter .....    0/0014  0.0000  TransWARE Active!hunter
+Email::Amavis ...........    4/0004  1.0000  amavisd-new: https://www.amavis.org/
 Email::AmazonSES ........   40/0049  0.8163  Amazon SES(Sending): http://aws.amazon.com/ses/
 Email::AmazonWorkMail ...    9/0013  0.6923  Amazon WorkMail: https://aws.amazon.com/workmail/
 Email::Aol ..............   20/0023  0.8696  Aol Mail: http://www.aol.com
@@ -21,16 +11,16 @@ Email::Bigfoot ..........    3/0003  1.0000  Bigfoot: http://www.bigfoot.com
 Email::Biglobe ..........    5/0007  0.7143  BIGLOBE: http://www.biglobe.ne.jp
 Email::Courier ..........   14/0016  0.8750  Courier MTA
 Email::Domino ...........    9/0018  0.5000  IBM Domino Server
-Email::EZweb ............  131/0124  1.0000  au EZweb: http://www.au.kddi.com/mobile/
+Email::EZweb ............  133/0126  1.0000  au EZweb: http://www.au.kddi.com/mobile/
 Email::EinsUndEins ......    0/0004  0.0000  1&1: http://www.1and1.de
 Email::Exchange2003 .....    1/0051  0.0196  Microsoft Exchange Server 2003
-Email::Exchange2007 .....    8/0010  0.8000  Microsoft Exchange Server 2007
-Email::Exim .............  228/0253  0.9012  Exim
+Email::Exchange2007 .....   10/0012  0.8333  Microsoft Exchange Server 2007
+Email::Exim .............  230/0255  0.9020  Exim
 Email::FML ..............    0/0004  0.0000  fml mailing list server/manager
 Email::Facebook .........    5/0005  1.0000  Facebook: https://www.facebook.com
 Email::GMX ..............    0/0010  0.0000  GMX: http://www.gmx.net
 Email::GSuite ...........   19/0019  1.0000  G Suite: https://gsuite.google.com/
-Email::Google ...........   59/0061  0.9672  Google Gmail: https://mail.google.com
+Email::Google ...........   61/0063  0.9683  Google Gmail: https://mail.google.com
 Email::IMailServer ......    0/0022  0.0000  IPSWITCH IMail Server
 Email::InterScanMSS .....    0/0008  0.0000  Trend Micro InterScan Messaging Security Suite
 Email::KDDI .............    6/0006  1.0000  au by KDDI: http://www.au.kddi.com
@@ -38,22 +28,22 @@ Email::MXLogic ..........    0/0014  0.0000  McAfee SaaS
 Email::MailFoundry ......    0/0007  0.0000  MailFoundry
 Email::MailMarshalSMTP ..    0/0004  0.0000  Trustwave Secure Email Gateway
 Email::MailRu ...........    4/0023  0.1739  @mail.ru: https://mail.ru
-Email::McAfee ...........    0/0012  0.0000  McAfee Email Appliance
+Email::McAfee ...........    0/0014  0.0000  McAfee Email Appliance
 Email::MessageLabs ......    7/0007  1.0000  Symantec.cloud http://www.messagelabs.com
-Email::MessagingServer ..   28/0031  0.9032  Oracle Communications Messaging Server
+Email::MessagingServer ..   30/0033  0.9091  Oracle Communications Messaging Server
 Email::Notes ............    0/0013  0.0000  Lotus Notes
 Email::Office365 ........   22/0025  0.8800  Microsoft Office 365: http://office.microsoft.com/
 Email::OpenSMTPD ........    6/0024  0.2500  OpenSMTPD
 Email::Outlook ..........   21/0023  0.9130  Microsoft Outlook.com: https://www.outlook.com/
-Email::Postfix ..........  222/0238  0.9328  Postfix
+Email::Postfix ..........  248/0264  0.9394  Postfix
 Email::ReceivingSES .....    0/0007  0.0000  Amazon SES(Receiving): http://aws.amazon.com/ses/
 Email::SendGrid .........    7/0012  0.5833  SendGrid: http://sendgrid.com/
-Email::Sendmail .........  354/0280  1.0000  V8Sendmail: /usr/sbin/sendmail
+Email::Sendmail .........  354/0279  1.0000  V8Sendmail: /usr/sbin/sendmail
 Email::SurfControl ......    6/0008  0.7500  WebSense SurfControl
 Email::V5sendmail .......    0/0386  0.0000  Sendmail version 5
 Email::Verizon ..........    4/0004  1.0000  Verizon Wireless: http://www.verizonwireless.com
 Email::X1 ...............    0/0007  0.0000  Unknown MTA #1
-Email::X2 ...............    0/0068  0.0000  Unknown MTA #2
+Email::X2 ...............    0/0070  0.0000  Unknown MTA #2
 Email::X3 ...............    0/0012  0.0000  Unknown MTA #3
 Email::X4 ...............    0/0029  0.0000  Unknown MTA #4 qmail clones
 Email::X5 ...............    3/0003  1.0000  Unknown MTA #5
@@ -61,11 +51,12 @@ Email::Yahoo ............    0/0025  0.0000  Yahoo! MAIL: https://www.yahoo.com
 Email::Yandex ...........    4/0007  0.5714  Yandex.Mail: http://www.yandex.ru
 Email::Zoho .............    0/0011  0.0000  Zoho Mail: https://www.zoho.com
 Email::mFILTER ..........    0/0009  0.0000  Digital Arts m-FILTER
-Email::qmail ............   56/0085  0.6588  qmail
+Email::qmail ............   58/0087  0.6667  qmail
 JSON::AmazonSES .........   40/0049  0.8163  Amazon SES(JSON): http://aws.amazon.com/ses/
 JSON::SendGrid ..........    7/0012  0.5833  SendGrid(JSON): http://sendgrid.com/
-ARF .....................    8/0037  0.2162  RFC3464 .................  150/0292  0.5137  Fallback Module for MTAs
-RFC3834 .................    0/0013  0.0000  Detector for auto replied message
+ARF .....................    8/0038  0.2105  Abuse Feedback Reporting Format
+RFC3464 .................  151/0290  0.5207  Fallback Module for MTAs
+RFC3834 .................    0/0014  0.0000  Detector for auto replied message
 --------------------------------------------------------------------------------
- bounceHammer 2.7.13p3    1356/2211  0.6133
- Sisimai v4.24.0          2211/2211  1.0000
+ bounceHammer 2.7.13p3    1549/2548  0.6079
+ Sisimai v4.25.0          2548/2548  1.0000

data/ChangeLog.md

@@ -3,6 +3,47 @@ RELEASE NOTES for Ruby version of Sisimai
 - releases: "https://github.com/sisimai/rb-Sisimai/releases"
 - download: "https://rubygems.org/gems/sisimai"
 
+v4.25.0
+--------------------------------------------------------------------------------
+- release: "Tue,  9 Apr 2019 11:22:22 +0900 (JST)"
+- version: "4.25.0"
+- changes:
+  - Implement new class `Sisimai::RFC1894` for parsing message/delivery-status
+    part. #133
+  - Experimental implementation at the following MTA, Rhost modules:
+    - `Sisimai::Bite::Email::Amavis`: amavisd-new
+    - `Sisimai::Rhost::TencentQQ`: Tencent QQ (mail.qq.com)
+  - Remove unused methods and variables
+    - `Sisimai::DateTime.hourname`
+    - `$Sisimai::DateTime::HourNames`
+    - `Sisimai::RFC5322.is_domainpart`
+  - Code refactoring: less lines of code and shallower indentation.
+  - Build test for JRuby on Travis CI was temporarily disabled. #138
+  - Sisimai works on Ruby 2.6.0
+  - Fix `Sisimai::ARF.is_arf` method to remove angle brackets:`<` and `>` from
+    `From:` header.
+  - Fix serious bug (Hash key typo) in `Sisimai::Rhost::Google`
+  - Less Symbol, less `String#to_sym`.
+  - Remove `set-of-emails/logo` directory because we cannot change the license
+    of each file in the directory to The 2-Clause BSD License.
+  - Update error message patterns in the following modules:
+    - `Sisimai::Reason::Blocked` (hotmail, ntt docomo)
+    - `Sisimai::Reason::PolicyViolation` (postfix)
+    - `Sisimai::Reason::Rejected` (postfix)
+    - `Sisimai::Reason::SystemError` (hotmail)
+    - `Sisimai::Reason::TooManyConn` (ntt docomo)
+    - `Sisimai::Reason::UserUnknown` (hotmail)
+    - `Sisimai::Bite::Email::McAfee` (userunknown)
+    - `Sisimai::Bite::Email::Exchange2007` (securityerror)
+  - The order of `Sisimai::Bite::Email` modules to be loaded has been changed:
+    Load Office365 and Outlook prior to Exchange2007 and Exchange2003.
+  - Update the followng MTA modules for improvements and bug fixes:
+    - `Sisimai::Bite::Email::Exchange2007`
+  - MIME Decoding in `Subject:` header improved.
+  - Bug fix in `Sisimai::MIME.is_mimeencoded` method.
+  - Make stable the order of MTA modules which have MTA specific email headers
+    at `Sisimai::Order::Email.headers` method.
+
 v4.24.1
 --------------------------------------------------------------------------------
 - release: "Wed, 14 Nov 2018 11:09:44 +0900 (JST)"

data/Developers.mk

@@ -68,13 +68,13 @@ update-other-format-emails:
 	done
 
 emails-for-precision:
-	for v in `$(LS) ./$(MAILCLASSDIR)/*.rb | grep -v userdefined`; do \
+	@ for v in `$(LS) ./$(MAILCLASSDIR)/*.rb | grep -v userdefined`; do \
 		MTA=`echo $$v | cut -d/ -f6 | tr '[A-Z]' '[a-z]' | sed 's/.rb//g'` ;\
 		$(MKDIR) $(PRECISIONDIR)/email-$$MTA ;\
 		$(CP) $(PUBLICEMAILS)/email-$$MTA-*.eml $(PRECISIONDIR)/email-$$MTA/ ;\
 		$(CP) $(PRIVATEMAILS)/email-$$MTA/* $(PRECISIONDIR)/email-$$MTA/ ;\
 	done
-	for v in arf rfc3464 rfc3834; do \
+	@ for v in arf rfc3464 rfc3834; do \
 		$(MKDIR) $(PRECISIONDIR)/$$v ;\
 		$(CP) $(PUBLICEMAILS)/$$v*.eml $(PRECISIONDIR)/$$v/ ;\
 		$(CP) $(PRIVATEMAILS)/$$v/* $(PRECISIONDIR)/$$v/ ;\

data/README-JA.md

@@ -4,7 +4,7 @@
 [![Coverage Status](https://img.shields.io/coveralls/sisimai/rb-Sisimai.svg)](https://coveralls.io/r/sisimai/rb-Sisimai)
 [![Build Status](https://travis-ci.org/sisimai/rb-Sisimai.svg?branch=master)](https://travis-ci.org/sisimai/rb-Sisimai) 
 [![Codacy Badge](https://api.codacy.com/project/badge/grade/38340177e6284a65be69c0c7c3dc2b58)](https://www.codacy.com/app/azumakuniyuki/rb-Sisimai)
-[![Ruby](https://img.shields.io/badge/ruby-v2.1.0--v2.4.0-red.svg)](https://www.ruby-lang.org/)
+[![Ruby](https://img.shields.io/badge/ruby-v2.1.0--v2.6.0-red.svg)](https://www.ruby-lang.org/)
 [![Gem Version](https://badge.fury.io/rb/sisimai.svg)](https://badge.fury.io/rb/sisimai)
 
 - [**README(English)**](README.md)
@@ -54,7 +54,7 @@ Key features
   * git clone & make
 * __高い解析精度__
   * 解析精度はbounceHammerの2倍
-  * 28種類のMTAに対応
+  * 29種類のMTAに対応
   * 22種類の著名なMSPに対応
   * 2種類の著名なメール配信クラウドに対応(JSON)
   * Feedback Loopにも対応
@@ -80,10 +80,10 @@ Install
 
 ```shell
 $ sudo gem install sisimai
-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
+Fetching: sisimai-4.25.0.gem (100%)
+Successfully installed sisimai-4.25.0
+Parsing documentation for sisimai-4.25.0
+Installing ri documentation for sisimai-4.25.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.23.0 built to pkg/sisimai-4.23.0.gem.
-sisimai (4.23.0) installed.
+sisimai 4.25.0 built to pkg/sisimai-4.25.0.gem.
+sisimai (4.25.0) installed.
 ```
 
 Usage
@@ -238,14 +238,14 @@ Differences between Ruby version and Perl version
 
 | 機能                                        | Ruby version   | Perl version  |
 |---------------------------------------------|----------------|---------------|
-| 動作環境                                    | Ruby 2.1 - 2.5 | Perl 5.10 -   |
+| 動作環境                                    | Ruby 2.1 - 2.6 | Perl 5.10 -   |
 |                                             | JRuby 9.0.4.0- |               |
 | 解析精度の割合(2000通のメール)[1]           | 1.00           | 1.00          |
-| メール解析速度(1000通のメール)              | 3.20秒[2]      | 1.60秒        |
+| メール解析速度(1000通のメール)              | 2.22秒[2]      | 1.50秒        |
 | インストール方法                            | gem install    | cpanm, cpm    |
 | 依存モジュール数(コアモジュールを除く)      | 1モジュール    | 2モジュール   |
-| LOC:ソースコードの行数                      | 11700行        | 8600行        |
-| テスト件数(spec/,t/,xt/ディレクトリ)        | 218000件       | 236600件      |
+| LOC:ソースコードの行数                      | 11700行        | 8200行        |
+| テスト件数(spec/,t/,xt/ディレクトリ)        | 224000件       | 242000件      |
 | ライセンス                                  | 二条項BSD      | 二条項BSD     |
 | 開発会社によるサポート契約                  | 準備中         | 提供中        |
 
@@ -300,7 +300,7 @@ Author
 
 Copyright
 ===============================================================================
-Copyright (C) 2015-2018 azumakuniyuki, All Rights Reserved.
+Copyright (C) 2015-2019 azumakuniyuki, All Rights Reserved.
 
 License
 ===============================================================================

data/README.md

@@ -4,7 +4,7 @@
 [![Coverage Status](https://img.shields.io/coveralls/sisimai/rb-Sisimai.svg)](https://coveralls.io/r/sisimai/rb-Sisimai)
 [![Build Status](https://travis-ci.org/sisimai/rb-Sisimai.svg?branch=master)](https://travis-ci.org/sisimai/rb-Sisimai) 
 [![Codacy Badge](https://api.codacy.com/project/badge/grade/38340177e6284a65be69c0c7c3dc2b58)](https://www.codacy.com/app/azumakuniyuki/rb-Sisimai)
-[![Ruby](https://img.shields.io/badge/ruby-v2.1.0--v2.4.0-red.svg)](https://www.ruby-lang.org/)
+[![Ruby](https://img.shields.io/badge/ruby-v2.1.0--v2.6.0-red.svg)](https://www.ruby-lang.org/)
 [![Gem Version](https://badge.fury.io/rb/sisimai.svg)](https://badge.fury.io/rb/sisimai)
 
 - [**README-JA(日本語)**](README-JA.md)
@@ -53,7 +53,7 @@ Key Features
   * git clone & make
 * __High Precision of Analysis__
   * 2 times higher than bounceHammer
-  * Support 23 known MTAs and 5 unknown MTAs
+  * Support 24 known MTAs and 5 unknown MTAs
   * Support 22 major MSPs(Mail Service Providers)
   * Support 2 major Cloud Email Delivery Services(JSON format)
   * Support Feedback Loop Message(ARF)
@@ -85,10 +85,10 @@ Install
 
 ```shell
 $ sudo gem install sisimai
-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
+Fetching: sisimai-4.25.0.gem (100%)
+Successfully installed sisimai-4.25.0
+Parsing documentation for sisimai-4.25.0
+Installing ri documentation for sisimai-4.25.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.23.0 built to pkg/sisimai-4.23.0.gem.
-sisimai (4.23.0) installed.
+sisimai 4.25.0 built to pkg/sisimai-4.25.0.gem.
+sisimai (4.25.0) installed.
 ```
 
 Usage
@@ -242,14 +242,14 @@ and bounceHammer are available at
 
 | Features                                    | Ruby version   | Perl version  |
 |---------------------------------------------|----------------|---------------|
-| System requirements                         | Ruby 2.1 - 2.5 | Perl 5.10 -   |
+| System requirements                         | Ruby 2.1 - 2.6 | Perl 5.10 -   |
 |                                             | JRuby 9.0.4.0- |               |
 | Analytical precision ratio(2000 emails)[1]  | 1.00           | 1.00          |
-| The speed of parsing email(1000 emails)     | 3.20s[2]       | 1.60s         |
+| The speed of parsing email(1000 emails)     | 2.22s[2]       | 1.50s         |
 | How to install                              | gem install    | cpanm, cpm    |
 | Dependencies (Except core modules)          | 1 module       | 2 modules     |
-| LOC:Source lines of code                    | 11700 lines    | 8600 lines    |
-| The number of tests(spec/,t/,xt/) directory | 218000 tests   | 236600 tests  |
+| LOC:Source lines of code                    | 11700 lines    | 8200 lines    |
+| The number of tests(spec/,t/,xt/) directory | 224000 tests   | 242000 tests  |
 | License                                     | BSD 2-Clause   | BSD 2-Clause  |
 | Support Contract provided by Developer      | Coming soon    | Available     |
 
@@ -306,7 +306,7 @@ Author
 
 Copyright
 ===============================================================================
-Copyright (C) 2015-2018 azumakuniyuki, All Rights Reserved.
+Copyright (C) 2015-2019 azumakuniyuki, All Rights Reserved.
 
 License
 ===============================================================================

data/lib/sisimai.rb

@@ -51,8 +51,7 @@ module Sisimai
       if input == 'email'
         # Path to mailbox or Maildir/, or STDIN: 'input' => 'email'
         require 'sisimai/mail'
-        mail = Sisimai::Mail.new(argv0)
-        return nil unless mail
+        return nil unless mail = Sisimai::Mail.new(argv0)
 
         while r = mail.read do
           # Read and parse each mail file
@@ -61,8 +60,7 @@ module Sisimai
           next if mesg.void
 
           methodargv = { data: mesg, hook: hookmethod, input: 'email', delivered: delivered1 }
-          data = Sisimai::Data.make(methodargv)
-          next unless data
+          next unless data = Sisimai::Data.make(methodargv)
           bouncedata += data unless data.empty?
         end
 
@@ -86,9 +84,7 @@ module Sisimai
           next if mesg.void
 
           methodargv = { data: mesg, hook: hookmethod, input: 'json', delivered: delivered1 }
-          data = Sisimai::Data.make(methodargv)
-
-          next unless data
+          next unless data = Sisimai::Data.make(methodargv)
           bouncedata += data unless data.empty?
         end
       else

data/lib/sisimai/address.rb

@@ -7,8 +7,8 @@ module Sisimai
       :'email-address' => (1 << 0),    # <neko@example.org>
       :'quoted-string' => (1 << 1),    # "Neko, Nyaan"
       :'comment-block' => (1 << 2),    # (neko)
-    }
-    @@undisclosed = 'libsisimai.org.invalid'
+    }.freeze
+    Delimiters  = { '<' => 1, '>' => 1, '(' => 1, ')' => 1, '"' => 1, ',' => 1 }.freeze
 
     # Return pseudo recipient or sender address
     # @param    [Symbol] argv1  Address type: :r or :s
@@ -16,10 +16,10 @@ module Sisimai
     #                           nil when the argv1 is neither :r nor :s
     def self.undisclosed(argv1)
       return nil unless argv1
-      return nil unless %w[r s].index(argv1.to_s)
+      return nil unless %w[r s].index(argv1)
 
-      local = argv1 == :r ? 'recipient' : 'sender'
-      return sprintf('undisclosed-%s-in-headers@%s', local, @@undisclosed)
+      local = argv1 == 'r' ? 'recipient' : 'sender'
+      return sprintf('undisclosed-%s-in-headers@libsisimai.org.invalid', local)
     end
 
     # New constructor of Sisimai::Address
@@ -55,7 +55,6 @@ module Sisimai
       #   #=> [{ address: 'neko@example.org', name: 'Neko', comment: '(nyaan)'}]
       return nil unless argv1
 
-      characters = argv1.gsub(/[\r\n]/, '').split('')
       emailtable = { address: '', name: '', comment: '' }
       addrtables = []
       readbuffer = []
@@ -64,9 +63,13 @@ module Sisimai
       v = emailtable  # temporary buffer
       p = ''          # current position
 
+      argv1.delete!("\r") if argv1.include?("\r")
+      argv1.delete!("\n") if argv1.include?("\n")
+      characters = argv1.split('')
+
       while e = characters.shift do
         # Check each characters
-        if %w[< > ( ) " ,].any? { |r| r == e }
+        if Delimiters.key?(e)
           # The character is a delimiter character
           if e == ','
             # Separator of email addresses or not
@@ -185,16 +188,12 @@ module Sisimai
               # email-address or comment-block
               v[p] << e
             else
-              # Display name
+              # Display name like "Neko, Nyaan"
               v[:name] << e
-              if readcursor & Indicators[:'quoted-string'] > 0
-                # "Neko, Nyaan"
-                unless v[:name].end_with?(%Q|\x5c"|)
-                  # "Neko, Nyaan \"...
-                  readcursor &= ~Indicators[:'quoted-string']
-                  p = ''
-                end
-              end
+              next unless readcursor & Indicators[:'quoted-string'] > 0
+              next if v[:name].end_with?(%Q|\x5c"|) # "Neko, Nyaan \"...
+              readcursor &= ~Indicators[:'quoted-string']
+              p = ''
             end
             next
           end # End of if('"')
@@ -234,8 +233,7 @@ module Sisimai
       while e = readbuffer.shift do
         # The element must not include any character except from 0x20 to 0x7e.
         next if e[:address] =~ /[^\x20-\x7e]/
-
-        unless e[:address] =~ /\A.+[@].+\z/
+        unless e[:address]  =~ /\A.+[@].+\z/
           # Allow if the argument is MAILER-DAEMON
           next unless Sisimai::RFC5322.is_mailerdaemon(e[:address])
         end
@@ -284,14 +282,10 @@ module Sisimai
     # @example  Expand VERP address
     #   expand_verp('bounce+neko=example.org@example.org') #=> 'neko@example.org'
     def self.expand_verp(email)
-      local = email.split('@', 2).first
-
-      if cv = local.match(/\A[-_\w]+?[+](\w[-._\w]+\w)[=](\w[-.\w]+\w)\z/)
-        verp0 = cv[1] + '@' + cv[2]
-        return verp0 if Sisimai::RFC5322.is_emailaddress(verp0)
-      else
-        return ''
-      end
+      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/)
+      verp0 = cv[1] + '@' + cv[2]
+      return verp0 if Sisimai::RFC5322.is_emailaddress(verp0)
     end
 
     # Expand alias: remove from '+' to '@'
@@ -300,12 +294,11 @@ module Sisimai
     # @example  Expand alias
     #   expand_alias('neko+straycat@example.org') #=> 'neko@example.org'
     def self.expand_alias(email)
-      return '' unless Sisimai::RFC5322.is_emailaddress(email)
+      return nil unless Sisimai::RFC5322.is_emailaddress(email)
 
       local = email.split('@')
-      value = ''
-      if cv = local[0].match(/\A([-_\w]+?)[+].+\z/) then value = cv[1] + '@' + local[1] end
-      return value
+      return nil unless cv = local[0].match(/\A([-_\w]+?)[+].+\z/)
+      return cv[1] + '@' + local[1]
     end
 
     @@roaccessors = [
@@ -342,9 +335,9 @@ module Sisimai
         email = Sisimai::Address.expand_verp(thing[:address])
         aname = nil
 
-        if email.empty?
+        unless email
           # Is not VERP address, try to expand the address as an alias
-          email = Sisimai::Address.expand_alias(thing[:address])
+          email = Sisimai::Address.expand_alias(thing[:address]) || ''
           aname = true unless email.empty?
         end
 
@@ -385,15 +378,6 @@ module Sisimai
       return false
     end
 
-    # Check the "address" is an undisclosed address or not
-    # @param    [None]
-    # @return   [Boolean] true:  Undisclosed address
-    #                     false: Is not undisclosed address
-    def is_undisclosed
-      return true if self.host == @@undisclosed
-      return false
-    end
-
     # Returns the value of address as String
     # @return [String] Email address
     def to_json(*)