whois 0.8.1 → 0.9.0

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

@@ -1,9 +1,7 @@
 require 'test_helper'
 require 'whois/answer/parser/whois.nic.it.rb'
 
-class AnswerParserWhoisNicItTest < Test::Unit::TestCase
-
-  TESTCASE_PATH = File.expand_path(File.dirname(__FILE__) + '/../../testcases/responses/whois.nic.it')
+class AnswerParserWhoisNicItTest < Whois::Answer::Parser::TestCase
 
   def setup
     @klass  = Whois::Answer::Parser::WhoisNicIt
@@ -56,21 +54,15 @@ class AnswerParserWhoisNicItTest < Test::Unit::TestCase
 
 
   def test_created_on
-    assert_equal  Time.parse("1999-12-10 00:00:00"),
+    assert_equal  Time.parse("1999-12-10 00:00:00 +0100"),
                   @klass.new(load_part('/registered.txt')).created_on
-  end
-
-  def test_created_on_with_available
     assert_equal  nil,
                   @klass.new(load_part('/available.txt')).created_on
   end
 
   def test_updated_on
-    assert_equal  Time.parse("2008-11-27 16:47:22"),
+    assert_equal  Time.parse("2008-11-27 16:47:22 +0100"),
                   @klass.new(load_part('/registered.txt')).updated_on
-  end
-
-  def test_updated_on_with_available
     assert_equal  nil,
                   @klass.new(load_part('/available.txt')).updated_on
   end
@@ -78,9 +70,6 @@ class AnswerParserWhoisNicItTest < Test::Unit::TestCase
   def test_expires_on
     assert_equal  Time.parse("2009-11-27"),
                   @klass.new(load_part('/registered.txt')).expires_on
-  end
-
-  def test_expires_on_with_available
     assert_equal  nil,
                   @klass.new(load_part('/available.txt')).expires_on
   end
@@ -241,15 +230,4 @@ Status:             AVAILABLE
     RESPONSE
   end
 
-
-  protected
-
-    def load_part(path)
-      part(File.read(TESTCASE_PATH + path), @host)
-    end
-
-    def part(*args)
-      Whois::Answer::Part.new(*args)
-    end
-
 end

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

@@ -0,0 +1,51 @@
+require 'test_helper'
+require 'whois/answer/parser/whois.nic.name.rb'
+
+class AnswerParserWhoisNicNameTest < Whois::Answer::Parser::TestCase
+
+  def setup
+    @klass  = Whois::Answer::Parser::WhoisNicName
+    @host   = "whois.nic.name"
+  end
+
+
+  def test_status
+    assert_equal  :available,
+                  @klass.new(load_part('/available.txt')).status
+    assert_equal  :registered,
+                  @klass.new(load_part('/registered.txt')).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('/available.txt')).registered?
+    assert  @klass.new(load_part('/registered.txt')).registered?
+  end
+
+
+  def test_created_on
+    assert_equal  nil,
+                  @klass.new(load_part('/registered.txt')).created_on
+    assert_equal  nil,
+                  @klass.new(load_part('/available.txt')).created_on
+  end
+
+  def test_updated_on
+    assert_equal  nil,
+                  @klass.new(load_part('/registered.txt')).updated_on
+    assert_equal  nil,
+                  @klass.new(load_part('/available.txt')).updated_on
+  end
+
+  def test_expires_on
+    assert_equal  nil,
+                  @klass.new(load_part('/registered.txt')).expires_on
+    assert_equal  nil,
+                  @klass.new(load_part('/available.txt')).expires_on
+  end
+
+end

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

@@ -0,0 +1,122 @@
+require 'test_helper'
+require 'whois/answer/parser/whois.nic.tv'
+
+class AnswerParserWhoisNicTvTest < Whois::Answer::Parser::TestCase
+
+  def setup
+    @klass  = Whois::Answer::Parser::WhoisNicTv
+    @host   = "whois.nic.tv"
+  end
+
+
+  def test_disclaimer
+    expected = <<-EOS.strip
+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 except as reasonably necessary to register domain names or \
+modify existing registrations; the Data in VeriSign's ("VeriSign") Whois \
+database is provided by VeriSign for information purposes only, and to \
+assist persons in obtaining information about or related to a domain name \
+registration record. VeriSign 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 \
+VeriSign (or its computer systems). The compilation, repackaging, \
+dissemination or other use of this Data is expressly prohibited without \
+the prior written consent of VeriSign. You agree not to use electronic \
+processes that are automated and high-volume to access or query the \
+Whois database except as reasonably necessary to register domain names \
+or modify existing registrations. VeriSign reserves the right to restrict \
+your access to the Whois database in its sole discretion to ensure \
+operational stability.  VeriSign may restrict or terminate your access to the \
+Whois database for failure to abide by these terms of use. VeriSign \
+reserves the right to modify these terms at any time. 
+EOS
+    assert_equal  expected,
+                  @klass.new(load_part('/registered.txt')).disclaimer
+    assert_equal  expected,
+                  @klass.new(load_part('/available.txt')).disclaimer
+  end
+
+
+  def test_domain
+    assert_equal  "thinkcode.tv",
+                  @klass.new(load_part('/registered.txt')).domain
+    assert_equal  "u34jedzcq.tv",
+                  @klass.new(load_part('/available.txt')).domain
+  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
+  end
+
+
+  def test_referral_whois
+    assert_equal  "whois.dynadot.com",
+                  @klass.new(load_part('/registered.txt')).referral_whois
+    assert_equal  nil,
+                  @klass.new(load_part('/available.txt')).referral_whois
+  end
+
+  def test_referral_url
+    assert_equal  "http://www.dynadot.com",
+                  @klass.new(load_part('/registered.txt')).referral_url
+    assert_equal  nil,
+                  @klass.new(load_part('/available.txt')).referral_url
+  end
+
+
+  def test_status
+    assert_equal  "CLIENT-XFER-PROHIBITED",
+                  @klass.new(load_part('/registered.txt')).status
+    assert_equal  nil,
+                  @klass.new(load_part('/available.txt')).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_equal  Time.parse("2009-04-21 00:00:00 +0200"),
+                  @klass.new(load_part('/registered.txt')).created_on
+    assert_equal  nil,
+                  @klass.new(load_part('/available.txt')).created_on
+  end
+
+  def test_updated_on
+    assert_equal  Time.parse("2009-11-19 00:00:00 +0100"),
+                  @klass.new(load_part('/registered.txt')).updated_on
+    assert_equal  nil,
+                  @klass.new(load_part('/available.txt')).updated_on
+  end
+
+  def test_expires_on
+    assert_equal  Time.parse("2010-04-21 00:00:00 +0200"),
+                  @klass.new(load_part('/registered.txt')).expires_on
+    assert_equal  nil,
+                  @klass.new(load_part('/available.txt')).expires_on
+  end
+
+
+  def test_registrar
+    assert_equal  nil,
+                  @klass.new(load_part('/registered.txt')).registrar
+    assert_equal  nil,
+                  @klass.new(load_part('/available.txt')).registrar
+  end
+
+end

data/test/answer/parser/{whois_publicinterestregistry_net_test.rb → whois.publicinterestregistry.net_test.rb}

@@ -1,9 +1,7 @@
 require 'test_helper'
 require 'whois/answer/parser/whois.publicinterestregistry.net'
 
-class AnswerParserWhoisPublicinterestregistryNetTest < Test::Unit::TestCase
-
-  TESTCASE_PATH = File.expand_path(File.dirname(__FILE__) + '/../../testcases/responses/whois.publicinterestregistry.net')
+class AnswerParserWhoisPublicinterestregistryNetTest < Whois::Answer::Parser::TestCase
 
   def setup
     @klass  = Whois::Answer::Parser::WhoisPublicinterestregistryNet
@@ -73,31 +71,22 @@ time. By submitting this query, you agree to abide by this policy.
 
 
   def test_created_on
-    assert_equal  Time.parse("21-Oct-1998 04:00:00 UTC"),
+    assert_equal  Time.parse("1998-10-21 04:00:00 UTC"),
                   @klass.new(load_part('/registered.txt')).created_on
-  end
-
-  def test_created_on_with_available
     assert_equal  nil,
                   @klass.new(load_part('/available.txt')).created_on
   end
 
   def test_updated_on
-    assert_equal  Time.parse("04-Mar-2009 12:07:19 UTC"),
+    assert_equal  Time.parse("2009-03-04 12:07:19 UTC"),
                   @klass.new(load_part('/registered.txt')).updated_on
-  end
-
-  def test_updated_on_with_available
     assert_equal  nil,
                   @klass.new(load_part('/available.txt')).updated_on
   end
 
   def test_expires_on
-    assert_equal  Time.parse("20-Oct-2012 04:00:00 UTC"),
+    assert_equal  Time.parse("2012-10-20 04:00:00 UTC"),
                   @klass.new(load_part('/registered.txt')).expires_on
-  end
-
-  def test_expires_on_with_available
     assert_equal  nil,
                   @klass.new(load_part('/available.txt')).expires_on
   end
@@ -196,15 +185,4 @@ time. By submitting this query, you agree to abide by this policy.
                   @klass.new(load_part('/available.txt')).nameservers
   end
 
-
-  protected
-
-    def load_part(path)
-      part(File.read(TESTCASE_PATH + path), @host)
-    end
-
-    def part(*args)
-      Whois::Answer::Part.new(*args)
-    end
-
 end

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

@@ -0,0 +1,51 @@
+require 'test_helper'
+require 'whois/answer/parser/whois.za.net.rb'
+
+class AnswerParserWhoisZaNetTest < Whois::Answer::Parser::TestCase
+
+  def setup
+    @klass  = Whois::Answer::Parser::WhoisZaNet
+    @host   = "whois.za.net"
+  end
+
+
+  def test_status
+    assert_equal  :registered,
+                  @klass.new(load_part('/registered.txt')).status
+    assert_equal  :available,
+                  @klass.new(load_part('/available.txt')).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('/available.txt')).registered?
+    assert  @klass.new(load_part('/registered.txt')).registered?
+  end
+
+
+  def test_created_on
+    assert_equal  Time.parse("2002-03-29 22:03:53 GMT"),
+                  @klass.new(load_part('/registered.txt')).created_on
+    assert_equal  nil,
+                  @klass.new(load_part('/available.txt')).created_on
+  end
+
+  def test_updated_on
+    assert_equal  Time.parse("2002-03-29 22:03:53 GMT"),
+                  @klass.new(load_part('/registered.txt')).updated_on
+    assert_equal  nil,
+                  @klass.new(load_part('/available.txt')).updated_on
+  end
+
+  def test_expires_on
+    assert_equal  nil,
+                  @klass.new(load_part('/registered.txt')).expires_on
+    assert_equal  nil,
+                  @klass.new(load_part('/available.txt')).expires_on
+  end
+
+end

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

@@ -0,0 +1,51 @@
+require 'test_helper'
+require 'whois/answer/parser/whois.za.org.rb'
+
+class AnswerParserWhoisZaOrgTest < Whois::Answer::Parser::TestCase
+
+  def setup
+    @klass  = Whois::Answer::Parser::WhoisZaOrg
+    @host   = "whois.za.org"
+  end
+
+
+  def test_status
+    assert_equal  :registered,
+                  @klass.new(load_part('/registered.txt')).status
+    assert_equal  :available,
+                  @klass.new(load_part('/available.txt')).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('/available.txt')).registered?
+    assert  @klass.new(load_part('/registered.txt')).registered?
+  end
+
+
+  def test_created_on
+    assert_equal  Time.parse("2000-11-05 14:03:48 GMT"),
+                  @klass.new(load_part('/registered.txt')).created_on
+    assert_equal  nil,
+                  @klass.new(load_part('/available.txt')).created_on
+  end
+
+  def test_updated_on
+    assert_equal  Time.parse("2005-08-15 12:15:10 BST"),
+                  @klass.new(load_part('/registered.txt')).updated_on
+    assert_equal  nil,
+                  @klass.new(load_part('/available.txt')).updated_on
+  end
+
+  def test_expires_on
+    assert_equal  nil,
+                  @klass.new(load_part('/registered.txt')).expires_on
+    assert_equal  nil,
+                  @klass.new(load_part('/available.txt')).expires_on
+  end
+
+end

data/test/answer/parser_test.rb

@@ -50,32 +50,60 @@ class AnswerParserTest < Test::Unit::TestCase
   end
 
 
+  # DEPRECATED
   def test_supported_with_zero_parts
     answer = Whois::Answer.new(nil, [])
     parser = @klass.new(answer)
     assert !parser.supported?(:disclaimer)
   end
 
+  # DEPRECATED
   def test_supported_with_one_part_supported
     answer = Whois::Answer.new(nil, [Whois::Answer::Part.new(nil, "whois.nic.it")])
     parser = @klass.new(answer)
     assert  parser.supported?(:disclaimer)
   end
 
+  # DEPRECATED
   def test_supported_with_one_part_unsupported
     answer = Whois::Answer.new(nil, [Whois::Answer::Part.new(nil, "invalid.nic.it")])
     parser = @klass.new(answer)
     assert !parser.supported?(:disclaimer)
   end
 
+  # DEPRECATED
   def test_supported_with_two_parts
     answer = Whois::Answer.new(nil, [Whois::Answer::Part.new(nil, "whois.crsnic.net"), Whois::Answer::Part.new(nil, "whois.nic.it")])
     parser = @klass.new(answer)
-    assert  parser.supported?(:disclaimer)
+    assert  parser.property_supported?(:disclaimer)
+  end
+
+  def test_property_supported_with_zero_parts
+    answer = Whois::Answer.new(nil, [])
+    parser = @klass.new(answer)
+    assert !parser.property_supported?(:disclaimer)
+  end
+
+  def test_property_supported_with_one_part_supported
+    answer = Whois::Answer.new(nil, [Whois::Answer::Part.new(nil, "whois.nic.it")])
+    parser = @klass.new(answer)
+    assert  parser.property_supported?(:disclaimer)
+  end
+
+  def test_property_supported_with_one_part_unsupported
+    answer = Whois::Answer.new(nil, [Whois::Answer::Part.new(nil, "invalid.nic.it")])
+    parser = @klass.new(answer)
+    assert !parser.property_supported?(:disclaimer)
+  end
+
+  def test_property_supported_with_two_parts
+    answer = Whois::Answer.new(nil, [Whois::Answer::Part.new(nil, "whois.crsnic.net"), Whois::Answer::Part.new(nil, "whois.nic.it")])
+    parser = @klass.new(answer)
+    assert  parser.property_supported?(:disclaimer)
   end
 
 
-  (Whois::Answer::Parser.registrable_methods - [:referral_url, :referral_whois]).each do |method|
+  (Whois::Answer::Parser.properties - [:referral_url, :referral_whois]).each do |method|
     define_method "test_should_delegate_#{method}_to_parsers_first_parser_if_supported" do
       answer = Whois::Answer.new(nil, [Whois::Answer::Part.new("", "whois.nic.it")])
       parser = @klass.new(answer)
@@ -92,7 +120,7 @@ class AnswerParserTest < Test::Unit::TestCase
     end
   end
 
-  Whois::Answer::Parser.registrable_methods.each do |method|
+  Whois::Answer::Parser.properties.each do |method|
     define_method "test_should_delegate_#{method}_to_parser_raise_with_no_zero_parts" do
       answer = Whois::Answer.new(nil, [])
       parser = @klass.new(answer)
@@ -107,4 +135,17 @@ class AnswerParserTest < Test::Unit::TestCase
     assert_raise(NoMethodError) { parser.send("unallowed_method") }
   end
 
+
+  def test_parser_klass
+    assert_equal "Whois::Answer::Parser::WhoisNicIt", @klass.parser_klass("whois.nic.it").name
+  end
+
+  def test_parser_klass_with_preloaded_class
+    @klass.class_eval <<-RUBY
+      class WhoisFooBar
+      end
+    RUBY
+    assert_equal "Whois::Answer::Parser::WhoisFooBar", @klass.parser_klass("whois.foo.bar").name
+  end
+
 end