whois 1.1.8 → 1.2.0

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

@@ -70,7 +70,7 @@ module Whois
 
         property_supported :nameservers do
           @nameservers ||= if content_for_scanner =~ / Domain Servers:\n((.+\n)+)\n/
-            $1.split("\n")
+            $1.split("\n").map(&:strip)
           else
             []
           end

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

@@ -30,7 +30,7 @@ module Whois
         include Ast
 
         property_supported :disclaimer do
-          @disclaimer ||= node("Disclaimer")
+          @disclaimer ||= node("disclaimer")
         end
 
 
@@ -118,6 +118,10 @@ module Whois
           self.content.to_s == other.content.to_s
         end
 
+        def throttle?
+          !!node("status-throttle")
+        end
+
 
         protected
 
@@ -160,40 +164,47 @@ module Whois
             end
             @ast
           end
-          
+
           private
 
             def parse_content
-              trim_newline      ||
+              trim_empty_line   ||
               parse_not_found   ||
+              parse_throttle    ||
               parse_disclaimer  ||
               parse_pair        ||
               error("Unexpected token")
             end
 
-            def trim_newline
-              # The last line is \r\n\n
-              @input.scan(/\n+/)
+            def trim_empty_line
+              @input.skip(/^\n/)
             end
 
             def parse_not_found
-              @input.scan(/NOT FOUND\n/)
+              @input.skip(/^NOT FOUND\n/)
+            end
+
+            def parse_throttle
+              if @input.match?(/^WHOIS LIMIT EXCEEDED/)
+                @ast["status-throttle"] = true
+                @input.skip(/^.+\n/)
+              end
             end
 
             def parse_disclaimer
-              if @input.match?(/NOTICE:/)
+              if @input.match?(/^NOTICE:/)
                 lines = []
                 while !@input.match?(/\n/) && @input.scan(/(.*)\n/)
                   lines << @input[1].strip
                 end
-                @ast["Disclaimer"] = lines.join(" ")
+                @ast["disclaimer"] = lines.join(" ")
               else
                 false
               end
             end
 
             def parse_pair
-              if @input.scan(/(.*?):(.*?)\n/)
+              if @input.scan(/(.+?):(.*?)\n/)
                 key, value = @input[1].strip, @input[2].strip
                 if @ast[key].nil?
                   @ast[key] = value
@@ -210,7 +221,7 @@ module Whois
               if @input.eos?
                 raise "Unexpected end of input."
               else
-                raise "#{message}: #{@input.peek(@input.string.length)}"
+                raise "#{message}: `#{@input.peek(@input.string.length)}'"
               end
             end
 

data/lib/whois/server.rb

@@ -15,22 +15,26 @@
 
 
 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'
-require 'whois/server/adapters/not_implemented'
-require 'whois/server/adapters/pir'
-require 'whois/server/adapters/standard'
-require 'whois/server/adapters/verisign'
-require 'whois/server/adapters/web'
 
 
 module Whois
-  
+
   class Server
-    
+
+    module Adapters
+      autoload :Base,             "whois/server/adapters/base"
+      autoload :Arpa,             "whois/server/adapters/arpa"
+      autoload :Afilias,          "whois/server/adapters/afilias"
+      autoload :Formatted,        "whois/server/adapters/formatted"
+      autoload :None,             "whois/server/adapters/none"
+      autoload :NotImplemented,   "whois/server/adapters/not_implemented"
+      autoload :Pir,              "whois/server/adapters/pir"
+      autoload :Standard,         "whois/server/adapters/standard"
+      autoload :Verisign,         "whois/server/adapters/verisign"
+      autoload :Web,              "whois/server/adapters/web"
+    end
+
+
     @@definitions = {}
 
     # Searches the /definitions folder for definition files and loads them.
@@ -141,7 +145,7 @@ module Whois
       # Gave Over
       raise ServerNotFound, "Unable to find a whois server for `#{qstring}'"
     end
-    
+
 
     private
 
@@ -199,8 +203,8 @@ module Whois
         false
       end
 
-    end
+  end
 
 end
 
-Whois::Server.load_definitions
+Whois::Server.load_definitions

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

@@ -42,4 +42,4 @@ module Whois
 
     end
   end
-end
+end

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

@@ -17,15 +17,15 @@
 module Whois
   class Server
     module Adapters
-      
+
       class Arpa < Base
-        
+
         def request(qstring)
           Server.guess(inaddr_to_ip(qstring)).query(qstring)
         end
-        
+
         protected
-        
+
           # "127.1.168.192.in-addr.arpa" => "192.168.1.127"
           # "1.168.192.in-addr.arpa" => "192.168.1.0"
           # "168.192.in-addr.arpa" => "192.168.0.0"
@@ -45,9 +45,9 @@ module Whois
               end
             end.join(".")
           end
-        
+
       end
 
     end
   end
-end
+end

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

@@ -87,7 +87,7 @@ module Whois
           ensure                            # and I really want to use read instead of gets.
             client.close if client          # If != client something went wrong.
           end
-        
+
       end
 
     end

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

@@ -17,17 +17,17 @@
 module Whois
   class Server
     module Adapters
-      
+
       class Formatted < Base
-        
+
         def request(qstring)
           options[:format] || raise(ServerError, "Missing mandatory :format option for adapter `Formatted'")
           response = query_the_socket(sprintf(options[:format], qstring), host)
           append_to_buffer response, host
         end
-        
+
       end
 
     end
   end
-end
+end

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

@@ -33,18 +33,17 @@ module Whois
       # adapter raises a <tt>Whois::NoInterfaceError</tt> exception.
       #
       class None < Base
-        
+
         # Always raises a <tt>Whois::NoInterfaceError</tt> exception.
         #
-        # ==== Raises
-        # NoInterfaceError:: for every request
-        #
+        # Returns nothing.
+        # Raises Whois::NoInterfaceError for every request.
         def request(qstring)
           raise NoInterfaceError, "This `#{type}' has no whois server"
         end
-        
+
       end
 
     end
   end
-end
+end

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

@@ -17,15 +17,17 @@
 module Whois
   class Server
     module Adapters
-      
+
       class NotImplemented < Base
-        
+
+        # Returns nothing.
+        # Raises Whois::ServerNotImplemented for every request.
         def request(qstring)
           raise ServerNotImplemented, "The `#{host}' feature has not been implemented yet."
         end
-        
+
       end
 
     end
   end
-end
+end

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

@@ -43,4 +43,4 @@ module Whois
 
     end
   end
-end
+end

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

@@ -29,12 +29,12 @@ module Whois
       # This adapter also supports an optional port number.
       #
       class Standard < Base
-        
+
         def request(qstring)
           response = query_the_socket(qstring, host)
           append_to_buffer response, host
         end
-        
+
       end
 
     end

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

@@ -17,9 +17,9 @@
 module Whois
   class Server
     module Adapters
-      
+
       class Verisign < Base
-        
+
         def request(qstring)
           response = ask_the_socket("=#{qstring}", host, DEFAULT_WHOIS_PORT)
           append_to_buffer response, host
@@ -42,4 +42,4 @@ module Whois
 
     end
   end
-end
+end

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

@@ -17,7 +17,7 @@
 module Whois
   class Server
     module Adapters
-      
+
       #
       # = Web Adapter
       #
@@ -28,19 +28,18 @@ module Whois
       # adapter a little more specific.
       #
       class Web < Base
-        
+
         # Always raises a <tt>Whois::WebInterfaceError</tt> exception
         # including the web address for the WHOIS inteface.
         #
-        # ==== Raises
-        # WebInterfaceError:: for every request
-        #
+        # Returns nothing.
+        # Raises Whois::WebInterfaceError for every request.
         def request(qstring)
           raise WebInterfaceError, options[:web]
         end
-        
+
       end
 
     end
   end
-end
+end

data/lib/whois/version.rb

@@ -18,8 +18,8 @@ module Whois
 
   module Version
     MAJOR = 1
-    MINOR = 1
-    PATCH = 8
+    MINOR = 2
+    PATCH = 0
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/test/testcases/responses/UTF8.txt

@@ -4,3 +4,5 @@ The following responses has been manually converted into UTF-8.
 
 * whois.nic.or.kr
 * whois.net.ua
+* whois.nic.tr
+* whois.dns.pt

data/test/testcases/responses/whois.dns.pt/registered.txt

@@ -1,4 +1,4 @@
-Nome de dom�nio / Domain Name: google.pt
+Nome de domínio / Domain Name: google.pt
 Data de registo / Creation Date (dd/mm/yyyy): 09/01/2003
 Estado / Status: ACTIVE
 
@@ -14,11 +14,11 @@ Entidade Gestora / Billing Contact
    Markmonitor - CCOPS
    Email: ccops@markmonitor.com
 
-Respons�vel Administrativo / Admin Contact
+Responsável Administrativo / Admin Contact
    Markmonitor - CCOPS
    Email: ccops@markmonitor.com
 
-Respons�vel T�cnico / Tech Contact
+Responsável Técnico / Tech Contact
    Markmonitor - CCOPS
    Email: ccops@markmonitor.com
 

data/test/testcases/responses/whois.nic.hu/current/available.txt

@@ -0,0 +1,3 @@
+% Whois server 2.02a serving the hu ccTLD
+
+Nincs találat / No match

data/test/testcases/responses/whois.nic.hu/current/registered.txt

@@ -0,0 +1,9 @@
+% Whois server 2.02a serving the hu ccTLD
+
+domain:         google.hu
+
+További adatokért ld.:
+http://www.domain.hu/domain/domainsearch/
+For further data see:
+http://www.domain.hu/domain/English/domainsearch/
+

data/test/testcases/responses/whois.nic.tr/property_nameservers_with_trailing_space.txt

@@ -0,0 +1,42 @@
+** Registrant:
+   Sevdin Filiz
+   Çýnar mh. 10.sok
+   
+   Ýstanbul,
+     Türkiye
+   phpbb@canver.net
+   + 90-212-6116571-
+   + 
+
+
+** Administrative Contact:
+NIC Handle		: sf256-metu
+Person			: Sevdin Filiz
+Address			: Hidden upon user request
+Phone			: Hidden upon user request
+Fax			: Hidden upon user request
+
+
+** Technical Contact:
+NIC Handle		: sf256-metu
+Person			: Sevdin Filiz
+Address			: Hidden upon user request
+Phone			: Hidden upon user request
+Fax			: Hidden upon user request
+
+
+** Billing Contact:
+NIC Handle		: sf256-metu
+Person			: Sevdin Filiz
+Address			: Hidden upon user request
+Phone			: Hidden upon user request
+Fax			: Hidden upon user request
+
+
+** Domain Servers:
+ns1.phpsunucu.com		
+ns2.phpsunucu.com		
+
+** Additional Info:
+Created on..............: 2009-Nov-16.
+Expires on..............: 2010-Nov-15.