whois 1.0.5 → 1.0.6

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

@@ -50,10 +50,8 @@ EOS
   end
 
   def test_domain_id
-    assert_equal  nil,
-                  @klass.new(load_part('/registered.txt')).domain_id
-    assert_equal  nil,
-                  @klass.new(load_part('/available.txt')).domain_id
+    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/registered.txt')).domain_id }
+    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/available.txt')).domain_id }
   end
 
 
@@ -129,8 +127,10 @@ EOS
     expected  = %w()
     assert_equal  expected, parser.nameservers
     assert_equal  expected, parser.instance_eval { @nameservers }
+  end
 
-    parser    = @klass.new(load_part('/nameservers_with_nonameserver.txt'))
+  def test_nameservers_with_no_nameserver
+    parser    = @klass.new(load_part('/nameservers_with_no_nameserver.txt'))
     expected  = %w()
     assert_equal  expected, parser.nameservers
     assert_equal  expected, parser.instance_eval { @nameservers }

data/test/answer/parser/whois.denic.de_test.rb

@@ -80,10 +80,8 @@ http://www.denic.de/en/background/whois-service/webwhois.html
   end
 
   def test_domain_id
-    assert_equal  nil,
-                  @klass.new(load_part('/available.txt')).domain_id
-    assert_equal  nil,
-                  @klass.new(load_part('/registered.txt')).domain_id
+    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/registered.txt')).domain_id }
+    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/available.txt')).domain_id }
   end
 
 
@@ -95,13 +93,13 @@ http://www.denic.de/en/background/whois-service/webwhois.html
   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
 
   def test_available?
+    assert !@klass.new(load_part('/registered.txt')).available?
     assert  @klass.new(load_part('/available.txt')).available?
-    assert  !@klass.new(load_part('/registered.txt')).available?
   end
 
 
@@ -257,10 +255,8 @@ assurance and to bar you from using its whois query.
   end
 
   def test_domain_id
-    assert_equal  nil,
-                  @klass.new(load_part('/1-10-0_available.txt')).domain_id
-    assert_equal  nil,
-                  @klass.new(load_part('/1-10-0_registered.txt')).domain_id
+    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/registered.txt')).domain_id }
+    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/available.txt')).domain_id }
   end
 
 

data/test/answer/parser/whois.domain-registry.nl_test.rb

@@ -46,4 +46,17 @@ class AnswerParserWhoisDomainRegistryNlTest < 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.domainregistry.ie_test.rb

@@ -44,4 +44,17 @@ class AnswerParserWhoisDomainregistryIeTest < Whois::Answer::Parser::TestCase
                   @klass.new(load_part('/available.txt')).expires_on
   end
 
+
+  def test_nameservers
+    parser    = @klass.new(load_part('/registered.txt'))
+    expected  = %w( ns1.google.com ns2.google.com ns3.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.dotmobiregistry.net_test.rb

@@ -48,4 +48,17 @@ class AnswerParserWhoisDotmobiregistryNetTest < Whois::Answer::Parser::TestCase
                   @klass.new(load_part('/available.txt')).expires_on
   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.educause.edu_test.rb

@@ -48,4 +48,17 @@ class AnswerParserWhoisEducauseEduTest < Whois::Answer::Parser::TestCase
                   @klass.new(load_part('/available.txt')).expires_on
   end
 
+
+  def test_nameservers
+    parser    = @klass.new(load_part('/registered.txt'))
+    expected  = %w( ns3.educause.edu ns4.educause.edu ns5.educause.edu )
+    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.eu.org_test.rb

@@ -22,8 +22,8 @@ class AnswerParserWhoisEuOrgTest < 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 AnswerParserWhoisEuOrgTest < 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.eu_test.rb

@@ -22,8 +22,8 @@ class AnswerParserWhoisEuTest < 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
 
 
@@ -55,4 +55,11 @@ class AnswerParserWhoisEuTest < Whois::Answer::Parser::TestCase
     assert_equal  expected, parser.instance_eval { @nameservers }
   end
 
+  def test_nameservers_with_ip
+    parser    = @klass.new(load_part('/nameservers_with_ip.txt'))
+    expected  = %w( dns1.servicemagic.eu dns2.servicemagic.eu )
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+  end
+
 end

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

@@ -22,8 +22,8 @@ class AnswerParserWhoisIanaOrgTest < 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,18 @@ class AnswerParserWhoisIanaOrgTest < Whois::Answer::Parser::TestCase
     assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/available.txt')).expires_on }
   end
 
+
+
+  def test_nameservers
+    parser    = @klass.new(load_part('/registered.txt'))
+    expected  = %w( max.nra.nato.int ns1.cs.uc1.ac.uk ns1.drenet.dnd.ca relay.mod.uk maxima.nra.nato.int ns.namsa.nato.int ns.saclantc.nato.int ns.nc3a.nato.int )
+    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.isnic.is_test.rb

@@ -46,4 +46,17 @@ class AnswerParserWhoisIsnicIsTest < Whois::Answer::Parser::TestCase
                   @klass.new(load_part('/available.txt')).expires_on
   end
 
+
+  def test_nameservers
+    parser    = @klass.new(load_part('/registered.txt'))
+    expected  = %w( ns1.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.museum_test.rb

@@ -48,4 +48,17 @@ class AnswerParserWhoisMuseumTest < Whois::Answer::Parser::TestCase
                   @klass.new(load_part('/available.txt')).expires_on
   end
 
+
+  def test_nameservers
+    parser    = @klass.new(load_part('/registered.txt'))
+    expected  = %w( nic.frd.se nic.museum )
+    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.nic.ac_test.rb

@@ -45,8 +45,8 @@ class AnswerParserWhoisNicAcTest < 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
 
 
@@ -123,4 +123,4 @@ class AnswerParserWhoisNicAcTest < Whois::Answer::Parser::TestCase
     assert !parser_a1.unchanged?(parser_r1)
   end
 
-end
+end

data/test/answer/parser/whois.nic.asia_test.rb

@@ -48,4 +48,17 @@ class AnswerParserWhoisNicAsiaTest < 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.dotasia.org ns2.dotasia.org )
+    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.nic.cc_test.rb

@@ -50,10 +50,8 @@ EOS
   end
 
   def test_domain_id
-    assert_equal  nil,
-                  @klass.new(load_part('/registered.txt')).domain_id
-    assert_equal  nil,
-                  @klass.new(load_part('/available.txt')).domain_id
+    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/registered.txt')).domain_id }
+    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/available.txt')).domain_id }
   end
 
 
@@ -119,4 +117,17 @@ EOS
                   @klass.new(load_part('/available.txt')).registrar
   end
 
-end
+
+  def test_nameservers
+    parser    = @klass.new(load_part('/registered.txt'))
+    expected  = %w( ns2.google.com ns1.google.com ns4.google.com ns3.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.nic.cd_test.rb

@@ -46,4 +46,17 @@ class AnswerParserWhoisNicCdTest < 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.nic.ch_test.rb

@@ -22,8 +22,8 @@ class AnswerParserWhoisNicChTest < 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 AnswerParserWhoisNicChTest < 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.nic.coop_test.rb

@@ -48,4 +48,17 @@ class AnswerParserWhoisNicCoopTest < Whois::Answer::Parser::TestCase
                   @klass.new(load_part('/available.txt')).expires_on
   end
 
+
+  def test_nameservers
+    parser    = @klass.new(load_part('/registered.txt'))
+    expected  = %w( ns1.calgarycoop.net ns2.calgarycoop.net )
+    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.nic.fr_test.rb

@@ -49,6 +49,19 @@ class AnswerParserWhoisNicFrFrTest < AnswerParserWhoisNicFrTest
     assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/fr/available.txt')).expires_on }
   end
 
+
+  def test_nameservers
+    parser    = @klass.new(load_part('/fr/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('/fr/available.txt'))
+    expected  = %w()
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+  end
+
 end
 
 class AnswerParserWhoisNicFrPmTest < AnswerParserWhoisNicFrTest
@@ -90,6 +103,19 @@ class AnswerParserWhoisNicFrPmTest < AnswerParserWhoisNicFrTest
     assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/pm/available.txt')).expires_on }
   end
 
+
+  def test_nameservers
+    parser    = @klass.new(load_part('/pm/registered.txt'))
+    expected  = %w( ns1.nic.fr ns2.nic.fr ns3.nic.fr )
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+
+    parser    = @klass.new(load_part('/pm/available.txt'))
+    expected  = %w()
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+  end
+
 end
 
 class AnswerParserWhoisNicFrReTest < AnswerParserWhoisNicFrTest
@@ -131,6 +157,19 @@ class AnswerParserWhoisNicFrReTest < AnswerParserWhoisNicFrTest
     assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/re/available.txt')).expires_on }
   end
 
+
+  def test_nameservers
+    parser    = @klass.new(load_part('/pm/registered.txt'))
+    expected  = %w( ns1.nic.fr ns2.nic.fr ns3.nic.fr )
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+
+    parser    = @klass.new(load_part('/pm/available.txt'))
+    expected  = %w()
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+  end
+
 end
 
 class AnswerParserWhoisNicFrWfTest < AnswerParserWhoisNicFrTest
@@ -172,6 +211,19 @@ class AnswerParserWhoisNicFrWfTest < AnswerParserWhoisNicFrTest
     assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/wf/available.txt')).expires_on }
   end
 
+
+  def test_nameservers
+    parser    = @klass.new(load_part('/wf/registered.txt'))
+    expected  = %w( ns1.nic.fr ns2.nic.fr ns3.nic.fr )
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+
+    parser    = @klass.new(load_part('/wf/available.txt'))
+    expected  = %w()
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+  end
+
 end
 
 class AnswerParserWhoisNicFrYtTest < AnswerParserWhoisNicFrTest
@@ -213,4 +265,17 @@ class AnswerParserWhoisNicFrYtTest < AnswerParserWhoisNicFrTest
     assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/yt/available.txt')).expires_on }
   end
 
+
+  def test_nameservers
+    parser    = @klass.new(load_part('/yt/registered.txt'))
+    expected  = %w( ns1.nic.fr ns2.nic.fr ns3.nic.fr )
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+
+    parser    = @klass.new(load_part('/yt/available.txt'))
+    expected  = %w()
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+  end
+
 end