whois 1.1.8 → 1.2.0

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

@@ -19,22 +19,22 @@ Fax			: Hidden upon user request
 
 ** Technical Contact:
 NIC Handle		: btl1-metu
-Organization Name	: BER�L TEKNOLOJ� LTD. �T�.
-Address			: Ceyhun Atuf Kansu Cad. Bayraktar �� Merkezi
+Organization Name	: BERÝL TEKNOLOJÝ LTD. ÞTÝ.
+Address			: Ceyhun Atuf Kansu Cad. Bayraktar Ýþ Merkezi
 			  No:114 G-4 Balgat
 			  Ankara,06520
-			  T�rkiye
+			  Türkiye
 Phone			: + 90-312-4733035-
 Fax			: + 90-312-4733039-
 
 
 ** Billing Contact:
 NIC Handle		: btl1-metu
-Organization Name	: BER�L TEKNOLOJ� LTD. �T�.
-Address			: Ceyhun Atuf Kansu Cad. Bayraktar �� Merkezi
+Organization Name	: BERÝL TEKNOLOJÝ LTD. ÞTÝ.
+Address			: Ceyhun Atuf Kansu Cad. Bayraktar Ýþ Merkezi
 			  No:114 G-4 Balgat
 			  Ankara,06520
-			  T�rkiye
+			  Türkiye
 Phone			: + 90-312-4733035-
 Fax			: + 90-312-4733039-
 

data/test/testcases/responses/whois.publicinterestregistry.net/throttle.txt

@@ -0,0 +1 @@
+WHOIS LIMIT EXCEEDED - SEE WWW.PIR.ORG/WHOIS FOR DETAILS

data/test/{answer → whois/answer}/parser/base_test.rb

@@ -63,6 +63,11 @@ class AnswerParserBaseTest < Test::Unit::TestCase
   end
 
 
+  def test_throttle_question
+    assert !@klass.new(@part).throttle?
+  end
+
+
   def test_self_property_registry
     assert_instance_of Hash, @klass.property_registry
   end

data/test/{answer → whois/answer}/parser/whois.nic.hu_test.rb

@@ -10,6 +10,27 @@ class AnswerParserWhoisNicHuTest < Whois::Answer::Parser::TestCase
     @host   = "whois.nic.hu"
   end
 
+  def test_domain
+    parser    = @klass.new(load_part('/current/registered.txt'))
+    expected  = "google.hu"
+    assert_equal  expected, parser.domain
+    assert_equal  expected, parser.instance_eval { @domain }
+
+    parser    = @klass.new(load_part('/current/available.txt'))
+    expected  = nil
+    assert_equal  expected, parser.domain
+    assert_equal  expected, parser.instance_eval { @domain }
+  end
+
+end
+
+class AnswerParserWhoisNicHu_v199_Test < Whois::Answer::Parser::TestCase
+
+  def setup
+    @klass  = Whois::Answer::Parser::WhoisNicHu
+    @host   = "whois.nic.hu"
+  end
+
 
   def test_disclaimer
     expected = <<-EOS.strip
@@ -23,82 +44,90 @@ elérhetõ feltételek elfogadása és betartása mellett
 használható legálisan.
 EOS
     assert_equal  expected,
-                  @klass.new(load_part('/available.txt')).disclaimer
+                  @klass.new(load_part('/v1.99/available.txt')).disclaimer
     assert_equal  expected,
-                  @klass.new(load_part('/in_progress.txt')).disclaimer
+                  @klass.new(load_part('/v1.99/in_progress.txt')).disclaimer
     assert_equal  expected,
-                  @klass.new(load_part('/registered.txt')).disclaimer
+                  @klass.new(load_part('/v1.99/registered.txt')).disclaimer
   end
 
 
   def test_domain
-    assert_equal  nil,
-                  @klass.new(load_part('/available.txt')).domain
-    assert_equal  'ezitvps.hu',
-                  @klass.new(load_part('/in_progress.txt')).domain
-    assert_equal  'google.hu',
-                  @klass.new(load_part('/registered.txt')).domain
+    parser    = @klass.new(load_part('/v1.99/registered.txt'))
+    expected  = "google.hu"
+    assert_equal  expected, parser.domain
+    assert_equal  expected, parser.instance_eval { @domain }
+
+    parser    = @klass.new(load_part('/v1.99/available.txt'))
+    expected  = nil
+    assert_equal  expected, parser.domain
+    assert_equal  expected, parser.instance_eval { @domain }
+
+    parser    = @klass.new(load_part('/v1.99/in_progress.txt'))
+    expected  = "ezitvps.hu"
+    assert_equal  expected, parser.domain
+    assert_equal  expected, parser.instance_eval { @domain }
   end
 
   def test_domain_id
     assert_equal  nil,
-                  @klass.new(load_part('/available.txt')).domain_id
+                  @klass.new(load_part('/v1.99/available.txt')).domain_id
     assert_equal  nil,
-                  @klass.new(load_part('/in_progress.txt')).domain_id
+                  @klass.new(load_part('/v1.99/in_progress.txt')).domain_id
     assert_equal  '0000219547',
-                  @klass.new(load_part('/registered.txt')).domain_id
+                  @klass.new(load_part('/v1.99/registered.txt')).domain_id
   end
 
 
   def test_status
     assert_equal  :available,
-                  @klass.new(load_part('/available.txt')).status
+                  @klass.new(load_part('/v1.99/available.txt')).status
     assert_equal  :in_progress,
-                  @klass.new(load_part('/in_progress.txt')).status
+                  @klass.new(load_part('/v1.99/in_progress.txt')).status
     assert_equal  :registered,
-                  @klass.new(load_part('/registered.txt')).status
+                  @klass.new(load_part('/v1.99/registered.txt')).status
   end
 
   def test_available?
-    assert  @klass.new(load_part('/available.txt')).available?
-    assert !@klass.new(load_part('/in_progress.txt')).available?
-    assert !@klass.new(load_part('/registered.txt')).available?
+    assert  @klass.new(load_part('/v1.99/available.txt')).available?
+    assert !@klass.new(load_part('/v1.99/in_progress.txt')).available?
+    assert !@klass.new(load_part('/v1.99/registered.txt')).available?
   end
 
   def test_registered?
-    assert !@klass.new(load_part('/available.txt')).registered?
-    assert !@klass.new(load_part('/in_progress.txt')).registered?
-    assert  @klass.new(load_part('/registered.txt')).registered?
+    assert !@klass.new(load_part('/v1.99/available.txt')).registered?
+    assert !@klass.new(load_part('/v1.99/in_progress.txt')).registered?
+    assert  @klass.new(load_part('/v1.99/registered.txt')).registered?
   end
 
 
   def test_created_on
     assert_equal  nil,
-                  @klass.new(load_part('/available.txt')).created_on
+                  @klass.new(load_part('/v1.99/available.txt')).created_on
     assert_equal  nil,
-                  @klass.new(load_part('/in_progress.txt')).created_on
+                  @klass.new(load_part('/v1.99/in_progress.txt')).created_on
     assert_equal  Time.parse("2000-03-25 23:20:39"),
-                  @klass.new(load_part('/registered.txt')).created_on
+                  @klass.new(load_part('/v1.99/registered.txt')).created_on
   end
 
   def test_updated_on
     assert_equal  nil,
-                  @klass.new(load_part('/available.txt')).updated_on
+                  @klass.new(load_part('/v1.99/available.txt')).updated_on
     assert_equal  nil,
-                  @klass.new(load_part('/in_progress.txt')).updated_on
+                  @klass.new(load_part('/v1.99/in_progress.txt')).updated_on
     assert_equal  Time.parse("2009-08-25 10:11:32"),
-                  @klass.new(load_part('/registered.txt')).updated_on
+                  @klass.new(load_part('/v1.99/registered.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 }
-    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/in_progress.txt')).expires_on }
+    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/v1.99/registered.txt')).expires_on }
+    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/v1.99/available.txt')).expires_on }
+    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/v1.99/in_progress.txt')).expires_on }
   end
 
 
   def test_registrar_with_registered
-    registrar = @klass.new(load_part('/registered.txt')).registrar
+    registrar = @klass.new(load_part('/v1.99/registered.txt')).registrar
     assert_instance_of Whois::Answer::Registrar, registrar
     assert_equal '1960108002', registrar.id
     assert_equal '3C Kft. (Registrar)', registrar.name
@@ -107,14 +136,14 @@ EOS
 
   def test_registrar_with_unregistered
     assert_equal  nil,
-                  @klass.new(load_part('/available.txt')).registrar
+                  @klass.new(load_part('/v1.99/available.txt')).registrar
     assert_equal  nil,
-                  @klass.new(load_part('/in_progress.txt')).registrar
+                  @klass.new(load_part('/v1.99/in_progress.txt')).registrar
   end
 
 
   def test_registrant_contact_with_registered
-    parser      = @klass.new(load_part('/registered.txt'))
+    parser      = @klass.new(load_part('/v1.99/registered.txt'))
     expected    = parser.registrant_contact
     assert_instance_of Whois::Answer::Contact, expected
     assert_equal  expected, parser.registrant_contact
@@ -122,19 +151,19 @@ EOS
  end
 
   def test_registrant_contact_with_unregistered
-    parser      = @klass.new(load_part('/available.txt'))
+    parser      = @klass.new(load_part('/v1.99/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'))
+    parser      = @klass.new(load_part('/v1.99/in_progress.txt'))
     expected    = nil
     assert_equal  expected, parser.registrant_contact
     assert_equal  expected, parser.instance_eval { @registrant }
   end
 
   def test_registrant_contact_as_company
-    parser    = @klass.new(load_part('/property_registrant_as_company.txt'))
+    parser    = @klass.new(load_part('/v1.99/property_registrant_as_company.txt'))
     result    = parser.registrant_contact
 
     assert_instance_of Whois::Answer::Contact,  result
@@ -150,7 +179,7 @@ EOS
   end
 
   def test_registrant_contact_as_private_person
-    parser    = @klass.new(load_part('/property_registrant_as_private_person.txt'))
+    parser    = @klass.new(load_part('/v1.99/property_registrant_as_private_person.txt'))
     result    = parser.registrant_contact
 
     assert_instance_of Whois::Answer::Contact,  result
@@ -166,7 +195,7 @@ EOS
   end
 
   def test_registrant_contact_without_address
-    parser    = @klass.new(load_part('/property_registrant_without_address.txt'))
+    parser    = @klass.new(load_part('/v1.99/property_registrant_without_address.txt'))
     result    = parser.registrant_contact
 
     assert_equal nil, result.address
@@ -176,7 +205,7 @@ EOS
   end
 
   def test_admin_contact_with_registered
-    result = @klass.new(load_part('/registered.txt')).admin_contact
+    result = @klass.new(load_part('/v1.99/registered.txt')).admin_contact
     assert_instance_of Whois::Answer::Contact,    result
     assert_equal Whois::Answer::Contact::TYPE_ADMIN, result.type
     assert_equal '2000466366',                    result.id
@@ -190,19 +219,19 @@ EOS
   end
 
   def test_admin_contact_with_unregistered
-    parser      = @klass.new(load_part('/available.txt'))
+    parser      = @klass.new(load_part('/v1.99/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'))
+    parser      = @klass.new(load_part('/v1.99/in_progress.txt'))
     expected    = nil
     assert_equal  expected, parser.admin_contact
     assert_equal  expected, parser.instance_eval { @admin_contact }
   end
 
   def test_technical_contact_with_registered
-    result = @klass.new(load_part('/registered.txt')).technical_contact
+    result = @klass.new(load_part('/v1.99/registered.txt')).technical_contact
     assert_instance_of Whois::Answer::Contact,    result
     assert_equal Whois::Answer::Contact::TYPE_TECHNICAL, result.type
     assert_equal '2000578125',                    result.id
@@ -217,12 +246,12 @@ EOS
   end
 
   def test_technical_contact_with_unregistered
-    parser      = @klass.new(load_part('/available.txt'))
+    parser      = @klass.new(load_part('/v1.99/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'))
+    parser      = @klass.new(load_part('/v1.99/in_progress.txt'))
     expected    = nil
     assert_equal  expected, parser.technical_contact
     assert_equal  expected, parser.instance_eval { @technical_contact }
@@ -230,17 +259,17 @@ EOS
 
 
   def test_nameserver
-    parser    = @klass.new(load_part('/registered.txt'))
+    parser    = @klass.new(load_part('/v1.99/registered.txt'))
     expected  = %w( ns1.google.com ns4.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'))
+    parser    = @klass.new(load_part('/v1.99/available.txt'))
     expected  = %w()
     assert_equal  expected, parser.nameservers
     assert_equal  expected, parser.instance_eval { @nameservers }
 
-    parser    = @klass.new(load_part('/in_progress.txt'))
+    parser    = @klass.new(load_part('/v1.99/in_progress.txt'))
     expected  = %w()
     assert_equal  expected, parser.nameservers
     assert_equal  expected, parser.instance_eval { @nameservers }
@@ -248,7 +277,7 @@ EOS
 
 
   def test_zone_contact_with_registered
-    zone_contact = @klass.new(load_part('/registered.txt')).zone_contact
+    zone_contact = @klass.new(load_part('/v1.99/registered.txt')).zone_contact
     assert_instance_of Whois::Answer::Contact, zone_contact
     assert_equal '2000578125', zone_contact.id
     assert_equal 'Markmonitor', zone_contact.name
@@ -263,13 +292,13 @@ EOS
 
   def test_zone_contact_with_unregistered
     assert_equal  nil,
-                  @klass.new(load_part('/available.txt')).zone_contact
+                  @klass.new(load_part('/v1.99/available.txt')).zone_contact
     assert_equal  nil,
-                  @klass.new(load_part('/in_progress.txt')).zone_contact
+                  @klass.new(load_part('/v1.99/in_progress.txt')).zone_contact
   end
 
   def test_registrar_contact_with_registered
-    registrar_contact = @klass.new(load_part('/registered.txt')).registrar_contact
+    registrar_contact = @klass.new(load_part('/v1.99/registered.txt')).registrar_contact
     assert_instance_of Whois::Answer::Contact, registrar_contact
     assert_equal '1960108002', registrar_contact.id
     assert_equal '3C Kft. (Registrar)', registrar_contact.name
@@ -284,9 +313,9 @@ EOS
 
   def test_registrar_contact_with_unregistered
     assert_equal  nil,
-                  @klass.new(load_part('/available.txt')).registrar_contact
+                  @klass.new(load_part('/v1.99/available.txt')).registrar_contact
     assert_equal  nil,
-                  @klass.new(load_part('/in_progress.txt')).registrar_contact
+                  @klass.new(load_part('/v1.99/in_progress.txt')).registrar_contact
   end
 
 end