whois 1.0.12 → 1.1.0

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

@@ -135,46 +135,67 @@ http://www.denic.de/en/background/whois-service/webwhois.html
                   @klass.new(load_part('/available.txt')).registrar
   end
 
-  def test_registrant
-    assert_equal  nil,
-                  @klass.new(load_part('/registered.txt')).registrant
+  def test_registrant_contact_with_registered
+    parser    = @klass.new(load_part('/registered.txt'))
+    expected  = nil
+    assert_equal  expected, parser.registrant_contact
+    assert_equal  expected, parser.instance_eval { @registrant_contact }
   end
 
-  def test_registrant_with_available
-    assert_equal  nil,
-                  @klass.new(load_part('/available.txt')).registrant
+  def test_registrant_contact_with_available
+    parser    = @klass.new(load_part('/available.txt'))
+    expected  = nil
+    assert_equal  expected, parser.registrant_contact
+    assert_equal  expected, parser.instance_eval { @registrant_contact }
   end
 
-  def test_admin
-    assert_equal  nil,
-                  @klass.new(load_part('/registered.txt')).admin
+  def test_admin_contact_with_registered
+    parser    = @klass.new(load_part('/registered.txt'))
+    expected  = nil
+    assert_equal  expected, parser.admin_contact
+    assert_equal  expected, parser.instance_eval { @admin_contact }
   end
 
-  def test_admin_with_available
-    assert_equal  nil,
-                  @klass.new(load_part('/available.txt')).admin
+  def test_admin_contact_with_available
+    parser    = @klass.new(load_part('/available.txt'))
+    expected  = nil
+    assert_equal  expected, parser.admin_contact
+    assert_equal  expected, parser.instance_eval { @admin_contact }
   end
 
-  def test_technical
-    contact = @klass.new(load_part('/registered.txt')).technical
-    assert_instance_of(Whois::Answer::Contact, contact)
-    assert_equal(nil, contact.id)
-    assert_equal('Google Inc.', contact.name)
-    assert_equal(nil, contact.organization)
-    assert_equal(['Google Inc.', '1600 Amphitheatre Parkway'], contact.address)
-    assert_equal('Mountain View', contact.city)
-    assert_equal(nil, contact.state)
-    assert_equal('94043', contact.zip)
-    assert_equal(nil, contact.country)
-    assert_equal('US', contact.country_code)
-    assert_equal('+1-6503300100', contact.phone)
-    assert_equal('+1-6506188571', contact.fax)
-    assert_equal('dns-admin@google.com', contact.email)
+  def test_technical_contact_with_registered
+    parser    = @klass.new(load_part('/registered.txt'))
+    expected  = parser.technical_contact
+    assert_equal  expected, parser.technical_contact
+    assert_equal  expected, parser.instance_eval { @technical_contact }
+
+    assert_instance_of Whois::Answer::Contact, expected
   end
 
-  def test_technical_with_available
-    assert_equal  nil,
-                  @klass.new(load_part('/available.txt')).technical
+  def test_technical_contact_with_available
+    parser    = @klass.new(load_part('/available.txt'))
+    expected  = nil
+    assert_equal  expected, parser.technical_contact
+    assert_equal  expected, parser.instance_eval { @technical_contact }
+  end
+
+  def test_technical_contact
+    parser    = @klass.new(load_part('/property_technical_contact.txt'))
+    result    = parser.technical_contact
+
+    assert_instance_of Whois::Answer::Contact, result
+    assert_equal nil,                     result.id
+    assert_equal 'Google Inc.',           result.name
+    assert_equal nil,                     result.organization
+    assert_equal ['Google Inc.', '1600 Amphitheatre Parkway'], result.address
+    assert_equal 'Mountain View',         result.city
+    assert_equal nil,                     result.state
+    assert_equal '94043',                 result.zip
+    assert_equal nil,                     result.country
+    assert_equal 'US',                    result.country_code
+    assert_equal '+1-6503300100',         result.phone
+    assert_equal '+1-6506188571',         result.fax
+    assert_equal 'dns-admin@google.com',  result.email
   end
 
 
@@ -191,7 +212,7 @@ http://www.denic.de/en/background/whois-service/webwhois.html
   end
 
   def test_nameservers_with_ip
-    parser    = @klass.new(load_part('/nameservers_with_ip.txt'))
+    parser    = @klass.new(load_part('/property_nameservers_with_ip.txt'))
     expected  = %w( ns1.prodns.de ns2.prodns.de ns3.prodns.de )
     assert_equal  expected, parser.nameservers
     assert_equal  expected, parser.instance_eval { @nameservers }
@@ -296,7 +317,7 @@ assurance and to bar you from using its whois query.
   end
 
 
-  def test_registrar
+  def test_registrar_with_registered
     registrar = @klass.new(load_part('/1-10-0_registered.txt')).registrar
     assert_instance_of(Whois::Answer::Registrar, registrar)
     assert_equal(nil, registrar.id)
@@ -310,8 +331,8 @@ assurance and to bar you from using its whois query.
                   @klass.new(load_part('/1-10-0_available.txt')).registrar
   end
 
-  def test_registrant
-    contact = @klass.new(load_part('/1-10-0_registered.txt')).registrant
+  def test_registrant_contact_with_registered
+    contact = @klass.new(load_part('/1-10-0_registered.txt')).registrant_contact
     assert_instance_of(Whois::Answer::Contact, contact)
     assert_equal(nil, contact.id)
     assert_equal('Google Inc.', contact.name)
@@ -327,13 +348,13 @@ assurance and to bar you from using its whois query.
     assert_equal(nil, contact.email)
   end
 
-  def test_registrant_with_available
+  def test_registrant_contact_with_available
     assert_equal  nil,
-                  @klass.new(load_part('/1-10-0_available.txt')).registrant
+                  @klass.new(load_part('/1-10-0_available.txt')).registrant_contact
   end
 
-  def test_admin
-    contact = @klass.new(load_part('/1-10-0_registered.txt')).admin
+  def test_admin_contact_with_registered
+    contact = @klass.new(load_part('/1-10-0_registered.txt')).admin_contact
     assert_instance_of(Whois::Answer::Contact, contact)
     assert_equal(nil, contact.id)
     assert_equal('Lena Tangermann', contact.name)
@@ -349,13 +370,13 @@ assurance and to bar you from using its whois query.
     assert_equal(nil, contact.email)
   end
 
-  def test_admin_with_available
+  def test_admin_contact_with_available
     assert_equal  nil,
-                  @klass.new(load_part('/1-10-0_available.txt')).admin
+                  @klass.new(load_part('/1-10-0_available.txt')).admin_contact
   end
 
-  def test_technical
-    contact = @klass.new(load_part('/1-10-0_registered.txt')).technical
+  def test_technical_contact_with_registered
+    contact = @klass.new(load_part('/1-10-0_registered.txt')).technical_contact
     assert_instance_of(Whois::Answer::Contact, contact)
     assert_equal(nil, contact.id)
     assert_equal('Google Inc.', contact.name)
@@ -371,9 +392,9 @@ assurance and to bar you from using its whois query.
     assert_equal('dns-admin@google.com', contact.email)
   end
 
-  def test_technical_with_available
+  def test_technical_contact_with_available
     assert_equal  nil,
-                  @klass.new(load_part('/1-10-0_available.txt')).technical
+                  @klass.new(load_part('/1-10-0_available.txt')).technical_contact
   end
 
 

data/test/answer/parser/whois.eu_test.rb

@@ -56,7 +56,7 @@ class AnswerParserWhoisEuTest < Whois::Answer::Parser::TestCase
   end
 
   def test_nameservers_with_ip
-    parser    = @klass.new(load_part('/nameservers_with_ip.txt'))
+    parser    = @klass.new(load_part('/property_nameservers_with_ip.txt'))
     expected  = %w( dns1.servicemagic.eu dns2.servicemagic.eu )
     assert_equal  expected, parser.nameservers
     assert_equal  expected, parser.instance_eval { @nameservers }

data/test/answer/parser/whois.nic-se.se_test.rb

@@ -62,7 +62,7 @@ class AnswerParserWhoisNicSeSeTest < Whois::Answer::Parser::TestCase
   end
 
   def test_nameservers_with_ip
-    parser    = @klass.new(load_part('/nameservers_with_ip.txt'))
+    parser    = @klass.new(load_part('/property_nameservers_with_ip.txt'))
     expected  = %w( ns2.loopia.se ns4.loopia.se ns3.loopia.se ns1.loopia.se )
     assert_equal  expected, parser.nameservers
     assert_equal  expected, parser.instance_eval { @nameservers }

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

@@ -13,12 +13,12 @@ class AnswerParserWhoisNicAcTest < Whois::Answer::Parser::TestCase
     parser    = @klass.new(load_part('/registered.txt'))
     expected  = "google.ac"
     assert_equal  expected, parser.domain
-    assert_equal  expected, parser.instance_variable_get(:"@domain")
+    assert_equal  expected, parser.instance_eval { @domain }
 
     parser    = @klass.new(load_part('/available.txt'))
     expected  = "u34jedzcq.ac"
     assert_equal  expected, parser.domain
-    assert_equal  expected, parser.instance_variable_get(:"@domain")
+    assert_equal  expected, parser.instance_eval { @domain }
   end
 
   def test_domain_id
@@ -31,12 +31,12 @@ class AnswerParserWhoisNicAcTest < Whois::Answer::Parser::TestCase
     parser    = @klass.new(load_part('/registered.txt'))
     expected  = :registered
     assert_equal  expected, parser.status
-    assert_equal  expected, parser.instance_variable_get(:"@status")
+    assert_equal  expected, parser.instance_eval { @status }
 
     parser    = @klass.new(load_part('/available.txt'))
     expected  = :available
     assert_equal  expected, parser.status
-    assert_equal  expected, parser.instance_variable_get(:"@status")
+    assert_equal  expected, parser.instance_eval { @status }
   end
 
   def test_available?
@@ -71,19 +71,19 @@ class AnswerParserWhoisNicAcTest < Whois::Answer::Parser::TestCase
     assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/available.txt')).registrar }
   end
 
-  def test_registrant
-    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/registered.txt')).registrant }
-    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/available.txt')).registrant }
+  def test_registrant_contact
+    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/registered.txt')).registrant_contact }
+    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/available.txt')).registrant_contact }
   end
 
-  def test_admin
-    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/registered.txt')).admin }
-    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/available.txt')).admin }
+  def test_admin_contact
+    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/registered.txt')).admin_contact }
+    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/available.txt')).admin_contact }
   end
 
-  def test_technical
-    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/registered.txt')).technical }
-    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/available.txt')).technical }
+  def test_technical_contact
+    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/registered.txt')).technical_contact }
+    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/available.txt')).technical_contact }
   end
 
 

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

@@ -0,0 +1,84 @@
+require 'test_helper'
+require 'whois/answer/parser/whois.nic.am'
+
+class AnswerParserWhoisNicAmTest < Whois::Answer::Parser::TestCase
+
+  def setup
+    @klass  = Whois::Answer::Parser::WhoisNicAm
+    @host   = "whois.nic.am"
+  end
+
+
+  def test_status
+    parser    = @klass.new(load_part('/registered.txt'))
+    expected  = "active"
+    assert_equal  expected, parser.status
+    assert_equal  expected, parser.instance_eval { @status }
+
+    parser    = @klass.new(load_part('/available.txt'))
+    expected  = nil
+    assert_equal  expected, parser.status
+    assert_equal  expected, parser.instance_eval { @status }
+  end
+
+  def test_available?
+    assert !@klass.new(load_part('/registered.txt')).available?
+    assert  @klass.new(load_part('/available.txt')).available?
+  end
+
+  def test_registered?
+    assert  @klass.new(load_part('/registered.txt')).registered?
+    assert !@klass.new(load_part('/available.txt')).registered?
+  end
+
+
+  def test_created_on
+    parser    = @klass.new(load_part('/registered.txt'))
+    expected  = Time.parse("1999-06-05")
+    assert_equal  expected, parser.created_on
+    assert_equal  expected, parser.instance_eval { @created_on }
+
+    parser    = @klass.new(load_part('/available.txt'))
+    expected  = nil
+    assert_equal  expected, parser.created_on
+    assert_equal  expected, parser.instance_eval { @created_on }
+  end
+
+  def test_updated_on
+    parser    = @klass.new(load_part('/registered.txt'))
+    expected  = Time.parse("2010-03-16")
+    assert_equal  expected, parser.updated_on
+    assert_equal  expected, parser.instance_eval { @updated_on }
+
+    parser    = @klass.new(load_part('/available.txt'))
+    expected  = nil
+    assert_equal  expected, parser.updated_on
+    assert_equal  expected, parser.instance_eval { @updated_on }
+  end
+
+  def test_expires_on
+    parser    = @klass.new(load_part('/registered.txt'))
+    expected  = Time.parse("2011-04-15")
+    assert_equal  expected, parser.expires_on
+    assert_equal  expected, parser.instance_eval { @expires_on }
+
+    parser    = @klass.new(load_part('/available.txt'))
+    expected  = nil
+    assert_equal  expected, parser.expires_on
+    assert_equal  expected, parser.instance_eval { @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.nic.as_test.rb

@@ -0,0 +1,63 @@
+require 'test_helper'
+require 'whois/answer/parser/whois.nic.as'
+
+class AnswerParserWhoisNicAsTest < Whois::Answer::Parser::TestCase
+
+  def setup
+    @klass  = Whois::Answer::Parser::WhoisNicAs
+    @host   = "whois.nic.as"
+  end
+
+
+  def test_status
+    parser    = @klass.new(load_part('/registered.txt'))
+    expected  = :registered
+    assert_equal  expected, parser.status
+    assert_equal  expected, parser.instance_eval { @status }
+
+    parser    = @klass.new(load_part('/available.txt'))
+    expected  = :available
+    assert_equal  expected, parser.status
+    assert_equal  expected, parser.instance_eval { @status }
+  end
+
+  def test_available?
+    assert !@klass.new(load_part('/registered.txt')).available?
+    assert  @klass.new(load_part('/available.txt')).available?
+  end
+
+  def test_registered?
+    assert  @klass.new(load_part('/registered.txt')).registered?
+    assert !@klass.new(load_part('/available.txt')).registered?
+  end
+
+
+  def test_created_on
+    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/registered.txt')).created_on }
+    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/available.txt')).created_on }
+  end
+
+  def test_updated_on
+    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/registered.txt')).updated_on }
+    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/available.txt')).updated_on }
+  end
+
+  def test_expires_on
+    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/registered.txt')).expires_on }
+    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( 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.hu_test.rb

@@ -113,29 +113,29 @@ EOS
   end
 
 
-  def test_registrant_with_registered
-    parser    = @klass.new(load_part('/registered.txt'))
-    result    = parser.registrant
-    assert_instance_of Whois::Answer::Contact, result
-    assert_equal  result, parser.registrant
-    assert_equal  result, parser.instance_eval { @registrant }
+  def test_registrant_contact_with_registered
+    parser      = @klass.new(load_part('/registered.txt'))
+    expected    = parser.registrant_contact
+    assert_instance_of Whois::Answer::Contact, expected
+    assert_equal  expected, parser.registrant_contact
+    assert_equal  expected, parser.instance_eval { @registrant_contact }
  end
 
-  def test_registrant_with_unregistered
-    parser    = @klass.new(load_part('/available.txt'))
-    result    = nil
-    assert_equal  result, parser.registrant
-    assert_equal  result, parser.instance_eval { @registrant }
+  def test_registrant_contact_with_unregistered
+    parser      = @klass.new(load_part('/available.txt'))
+    expected    = nil
+    assert_equal  expected, parser.registrant_contact
+    assert_equal  expected, parser.instance_eval { @registrant_contact }
 
-    parser    = @klass.new(load_part('/in_progress.txt'))
-    result    = nil
-    assert_equal  result, parser.registrant
-    assert_equal  result, parser.instance_eval { @registrant }
+    parser      = @klass.new(load_part('/in_progress.txt'))
+    expected    = nil
+    assert_equal  expected, parser.registrant_contact
+    assert_equal  expected, parser.instance_eval { @registrant }
   end
 
-  def test_registrant_as_company
+  def test_registrant_contact_as_company
     parser    = @klass.new(load_part('/property_registrant_as_company.txt'))
-    result    = parser.registrant
+    result    = parser.registrant_contact
 
     assert_instance_of Whois::Answer::Contact,  result
     assert_equal 'Google, Inc.',                result.name
@@ -148,9 +148,9 @@ EOS
     assert_equal '+1 650 253 0001',             result.fax
   end
 
-  def test_registrant_as_private_person
+  def test_registrant_contact_as_private_person
     parser    = @klass.new(load_part('/property_registrant_as_private_person.txt'))
-    result    = parser.registrant
+    result    = parser.registrant_contact
 
     assert_instance_of Whois::Answer::Contact,  result
     assert_match /Buruzs/,                      result.name             # UTF-8 hack
@@ -163,9 +163,9 @@ EOS
     assert_equal nil,                           result.fax
   end
 
-  def test_registrant_without_address
+  def test_registrant_contact_without_address
     parser    = @klass.new(load_part('/property_registrant_without_address.txt'))
-    result    = parser.registrant
+    result    = parser.registrant_contact
 
     assert_equal nil, result.address
     assert_equal nil, result.zip
@@ -173,8 +173,8 @@ EOS
     assert_equal nil, result.country_code
   end
 
-  def test_admin_with_registered
-    admin = @klass.new(load_part('/registered.txt')).admin
+  def test_admin_contact_with_registered
+    admin = @klass.new(load_part('/registered.txt')).admin_contact
     assert_instance_of Whois::Answer::Contact, admin
     assert_equal '2000466366', admin.id
     assert_equal '3C Kft. (Registrar)', admin.name
@@ -186,15 +186,20 @@ EOS
     assert_equal '+36 1 275 58 87', admin.fax
   end
 
-  def test_admin_with_unregistered
-    assert_equal  nil,
-                  @klass.new(load_part('/available.txt')).admin
-    assert_equal  nil,
-                  @klass.new(load_part('/in_progress.txt')).admin
+  def test_admin_contact_with_unregistered
+    parser      = @klass.new(load_part('/available.txt'))
+    expected    = nil
+    assert_equal  expected, parser.admin_contact
+    assert_equal  expected, parser.instance_eval { @admin_contact }
+
+    parser      = @klass.new(load_part('/in_progress.txt'))
+    expected    = nil
+    assert_equal  expected, parser.admin_contact
+    assert_equal  expected, parser.instance_eval { @admin_contact }
   end
 
-  def test_technical_with_registered
-    technical = @klass.new(load_part('/registered.txt')).technical
+  def test_technical_contact_with_registered
+    technical = @klass.new(load_part('/registered.txt')).technical_contact
     assert_instance_of Whois::Answer::Contact, technical
     assert_equal '2000578125', technical.id
     assert_equal 'Markmonitor', technical.name
@@ -207,11 +212,16 @@ EOS
     assert_equal 'ccops@markmonitor.com', technical.email
   end
 
-  def test_technical_with_unregistered
-    assert_equal  nil,
-                  @klass.new(load_part('/available.txt')).technical
-    assert_equal  nil,
-                  @klass.new(load_part('/in_progress.txt')).technical
+  def test_technical_contact_with_unregistered
+    parser      = @klass.new(load_part('/available.txt'))
+    expected    = nil
+    assert_equal  expected, parser.technical_contact
+    assert_equal  expected, parser.instance_eval { @technical_contact }
+
+    parser      = @klass.new(load_part('/in_progress.txt'))
+    expected    = nil
+    assert_equal  expected, parser.technical_contact
+    assert_equal  expected, parser.instance_eval { @technical_contact }
   end