whois 0.8.1 → 0.9.0

data/CHANGELOG.rdoc

@@ -1,6 +1,67 @@
 = Changelog
 
 
+== Release 0.9.0
+
+* FIXED: .ec TLD has a whois server (closes #322)
+
+* FIXED: .gl TLD has a whois server (closes #323)
+
+* FIXED: .md TLD has a whois server (closes #325)
+
+* FIXED: TLD definitions for whois.afilias-grs.info missing proper adapter (closes #342)
+
+* FIXED: ./bin/ruby-whois uses the Gem instead of current version (closes #344)
+
+* FIXED: Whois::Client doesn't cast qstring to_s (closes #339)
+
+* FIXED: Whois::Parser doesn't detect preloaded parsers. Improved performances skipping unnecessary 'require'. (closes #340)
+
+* ADDED: Simple .fr TLD parser.
+
+* ADDED: Simple .name TLD parser.
+
+* ADDED: Simple .ie TLD parser.
+
+* ADDED: Simple .edu TLD parser.
+
+* ADDED: Simple .info TLD parser.
+
+* ADDED: Simple .gov TLD parser.
+
+* ADDED: Simple .za.net TLD parser.
+
+* ADDED: Simple .eu.org TLD parser.
+
+* ADDED: Simple .za.org TLD parser.
+
+* ADDED: Simple .int/.arpa TLD parser.
+
+* ADDED: Simple .aero TLD parser.
+
+* ADDED: Simple .asia TLD parser.
+
+* ADDED: Simple .bz/.gi/.hn/.lc/.mn/.sc/.vc TLD parser.
+
+* ADDED: .tv TLD parser.
+
+* ADDED: .hu TLD parser.
+
+* ADDED: Ability to pass timeout option to 'ruby-whois' (closes #334)
+
+* ADDED: Whois::Answer#properties returns an Hash of :key => value
+
+* CHANGED: Removed Whois::BUILD and Whois::STATUS constants. Added Whois::Version::ALPHA constant to be used when I need to package prereleases (see RubyGem --prerelease flag).
+
+* CHANGED: Extracted Whois::Answer::Parser::Ast module from existing parsers.
+
+* CHANGED: Normalized WhoisDenicDe parser.
+
+* CHANGED: Changed .edu TLD server to whois.educause.edu (see http://www.iana.org/domains/root/db/edu.html)
+
+* CHANGED: Renamed #supported to #property_supported?
+
+
 == Release 0.8.1
 
 * FIXED: Updated the whois.denic.de parser to the new format. Thanks to David Krentzlin (closes #314)

data/Manifest

@@ -15,12 +15,29 @@ lib/whois/answer.rb
 lib/whois/answer/contact.rb
 lib/whois/answer/parser.rb
 lib/whois/answer/parser/README.rdoc
+lib/whois/answer/parser/ast.rb
 lib/whois/answer/parser/base.rb
 lib/whois/answer/parser/blank.rb
+lib/whois/answer/parser/scanners/verisign.rb
+lib/whois/answer/parser/whois.aero.rb
+lib/whois/answer/parser/whois.afilias-grs.info.rb
+lib/whois/answer/parser/whois.afilias.info.rb
 lib/whois/answer/parser/whois.crsnic.net.rb
 lib/whois/answer/parser/whois.denic.de.rb
+lib/whois/answer/parser/whois.domainregistry.ie.rb
+lib/whois/answer/parser/whois.educause.edu.rb
+lib/whois/answer/parser/whois.eu.org.rb
+lib/whois/answer/parser/whois.iana.org.rb
+lib/whois/answer/parser/whois.nic.asia.rb
+lib/whois/answer/parser/whois.nic.fr.rb
+lib/whois/answer/parser/whois.nic.gov.rb
+lib/whois/answer/parser/whois.nic.hu.rb
 lib/whois/answer/parser/whois.nic.it.rb
+lib/whois/answer/parser/whois.nic.name.rb
+lib/whois/answer/parser/whois.nic.tv.rb
 lib/whois/answer/parser/whois.publicinterestregistry.net.rb
+lib/whois/answer/parser/whois.za.net.rb
+lib/whois/answer/parser/whois.za.org.rb
 lib/whois/answer/part.rb
 lib/whois/answer/registrar.rb
 lib/whois/answer/super_struct.rb
@@ -29,6 +46,7 @@ lib/whois/definitions/ipv4.rb
 lib/whois/definitions/ipv4.txt
 lib/whois/definitions/ipv6.rb
 lib/whois/definitions/ipv6.txt
+lib/whois/definitions/tld.notes.txt
 lib/whois/definitions/tlds.rb
 lib/whois/definitions/tlds.txt
 lib/whois/errors.rb
@@ -48,15 +66,31 @@ lib/whois/whois.rb
 tasks/server.rake
 test/answer/parser/base_test.rb
 test/answer/parser/blank_test.rb
-test/answer/parser/whois_crsnic_net_test.rb
-test/answer/parser/whois_denic_de_test.rb
-test/answer/parser/whois_nic_it_test.rb
-test/answer/parser/whois_publicinterestregistry_net_test.rb
+test/answer/parser/whois.aero_test.rb
+test/answer/parser/whois.afilias-grs.info_test.rb
+test/answer/parser/whois.afilias.info_test.rb
+test/answer/parser/whois.crsnic.net_test.rb
+test/answer/parser/whois.denic.de_test.rb
+test/answer/parser/whois.domainregistry.ie_test.rb
+test/answer/parser/whois.educause.edu_test.rb
+test/answer/parser/whois.eu.org_test.rb
+test/answer/parser/whois.iana.org_test.rb
+test/answer/parser/whois.nic.asia_test.rb
+test/answer/parser/whois.nic.fr_test.rb
+test/answer/parser/whois.nic.gov_test.rb
+test/answer/parser/whois.nic.hu_test.rb
+test/answer/parser/whois.nic.it_test.rb
+test/answer/parser/whois.nic.name_test.rb
+test/answer/parser/whois.nic.tv_test.rb
+test/answer/parser/whois.publicinterestregistry.net_test.rb
+test/answer/parser/whois.za.net_test.rb
+test/answer/parser/whois.za.org_test.rb
 test/answer/parser_test.rb
 test/answer_test.rb
 test/client_test.rb
 test/deprecated_test.rb
 test/integration_test.rb
+test/list_tld
 test/server/adapters/afilias_test.rb
 test/server/adapters/base_test.rb
 test/server/adapters/formatted_test.rb
@@ -75,6 +109,27 @@ test/testcases/referrals/crsnic.com_one_server.txt
 test/testcases/referrals/niccc.cc.txt
 test/testcases/referrals/pir.org.txt
 test/testcases/responses/super_struct_test.rb
+test/testcases/responses/whois.aero/available.txt
+test/testcases/responses/whois.aero/registered.txt
+test/testcases/responses/whois.afilias-grs.info/available.txt
+test/testcases/responses/whois.afilias-grs.info/bz/available.txt
+test/testcases/responses/whois.afilias-grs.info/bz/registered.txt
+test/testcases/responses/whois.afilias-grs.info/gi/available.txt
+test/testcases/responses/whois.afilias-grs.info/gi/registered.txt
+test/testcases/responses/whois.afilias-grs.info/hn/available.txt
+test/testcases/responses/whois.afilias-grs.info/hn/registered.txt
+test/testcases/responses/whois.afilias-grs.info/lc/available.txt
+test/testcases/responses/whois.afilias-grs.info/lc/registered.txt
+test/testcases/responses/whois.afilias-grs.info/mn/available.txt
+test/testcases/responses/whois.afilias-grs.info/mn/registered.txt
+test/testcases/responses/whois.afilias-grs.info/registered.txt
+test/testcases/responses/whois.afilias-grs.info/sc/available.txt
+test/testcases/responses/whois.afilias-grs.info/sc/registered.txt
+test/testcases/responses/whois.afilias-grs.info/vc/available.txt
+test/testcases/responses/whois.afilias-grs.info/vc/registered.txt
+test/testcases/responses/whois.afilias.info/available.txt
+test/testcases/responses/whois.afilias.info/registered.txt
+test/testcases/responses/whois.crsnic.net/MULTIPLE.txt
 test/testcases/responses/whois.crsnic.net/available.txt
 test/testcases/responses/whois.crsnic.net/registered.txt
 test/testcases/responses/whois.denic.de/1-10-0_available.txt
@@ -82,12 +137,40 @@ test/testcases/responses/whois.denic.de/1-10-0_registered.txt
 test/testcases/responses/whois.denic.de/available.txt
 test/testcases/responses/whois.denic.de/error_invalid_domain_name.txt
 test/testcases/responses/whois.denic.de/registered.txt
+test/testcases/responses/whois.domainregistry.ie/available.txt
+test/testcases/responses/whois.domainregistry.ie/registered.txt
+test/testcases/responses/whois.educause.edu/available.txt
+test/testcases/responses/whois.educause.edu/registered.txt
+test/testcases/responses/whois.eu.org/available.txt
+test/testcases/responses/whois.eu.org/registered.txt
+test/testcases/responses/whois.iana.org/MULTIPLE.txt
+test/testcases/responses/whois.iana.org/available.txt
+test/testcases/responses/whois.iana.org/registered.txt
+test/testcases/responses/whois.nic.asia/available.txt
+test/testcases/responses/whois.nic.asia/registered.txt
+test/testcases/responses/whois.nic.fr/MULTIPLE.txt
+test/testcases/responses/whois.nic.fr/available.txt
+test/testcases/responses/whois.nic.fr/registered.txt
+test/testcases/responses/whois.nic.gov/available.txt
+test/testcases/responses/whois.nic.gov/registered.txt
+test/testcases/responses/whois.nic.hu/available.txt
+test/testcases/responses/whois.nic.hu/in_progress.txt
+test/testcases/responses/whois.nic.hu/registered.txt
 test/testcases/responses/whois.nic.it/available.txt
 test/testcases/responses/whois.nic.it/registered.txt
 test/testcases/responses/whois.nic.it/status_active.txt
 test/testcases/responses/whois.nic.it/status_available.txt
+test/testcases/responses/whois.nic.name/available.txt
+test/testcases/responses/whois.nic.name/registered.txt
+test/testcases/responses/whois.nic.name/reserved.txt
+test/testcases/responses/whois.nic.tv/available.txt
+test/testcases/responses/whois.nic.tv/registered.txt
 test/testcases/responses/whois.publicinterestregistry.net/available.txt
 test/testcases/responses/whois.publicinterestregistry.net/registered.txt
+test/testcases/responses/whois.za.net/available.txt
+test/testcases/responses/whois.za.net/registered.txt
+test/testcases/responses/whois.za.org/available.txt
+test/testcases/responses/whois.za.org/registered.txt
 test/whois_test.rb
 utils/bm_delegation_vs_inheritance.rb
 utils/bm_shell_vs_pure.rb

data/README.rdoc

@@ -17,7 +17,6 @@ An extensive test suite is available to verify the library correctness but you m
 * Powerful whois response parser
 * Support for ipv6, ipv4 and top level domain whois queries
 * Object oriented design
-* Compatible with older Whois version (Whois 0.4.2, see below)
 * Compatible with Ruby 1.8.6 and greater, including Ruby 1.9
 
 
@@ -36,8 +35,7 @@ Do you run any other Ruby platform or version? Are you experiencing any problem?
 
 == Installation
 
-This library is intended to be installed via the
-RubyGems[http://rubyforge.org/projects/rubygems/] system.
+This library is intended to be installed as a Gem.
 
   $ gem install whois
 
@@ -77,16 +75,16 @@ The query method is stateless. For this reason, you can safely re-use the same c
   w.query("2001:db8::1428:57ab")
   w.query("google.it")
 
-If you just need a WHOIS response and you don't care about a full control of the WHOIS Client, Whois comes with a simple method called whois. This is the simplest way to send a WHOIS request.
+If you just need a WHOIS response and you don't care about a full control of the WHOIS Client, <tt>Whois</tt> comes with a simple method called whois. This is the simplest way to send a WHOIS request.
 
   Whois.whois("google.com")
   # => #<Whois::Answer>
 
 === Consuming the Answer
 
-As of release 0.8, a WHOIS query no longer returns a simple string. Instead, you get a full Whois::Answer instance and this is just the beginning of the story.
+As of release 0.8, a WHOIS query no longer returns a simple string. Instead, you get a full <tt>Whois::Answer</tt> instance and this is just the beginning of the story.
 
-Whois::Answer is a super powerful object. It encapsulates the full WHOIS answer and it provides you the ability to parse the WHOIS response with a full object oriented notation.
+<tt>Whois::Answer</tt> is a super powerful object. It encapsulates the full WHOIS answer and it provides you the ability to parse the WHOIS response with a full object oriented notation.
 
   a = Whois.whois("google.it")
   # => #<Whois::Answer>
@@ -110,7 +108,7 @@ Whois::Answer is a super powerful object. It encapsulates the full WHOIS answer
     puts nameserver
   end
 
-This feature is made possible by the Whois answer parsers. Unfortunately, due to the lack of a global standard, each WHOIS server requires a specific parser. For this reason, the library doesn't support all existing WHOIS servers.
+This feature is made possible by the <tt>Whois</tt> answer parsers. Unfortunately, due to the lack of a global standard, each WHOIS server requires a specific parser. For this reason, the library doesn't support all existing WHOIS servers.
 
 If you create a new parser, please consider releasing it to the public so that it can be included in a next version.
 
@@ -156,10 +154,16 @@ Ruby Whois 0.4.2 is released under the MIT license.
 Copyright (c) 2007 by Cyril Mougel (cyril.mougel@gmail.com)
 
 
-== Credits
+== Author
 
 Author:: {Simone Carletti}[http://www.simonecarletti.com/] <weppos@weppos.net>
-Author (Whois 0.4):: {Cyril Mougel}[http://blog.shingara.fr/] <cyril.mougel@gmail.com>
+
+
+== 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
 
 
 == FeedBack and Bug reports

data/Rakefile

@@ -4,7 +4,8 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 require 'whois'
-
+require 'rake/rdoctask'
+require 'hanna/rdoctask'
 
 # Common package properties
 PKG_NAME    = ENV['PKG_NAME']    || Whois::GEM
@@ -31,9 +32,11 @@ Echoe.new(PKG_NAME, PKG_VERSION) do |p|
   p.need_zip      = true
 
   p.development_dependencies += ["rake  ~>0.8",
+                                 "hanna ~>0.1.12",
                                  "echoe ~>3.1",
                                  "mocha ~>0.9"]
 
+  p.rdoc_options  = ["--inline-source", "-T", "hanna"]
   p.rcov_options  = ["-Itest -x mocha,rcov,Rakefile"]
 end
 

data/bin/ruby-whois

@@ -1,37 +1,51 @@
 #!/usr/bin/env ruby -wKU
 
+$:.unshift(File.dirname(__FILE__) + "/../lib")
+
 require 'optparse'
-require 'rubygems'
+require 'ostruct'
 require 'whois'
 
-opts = OptionParser.new do |opts|
-  opts.banner = "Whois: an intelligent pure Ruby Whois client"
-  opts.define_head "Usage: whois [options] object"
-  opts.separator ""
-  opts.separator "Examples:"
-  opts.separator " whois ruby-lang.com"
-  opts.separator " whois 213.149.247.64"
-  opts.separator ""
-  opts.separator "Options:"
- 
+
+options = OpenStruct.new
+OptionParser.new do |opts|
+  opts.banner     = "Whois: an intelligent pure Ruby Whois client"
+  opts.define_head  "Usage: whois [options] object"
+  opts.separator    ""
+  opts.separator    "Examples:"
+  opts.separator    " whois ruby-lang.com"
+  opts.separator    " whois 213.149.247.64"
+  opts.separator    ""
+  opts.separator    "Options:"
+
+  opts.on("-t", "--timeout [SECONDS]", Integer, "Specify the timeout value") do |seconds|
+    options.timeout = seconds
+  end
+
   opts.on_tail("--help", "Show this message") do
     puts opts
     exit
   end
- 
-  opts.on_tail("-V", "--version", "Show version") do
+
+  opts.on_tail("-v", "--version", "Show version") do
     puts "#{Whois::NAME} #{Whois::VERSION}"
     exit
   end
+
+  begin
+    opts.parse!
+  rescue OptionParser::ParseError
+    puts opts
+    exit 1
+  end
+
+  if ARGV.size.zero?
+    puts opts
+    exit 1
+  end
 end
-opts.parse!
- 
+
 qstring = ARGV.shift
  
-if qstring.to_s.strip.empty?
-  puts opts
-  exit 1
-end
- 
-@client = Whois::Client.new
+@client = Whois::Client.new(:timeout => options.timeout)
 puts @client.query(qstring)

data/lib/whois.rb

@@ -98,4 +98,10 @@ module Whois
     Client.new.query(qstring)
   end
 
+
+  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
+
 end

data/lib/whois/answer.rb

@@ -30,21 +30,27 @@ module Whois
       @server = server
     end
 
-    
+
     def to_s
       content.to_s
     end
-    
+
     def inspect
       content.inspect
     end
-    
+
     # Invokes <tt>match</tt> on answer <tt>@content</tt>
     # and returns the <tt>MatchData</tt> or <tt>nil</tt>.
     def match(pattern)
       content.match(pattern)
     end
-    
+
+    # Invokes <tt>match</tt> and returns <tt>true</tt> if <tt>pattern</tt>
+    # matches <tt>@content</tt>, <tt>false</tt> otherwise.
+    def match?(pattern)
+      !content.match(pattern).nil?
+    end
+
     # Returns true if the <tt>object</tt> is the same object,
     # or is a string and has the same content.
     def ==(other)
@@ -53,7 +59,7 @@ module Whois
       (other.instance_of?(String) && other == self.to_s) ||
       (other.instance_of?(Answer) && other.to_s == self.to_s)
     end
-    
+
     # Delegates to ==.
     def eql?(other)
       self == other
@@ -97,23 +103,33 @@ module Whois
     end
 
 
-    # Invokes <tt>match</tt> and returns <tt>true</tt> if <tt>pattern</tt>
-    # matches <tt>@content</tt>, <tt>false</tt> otherwise.
-    def match?(pattern)
-      !content.match(pattern).nil?
-    end
-
 
     # Lazy-loads and returns a <tt>Whois::Answer::Parser</tt> proxy for current answer.
     def parser
       @parser ||= Parser.new(self)
     end
 
+
+    # Returns a Hash containing all supported properties for this Answer
+    # along with corresponding values.
+    def properties
+      list = Parser.properties.inject([]) do |l,a|
+        l.concat([a, send(a)]) if property_supported?(a)
+        l
+      end
+      Hash[*list]
+    end
+
     # Returns <tt>true</tt> if the <tt>property</tt> passed as symbol
     # is supported by any available parser for this answer.
     # See also <tt>Whois::Answer::Parser.supported?</tt>.
-    def supported?(property)
-      parser.supported?(property)
+    def property_supported?(property)
+      parser.property_supported?(property)
+    end
+
+    def supported?(*args)
+      ::Whois.deprecate "supported? is deprecated. Use property_supported? instead."
+      property_supported?(*args)
     end
 
 
@@ -121,7 +137,7 @@ module Whois
       
       # Delegates all method calls to the internal parser.
       def method_missing(method, *args, &block)
-        if Parser.registrable_methods.include?(method)
+        if Parser.properties.include?(method)
           parser.send(method, *args, &block)
         else
           super