whois 0.8.0 → 0.8.1

data/CHANGELOG.rdoc

@@ -1,6 +1,15 @@
 = Changelog
 
 
+== Release 0.8.1
+
+* FIXED: Updated the whois.denic.de parser to the new format. Thanks to David Krentzlin (closes #314)
+
+* FIXED: In case of thin server the client should select the closest whois server match (closes #264)
+
+* ADDED: ability to check whether a property is supported via answer.supported? or parser.supported?
+
+
 == Release 0.8.0
 
 * FIXED: Server definition with :format doesn't use the Formatted adapter (closes #305)

data/Manifest

@@ -1,24 +1,29 @@
-bin/ruby-whois
 CHANGELOG.rdoc
+LICENSE.rdoc
+Manifest
+README.rdoc
+Rakefile
+bin/ruby-whois
 data/ip6_del_list
 data/ip_del_list
 data/make_ip6_del.pl
 data/make_ip_del.pl
 data/make_tld_serv.pl
 data/tld_serv_list
+lib/whois.rb
+lib/whois/answer.rb
 lib/whois/answer/contact.rb
+lib/whois/answer/parser.rb
+lib/whois/answer/parser/README.rdoc
 lib/whois/answer/parser/base.rb
 lib/whois/answer/parser/blank.rb
-lib/whois/answer/parser/README.rdoc
 lib/whois/answer/parser/whois.crsnic.net.rb
 lib/whois/answer/parser/whois.denic.de.rb
 lib/whois/answer/parser/whois.nic.it.rb
 lib/whois/answer/parser/whois.publicinterestregistry.net.rb
-lib/whois/answer/parser.rb
 lib/whois/answer/part.rb
 lib/whois/answer/registrar.rb
 lib/whois/answer/super_struct.rb
-lib/whois/answer.rb
 lib/whois/client.rb
 lib/whois/definitions/ipv4.rb
 lib/whois/definitions/ipv4.txt
@@ -27,6 +32,7 @@ lib/whois/definitions/ipv6.txt
 lib/whois/definitions/tlds.rb
 lib/whois/definitions/tlds.txt
 lib/whois/errors.rb
+lib/whois/server.rb
 lib/whois/server/adapters/afilias.rb
 lib/whois/server/adapters/arpa.rb
 lib/whois/server/adapters/base.rb
@@ -37,14 +43,8 @@ lib/whois/server/adapters/pir.rb
 lib/whois/server/adapters/standard.rb
 lib/whois/server/adapters/verisign.rb
 lib/whois/server/adapters/web.rb
-lib/whois/server.rb
 lib/whois/version.rb
 lib/whois/whois.rb
-lib/whois.rb
-LICENSE.rdoc
-Manifest
-Rakefile
-README.rdoc
 tasks/server.rake
 test/answer/parser/base_test.rb
 test/answer/parser/blank_test.rb
@@ -70,12 +70,17 @@ test/server_test.rb
 test/test_helper.rb
 test/testcases/referrals/afilias.bz.txt
 test/testcases/referrals/crsnic.com.txt
+test/testcases/referrals/crsnic.com_more_servers.txt
+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.crsnic.net/available.txt
 test/testcases/responses/whois.crsnic.net/registered.txt
+test/testcases/responses/whois.denic.de/1-10-0_available.txt
+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.nic.it/available.txt
 test/testcases/responses/whois.nic.it/registered.txt

data/Rakefile

@@ -19,12 +19,13 @@ end
 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."
+  p.summary       = "An intelligent pure Ruby WHOIS client and parser."
   p.url           = "http://code.simonecarletti.com/whois"
   p.project       = RUBYFORGE_PROJECT
   p.description   = <<-EOD
-    Whois is an intelligent WHOIS client written in pure Ruby. \
-    It enables you to query registry data for ipv4, ipv6 and top level domains.
+    Whois is an intelligent WHOIS client and parser written in pure Ruby. \
+    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

data/lib/whois.rb

@@ -1,7 +1,7 @@
 #
 # = Ruby Whois
 #
-# An intelligent pure Ruby WHOIS client.
+# An intelligent pure Ruby WHOIS client and parser.
 #
 #
 # Category::    Net
@@ -63,7 +63,7 @@ module Whois
   def self.available?(qstring)
     query(qstring).available?
   rescue ParserNotFound => e
-    $stderr.puts  "This method is not available for this kind of object.\n" +
+    $stderr.puts  "This method is not supported for this kind of object.\n" +
                   "Use Whois.query('#{qstring}') instead."
     nil
   end
@@ -87,7 +87,7 @@ module Whois
   def self.registered?(qstring)
     query(qstring).registered?
   rescue ParserNotFound => e
-    $stderr.puts  "This method is not available for this kind of object.\n" +
+    $stderr.puts  "This method is not supported for this kind of object.\n" +
                   "Use Whois.query('#{qstring}') instead."
     nil
   end

data/lib/whois/answer.rb

@@ -1,7 +1,7 @@
 #
 # = Ruby Whois
 #
-# An intelligent pure Ruby WHOIS client.
+# An intelligent pure Ruby WHOIS client and parser.
 #
 #
 # Category::    Net
@@ -109,6 +109,13 @@ module Whois
       @parser ||= Parser.new(self)
     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)
+    end
+
 
     protected
       

data/lib/whois/answer/contact.rb

@@ -1,7 +1,7 @@
 #
 # = Ruby Whois
 #
-# An intelligent pure Ruby WHOIS client.
+# An intelligent pure Ruby WHOIS client and parser.
 #
 #
 # Category::    Net

data/lib/whois/answer/parser.rb

@@ -1,7 +1,7 @@
 #
 # = Ruby Whois
 #
-# An intelligent pure Ruby WHOIS client.
+# An intelligent pure Ruby WHOIS client and parser.
 #
 #
 # Category::    Net
@@ -46,10 +46,20 @@ module Whois
         @answer = answer
       end
 
+      # Returns an array with all host-specific parsers initialized for the parts
+      # contained into this parser.
+      # The array is lazy-initialized.
       def parsers
         @parsers ||= init_parsers
       end
 
+      # Returns <tt>true</tt> if the <tt>property</tt> passed as symbol
+      # is supported by any available parser.
+      # See also <tt>Whois::Answer::Parser::Base.supported?</tt>.
+      def supported?(property)
+        parsers.any? { |parser| parser.supported?(property) }
+      end
+
 
       protected
 
@@ -70,12 +80,21 @@ module Whois
         # Loops through all answer parts, for each parts tries to guess
         # the appropriate Whois::Answer::Parser::<parser> if it exists
         # and returns the final array of server-specific parsers.
+        #
+        # Parsers are initialized in reverse order for performance reason.
+        # See also <tt>select_parser</tt>.
+        #
+        #   parser.parts
+        #   # => [whois.foo.com, whois.bar.com]
+        #   parser.parsers
+        #   # => [parser(whois.bar.com), parser(whois.foo.com)]
+        #
         def init_parsers
-          answer.parts.map { |part| self.class.parser_for(part) }
+          answer.parts.reverse.map { |part| self.class.parser_for(part) }
         end
 
         def select_parser(method)
-          parsers.reverse.each do |parser|
+          parsers.each do |parser|
             return parser if parser.method_registered?(method)
           end
           nil

data/lib/whois/answer/parser/base.rb

@@ -1,7 +1,7 @@
 #
 # = Ruby Whois
 #
-# An intelligent pure Ruby WHOIS client.
+# An intelligent pure Ruby WHOIS client and parser.
 #
 #
 # Category::    Net
@@ -50,6 +50,43 @@ module Whois
           end
         end
 
+        # Returns <tt>true</tt> if the <tt>property</tt> passed as symbol
+        # is supported by current parser.
+        #
+        #   parser.supported? :disclaimer
+        #   # => false
+        #
+        #   parser.register_method(:disclaimer) {}
+        #   parser.supported? :disclaimer
+        #   # => true
+        #
+        # This method is different than <tt>respond_to?</tt>.
+        # While <tt>respond_to?</tt> always returns true for any registrable property,
+        # including those not effectively implemented,
+        # this method only returns <tt>true</tt> if the parser implements <tt>property</tt>.
+        # Also, <tt>supported?</tt> returns <tt>false</tt> if <tt>property</tt> exists as a method
+        # but it's not a property method.
+        #
+        #   parser.respond_to?(:disclaimer)
+        #   # => true
+        #   parser.supported?(:disclaimer)
+        #   # => false
+        #
+        #   parser.register_method(:disclaimer) {}
+        #   parser.respond_to?(:disclaimer)
+        #   # => true
+        #   parser.supported?(:disclaimer)
+        #   # => true
+        #
+        #   parser.respond_to?(:contact)
+        #   # => true
+        #   parser.supported?(:contact)
+        #   # => false
+        #
+        def supported?(property)
+          method_registered?(property.to_s.to_sym)
+        end
+
 
         # This is an internal method primaly used as a common access point
         # to get the content to be parsed as a string.

data/lib/whois/answer/parser/blank.rb

@@ -1,7 +1,7 @@
 #
 # = Ruby Whois
 #
-# An intelligent pure Ruby WHOIS client.
+# An intelligent pure Ruby WHOIS client and parser.
 #
 #
 # Category::    Net

data/lib/whois/answer/parser/whois.crsnic.net.rb

@@ -1,7 +1,7 @@
 #
 # = Ruby Whois
 #
-# An intelligent pure Ruby WHOIS client.
+# An intelligent pure Ruby WHOIS client and parser.
 #
 #
 # Category::    Net

data/lib/whois/answer/parser/whois.denic.de.rb

@@ -1,12 +1,12 @@
 #
 # = Ruby Whois
 #
-# An intelligent pure Ruby WHOIS client.
+# An intelligent pure Ruby WHOIS client and parser.
 #
 #
 # Category::    Net
 # Package::     Whois
-# Author::      Aaron Mueller <mail@aaron-mueller.de>
+# Author::      Aaron Mueller <mail@aaron-mueller.de>, Simone Carletti <weppos@weppos.net>
 # License::     MIT License
 #
 #--
@@ -39,11 +39,11 @@ module Whois
         end
 
         register_method :registered? do
-          !ast['NotFound']
+          !(ast['NotFound'] || ast['Invalid'])
         end
 
         register_method :available? do
-          ast['NotFound']
+          ast['NotFound'] && !ast['Invalid']
         end
 
         register_method :created_on do
@@ -119,6 +119,7 @@ module Whois
 
             def parse_content
               parse_disclaimer ||
+              parse_invalid ||
               parse_not_found ||
               parse_pair(@ast) ||
               parse_contact ||
@@ -127,8 +128,8 @@ module Whois
             end
 
             def parse_disclaimer
-              if @input.match?(/% Copyright \(c\)2008 by DENIC\n/)
-                8.times { @input.scan(/%(.*)\n/) } # strip junk
+              if @input.match?(/% Copyright \(c\) *\d{4} by DENIC\n/)
+                @input.scan_until(/% Terms and Conditions of Use\n/)
                 lines = []
                 while @input.match?(/%/) && @input.scan(/%(.*)\n/)
                   lines << @input[1].strip unless @input[1].strip == ""
@@ -190,6 +191,14 @@ module Whois
               @ast['NotFound'] = false
             end
 
+            def parse_invalid
+              if @input.match?(/% ".*" is not a valid domain name\n/)
+                 @input.scan(/%.*\n/)
+                 return @ast['Invalid'] = true
+              end 
+              @ast['Invalid'] = false
+            end 
+
             def error(message)
               raise "#{message}: #{@input.peek(@input.string.length)}"
             end

data/lib/whois/answer/parser/whois.nic.it.rb

@@ -1,7 +1,7 @@
 #
 # = Ruby Whois
 #
-# An intelligent pure Ruby WHOIS client.
+# An intelligent pure Ruby WHOIS client and parser.
 #
 #
 # Category::    Net

data/lib/whois/answer/parser/whois.publicinterestregistry.net.rb

@@ -1,7 +1,7 @@
 #
 # = Ruby Whois
 #
-# An intelligent pure Ruby WHOIS client.
+# An intelligent pure Ruby WHOIS client and parser.
 #
 #
 # Category::    Net

data/lib/whois/answer/part.rb

@@ -1,7 +1,7 @@
 #
 # = Ruby Whois
 #
-# An intelligent pure Ruby WHOIS client.
+# An intelligent pure Ruby WHOIS client and parser.
 #
 #
 # Category::    Net

data/lib/whois/answer/registrar.rb

@@ -1,7 +1,7 @@
 #
 # = Ruby Whois
 #
-# An intelligent pure Ruby WHOIS client.
+# An intelligent pure Ruby WHOIS client and parser.
 #
 #
 # Category::    Net

data/lib/whois/answer/super_struct.rb

@@ -1,7 +1,7 @@
 #
 # = Ruby Whois
 #
-# An intelligent pure Ruby WHOIS client.
+# An intelligent pure Ruby WHOIS client and parser.
 #
 #
 # Category::    Net

data/lib/whois/client.rb

@@ -1,7 +1,7 @@
 #
 # = Ruby Whois
 #
-# An intelligent pure Ruby WHOIS client.
+# An intelligent pure Ruby WHOIS client and parser.
 #
 #
 # Category::    Net

data/lib/whois/errors.rb

@@ -1,7 +1,7 @@
 #
 # = Ruby Whois
 #
-# An intelligent pure Ruby WHOIS client.
+# An intelligent pure Ruby WHOIS client and parser.
 #
 #
 # Category::    Net

data/lib/whois/server.rb

@@ -1,7 +1,7 @@
 #
 # = Ruby Whois
 #
-# An intelligent pure Ruby WHOIS client.
+# An intelligent pure Ruby WHOIS client and parser.
 #
 #
 # Category::    Net

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

@@ -1,7 +1,7 @@
 #
 # = Ruby Whois
 #
-# An intelligent pure Ruby WHOIS client.
+# An intelligent pure Ruby WHOIS client and parser.
 #
 #
 # Category::    Net