whois-parser 1.0.1 → 2.0.0

data/lib/whois/scanners/iana.rb

@@ -13,8 +13,8 @@ module Whois
 
 
       tokenizer :scan_disclaimer do
-        if @input.match?(/^\%(.*?)\n/)
-          @ast["Disclaimer"] = _scan_lines_to_array(/\%(.*?)\n/).select { |line| line =~ /\w+/ }.join(" ")
+        if @input.match?(/^%(.*?)\n/)
+          @ast["Disclaimer"] = _scan_lines_to_array(/%(.*?)\n/).select { |line| line =~ /\w+/ }.join(" ")
         end
       end
 
@@ -23,15 +23,15 @@ module Whois
 
           # Adapt the section's name depending on the first line
           section = case @input[1].strip
-          when 'contact'
-            @input[2].strip # use the contact type name as identifier
-          when 'created', 'changed'
-            'dates'
-          when 'nserver'
-            'nameservers'
-          else
-            @input[1].strip # Default name is the first label found
-          end
+                    when 'contact'
+                      @input[2].strip # use the contact type name as identifier
+                    when 'created', 'changed'
+                      'dates'
+                    when 'nserver'
+                      'nameservers'
+                    else
+                      @input[1].strip # Default name is the first label found
+                    end
 
           content = parse_section_pairs
           @input.match?(/\n+/) || error("Unexpected end of section")
@@ -40,12 +40,12 @@ module Whois
       end
 
 
-    private
+      private
 
       def parse_section_pairs
         # Sets by default the firsts values found in the section parsing bellow
         section_name, section_value = @input[1].strip, @input[2].strip
-        #contents = {section_name =>  section_value}
+        # contents = {section_name =>  section_value}
 
         contents = {}
 
@@ -53,37 +53,37 @@ module Whois
           contents.merge!(content)
         end
 
-        if contents.has_key? section_name
+        if contents.key? section_name
           contents[section_name].insert(0, "#{section_value}\n")
         else
           contents[section_name] = section_value
         end
 
-        if !contents.empty?
-          contents
-        else
+        if contents.empty?
           false
+        else
+          contents
         end
       end
 
-        def parse_section_pair
-          if @input.scan(/^(.+):\s*(.+)\n/)
-            key     =  @input[1].strip
-            values  = [@input[2].strip]
+      def parse_section_pair
+        if @input.scan(/^(.+):\s*(.+)\n/)
+          key     =  @input[1].strip
+          values  = [@input[2].strip]
 
-            while value = parse_section_pair_newlinevalue(key)
-              values << value
-            end
-            { key => values.join("\n") }
+          while value = parse_section_pair_newlinevalue(key)
+            values << value
           end
+          { key => values.join("\n") }
         end
+      end
 
-          def parse_section_pair_newlinevalue(key)
-            if @input.scan(/^#{key}:\s*(.+)\n/)
-              @input[1].strip
-            end
-          end
+      def parse_section_pair_newlinevalue(key)
+        if @input.scan(/^#{key}:\s*(.+)\n/)
+          @input[1].strip
+        end
+      end
 
     end
   end
-end
+end

data/lib/whois/scanners/verisign.rb

@@ -21,12 +21,12 @@ module Whois
       tokenizer :scan_response_unavailable do
         # Check if the string starts with /*
         # If it does, match until the end of all /* lines
-        # or the end of the file and check for the content.
+        #  or the end of the file and check for the content.
         #
         # Flag the block as visited to force the scanner to ignore this tokenizer
-        # if already used and the content didn't match the unavailable message.
+        #  if already used and the content didn't match the unavailable message.
         if @input.match?(/^\*\n/) && !visited?
-          p = /^[^\*]|\z/
+          p = /^[^*]|\z/
           y = @input.check_until(p) =~ /^\* Sorry, the Whois database is currently down/
 
           if y

data/lib/whois/scanners/whois.cira.ca.rb

@@ -23,7 +23,7 @@ module Whois
       end
 
       tokenizer :scan_header do
-        if @input.scan(/^(.+?):\n/)
+        if !@input.match?(/^\s/) && @input.scan(/^(.+?):\n/)
           @tmp["group"] = @input[1]
         end
       end
@@ -35,13 +35,13 @@ module Whois
 
           # This is a nested key
           target = if start.index(" ") == 0
-            error!("Expected group.") if @tmp["group"].nil?
-            @ast[@tmp["group"]] ||= {}
-            @ast[@tmp["group"]]
-          else
-            @tmp.delete("group")
-            @ast
-          end
+                     error!("Expected group.") if @tmp["group"].nil?
+                     @ast[@tmp["group"]] ||= {}
+                     @ast[@tmp["group"]]
+                   else
+                     @tmp.delete("group")
+                     @ast
+                   end
 
           more  = _scan_lines_to_array(/^\s{#{start.size}}(.+)\n/)
           value = more.unshift(value).join("\n") unless more.empty?

data/lib/whois/scanners/whois.denic.de.rb

@@ -34,7 +34,7 @@ module Whois
         if @input.match?(/% Copyright \(c\) *\d{4} by DENIC\n/)
           @input.scan_until(/% Terms and Conditions of Use\n/)
           lines = []
-          while @input.match?(/%/) && @input.scan(/%(.*)\n/)
+          while @input.match?(/%/) && @input.scan(/%(.*)\n/) # rubocop:disable Style/WhileUntilModifier
             lines << @input[1].strip unless @input[1].strip == ""
           end
           @ast["Disclaimer"] = lines.join(" ")
@@ -65,7 +65,7 @@ module Whois
             "fax" => contact['Fax'],
             "email" => contact['Email'],
             "created_on" => nil,
-            "updated_on" => contact['Changed']
+            "updated_on" => contact['Changed'],
           }
         end
       end
@@ -78,7 +78,7 @@ module Whois
       private
 
       def parse_pair(store)
-        if @input.scan(/([^  \[]*):(.*)\n/)
+        if @input.scan(/([^ \[]*):(.*)\n/)
           key, value = @input[1].strip, @input[2].strip
           if store[key].nil?
             store[key] = value

data/lib/whois/scanners/whois.fi.rb

@@ -11,7 +11,7 @@ module Whois
           :scan_available,
           :scan_disclaimer,
           :scan_keyvalue,
-          :scan_reserved
+          :scan_reserved,
       ]
 
 

data/lib/whois/scanners/whois.nic.it.rb

@@ -61,10 +61,10 @@ module Whois
         while content = parse_section_pair
           contents.merge!(content)
         end
-        if !contents.empty?
-          contents
-        else
+        if contents.empty?
           false
+        else
+          contents
         end
       end
 

data/lib/whois/scanners/whois.pir.org.rb

@@ -8,7 +8,7 @@ module Whois
 
       tokenizer :scan_disclaimer do
         if @input.match?(/^Access to/)
-          @ast["field:disclaimer"] = _scan_lines_to_array(/^(.+)\n/).join(" ")
+          @ast["field:disclaimer"] = _scan_lines_to_array(/^(.+)(\n+)/).join(" ")
         end
       end
     end

data/lib/whois/scanners/whois.smallregistry.net.rb

@@ -40,8 +40,8 @@ module Whois
 
       tokenizer :scan_body do
         str = @input.rest
-        str.gsub!(/ (![\w]+) \n/, " \n") # remove custom types
-        @ast.merge! YAML.load(str)
+        str.gsub!(/ (!\w+) \n/, " \n") # remove custom types
+        @ast.merge! YAML.safe_load(str)
         @input.terminate
       end
 

data/lib/whois/scanners/whois.tld.ee.rb

@@ -11,7 +11,7 @@ module Whois
           :skip_head,
           :scan_section,
           :skip_empty_line,
-          :scan_disclaimer
+          :scan_disclaimer,
       ]
 
 
@@ -35,7 +35,7 @@ module Whois
       end
 
       tokenizer :skip_end do
-        @input.skip(/^More information at http:\/\/internet.ee\n?/)
+        @input.skip(%r{^More information at http://internet.ee\n?})
       end
 
       tokenizer :scan_disclaimer do

data/lib/whois/scanners/whois.yoursrs.com.rb

@@ -13,7 +13,7 @@ module Whois
 
 
       tokenizer :scan_available do
-        if @input.scan(/^No match for [\w\.]+/)
+        if @input.scan(/^No match for [\w.]+/)
           @ast["status:available"] = true
         end
       end

data/lib/whois-parser.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2015 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 

data/spec/fixtures/referrals/afilias.bz.txt

@@ -0,0 +1,40 @@
+Access to CCTLD WHOIS information is provided to assist persons in 
+determining the contents of a domain name registration record in the 
+Afilias registry database. The data in this record is provided by 
+Afilias Limited for informational purposes only, and Afilias does not 
+guarantee its accuracy.  This service is intended only for query-based 
+access. You agree that you will use this data only for lawful purposes 
+and that, under no circumstances will you use this data to: (a) allow, 
+enable, or otherwise support the transmission by e-mail, telephone, or 
+facsimile of mass unsolicited, commercial advertising or solicitations 
+to entities other than the data recipient's own existing customers; or 
+(b) enable high volume, automated, electronic processes that send 
+queries or data to the systems of Registry Operator, a Registrar, or 
+Afilias except as reasonably necessary to register domain names or 
+modify existing registrations. All rights reserved. Afilias reserves 
+the right to modify these terms at any time. By submitting this query, 
+you agree to abide by this policy. 
+
+Domain ID:D355891-LRCC
+Domain Name:BELIZENIC.BZ
+Created On:30-Apr-2001 19:00:00 UTC
+Last Updated On:17-Mar-2009 15:34:51 UTC
+Expiration Date:30-Apr-2010 19:00:00 UTC
+Sponsoring Registrar:University Management Limited (R113-LRCC)
+Whois Server:whois.belizenic.bz
+Referral URL:http://www.belizenic.bz
+Status:OK
+Name Server:NS1.BELIZENIC.BZ
+Name Server:PIXIE.UCB.EDU.BZ
+Name Server: 
+Name Server: 
+Name Server: 
+Name Server: 
+Name Server: 
+Name Server: 
+Name Server: 
+Name Server: 
+Name Server: 
+Name Server: 
+Name Server: 
+

data/spec/fixtures/referrals/arin_referral_apnic.txt

@@ -0,0 +1,78 @@
+
+#
+# ARIN WHOIS data and services are subject to the Terms of Use
+# available at: https://www.arin.net/whois_tou.html
+#
+# If you see inaccuracies in the results, please report at
+# http://www.arin.net/public/whoisinaccuracy/index.xhtml
+#
+
+
+#
+# Query terms are ambiguous.  The query is assumed to be:
+#     "n 144.134.121.81"
+#
+# Use "?" to get help.
+#
+
+#
+# The following results may also be obtained via:
+# http://whois.arin.net/rest/nets;q=144.134.121.81?showDetails=true&showARIN=false&ext=netref2
+#
+
+NetRange:       144.130.0.0 - 144.140.255.255
+CIDR:           144.132.0.0/14, 144.136.0.0/14, 144.130.0.0/15, 144.140.0.0/16
+OriginAS:
+NetName:        APNIC-ERX-144-130-0-0
+NetHandle:      NET-144-130-0-0-1
+Parent:         NET-144-0-0-0-0
+NetType:        Early Registrations, Transferred to APNIC
+Comment:        This IP address range is not registered in the ARIN database.
+Comment:        This range was transferred to the APNIC Whois Database as
+Comment:        part of the ERX (Early Registration Transfer) project.
+Comment:        For details, refer to the APNIC Whois Database via
+Comment:        WHOIS.APNIC.NET or http://wq.apnic.net/apnic-bin/whois.pl
+Comment:
+Comment:        ** IMPORTANT NOTE: APNIC is the Regional Internet Registry
+Comment:        for the Asia Pacific region.  APNIC does not operate networks
+Comment:        using this IP address range and is not able to investigate
+Comment:        spam or abuse reports relating to these addresses.  For more
+Comment:        help, refer to http://www.apnic.net/apnic-info/whois_search2/abuse-and-spamming
+RegDate:        2004-01-07
+Updated:        2009-10-08
+Ref:            http://whois.arin.net/rest/net/NET-144-130-0-0-1
+
+OrgName:        Asia Pacific Network Information Centre
+OrgId:          APNIC
+Address:        PO Box 3646
+City:           South Brisbane
+StateProv:      QLD
+PostalCode:     4101
+Country:        AU
+RegDate:
+Updated:        2012-01-24
+Ref:            http://whois.arin.net/rest/org/APNIC
+
+ReferralServer: whois://whois.apnic.net
+
+OrgTechHandle: AWC12-ARIN
+OrgTechName:   APNIC Whois Contact
+OrgTechPhone:  +61 7 3858 3188
+OrgTechEmail:  search-apnic-not-arin@apnic.net
+OrgTechRef:    http://whois.arin.net/rest/poc/AWC12-ARIN
+
+OrgAbuseHandle: AWC12-ARIN
+OrgAbuseName:   APNIC Whois Contact
+OrgAbusePhone:  +61 7 3858 3188
+OrgAbuseEmail:  search-apnic-not-arin@apnic.net
+OrgAbuseRef:    http://whois.arin.net/rest/poc/AWC12-ARIN
+
+
+#
+# ARIN WHOIS data and services are subject to the Terms of Use
+# available at: https://www.arin.net/whois_tou.html
+#
+# If you see inaccuracies in the results, please report at
+# http://www.arin.net/public/whoisinaccuracy/index.xhtml
+#
+

data/spec/fixtures/referrals/arin_referral_missing.txt

@@ -0,0 +1,52 @@
+#
+# The following results may also be obtained via:
+# http://whois.arin.net/rest/nets;q=4.2.2.1?showDetails=true&showARIN=false&ext=netref2
+#
+
+NetRange:       4.0.0.0 - 4.255.255.255
+CIDR:           4.0.0.0/8
+OriginAS:       
+NetName:        LVLT-ORG-4-8
+NetHandle:      NET-4-0-0-0-1
+Parent:         
+NetType:        Direct Allocation
+RegDate:        1992-12-01
+Updated:        2012-02-24
+Ref:            http://whois.arin.net/rest/net/NET-4-0-0-0-1
+
+
+OrgName:        Level 3 Communications, Inc.
+OrgId:          LVLT
+Address:        1025 Eldorado Blvd.
+City:           Broomfield
+StateProv:      CO
+PostalCode:     80021
+Country:        US
+RegDate:        1998-05-22
+Updated:        2012-01-30
+Comment:        ADDRESSES WITHIN THIS BLOCK ARE NON-PORTABLE
+Ref:            http://whois.arin.net/rest/org/LVLT
+
+OrgTechHandle: IPADD5-ARIN
+OrgTechName:   ipaddressing
+OrgTechPhone:  +1-877-453-8353 
+OrgTechEmail:  ipaddressing@level3.com
+OrgTechRef:    http://whois.arin.net/rest/poc/IPADD5-ARIN
+
+OrgNOCHandle: NOCSU27-ARIN
+OrgNOCName:   NOC Support
+OrgNOCPhone:  +1-877-453-8353 
+OrgNOCEmail:  noc.coreip@level3.com
+OrgNOCRef:    http://whois.arin.net/rest/poc/NOCSU27-ARIN
+
+OrgAbuseHandle: APL8-ARIN
+OrgAbuseName:   Abuse POC LVLT
+OrgAbusePhone:  +1-877-453-8353 
+OrgAbuseEmail:  security@level3.com
+OrgAbuseRef:    http://whois.arin.net/rest/poc/APL8-ARIN
+
+#
+# ARIN WHOIS data and services are subject to the Terms of Use
+# available at: https://www.arin.net/whois_tou.html
+#
+

data/spec/fixtures/referrals/arin_referral_ripe.txt

@@ -0,0 +1,50 @@
+% This is the RIPE Database query service.
+% The objects are in RPSL format.
+%
+% The RIPE Database is subject to Terms and Conditions.
+% See http://www.ripe.net/db/support/db-terms-conditions.pdf
+
+% Note: this output has been filtered.
+%       To receive output for a database update, use the "-B" flag.
+
+% Information related to '128.79.0.0 - 128.79.63.0'
+
+inetnum:        128.79.0.0 - 128.79.63.0
+netname:        BOUYGTEL-ISP-CABLE
+descr:          Pool for Broadband CABLE customers
+remarks:        INFRA-AW
+country:        FR
+admin-c:        NOCB1-RIPE
+tech-c:         NOCB1-RIPE
+status:         ASSIGNED PA
+mnt-by:         BYTEL-MNT
+mnt-lower:      BYTEL-MNT
+mnt-routes:     BYTEL-MNT
+source:         RIPE # Filtered
+
+role:           Network Operation Centre Bouygues Telecom FAI
+remarks:        Bouygues Telecom ISP
+address:        Bouygues Telecom
+address:        13-15 avenue du Marechal Juin
+address:        92366 Meudon-la-Foret cedex
+address:        France
+abuse-mailbox:  abuse_box@bouyguestelecom.fr
+admin-c:        LH761-RIPE
+admin-c:        FT4354-RIPE
+tech-c:         LH761-RIPE
+tech-c:         FT4354-RIPE
+nic-hdl:        NOCB1-RIPE
+mnt-by:         BYTEL-MNT
+source:         RIPE # Filtered
+
+% Information related to '128.78.0.0/15AS5410'
+
+route:          128.78.0.0/15
+descr:          BOUYGUES Telecom ISP Wireline
+origin:         AS5410
+mnt-by:         BYTEL-MNT
+source:         RIPE # Filtered
+
+% This query was served by the RIPE Database Query Service version 1.66.3 (WHOIS2)
+
+

data/spec/fixtures/referrals/arin_referral_rwhois.txt

@@ -0,0 +1,63 @@
+
+#
+# ARIN WHOIS data and services are subject to the Terms of Use
+# available at: https://www.arin.net/whois_tou.html
+#
+
+
+#
+# The following results may also be obtained via:
+# http://whois.arin.net/rest/nets;q=69.65.39.166?showDetails=true&showARIN=false&ext=netref2
+#
+
+NetRange:       69.65.0.0 - 69.65.63.255
+CIDR:           69.65.0.0/18
+OriginAS:       AS32181
+NetName:        IPNAP
+NetHandle:      NET-69-65-0-0-1
+Parent:         NET-69-0-0-0-0
+NetType:        Direct Allocation
+Comment:        www.gigenet.com
+RegDate:        2003-07-30
+Updated:        2013-05-09
+Ref:            http://whois.arin.net/rest/net/NET-69-65-0-0-1
+
+OrgName:        GigeNET
+OrgId:          DMPL
+Address:        545 E Algonquin Rd
+Address:        Suite D
+City:           Arlington Heights
+StateProv:      IL
+PostalCode:     60005
+Country:        US
+RegDate:        2011-03-04
+Updated:        2011-06-23
+Comment:        http://www.gigenet.com
+Ref:            http://whois.arin.net/rest/org/DMPL
+
+ReferralServer: rwhois://rwhois.servernap.net:4321
+
+OrgAbuseHandle: ABUSE2935-ARIN
+OrgAbuseName:   Abuse Department
+OrgAbusePhone:  +1-800-561-2656 
+OrgAbuseEmail:  abuse@gigenet.com
+OrgAbuseRef:    http://whois.arin.net/rest/poc/ABUSE2935-ARIN
+
+OrgNOCHandle: IPADM152-ARIN
+OrgNOCName:   IP Administrator
+OrgNOCPhone:  +1-800-561-2656 
+OrgNOCEmail:  ip-admin@coloquest.com
+OrgNOCRef:    http://whois.arin.net/rest/poc/IPADM152-ARIN
+
+OrgTechHandle: IPADM152-ARIN
+OrgTechName:   IP Administrator
+OrgTechPhone:  +1-800-561-2656 
+OrgTechEmail:  ip-admin@coloquest.com
+OrgTechRef:    http://whois.arin.net/rest/poc/IPADM152-ARIN
+
+
+#
+# ARIN WHOIS data and services are subject to the Terms of Use
+# available at: https://www.arin.net/whois_tou.html
+#
+

data/spec/fixtures/referrals/arin_referral_servernap.txt

@@ -0,0 +1,63 @@
+
+#
+# ARIN WHOIS data and services are subject to the Terms of Use
+# available at: https://www.arin.net/whois_tou.html
+#
+
+
+#
+# The following results may also be obtained via:
+# http://whois.arin.net/rest/nets;q=69.65.39.166?showDetails=true&showARIN=false&ext=netref2
+#
+
+NetRange:       69.65.0.0 - 69.65.63.255
+CIDR:           69.65.0.0/18
+OriginAS:       AS32181
+NetName:        IPNAP
+NetHandle:      NET-69-65-0-0-1
+Parent:         NET-69-0-0-0-0
+NetType:        Direct Allocation
+Comment:        www.gigenet.com
+RegDate:        2003-07-30
+Updated:        2013-05-09
+Ref:            http://whois.arin.net/rest/net/NET-69-65-0-0-1
+
+OrgName:        GigeNET
+OrgId:          DMPL
+Address:        545 E Algonquin Rd
+Address:        Suite D
+City:           Arlington Heights
+StateProv:      IL
+PostalCode:     60005
+Country:        US
+RegDate:        2011-03-04
+Updated:        2011-06-23
+Comment:        http://www.gigenet.com
+Ref:            http://whois.arin.net/rest/org/DMPL
+
+ReferralServer: rwhois://rwhois.servernap.net:4321
+
+OrgAbuseHandle: ABUSE2935-ARIN
+OrgAbuseName:   Abuse Department
+OrgAbusePhone:  +1-800-561-2656 
+OrgAbuseEmail:  abuse@gigenet.com
+OrgAbuseRef:    http://whois.arin.net/rest/poc/ABUSE2935-ARIN
+
+OrgNOCHandle: IPADM152-ARIN
+OrgNOCName:   IP Administrator
+OrgNOCPhone:  +1-800-561-2656 
+OrgNOCEmail:  ip-admin@coloquest.com
+OrgNOCRef:    http://whois.arin.net/rest/poc/IPADM152-ARIN
+
+OrgTechHandle: IPADM152-ARIN
+OrgTechName:   IP Administrator
+OrgTechPhone:  +1-800-561-2656 
+OrgTechEmail:  ip-admin@coloquest.com
+OrgTechRef:    http://whois.arin.net/rest/poc/IPADM152-ARIN
+
+
+#
+# ARIN WHOIS data and services are subject to the Terms of Use
+# available at: https://www.arin.net/whois_tou.html
+#
+

data/spec/fixtures/referrals/arin_referral_whois.txt

@@ -0,0 +1,56 @@
+#
+# Query terms are ambiguous.  The query is assumed to be:
+#     "n 130.66.76.222"
+#
+# Use "?" to get help.
+#
+
+#
+# The following results may also be obtained via:
+# http://whois.arin.net/rest/nets;q=130.66.76.222?showDetails=true&showARIN=false&ext=netref2
+#
+
+NetRange:       130.66.0.0 - 130.67.255.255
+CIDR:           130.66.0.0/15
+OriginAS:       
+NetName:        RIPE-ERX-130-66-0-0
+NetHandle:      NET-130-66-0-0-1
+Parent:         NET-130-0-0-0-0
+NetType:        Early Registrations, Transferred to RIPE NCC
+Comment:        These addresses have been further assigned to users in
+Comment:        the RIPE NCC region.  Contact information can be found in
+Comment:        the RIPE database at http://www.ripe.net/whois
+RegDate:        2003-11-12
+Updated:        2003-11-12
+Ref:            http://whois.arin.net/rest/net/NET-130-66-0-0-1
+
+OrgName:        RIPE Network Coordination Centre
+OrgId:          RIPE
+Address:        P.O. Box 10096
+City:           Amsterdam
+StateProv:      
+PostalCode:     1001EB
+Country:        NL
+RegDate:        
+Updated:        2011-09-24
+Ref:            http://whois.arin.net/rest/org/RIPE
+
+ReferralServer: whois://whois.ripe.net:43
+
+OrgAbuseHandle: RNO29-ARIN
+OrgAbuseName:   RIPE NCC Operations
+OrgAbusePhone:  +31 20 535 4444 
+OrgAbuseEmail:  hostmaster@ripe.net
+OrgAbuseRef:    http://whois.arin.net/rest/poc/RNO29-ARIN
+
+OrgTechHandle: RNO29-ARIN
+OrgTechName:   RIPE NCC Operations
+OrgTechPhone:  +31 20 535 4444 
+OrgTechEmail:  hostmaster@ripe.net
+OrgTechRef:    http://whois.arin.net/rest/poc/RNO29-ARIN
+
+#
+# ARIN WHOIS data and services are subject to the Terms of Use
+# available at: https://www.arin.net/whois_tou.html
+#
+