whois 2.7.0 → 3.0.0

data/lib/whois/record/scanners/whois.rnids.rs.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 

data/lib/whois/record/scanners/whois.smallregistry.net.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 

data/lib/whois/record/scanners/whois.sx.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -14,63 +14,31 @@ module Whois
   class Record
     module Scanners
 
-      # Scanner for the whois.sx record.
-      #
-      # @since  2.6.2
       class WhoisSx < Base
 
         self.tokenizers += [
-            :skip_header,
-            :skip_comments,
-            :skip_empty_line,
-            :flag_section_start,
-            :flag_section_end,
-            :scan_section,
+            :skip_blank_line,
+            :scan_available,
             :scan_keyvalue,
+            :skip_lastupdate,
+            :scan_disclaimer,
         ]
 
 
-        tokenizer :skip_header do
-          if @input.pos == 0 && @input.match?(/^\[/)
-            @input.skip_until(/\n/)
+        tokenizer :scan_available do
+          if @input.scan(/^Status: (.+) \(No match for domain "(.+)"\)\n/)
+            @ast["Domain Status"] = @input[1]
+            @ast["Domain Name"] = @input[2]
           end
         end
 
-        tokenizer :skip_comments do
-          if @input.match?(/^%/)
-            @input.skip_until(/\n/)
-          end
+        tokenizer :skip_lastupdate do
+          @input.skip(/>>>(.+?)<<<\n/)
         end
 
-        tokenizer :flag_section_start do
-          if @input.scan(/(.+?):\n/)
-            @tmp['section'] = @input[1].strip
-          end
-        end
-
-        tokenizer :flag_section_end do
-          # if @input.match?(/^\n/)
-          #   @tmp.delete('section')
-          # end
-        end
-
-        tokenizer :scan_section do
-          if @tmp['section']
-            lines = _scan_lines_to_array(/^(.+)\n/)
-
-            # Check all lines to be sure there is no case where a value containing a :
-            # is misinterpreted as key : value.
-
-            # The section is a hash
-            value = if lines.all? { |line| line.index(':', 1) }
-              Hash[lines.map { |line| line.split(':', 2).map(&:strip) }]
-            # The section is an array of values
-            else
-              lines
-            end
-
-            @ast[@tmp['section']] = value
-            @tmp.delete('section')
+        tokenizer :scan_disclaimer do
+          if @input.match?(/^% WHOIS LEGAL STATEMENT/)
+            @ast["field:disclaimer"] = _scan_lines_to_array(/%(.*)\n/).map(&:strip).join("\n")
           end
         end
 

data/lib/whois/record/super_struct.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 

data/lib/whois/server.rb

@@ -3,11 +3,13 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 
 require 'ipaddr'
+require 'json'
+require 'whois/server/adapters/base'
 
 
 module Whois
@@ -23,7 +25,6 @@ module Whois
     # WHOIS server adapters. Each adapter is a subclass of {Whois::Server::Adapters::Base},
     # customized to handle WHOIS queries for a type or a group of servers.
     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"
@@ -47,9 +48,22 @@ module Whois
     #
     # @return [void]
     def self.load_definitions
-      Dir[File.dirname(__FILE__) + '/definitions/*.rb'].each { |file| load(file) }
+      Dir[File.expand_path("../../../data/*.json", __FILE__)].each { |f| load_json(f) }
     end
 
+    # Loads the definitions from a JSON file.
+    #
+    # @param  [String] file The path to the definition file.
+    #
+    # @return [void]
+    def self.load_json(file)
+      type = File.basename(file, File.extname(file)).to_sym
+      JSON.load(File.read(file)).each do |allocation, settings|
+        define(type, allocation, settings.delete("host"), Hash[settings.map { |k,v| [k.to_sym, v] }])
+      end
+    end
+
+
     # Lookup and returns the definition list for given <tt>type</tt>,
     # or all definitions if <tt>type</tt> is <tt>nil</tt>.
     #
@@ -253,7 +267,7 @@ module Whois
             return factory(type, *definition)
           end
         end
-      rescue ArgumentError => error
+      rescue ArgumentError
         # continue
       end
       raise AllocationUnknown, "IP Allocation for `#{string}' unknown. Server definitions might be outdated."

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

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -16,11 +16,6 @@ module Whois
       #
       # Provides ability to query Afilias WHOIS interfaces.
       #
-      # The following WHOIS servers are currently known
-      # to require the Afilias adapter:
-      #
-      # - whois.afilias-grs.info
-      #
       class Afilias < Base
 
         # Executes a WHOIS query to the Afilias WHOIS interface,
@@ -34,20 +29,20 @@ module Whois
           response = query_the_socket(string, host)
           buffer_append response, host
 
-          if endpoint = extract_referral(response)
-            response = query_the_socket(string, endpoint)
-            buffer_append response, endpoint
+          if options[:referral] != false && referral = extract_referral(response)
+            response = query_the_socket(string, referral)
+            buffer_append(response, referral)
           end
         end
 
 
         private
 
-          def extract_referral(response)
-            if response =~ /Domain Name:/ && response =~ /Whois Server:(\S+)/
-              $1
-            end
+        def extract_referral(response)
+          if response =~ /Domain Name:/
+            response.slice(/Whois Server:(\S+)/, 1)
           end
+        end
 
       end
 

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

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 

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

@@ -3,13 +3,13 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 
 require 'whois/record/part'
 require 'whois/record'
-require 'socket'
+require 'whois/server/socket_handler'
 
 
 module Whois
@@ -20,20 +20,13 @@ module Whois
 
         # Default WHOIS request port.
         DEFAULT_WHOIS_PORT = 43
-
         # Default bind hostname.
         DEFAULT_BIND_HOST = "0.0.0.0"
 
-        # Array of connection errors to rescue and wrap into a {Whois::ConnectionError}
-        RESCUABLE_CONNECTION_ERRORS = [
-          Errno::ECONNRESET,
-          Errno::EHOSTUNREACH,
-          Errno::ECONNREFUSED,
-          SocketError,
-        ]
-
+        class_attribute :query_handler
+        self.query_handler = SocketHandler.new
 
-        # @return [Symbol] The type of WHOIS server
+        # @return [Symbol] The type of WHOIS server.
         attr_reader :type
         # @return [String] The allocation this server is responsible for.
         attr_reader :allocation
@@ -68,7 +61,6 @@ module Whois
         # Checks self and other for equality.
         #
         # @param  [The Whois::Server::Adapters::Base] other
-        #
         # @return [Boolean] Returns true if the other is the same object,
         #         or <tt>other</tt> attributes matches this object attributes.
         #
@@ -93,24 +85,24 @@ module Whois
         # @return [Hash] The updated options for this object.
         #
         def configure(settings)
+          @host = settings[:host] if settings[:host]
           options.merge!(settings)
         end
 
 
-        # Performs a Whois query for <tt>string</tt>
+        # Performs a Whois lookup for <tt>string</tt>
         # using the current server adapter.
         #
-        # @param  [String] string The string to be sent as query parameter.
-        #
-        # @return [Whois::Record]
-        #
         # Internally, this method calls {#request}
         # using the Template Method design pattern.
         #
-        #   server.query("google.com")
+        #   server.lookup("google.com")
         #   # => Whois::Record
         #
-        def query(string)
+        # @param  [String] string The string to be sent as query parameter.
+        # @return [Whois::Record]
+        #
+        def lookup(string)
           buffer_start do |buffer|
             request(string)
             Whois::Record.new(self, buffer)
@@ -124,9 +116,8 @@ module Whois
         # This is the heart of the Template Method design pattern.
         #
         # @param  [String] string The string to be sent as query parameter.
-        #
-        # @raise  [NotImplementedError]
         # @return [void]
+        # @raise  [NotImplementedError]
         # @abstract
         #
         def request(string)
@@ -134,7 +125,7 @@ module Whois
         end
 
 
-      private
+        private
 
         # Store a record part in {#buffer}.
         #
@@ -142,8 +133,6 @@ module Whois
         # @param  [String] host
         # @return [void]
         #
-        # @api public
-        #
         def buffer_append(body, host)
           @buffer << Whois::Record::Part.new(:body => body, :host => host)
         end
@@ -156,8 +145,14 @@ module Whois
           result
         end
 
-        # @api public
-        def query_the_socket(query, host, port = nil)
+        # Prepares and passes the query to the {#query_handler}.
+        #
+        # @param  [String] query
+        # @param  [String] host
+        # @param  [String] port
+        # @return [String]
+        #
+        def query(query, host, port = nil)
           args = []
           args.push(host)
           args.push(port || options[:port] || DEFAULT_WHOIS_PORT)
@@ -177,25 +172,10 @@ module Whois
             args.push(options[:bind_port]) if options[:bind_port]
           end
 
-          ask_the_socket(query, *args)
-
-        rescue *RESCUABLE_CONNECTION_ERRORS => error
-          raise ConnectionError, "#{error.class}: #{error.message}"
+          self.class.query_handler.call(query, *args)
         end
 
-        # This method handles the lowest connection
-        # to the WHOIS server.
-        #
-        # This is for internal use only!
-        #
-        # @api private
-        def ask_the_socket(query, *args)
-          client = TCPSocket.new(*args)
-          client.write("#{query}\r\n")    # I could use put(foo) and forget the \n
-          client.read                     # but write/read is more symmetric than puts/read
-        ensure                            # and I really want to use read instead of gets.
-          client.close if client          # If != client something went wrong.
-        end
+        alias :query_the_socket :query
 
       end
 

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

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 

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

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 

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

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 

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

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 

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

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -16,14 +16,6 @@ module Whois
       #
       # Provides ability to query Verisign WHOIS interfaces.
       #
-      # The following WHOIS servers are currently known
-      # to require the Verisign adapter:
-      #
-      # - whois.nic.tv
-      # - whois.crsnic.net
-      # - jobswhois.verisign-grs.com
-      # - whois.nic.cc
-      #
       class Verisign < Base
 
         # Executes a WHOIS query to the Verisign WHOIS interface,
@@ -37,23 +29,23 @@ module Whois
           response = query_the_socket("=#{string}", host)
           buffer_append response, host
 
-          if endpoint = extract_referral(response)
-            response = query_the_socket(string, endpoint)
-            buffer_append response, endpoint
+          if options[:referral] != false && referral = extract_referral(response)
+            response = query_the_socket(string, referral)
+            buffer_append(response, referral)
           end
         end
 
 
         private
 
-          def extract_referral(response)
-            if response =~ /Domain Name:/
-              endpoint = response.scan(/Whois Server: (.+?)$/).flatten.last
-              endpoint.strip! if endpoint != nil
-              endpoint = nil  if endpoint == "not defined"
-              endpoint
-            end
+        def extract_referral(response)
+          if response =~ /Domain Name:/
+            server = response.scan(/Whois Server: (.+?)$/).flatten.last
+            server.strip! if server != nil
+            server = nil  if server == "not defined"
+            server
           end
+        end
 
       end