whois 2.6.1 → 2.6.2

data/lib/whois/record/scanners/base.rb

@@ -62,20 +62,33 @@ module Whois
       protected
 
         def _scan_lines_to_array(pattern)
-          lines = []
+          results = []
           while @input.scan(pattern)
             @input[1].strip
-            lines << @input[1].strip
+            results << @input[1].strip
           end
-          lines
+          results
         end
 
         def _scan_lines_to_hash(pattern)
-          lines = {}
+          results = {}
           while @input.scan(pattern)
-            lines.merge! @input[1].strip => @input[2].strip
+            results.merge! @input[1].strip => @input[2].strip
+          end
+          results
+        end
+
+        def _scan_keyvalues(pattern)
+          results = []
+          while @input.scan(/(.+?):(.*?)\n/)
+            key, value = @input[1].strip, @input[2].strip
+            if results[key].nil?
+              results[key] = value
+            else
+              results[key] = Array.wrap(results[key])
+              results[key] << value
+            end
           end
-          lines
         end
 
       private

data/lib/whois/record/scanners/whois.ati.tn.rb

@@ -16,7 +16,7 @@ module Whois
 
       # Scanner for the whois.ati.tn record.
       #
-      # @since RELEASE
+      # @since 2.6.0
       class WhoisAtiTn < Base
 
         self.tokenizers += [

data/lib/whois/record/scanners/whois.registry.om.rb

@@ -16,7 +16,7 @@ module Whois
 
       # Scanner for the whois.registry.om record.
       #
-      # @since RELEASE
+      # @since 2.6.0
       class WhoisRegistryOm < Base
 
         self.tokenizers += [

data/lib/whois/record/scanners/whois.rnids.rs.rb

@@ -22,15 +22,15 @@ module Whois
         self.tokenizers += [
             :scan_available,
             :skip_comment,
-            :flag_group_start,
-            :scan_group_keyvalue,
-            :flag_group_end,
+            :flag_section_start,
+            :scan_section_keyvalue,
+            :flag_section_end,
             :skip_empty_line,
             :skip_privacy,
         ]
 
 
-        GROUPS = ["Owner", "Administrative contact", "Technical contact"]
+        SECTIONS = ["Owner", "Administrative contact", "Technical contact"]
 
         tokenizer :scan_available do
           if @input.scan(/^%ERROR:103: Domain is not registered/)
@@ -38,23 +38,23 @@ module Whois
           end
         end
 
-        tokenizer :flag_group_start do
-          if GROUPS.any? { |group| @input.check(/^(#{group}):/) }
-            @tmp["group"] = @input[1]
+        tokenizer :flag_section_start do
+          if SECTIONS.any? { |section| @input.check(/^(#{section}):/) }
+            @tmp["section"] = @input[1]
           end
           false
         end
 
-        tokenizer :flag_group_end do
+        tokenizer :flag_section_end do
           if @input.match?(/^\n/)
-            @tmp.delete("group")
+            @tmp.delete("section")
           end
         end
 
-        tokenizer :scan_group_keyvalue do
+        tokenizer :scan_section_keyvalue do
           if @input.scan(/(.+?):(.*?)\n/)
             key, value = @input[1].strip, @input[2].strip
-            target = @tmp["group"] ? (@ast[@tmp["group"]] ||= {}) : @ast
+            target = @tmp["section"] ? (@ast[@tmp["section"]] ||= {}) : @ast
 
             if target[key].nil?
               target[key] = value

data/lib/whois/record/scanners/whois.sx.rb

@@ -0,0 +1,81 @@
+#--
+# Ruby Whois
+#
+# An intelligent pure Ruby WHOIS client and parser.
+#
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+#++
+
+
+require 'whois/record/scanners/base'
+
+
+module Whois
+  class Record
+    module Scanners
+
+      # Scanner for the whois.sx record.
+      #
+      # @since RELEASE
+      class WhoisSx < Base
+
+        self.tokenizers += [
+            :skip_header,
+            :skip_comments,
+            :skip_empty_line,
+            :flag_section_start,
+            :flag_section_end,
+            :scan_section,
+            :scan_keyvalue,
+        ]
+
+
+        tokenizer :skip_header do
+          if @input.pos == 0 && @input.match?(/^\[/)
+            @input.skip_until(/\n/)
+          end
+        end
+
+        tokenizer :skip_comments do
+          if @input.match?(/^%/)
+            @input.skip_until(/\n/)
+          end
+        end
+
+        tokenizer :flag_section_start do
+          if @input.scan(/(.+?):\n/)
+            @tmp['section'] = @input[1].strip
+          end
+        end
+
+        tokenizer :flag_section_end do
+          # if @input.match?(/^\n/)
+          #   @tmp.delete('section')
+          # end
+        end
+
+        tokenizer :scan_section do
+          if @tmp['section']
+            lines = _scan_lines_to_array(/^(.+)\n/)
+
+            # Check all lines to be sure there is no case where a value containing a :
+            # is misinterpreted as key : value.
+
+            # The section is a hash
+            value = if lines.all? { |line| line.index(':', 1) }
+              Hash[lines.map { |line| line.split(':', 2).map(&:strip) }]
+            # The section is an array of values
+            else
+              lines
+            end
+
+            @ast[@tmp['section']] = value
+            @tmp.delete('section')
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/whois/version.rb

@@ -13,7 +13,7 @@ module Whois
   module Version
     MAJOR = 2
     MINOR = 6
-    PATCH = 1
+    PATCH = 2
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join(".")

data/spec/fixtures/responses/whois.networksolutions.com/property_contacts_short.expected

@@ -0,0 +1,47 @@
+
+#registrant_contacts
+  should: %s CLASS(array)
+  should: %s SIZE(1)
+  should: %s[0] CLASS(contact)
+  should: %s[0].type         == Whois::Record::Contact::TYPE_REGISTRANT
+  should: %s[0].organization == "mpowers LLC"
+  should: %s[0].address      == "21010 Southbank St #575"
+  should: %s[0].city         == "Potomac Falls"
+  should: %s[0].zip          == "20165"
+  should: %s[0].state        == "VA"
+  should: %s[0].country_code == "US"
+  should: %s[0].phone        == nil
+  should: %s[0].fax          == nil
+  should: %s[0].email        == nil
+
+#admin_contacts
+  should: %s CLASS(array)
+  should: %s SIZE(1)
+  should: %s[0] CLASS(contact)
+  should: %s[0].type         == Whois::Record::Contact::TYPE_ADMIN
+  should: %s[0].name         == "mpowers LLC"
+  should: %s[0].organization == nil
+  should: %s[0].address      == "21010 Southbank St #575"
+  should: %s[0].city         == "Potomac Falls"
+  should: %s[0].zip          == "20165"
+  should: %s[0].state        == "VA"
+  should: %s[0].country_code == "US"
+  should: %s[0].phone        == "+1.5712832829"
+  should: %s[0].fax          == nil
+  should: %s[0].email        == "michael@mpowers.net"
+
+#technical_contacts
+  should: %s CLASS(array)
+  should: %s SIZE(1)
+  should: %s[0] CLASS(contact)
+  should: %s[0].type         == Whois::Record::Contact::TYPE_TECHNICAL
+  should: %s[0].name         == "mpowers LLC"
+  should: %s[0].organization == nil
+  should: %s[0].address      == "21010 Southbank St #575"
+  should: %s[0].city         == "Potomac Falls"
+  should: %s[0].zip          == "20165"
+  should: %s[0].state        == "VA"
+  should: %s[0].country_code == "US"
+  should: %s[0].phone        == "+1.5712832829"
+  should: %s[0].fax          == nil
+  should: %s[0].email        == "michael@mpowers.net"

data/spec/fixtures/responses/whois.networksolutions.com/property_contacts_short.txt

@@ -0,0 +1,61 @@
+NOTICE AND TERMS OF USE: You are not authorized to access or query our WHOIS
+database through the use of high-volume, automated, electronic processes. The
+Data in Network Solutions' WHOIS database is provided by Network Solutions for information
+purposes only, and to assist persons in obtaining information about or related
+to a domain name registration record. Network Solutions does not guarantee its accuracy.
+By submitting a WHOIS query, you agree to abide by the following terms of use:
+You agree that you may use this Data only for lawful purposes and that under no
+circumstances will you use this Data to: (1) allow, enable, or otherwise support
+the transmission of mass unsolicited, commercial advertising or solicitations
+via e-mail, telephone, or facsimile; or (2) enable high volume, automated,
+electronic processes that apply to Network Solutions (or its computer systems). The
+compilation, repackaging, dissemination or other use of this Data is expressly
+prohibited without the prior written consent of Network Solutions. You agree not to use
+high-volume, automated, electronic processes to access or query the WHOIS
+database. Network Solutions reserves the right to terminate your access to the WHOIS
+database in its sole discretion, including without limitation, for excessive
+querying of the WHOIS database or for failure to otherwise abide by this policy.
+Network Solutions reserves the right to modify these terms at any time.
+
+Get a FREE domain name registration, transfer, or renewal with any annual hosting package.
+
+http://www.networksolutions.com
+
+Visit AboutUs.org for more information about APPTAP.COM
+<a href="http://www.aboutus.org/APPTAP.COM">AboutUs: APPTAP.COM </a>
+
+
+
+
+Registrant:
+mpowers LLC
+   21010 Southbank St #575
+   Potomac Falls, VA 20165
+   US
+
+   Domain Name: APPTAP.COM
+
+   ------------------------------------------------------------------------
+   Promote your business to millions of viewers for only $1 a month
+   Learn how you can get an Enhanced Business Listing here for your domain name.
+   Learn more at http://www.NetworkSolutions.com/
+   ------------------------------------------------------------------------
+
+   Administrative Contact, Technical Contact:
+      mpowers LLC		michael@mpowers.net
+      21010 Southbank St #575
+      Potomac Falls, VA 20165
+      US
+      +1.5712832829
+
+
+   Record expires on 17-Mar-2017.
+   Record created on 21-May-2010.
+   Database last updated on 5-Jun-2012 12:08:08 EDT.
+
+   Domain servers in listed order:
+
+   NS53.WORLDNIC.COM            205.178.190.27
+   NS54.WORLDNIC.COM            206.188.198.27
+
+

data/spec/fixtures/responses/whois.networksolutions.com/status_registered.expected

@@ -0,0 +1,89 @@
+#status
+  should: %s raise_error(Whois::PropertyNotSupported)
+
+#available?
+  should: %s == false
+
+#registered?
+  should: %s == true
+
+
+#created_on
+  should: %s CLASS(time)
+  should: %s == Time.parse("1997-06-10")
+
+#updated_on
+  should: %s raise_error(Whois::PropertyNotSupported)
+
+#expires_on
+  should: %s CLASS(time)
+  should: %s == Time.parse("2014-06-09")
+
+
+#registrar
+  should: %s CLASS(registrar)
+  should: %s.name         == "Network Solutions"
+  should: %s.organization == "Network Solutions, LLC"
+  should: %s.url          == "http://www.networksolutions.com/"
+
+#registrant_contacts
+  should: %s CLASS(array)
+  should: %s SIZE(1)
+  should: %s[0] CLASS(contact)
+  should: %s[0].type         == Whois::Record::Contact::TYPE_REGISTRANT
+  should: %s[0].name         == nil
+  should: %s[0].organization == "XIF Communications"
+  should: %s[0].address      == "1200 New Hampshire Avenue NW\nSuite 410"
+  should: %s[0].city         == "Washington"
+  should: %s[0].zip          == "20036"
+  should: %s[0].state        == "DC"
+  should: %s[0].country_code == "US"
+  should: %s[0].phone        == nil
+  should: %s[0].fax          == nil
+  should: %s[0].email        == nil
+
+#admin_contacts
+  should: %s CLASS(array)
+  should: %s SIZE(1)
+  should: %s[0] CLASS(contact)
+  should: %s[0].type         == Whois::Record::Contact::TYPE_ADMIN
+  should: %s[0].name         == "Communications, XIF ContactMiddleName"
+  should: %s[0].organization == "XIF Communications"
+  should: %s[0].address      == "1200 New Hampshire Avenue NW\nSuite 410"
+  should: %s[0].city         == "Washington"
+  should: %s[0].zip          == "20036"
+  should: %s[0].state        == "DC"
+  should: %s[0].country_code == "US"
+  should: %s[0].phone        == "202-463-7200"
+  should: %s[0].fax          == "202-318-4003"
+  should: %s[0].email        == "noc@xif.com"
+
+#technical_contacts
+  should: %s CLASS(array)
+  should: %s SIZE(1)
+  should: %s[0] CLASS(contact)
+  should: %s[0].type         == Whois::Record::Contact::TYPE_TECHNICAL
+  should: %s[0].name         == "Communications, XIF ContactMiddleName"
+  should: %s[0].organization == "XIF Communications"
+  should: %s[0].address      == "1200 New Hampshire Avenue NW\nSuite 410"
+  should: %s[0].city         == "Washington"
+  should: %s[0].zip          == "20036"
+  should: %s[0].state        == "DC"
+  should: %s[0].country_code == "US"
+  should: %s[0].phone        == "202-463-7200"
+  should: %s[0].fax          == "202-318-4003"
+  should: %s[0].email        == "noc@xif.com"
+
+
+#nameservers
+  should: %s CLASS(array)
+  should: %s SIZE(3)
+  should: %s[0] CLASS(nameserver)
+  should: %s[0].name == "ns01.xif.com"
+  should: %s[0].ipv4 == "63.240.200.70"
+  should: %s[1] CLASS(nameserver)
+  should: %s[1].name == "ns-east.cerf.net"
+  should: %s[1].ipv4 == "207.252.96.3"
+  should: %s[2] CLASS(nameserver)
+  should: %s[2].name == "ns-west.cerf.net"
+  should: %s[2].ipv4 == "192.153.156.3"

data/spec/fixtures/responses/whois.networksolutions.com/status_registered.txt

@@ -0,0 +1,65 @@
+NOTICE AND TERMS OF USE: You are not authorized to access or query our WHOIS
+database through the use of high-volume, automated, electronic processes. The
+Data in Network Solutions' WHOIS database is provided by Network Solutions for information
+purposes only, and to assist persons in obtaining information about or related
+to a domain name registration record. Network Solutions does not guarantee its accuracy.
+By submitting a WHOIS query, you agree to abide by the following terms of use:
+You agree that you may use this Data only for lawful purposes and that under no
+circumstances will you use this Data to: (1) allow, enable, or otherwise support
+the transmission of mass unsolicited, commercial advertising or solicitations
+via e-mail, telephone, or facsimile; or (2) enable high volume, automated,
+electronic processes that apply to Network Solutions (or its computer systems). The
+compilation, repackaging, dissemination or other use of this Data is expressly
+prohibited without the prior written consent of Network Solutions. You agree not to use
+high-volume, automated, electronic processes to access or query the WHOIS
+database. Network Solutions reserves the right to terminate your access to the WHOIS
+database in its sole discretion, including without limitation, for excessive
+querying of the WHOIS database or for failure to otherwise abide by this policy.
+Network Solutions reserves the right to modify these terms at any time.
+
+Get a FREE domain name registration, transfer, or renewal with any annual hosting package.
+
+http://www.networksolutions.com
+
+Visit AboutUs.org for more information about XIF.COM
+<a href="http://www.aboutus.org/XIF.COM">AboutUs: XIF.COM </a>
+
+
+
+
+Registrant:
+XIF Communications
+   1200 New Hampshire Avenue NW
+   Suite 410
+   Washington, DC 20036
+   US
+
+   Domain Name: XIF.COM
+
+   ------------------------------------------------------------------------
+   Promote your business to millions of viewers for only $1 a month
+   Learn how you can get an Enhanced Business Listing here for your domain name.
+   Learn more at http://www.NetworkSolutions.com/
+   ------------------------------------------------------------------------
+
+   Administrative Contact, Technical Contact:
+      Communications, XIF ContactMiddleName		noc@xif.com
+      XIF Communications
+      1200 New Hampshire Avenue NW
+      Suite 410
+      Washington, DC 20036
+      US
+      202-463-7200 fax: 202-318-4003
+
+
+   Record expires on 09-Jun-2014.
+   Record created on 10-Jun-1997.
+   Database last updated on 5-Jun-2012 12:20:31 EDT.
+
+   Domain servers in listed order:
+
+   NS01.XIF.COM                 63.240.200.70
+   NS-EAST.CERF.NET             207.252.96.3
+   NS-WEST.CERF.NET             192.153.156.3
+
+