whois 0.9.0 → 1.0.0

data/lib/whois/answer/parser/whois.za.org.rb

@@ -34,7 +34,7 @@ module Whois
       #
       class WhoisZaOrg < Base
 
-        register_method :status do
+        property_supported :status do
           if available?
             :available
           else
@@ -42,31 +42,28 @@ module Whois
           end
         end
 
-        register_method :available? do
+        property_supported :available? do
           @available ||= !!(content.to_s =~ /No such domain:/)
         end
 
-        register_method :registered? do
+        property_supported :registered? do
           !available?
         end
 
 
-        register_method :created_on do
+        property_supported :created_on do
           @created_on ||= if content.to_s =~ /Record Created\s+:\s+(.*)\n/
             Time.parse($1)
           end
         end
         
-        register_method :updated_on do
+        property_supported :updated_on do
           @updated_on ||= if content.to_s =~ /Record Last Updated\s+:\s+(.*)\n/
             Time.parse($1)
           end
         end
-        
-        # TODO: NotAvailable
-        register_method :expires_on do
-          nil
-        end
+
+        property_not_supported :expires_on
 
       end
       

data/lib/whois/answer/super_struct.rb

@@ -24,7 +24,7 @@ require 'ostruct'
 #
 # Compared with the original version, it provides the following additional features:
 # * ability to initialize an instance from Hash
-# * ability to pass a block on creation  
+# * ability to pass a block on creation
 #
 class SuperStruct < Struct
 

data/lib/whois/client.rb

@@ -23,7 +23,7 @@ module Whois
   class Client
 
     # The maximum time to run a whois query expressed in seconds
-    DEFAULT_TIMEOUT = 5
+    DEFAULT_TIMEOUT = 10
 
     attr_accessor :timeout
 
@@ -67,10 +67,10 @@ module Whois
     #   # => #<Whois::Answer>
     #
     def query(qstring)
-      qstring = qstring.to_s
+      string = qstring.to_s
       Timeout::timeout(timeout) do
-        @server = Server.guess(qstring)
-        @server.query(qstring)
+        @server = Server.guess(string)
+        @server.query(string)
       end
     end
 

data/lib/whois/definitions/NOTES.txt

@@ -0,0 +1,12 @@
+ec    # debian: "whois.nic.ec is restricted", however it provides enough details - including creation, expiration - to use it
+ki    # http://www.iana.org/domains/root/db/ki.html whois.nic.ki timeouts
+md    # debian: "whois.nic.md is restricted", however it provides enough details - including creation, expiration - to use it
+mn    # http://www.iana.org/domains/root/db/mn.html whois.nic.mn tested and not working. maintenance page
+mp    # http://www.iana.org/domains/root/db/mp.html whois.nic.mp doesn't work
+so    # http://www.iana.org/domains/root/db/so.html whois.nic.so doesn't work
+fo    # http://www.iana.org/domains/root/db/fo.html empty, but whois.ripe.net works
+gm    # http://www.iana.org/domains/root/db/gm.html empty, but whois.ripe.net works
+mc    # http://www.iana.org/domains/root/db/mc.html empty, but whois.ripe.net works
+va    # http://www.iana.org/domains/root/db/va.html empty, but whois.ripe.net works
+wf    # http://www.iana.org/domains/root/db/wf.html provides whois.nic.wf, but using whois.nic.fr for compatibility with debian whois and to reuse parser
+yt    # http://www.iana.org/domains/root/db/wf.html provides whois.nic.yt, but using whois.nic.fr for compatibility with debian whois and to reuse parser

data/lib/whois/definitions/ipv4.rb

@@ -1,6 +1,8 @@
+Whois::Server.define :ipv4, "2.0.0.0/8", "whois.ripe.net"
 Whois::Server.define :ipv4, "24.132.0.0/14", "whois.ripe.net"
 Whois::Server.define :ipv4, "41.0.0.0/8", "whois.afrinic.net"
 Whois::Server.define :ipv4, "43.0.0.0/8", "whois.v6nic.net"
+Whois::Server.define :ipv4, "46.0.0.0/8", "whois.v6nic.net"
 Whois::Server.define :ipv4, "51.0.0.0/8", "whois.ripe.net"
 Whois::Server.define :ipv4, "59.0.0.0/11", "whois.nic.or.kr"
 Whois::Server.define :ipv4, "58.0.0.0/7", "whois.apnic.net"

data/lib/whois/definitions/tlds.rb

@@ -23,17 +23,17 @@ Whois::Server.define :tld, ".za.net", "whois.za.net"
 Whois::Server.define :tld, ".net", "whois.crsnic.net", {:adapter=>Whois::Server::Adapters::Verisign}
 Whois::Server.define :tld, ".eu.org", "whois.eu.org"
 Whois::Server.define :tld, ".za.org", "whois.za.org"
-Whois::Server.define :tld, ".org", "whois.publicinterestregistry.net"
+Whois::Server.define :tld, ".org", "whois.publicinterestregistry.net", {:adapter=>Whois::Server::Adapters::Pir}
 Whois::Server.define :tld, ".edu", "whois.educause.edu"
 Whois::Server.define :tld, ".gov", "whois.nic.gov"
 Whois::Server.define :tld, ".int", "whois.iana.org"
 Whois::Server.define :tld, ".mil", nil, {:adapter=>Whois::Server::Adapters::None}
 Whois::Server.define :tld, ".e164.arpa", "whois.ripe.net"
-Whois::Server.define :tld, ".in-addr.arpa", nil
+Whois::Server.define :tld, ".in-addr.arpa", nil, {:adapter=>Whois::Server::Adapters::Arpa}
 Whois::Server.define :tld, ".arpa", "whois.iana.org"
 Whois::Server.define :tld, ".aero", "whois.aero"
 Whois::Server.define :tld, ".asia", "whois.nic.asia"
-Whois::Server.define :tld, ".biz", "whois.nic.biz"
+Whois::Server.define :tld, ".biz", "whois.biz"
 Whois::Server.define :tld, ".cat", "whois.cat", {:adapter=>Whois::Server::Adapters::Formatted, :format => "-C US-ASCII ace %s"}
 Whois::Server.define :tld, ".coop", "whois.nic.coop"
 Whois::Server.define :tld, ".info", "whois.afilias.info"
@@ -64,17 +64,17 @@ Whois::Server.define :tld, ".ax", nil, {:adapter=>Whois::Server::Adapters::None}
 Whois::Server.define :tld, ".az", nil, {:web=>"http://www.nic.az/AzCheck.htm", :adapter=>Whois::Server::Adapters::Web}
 Whois::Server.define :tld, ".ba", nil, {:web=>"http://www.nic.ba/stream/whois/", :adapter=>Whois::Server::Adapters::Web}
 Whois::Server.define :tld, ".bb", nil, {:web=>"http://www.barbadosdomains.net/search_domain.php", :adapter=>Whois::Server::Adapters::Web}
-Whois::Server.define :tld, ".bd", "www.whois.com.bd"
+Whois::Server.define :tld, ".bd", nil, {:web=>"http://www.whois.com.bd/", :adapter=>Whois::Server::Adapters::Web}
 Whois::Server.define :tld, ".be", "whois.dns.be"
 Whois::Server.define :tld, ".bf", nil, {:adapter=>Whois::Server::Adapters::None}
 Whois::Server.define :tld, ".bg", "whois.register.bg"
 Whois::Server.define :tld, ".bh", nil, {:adapter=>Whois::Server::Adapters::None}
-Whois::Server.define :tld, ".bi", nil, {:web=>"http://www.nic.bi/Nic_search.asp", :adapter=>Whois::Server::Adapters::Web}
+Whois::Server.define :tld, ".bi", nil, {:web=>"http://whois.nic.bi/register/whois.hei", :adapter=>Whois::Server::Adapters::Web}
 Whois::Server.define :tld, ".bj", "whois.nic.bj"
 Whois::Server.define :tld, ".bm", nil, {:web=>"http://207.228.133.14/cgi-bin/lansaweb?procfun+BMWHO+BMWHO2+WHO", :adapter=>Whois::Server::Adapters::Web}
 Whois::Server.define :tld, ".bn", nil, {:adapter=>Whois::Server::Adapters::None}
 Whois::Server.define :tld, ".bo", nil, {:web=>"http://www.nic.bo/", :adapter=>Whois::Server::Adapters::Web}
-Whois::Server.define :tld, ".br", "whois.nic.br"
+Whois::Server.define :tld, ".br", "whois.registro.br"
 Whois::Server.define :tld, ".bs", nil, {:web=>"http://www.nic.bs/cgi-bin/search.pl", :adapter=>Whois::Server::Adapters::Web}
 Whois::Server.define :tld, ".bt", nil, {:web=>"http://www.nic.bt/", :adapter=>Whois::Server::Adapters::Web}
 Whois::Server.define :tld, ".bv", nil, {:adapter=>Whois::Server::Adapters::None}
@@ -91,7 +91,7 @@ Whois::Server.define :tld, ".ch", "whois.nic.ch"
 Whois::Server.define :tld, ".ci", "www.nic.ci"
 Whois::Server.define :tld, ".ck", "whois.nic.ck"
 Whois::Server.define :tld, ".cl", "whois.nic.cl"
-Whois::Server.define :tld, ".cm", nil, {:adapter=>Whois::Server::Adapters::None}
+Whois::Server.define :tld, ".cm", nil, {:web=>"http://netcom.cm/whois.php", :adapter=>Whois::Server::Adapters::Web}
 Whois::Server.define :tld, ".edu.cn", "whois.edu.cn"
 Whois::Server.define :tld, ".cn", "whois.cnnic.net.cn"
 Whois::Server.define :tld, ".uk.co", "whois.uk.co"
@@ -104,7 +104,7 @@ Whois::Server.define :tld, ".cy", nil, {:web=>"http://www.nic.cy/nslookup/online
 Whois::Server.define :tld, ".cz", "whois.nic.cz"
 Whois::Server.define :tld, ".de", "whois.denic.de", {:adapter=>Whois::Server::Adapters::Formatted, :format => "-T dn,ace -C US-ASCII %s"}
 Whois::Server.define :tld, ".dj", "whois.domain.dj"
-Whois::Server.define :tld, ".dk", "whois.dk-hostmaster.dk"
+Whois::Server.define :tld, ".dk", "whois.dk-hostmaster.dk", {:adapter=>Whois::Server::Adapters::Formatted, :format => "--show-handles %s"}
 Whois::Server.define :tld, ".dm", "whois.nic.dm"
 Whois::Server.define :tld, ".do", nil, {:web=>"http://www.nic.do/whois-h.php3", :adapter=>Whois::Server::Adapters::Web}
 Whois::Server.define :tld, ".dz", nil, {:web=>"https://www.nic.dz/", :adapter=>Whois::Server::Adapters::Web}
@@ -124,8 +124,8 @@ Whois::Server.define :tld, ".fr", "whois.nic.fr"
 Whois::Server.define :tld, ".ga", nil, {:adapter=>Whois::Server::Adapters::None}
 Whois::Server.define :tld, ".gb", nil, {:adapter=>Whois::Server::Adapters::None}
 Whois::Server.define :tld, ".gd", "whois.adamsnames.tc"
-Whois::Server.define :tld, ".ge", nil, {:web=>"http://whois.sanet.ge/", :adapter=>Whois::Server::Adapters::Web}
-Whois::Server.define :tld, ".gf", "whois.nplus.gf"
+Whois::Server.define :tld, ".ge", nil, {:web=>"http://www.registration.ge/", :adapter=>Whois::Server::Adapters::Web}
+Whois::Server.define :tld, ".gf", nil, {:web=>"http://www.nic.gf/?id=whois", :adapter=>Whois::Server::Adapters::Web}
 Whois::Server.define :tld, ".gg", "whois.gg"
 Whois::Server.define :tld, ".gh", nil, {:web=>"http://www.nic.gh/customer/search_c.htm", :adapter=>Whois::Server::Adapters::Web}
 Whois::Server.define :tld, ".gi", "whois.afilias-grs.info", {:adapter=>Whois::Server::Adapters::Afilias}
@@ -146,7 +146,7 @@ Whois::Server.define :tld, ".hn", "whois.afilias-grs.info", {:adapter=>Whois::Se
 Whois::Server.define :tld, ".hr", nil, {:web=>"http://www.dns.hr/pretrazivanje.html", :adapter=>Whois::Server::Adapters::Web}
 Whois::Server.define :tld, ".ht", "whois.nic.ht"
 Whois::Server.define :tld, ".hu", "whois.nic.hu"
-Whois::Server.define :tld, ".id", "whois.idnic.net.id"
+Whois::Server.define :tld, ".id", "whois.pandi.or.id"
 Whois::Server.define :tld, ".ie", "whois.domainregistry.ie"
 Whois::Server.define :tld, ".il", "whois.isoc.org.il"
 Whois::Server.define :tld, ".im", "whois.nic.im"
@@ -154,7 +154,7 @@ Whois::Server.define :tld, ".in", "whois.registry.in"
 Whois::Server.define :tld, ".io", "whois.nic.io"
 Whois::Server.define :tld, ".iq", nil, {:adapter=>Whois::Server::Adapters::None}
 Whois::Server.define :tld, ".ir", "whois.nic.ir"
-Whois::Server.define :tld, ".is", "whois.isnet.is"
+Whois::Server.define :tld, ".is", "whois.isnic.is"
 Whois::Server.define :tld, ".it", "whois.nic.it"
 Whois::Server.define :tld, ".je", "whois.je"
 Whois::Server.define :tld, ".jm", nil, {:adapter=>Whois::Server::Adapters::None}
@@ -163,9 +163,9 @@ Whois::Server.define :tld, ".jp", "whois.jprs.jp"
 Whois::Server.define :tld, ".ke", "whois.kenic.or.ke"
 Whois::Server.define :tld, ".kg", "whois.domain.kg"
 Whois::Server.define :tld, ".kh", nil, {:adapter=>Whois::Server::Adapters::None}
-Whois::Server.define :tld, ".ki", nil, {:web=>"http://www.ki/dns/", :adapter=>Whois::Server::Adapters::Web}
+Whois::Server.define :tld, ".ki", "whois.nic.mu"
 Whois::Server.define :tld, ".km", nil, {:adapter=>Whois::Server::Adapters::None}
-Whois::Server.define :tld, ".kn", nil, {:adapter=>Whois::Server::Adapters::None}
+Whois::Server.define :tld, ".kn", nil, {:web=>"http://www.nic.kn/", :adapter=>Whois::Server::Adapters::Web}
 Whois::Server.define :tld, ".kp", "whois.kcce.kp"
 Whois::Server.define :tld, ".kr", "whois.nic.or.kr"
 Whois::Server.define :tld, ".kw", nil, {:web=>"http://www.kw/", :adapter=>Whois::Server::Adapters::Web}
@@ -177,7 +177,7 @@ Whois::Server.define :tld, ".lc", "whois.afilias-grs.info", {:adapter=>Whois::Se
 Whois::Server.define :tld, ".li", "whois.nic.li"
 Whois::Server.define :tld, ".lk", "whois.nic.lk"
 Whois::Server.define :tld, ".lr", nil, {:adapter=>Whois::Server::Adapters::None}
-Whois::Server.define :tld, ".ls", nil, {:web=>"http://www.co.ls/data/leo2.asp", :adapter=>Whois::Server::Adapters::Web}
+Whois::Server.define :tld, ".ls", nil, {:web=>"http://www.co.ls/data/co.asp", :adapter=>Whois::Server::Adapters::Web}
 Whois::Server.define :tld, ".lt", "whois.domreg.lt"
 Whois::Server.define :tld, ".lu", "whois.dns.lu"
 Whois::Server.define :tld, ".lv", "whois.nic.lv"
@@ -190,11 +190,11 @@ Whois::Server.define :tld, ".mg", "whois.nic.mg"
 Whois::Server.define :tld, ".mh", nil, {:adapter=>Whois::Server::Adapters::None}
 Whois::Server.define :tld, ".mk", nil, {:web=>"http://dns.marnet.net.mk/registar.php", :adapter=>Whois::Server::Adapters::Web}
 Whois::Server.define :tld, ".ml", nil, {:adapter=>Whois::Server::Adapters::None}
-Whois::Server.define :tld, ".mm", "whois.nic.mm"
+Whois::Server.define :tld, ".mm", nil, {:adapter=>Whois::Server::Adapters::None}
 Whois::Server.define :tld, ".mn", "whois.afilias-grs.info", {:adapter=>Whois::Server::Adapters::Afilias}
 Whois::Server.define :tld, ".mo", nil, {:web=>"http://www.monic.net.mo/", :adapter=>Whois::Server::Adapters::Web}
 Whois::Server.define :tld, ".mp", nil, {:adapter=>Whois::Server::Adapters::None}
-Whois::Server.define :tld, ".mq", "whois.nic.mq"
+Whois::Server.define :tld, ".mq", nil, {:adapter=>Whois::Server::Adapters::None}
 Whois::Server.define :tld, ".mr", nil, {:adapter=>Whois::Server::Adapters::None}
 Whois::Server.define :tld, ".ms", "whois.nic.ms"
 Whois::Server.define :tld, ".mt", nil, {:web=>"https://www.nic.org.mt/dotmt/", :adapter=>Whois::Server::Adapters::Web}
@@ -202,7 +202,7 @@ Whois::Server.define :tld, ".mu", "whois.nic.mu"
 Whois::Server.define :tld, ".mv", nil, {:adapter=>Whois::Server::Adapters::None}
 Whois::Server.define :tld, ".mw", nil, {:web=>"http://www.registrar.mw/", :adapter=>Whois::Server::Adapters::Web}
 Whois::Server.define :tld, ".mx", "whois.nic.mx"
-Whois::Server.define :tld, ".my", "whois.mynic.net.my"
+Whois::Server.define :tld, ".my", "whois.domainregistry.my"
 Whois::Server.define :tld, ".mz", nil, {:adapter=>Whois::Server::Adapters::None}
 Whois::Server.define :tld, ".na", "whois.na-nic.com.na"
 Whois::Server.define :tld, ".nc", "whois.cctld.nc"
@@ -212,7 +212,7 @@ Whois::Server.define :tld, ".ng", "whois.register.net.ng"
 Whois::Server.define :tld, ".ni", nil, {:web=>"http://www.nic.ni/consulta.htm", :adapter=>Whois::Server::Adapters::Web}
 Whois::Server.define :tld, ".nl", "whois.domain-registry.nl"
 Whois::Server.define :tld, ".no", "whois.norid.no"
-Whois::Server.define :tld, ".np", nil, {:web=>"http://www.mos.com.np/domsearch.html", :adapter=>Whois::Server::Adapters::Web}
+Whois::Server.define :tld, ".np", nil, {:web=>"http://register.mos.com.np/userSearchInc.asp", :adapter=>Whois::Server::Adapters::Web}
 Whois::Server.define :tld, ".nr", nil, {:web=>"http://www.cenpac.net.nr/dns/whois.html", :adapter=>Whois::Server::Adapters::Web}
 Whois::Server.define :tld, ".nu", "whois.nic.nu"
 Whois::Server.define :tld, ".nz", "whois.srs.net.nz"
@@ -230,7 +230,7 @@ Whois::Server.define :tld, ".pn", nil, {:web=>"http://www.pitcairn.pn/PnRegistry
 Whois::Server.define :tld, ".pr", "whois.nic.pr"
 Whois::Server.define :tld, ".ps", nil, {:web=>"http://www.nic.ps/whois/whois.html", :adapter=>Whois::Server::Adapters::Web}
 Whois::Server.define :tld, ".pt", "whois.dns.pt"
-Whois::Server.define :tld, ".pw", "whois.nic.pw"
+Whois::Server.define :tld, ".pw", nil, {:adapter=>Whois::Server::Adapters::None}
 Whois::Server.define :tld, ".py", nil, {:web=>"http://www.nic.py/consultas.html", :adapter=>Whois::Server::Adapters::Web}
 Whois::Server.define :tld, ".qa", nil, {:adapter=>Whois::Server::Adapters::None}
 Whois::Server.define :tld, ".re", "whois.nic.fr"
@@ -240,7 +240,7 @@ Whois::Server.define :tld, ".edu.ru", "whois.informika.ru"
 Whois::Server.define :tld, ".ru", "whois.ripn.net"
 Whois::Server.define :tld, ".rw", nil, {:web=>"http://www.nic.rw/cgi-bin/whoisrw.pl", :adapter=>Whois::Server::Adapters::Web}
 Whois::Server.define :tld, ".sa", "saudinic.net.sa"
-Whois::Server.define :tld, ".sb", "whois.nic.net.sb"
+Whois::Server.define :tld, ".sb", "whois.coccaregistry.net"
 Whois::Server.define :tld, ".sc", "whois.afilias-grs.info", {:adapter=>Whois::Server::Adapters::Afilias}
 Whois::Server.define :tld, ".sd", nil, {:adapter=>Whois::Server::Adapters::None}
 Whois::Server.define :tld, ".se", "whois.nic-se.se"
@@ -253,7 +253,7 @@ Whois::Server.define :tld, ".sl", "whois.nic.sl"
 Whois::Server.define :tld, ".sm", "whois.ripe.net"
 Whois::Server.define :tld, ".sn", "whois.nic.sn"
 Whois::Server.define :tld, ".so", nil, {:adapter=>Whois::Server::Adapters::None}
-Whois::Server.define :tld, ".sr", "whois.register.sr"
+Whois::Server.define :tld, ".sr", nil, {:adapter=>Whois::Server::Adapters::None}
 Whois::Server.define :tld, ".st", "whois.nic.st"
 Whois::Server.define :tld, ".su", "whois.ripn.net"
 Whois::Server.define :tld, ".sv", nil, {:web=>"http://www.uca.edu.sv/dns/", :adapter=>Whois::Server::Adapters::Web}
@@ -264,14 +264,14 @@ Whois::Server.define :tld, ".td", nil, {:adapter=>Whois::Server::Adapters::None}
 Whois::Server.define :tld, ".tf", "whois.nic.tf"
 Whois::Server.define :tld, ".tg", nil, {:web=>"http://www.nic.tg/", :adapter=>Whois::Server::Adapters::Web}
 Whois::Server.define :tld, ".th", "whois.thnic.net"
-Whois::Server.define :tld, ".tj", "whois.nic.tj"
+Whois::Server.define :tld, ".tj", nil, {:web=>"http://www.nic.tj/whois.html", :adapter=>Whois::Server::Adapters::Web}
 Whois::Server.define :tld, ".tk", "whois.dot.tk"
 Whois::Server.define :tld, ".tl", "whois.nic.tl"
 Whois::Server.define :tld, ".tm", "whois.nic.tm"
 Whois::Server.define :tld, ".tn", nil, {:web=>"http://whois.ati.tn/", :adapter=>Whois::Server::Adapters::Web}
 Whois::Server.define :tld, ".to", "whois.tonic.to"
-Whois::Server.define :tld, ".tp", "whois.nic.tp"
-Whois::Server.define :tld, ".tr", "whois.metu.edu.tr"
+Whois::Server.define :tld, ".tp", nil, {:adapter=>Whois::Server::Adapters::None}
+Whois::Server.define :tld, ".tr", "whois.nic.tr"
 Whois::Server.define :tld, ".tt", nil, {:web=>"http://www.nic.tt/cgi-bin/search.pl", :adapter=>Whois::Server::Adapters::Web}
 Whois::Server.define :tld, ".tv", "whois.nic.tv", {:adapter=>Whois::Server::Adapters::Verisign}
 Whois::Server.define :tld, ".tw", "whois.twnic.net"
@@ -302,10 +302,10 @@ Whois::Server.define :tld, ".vg", "whois.adamsnames.tc"
 Whois::Server.define :tld, ".vi", nil, {:web=>"http://www.nic.vi/whoisform.htm", :adapter=>Whois::Server::Adapters::Web}
 Whois::Server.define :tld, ".vn", nil, {:web=>"http://www.vnnic.vn/english/", :adapter=>Whois::Server::Adapters::Web}
 Whois::Server.define :tld, ".vu", nil, {:web=>"http://www.vunic.vu/whois.html", :adapter=>Whois::Server::Adapters::Web}
-Whois::Server.define :tld, ".wf", "whois.nic.wf"
+Whois::Server.define :tld, ".wf", "whois.nic.fr"
 Whois::Server.define :tld, ".ws", "whois.samoanic.ws"
 Whois::Server.define :tld, ".ye", nil, {:adapter=>Whois::Server::Adapters::None}
-Whois::Server.define :tld, ".yt", "whois.nic.yt"
+Whois::Server.define :tld, ".yt", "whois.nic.fr"
 Whois::Server.define :tld, ".yu", nil, {:adapter=>Whois::Server::Adapters::None}
 Whois::Server.define :tld, ".ac.za", "whois.ac.za"
 Whois::Server.define :tld, ".co.za", "whois.coza.net.za"

data/lib/whois/errors.rb

@@ -46,6 +46,11 @@ module Whois
   # standard whois interface via port 43. This is the case of some
   # specific domains that only provide a web–based WHOIS interface. (\x01)
   class WebInterfaceError < InterfaceNotSupported
+    attr_reader :url
+    def initialize(url)
+      @url = url
+      super("This TLD has no whois server, but you can access the whois database at `#{@url}'")
+    end
   end
 
   # Server Known object, Definition unavailable
@@ -80,8 +85,13 @@ module Whois
   end
 
   # Raised when you are trying to access a property that is not supported
-  # by any of the parsers available for current WHOIS answer.
+  # for the current WHOIS answer.
   class PropertyNotSupported < ParserError
   end
 
+  # Raised when you are trying to access a property that is not supported
+  # by any of the parsers available for current WHOIS answer.
+  class PropertyNotAvailable < ParserError
+  end
+
 end

data/lib/whois/server.rb

@@ -16,6 +16,7 @@
 
 require 'ipaddr'
 require 'whois/server/adapters/base'
+require 'whois/server/adapters/arpa'
 require 'whois/server/adapters/afilias'
 require 'whois/server/adapters/formatted'
 require 'whois/server/adapters/none'

data/lib/whois/server/adapters/web.rb

@@ -36,8 +36,7 @@ module Whois
         # WebInterfaceError:: for every request
         #
         def request(qstring)
-          raise WebInterfaceError,  "This TLD has no whois server, " +
-                                    "but you can access the whois database at `#{options[:web]}'"
+          raise WebInterfaceError, options[:web]
         end
         
       end

data/lib/whois/version.rb

@@ -17,12 +17,12 @@
 module Whois
 
   module Version
-    MAJOR = 0
-    MINOR = 9
-    PATCH = 0
+    MAJOR = 1
+    MINOR = 0
+    TINY  = 0
     ALPHA = nil
 
-    STRING = [MAJOR, MINOR, PATCH, ALPHA].compact.join('.')
+    STRING = [MAJOR, MINOR, TINY, ALPHA].compact.join('.')
   end
 
   VERSION = Version::STRING

data/test/answer/parser/base_test.rb

@@ -19,50 +19,37 @@ class AnswerParserBaseTest < Test::Unit::TestCase
   end
 
 
-  # DEPRECATED
-  def test_supported?
-    klass = Class.new(@klass) do
-      register_method(:disclaimer) {}
-    end
-    assert  klass.new(@part).supported?(:disclaimer)
-    assert  klass.new(@part).respond_to?(:disclaimer)
-
-    klass = Class.new(@klass) do
-    end
-    assert !klass.new(@part).supported?(:disclaimer)
-    assert  klass.new(@part).respond_to?(:disclaimer)
-  end
-
-  # DEPRECATED
-  def test_supported_should_return_false_unless_registrable_method
+  def test_content
     parser = @klass.new(@part)
-    assert !parser.supported?(:content)
-    assert  parser.respond_to?(:content)
+    assert_equal @part.response, parser.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).property_supported?(:disclaimer)
     assert  klass.new(@part).respond_to?(:disclaimer)
 
     klass = Class.new(@klass) do
+      register_property(:disclaimer, :supported) {}
     end
-    assert !klass.new(@part).property_supported?(:disclaimer)
+    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)
+
+  def test_self_property_registry
+    assert_instance_of Hash, @klass.property_registry
   end
 
+  def test_self_property_registry_with_klass
+    assert_instance_of Hash, @klass.property_registry(Whois::Answer::Parser::WhoisNicIt)
+  end
 
-  def test_content
-    parser = @klass.new(@part)
-    assert_equal @part.response, parser.content
+  def test_self_property_registry_with_klass_should_initialize_to_empty_hash
+    parser = Class.new
+    assert_equal Hash.new, @klass.property_registry(parser)
   end
-  
+
 end

data/test/answer/parser/jobswhois.verisign-grs.com_test.rb

@@ -0,0 +1,122 @@
+require 'test_helper'
+require 'whois/answer/parser/jobswhois.verisign-grs.com.rb'
+
+class AnswerParserJobswhoisVerisignGrsComTest < Whois::Answer::Parser::TestCase
+
+  def setup
+    @klass  = Whois::Answer::Parser::JobswhoisVerisignGrsCom
+    @host   = "jobswhois.verisign-grs.com"
+  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  "goto.jobs",
+                  @klass.new(load_part('/registered.txt')).domain
+    assert_equal  "u34jedzcq.jobs",
+                  @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.encirca.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.encirca.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  "ACTIVE",
+                  @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("2006-02-21"),
+                  @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-20"),
+                  @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-02-21"),
+                  @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