sisimai 4.22.7 → 4.23.0

data/lib/sisimai/datetime.rb

@@ -200,7 +200,7 @@ module Sisimai
         elsif cr = argv1.match(/\A(\d+|\d+[.]\d+)?([#{mathconsts}])([#{unitoftime}])?\z/)
           # 1pd, 1.5pw
           n = cr[1].to_f || 1
-          n = 1 if n.to_i.zero?
+          n = 1 if n.to_i == 0
           m = MathematicalConstant[cr[2].to_sym].to_f
           u = cr[3] || 'd'
           getseconds = n * m * TimeUnit[u.to_sym].to_f
@@ -278,11 +278,11 @@ module Sisimai
       #   parse("Tue, Nov 3 2015 2:2:2")      #=> Tue, 3 Nov 2015 02:02:02 +0900
       def parse(argv1)
         return nil unless argv1.is_a?(::String)
-        return nil unless argv1.size > 0
+        return nil if argv1.empty?
 
         datestring = argv1
-        datestring = datestring.sub(/[,](\d+)/, ', \1')  # Thu,13 -> Thu, 13
-        datestring = datestring.sub(/(\d{1,2}),/, '\1')  # Apr,29 -> Apr 29
+        datestring.sub!(/[,](\d+)/, ', \1') # Thu,13 -> Thu, 13
+        datestring.sub!(/(\d{1,2}),/, '\1') # Apr,29 -> Apr 29
         timetokens = datestring.split(' ')
         afternoon1 = 0    # (Integer) After noon flag
         altervalue = {}   # (Hash) To store alternative values
@@ -299,7 +299,7 @@ module Sisimai
           # Parse each piece of time
           if p =~ /\A[A-Z][a-z]{2}[,]?\z/
             # Day of week or Day of week; Thu, Apr, ...
-            p.chop if p.length == 4 # Thu, -> Thu
+            p.chop if p.size == 4 # Thu, -> Thu
 
             if DayOfWeek[:abbr].include?(p)
               # Day of week; Mon, Thu, Sun,...

data/lib/sisimai/mail.rb

@@ -8,7 +8,7 @@ module Sisimai
       :type,  # [String] Data type: mailbox, maildir, or stdin
     ]
     @@rwaccessors = [
-      :mail,  # [Sisimai::Mail::Mbox, Sisimai::Mail::Maildir] Object
+      :mail,  # [Sisimai::Mail::[Mbox,Maildir,Memory,STDIN]] Object
     ]
     @@roaccessors.each { |e| attr_reader   e }
     @@rwaccessors.each { |e| attr_accessor e }
@@ -29,7 +29,7 @@ module Sisimai
           parameter['path'] = $stdin
         else
           # The argumenet is a mailbox or a Maildir/.
-          mediatype = File.ftype(argv1)
+          mediatype = argv1.include?("\n") ? 'memory' : File.ftype(argv1)
 
           if mediatype == 'file'
             # The argument is a file, it is an mbox or email file in Maildir/
@@ -40,6 +40,12 @@ module Sisimai
             # The agument is not a file, it is a Maildir/
             classname = self.class.to_s << '::Maildir'
             parameter['type'] = 'maildir'
+
+          elsif mediatype == 'memory'
+            # The argument is an email string
+            classname = self.class.to_s << '::Memory'
+            parameter['type'] = 'memory'
+            parameter['path'] = 'MEMORY'
           end
         end
       elsif argv1.is_a?(IO)
@@ -52,7 +58,7 @@ module Sisimai
 
       classpath = classname.gsub('::', '/').downcase
       require classpath
-      parameter['mail'] = Module.const_get(classname).new(parameter['path'])
+      parameter['mail'] = Module.const_get(classname).new(argv1)
 
       @path = parameter['path']
       @type = parameter['type']

data/lib/sisimai/mail/maildir.rb

@@ -48,9 +48,7 @@ module Sisimai
             # Read each file in the directory
             next if r == '.' || r == '..'
 
-            emailindir = self.dir + '/' + r
-            emailindir = emailindir.squeeze('/')
-
+            emailindir = (self.dir + '/' + r).squeeze('/')
             next unless File.ftype(emailindir) == 'file'
             next unless File.size(emailindir) > 0
             next unless File.readable?(emailindir)

data/lib/sisimai/mail/mbox.rb

@@ -48,7 +48,7 @@ module Sisimai
 
           filehandle.each_line do |r|
             # Read the UNIX mbox file from 'From ' to the next 'From '
-            if r[0, 5] == 'From ' && readbuffer.size > 0
+            if r.start_with?('From ') && !readbuffer.empty?
               frombuffer = r
               break
             end

data/lib/sisimai/mail/memory.rb

@@ -0,0 +1,47 @@
+module Sisimai
+  class Mail
+    # Sisimai::Mail::Memory is a class for reading an email string
+    class Memory
+      # Imported from p5-Sisimail/lib/Sisimai/Mail/Memory.pm
+      @@roaccessors = [
+        :size,    # [Integer] data size of the email text
+      ]
+      @@rwaccessors = [
+        :data,    # [Array]   Entire bounce mail message
+        :offset,  # [Integer] Index of ":data"
+      ]
+      @@roaccessors.each { |e| attr_reader   e }
+      @@rwaccessors.each { |e| attr_accessor e }
+
+      # Constructor of Sisimai::Mail::Memory
+      # @param    [String] argv1              Entire email string
+      # @return   [Sisimai::Mail::Memory,Nil] Object or nil if the argument is
+      #                                       not specified or does not exist
+      def initialize(argv1)
+        raise 'is not a String' unless argv1.is_a? ::String
+        raise 'is empty'        if argv1.empty?
+
+        @size   = argv1.size
+        @data   = []
+        @offset = 0
+
+        if argv1.start_with?('From ')
+          # UNIX mbox
+          @data = argv1.split(/^From /).map! { |e| e = 'From ' + e }
+          @data.shift
+        else
+          @data = [argv1]
+        end
+      end
+
+      # Memory reader, works as an iterator.
+      # @return   [String] Contents of a bounce mail
+      def read
+        return nil if self.data.empty?
+        self.offset += 1
+        return self.data.shift
+      end
+    end
+  end
+end
+

data/lib/sisimai/mail/stdin.rb

@@ -42,7 +42,7 @@ module Sisimai
         begin
           readhandle = STDIN unless readhandle
           while r = readhandle.gets
-            break if readbuffer.size > 0 && r[0, 5] == 'From '
+            break if readbuffer.size > 0 && r.start_with?('From ')
             readbuffer << r
           end
         ensure

data/lib/sisimai/mda.rb

@@ -86,10 +86,6 @@ module Sisimai
       #                                   or nil if it failed to parse or the
       #                                   arguments are missing
       def scan(mhead, mbody)
-        return nil unless mhead
-        return nil unless mbody
-        return nil if mhead.keys.size.zero?
-        return nil if mbody.empty?
         return nil unless mhead['from'].downcase.start_with?('mail delivery subsystem','mailer-daemon', 'postmaster')
 
         agentname0 = ''   # [String] MDA name
@@ -102,7 +98,7 @@ module Sisimai
           # Check each line with each MDA's symbol regular expression.
           if agentname0 == ''
             # Try to match with each regular expression
-            next unless e.size > 0
+            next if e.empty?
             next unless e =~ MarkingsOf[:message]
 
             AgentNames.each_key do |f|
@@ -115,17 +111,18 @@ module Sisimai
 
           # Append error message lines to @linebuffer
           linebuffer << e
-          break unless e.size > 0
+          break if e.empty?
         end
-        return nil unless agentname0.size > 0
-        return nil unless linebuffer.size > 0
+        return nil if agentname0.empty?
+        return nil if linebuffer.empty?
 
         MessagesOf[agentname0.to_sym].each_key do |e|
           # Detect an error reason from message patterns of the MDA.
-          linebuffer.each do |f|
+          duplicated = linebuffer.dup
+          while f = duplicated.shift do
             # Whether the error message include each message defined in $MessagesOf
             g = f.downcase
-            next unless MessagesOf[agentname0.to_sym][e].find { |a| g.include?(a) }
+            next unless MessagesOf[agentname0.to_sym][e].any? { |a| g.include?(a) }
             reasonname = e.to_s
             bouncemesg = f
             break

data/lib/sisimai/message.rb

@@ -5,12 +5,11 @@ module Sisimai
   # method is not a bounce email, the method returns nil.
   class Message
     # Imported from p5-Sisimail/lib/Sisimai/Message.pm
-    require 'sisimai/arf'
-    require 'sisimai/mime'
     require 'sisimai/order'
     require 'sisimai/string'
-    require 'sisimai/rfc3834'
+    require 'sisimai/address'
     require 'sisimai/rfc5322'
+    require 'sisimai/smtp/error'
 
     @@rwaccessors = [
       :from,    # [String] UNIX From line
@@ -41,9 +40,8 @@ module Sisimai
 
       if input == 'email'
         # Sisimai::Message::Email
-        return nil unless email.size > 0
-        email = email.scrub('?')
-        email = email.gsub("\r\n", "\n")
+        return nil if email.empty?
+        email = email.scrub('?').gsub("\r\n", "\n")
         child = 'Sisimai::Message::Email'
 
       elsif input == 'json'

data/lib/sisimai/message/email.rb

@@ -8,9 +8,7 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Message/Email.pm
       require 'sisimai/arf'
       require 'sisimai/mime'
-      require 'sisimai/string'
       require 'sisimai/rfc3834'
-      require 'sisimai/rfc5322'
       require 'sisimai/order/email'
 
       @@ToBeLoaded = []
@@ -73,7 +71,7 @@ module Sisimai
 
         # 3. Check headers for detecting MTA modules
         if headerargv['tryonfirst'].empty?
-          headerargv['tryonfirst'].concat(Sisimai::Message::Email.makeorder(processing['header']))
+          headerargv['tryonfirst'] += Sisimai::Message::Email.makeorder(processing['header'])
         end
 
         # 4. Rewrite message body for detecting the bounce reason
@@ -121,7 +119,7 @@ module Sisimai
           next unless argvs[e].is_a? Array
           next if argvs[e].empty?
 
-          modulelist.concat(argvs['order']) if e == 'order'
+          modulelist += argvs['order'] if e == 'order'
           next unless e == 'load'
 
           # Load user defined MTA module
@@ -143,7 +141,7 @@ module Sisimai
           end
         end
 
-        modulelist.each do |e|
+        while e = modulelist.shift do
           # Append the custom order of MTA modules
           next if tobeloaded.index(e)
           tobeloaded << e
@@ -158,9 +156,9 @@ module Sisimai
       def self.divideup(email)
         return {} if email.empty?
 
-        email = email.scrub('?')
-        email = email.gsub(/\r\n/, "\n")  if email.include?("\r\n")
-        email = email.gsub(/[ \t]+$/, '') if email =~ /[ \t]+$/
+        email.scrub!('?')
+        email.gsub!(/\r\n/, "\n")  if email.include?("\r\n")
+        email.gsub!(/[ \t]+$/, '') if email =~ /[ \t]+$/
 
         hasdivided = email.split("\n")
         return {} if hasdivided.empty?
@@ -219,7 +217,7 @@ module Sisimai
         RFC3834Set.each { |e| allheaders[e] = true }
         MultiHeads.each_key { |e| structured[e.downcase] = [] }
         extheaders.each_key { |e| allheaders[e] = true }
-        if extrafield.size > 0
+        unless extrafield.empty?
           extrafield.each { |e| allheaders[e.downcase] = true }
         end
 
@@ -236,8 +234,7 @@ module Sisimai
             if MultiHeads.key?(currheader)
               # Such as 'Received' header, there are multiple headers in a single
               # email message.
-              rhs = rhs.tr("\t", ' ')
-              rhs = rhs.squeeze(' ')
+              rhs = rhs.tr("\t", ' ').squeeze(' ')
               structured[currheader] << rhs
             else
               # Other headers except "Received" and so on
@@ -282,9 +279,7 @@ module Sisimai
         SubjectTab.each_key do |e|
           # Get MTA list from the subject header
           next unless title.include?(e)
-
-          # Matched and push MTA list
-          order.concat(SubjectTab[e])
+          order += SubjectTab[e]  # Matched and push MTA list
           break
         end
         return order
@@ -298,8 +293,7 @@ module Sisimai
 
         # 1. Scrub to avoid "invalid byte sequence in UTF-8" exception (#82)
         # 2. Convert from string to hash reference
-        heads = heads.scrub('?')
-        heads = heads.gsub(/^[>]+[ ]/m, '')
+        heads = heads.scrub('?').gsub(/^[>]+[ ]/m, '')
 
         takenapart = {}
         hasdivided = heads.split("\n")
@@ -335,8 +329,7 @@ module Sisimai
               mimeborder[previousfn] = true
             else
               # ASCII Characters only: Not MIME-Encoded
-              e = e.lstrip
-              takenapart[previousfn] << e
+              takenapart[previousfn] << e.lstrip
               mimeborder[previousfn] ||= false
             end
           end
@@ -461,11 +454,11 @@ module Sisimai
         # Get the original text when the subject begins from 'fwd:' or 'fw:'
         if mailheader['subject'].downcase =~ /\A[ \t]*fwd?:/
           # Delete quoted strings, quote symbols(>)
-          bodystring = bodystring.gsub(/^[>]+[ ]/m, '')
-          bodystring = bodystring.gsub(/^[>]$/m, '')
+          bodystring = bodystring.gsub(/^[>]+[ ]/m, '').gsub(/^[>]$/m, '')
         end
         bodystring << EndOfEmail
         haveloaded = {}
+        defaultset = DefaultSet.dup
         scannedset = nil
 
         catch :SCANNER do
@@ -483,16 +476,15 @@ module Sisimai
               throw :SCANNER if scannedset
             end
 
-            tobeloaded.each do |r|
+            while r = tobeloaded.shift do
               # Call user defined MTA modules
               next if haveloaded[r]
-              #require r.gsub('::', '/').downcase
               scannedset = Module.const_get(r).scan(mailheader, bodystring)
               haveloaded[r] = true
               throw :SCANNER if scannedset
             end
 
-            tryonfirst.each do |r|
+            while r = tryonfirst.shift do
               # Try MTA module candidates which are detected from MTA specific
               # mail headers on first
               next if haveloaded.key?(r)
@@ -502,7 +494,7 @@ module Sisimai
               throw :SCANNER if scannedset
             end
 
-            DefaultSet.each do |r|
+            while r = defaultset.shift do
               # MTA modules which does not have MTA specific header and did
               # not match with any regular expressions of Subject header.
               next if haveloaded.key?(r)

data/lib/sisimai/message/json.rb

@@ -64,7 +64,7 @@ module Sisimai
           next unless argvs[e].is_a? Array
           next if argvs[e].empty?
 
-          modulelist.concat(argvs['order']) if e == 'order'
+          modulelist += argvs['order'] if e == 'order'
           next unless e == 'load'
 
           # Load user defined MTA(JSON) module
@@ -95,16 +95,14 @@ module Sisimai
       # @return        [Array]        Order of MTA(JSON) modules
       def self.makeorder(argvs)
         return [] unless argvs
-        return [] unless argvs.keys.size > 0
+        return [] if argvs.empty?
         order = []
 
         # Seek some key names from given argument
         ObjectKeys.each_key do |e|
           # Get MTA(JSON) module list matched with a specified key
           next unless argvs.key?(e)
-
-          # Matched and push it into the order list
-          order.concat(ObjectKeys[e])
+          order += ObjectKeys[e] # Matched and push it into the order list
           break
         end
         return order

data/lib/sisimai/mime.rb

@@ -28,7 +28,7 @@ module Sisimai
       def is_mimeencoded(argv1)
         return false unless argv1
 
-        argv1 = argv1.delete('"')
+        argv1.delete!('"')
         piece = []
         mime1 = false
 
@@ -48,12 +48,9 @@ module Sisimai
       end
 
       # Decode MIME-Encoded string
-      # @param    [Array] argvs   Reference to an array including MIME-Encoded text
+      # @param    [Array] argvs   An array including MIME-Encoded text
       # @return   [String]        MIME-Decoded text
       def mimedecode(argvs = [])
-        return '' unless argvs
-        return '' unless argvs.is_a? Array
-
         characterset = nil
         encodingname = nil
         mimeencoded0 = nil
@@ -61,10 +58,9 @@ module Sisimai
         notmimetext0 = ''
         notmimetext1 = ''
 
-        argvs.each do |e|
+        while e = argvs.shift do
           # Check and decode each element
-          e = e.strip
-          e = e.delete('"')
+          e = e.strip.delete('"')
 
           if self.is_mimeencoded(e)
             # MIME Encoded string
@@ -92,17 +88,17 @@ module Sisimai
           end
         end
 
-        return '' unless decodedtext0.size > 0
+        return '' if decodedtext0.empty?
         decodedtext1 = decodedtext0.join('')
 
         if characterset && encodingname
           # utf8 => UTF-8
-          characterset = 'UTF-8' if characterset.casecmp('UTF8').zero?
+          characterset = 'UTF-8' if characterset.casecmp('UTF8') == 0
 
-          unless characterset.casecmp('UTF-8').zero?
+          unless characterset.casecmp('UTF-8') == 0
             # Characterset is not UTF-8
             begin
-              decodedtext1 = decodedtext1.encode('UTF-8', characterset)
+              decodedtext1.encode!('UTF-8', characterset)
             rescue
               decodedtext1 = 'FAILED TO CONVERT THE SUBJECT'
             end
@@ -119,7 +115,7 @@ module Sisimai
       def qprintd(argv1 = nil, heads = {})
         return nil unless argv1
         return argv1.unpack('M').first unless heads['content-type']
-        return argv1.unpack('M').first unless heads['content-type'].size > 0
+        return argv1.unpack('M').first if heads['content-type'].empty?
 
         # Quoted-printable encoded part is the part of the text
         boundary00 = Sisimai::MIME.boundary(heads['content-type'], 0)
@@ -127,7 +123,7 @@ module Sisimai
         # Decoded using unpack('M') entire body string when the boundary string
         # or "Content-Transfer-Encoding: quoted-printable" are not included in
         # the message body.
-        return argv1.unpack('M').first if boundary00.size.zero?
+        return argv1.unpack('M').first if boundary00.empty?
         return argv1.unpack('M').first unless argv1.downcase =~ ReE[:'quoted-print']
 
         boundary01 = Sisimai::MIME.boundary(heads['content-type'], 1)
@@ -154,8 +150,7 @@ module Sisimai
               # The next boundary string has appeared
               # --=_gy7C4Gpes0RP4V5Bs9cK4o2Us2ZT57b-3OLnRN+4klS8dTmQ
               getencoded = Sisimai::String.to_utf8(notdecoded.unpack('M').first, encodename)
-              bodystring << getencoded
-              bodystring << e + "\n"
+              bodystring << getencoded << e + "\n"
 
               notdecoded = ''
               mimeinside = false
@@ -179,7 +174,7 @@ module Sisimai
                 mustencode = true
                 while true do
                   break if e.end_with?(' ', "\t")
-                  break if e.split('').find { |c| c.ord < 32 || c.ord > 126 }
+                  break if e.split('').any? { |c| c.ord < 32 || c.ord > 126 }
                   if e.end_with?('=')
                     # Padding character of Base64 or not
                     break if e =~ /[\+\/0-9A-Za-z]{32,}[=]+\z/
@@ -261,7 +256,7 @@ module Sisimai
           # Content-Type: multipart/report; report-type=delivery-status;
           #    boundary="n6H9lKZh014511.1247824040/mx.example.jp"
           value = cv[1]
-          value = value.delete(%q|'"|)
+          value.delete!(%q|'"|)
           value = '--' + value if start > -1
           value = value + '--' if start >  0
         end