whois 0.9.0 → 1.0.0

data/README.rdoc

@@ -2,9 +2,9 @@
 
 Whois is an intelligent pure Ruby WHOIS client and parser.
 
-It is a os-independent library and doesn't require external C libraries or GEMS: it is a 100% Ruby software with all the advantages and disadvantages that it involves.
+It is a OS-independent library and doesn't require external C libraries or Gems: it is a 100% Ruby software with all the advantages and disadvantages that it involves.
 
-This software was developed to power RoboDomain[http://www.robodomain.com] and, since July 2009, it run more than thousands requests.
+This software was developed to power {RoboDomain}[http://www.robodomain.com] and, since July 2009, it ran more than thousands requests.
 
 An extensive test suite is available to verify the library correctness but you must be aware that registrant might change Whois interfaces without notice and at any time causing queries to specific hosts to stop working.
 
@@ -15,16 +15,16 @@ An extensive test suite is available to verify the library correctness but you m
 * Intelligent Ruby client
 * Flexible and extensible configuration with support for user-defined servers
 * Powerful whois response parser
-* Support for ipv6, ipv4 and top level domain whois queries
+* Support for IPv6, IPv4 and top level domain whois queries
 * Object oriented design
-* Compatible with Ruby 1.8.6 and greater, including Ruby 1.9
+* Compatible with Ruby 1.8.6 and newer, including Ruby 1.9
 
 
 == Requirements
 
 * Ruby >= 1.8.6 (not tested with previous versions)
 
-Whois has been {successfully tested}[http://code.simonecarletti.com/wiki/whois/Platforms] against the following Ruby platforms:
+Whois has been {successfully tested}[http://www.ruby-whois.org/documentation/installation.html] against the following Ruby platforms:
 
 * Ruby 1.8.6 / 1.8.7 / 1.9.1
 * MacRuby 0.4
@@ -44,13 +44,13 @@ You might need administrator privileges on your system to install it.
 
 == Getting Started
 
-Note. This section covers only the essentials for getting started with the Whois library. The {documentation}[http://code.simonecarletti.com/wiki/whois] provides a more accurate explanation including tutorials, more examples and technical details about the client/server/answer/parser architecture.
+Note. This section covers only the essentials for getting started with the Whois library. The {documentation}[http://www.ruby-whois.org/documentation.html] provides a more accurate explanation including tutorials, more examples and technical details about the client/server/answer/parser architecture.
 
 === Querying the Server
 
-Whois provides the ability to get WHOIS information for hostnames, ipv4 and ipv6 ip addresses. The client is smart enough to guess the best WHOIS server according to given query, send the request and return the response.
+Whois provides the ability to get WHOIS information for hostnames, IPv4 and IPv6 addresses. The client is smart enough to guess the best WHOIS server according to given query, send the request and return the response.
 
-Checkout the following examples:
+Check out the following examples:
 
   # Domain Whois
   w = Whois::Client.new
@@ -97,7 +97,7 @@ As of release 0.8, a WHOIS query no longer returns a simple string. Instead, you
   a.created_on
   # => Fri Dec 10 00:00:00 +0100 1999
   
-  t = a.techinical
+  t = a.technical
   # => #<Whois::Answer::Contact>
   t.id
   # => "TS7016-ITNIC"
@@ -128,30 +128,23 @@ Off course, you can customize the timeout value setting a different value. If ti
 
 == Acknowledgments
 
-First of all, I would like to express my most sincere thanks to Cyril Mougel, the author of the first Ruby Whois GEM that has been available since 2007. Cyril has been kind enough to yield me the privilege of using the RubyForge Whois project and the Whois package name to publish this library.
-To express all my gratitude, the Release 0.5.0 of the new Ruby Whois is 100% compatible with Cyril's Whois (as of release 0.4.2).
+First of all, I would like to express my most sincere thanks to Cyril Mougel, the author of the first Ruby Whois GEM that has been available since 2007. Cyril has been kind enough to yield me the privilege of using the RubyForge Whois project and the Whois package name to publish this library. To express all my gratitude, the release 0.5.0 and all sub sequential versions of the new Whois up to 0.9.x are 100% compatible with Cyril's Whois.
 
-Whois is largely inspired by other notable Whois projects, most of all the Debian Whois library written and mainained by Marco D'Itri. Other good ideas and design decisions come from the PERL Net::DRI package.
+Whois is largely inspired by other notable Whois projects, most of all the Debian Whois library written and maintained by Marco D'Itri. Other good ideas and design decisions come from the PERL Net::DRI package.
 
 I would lie if I say I'm completely unaware of the other Ruby Whois projects. Before starting this Ruby Whois library I deeply investigated the available resources and, despite none of them was a good candidate for a refactoring, some of them expose a really cool API.
 They didn't directly influence this library or any design decision, but they have been a really interesting code-reading.
 
-The parser architecture (yet to come) has been inspired by the PHPWhois[http://phpwhois.sourceforge.net/] project. The authors puts lot of effort to create whois-specific parsers normalizing the different responses in a single tree-based structure. So far, this is the only one opensource project that offers such this feature in all the programming language ecosystem.
+The parser architecture has been inspired by the PHPWhois[http://phpwhois.sourceforge.net/] project. The authors puts lot of effort to create whois-specific parsers normalizing the different responses in a single tree-based structure. So far, this is the only one opensource project that offers such this feature in all the programming language ecosystem.
 
 Despite I spent weeks reading source code from the available whois libraries, Ruby Whois has been built from scratch trying to focus on long-term maintainability and flexibility and cannot be considered a Ruby port of any of other existing Whois libraries.
 
 
-== Notice for users of Whois 0.4 (or previous version)
+== Note for Whois 0.4 users
 
 As of release 0.5.0, the Whois GEM has been completely rewritten. As I explained in the Acknowledgment section, Cyril Mougel (the author of the original Whois package) yield me the privilege to use the Whois RubyForge project for my new Whois client.
 
-My Whois client provides all the features offered by Cyril's library, with some nice additions like the ability to get top level domain query information. All existing users won't be affected by this change since the new Whois library comes with a compatibility adapter that translates all the requests from the deprecated interface to the new one.
-
-The adapter will be removed in a future version so make sure to check your application for deprecation warnings and fix them before upgrading to a newest release that doesn't belong to the 0.5.x series.
-
-Ruby Whois 0.4.2 is released under the MIT license.
-
-Copyright (c) 2007 by Cyril Mougel (cyril.mougel@gmail.com)
+All versions between Whois 0.5.0 and 0.9.x include a compatibility adapter and the corresponding deprecation warnings to help you migrate to the new API. Starting from Whois 1.0.0, the library is no longer backward compatible with Cyril's Whois.
 
 
 == Author
@@ -161,24 +154,24 @@ Author:: {Simone Carletti}[http://www.simonecarletti.com/] <weppos@weppos.net>
 
 == Thanks to
 
-* {Cyril Mougel}[http://blog.shingara.fr/] <cyril.mougel@gmail.com> Author of the initial Whois GEM
-* {Gábor Vészi}[http://well.done.hu/] .hu whois parser
-* {Aaron Mueller}[http://aaron-mueller.de/] .de whois parser
+* {Cyril Mougel}[http://blog.shingara.fr/] - Author of the initial Whois GEM
+* {Gábor Vészi}[http://well.done.hu/] - .hu whois parser
+* {Aaron Mueller}[http://aaron-mueller.de/] - .de whois parser
+* Mikkel Mondrup Kristensen - Improvements and updates to many WHOIS parsers
 
 
 == FeedBack and Bug reports
 
 If you use this library and find yourself missing any functionality I have missed, please {let me know}[mailto:weppos@weppos.net].
 
-Bug reports and Feature suggestions {are welcomed}[http://code.simonecarletti.com/projects/whois/issues].
+Bug reports and Feature suggestions {are welcomed}[http://github.com/weppos/whois/issues].
 
 
-== Resources
+== More
 
-* {Homepage}[http://code.simonecarletti.com/whois]
-* {GitHub}[http://github.com/weppos/whois]
-* {RubyForge}[http://rubyforge.org/projects/whois/]
-* {API}[http://whois.rubyforge.org/]
+* {Homepage}[http://ruby-whois.org]
+* {GitHub Repository}[http://github.com/weppos/whois]
+* {API Documentation}[http://whois.rubyforge.org]
 * {Discussion Group}[http://groups.google.com/group/ruby-whois]
 
 
@@ -189,5 +182,5 @@ See the CHANGELOG.rdoc file for details.
 
 == License
 
-Copyright (c) 2009 Simone Carletti, Whois is released under the MIT license.
+Copyright (c) 2009-2010 Simone Carletti, Whois is released under the MIT license.
 

data/Rakefile

@@ -1,9 +1,9 @@
 $:.unshift(File.dirname(__FILE__) + "/lib")
 
+require 'whois'
 require 'rubygems'
 require 'rake'
 require 'echoe'
-require 'whois'
 require 'rake/rdoctask'
 require 'hanna/rdoctask'
 
@@ -21,20 +21,20 @@ Echoe.new(PKG_NAME, PKG_VERSION) do |p|
   p.author        = "Simone Carletti"
   p.email         = "weppos@weppos.net"
   p.summary       = "An intelligent pure Ruby WHOIS client and parser."
-  p.url           = "http://code.simonecarletti.com/whois"
+  p.url           = "http://www.ruby-whois.org"
   p.project       = RUBYFORGE_PROJECT
   p.description   = <<-EOD
     Whois is an intelligent WHOIS client and parser written in pure Ruby. \
-    It can query registry data for ipv4, ipv6 and top level domains, \
+    It can query registry data for IPv4, IPv6 and top level domains, \
     parse and convert responses into easy-to-use Ruby objects.
   EOD
 
   p.need_zip      = true
 
-  p.development_dependencies += ["rake  ~>0.8",
-                                 "hanna ~>0.1.12",
-                                 "echoe ~>3.1",
-                                 "mocha ~>0.9"]
+  p.development_dependencies += ["rake  0.8.7",
+                                 "hanna 0.1.12",
+                                 "echoe 4.1",
+                                 "mocha 0.9.8"]
 
   p.rdoc_options  = ["--inline-source", "-T", "hanna"]
   p.rcov_options  = ["-Itest -x mocha,rcov,Rakefile"]

data/bin/ruby-whois

@@ -46,6 +46,12 @@ OptionParser.new do |opts|
 end
 
 qstring = ARGV.shift
- 
-@client = Whois::Client.new(:timeout => options.timeout)
-puts @client.query(qstring)
+
+begin
+  @client = Whois::Client.new(:timeout => options.timeout)
+  puts @client.query(qstring)
+rescue Whois::Error => e
+  abort(e.message)
+rescue Timeout::Error => e
+  abort("Request Timeout")
+end

data/data/ip_del_list

@@ -6,9 +6,11 @@
 #
 # http://www.iana.org/assignments/ipv4-address-space
 #
+2.0.0.0/8	ripe
 24.132.0.0/14	ripe
 41.0.0.0/8	afrinic
 43.0.0.0/8	v6nic
+46.0.0.0/8	ripe
 51.0.0.0/8	ripe
 # whois -r -K -h whois.apnic.net -i admin-c IM76-AP
 59.0.0.0/11	whois.nic.or.kr

data/data/make_servers_charset.pl

@@ -0,0 +1,21 @@
+#!/usr/bin/perl
+
+use warnings;
+use strict;
+
+while (<>) {
+	chomp;
+	s/#.*$//;
+	s/^\s+//; s/\s+$//;
+	next if /^$/;
+
+	die "format error: $_" unless
+		(my ($a, $b, $c) = /^([a-z0-9.-]+)\s+([a-z0-9-]+)(?:\s+(.+))?$/);
+
+	if ($c) {
+		print qq(    { "$a",\t"$b",\t"$c" },\n);
+	} else {
+		print qq(    { "$a",\t"$b",\tNULL },\n);
+	}
+}
+

data/data/make_tld_serv.pl

@@ -1,22 +1,23 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
+use warnings;
 use strict;
 
 while (<>) {
 	chomp;
-	s/^\s*(.*)\s*$/$1/;
-	s/\s*#.*$//;
+	s/#.*$//;
+	s/^\s+//; s/\s+$//;
 	next if /^$/;
+
 	die "format error: $_" unless
 		(my ($a, $b) = /^([\w\d\.-]+)\s+([\w\d\.:-]+|[A-Z]+\s+.*)$/);
+
 	$b =~ s/^W(?:EB)?\s+/\\x01/;
-	$b =~ s/^M(?:SG)?\s+/\\x02/;
+	$b =~ s/^VERISIGN\s+/\\x04/;
 	$b = "\\x03" if $b eq 'NONE';
-	$b = "\\x04" if $b eq 'CRSNIC';
 	$b = "\\x07" if $b eq 'PIR';
 	$b = "\\x08" if $b eq 'AFILIAS';
-	$b = "\\x09" if $b eq 'NICCC';
 	$b = "\\x0C" if $b eq 'ARPA';
-	print "    \"$a\",\t\"$b\",\n";
+	print qq(    "$a",\t"$b",\n);
 }
 

data/data/servers_charset_list

@@ -0,0 +1,37 @@
+# server name		charset		optional parameters
+whois.corenic.net	utf-8		-C UTF-8
+whois.cat		utf-8		-C UTF-8
+whois.museum		utf-8		-C UTF-8
+
+whois.nic.br		iso-8859-1
+whois.cira.ca		iso-8859-1
+whois.nic.ch		utf-8
+whois.nic.cl		iso-8859-1
+whois.cnnic.net.cn	utf-8
+whois.nic.cz		utf-8
+whois.denic.de		utf-8
+whois.enum.denic.de	utf-8
+whois.dk-hostmaster.dk	utf-8		--charset=utf-8
+whois.eenet.ee		iso-8859-1
+whois.eu		utf-8
+whois.ficora.fi		iso-8859-1
+whois.nic.fr		iso-8859-1
+whois.hkdnr.net.hk	utf-8
+whois.nic.hu		iso-8859-1
+whois.isnic.is		iso-8859-1
+whois.jprs.jp		iso-2022-jp
+whois.nic.ad.jp		iso-2022-jp
+whois.nic.or.kr		euc-kr
+whois.nic.li		utf-8
+whois.domreg.lt		utf-8
+whois.dns.lu		iso-8859-1
+whois.nic.mu		utf-8
+whois.norid.no		iso-8859-1
+whois.nic.nu		utf-8
+whois.dns.pt		iso-8859-1
+whois.nic-se.se		utf-8
+whois.nic.tr		utf-8
+whois.twnic.net		utf-8
+whois.net.ua		koi8-u
+whois.nic.org.uy	utf-8
+

data/data/tld_serv_list

@@ -73,13 +73,14 @@
 .az	WEB http://www.nic.az/AzCheck.htm
 .ba	WEB http://www.nic.ba/stream/whois/
 .bb	WEB http://www.barbadosdomains.net/search_domain.php
-.bd	www.whois.com.bd # http://www.btcl.net.bd/faq_dotbd.php
+.bd	WEB http://www.whois.com.bd/ # http://www.btcl.net.bd/faq_dotbd.php www.register.com.bd FIXME APPARENTLY NOT OFFICIAL!
 .be	whois.dns.be
-.bf	NONE		# NIC? http://www.onatel.bf/
+.bf	NONE		# http://www.artel.bf/ http://www.onatel.bf/internet/domaine.htm
 .bg	whois.register.bg
 .bh	NONE		# www.inet.com.bh
-.bi	WEB http://www.nic.bi/Nic_search.asp
+.bi	WEB http://whois.nic.bi/register/whois.hei	# whois.nic.bi wrong referral?
 .bj	whois.nic.bj
+#.bl
 .bm	WEB http://207.228.133.14/cgi-bin/lansaweb?procfun+BMWHO+BMWHO2+WHO
 .bn	NONE		# www.brunet.bn
 .bo	WEB http://www.nic.bo/
@@ -100,7 +101,7 @@
 .ci	www.nic.ci
 .ck	whois.nic.ck
 .cl	whois.nic.cl
-.cm	NONE		# NIC? http://info.intelcam.cm http://www.camnet.cm/
+.cm	WEB http://netcom.cm/whois.php
 .edu.cn	whois.edu.cn
 .cn	whois.cnnic.net.cn
 .uk.co	whois.uk.co
@@ -117,9 +118,9 @@
 .dm	whois.nic.dm
 .do	WEB http://www.nic.do/whois-h.php3
 .dz	WEB https://www.nic.dz/
-.ec	WEB http://www.nic.ec/whois/eng/whois.asp
+.ec	WEB http://www.nic.ec/whois/eng/whois.asp # whois.nic.ec is restricted
 .ee	whois.eenet.ee
-.eg	NONE		# http://lookup.egregistry.eg/
+.eg	NONE		# http://lookup.egregistry.eg/english.aspx
 #.eh
 .er	NONE		# http://www.afridns.org/er/tld_er.txt
 .es	WEB https://www.nic.es/
@@ -134,8 +135,8 @@
 .ga	NONE		# www.nic.ga
 .gb	NONE
 .gd	whois.adamsnames.tc
-.ge	WEB http://whois.sanet.ge/
-.gf	whois.nplus.gf
+.ge	WEB http://www.registration.ge/
+.gf	WEB http://www.nic.gf/?id=whois
 .gg	whois.gg
 .gh	WEB http://www.nic.gh/customer/search_c.htm
 .gi	AFILIAS
@@ -148,7 +149,7 @@
 .gs	whois.nic.gs
 .gt	WEB http://www.gt/whois.htm
 .gu	WEB http://gadao.gov.gu/domainsearch.htm
-.gw	NONE		# www.nic.gw
+.gw	NONE		# www.gwregister.com
 .gy	whois.registry.gy
 .hk	whois.hkdnr.net.hk
 .hm	whois.registry.hm
@@ -156,7 +157,7 @@
 .hr	WEB http://www.dns.hr/pretrazivanje.html
 .ht	whois.nic.ht
 .hu	whois.nic.hu
-.id	whois.idnic.net.id
+.id	whois.pandi.or.id
 .ie	whois.domainregistry.ie
 .il	whois.isoc.org.il
 .im	whois.nic.im
@@ -164,7 +165,7 @@
 .io	whois.nic.io
 .iq	NONE		# http://www.cmc.iq/english/iq/iqregister1.htm
 .ir	whois.nic.ir
-.is	whois.isnet.is
+.is	whois.isnic.is
 .it	whois.nic.it
 .je	whois.je
 .jm	NONE		# NIC? uwimona.edu.jm http://nic.jm
@@ -172,10 +173,10 @@
 .jp	whois.jprs.jp
 .ke	whois.kenic.or.ke
 .kg	whois.domain.kg
-.kh	NONE		# http://www.mptc.gov.kh/ http://www.nic.net.kh/
-.ki	WEB http://www.ki/dns/
+.kh	NONE		# http://www.mptc.gov.kh/DomainNameRegistrationForm.aspx http://www.nic.net.kh/
+.ki	whois.nic.mu
 .km	NONE		# www.domaine.km
-.kn	NONE		# www.dot.kn
+.kn	WEB http://www.nic.kn/
 .kp	whois.kcce.kp
 .kr	whois.nic.or.kr
 .kw	WEB http://www.kw/
@@ -187,7 +188,7 @@
 .li	whois.nic.li
 .lk	whois.nic.lk
 .lr	NONE		# http://www.psg.com/dns/lr/
-.ls	WEB http://www.co.ls/data/leo2.asp
+.ls	WEB http://www.co.ls/data/co.asp
 .lt	whois.domreg.lt
 .lu	whois.dns.lu
 .lv	whois.nic.lv
@@ -196,15 +197,16 @@
 .mc	whois.ripe.net
 .md	WEB http://www.dns.md/wh1.php # whois.nic.md is restricted
 .me	whois.meregistry.net	# afilias
+#.mf
 .mg	whois.nic.mg
 .mh	NONE		# www.nic.net.mh
 .mk	WEB http://dns.marnet.net.mk/registar.php
 .ml	NONE		# NIC? www.sotelma.ml
-.mm	whois.nic.mm
+.mm	NONE		# NO NIC
 .mn	AFILIAS
 .mo	WEB http://www.monic.net.mo/
 .mp	NONE		# get.mp
-.mq	whois.nic.mq
+.mq	NONE		# whois.nic.mq
 .mr	NONE		# www.nic.mr
 .ms	whois.nic.ms
 .mt	WEB https://www.nic.org.mt/dotmt/ # whois.nic.org.mt is restricted
@@ -212,7 +214,7 @@
 .mv	NONE		# NIC? www.dhiraagu.com.mv
 .mw	WEB http://www.registrar.mw/
 .mx	whois.nic.mx
-.my	whois.mynic.net.my
+.my	whois.domainregistry.my
 .mz	NONE		# NIC? www.uem.mz
 .na	whois.na-nic.com.na
 .nc	whois.cctld.nc
@@ -222,7 +224,7 @@
 .ni	WEB http://www.nic.ni/consulta.htm
 .nl	whois.domain-registry.nl
 .no	whois.norid.no
-.np	WEB http://www.mos.com.np/domsearch.html
+.np	WEB http://register.mos.com.np/userSearchInc.asp
 .nr	WEB http://www.cenpac.net.nr/dns/whois.html
 .nu	whois.nic.nu
 .nz	whois.srs.net.nz
@@ -240,7 +242,7 @@
 .pr	whois.nic.pr
 .ps	WEB http://www.nic.ps/whois/whois.html
 .pt	whois.dns.pt
-.pw	whois.nic.pw
+.pw	NONE		# NO NIC
 .py	WEB http://www.nic.py/consultas.html
 .qa	NONE		# http://www.qtel.com.qa/InternetFeatures.do
 .re	whois.nic.fr
@@ -250,7 +252,7 @@
 .ru	whois.ripn.net
 .rw	WEB http://www.nic.rw/cgi-bin/whoisrw.pl
 .sa	saudinic.net.sa
-.sb	whois.nic.net.sb
+.sb	whois.coccaregistry.net
 .sc	AFILIAS		# www.nic.sc
 .sd	NONE		# http://isoc.sd/ (CHECK LATER)
 .se	whois.nic-se.se
@@ -263,7 +265,7 @@
 .sm	whois.ripe.net
 .sn	whois.nic.sn
 .so	NONE		# www.nic.so (CHECK LATER, recently delegated)
-.sr	whois.register.sr
+.sr	NONE		# www.register.sr
 .st	whois.nic.st
 .su	whois.ripn.net
 .sv	WEB http://www.uca.edu.sv/dns/	# http://www.svnet.org.sv/
@@ -274,16 +276,15 @@
 .tf	whois.nic.tf
 .tg	WEB http://www.nic.tg/
 .th	whois.thnic.net
-.tj	whois.nic.tj
+.tj	WEB http://www.nic.tj/whois.html
 .tk	whois.dot.tk
 .tl	whois.nic.tl
 .tm	whois.nic.tm
 .tn	WEB http://whois.ati.tn/
 .to	whois.tonic.to
-.tp	whois.nic.tp
-.tr	whois.metu.edu.tr
+.tp	NONE			# phase out in progress
+.tr	whois.nic.tr
 .tt	WEB http://www.nic.tt/cgi-bin/search.pl
-#.tv	whois.nic.tv
 .tv	VERISIGN whois.nic.tv
 .tw	whois.twnic.net
 .tz	WEB http://whois.tznic.or.tz/
@@ -301,6 +302,7 @@
 .parliament.uk NONE
 .police.uk NONE
 .uk	whois.nic.uk
+#.um
 .fed.us	whois.nic.gov
 .us	whois.nic.us
 .com.uy	WEB https://nic.anteldata.com.uy/dns/
@@ -313,11 +315,11 @@
 .vi	WEB http://www.nic.vi/whoisform.htm
 .vn	WEB http://www.vnnic.vn/english/
 .vu	WEB http://www.vunic.vu/whois.html
-.wf	whois.nic.wf
+.wf	whois.nic.fr
 .ws	whois.samoanic.ws
 .ye	NONE		# NIC? www.nominet.org.ye http://www.y.net.ye/services/domain_name.htm
-.yt	whois.nic.yt
-.yu	NONE		# www.nic.yu - phase out date: 30 September 2009
+.yt	whois.nic.fr
+.yu	NONE		# www.nic.yu - phase out date: 30 March 2009
 .ac.za	whois.ac.za
 .co.za	whois.coza.net.za
 .gov.za	whois.gov.za
@@ -341,7 +343,7 @@
 -cz	whois.nic.cz
 -dk	whois.dk-hostmaster.dk
 -il	whois.isoc.org.il
--is	whois.isnet.is
+-is	whois.isnic.is
 -kg	whois.domain.kg
 -ti	whois.telstra.net
 -tw	whois.twnic.net