whois 2.0.7 → 2.1.0

data/lib/whois/record/parser/whois.registry.qa.rb

@@ -0,0 +1,117 @@
+#--
+# Ruby Whois
+#
+# An intelligent pure Ruby WHOIS client and parser.
+#
+# Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
+#++
+
+
+require 'whois/record/parser/base'
+require 'whois/record/parser/scanners/whois.registry.qa.rb'
+
+
+module Whois
+  class Record
+    class Parser
+
+      # Parser for the whois.registry.qa server.
+      #
+      # @since  2.1.0
+      class WhoisRegistryQa < Base
+        include Scanners::Ast
+
+        property_not_supported :disclaimer
+
+
+        property_supported :domain do
+          node("Domain Name")
+        end
+
+        property_not_supported :domain_id
+
+
+        property_not_supported :referral_whois
+
+        property_not_supported :referral_url
+
+
+        property_supported :status do
+          Array.wrap(node("Status"))
+        end
+
+        property_supported :available? do
+          !!node("status:available")
+        end
+
+        property_supported :registered? do
+          !available?
+        end
+
+
+        property_not_supported :created_on
+
+        property_not_supported :updated_on
+
+        property_not_supported :expires_on
+
+
+        property_supported :registrar do
+          node("Registrar ID") do |raw|
+            Record::Registrar.new(
+              :id           => node("Registrar ID"),
+              :name         => node("Registrar Name"),
+              :organization => node("Registrar Name")
+            )
+          end
+        end
+
+
+        property_supported :registrant_contacts do
+          contact("Registrant Contact", Whois::Record::Contact::TYPE_REGISTRANT)
+        end
+
+        property_not_supported :admin_contacts
+
+        property_supported :technical_contacts do
+          contact("Tech Contact", Whois::Record::Contact::TYPE_TECHNICAL)
+        end
+
+
+        property_supported :nameservers do
+          node("Name Server") do |value|
+            value.zip(node("Name Server IP")).map do |name, ipv4|
+              Nameserver.new(:name => name, :ipv4 => ipv4)
+            end
+          end
+        end
+
+
+        # Initializes a new {Scanners::WhoisRegistryQa} instance
+        # passing the {#content_for_scanner}
+        # and calls +parse+ on it.
+        #
+        # @return [Hash]
+        def parse
+          Scanners::WhoisRegistryQa.new(content_for_scanner).parse
+        end
+
+
+        protected
+
+          def contact(element, type)
+            node("#{element} ID") do |raw|
+              Record::Contact.new(
+                :type         => type,
+                :id           => node("#{element} ID"),
+                :name         => node("#{element} Name"),
+                :email        => node("#{element} Email")
+              )
+            end
+          end
+
+      end
+
+    end
+  end
+end

data/lib/whois/record/parser/whois.ripn.net.rb

@@ -7,96 +7,16 @@
 #++
 
 
-require 'whois/record/parser/base'
+require 'whois/record/parser/whois.tcinet.ru.rb'
 
 
 module Whois
   class Record
     class Parser
 
-      #
-      # = whois.ripn.net parser
-      #
-      # Parser for the whois.ripn.net server.
-      #
-      # NOTE: This parser is just a stub and provides only a few basic methods
-      # to check for domain availability and get domain status.
-      # Please consider to contribute implementing missing methods.
-      # See WhoisNicIt parser for an explanation of all available methods
-      # and examples.
-      #
-      class WhoisRipnNet < Base
-
-        property_supported :status do
-          if content_for_scanner =~ /state:\s+(.+?)\n/
-            $1.split(",").map(&:strip)
-          else
-            []
-          end
-        end
-
-        property_supported :available? do
-          !!(content_for_scanner =~ /No entries found/)
-        end
-
-        property_supported :registered? do
-          !available?
-        end
-
-
-        property_supported :created_on do
-          if content_for_scanner =~ /created:\s+(.*)\n/
-            Time.parse($1)
-          end
-        end
-
-        property_not_supported :updated_on
-
-        property_supported :expires_on do
-          if content_for_scanner =~ /paid-till:\s+(.*)\n/
-            Time.parse($1)
-          end
-        end
-
-
-        property_supported :registrar do
-          if content_for_scanner =~ /registrar:\s+(.*)\n/
-            Record::Registrar.new(:id => $1)
-          end
-        end
-
-
-        property_supported :admin_contacts do
-          content_for_scanner.scan(/e-mail:\s+(.+)\n/).flatten.map do |email|
-            Record::Contact.new(
-              :type         => Record::Contact::TYPE_ADMIN,
-              :name         => content_for_scanner[/person:\s+(.+)\n/, 1],
-              :organization => content_for_scanner[/org:\s+(.+)\n/, 1],
-              :phone        => content_for_scanner[/phone:\s+(.+)\n/, 1],
-              :fax          => content_for_scanner[/fax-no:\s+(.+)\n/, 1],
-              :email        => email
-            )
-          end
-        end
-
-        property_not_supported :registrant_contacts
-
-        property_not_supported :technical_contacts
-
-
-        # Nameservers are listed in the following formats:
-        #
-        #   nserver:     ns.masterhost.ru.
-        #   nserver:     ns.masterhost.ru. 217.16.20.30
-        #
-        property_supported :nameservers do
-          content_for_scanner.scan(/nserver:\s+(.+)\n/).flatten.map do |line|
-            name, ipv4 = line.split(/\s+/)
-            Record::Nameserver.new(name.chomp("."), ipv4)
-          end
-        end
-
-      end
+      # Parser for the <tt>whois.ripn.net</tt> server.
+      # Aliases the <tt>whois.tcinet.ru</tt> parser.
+      WhoisRipnNet = WhoisTcinetRu
 
     end
   end

data/lib/whois/record/parser/whois.sgnic.sg.rb

@@ -60,16 +60,24 @@ module Whois
             values = case value = $1.downcase
               # schema-1
               when /^(?:\s+([\w.-]+)\n){2,}/
-                value.split("\n").map(&:strip)
+                value.scan(/\s+([\w.-]+)\n/).map do |match|
+                  { :name => match[0] }
+                end
+              when /^(?:\s+([\w.-]+)\s+\((.+)\)\n){2,}/
+                value.scan(/\s+([\w.-]+)\s+\((.+)\)\n/).map do |match|
+                  { :name => match[0], :ipv4 => match[1] }
+                end
               # schema-2
               when /^(?:\s+([\w.-]+)){2,}/
-                value.strip.split(/\s+/)
+                value.strip.split(/\s+/).map do |name|
+                  { :name => name }
+                end
               else
-                Whois.bug!("Unknown nameservers format `#{value}'")
+                Whois.bug!(ParserError, "Unknown nameservers format `#{value}'")
             end
 
-            values.map do |name|
-              Record::Nameserver.new(name)
+            values.map do |params|
+              Record::Nameserver.new(params)
             end
           end
         end

data/lib/whois/record/parser/whois.tcinet.ru.rb

@@ -0,0 +1,102 @@
+#--
+# Ruby Whois
+#
+# An intelligent pure Ruby WHOIS client and parser.
+#
+# Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
+#++
+
+
+require 'whois/record/parser/base'
+
+
+module Whois
+  class Record
+    class Parser
+
+      # Parser for the whois.tcinet.ru server.
+      #
+      # @note This parser is just a stub and provides only a few basic methods
+      #   to check for domain availability and get domain status.
+      #   Please consider to contribute implementing missing methods.
+      # 
+      # @see Whois::Record::Parser::Example
+      #   The Example parser for the list of all available methods.
+      #
+      # @since  2.1.0
+      class WhoisTcinetRu < Base
+
+        property_supported :status do
+          if content_for_scanner =~ /state:\s+(.+?)\n/
+            $1.split(",").map(&:strip)
+          else
+            []
+          end
+        end
+
+        property_supported :available? do
+          !!(content_for_scanner =~ /No entries found/)
+        end
+
+        property_supported :registered? do
+          !available?
+        end
+
+
+        property_supported :created_on do
+          if content_for_scanner =~ /created:\s+(.*)\n/
+            Time.parse($1)
+          end
+        end
+
+        property_not_supported :updated_on
+
+        property_supported :expires_on do
+          if content_for_scanner =~ /paid-till:\s+(.*)\n/
+            Time.parse($1)
+          end
+        end
+
+
+        property_supported :registrar do
+          if content_for_scanner =~ /registrar:\s+(.*)\n/
+            Record::Registrar.new(:id => $1)
+          end
+        end
+
+
+        property_supported :admin_contacts do
+          content_for_scanner.scan(/e-mail:\s+(.+)\n/).flatten.map do |email|
+            Record::Contact.new(
+              :type         => Record::Contact::TYPE_ADMIN,
+              :name         => content_for_scanner[/person:\s+(.+)\n/, 1],
+              :organization => content_for_scanner[/org:\s+(.+)\n/, 1],
+              :phone        => content_for_scanner[/phone:\s+(.+)\n/, 1],
+              :fax          => content_for_scanner[/fax-no:\s+(.+)\n/, 1],
+              :email        => email
+            )
+          end
+        end
+
+        property_not_supported :registrant_contacts
+
+        property_not_supported :technical_contacts
+
+
+        # Nameservers are listed in the following formats:
+        #
+        #   nserver:     ns.masterhost.ru.
+        #   nserver:     ns.masterhost.ru. 217.16.20.30
+        #
+        property_supported :nameservers do
+          content_for_scanner.scan(/nserver:\s+(.+)\n/).flatten.map do |line|
+            name, ipv4 = line.split(/\s+/)
+            Record::Nameserver.new(name.chomp("."), ipv4)
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/whois/record/parser/whois.tld.ee.rb

@@ -8,7 +8,7 @@
 
 
 require 'whois/record/parser/base'
-require 'whois/record/parser/scanners/base'
+require 'whois/record/parser/scanners/whois.tld.ee.rb'
 
 
 module Whois
@@ -27,7 +27,7 @@ module Whois
       # and examples.
       #
       class WhoisTldEe < Base
-        include Features::Ast
+        include Scanners::Ast
 
         property_supported :status do
           if content_for_scanner =~ /status:\s+(.+)\n/
@@ -106,13 +106,13 @@ module Whois
         end
 
 
-        # Initializes a new {Scanner} instance
-        # passing the {Whois::Record::Parser::Base#content_for_scanner}
+        # Initializes a new {Scanners::WhoisTldEe} instance
+        # passing the {#content_for_scanner}
         # and calls +parse+ on it.
         #
         # @return [Hash]
         def parse
-          Scanner.new(content_for_scanner).parse
+          Scanners::WhoisTldEe.new(content_for_scanner).parse
         end
 
 
@@ -130,27 +130,6 @@ module Whois
             end
           end
 
-
-          class Scanner < Scanners::Base
-
-            def parse_content
-              if @input.scan(/contact:\s+(.*)\n/)
-                section = @input[1].strip
-                content = {}
-
-                while @input.scan(/(.*?):\s+(.*?)\n/)
-                  content[@input[1]] = @input[2]
-                end
-
-                @ast[section] = content
-              # FIXME: incomplete scanner, it skips all the properties
-              else
-                @input.scan(/(.*)\n/)
-              end
-            end
-
-          end
-
       end
     end
   end

data/lib/whois/record/parser/whois.tonic.to.rb

@@ -87,14 +87,6 @@ module Whois
           content_for_scanner.strip == ""
         end
 
-
-        protected
-
-          def incomplete_response?
-            Whois.deprecate "#{self.class}#response_incomplete? will be removed in Whois 2.1. Please use #{self.class}#response_incomplete?."
-            response_incomplete?
-          end
-
       end
 
     end

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

@@ -154,13 +154,27 @@ module Whois
 
           # @api public
           def query_the_socket(query, host, port = nil)
-            ask_the_socket(
-              query,
-              host,
-              port || options[:port] || DEFAULT_WHOIS_PORT,
-              options[:bind_host] || DEFAULT_BIND_HOST,
-              options[:bind_port]
-            )
+            args = []
+            args.push(host)
+            args.push(port || options[:port] || DEFAULT_WHOIS_PORT)
+
+            # This is a hack to prevent +TCPSocket.new+ to crash
+            # when resolv-replace.rb file is required.
+            #
+            # +TCPSocket.new+ defaults +local_host+ and +local_port+ to nil
+            # but when you require resolv-replace.rb, +local_host+
+            # is resolved when you pass any local parameter and in case of nil
+            # it raises the following error
+            #
+            #   ArgumentError: cannot interpret as DNS name: nil
+            #
+            if options[:bind_host] || options[:bind_port]
+              args.push(options[:bind_host] || DEFAULT_BIND_HOST)
+              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}"
           end
@@ -171,9 +185,8 @@ module Whois
           # This is for internal use only!
           #
           # @api internal
-          def ask_the_socket(query, host, port, local_host, local_port)
-            args   = [host, port, local_host, local_port].compact
-            client = TCPSocket.open(host, port, local_host, local_port)
+          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.