whois 1.0.5 → 1.0.6

data/test/answer/parser/whois.norid.no_test.rb

@@ -46,4 +46,4 @@ class AnswerParserWhoisNoridNoTest < Whois::Answer::Parser::TestCase
     assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/available.txt')).expires_on }
   end
 
-end
+end

data/test/answer/parser/whois.publicinterestregistry.net_test.rb

@@ -45,10 +45,10 @@ time. By submitting this query, you agree to abide by this policy.
   end
 
   def test_domain_id
-    assert_equal  nil,
-                  @klass.new(load_part('/available.txt')).domain_id
     assert_equal  "D2244233-LROR",
                   @klass.new(load_part('/registered.txt')).domain_id
+    assert_equal  nil,
+                  @klass.new(load_part('/available.txt')).domain_id
   end
 
 
@@ -65,8 +65,8 @@ time. By submitting this query, you agree to abide by this policy.
   end
 
   def test_registered?
-    assert !@klass.new(load_part('/available.txt')).registered?
     assert  @klass.new(load_part('/registered.txt')).registered?
+    assert !@klass.new(load_part('/available.txt')).registered?
   end
 
 

data/test/answer/parser/whois.register.bg_test.rb

@@ -22,8 +22,8 @@ class AnswerParserWhoisRegisterBgTest < Whois::Answer::Parser::TestCase
   end
 
   def test_registered?
-    assert !@klass.new(load_part('/available.txt')).registered?
     assert  @klass.new(load_part('/registered.txt')).registered?
+    assert !@klass.new(load_part('/available.txt')).registered?
   end
 
 
@@ -46,4 +46,17 @@ class AnswerParserWhoisRegisterBgTest < Whois::Answer::Parser::TestCase
                   @klass.new(load_part('/available.txt')).expires_on
   end
 
-end
+
+  def test_nameservers
+    parser    = @klass.new(load_part('/registered.txt'))
+    expected  = %w( ns4.google.com ns1.google.com ns3.google.com ns2.google.com )
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+
+    parser    = @klass.new(load_part('/available.txt'))
+    expected  = %w()
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+  end
+
+end

data/test/answer/parser/whois.registro.br_test.rb

@@ -22,8 +22,8 @@ class AnswerParserWhoisRegistroBrTest < Whois::Answer::Parser::TestCase
   end
 
   def test_registered?
-    assert !@klass.new(load_part('/available.txt')).registered?
     assert  @klass.new(load_part('/registered.txt')).registered?
+    assert !@klass.new(load_part('/available.txt')).registered?
   end
 
 
@@ -42,4 +42,10 @@ class AnswerParserWhoisRegistroBrTest < Whois::Answer::Parser::TestCase
     assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/available.txt')).expires_on }
   end
 
+
+  def test_nameservers
+    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/registered.txt')).nameservers }
+    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/available.txt')).nameservers }
+  end
+
 end

data/test/answer/parser/whois.ripe.net_test.rb

@@ -9,7 +9,6 @@ class AnswerParserWhoisRipeNetTest < Whois::Answer::Parser::TestCase
     @host   = "whois.ripe.net"
   end
 
-
   def test_true
     assert true
   end
@@ -51,6 +50,19 @@ class AnswerParserWhoisRipeNetFoTest < AnswerParserWhoisRipeNetTest
     assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/fo/available.txt')).expires_on }
   end
 
+
+  def test_nameservers
+    parser    = @klass.new(load_part('/fo/registered.txt'))
+    expected  = %w( ns3.zoneedit.com ns4.zoneedit.com )
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+
+    parser    = @klass.new(load_part('/fo/available.txt'))
+    expected  = %w()
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+  end
+
 end
 
 class AnswerParserWhoisRipeNetGmTest < AnswerParserWhoisRipeNetTest
@@ -88,6 +100,19 @@ class AnswerParserWhoisRipeNetGmTest < AnswerParserWhoisRipeNetTest
     assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/gm/available.txt')).expires_on }
   end
 
+
+  def test_nameservers
+    parser    = @klass.new(load_part('/gm/registered.txt'))
+    expected  = %w( ns1.commit.gm ns1.sol.no )
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+
+    parser    = @klass.new(load_part('/gm/available.txt'))
+    expected  = %w()
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+  end
+
 end
 
 class AnswerParserWhoisRipeNetMcTest < AnswerParserWhoisRipeNetTest
@@ -125,6 +150,19 @@ class AnswerParserWhoisRipeNetMcTest < AnswerParserWhoisRipeNetTest
     assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/mc/available.txt')).expires_on }
   end
 
+
+  def test_nameservers
+    parser    = @klass.new(load_part('/mc/registered.txt'))
+    expected  = %w( ns.nic.mc bow.rain.fr ns.ripe.net )
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+
+    parser    = @klass.new(load_part('/mc/available.txt'))
+    expected  = %w()
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+  end
+
 end
 
 class AnswerParserWhoisRipeNetSmTest < AnswerParserWhoisRipeNetTest
@@ -162,6 +200,19 @@ class AnswerParserWhoisRipeNetSmTest < AnswerParserWhoisRipeNetTest
     assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/sm/available.txt')).expires_on }
   end
 
+
+  def test_nameservers
+    parser    = @klass.new(load_part('/sm/registered.txt'))
+    expected  = %w( ns1.google.com ns2.google.com ns3.google.com ns4.google.com )
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+
+    parser    = @klass.new(load_part('/sm/available.txt'))
+    expected  = %w()
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+  end
+
 end
 
 class AnswerParserWhoisRipeNetVaTest < AnswerParserWhoisRipeNetTest
@@ -199,5 +250,17 @@ class AnswerParserWhoisRipeNetVaTest < AnswerParserWhoisRipeNetTest
     assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/va/available.txt')).expires_on }
   end
 
-end
 
+  def test_nameservers
+    parser    = @klass.new(load_part('/va/registered.txt'))
+    expected  = %w( john.vatican.va ns2.nic.it seth.namex.it osiris.namex.it michael.vatican.va )
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+
+    parser    = @klass.new(load_part('/va/available.txt'))
+    expected  = %w()
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+  end
+
+end

data/test/answer/parser/whois.ripn.net_test.rb

@@ -49,6 +49,19 @@ class AnswerParserWhoisRipnNetRuTest < AnswerParserWhoisRipnNetTest
                   @klass.new(load_part('/ru/available.txt')).expires_on
   end
 
+
+  def test_nameservers
+    parser    = @klass.new(load_part('/ru/registered.txt'))
+    expected  = %w( ns1.google.com ns2.google.com ns3.google.com ns4.google.com )
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+
+    parser    = @klass.new(load_part('/ru/available.txt'))
+    expected  = %w()
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+  end
+
 end
 
 
@@ -91,4 +104,17 @@ class AnswerParserWhoisRipnNetSuTest < AnswerParserWhoisRipnNetTest
                   @klass.new(load_part('/su/available.txt')).expires_on
   end
 
-end
+
+  def test_nameservers
+    parser    = @klass.new(load_part('/su/registered.txt'))
+    expected  = %w( ns1073.hostgator.com ns1074.hostgator.com )
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+
+    parser    = @klass.new(load_part('/su/available.txt'))
+    expected  = %w()
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+  end
+
+end

data/test/answer/parser/whois.rotld.ro_test.rb

@@ -22,8 +22,8 @@ class AnswerParserWhoisRotldRoTest < Whois::Answer::Parser::TestCase
   end
 
   def test_registered?
-    assert !@klass.new(load_part('/available.txt')).registered?
     assert  @klass.new(load_part('/registered.txt')).registered?
+    assert !@klass.new(load_part('/available.txt')).registered?
   end
 
 
@@ -42,4 +42,17 @@ class AnswerParserWhoisRotldRoTest < Whois::Answer::Parser::TestCase
     assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/available.txt')).expires_on }
   end
 
-end
+
+  def test_nameservers
+    parser    = @klass.new(load_part('/registered.txt'))
+    expected  = %w( ns1.google.com ns2.google.com ns3.google.com ns4.google.com )
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+
+    parser    = @klass.new(load_part('/available.txt'))
+    expected  = %w()
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+  end
+
+end

data/test/answer/parser/whois.samoanic.ws_test.rb

@@ -48,4 +48,17 @@ class AnswerParserWhoisSamoaNicTest < Whois::Answer::Parser::TestCase
                   @klass.new(load_part('/available.txt')).expires_on
   end
 
-end
+
+  def test_nameservers
+    parser    = @klass.new(load_part('/registered.txt'))
+    expected  = %w( ns1.google.com ns2.google.com ns3.google.com ns4.google.com )
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+
+    parser    = @klass.new(load_part('/available.txt'))
+    expected  = %w()
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+  end
+
+end

data/test/answer/parser/whois.za.net_test.rb

@@ -22,8 +22,8 @@ class AnswerParserWhoisZaNetTest < Whois::Answer::Parser::TestCase
   end
 
   def test_registered?
-    assert !@klass.new(load_part('/available.txt')).registered?
     assert  @klass.new(load_part('/registered.txt')).registered?
+    assert !@klass.new(load_part('/available.txt')).registered?
   end
 
 
@@ -46,4 +46,17 @@ class AnswerParserWhoisZaNetTest < Whois::Answer::Parser::TestCase
     assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/available.txt')).expires_on }
   end
 
-end
+
+  def test_nameservers
+    parser    = @klass.new(load_part('/registered.txt'))
+    expected  = %w( ns3.zoneedit.com ns5.zoneedit.com )
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+
+    parser    = @klass.new(load_part('/available.txt'))
+    expected  = %w()
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+  end
+
+end

data/test/answer/parser/whois.za.org_test.rb

@@ -22,8 +22,8 @@ class AnswerParserWhoisZaOrgTest < Whois::Answer::Parser::TestCase
   end
 
   def test_registered?
-    assert !@klass.new(load_part('/available.txt')).registered?
     assert  @klass.new(load_part('/registered.txt')).registered?
+    assert !@klass.new(load_part('/available.txt')).registered?
   end
 
 
@@ -46,4 +46,17 @@ class AnswerParserWhoisZaOrgTest < Whois::Answer::Parser::TestCase
     assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/available.txt')).expires_on }
   end
 
-end
+
+  def test_nameservers
+    parser    = @klass.new(load_part('/registered.txt'))
+    expected  = %w( blade.wcic.co.za sabertooth.wcic.co.za ns2.iafrica.com )
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+
+    parser    = @klass.new(load_part('/available.txt'))
+    expected  = %w()
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+  end
+
+end

data/test/list_tld

@@ -298,7 +298,7 @@ us;whois.nic.us;google.us;u34jedzcq.us
 #Whois::Server.define :tld, ".uz", "whois.cctld.uz"
 va;whois.ripe.net;vatican.va;u34jedzcq.va
 vc;whois.afilias-grs.info;google.vc;u34jedzcq.vc
-#Whois::Server.define :tld, ".ve", "whois.nic.ve"
+ve;whois.nic.ve;ula.ve;u34jedzcq.ve
 vg;whois.adamsnames.tc;google.vg;u34jedzcq.vg
 vi;;;
 vn;;;

data/test/server/adapters/none_test.rb

@@ -19,4 +19,4 @@ class ServerAdaptersNoneTest < Test::Unit::TestCase
     assert_match /ipv4/, error.message
   end
 
-end
+end

data/test/testcases/responses/whois.eu/nameservers_with_ip.txt

@@ -0,0 +1,61 @@
+% The WHOIS service offered by EURid and the access to the records
+% in the EURid WHOIS database are provided for information purposes
+% only. It allows persons to check whether a specific domain name
+% is still available or not and to obtain information related to
+% the registration records of existing domain names.
+%
+% EURid cannot, under any circumstances, be held liable in case the
+% stored information would prove to be wrong, incomplete or not
+% accurate in any sense.
+%
+% By submitting a query you agree not to use the information made
+% available to:
+%
+% - allow, enable or otherwise support the transmission of unsolicited,
+%   commercial advertising or other solicitations whether via email or
+%   otherwise;
+% - target advertising in any possible way;
+%
+% - to cause nuisance in any possible way to the registrants by sending
+%   (whether by automated, electronic processes capable of enabling
+%   high volumes or other possible means) messages to them.
+%
+% Without prejudice to the above, it is explicitly forbidden to extract,
+% copy and/or use or re-utilise in any form and by any means
+% (electronically or not) the whole or a quantitatively or qualitatively
+% substantial part of the contents of the WHOIS database without prior
+% and explicit permission by EURid, nor in any attempt hereof, to apply
+% automated, electronic processes to EURid (or its systems).
+%
+% You agree that any reproduction and/or transmission of data for
+% commercial purposes will always be considered as the extraction of a
+% substantial part of the content of the WHOIS database.
+%
+% By submitting the query you agree to abide by this policy and accept
+% that EURid can take measures to limit the use of its WHOIS services
+% in order to protect the privacy of its registrants or the integrity
+% of the database.
+%
+% The EURid WHOIS service on port 43 (textual whois) never
+% discloses any information concerning the registrant.
+% Registrant information can be obtained through use of the
+% webbased whois service available from the EURid website www.eurid.eu
+%
+% WHOIS servicemagic
+Domain:	servicemagic
+
+Registrant:
+	NOT DISCLOSED!
+	Visit www.eurid.eu for webbased whois.
+
+Registrar Technical Contacts:
+
+Registrar:
+	Name:	 MarkMonitor Inc.
+	Website: www.markmonitor.com
+
+Nameservers:
+	dns1.servicemagic.eu (91.121.133.61)
+	dns2.servicemagic.eu (91.121.103.77)
+
+Please visit www.eurid.eu for more info.

data/test/testcases/responses/whois.nic.ve/available.txt

@@ -0,0 +1,10 @@
+
+Servidor Whois de NIC-Venezuela (.VE)
+
+Este servidor contiene informacion autoritativa exclusivamente de dominios .VE
+Cualquier consulta sobre este servicio, puede hacerla al correo electronico whois@nic.ve
+
+No match for "u34jedzcq.ve".
+
+NIC-Venezuela - CONATEL
+http://www.nic.ve

data/test/testcases/responses/whois.nic.ve/registered.txt

@@ -0,0 +1,48 @@
+
+Servidor Whois de NIC-Venezuela (.VE)
+
+Este servidor contiene informacion autoritativa exclusivamente de dominios .VE
+Cualquier consulta sobre este servicio, puede hacerla al correo electronico whois@nic.ve
+
+Titular: 
+Universidad de los Andes  (ula.ve-dom)		fobispo@nic.ve
+   ULA 
+   Merida
+   Merida, Merida  VE
+   +582127718584 (FAX) +582127718599
+
+   Nombre de Dominio: ula.ve
+
+   Contacto Administrativo: 
+      Universidad de los Andes  (ula.ve-adm)		fobispo@nic.ve
+      ULA 
+      Merida
+      Merida, Merida  VE
+      +582127718584 (FAX) +582127718599
+   
+   Contacto Tecnico: 
+      Universidad de los Andes  (ula.ve-tec)		fobispo@nic.ve
+      ULA 
+      Merida
+      Merida, Merida  VE
+      +582127718584 (FAX) +582127718599
+   
+   Contacto de Cobranza: 
+      Universidad de los Andes  (ula.ve-bil)		fobispo@nic.ve
+      ULA 
+      Merida
+      Merida, Merida  VE
+      +582127718584 (FAX) +582127718599
+
+   Ultima Actualizacion: 2005-11-17 21:16:31
+   Fecha de Creacion: 2005-11-15 14:40:48
+
+   Estatus del dominio: ACTIVO
+
+   Servidor(es) de Nombres de Dominio:
+
+   - avalon.ula.ve
+   - azmodan.ula.ve
+
+NIC-Venezuela - CONATEL
+http://www.nic.ve