whois 2.0.5 → 2.0.6

data/lib/whois/record/parser/whois.pnina.ps.rb

@@ -30,8 +30,10 @@ module Whois
         property_supported :status do
           if content_for_scanner =~ /Status:\s+(.+?)\n/
             case $1.downcase
-              when "active"         then :registered
-              when "not registered" then :available
+              when /^active/
+                :registered
+              when "not registered"
+                :available
               else
                 Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end
@@ -41,7 +43,7 @@ module Whois
         end
 
         property_supported :available? do
-          (status == :available)
+          status == :available
         end
 
         property_supported :registered? do

data/lib/whois/record/parser/whois.registry.gy.rb

@@ -30,8 +30,10 @@ module Whois
         property_supported :status do
           if content_for_scanner =~ /Status:\s+(.+?)\n/
             case $1.downcase
-              when "active"         then :registered
-              when "not registered" then :available
+              when "active"
+                :registered
+              when "not registered"
+                :available
               else
                 Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end
@@ -41,7 +43,7 @@ module Whois
         end
 
         property_supported :available? do
-          (status == :available)
+          status == :available
         end
 
         property_supported :registered? do

data/lib/whois/record/parser/whois.sk-nic.sk.rb

@@ -32,21 +32,17 @@ module Whois
         property_supported :status do
           if content_for_scanner =~ /^Domain-status\s+(.+)\n/
             case $1.downcase
-              # The domain is registered and paid.
-              when  "dom_ok",
-              # Replacement 14-day period for domain payment.
-                    "dom_dakt",
-              # 28 days before the expiration of one year's notice is sent to the first call for an extension of domains.
-              # The domain is still fully functional (14 days).
-                    "dom_warn",
-              # 14 days before the expiration of one year's notice is sent to the second call to the extension of domains.
-              # The domain is still fully functional (14 days).
-                    "dom_lnot",
-              # The domain is expired and has not been renewed (14 days).
+              when  "dom_ok",   # The domain is registered and paid.
+                    "dom_ta",   # The domain is registered and registration fee has to be payed (14 days).
+                                # Replacement 14-day period for domain payment.
+                    "dom_dakt", # 28 days before the expiration of one year's notice is sent to the first call for an extension of domains.
+                                # The domain is still fully functional (14 days).
+                    "dom_warn", # 14 days before the expiration of one year's notice is sent to the second call to the extension of domains.
+                                # The domain is still fully functional (14 days).
+                    "dom_lnot", # The domain is expired and has not been renewed (14 days).
                     "dom_exp"
                 :registered
-              # The domain losts its registrar (28 days).
-              when  "dom_held"
+              when  "dom_held"  # The domain losts its registrar (28 days).
                 :redemption
               else
                 Whois.bug!(ParserError, "Unknown status `#{$1}'.")

data/lib/whois/record/parser/whois.srs.net.nz.rb

@@ -27,14 +27,18 @@ module Whois
       #
       class WhoisSrsNetNz < Base
 
+        # @see http://dnc.org.nz/content/srs-whois-spec-1.0.html
         property_supported :status do
           if content_for_scanner =~ /query_status:\s(.+)\n/
-            case $1.downcase
+            case s = $1.downcase
               when /active/               then :registered
               when /available/            then :available
               when /invalid characters/   then :invalid
+              # The domain is no longer active but is in the period prior
+              # to being released for general registrations
+              when "210 pendingrelease"   then :redemption
               else
-                Whois.bug!(ParserError, "Unknown status `#{$1}'.")
+                Whois.bug!(ParserError, "Unknown status `#{s}'.")
             end
           else
             Whois.bug!(ParserError, "Unable to parse status.")
@@ -46,7 +50,7 @@ module Whois
         end
 
         property_supported :registered? do
-          (status == :registered)
+          (status == :registered) || (status == :redemption)
         end
 
 

data/lib/whois/version.rb

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

data/spec/fixtures/responses/whois.dns.pt/status_reserved.expected

@@ -10,7 +10,7 @@
 
 #created_on
   should: %s be_a(Time)
-  should: %s == Time.parse("2009-02-09 01:00:00")
+  should: %s == Time.parse("2009-02-09 00:00:00 UTC")
 
 #updated_on
   should: %s raise_error(Whois::PropertyNotSupported)

data/spec/fixtures/responses/whois.gg/status_available.expected

@@ -9,10 +9,10 @@
 
 
 #created_on
-  should: %s raise_error(Whois::PropertyNotSupported)
+  should: %s == nil
 
 #updated_on
-  should: %s raise_error(Whois::PropertyNotSupported)
+  should: %s == nil
 
 #expires_on
   should: %s raise_error(Whois::PropertyNotSupported)

data/spec/fixtures/responses/whois.gg/status_available.txt

@@ -1,26 +1,34 @@
-status:0
+This information is provided free of charge from the Channel Islands' 
+Register of Internet Names. The copyright  and database rights in this
+information and in the contents are owned by Island Networks Ltd
+whose Registered Office is at 12 Victoria St, St Anne's GY9 3UF
+
+WHOIS query results shown may lag behind the Register.
+
+You may not access this server or use any data obtained from it 
+without written licence except for private, non-commercial use for the 
+purpose(s) of determining availability of, or confirming the registration of 
+a domain name on the Register. 
+
+Any other use constitutes unauthorised access to a computer, 
+which is a statutory offence under the Computer Misuse 
+(Bailiwick of Guernsey) Law 1991, and/or similar legislation 
+in other parts of the British Islands and elsewhere.
+
+Furthermore, you may never do any of the following
+
+(a) use data obtained from this server for advertising; 
+(b) repackage, reuse or redistribute the data;
+(c) obscure, remove or hide any or all of this notice; or 
+(d) make excessive queries. 
+
+Access may be withdrawn or restricted at any time 
+without notice. 
+
+
+Domain Information
+Query: u34jedzcq.gg
+Status: Not Registered
 
-** No information found in WHOIS **
 
 
-
-
-This information is provided free of charge from the Channel Islands' Register
-of Internet Names. This information and the contents of the Register are:
-
-                   Copyright (c) & database right
-         Island Networks & Island Networks (Jersey), 1996-2010
-
-You may not access this server or use any data from it except for
-private, non-commercial use in order to determine availability of, or
-confirm registration of a domain name on the Register. Any other use will
-constitute unauthorised access to a computer system, which is an offence
-under the Computer Misuse (Bailiwick of Guernsey) Law 1991, and/or 
-similar legislation in other jurisdictions.
-
-In particular, you may not (a) use the data for advertising, (b) repackage, 
-reuse or redistribute the data, (c) obscure, remove or hide any or all of 
-this notice or (d) make excessive queries. 
-
-The data is provided on an 'as-is' basis and results given may lag behind 
-the Register. Access may be withdrawn or restricted at any time without notice. 

data/spec/fixtures/responses/whois.gg/status_registered.expected

@@ -9,10 +9,12 @@
 
 
 #created_on
-  should: %s raise_error(Whois::PropertyNotSupported)
+  should: %s be_a(Time)
+  should: %s == Time.parse("2003-04-30 00:00:00")
 
 #updated_on
-  should: %s raise_error(Whois::PropertyNotSupported)
+  should: %s be_a(Time)
+  should: %s == Time.parse("2011-03-31 00:00:00")
 
 #expires_on
   should: %s raise_error(Whois::PropertyNotSupported)
@@ -24,8 +26,8 @@
   should: %s[0] be_a(_nameserver)
   should: %s[0].name == "ns1.google.com"
   should: %s[1] be_a(_nameserver)
-  should: %s[1].name == "ns4.google.com"
+  should: %s[1].name == "ns2.google.com"
   should: %s[2] be_a(_nameserver)
-  should: %s[2].name == "ns2.google.com"
+  should: %s[2].name == "ns4.google.com"
   should: %s[3] be_a(_nameserver)
   should: %s[3].name == "ns3.google.com"

data/spec/fixtures/responses/whois.gg/status_registered.txt

@@ -1,32 +1,54 @@
-status:1
+This information is provided free of charge from the Channel Islands' 
+Register of Internet Names. The copyright  and database rights in this
+information and in the contents are owned by Island Networks Ltd
+whose Registered Office is at 12 Victoria St, St Anne's GY9 3UF
+
+WHOIS query results shown may lag behind the Register.
+
+You may not access this server or use any data obtained from it 
+without written licence except for private, non-commercial use for the 
+purpose(s) of determining availability of, or confirming the registration of 
+a domain name on the Register. 
+
+Any other use constitutes unauthorised access to a computer, 
+which is a statutory offence under the Computer Misuse 
+(Bailiwick of Guernsey) Law 1991, and/or similar legislation 
+in other parts of the British Islands and elsewhere.
+
+Furthermore, you may never do any of the following
+
+(a) use data obtained from this server for advertising; 
+(b) repackage, reuse or redistribute the data;
+(c) obscure, remove or hide any or all of this notice; or 
+(d) make excessive queries. 
+
+Access may be withdrawn or restricted at any time 
+without notice. 
+
+
+Domain Information
+Query: google.gg
+Status: Active
+Created: 30 Apr 2003
+Modified: 31 Mar 2011
+Name Servers:
+    ns1.google.com
+    ns2.google.com
+    ns4.google.com
+    ns3.google.com
+
+Registrar Information
+Registrar Name: Markmonitor
+Registration URL: http://www.markmonitor.com
+
+
+
+
+Registrant:
+Name: Google Inc.
+Organisation: Google Inc.
+Address:
+	1600 Amphitheatre Parkway
+	Mountain View, CA 94043
+	US
 
-Domain is Registered.
-
-Registered Nameservers
-----------------------
-ns1.google.com.
-ns4.google.com.
-ns2.google.com.
-ns3.google.com.
-
-
-
-This information is provided free of charge from the Channel Islands' Register
-of Internet Names. This information and the contents of the Register are:
-
-                   Copyright (c) & database right
-         Island Networks & Island Networks (Jersey), 1996-2010
-
-You may not access this server or use any data from it except for
-private, non-commercial use in order to determine availability of, or
-confirm registration of a domain name on the Register. Any other use will
-constitute unauthorised access to a computer system, which is an offence
-under the Computer Misuse (Bailiwick of Guernsey) Law 1991, and/or 
-similar legislation in other jurisdictions.
-
-In particular, you may not (a) use the data for advertising, (b) repackage, 
-reuse or redistribute the data, (c) obscure, remove or hide any or all of 
-this notice or (d) make excessive queries. 
-
-The data is provided on an 'as-is' basis and results given may lag behind 
-the Register. Access may be withdrawn or restricted at any time without notice. 

data/spec/fixtures/responses/whois.pnina.ps/property_status_active_pending_transfer.expected

@@ -0,0 +1,8 @@
+#status
+  should: %s == :registered
+
+#available?
+  should: %s == false
+
+#registered?
+  should: %s == true

data/spec/fixtures/responses/whois.pnina.ps/property_status_active_pending_transfer.txt

@@ -0,0 +1,69 @@
+TERMS OF USE: You are not authorized to access or query our Whois
+database through the use of electronic processes that are high-volume and
+automated.  Whois database is provided by PNINA as a service to the internet
+community on behalf of PNINA and Its Certified Registrars (CR). (http://www.pnina.ps/registrars/registrars-list/)
+
+The data is for information purposes only. PNINA 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 PNINA and it's Certified Registrar's (or PNINA or CR computer systems). The
+compilation, repackaging, dissemination or other use of this Data is
+expressly prohibited.
+
+Domain Information
+Query: zumba.ps
+Status: Active - Pending Transfer
+Created: 27 Oct 2010
+Expires: 27 Oct 2011
+Name Servers:
+    c.ns.zerigo.net
+    b.ns.zerigo.net
+    a.ns.zerigo.net
+
+Registrar Information
+Registrar Name: INSTRA
+Address: Level2, 222-225 Beach Road,Mordialloc,Victoria 3195,Australi
+Phone: +61 3 997831800
+Fax: +61 3 97836844
+
+
+
+
+Registrant:
+Name: Rodrigo Faerman
+Address:
+	3801 N 29th Ave
+	Hollywood	US
+Phone Number: 1-95-492-53755
+
+
+Admin Contact:
+Name: Antonio Lentino
+Address:
+	Lot 5 -38 Hartnett Dirve-Seaford-  Victoria  3198
+	Melbourne	AU
+Phone Number: 61-39-7831800
+Fax Number: 61-39-7836844
+
+
+Technical Contact:
+Name: Phillip Parker
+Address:
+	Level2- 222-225 Beach Road-Mordialloc-Victoria 319
+	Melbourne	AU
+Phone Number: 61-3-997831800
+Fax Number: 61-3-97836844
+
+
+Billing Contact:
+Name: Antonio Lentino
+Address:
+	Lot 5 -38 Hartnett Dirve-Seaford-  Victoria  3198
+	Melbourne	AU
+Phone Number: 61-39-7831800
+Fax Number: 61-39-7836844
+

data/spec/fixtures/responses/whois.sk-nic.sk/property_status_dom_ta.expected

@@ -0,0 +1,8 @@
+#status
+  should: %s == :registered
+
+#available?
+  should: %s == false
+
+#registered?
+  should: %s == true

data/spec/fixtures/responses/whois.sk-nic.sk/property_status_dom_ta.txt

@@ -0,0 +1,25 @@
+%
+% whois.sk-nic.sk - whois server for TLD .sk
+%
+
+
+Domain-name         plac.sk
+Admin-id            KATA-0423
+Admin-name          Katarina Majercakova
+Admin-legal-form    zivnost
+Admin-org.-ID       44304862
+Admin-address       Pradiaren 765/10, Kezmarok 060 01
+Admin-telephone     0907 555 883
+Admin-email         majercakova.katarina@gmail.com
+Tech-id             KATA-0423
+Tech-name           Katarina Majercakova
+Tech-org.-ID        44304862
+Tech-address        Pradiaren 765/10, Kezmarok 060 01
+Tech-telephone      0907 555 883
+Tech-email          majercakova.katarina@gmail.com
+dns_name            ns1.dnparking.sk
+dns_name            ns2.dnparking.sk
+Last-update         2011-08-02
+Valid-date          2011-08-16
+Domain-status       DOM_TA
+

data/spec/fixtures/responses/whois.srs.net.nz/property_status_pendingrelease.expected

@@ -0,0 +1,8 @@
+#status
+  should: %s == :redemption
+
+#available?
+  should: %s == false
+
+#registered?
+  should: %s == true

data/spec/fixtures/responses/whois.srs.net.nz/property_status_pendingrelease.txt

@@ -0,0 +1,68 @@
+% New Zealand Domain Name Registry Limited
+% Users confirm on submission their agreement to all published Terms
+%
+version: 5.00
+query_datetime: 2011-08-07T05:56:36+12:00
+domain_name: zumbafitness.co.nz
+query_status: 210 PendingRelease
+domain_dateregistered: 2009-07-14T12:11:36+12:00
+domain_datebilleduntil: 2011-07-14T12:11:36+12:00
+domain_datelastmodified: 2011-07-14T03:13:49+12:00
+domain_datecancelled: 2011-07-14T03:13:49+12:00
+domain_delegaterequested: yes
+domain_signed: no
+%
+registrar_name: NETREGISTRY PTY LTD
+registrar_address1: PO Box 270
+registrar_city: Broadway
+registrar_postalcode: 2007
+registrar_country: AU (AUSTRALIA)
+registrar_phone: +61 2 9699 6099
+registrar_fax: +61 2 9699 6088
+registrar_email: dnsadmin@netregistry.com.au
+%
+registrant_contact_name: Zumba Fitness, Rodrigo, Faerman
+registrant_contact_address1: 3801 North 29th Avenue
+registrant_contact_address2: fl, 33020
+registrant_contact_city: Hollywood
+registrant_contact_country: GB (UNITED KINGDOM)
+registrant_contact_phone: +1 9 549253755
+registrant_contact_email: rodrigo@zumba.com
+%
+admin_contact_name: NetRegistry
+admin_contact_address1: PO BOX 270
+admin_contact_address2: NSW 2007
+admin_contact_city: Broadway
+admin_contact_country: AU (AUSTRALIA)
+admin_contact_phone: +61 2 96996099
+admin_contact_fax: +61 2 96996088
+admin_contact_email: dmain@netregistry.com.au
+%
+technical_contact_name: NETREGISTRY PTY LTD
+technical_contact_address1: PO Box 270
+technical_contact_city: Broadway
+technical_contact_postalcode: 2007
+technical_contact_country: AU (AUSTRALIA)
+technical_contact_phone: +61 2 9699 6099
+technical_contact_fax: +61 2 9699 6088
+technical_contact_email: dnsadmin@netregistry.com.au
+%
+ns_name_01: ns1.netregistry.net
+ns_name_02: ns2.netregistry.net
+ns_name_03: ns3.netregistry.net
+%
+% Users are advised that the following activities are strictly forbidden.
+%
+% Using multiple WHOIS queries, or using the output of multiple WHOIS
+% queries in conjunction with any other facility or service, to enable
+% or effect a download of part or all of the .nz Register.
+%
+% Using any information contained in the WHOIS query output to attempt a
+% targeted contact campaign with any person, or any organisation, using any
+% medium.
+%
+% A breach of these conditions will be treated as a breach of the .nz Policies
+% and Procedures.  Sanctions in line with those specified in the policies and
+% procedures at www.dnc.org.nz may result from any breach.
+%
+% Copyright InternetNZ