whois 2.6.1 → 2.6.2

data/CHANGELOG.md

@@ -1,6 +1,17 @@
 # Changelog
 
 
+## Release 2.6.2
+
+* SERVER: Added .SX TLD server (GH-170).
+
+* NEW: Added full whois.networksolutions.com parser (GH-168). [Thanks @bramp]
+
+* NEW: Added full whois.sx parser (GH-170).
+
+* NEW: whois.ua parser is now a full parser (GH-169). [Thanks @Uko]
+
+
 ## Release 2.6.1
 
 * Reverted partial commit about .SX definitions included in v2.6.0 by mistake.

data/lib/whois/definitions/tlds.rb

@@ -273,6 +273,7 @@ Whois::Server.define :tld, ".sr", nil, { :adapter => Whois::Server::Adapters::No
 Whois::Server.define :tld, ".st", "whois.nic.st"
 Whois::Server.define :tld, ".su", "whois.tcinet.ru"
 Whois::Server.define :tld, ".sv", nil, { :adapter => Whois::Server::Adapters::Web, :web => "http://www.uca.edu.sv/dns/" }
+Whois::Server.define :tld, ".sx", "whois.sx"
 Whois::Server.define :tld, ".sy", nil, { :adapter => Whois::Server::Adapters::None }
 Whois::Server.define :tld, ".sz", nil, { :adapter => Whois::Server::Adapters::None }
 Whois::Server.define :tld, ".tc", "whois.adamsnames.tc"

data/lib/whois/record/parser/whois.ati.tn.rb

@@ -20,7 +20,7 @@ module Whois
       # @see Whois::Record::Parser::Example
       #   The Example parser for the list of all available methods.
       #
-      # @since RELEASE
+      # @since 2.6.0
       class WhoisAtiTn < Base
         include Scanners::Ast
 

data/lib/whois/record/parser/whois.godaddy.com.rb

@@ -15,10 +15,6 @@ module Whois
     class Parser
 
       # Parser for the whois.godaddy.com 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.

data/lib/whois/record/parser/whois.markmonitor.com.rb

@@ -16,10 +16,6 @@ module Whois
 
       # Parser for the whois.markmonitor.com 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.
       class WhoisMarkmonitorCom < Base

data/lib/whois/record/parser/whois.networksolutions.com.rb

@@ -0,0 +1,146 @@
+#--
+# Ruby Whois
+#
+# An intelligent pure Ruby WHOIS client and parser.
+#
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+#++
+
+
+require 'whois/record/parser/base'
+
+
+module Whois
+  class Record
+    class Parser
+
+      # Parser for the whois.networksolutions.com server.
+      #
+      # @see Whois::Record::Parser::Example
+      #   The Example parser for the list of all available methods.
+      #
+      # @author Andrew Brampton <me@bramp.net>
+      # @since RELEASE
+      class WhoisNetworksolutionsCom < Base
+
+        property_not_supported :status
+
+        # The server is contacted only in case of a registered domain.
+        property_supported :available? do
+          false
+        end
+
+        property_supported :registered? do
+          !available?
+        end
+
+
+        property_supported :created_on do
+          if content_for_scanner =~ /Record created on (.+)\.\n/
+            Time.parse($1)
+          end
+        end
+
+        property_not_supported :updated_on
+
+        property_supported :expires_on do
+          if content_for_scanner =~ /Record expires on (.+)\.\n/
+            Time.parse($1)
+          end
+        end
+
+
+        property_supported :registrar do
+          Record::Registrar.new(
+              :name         => 'Network Solutions',
+              :organization => 'Network Solutions, LLC',
+              :url          => 'http://www.networksolutions.com/'
+          )
+        end
+
+        property_supported :registrant_contacts do
+          build_contact('Registrant:', Record::Contact::TYPE_REGISTRANT)
+        end
+
+        property_supported :admin_contacts do
+          build_contact('Administrative Contact', Record::Contact::TYPE_ADMIN)
+        end
+
+        property_supported :technical_contacts do
+          build_contact('Technical Contact', Record::Contact::TYPE_TECHNICAL)
+        end
+
+
+        property_supported :nameservers do
+         if content_for_scanner =~ /Domain servers in listed order:\n\n((?:[^\n]+\n)+)/
+            $1.split("\n").map do |line|
+              #   NS01.XIF.COM                 63.240.200.70
+              name, ipv4 = line.strip.split(" ")
+              Record::Nameserver.new(:name => name.downcase, :ipv4 => ipv4)
+            end
+          end
+        end
+
+
+      private
+
+        def build_contact(element, type)
+          match = content_for_scanner.slice(/#{element}.*\n((.+\n){4,7})/, 1)
+          return unless match
+
+          lines = match.split("\n").map(&:strip)
+
+          # 0 XIF Communications                    |  mpowers LLC
+          # 1  1200 New Hampshire Avenue NW         |  21010 Southbank St #575
+          # 2  Suite 410                            |  Potomac Falls, VA 20165
+          # 3  Washington, DC 20036                 |  US
+          # 4  US
+
+          # 0 Communications, XIF ContactMiddleName   noc@xif.com   | mpowers LLC   michael@mpowers.net
+          # 1 XIF Communications                                    | 21010 Southbank St #575
+          # 2 1200 New Hampshire Avenue NW                          | Potomac Falls, VA 20165
+          # 3 Suite 410                                             | US
+          # 4 Washington, DC 20036                                  | +1.5712832829
+          # 5 US
+          # 6 202-463-7200 fax: 202-318-4003
+
+          # Does the first line end in something that looks like a email address?
+          if lines[0].to_s =~ /\S+@\S+$/
+            # The record has a extra name and number line
+            name, email = lines.shift.scan(/^(.+)\s(\S+@\S+)$/).first
+            name = name.strip
+          end
+
+          # Does the last line contains the word fax, or has >9 digits
+          if lines[-1].to_s =~ / fax: /
+            phone, fax  = lines.pop.to_s.scan(/^(.+) fax: (.+)$/).first
+            phone = phone.strip
+            fax   = fax.strip
+          elsif lines[-1].to_s.gsub(/[^\d]+/, '').length > 9
+            phone = lines.pop
+          end
+
+          country_code = lines.pop
+          city, state, zip = lines.pop.scan(/^(.+), ([A-Z]{2}) ([\sA-Z0-9\-]+)$/).first
+          organization = lines.shift if lines.length >= 2
+
+          address = lines.join("\n")
+
+          Record::Contact.new(
+            :type => type,
+            :name => name,
+            :organization => organization,
+            :address => address,
+            :city => city,
+            :state => state,
+            :zip => zip,
+            :country_code => country_code,
+            :email => email,
+            :phone => phone,
+            :fax => fax
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -20,7 +20,7 @@ module Whois
       # @see Whois::Record::Parser::Example
       #   The Example parser for the list of all available methods.
       #
-      # @since RELEASE
+      # @since 2.6.0
       class WhoisRegistryOm < Base
         include Scanners::Ast
 

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

@@ -0,0 +1,124 @@
+#--
+# Ruby Whois
+#
+# An intelligent pure Ruby WHOIS client and parser.
+#
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+#++
+
+
+require 'whois/record/parser/base'
+require 'whois/record/scanners/whois.sx.rb'
+
+
+module Whois
+  class Record
+    class Parser
+
+      # Parser for the whois.sx server.
+      # 
+      # @see Whois::Record::Parser::Example
+      #   The Example parser for the list of all available methods.
+      #
+      # @since RELEASE
+      class WhoisSx < Base
+        include Scanners::Ast
+
+        property_not_supported :disclaimer
+
+
+        property_supported :domain do
+          "#{node('Domain')}.sx"
+        end
+
+        property_not_supported :domain_id
+
+
+        property_not_supported :referral_whois
+
+        property_not_supported :referral_url
+
+
+        property_supported :status do
+          case (s = node('Status'))
+          when /free/
+            :available
+          when 'active'
+            :registered
+          else
+            Whois.bug!(ParserError, "Unknown status `#{s}'.")
+          end
+        end
+
+        property_supported :available? do
+          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') do |hash|
+            Record::Registrar.new(
+                :name         => hash['Name'],
+                :url          => hash['Website']
+            )
+          end
+        end
+
+
+        property_supported :registrant_contacts do
+          build_contact('Registrant', Whois::Record::Contact::TYPE_REGISTRANT)
+        end
+
+        property_not_supported :admin_contacts
+
+        property_not_supported :technical_contacts
+
+
+        property_supported :nameservers do
+          node('Name servers') do |names|
+            names.map do |name|
+              Record::Nameserver.new(:name => name)
+            end
+          end
+        end
+
+
+        # Initializes a new {Scanners::WhoisSx} instance
+        # passing the {#content_for_scanner}
+        # and calls +parse+ on it.
+        #
+        # @return [Hash]
+        def parse
+          Scanners::WhoisSx.new(content_for_scanner).parse
+        end
+
+
+        private
+
+        def build_contact(element, type)
+          node("#{element}") do |array|
+            Record::Contact.new(
+                :type         => type,
+                :id           => nil,
+                :name         => array[0],
+                :email        => nil
+            )
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/whois/record/parser/whois.ua.rb

@@ -16,20 +16,30 @@ module Whois
 
       # Parser for the whois.ua 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.
-      #
       # @since 2.4.0
       class WhoisUa < Base
 
+        property_supported :domain do
+          if content_for_scanner =~ /domain:\s+(.+)\n/
+            $1
+          end
+        end
+
+        property_not_supported :domain_id
+
+  
+        property_not_supported :referral_whois
+
+        property_not_supported :referral_url
+
+
         property_supported :status do
           if content_for_scanner =~ /status:\s+(.+?)\n/
-            case s = $1.downcase
-              when /^ok-until/
-                :registered
-              else
-                Whois.bug!(ParserError, "Unknown status `#{s}'.")
+            case (s = $1.downcase)
+            when /^ok-until/
+              :registered
+            else
+              Whois.bug!(ParserError, "Unknown status `#{s}'.")
             end
           else
             :available
@@ -45,7 +55,12 @@ module Whois
         end
 
 
-        property_not_supported :created_on
+        property_supported :created_on do
+          if content_for_scanner =~ /created:\s+(.+)\n/
+            time = $1.split(" ").last
+            Time.parse(time)
+          end
+        end
 
         property_supported :updated_on do
           if content_for_scanner =~ /changed:\s+(.+)\n/
@@ -62,12 +77,57 @@ module Whois
         end
 
 
+        property_not_supported :registrar
+
+        property_not_supported :registrant_contacts
+
+        property_supported :admin_contacts do
+          build_contact("Administrative", Whois::Record::Contact::TYPE_ADMIN)
+        end
+
+        property_supported :technical_contacts do
+          build_contact("Technical", Whois::Record::Contact::TYPE_TECHNICAL)
+        end
+
+
         property_supported :nameservers do
           content_for_scanner.scan(/nserver:\s+(.+)\n/).flatten.map do |name|
             Record::Nameserver.new(:name => name.strip.downcase)
           end
         end
 
+
+      private
+
+        def build_contact(element, type)
+          record = []
+          content_for_scanner.scan(/%\s#{element}\sContact:\n %\s=+\n ((?: .+\n)+) (?: \n|\z)/ix).flatten.each do |match|
+            address = match.scan(/address:\s+(.+)\n/).flatten
+            zip = nil
+            zip = address[1].slice!(/\s+\d{5}/).strip if address[1] =~ /\s+\d{5}/
+            zip = address[1].slice!(/\d{5}\s+/).strip if address[1] =~ /\d{5}\s+/
+            state = nil
+            state = address[1].slice!(/\s+[A-Z]{2}\z/).strip if address[1] =~ /\s+[A-Z]{2}\z/
+            
+            record.push Record::Contact.new(
+              :type         => type,
+              :id           => match[/org-id:\s+(.+)\n/,1],
+              :name         => nil,
+              :organization => match.scan(/organization:\s+(.+)\n/).join("\n"),
+              :address      => address[0],
+              :zip          => zip,
+              :state        => state,
+              :city         => address[1],
+              :country      => address[2],
+              :phone        => match[/phone:\s+(.+)\n/,1],
+              :fax          => match[/fax-no:\s+(.+)\n/,1],
+              :email        => match[/e-mail:\s+(.+)\n/,1],
+              :updated_on   => (Time.parse($1.split(" ").last) if match =~ /changed:\s+(.+)\n/)
+            )
+          end
+          record
+        end
+
       end
 
     end