whois 0.8.1 → 0.9.0

data/lib/whois/version.rb

@@ -18,14 +18,13 @@ module Whois
 
   module Version
     MAJOR = 0
-    MINOR = 8
-    TINY  = 1
+    MINOR = 9
+    PATCH = 0
+    ALPHA = nil
 
-    STRING = [MAJOR, MINOR, TINY].join('.')
+    STRING = [MAJOR, MINOR, PATCH, ALPHA].compact.join('.')
   end
 
-  VERSION         = Version::STRING
-  STATUS          = 'beta'
-  BUILD           = nil
+  VERSION = Version::STRING
 
 end

data/lib/whois/whois.rb

@@ -19,12 +19,6 @@ require 'resolv'
 
 module Whois
 
-  def self.deprecate(message = nil)
-    message ||= "You are using deprecated behavior which will be removed from the next major or minor release."
-    $stderr.puts("DEPRECATION WARNING: #{message}")
-  end
-
-
   class WhoisException < Exception # :nodoc
     def initialize(message)
       ::Whois.deprecate "WhoisException is deprecated as of 0.5.0 and will be removed in a future release along with Whois::Whois class."

data/test/answer/parser/base_test.rb

@@ -19,6 +19,7 @@ class AnswerParserBaseTest < Test::Unit::TestCase
   end
 
 
+  # DEPRECATED
   def test_supported?
     klass = Class.new(@klass) do
       register_method(:disclaimer) {}
@@ -32,12 +33,32 @@ class AnswerParserBaseTest < Test::Unit::TestCase
     assert  klass.new(@part).respond_to?(:disclaimer)
   end
 
+  # DEPRECATED
   def test_supported_should_return_false_unless_registrable_method
     parser = @klass.new(@part)
     assert !parser.supported?(:content)
     assert  parser.respond_to?(:content)
   end
 
+  def test_property_supported?
+    klass = Class.new(@klass) do
+      register_method(:disclaimer) {}
+    end
+    assert  klass.new(@part).property_supported?(:disclaimer)
+    assert  klass.new(@part).respond_to?(:disclaimer)
+
+    klass = Class.new(@klass) do
+    end
+    assert !klass.new(@part).property_supported?(:disclaimer)
+    assert  klass.new(@part).respond_to?(:disclaimer)
+  end
+
+  def test_property_supported_should_return_false_unless_registrable_method
+    parser = @klass.new(@part)
+    assert !parser.property_supported?(:content)
+    assert  parser.respond_to?(:content)
+  end
+
 
   def test_content
     parser = @klass.new(@part)

data/test/answer/parser/blank_test.rb

@@ -8,7 +8,7 @@ class AnswerParserBlankTest < Test::Unit::TestCase
     @part   = Whois::Answer::Part.new("This is the response.", "whois.foo.com")
   end
 
-  Whois::Answer::Parser.registrable_methods.each do |method|
+  Whois::Answer::Parser.properties.each do |method|
     define_method "test_#{method}_should_raise" do
       parser = @klass.new(@part)
       error  = assert_raise(Whois::ParserNotFound) { parser.send(method) }

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

@@ -0,0 +1,51 @@
+require 'test_helper'
+require 'whois/answer/parser/whois.aero.rb'
+
+class AnswerParserWhoisAeroTest < Whois::Answer::Parser::TestCase
+
+  def setup
+    @klass  = Whois::Answer::Parser::WhoisAero
+    @host   = "whois.aero"
+  end
+
+
+  def test_status
+    assert_equal  :ok,
+                  @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('/available.txt')).registered?
+    assert  @klass.new(load_part('/registered.txt')).registered?
+  end
+
+
+  def test_created_on
+    assert_equal  Time.parse("2002-03-26 06:48:27 UTC"),
+                  @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("2008-03-05 14:32:18 UTC"),
+                  @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-03-26 06:48:27 UTC"),
+                  @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.afilias-grs.info_test.rb

@@ -0,0 +1,51 @@
+require 'test_helper'
+require 'whois/answer/parser/whois.afilias-grs.info.rb'
+
+class AnswerParserWhoisAfiliasGrsInfoTest < Whois::Answer::Parser::TestCase
+
+  def setup
+    @klass  = Whois::Answer::Parser::WhoisAfiliasGrsInfo
+    @host   = "whois.afilias-grs.info"
+  end
+
+
+  def test_status
+    assert_equal  ["CLIENT DELETE PROHIBITED", "CLIENT TRANSFER PROHIBITED", "CLIENT UPDATE PROHIBITED"],
+                  @klass.new(load_part('/registered.txt')).status
+    assert_equal  [],
+                  @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("2006-02-12 18:08:52 UTC"),
+                  @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-01-21 13:29:10 UTC"),
+                  @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("2011-02-12 18:08:52 UTC"),
+                  @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.afilias.info_test.rb

@@ -0,0 +1,51 @@
+require 'test_helper'
+require 'whois/answer/parser/whois.afilias.info.rb'
+
+class AnswerParserWhoisAfiliasInfoTest < Whois::Answer::Parser::TestCase
+
+  def setup
+    @klass  = Whois::Answer::Parser::WhoisAfiliasInfo
+    @host   = "whois.afilias.info"
+  end
+
+
+  def test_status
+    assert_equal  ["CLIENT DELETE PROHIBITED", "CLIENT TRANSFER PROHIBITED", "CLIENT UPDATE PROHIBITED"],
+                  @klass.new(load_part('/registered.txt')).status
+    assert_equal  [],
+                  @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("2001-07-31 23:57:50 UTC"),
+                  @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-03-05 22:39:19 UTC"),
+                  @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-07-31 23:57:50 UTC"),
+                  @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_crsnic_net_test.rb → whois.crsnic.net_test.rb}

@@ -1,9 +1,7 @@
 require 'test_helper'
 require 'whois/answer/parser/whois.crsnic.net'
 
-class AnswerParserWhoisCrsnicNetTest < Test::Unit::TestCase
-
-  TESTCASE_PATH = File.expand_path(File.dirname(__FILE__) + '/../../testcases/responses/whois.crsnic.net')
+class AnswerParserWhoisCrsnicNetTest < Whois::Answer::Parser::TestCase
 
   def setup
     @klass  = Whois::Answer::Parser::WhoisCrsnicNet
@@ -39,74 +37,46 @@ reserves the right to modify these terms at any time.
 EOS
     assert_equal  expected,
                   @klass.new(load_part('/registered.txt')).disclaimer
-  end
-
-  def test_disclaimer_with_available
-    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 Global Registry \
-Services' ("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('/available.txt')).disclaimer
   end
 
 
   def test_domain
-    assert_equal  "googlelkjhgfdfghjklkjhgf.net",
-                  @klass.new(load_part('/available.txt')).domain
     assert_equal  "google.net",
                   @klass.new(load_part('/registered.txt')).domain
+    assert_equal  "googlelkjhgfdfghjklkjhgf.net",
+                  @klass.new(load_part('/available.txt')).domain
   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_equal  nil,
+                  @klass.new(load_part('/available.txt')).domain_id
   end
 
 
   def test_referral_whois
-    assert_equal  nil,
-                  @klass.new(load_part('/available.txt')).referral_whois
     assert_equal  "whois.markmonitor.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  nil,
-                  @klass.new(load_part('/available.txt')).referral_url
     assert_equal  "http://www.markmonitor.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  nil,
-                  @klass.new(load_part('/available.txt')).status
     assert_equal  ["clientDeleteProhibited", "clientTransferProhibited", "clientUpdateProhibited"],
                   @klass.new(load_part('/registered.txt')).status
+    assert_equal  nil,
+                  @klass.new(load_part('/available.txt')).status
   end
 
   def test_available?
@@ -115,37 +85,28 @@ EOS
   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_created_on
-    assert_equal  Time.parse("1999-03-15 00:00:00"),
+    assert_equal  Time.parse("1999-03-15 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("2009-02-10 00:00:00"),
+    assert_equal  Time.parse("2009-02-10 00:00:00 +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
 
   def test_expires_on
-    assert_equal  Time.parse("2010-03-15 00:00:00"),
+    assert_equal  Time.parse("2010-03-15 00:00:00 +0100"),
                   @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
@@ -154,22 +115,8 @@ EOS
   def test_registrar
     assert_equal  nil,
                   @klass.new(load_part('/registered.txt')).registrar
-  end
-
-  def test_registrar_with_available
     assert_equal  nil,
                   @klass.new(load_part('/available.txt')).registrar
   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_denic_de_test.rb → whois.denic.de_test.rb}

@@ -1,9 +1,7 @@
 require 'test_helper'
 require 'whois/answer/parser/whois.denic.de'
 
-class AnswerParserWhoisDenicDeTest < Test::Unit::TestCase
-
-  TESTCASE_PATH = File.expand_path(File.dirname(__FILE__) + '/../../testcases/responses/whois.denic.de')
+class AnswerParserWhoisDenicDeTest < Whois::Answer::Parser::TestCase
 
   def setup
     @klass  = Whois::Answer::Parser::WhoisDenicDe
@@ -107,22 +105,23 @@ http://www.denic.de/en/background/whois-service/webwhois.html
   end
 
 
-  def test_created_on_with_available
+  def test_created
+    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  Time.parse('2009-02-28 12:03:09'),
+    assert_equal  Time.parse('2009-02-28 12:03:09 +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
 
-  def test_expires_on_with_available
+  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
@@ -195,23 +194,10 @@ http://www.denic.de/en/background/whois-service/webwhois.html
                   @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
 
 
-class AnswerParserWhoisDenicDe1100Test < Test::Unit::TestCase
-
-  TESTCASE_PATH = File.expand_path(File.dirname(__FILE__) + '/../../testcases/responses/whois.denic.de')
+class AnswerParserWhoisDenicDe1100Test < Whois::Answer::Parser::TestCase
 
   def setup
     @klass  = Whois::Answer::Parser::WhoisDenicDe
@@ -403,15 +389,4 @@ assurance and to bar you from using its whois query.
                   @klass.new(load_part('/1-10-0_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