Merge pull request #165 from sherwind/cocca-property-registrar

Implement registrar property for CoCCA

lib/whois/record/parser/base_cocca.rb

@@ -70,6 +70,14 @@ class BaseCocca < Base
         end
 
 
+        property_supported :registrar do
+          Record::Registrar.new(
+            :name => content_for_scanner.slice(/Registrar Name: (.+)\n/, 1),
+            :url  => content_for_scanner.slice(/Registration URL: (.+)\n/, 1)
+          )
+        end
+
+
         property_supported :nameservers do
           if content_for_scanner =~ /Name Servers:\n((.+\n)+)\n/
             $1.split("\n").map do |name|

spec/fixtures/responses/whois.na-nic.com.na/status_registered.expected

@@ -28,6 +28,13 @@
   should: %s == Time.parse("2012-08-20")
 
 
+#registrar
+  should: %s CLASS(registrar)
+  should: %s.id           == nil
+  should: %s.name         == "MarkMonitor"
+  should: %s.url          == "http://www.markmonitor.com"
+
+
 #nameservers
   should: %s CLASS(array)
   should: %s SIZE(2)

spec/fixtures/responses/whois.nic.af/status_registered.expected

@@ -21,17 +21,28 @@
 
 #updated_on
   should: %s CLASS(time)
-  should: %s == Time.parse("2010-01-29")
+  should: %s == Time.parse("2012-05-01")
 
 #expires_on
   should: %s CLASS(time)
-  should: %s == Time.parse("2010-05-05")
+  should: %s == Time.parse("2013-05-05")
+
+
+#registrar
+  should: %s CLASS(registrar)
+  should: %s.id           == nil
+  should: %s.name         == "MarkMonitor"
+  should: %s.url          == "http://www.markmonitor.com"
 
 
 #nameservers
   should: %s CLASS(array)
-  should: %s SIZE(2)
+  should: %s SIZE(4)
   should: %s[0] CLASS(nameserver)
   should: %s[0].name == "ns1.google.com"
   should: %s[1] CLASS(nameserver)
   should: %s[1].name == "ns2.google.com"
+  should: %s[2] CLASS(nameserver)
+  should: %s[2].name == "ns3.google.com"
+  should: %s[3] CLASS(nameserver)
+  should: %s[3].name == "ns4.google.com"

spec/fixtures/responses/whois.nic.af/status_registered.txt

@@ -1,56 +1,75 @@
-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 CoCCA as a service to the internet community on behalf of CoCCA members. (http://www.cocca.cx/members.jsp)
+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 AFGNIC as a service to the internet community.
 
-The data is for information purposes only. CoCCA 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 CoCCA it's members (or CoCCA or member computer systems). The compilation, repackaging, dissemination or other use of this Data is expressly prohibited.
+The data is for information purposes only. AFGNIC 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 CoCCA it's members (or CoCCA or member computer systems). The compilation, repackaging, dissemination or other use of this Data is expressly prohibited.
 
 ADRAS Helpdesk | http://helpdesk.adras.af
-
 Domain Information
 Query: google.af
+Status: Delegated
 Created: 05 Oct 2009
-Expires: 05 May 2010
-Modified: 29 Jan 2010
-Status: Active
-Registrar: MarkMonitor
+Modified: 01 May 2012
+Expires: 05 May 2013
 Name Servers:
     ns1.google.com
     ns2.google.com
+    ns3.google.com
+    ns4.google.com
+
+Registrar Information
+Registrar Name: MarkMonitor
+Registration URL: http://www.markmonitor.com
+Address: MarkMonitor
+Emerald Tech Center
+391 N. Ancestor Place
+Boise, ID 83704
+Country: US
+Phone: +1 (208) 389-5740
+Fax: +1 (208) 389-5771
+Customer Service Contact: ccops@markmonitor.com
+Customer Service Email: ccops@markmonitor.com
+
+
+
 
 Registrant:
-    Google Inc.
-    Google Inc.
-    1600 Amphitheatre Parkway
-    Mountain View, CA 94043
-    US
-    dns-admin@google.com
-    Voice: +1.6502530000
-    Fax: +1.6506188571
-
-Administrative Contact:
-    Google Inc.
-    Google Inc.
-    1600 Amphitheatre Parkway
-    Mountain View, CA 94043
-    US
-    dns-admin@google.com
-    Voice: +1.6502530000
-    Fax: +1.6506188571
+Name: Google Inc.
+Address:
+	1600 Amphitheatre Parkway
+	Mountain View, CA 94043
+	US
+Email Address: dns-admin@google.com
+Phone Number: +1.6502530000
+Fax Number: +1.6506188571
+
+
+Admin Contact:
+Name: Google Inc.
+Address:
+	1600 Amphitheatre Parkway
+	Mountain View, CA 94043
+	US
+Email Address: dns-admin@google.com
+Phone Number: +1.6502530000
+Fax Number: +1.6506188571
+
 
 Technical Contact:
-    Google Inc.
-    Google Inc.
-    1600 Amphitheatre Parkway
-    Mountain View, CA 94043
-    US
-    dns-admin@google.com
-    Voice: +1.6502530000
-    Fax: +1.6506188571
+Name: Google Inc.
+Address:
+	1600 Amphitheatre Parkway
+	Mountain View, CA 94043
+	US
+Email Address: dns-admin@google.com
+Phone Number: +1.6502530000
+Fax Number: +1.6506188571
 
-Billing Contact:
-    eMarkmonitor Inc. dba MarkMonitor
-    PMB 155
-    10400 Overland Road
-    Boise, Idaho 83709    US
-    ccops@markmonitor.com
-    Voice: +1 (208) 389 5799
 
+Billing Contact:
+Name: eMarkmonitor Inc. dba MarkMonitor
+Address:
+	PMB 155
+	10400 Overland Road
+	Boise, Idaho 83709	US
+Email Address: ccops@markmonitor.com
+Phone Number: +1 (208) 389 5799
 

spec/fixtures/responses/whois.nic.cx/status_registered.expected

@@ -28,6 +28,13 @@
   should: %s == Time.parse("2012-07-30")
 
 
+#registrar
+  should: %s CLASS(registrar)
+  should: %s.id           == nil
+  should: %s.name         == "MarkMonitor"
+  should: %s.url          == "http://www.markmonitor.com"
+
+
 #nameservers
   should: %s CLASS(array)
   should: %s SIZE(4)

spec/fixtures/responses/whois.nic.gs/status_registered.expected

@@ -28,6 +28,13 @@
   should: %s == Time.parse("2011-07-08")
 
 
+#registrar
+  should: %s CLASS(registrar)
+  should: %s.id           == nil
+  should: %s.name         == "MarkMonitor"
+  should: %s.url          == "http://www.markmonitor.com"
+
+
 #nameservers
   should: %s CLASS(array)
   should: %s SIZE(2)

spec/fixtures/responses/whois.nic.ht/status_registered.expected

@@ -21,11 +21,18 @@
 
 #updated_on
   should: %s CLASS(time)
-  should: %s == Time.parse("2010-05-20 00:00:00")
+  should: %s == Time.parse("2012-03-30 00:00:00")
 
 #expires_on
   should: %s CLASS(time)
-  should: %s == Time.parse("2011-06-18 00:00:00")
+  should: %s == Time.parse("2012-06-18 00:00:00")
+
+
+#registrar
+  should: %s CLASS(registrar)
+  should: %s.id           == nil
+  should: %s.name         == "MarkMonitor"
+  should: %s.url          == "http://www.markmonitor.com"
 
 
 #nameservers

spec/fixtures/responses/whois.nic.ht/status_registered.txt

@@ -1,59 +1,73 @@
-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 Consortium FDS/RDDH as a service to the internet
-community on by of Consortium FDS/RDDH. (http://www.nic.ht)
+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 Consortium FDS/RDDH as a service to the internet community on by of Consortium FDS/RDDH. (http://www.nic.ht)
 
-The data is for information purposes only. Consortium FDS/RDDH 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 Consortium FDS/RDDH it's members (or Consortium FDS/RDDH or member computer systems). The
-compilation, repackaging, dissemination or other use of this Data is
-expressly prohibited.
-
+The data is for information purposes only. Consortium FDS/RDDH 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 Consortium FDS/RDDH it's members (or Consortium FDS/RDDH or member computer systems). The compilation, repackaging, dissemination or other use of this Data is expressly prohibited.
 Domain Information
 Query: google.ht
+Status: Delegated
 Created: 18 Jun 2004
-Expires: 18 Jun 2011
-Modified: 20 May 2010
-Status: Active
-Registrar: MarkMonitor
+Modified: 30 Mar 2012
+Expires: 18 Jun 2012
 Name Servers:
     ns1.google.com
     ns2.google.com
     ns3.google.com
     ns4.google.com
 
+Registrar Information
+Registrar Name: MarkMonitor
+Registration URL: http://www.markmonitor.com
+Address: MarkMonitor
+Emerald Tech Center
+391 N. Ancestor Place
+Boise, ID 83704
+Country: US
+Phone: +1 (208) 389-5740
+Fax: +1 (208) 389-5771
+Customer Service Contact: ccops@markmonitor.com
+Customer Service Email: ccops@markmonitor.com
+
+
+
+
 Registrant:
-    Google Inc.
-    Google Inc.
-    1600 Amphitheatre Parkway
-    Mountain View, CA 94043
-    US
-    dns-admin@google.com
-    Voice: +1.6502530000
-    Fax: +1.6506188571
-
-Administrative Contact:
-    Google Inc.
-    Google Inc.
-    1600 Amphitheatre Parkway
-    Mountain View, CA 94043
-    US
-    dns-admin@google.com
-    Voice: +1.6502530000
-    Fax: +1.6506188571
+Name: Google Inc.
+Address:
+	1600 Amphitheatre Parkway
+	Mountain View, CA 94043
+	US
+Email Address: dns-admin@google.com
+Phone Number: +1.6502530000
+Fax Number: +1.6506188571
+
+
+Admin Contact:
+Name: Google Inc.
+Address:
+	1600 Amphitheatre Parkway
+	Mountain View, CA 94043
+	US
+Email Address: dns-admin@google.com
+Phone Number: +1.6502530000
+Fax Number: +1.6506188571
+
 
 Technical Contact:
-    Google Inc.
-    1600 Amphitheatre Parkway
-    Mountain View, CA 94043
-    US
-    dns-admin@google.com
-    Voice: +1.6502530000
-    Fax: +1.6506188571
+Name: Google Inc.
+Address:
+	1600 Amphitheatre Parkway
+	Mountain View, CA 94043
+	US
+Email Address: dns-admin@google.com
+Phone Number: +1.6502530000
+Fax Number: +1.6506188571
+
 
+Billing Contact:
+Name: eMarkmonitor Inc. dba MarkMonitor
+Address:
+	PMB 155
+	10400 Overland Road
+	Boise, Idaho 83709	US
+Email Address: ccops@markmonitor.com
+Phone Number: +1 (208) 389 5799
 

spec/fixtures/responses/whois.nic.ki/status_registered.expected

@@ -28,6 +28,13 @@
   should: %s == Time.parse("2010-11-27")
 
 
+#registrar
+  should: %s CLASS(registrar)
+  should: %s.id           == nil
+  should: %s.name         == "MarkMonitor"
+  should: %s.url          == "http://www.markmonitor.com"
+
+
 #nameservers
   should: %s CLASS(array)
   should: %s SIZE(4)

spec/fixtures/responses/whois.nic.ms/status_registered.expected

@@ -28,6 +28,13 @@
   should: %s == Time.parse("2011-06-04 08:00 AST")
 
 
+#registrar
+  should: %s CLASS(registrar)
+  should: %s.id           == nil
+  should: %s.name         == "MarkMonitor"
+  should: %s.url          == "http://www.markmonitor.com"
+
+
 #nameservers
   should: %s CLASS(array)
   should: %s SIZE(2)

spec/fixtures/responses/whois.nic.mu/status_registered.expected

@@ -21,11 +21,18 @@
 
 #updated_on
   should: %s CLASS(time)
-  should: %s == Time.parse("2009-12-04")
+  should: %s == Time.parse("2012-03-21")
 
 #expires_on
   should: %s CLASS(time)
-  should: %s == Time.parse("2010-12-20")
+  should: %s == Time.parse("2012-12-20")
+
+
+#registrar
+  should: %s CLASS(registrar)
+  should: %s.id           == nil
+  should: %s.name         == "MarkMonitor"
+  should: %s.url          == "http://www.markmonitor.com"
 
 
 #nameservers