sisimai 4.22.1 → 4.22.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c644b2582fd163b4227e472c750409fff659c691
-  data.tar.gz: 39c38f411e6411a77f907d96877c808a8f731879
+  metadata.gz: 0ca3f22af3e372dd9c1d741bca61752dc92bdeaf
+  data.tar.gz: bf25002aabb9a2926ca13631022b06b6331271f9
 SHA512:
-  metadata.gz: 8d08ac534acade16e7aedd5ef71bd12bd44702b51283833a874e1f178f4e3e5e7e6bab3f8544e0e1254e686f8c4455e15b397bbd05a89a2aba343202013a818e
-  data.tar.gz: 2302808a843715d2a463256abde74c8dd208b277d4325941b39e64ad87f429252e65f794e7a30fd8a924e2d665b77e7026088cbd974a9fcfc29b61f67c5e45be
+  metadata.gz: 440afa6405f3c4b7e0faa47c958733e755f8400dd9666b3e324dedea6b8d01d506be83b3115332fc1b0ac8f83bab029a68f13ee7c2969df2392a90af0338d960
+  data.tar.gz: 44effc61e68e42a4dc9a1f71c95daacaf61d5e6f0904cf57b0b1a405621fd5fafeca99195f76c88398974093d74a038e5243ecbaf6718d143b4f8650fd61966c

data/ChangeLog.md

@@ -3,6 +3,27 @@ RELEASE NOTES for Ruby version of Sisimai
 - releases: "https://github.com/sisimai/rb-Sisimai/releases"
 - download: "https://rubygems.org/gems/sisimai"
 
+v4.22.2
+--------------------------------------------------------------------------------
+- release: "Fri, 13 Oct 2017 11:59:53 +0900 (JST)"
+- version: "v4.22.2"
+- changes:
+  - Apply Pull-Request #84 (issue #83) for setting the value of `softorhard` in 
+    `Sisimai::SMTP::Error.soft_or_hard` method. Thanks to @lunatyq.
+  - Fix a wrong value assingment, and code for Performance/StartWith reported
+    from Rubocop in Sisimai::Bite::Email::GSuite.
+  - Update codes about Lint/AssignmentInCondition, Style/Next, Style/EmptyElse,
+    Style/UselessAssignment, and others reported from Rubocop.
+  - Fix code for Performance/Casecmp, Performance/LstripRstrip in Sisimai::MIME.
+  - Update code for Style/SymbolProc in Sisimai::Message::Email.
+  - Support parsing JSON object from SendGrid Event Webhook.
+  - Suuport "event": "spamreport" via Feedback Loop on SendGrid Event Webhook.
+  - Implement `Sisimai::Address.is_undisclosed` method.
+  - Import Pull-Request #237: Support parsing bounce mail from GoDaddy.
+  - Fix bug for setting the value of `date` in Sisimai::Bite::Email::Postfix.
+  - Remove obsoleted classes: Sisimai::MTA, Sisimai::MSP, and Sisimai::CED.
+  - Remove obsoleted method: `Sisimai::Address.parse`.
+
 v4.22.1
 --------------------------------------------------------------------------------
 - release: "Tue, 29 Aug 2017 17:25:22 +0900 (JST)"

data/README-JA.md

@@ -239,8 +239,8 @@ Differences between Ruby version and Perl version
 | メール解析速度(1000通のメール)              | 3.30秒         | 2.33秒        |
 | インストール方法                            | gem install    | cpanm, cpm    |
 | 依存モジュール数(コアモジュールを除く)      | 1モジュール    | 2モジュール   |
-| LOC:ソースコードの行数                      | 12600行        | 9300行        |
-| テスト件数(spec/,t/,xt/ディレクトリ)        | 196800件       | 204600件      |
+| LOC:ソースコードの行数                      | 12600行        | 9400行        |
+| テスト件数(spec/,t/,xt/ディレクトリ)        | 197300件       | 205200件      |
 | ライセンス                                  | 二条項BSD      | 二条項BSD     |
 | 開発会社によるサポート契約                  | 準備中         | 提供中        |
 

data/README.md

@@ -243,8 +243,8 @@ and bounceHammer are available at
 | The speed of parsing email(1000 emails)     | 3.30s          | 2.33s         |
 | How to install                              | gem install    | cpanm, cpm    |
 | Dependencies (Except core modules)          | 1 module       | 2 modules     |
-| LOC:Source lines of code                    | 12600 lines    | 9300 lines    |
-| The number of tests(spec/,t/,xt/) directory | 196800 tests   | 204600 tests  |
+| LOC:Source lines of code                    | 12600 lines    | 9400 lines    |
+| The number of tests(spec/,t/,xt/) directory | 197300 tests   | 205200 tests  |
 | License                                     | BSD 2-Clause   | BSD 2-Clause  |
 | Support Contract provided by Developer      | Coming soon    | Available     |
 

data/lib/sisimai.rb

@@ -32,8 +32,7 @@ module Sisimai
       rtype = nil
       input = argv1[:input] || nil
       field = argv1[:field] || []
-      fail ' ***error: "field" accepts an array reference only' unless field.is_a? Array
-
+      raise ' ***error: "field" accepts an array reference only' unless field.is_a? Array
 
       unless input
         # "input" did not specified, try to detect automatically.
@@ -100,7 +99,7 @@ module Sisimai
 
       else
         # The value of "input" neither "email" nor "json"
-        fail ' ***error: invalid value of "input"'
+        raise ' ***error: invalid value of "input"'
       end
 
       return nil if bouncedata.size.zero?

data/lib/sisimai/address.rb

@@ -3,22 +3,23 @@ module Sisimai
   class Address
     # Imported from p5-Sisimail/lib/Sisimai/Address.pm
     require 'sisimai/rfc5322'
+    @@undisclosed = 'libsisimai.org.invalid'
 
     # Return pseudo recipient or sender address
     # @param    [Symbol] argv1  Address type: :r or :s
     # @return   [String, Nil]   Pseudo recipient address or sender address or
-    #                           Undef when the $argv1 is neither :r nor :s
+    #                           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)
 
       local = argv1 == :r ? 'recipient' : 'sender'
-      return sprintf('undisclosed-%s-in-headers@libsisimai.org.invalid', local)
+      return sprintf('undisclosed-%s-in-headers@%s', local, @@undisclosed)
     end
 
     # New constructor of Sisimai::Address
     # @param    [Hash] argvs        Email address, name, and other elements
-    # @return   [Sisimai::Address]  Object or Undef when the email address was
+    # @return   [Sisimai::Address]  Object or nil when the email address was
     #                               not valid.
     # @example  make({address: 'neko@example.org', name: 'Neko', comment: '(nyaan)')}
     #           # => Sisimai::Address object
@@ -42,7 +43,7 @@ module Sisimai
       # @param    [String] argv1  String including email address
       # @param    [Boolean] addrs true:  Returns list including all the elements
       #                           false: Returns list including email addresses only
-      # @return   [Array, Nil]    Email address list or Undef when there is no 
+      # @return   [Array, Nil]    Email address list or nil when there is no
       #                           email address in the argument
       # @example  Parse email address
       #   find('Neko <neko(nyaan)@example.org>')
@@ -212,7 +213,7 @@ module Sisimai
               end
             end
             next
-          end # End of if('"') 
+          end # End of if('"')
         else
           # The character is not a delimiter
           p.size > 0 ? (v[p] += e) : (v[:name] += e)
@@ -227,7 +228,7 @@ module Sisimai
         # No email address like <neko@example.org> in the argument
         if cv = v[:name].match(validemail)
           # String like an email address will be set to the value of "address"
-          v[:address] = sprintf("%s@%s", cv[1], cv[2])
+          v[:address] = sprintf('%s@%s', cv[1], cv[2])
 
         elsif Sisimai::RFC5322.is_mailerdaemon(v[:name])
           # Allow if the argument is MAILER-DAEMON
@@ -290,36 +291,6 @@ module Sisimai
       return addrtables
     end
 
-    # Email address parser
-    # @param    [Array] argvs   List of strings including email address
-    # @return   [Array, Nil]    Email address list or Undef when there is no
-    #                           email address in the argument
-    # @until    v4.22.1
-    def self.parse(argvs = nil)
-      return nil unless argvs
-      return nil unless argvs.is_a? Array
-      return nil if argvs.empty?
-
-      warn ' ***warning: Sisimai::Address.parse is marked as obsoleted'
-      addrs = []
-
-      argvs.each do |e|
-        # Parse each element in the array
-        #   1. The element must include '@'.
-        #   2. The element must not include character except from 0x20 to 0x7e.
-        next unless e
-        next unless e.is_a? Object::String
-        next if e.empty?
-
-        v = Sisimai::Address.find(e, 1) || []
-        next if v.empty?
-        v.each { |f| addrs << f[:address] }
-      end
-
-      return nil if addrs.empty?
-      return addrs
-    end
-
     # Runs like ruleset 3,4 of sendmail.cf
     # @param    [String] input  Text including an email address
     # @return   [String]        Email address without comment, brackets
@@ -343,7 +314,7 @@ module Sisimai
       verp0 = ''
 
       if cv = local.match(/\A[-_\w]+?[+](\w[-._\w]+\w)[=](\w[-.\w]+\w)\z/)
-        verp0 = sprintf("%s@%s", cv[1], cv[2])
+        verp0 = sprintf('%s@%s', cv[1], cv[2])
         return verp0 if Sisimai::RFC5322.is_emailaddress(verp0)
       else
         return ''
@@ -382,7 +353,7 @@ module Sisimai
 
     # Constructor of Sisimai::Address
     # @param <str>  [String] argv1          Email address
-    # @return       [Sisimai::Address, Nil] Object or Undef when the email
+    # @return       [Sisimai::Address, Nil] Object or nil when the email
     #                                       address was not valid
     def initialize(argv1)
       return nil unless argv1
@@ -393,7 +364,7 @@ module Sisimai
       thing = addrs.shift
 
       if cv = thing[:address].match(/\A([^\s]+)[@]([^@]+)\z/) ||
-         cv = thing[:address].match(/\A(["].+?["])[@]([^@]+)\z/)
+              thing[:address].match(/\A(["].+?["])[@]([^@]+)\z/)
         # Get the local part and the domain part from the email address
         lpart = cv[1]
         dpart = cv[2]
@@ -418,7 +389,7 @@ module Sisimai
         end
         @user    = lpart
         @host    = dpart
-        @address = sprintf("%s@%s", lpart, dpart)
+        @address = sprintf('%s@%s', lpart, dpart)
 
       else
         # The argument does not include "@"
@@ -444,6 +415,15 @@ 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(*)

data/lib/sisimai/arf.rb

@@ -15,7 +15,7 @@ module Sisimai
           )
         }x,
         :'subject'      => %r/complaint[ ]about[ ]message[ ]from[ ]/,
-      }
+      }.freeze
       # http://tools.ietf.org/html/rfc5965
       # http://en.wikipedia.org/wiki/Feedback_loop_(email)
       # http://en.wikipedia.org/wiki/Abuse_Reporting_Format
@@ -35,7 +35,7 @@ module Sisimai
         }x,
         :rfc822 => %r[\AContent-Type: (:?message/rfc822|text/rfc822-headers)],
         :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
       LongFields = Sisimai::RFC5322.LONGFIELDS
       RFC822Head = Sisimai::RFC5322.HEADERFIELDS
@@ -80,7 +80,7 @@ module Sisimai
       # @options mhead [String] others    Other required headers
       # @param         [String] mbody     Message body of a bounce email
       # @return        [Hash, Nil]        Bounce data list and message/rfc822 part
-      #                                   or Undef if it failed to parse or the
+      #                                   or nil if it failed to parse or the
       #                                   arguments are missing
       def scan(mhead, mbody)
         return nil unless self.is_arf(mhead)
@@ -136,7 +136,7 @@ module Sisimai
             end
           end
 
-          if readcursor & Indicators[:'message-rfc822'] == 0
+          if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
             if e =~ Re1[:rfc822]
               readcursor |= Indicators[:'message-rfc822']

data/lib/sisimai/bite.rb

@@ -3,6 +3,7 @@ module Sisimai
   module Bite
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite.pm
+      require 'sisimai/rfc5322'
 
       # Data structure for parsed bounce messages
       # @return [Hash] Data structure for delivery status

data/lib/sisimai/bite/email.rb

@@ -1,11 +1,10 @@
 module Sisimai
   module Bite
+    # Sisimai::Bite::Email- Base class for Sisimai::Bite::Email::*
     module Email
-      # Sisimai::Bite::Email- Base class for Sisimai::Bite::Email::*
       class << self
         # Imported from p5-Sisimail/lib/Sisimai/Bite/Email.pm
         require 'sisimai/bite'
-        require 'sisimai/rfc5322'
 
         # @abstract Flags for position variable
         # @return   [Hash] Position flag data
@@ -27,9 +26,9 @@ module Sisimai
             Google Yahoo GSuite Aol Outlook Office365 SendGrid AmazonSES MailRu
             Yandex MessagingServer Domino Notes ReceivingSES AmazonWorkMail Verizon
             GMX Bigfoot Facebook Zoho EinsUndEins MessageLabs EZweb KDDI Biglobe
-            ApacheJames McAfee MXLogic MailFoundry IMailServer 
+            ApacheJames McAfee MXLogic MailFoundry IMailServer
             MFILTER Activehunter InterScanMSS SurfControl MailMarshalSMTP
-            X1 X2 X3 X4 X5 V5sendmail 
+            X1 X2 X3 X4 X5 V5sendmail
           |
         end
 

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

@@ -1,8 +1,8 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::Activehunter parses a bounce email which created
+  # by TransWARE Active!hunter.
+  # Methods in the module are called from only Sisimai::Message.
   module Activehunter
-    # Sisimai::Bite::Email::Activehunter parses a bounce email which created
-    # by TransWARE Active!hunter.
-    # Methods in the module are called from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/Activehunter.pm
       require 'sisimai/bite/email'
@@ -10,13 +10,13 @@ module Sisimai::Bite::Email
       Re0 = {
         :from    => %r/\A"MAILER-DAEMON"/,
         :subject => %r/FAILURE NOTICE :/,
-      }
+      }.freeze
       Re1 = {
         :begin   => %r/\A  ----- The following addresses had permanent fatal errors -----\z/,
         :error   => %r/\A  ----- Transcript of session follows -----\z/,
         :rfc822  => %r|\AContent-type: message/rfc822\z|,
         :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'TransWARE Active!hunter'; end
@@ -57,7 +57,7 @@ module Sisimai::Bite::Email
             end
           end
 
-          if readcursor & Indicators[:'message-rfc822'] == 0
+          if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
             if e =~ Re1[:rfc822]
               readcursor |= Indicators[:'message-rfc822']
@@ -76,7 +76,7 @@ module Sisimai::Bite::Email
 
           else
             # Before "message/rfc822"
-            next if readcursor & Indicators[:deliverystatus] == 0
+            next if (readcursor & Indicators[:deliverystatus]).zero?
             next if e.empty?
 
             #  ----- The following addresses had permanent fatal errors -----

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

@@ -1,18 +1,18 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::AmazonSES parses a bounce email which created by
+  # Amazon Simple Email Service.
+  # Methods in the module are called from only Sisimai::Message.
   module AmazonSES
-    # Sisimai::Bite::Email::AmazonSES parses a bounce email which created by
-    # Amazon Simple Email Service.
-    # Methods in the module are called from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/AmazonSES.pm
       require 'sisimai/bite/email'
 
       # http://aws.amazon.com/ses/
-      ReE = { :'x-mailer' => %r/Amazon[ ]WorkMail/ }
+      ReE = { :'x-mailer' => %r/Amazon[ ]WorkMail/ }.freeze
       Re0 = {
         :from    => %r/\AMAILER-DAEMON[@]email[-]bounces[.]amazonses[.]com\z/,
         :subject => %r/\ADelivery Status Notification [(]Failure[)]\z/,
-      }
+      }.freeze
       Re1 = {
         :begin   => %r/\A(?:
              The[ ]following[ ]message[ ]to[ ][<]
@@ -21,10 +21,10 @@ module Sisimai::Bite::Email
         /x,
         :rfc822  => %r|\Acontent-type: message/rfc822\z|,
         :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }
+      }.freeze
       ReFailure = {
         expired: %r/Delivery[ ]expired/x,
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Amazon SES(Sending): http://aws.amazon.com/ses/'; end
@@ -66,7 +66,7 @@ module Sisimai::Bite::Email
         blanklines = 0      # (Integer) The number of blank lines
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
-        connvalues = 0      # (Integer) Flag, 1 if all the value of $connheader have been set
+        connvalues = 0      # (Integer) Flag, 1 if all the value of connheader have been set
         connheader = {
           'lhost' => '',    # The value of Reporting-MTA header
         }
@@ -85,7 +85,7 @@ module Sisimai::Bite::Email
             end
           end
 
-          if readcursor & Indicators[:'message-rfc822'] == 0
+          if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
             if e =~ Re1[:rfc822]
               readcursor |= Indicators[:'message-rfc822']
@@ -105,7 +105,7 @@ module Sisimai::Bite::Email
 
           else
             # Before "message/rfc822"
-            next if readcursor & Indicators[:deliverystatus] == 0
+            next if (readcursor & Indicators[:deliverystatus]).zero?
             next if e.empty?
 
             if connvalues == connheader.keys.size
@@ -192,12 +192,12 @@ module Sisimai::Bite::Email
         if recipients.zero? && mbody =~ /notificationType/
           # Try to parse with Sisimai::Bite::JSON::AmazonSES module
           require 'sisimai/bite/json/amazonses'
-          e = Sisimai::Bite::JSON::AmazonSES.scan(mhead, mbody)
+          j = Sisimai::Bite::JSON::AmazonSES.scan(mhead, mbody)
 
-          if e['ds'].is_a? Array
+          if j['ds'].is_a? Array
             # Update dscontents
-            dscontents = e['ds']
-            recipients = e['ds'].size
+            dscontents = j['ds']
+            recipients = j['ds'].size
           end
         end
 

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

@@ -1,7 +1,7 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::AmazonWorkMail parses a bounce email which created by
+  # Amazon WorkMail. Methods in the module are called from only Sisimai::Message.
   module AmazonWorkMail
-    # Sisimai::Bite::Email::AmazonWorkMail parses a bounce email which created by
-    # Amazon WorkMail. Methods in the module are called from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/AmazonWorkMail.pm
       require 'sisimai/bite/email'
@@ -11,12 +11,12 @@ module Sisimai::Bite::Email
         :'subject'  => %r/Delivery[_ ]Status[_ ]Notification[_ ].+Failure/,
         :'received' => %r/.+[.]smtp-out[.].+[.]amazonses[.]com\b/,
         :'x-mailer' => %r/\AAmazon WorkMail\z/,
-      }
+      }.freeze
       Re1 = {
         :begin  => %r/\ATechnical report:\z/,
         :rfc822 => %r|\Acontent-type: message/rfc822\z|,
         :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Amazon WorkMail: https://aws.amazon.com/workmail/'; end
@@ -60,7 +60,7 @@ module Sisimai::Bite::Email
         blanklines = 0      # (Integer) The number of blank lines
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
-        connvalues = 0      # (Integer) Flag, 1 if all the value of $connheader have been set
+        connvalues = 0      # (Integer) Flag, 1 if all the value of connheader have been set
         connheader = {
           'lhost' => '',    # The value of Reporting-MTA header
         }
@@ -75,7 +75,7 @@ module Sisimai::Bite::Email
             end
           end
 
-          if readcursor & Indicators[:'message-rfc822'] == 0
+          if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
             if e =~ Re1[:rfc822]
               readcursor |= Indicators[:'message-rfc822']
@@ -94,7 +94,7 @@ module Sisimai::Bite::Email
 
           else
             # Before "message/rfc822"
-            next if readcursor & Indicators[:deliverystatus] == 0
+            next if (readcursor & Indicators[:deliverystatus]).zero?
             next if e.empty?
 
             if connvalues == connheader.keys.size