sisimai 5.1.0 → 5.2.0

data/lib/sisimai/rfc5322.rb

@@ -2,7 +2,7 @@ module Sisimai
   # Sisimai::RFC5322 provide methods for checking email address.
   module RFC5322
     class << self
-      require 'sisimai/string'
+      require 'sisimai/rfc791'
       require 'sisimai/address'
       HeaderTable = {
         :messageid => %w[message-id],
@@ -12,16 +12,7 @@ module Sisimai
         :addresser => %w[from return-path reply-to errors-to reverse-path x-postfix-sender envelope-from x-envelope-from],
         :recipient => %w[to delivered-to forward-path envelope-to x-envelope-to resent-to apparently-to],
       }.freeze
-
-      build_flatten_rfc822header_list = lambda do
-        # Convert HEADER: structured hash table to flatten hash table for being called from Sisimai::Lhost::*
-        fv = {}
-        HeaderTable.each_value do |e|
-          e.each { |ee| fv[ee] = true }
-        end
-        return fv
-      end
-      HeaderIndex = build_flatten_rfc822header_list.call
+      def HEADERTABLE; return HeaderTable; end
 
       def FIELDINDEX
         return %w[
@@ -35,11 +26,10 @@ module Sisimai
 
       # Grouped RFC822 headers
       # @param    [Symbol] group  RFC822 Header group name
-      # @return   [Array,Hash]    RFC822 Header list
+      # @return   [Array]         RFC822 Header list
       def HEADERFIELDS(group = '')
-        return HeaderIndex if group.empty?
         return HeaderTable[group] if HeaderTable[group]
-        return HeaderTable
+        return []
       end
 
       # Fields that might be long
@@ -129,7 +119,7 @@ module Sisimai
           next if token[e].nil?
           next if token[e].empty?
           next unless token[e].start_with?('[')
-          token[e] = Sisimai::String.ipv4(token[e]).shift || ''
+          token[e] = Sisimai::RFC791.find(token[e]).shift || ''
         end
         token['from'] ||= ''
 
@@ -138,7 +128,7 @@ module Sisimai
           break if token['from'] == 'localhost'
           break if token['from'] == 'localhost.localdomain'
           break unless token['from'].include?('.')  # A hostname without a domain name
-          break unless Sisimai::String.ipv4(token['from']).empty?
+          break unless Sisimai::RFC791.find(token['from']).empty?
 
           # No need to rewrite token['from']
           right = true
@@ -223,7 +213,7 @@ module Sisimai
           # 1. Remove leading blank lines
           # 2. Remove text after the first blank line: \n\n
           # 3. Append "\n" at the end of test block when the last character is not "\n"
-          latterpart.sub!(/\A[\r\n\s]+/, '')
+          latterpart.sub!(/\A\s+/, '')
           if keeps == false
             #  Remove text after the first blank line: \n\n when "keeps" is false
             latterpart = latterpart[0, latterpart.index("\n\n")] if latterpart.include?("\n\n")

data/lib/sisimai/rfc791.rb

@@ -0,0 +1,69 @@
+module Sisimai
+  # Sisimai::RFC791 is a class related to the Internet host
+  module RFC791
+    class << self
+      # Returns 1 if the argument is an IPv4 address
+      # @param    [String] argv1  IPv4 address like "192.0.2.25"
+      # @return   [Bool]          1: is an IPv4 address
+      # @since v5.2.0
+      def is_ipv4address(argv0)
+        return false if argv0.nil? || argv0.size < 7
+        octet = argv0.split(/[.]/); return false if octet.size != 4
+
+        octet.each do |e|
+          # Check each octet is between 0 and 255
+          return false unless e =~ /\A[0-9]{1,3}\z/
+          v = e.to_i
+          return false if v < 0 || v > 255
+        end
+        return true
+      end
+      # Find an IPv4 address from the given string
+      # @param    [String] argv1  String including an IPv4 address
+      # @return   [Array]         List of IPv4 addresses
+      # @since v5.0.0
+      def find(argv0)
+        return nil if argv0.to_s.empty?
+        return []  if argv0.size < 7
+
+        ipv4a = []
+        %w|( ) [ ] ,|.each do |e|
+          # Rewrite: "mx.example.jp[192.0.2.1]" => "mx.example.jp 192.0.2.1"
+          p0 = argv0.index(e); next unless p0
+          argv0[p0, 1] = ' '
+        end
+
+        argv0.split(' ').each do |e|
+          # Find string including an IPv4 address
+          next unless e.index('.')  # IPv4 address must include "." character
+
+          lx = e.size; next if lx < 7 || lx > 17  # 0.0.0.0 = 7, [255.255.255.255] = 17
+          cu = 0  # Cursor for seeking each octet of an IPv4 address
+          as = '' # ASCII Code of each character
+          eo = '' # Buffer of each octet of IPv4 Address
+
+          while cu < lx
+            # Check whether each character is a number or "." or not
+            as  = e[cu, 1].ord
+            cu += 1
+
+            if as < 48 || as > 57
+              # The character is not a number(0-9)
+              break if as      != 46  # The character is not "."
+              next  if eo      == ''  # The current buffer is empty
+              break if eo.to_i > 255  # The current buffer is greater than 255
+              eo = ''
+              next
+            end
+            eo << as.chr
+            break if eo.to_i > 255
+          end
+          ipv4a << e if eo.size > 0 && eo.to_i < 256
+        end
+        return ipv4a
+      end
+
+    end
+  end
+end
+

data/lib/sisimai/rhost/aol.rb

@@ -0,0 +1,36 @@
+module Sisimai
+  module Rhost
+    # Sisimai::Rhost detects the bounce reason from the content of Sisimai::Fact object as an argument
+    # of find() method when the value of "rhost" of the object is "*.aol.com". This class is called
+    # only from Sisimai::Fact class.
+    module Aol
+      class << self
+        MessagesOf = {
+          "hostunknown" => ["Host or domain name not found"],
+          "notaccept"   => ["type=MX: Malformed or unexpected name server reply"],
+        }.freeze
+
+        # Detect bounce reason from Aol Mail: https://www.aol.com
+        # @param    [Sisimai::Fact] argvs   Decoded email object
+        # @return   [String]                The bounce reason for Aol
+        # @since v5.2.0
+        def find(argvs)
+          return "" if argvs["diagnosticcode"].empty?
+          issuedcode = argvs["diagnosticcode"]
+          reasontext = ""
+
+          MessagesOf.each_key do |e|
+            # Try to match the error message with message patterns defined in $MessagesOf
+            next unless MessagesOf[e].any? { |a| issuedcode.include?(a) }
+            reasontext = e
+            break
+          end
+
+          return reasontext
+        end
+
+      end
+    end
+  end
+end
+

data/lib/sisimai/rhost/apple.rb

@@ -1,7 +1,7 @@
 module Sisimai
   module Rhost
     # Sisimai::Rhost detects the bounce reason from the content of Sisimai::Fact object as an argument
-    # of get() method when the value of "destination" of the object is "mail.icloud.com" or "apple.com".
+    # of find() method when the value of "destination" of the object is "mail.icloud.com" or "apple.com".
     # This class is called only Sisimai::Fact class.
     module Apple
       class << self
@@ -69,7 +69,10 @@ module Sisimai
         #           https://www.postmastery.com/icloud-postmastery-page/
         #           https://smtpfieldmanual.com/provider/apple
         # @since v5.1.0
-        def get(argvs)
+        def find(argvs)
+          return '' unless argvs
+          return '' unless argvs['diagnosticcode'].size > 0
+
           issuedcode = argvs['diagnosticcode'].downcase
           reasontext = ''
 

data/lib/sisimai/rhost/cox.rb

@@ -1,7 +1,7 @@
 module Sisimai
   module Rhost
     # Sisimai::Rhost detects the bounce reason from the content of Sisimai::Fact object as an argument
-    # of get() method when the value of "destination" of the object is "charter.net". This class is
+    # of find() method when the value of "destination" of the object is "charter.net". This class is
     # called only Sisimai::Fact class.
     module Cox
       class << self
@@ -129,7 +129,8 @@ module Sisimai
         # @return   [String, Nil]           The bounce reason at Cox
         # @see      https://www.cox.com/residential/support/email-error-codes.html
         # @since v4.25.8
-        def get(argvs)
+        def find(argvs)
+          return "" if argvs["diagnosticcode"].empty?
           issuedcode = argvs['diagnosticcode']
           codenumber = 0
 

data/lib/sisimai/rhost/facebook.rb

@@ -0,0 +1,100 @@
+module Sisimai
+  module Rhost
+    # Sisimai::Rhost detects the bounce reason from the content of Sisimai::Fact object as an argument
+    # of find() method when the value of "rhost" of the object is "*.facebook.com". This class is
+    # called only from Sisimai::Fact class.
+    module Facebook
+      class << self
+        ErrorCodes = {
+          # http://postmaster.facebook.com/response_codes
+          # NOT TESTD EXCEPT RCP-P2
+          "authfailure" => [
+            "POL-P7",   # The message does not comply with Facebook's Domain Authentication requirements.
+          ],
+          "blocked" => [
+            "POL-P1",   # Your mail server's IP Address is listed on the Spamhaus PBL.
+            "POL-P2",   # Facebook will no longer accept mail from your mail server's IP Address.
+            "POL-P3",   # Facebook is not accepting messages from your mail server. This will persist for 4 to 8 hours.
+            "POL-P4",   # Facebook is not accepting messages from your mail server. This will persist for 24 to 48 hours.
+            "POL-T1",   # Facebook is not accepting messages from your mail server, but they may be retried later. This will persist for 1 to 2 hours.
+            "POL-T2",   # Facebook is not accepting messages from your mail server, but they may be retried later. This will persist for 4 to 8 hours.
+            "POL-T3",   # Facebook is not accepting messages from your mail server, but they may be retried later. This will persist for 24 to 48 hours.
+          ],
+          "contenterror" => [
+            "MSG-P2",   # The message contains an attachment type that Facebook does not accept.
+          ],
+          "filtered" => [
+            "RCP-P2",   # The attempted recipient's preferences prevent messages from being delivered.
+            "RCP-P3",   # The attempted recipient's privacy settings blocked the delivery.
+          ],
+          "mesgtoobig" => [
+            "MSG-P1",   # The message exceeds Facebook's maximum allowed size.
+            "INT-P2",   # The message exceeds Facebook's maximum allowed size.
+          ],
+          "notcompliantrfc" => [
+            "MSG-P3",   # The message contains multiple instances of a header field that can only be present once.
+          ],
+          "rejected" => [
+            "DNS-P1",   # Your SMTP MAIL FROM domain does not exist.
+            "DNS-P2",   # Your SMTP MAIL FROM domain does not have an MX record.
+            "DNS-T1",   # Your SMTP MAIL FROM domain exists but does not currently resolve.
+          ],
+          "requireptr" => [
+            "DNS-P3",   # Your mail server does not have a reverse DNS record.
+            "DNS-T2",   # You mail server's reverse DNS record does not currently resolve.
+          ],
+          "spamdetected" => [
+            "POL-P6",   # The message contains a url that has been blocked by Facebook.
+            "POL-P7",   # The message does not comply with Facebook's abuse policies and will not be accepted.
+          ],
+          "suspend" => [
+            "RCP-T4",   # The attempted recipient address is currently deactivated. The user may or may not reactivate it.
+          ],
+          "systemerror" => [
+            "RCP-T1",   # The attempted recipient address is not currently available due to an internal system issue. This is a temporary condition.
+          ],
+          "toomanyconn" => [
+            "CON-T1",   # Facebook's mail server currently has too many connections open to allow another one.
+            "CON-T2",   # Your mail server currently has too many connections open to Facebook's mail servers.
+            "CON-T3",   # Your mail server has opened too many new connections to Facebook's mail servers in a short period of time.
+            "CON-T4",   # Your mail server has exceeded the maximum number of recipients for its current connection.
+            "MSG-T1",   # The number of recipients on the message exceeds Facebook's allowed maximum.
+          ],
+          "userunknown" => [
+            "RCP-P1",   # The attempted recipient address does not exist.
+            "INT-P1",   # The attempted recipient address does not exist.
+            "INT-P3",   # The attempted recpient group address does not exist.
+            "INT-P4",   # The attempted recipient address does not exist.
+          ],
+          "virusdetected" => [
+            "POL-P5",   # The message contains a virus.
+          ],
+        }.freeze
+
+        # Detect bounce reason from Facebook
+        # @param    [Sisimai::Fact] argvs   Decoded email object
+        # @return   [String]                The bounce reason for Facebook
+        # @since v5.2.0
+        def find(argvs)
+          return "" if argvs["diagnosticcode"].empty?
+          return "" if argvs["diagnosticcode"].include?("-") == false
+
+          errorindex = argvs["diagnosticcode"].index("-")
+          errorlabel = argvs["diagnosticcode"][errorindex - 3, 6]
+          reasontext = ''
+
+          ErrorCodes.each_key do |e|
+            # The key is a bounce reason name
+            next unless ErrorCodes[e].any? { |a| errorlabel == a }
+            reasontext = e
+            break
+          end
+
+          return reasontext
+        end
+
+      end
+    end
+  end
+end
+

data/lib/sisimai/rhost/franceptt.rb

@@ -1,7 +1,7 @@
 module Sisimai
   module Rhost
     # Sisimai::Rhost detects the bounce reason from the content of Sisimai::Fact object as an argument
-    # of get() method when the value of "rhost" of the object is "*.laposte.net" or "*.orange.fr".
+    # of find() method when the value of "rhost" of the object is "*.laposte.net" or "*.orange.fr".
     # This class is called only Sisimai::Fact class.
     module FrancePTT
       class << self
@@ -127,7 +127,8 @@ module Sisimai
         # @return   [String]                The bounce reason for Orange or La Poste
         # @see      https://www.postmastery.com/orange-postmaster-smtp-error-codes-ofr/
         #           https://smtpfieldmanual.com/provider/orange
-        def get(argvs)
+        def find(argvs)
+          return "" if argvs["diagnosticcode"].empty?
           issuedcode = argvs['diagnosticcode']
           reasontext = ''
 

data/lib/sisimai/rhost/godaddy.rb

@@ -1,7 +1,7 @@
 module Sisimai
   module Rhost
     # Sisimai::Rhost detects the bounce reason from the content of Sisimai::Fact object as an argument
-    # of get() method when the value of "rhost" of the object is "*.secureserver.net". This class is
+    # of find() method when the value of "rhost" of the object is "*.secureserver.net". This class is
     # called only Sisimai::Fact class.
     module GoDaddy
       class << self
@@ -206,7 +206,8 @@ module Sisimai
         # @return   [String]                The bounce reason for GoDaddy
         # @see      https://ca.godaddy.com/help/fix-rejected-email-with-a-bounce-error-40685
         # @since v4.22.2
-        def get(argvs)
+        def find(argvs)
+          return "" if argvs["diagnosticcode"].empty?
           issuedcode = argvs['diagnosticcode']
           positionib = issuedcode.index(' IB') || -1
           reasontext = ''

data/lib/sisimai/rhost/google.rb

@@ -1,7 +1,7 @@
 module Sisimai
   module Rhost
     # Sisimai::Rhost detects the bounce reason from the content of Sisimai::Fact object as an argument
-    # of get() method when the value of "rhost" of the object is "aspmx.l.google.com". This class is
+    # of find() method when the value of "rhost" of the object is "aspmx.l.google.com". This class is
     # called only Sisimai::Fact class.
     module Google
       class << self
@@ -165,6 +165,22 @@ module Sisimai
             #   error messages. https://support.google.com/a/answer/3221692
             ['451', '4.4.2', 'timeout - closing connection'],
           ],
+          'failedstarttls' => [
+            # - 530 5.7.0 Must issue a STARTTLS command first. For more information, go to About
+            #   SMTP error messages and review RFC 3207 specifications.
+            ['530', '5.7.0', 'must issue a starttls command first'],
+            ['454', '5.5.1', 'starttls may not be repeated'],
+
+            # - 421 4.7.0 TLS required for RCPT domain, closing connection. For more information,
+            #   go to Email encryption in transit. https://support.google.com/mail/answer/6330403
+            ['421', '4.7.0', 'tls required for rcpt domain'],
+
+            # - 421 4.7.29 Your email has been rate limited because this message wasn't sent over a
+            #   TLS connection. Gmail requires all bulk email senders to use TLS/SSL for SMTP conn-
+            #   ections.
+            ['421', '4.7.29', 'senders to use tls/ssl for smtp'],
+            ['550', '5.7.29', 'senders to use tls/ssl for smtp'],
+          ],
           'mailboxfull' => [
             # - 452 4.2.2 The recipient's inbox is out of storage space.
             #   Please direct the recipient to https://support.google.com/mail/?p=OverQuotaTemp
@@ -322,12 +338,8 @@ module Sisimai
             ['550', '5.7.25', 'does not match the ip address of the hostname'],
           ],
           'securityerror' => [
-            # - 421 4.7.0 TLS required for RCPT domain, closing connection. For more information,
-            #   go to Email encryption in transit. https://support.google.com/mail/answer/6330403
-            #
             # - 454 4.7.0 Too many login attempts, please try again later. For more information, go
             #   to Add Gmail to another email client. https://support.google.com/mail/answer/7126229
-            ['421', '4.7.0', 'tls required for rcpt domain'],
             ['454', '4.7.0', 'too many login attempts'],
 
             # - 503 5.7.0 No identity changes permitted. For more information, go to About SMTP
@@ -356,12 +368,6 @@ module Sisimai
             #   https://support.google.com/accounts/troubleshooter/2402620
             ['535', '5.7.1', 'username and password not accepted'],
             ['535', '5.7.8', 'username and password not accepted'],
-
-            # - 421 4.7.29 Your email has been rate limited because this message wasn't sent over a
-            #   TLS connection. Gmail requires all bulk email senders to use TLS/SSL for SMTP conn-
-            #   ections.
-            ['421', '4.7.29', 'senders to use tls/ssl for smtp'],
-            ['550', '5.7.29', 'senders to use tls/ssl for smtp'],
           ],
           'spamdetected' => [
             # - 421 4.7.0 This message is suspicious due to the nature of the content or the links
@@ -422,7 +428,6 @@ module Sisimai
             ['454', '4.5.0',  'smtp protocol violation'],
             ['525', '5.7.10', 'smtp protocol violation'],
             ['535', '5.5.4',  'optional argument not permitted'],
-            ['454', '5.5.1',  'starttls may not be repeated'],
 
             # - 501 5.5.2 Syntax error, cannot decode response. For more information, go to About
             #   SMTP error messages.
@@ -451,10 +456,6 @@ module Sisimai
             ['503', '5.5.1', 'no data after bdat'],
             ['504', '5.7.4', 'unrecognized authentication type'],
             ['504', '5.7.4', 'xoauth is no longer supported'],
-
-            # - 530 5.7.0 Must issue a STARTTLS command first. For more information, go to About
-            #   SMTP error messages and review RFC 3207 specifications.
-            ['530', '5.7.0', 'must issue a starttls command first'],
             ['554', '5.7.0', 'too many unauthenticated commands'],
           ],
           'systemerror' => [
@@ -512,7 +513,8 @@ module Sisimai
         # @param    [Sisimai::Fact] argvs   Decoded email object
         # @return   [String]                The bounce reason for Google Workspace
         # @see      https://support.google.com/a/answer/3726730?hl=en
-        def get(argvs)
+        def find(argvs)
+          return "" if argvs["diagnosticcode"].empty?
           return '' unless Sisimai::SMTP::Reply.test(argvs['replycode'])
           return '' unless Sisimai::SMTP::Status.test(argvs['deliverystatus'])
 

data/lib/sisimai/rhost/gsuite.rb

@@ -0,0 +1,42 @@
+module Sisimai
+  module Rhost
+    # Sisimai::Rhost detects the bounce reason from the content of Sisimai::Fact object as an argument
+    # of find() method when the value of "rhost" of the object is "*.googlemail.com". This class is
+    # called only from Sisimai::Fact class.
+    module GSuite
+      class << self
+        MessagesOf = {
+          "hostunknown"  => [" responded with code NXDOMAIN", "Domain name not found"],
+          "networkerror" => [" had no relevant answers.", "responded with code NXDOMAIN", "Domain name not found"],
+          "notaccept"    => ["Null MX"],
+          "userunknown"  => ["because the address couldn't be found. Check for typos or unnecessary spaces and try again."],
+        }.freeze
+
+        # Detect bounce reason from Gsuite Mail: https://www.aol.com
+        # @param    [Sisimai::Fact] argvs   Decoded email object
+        # @return   [String]                The bounce reason for Gsuite
+        # @since v5.2.0
+        def find(argvs)
+          return "" if argvs["diagnosticcode"].empty?
+          statuscode = ""; statuscode = argvs["deliverystatus"][0, 1] if argvs["deliverystatus"].empty? == false
+          esmtpreply = ""; esmtpreply = argvs["replycode"][0, 1]      if argvs["replycode"].empty?      == false
+          reasontext = ""
+
+          MessagesOf.each_key do |e|
+            # Try to match the error message with message patterns defined in $MessagesOf
+            next unless MessagesOf[e].any? { |a| argvs["diagnosticcode"].include?(a) }
+            next if e == "networkerror" && (statuscode == "5" || esmtpreply == "5")
+            next if e == "hostunknown"  && (statuscode == "4" || statuscode == "")
+            next if e == "hostunknown"  && (esmtpreply == "4" || esmtpreply == "")
+            reasontext = e
+            break
+          end
+
+          return reasontext
+        end
+
+      end
+    end
+  end
+end
+

data/lib/sisimai/rhost/iua.rb

@@ -1,7 +1,7 @@
 module Sisimai
   module Rhost
     # Sisimai::Rhost detects the bounce reason from the content of Sisimai::Fact object as an argument
-    # of get() method when the value of "rhost" of the object is "*.email.ua". This class is called
+    # of find() method when the value of "rhost" of the object is "*.email.ua". This class is called
     # only Sisimai::Fact class.
     module IUA
       class << self
@@ -22,8 +22,8 @@ module Sisimai
         # Detect bounce reason from https://www.i.ua/
         # @param    [Sisimai::Fact] argvs   Decoded email object
         # @return   [String]                The bounce reason at https://www.i.ua/
-        def get(argvs)
-          return argvs['reason'] unless argvs['reason'].empty?
+        def find(argvs)
+          return "" if argvs["diagnosticcode"].empty?
           issuedcode = argvs['diagnosticcode'].downcase
           codenumber = issuedcode.index('.i.ua/err/') > 0 ? issuedcode[issuedcode.index('/err/') + 5, 2] : 0
           codenumber = codenumber[0, 1] if codenumber.index('/') == 1

data/lib/sisimai/rhost/kddi.rb

@@ -1,7 +1,7 @@
 module Sisimai
   module Rhost
     # Sisimai::Rhost detects the bounce reason from the content of Sisimai::Fact object as an argument
-    # of get() method when the value of "rhost" of the object is "lsean.ezweb.ne.jp" or "msmx.au.com".
+    # of find() method when the value of "rhost" of the object is "lsean.ezweb.ne.jp" or "msmx.au.com".
     # This class is called only Sisimai::Fact class.
     module KDDI
       class << self
@@ -14,7 +14,8 @@ module Sisimai
         # @param    [Sisimai::Fact] argvs   Decoded email object
         # @return   [String]                The bounce reason for au.com or ezweb.ne.jp
         # @since v4.22.6
-        def get(argvs)
+        def find(argvs)
+          return "" if argvs["diagnosticcode"].empty?
           issuedcode = argvs['diagnosticcode'].downcase
           reasontext = ''
 

data/lib/sisimai/rhost/messagelabs.rb

@@ -0,0 +1,37 @@
+module Sisimai
+  module Rhost
+    # Sisimai::Rhost detects the bounce reason from the content of Sisimai::Fact object as an argument
+    # of find() method when the value of "rhost" of the object is "*.messagelabs.com". This class is
+    # called only from Sisimai::Fact class.
+    module MessageLabs
+      class << self
+        MessagesOf = {
+          "securityerror" => ["Please turn on SMTP Authentication in your mail client"],
+          "userunknown"   => ["542 ", " Rejected", "No such user"],
+        }.freeze
+
+        # Detect bounce reason from Email Security (formerly MessageLabs.com)
+        # @param    [Sisimai::Fact] argvs   Decoded email object
+        # @return   [String]                The bounce reason for MessageLabs
+        # @see https://www.broadcom.com/products/cybersecurity/email
+        # @since v5.2.0
+        def find(argvs)
+          return "" if argvs["diagnosticcode"].empty?
+          issuedcode = argvs["diagnosticcode"]
+          reasontext = ""
+
+          MessagesOf.each_key do |e|
+            # Try to match the error message with message patterns defined in $MessagesOf
+            next unless MessagesOf[e].any? { |a| issuedcode.include?(a) }
+            reasontext = e
+            break
+          end
+
+          return reasontext
+        end
+
+      end
+    end
+  end
+end
+