whois 2.0.7 → 2.1.0

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

@@ -7,64 +7,15 @@
 #++
 
 
-require 'whois/record/parser/base'
+require 'whois/record/parser/base_afilias'
 
 
 module Whois
   class Record
     class Parser
 
-      #
-      # = whois.dotmobiregistry.net parser
-      #
       # Parser for the whois.dotmobiregistry.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 WhoisDotmobiregistryNet < Base
-
-        property_supported :status do
-          content_for_scanner.scan(/Status:(.*?)\n/).flatten
-        end
-
-        property_supported :available? do
-          !!(content_for_scanner =~ /Not found:/)
-        end
-
-        property_supported :registered? do
-          !available?
-        end
-
-
-        property_supported :created_on do
-          if content_for_scanner =~ /Created On:(.*?)\n/
-            Time.parse($1)
-          end
-        end
-
-        property_supported :updated_on do
-          if content_for_scanner =~ /Last Updated On:(.*?)\n/
-            Time.parse($1)
-          end
-        end
-
-        property_supported :expires_on do
-          if content_for_scanner =~ /Expiration Date:(.*?)\n/
-            Time.parse($1)
-          end
-        end
-
-
-        property_supported :nameservers do
-          content_for_scanner.scan(/Name Server:([^\s]+)\n/).flatten.map do |name|
-            Record::Nameserver.new(name.downcase)
-          end
-        end
-
+      class WhoisDotmobiregistryNet < BaseAfilias
       end
 
     end

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

@@ -0,0 +1,138 @@
+#--
+# 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.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.
+      #
+      # @author Simone Carletti
+      # @author Tom Nicholls <tom.nicholls@oii.ox.ac.uk>
+      # @since  2.1.0
+      class WhoisGodaddyCom < Base
+
+        property_not_supported :status
+
+        # The server seems to provide only linesrmation for registered domains
+        property_supported :available? do
+          false
+        end
+
+        property_supported :registered? do
+          !available?
+        end
+
+
+        property_supported :created_on do
+          if content_for_scanner =~ /Created on: (.+)\n/
+            Time.parse($1)
+          end
+        end
+
+        property_supported :updated_on do
+          if content_for_scanner =~ /Last Updated on: (.+)\n/
+            Time.parse($1)
+          end
+        end
+
+        property_supported :expires_on do
+          if content_for_scanner =~ /Expires on: (.+)\n/
+            Time.parse($1)
+          end
+        end
+
+
+        property_supported :registrar do
+          Record::Registrar.new(
+            :name => content_for_scanner[/Registered through: (.+) \(/, 1],
+            :url  => content_for_scanner[/Registered through: .*\((.+)\)\n/, 1]
+          )
+        end
+
+        property_supported :registrant_contacts do
+          contact('Registrant:', Record::Contact::TYPE_REGISTRANT)
+        end
+
+        property_supported :admin_contacts do
+          contact('Administrative Contact:', Record::Contact::TYPE_ADMIN)
+        end
+
+        property_supported :technical_contacts do
+          contact('Technical Contact:', Record::Contact::TYPE_TECHNICAL)
+        end
+
+
+        property_supported :nameservers do
+          if content_for_scanner =~ /Domain servers in listed order:\n((.+\n)+)\n/
+            $1.split("\n").map do |line|
+              Record::Nameserver.new(line.strip)
+            end
+          end
+        end
+
+
+        private
+
+
+          def contact(element, type)
+            match = content_for_scanner.slice(/#{element}\n((.+\n)+)\n/, 1)
+            return unless match
+
+            lines = $1.split("\n").map(&:strip)
+
+            # Lines 1 and 5 may be absent, depending on the record.
+            # The parser attempts to correct for this, but may be a bit flaky
+            # on non-standard data.
+            #
+            # 0 GoDaddy.com, Inc., GoDaddy.com, Inc.  dns@jomax.net
+            # 1 GoDaddy.com, Inc.
+            # 2 14455 N Hayden Rd Suite 219
+            # 3 Scottsdale, Arizona 85260
+            # 4 United States
+            # 5 +1.4805058800      Fax -- +1.4805058844
+            phone = nil
+            fax   = nil
+            if lines[-1].to_s =~ /Fax --/
+               phone, fax = lines.delete_at(-1).to_s.scan(/^(.*) Fax --(.*)$/).first
+               phone = phone.strip
+               fax   = fax.strip
+            end
+
+            Record::Contact.new(
+              :type         => type,
+              :id           => nil,
+              :name         => lines[0].to_s.gsub(/\s\S+@[^\.].*\.[a-z]{2,}\s?\)?$/, "").strip,
+              :organization => lines.length >= 5 ? lines[-4] : "",
+              :address      => lines.length >= 4 ? lines[-3] : "",
+              :city         => lines.length >= 4 ? lines[-2].to_s.partition(",")[0] : "",
+              :zip          => lines.length >= 4 ? lines[-2].to_s.rpartition(" ")[2] : "",
+              :state        => lines.length >= 4 ? lines[-2].to_s.partition(",")[2].rpartition(" ")[0].to_s.strip : "",
+              :country      => lines.length >= 4 ? lines[-1] : "",
+              :phone        => phone,
+              :fax          => fax,
+              :email        => lines[0].to_s.scan(/[^\s]\S+@[^\.].*\.[a-z]{2,}[^\s\)\n]/).first
+            )
+          end
+
+      end
+
+    end
+  end
+end

data/lib/whois/record/parser/whois.iana.org.rb

@@ -21,7 +21,7 @@ module Whois
       # Parser for the whois.iana.org server.
       #
       class WhoisIanaOrg < Base
-        include Features::Ast
+        include Scanners::Ast
 
         property_supported :status do
           if available?
@@ -76,7 +76,7 @@ module Whois
 
 
         # Initializes a new {Scanners::Iana} instance
-        # passing the {Whois::Record::Parser::Base#content_for_scanner}
+        # passing the {#content_for_scanner}
         # and calls +parse+ on it.
         #
         # @return [Hash]

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

@@ -29,8 +29,7 @@ module Whois
 
         property_not_supported :status
 
-
-        # The server seems to provide only information for registered domains
+        # The server seems to provide only linesrmation for registered domains
         property_supported :available? do
           false
         end
@@ -66,7 +65,6 @@ module Whois
           )
         end
 
-
         property_supported :registrant_contacts do
           contact('Registrant:', Record::Contact::TYPE_REGISTRANT)
         end
@@ -81,8 +79,10 @@ module Whois
 
 
         property_supported :nameservers do
-          content_for_scanner.slice(/Domain servers in listed order:\n\n((?:\s*[^\s\n]+\n)+)/, 1).split("\n").map do |line|
-            Record::Nameserver.new(line.strip)
+         if content_for_scanner =~ /Domain servers in listed order:\n\n((?:\s*[^\s\n]+\n)+)/
+            $1.split("\n").map do |line|
+              Record::Nameserver.new(line.strip)
+            end
           end
         end
 
@@ -93,24 +93,25 @@ module Whois
             match = content_for_scanner.slice(/#{element}\n((.+\n){6})/, 1)
             return unless match
 
-            info  = match.split("\n").map(&:strip)
+            lines = match.split("\n").map(&:strip)
+
             # 0 DNS Admin
             # 1 Google Inc.
             # 2 1600 Amphitheatre Parkway
             # 3 Mountain View CA 94043
             # 4 US
             # 5 dns-admin@google.com +1.6506234000 Fax: +1.6506188571
-            city, state, zip = info[3].scan(/^(.+) ([A-Z]{2}) ([0-9]+)$/).first
-            email, phone, fax = info[5].scan(/^(.+) (.+) Fax: (.+)$/).first
+            city, state, zip = lines[3].scan(/^(.+) ([A-Z]{2}) ([0-9]+)$/).first
+            email, phone, fax = lines[5].scan(/^(.+) (.+) Fax: (.+)$/).first
             Record::Contact.new(
               :type => type,
-              :name => info[0],
-              :organization => info[1],
-              :address => info[2],
+              :name => lines[0],
+              :organization => lines[1],
+              :address => lines[2],
               :city => city,
               :state => state,
               :zip => zip,
-              :country_code => info[4],
+              :country_code => lines[4],
               :email => email,
               :phone => phone,
               :fax => fax

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

@@ -7,64 +7,79 @@
 #++
 
 
-require 'whois/record/parser/base'
+require 'whois/record/parser/base_afilias'
 
 
 module Whois
   class Record
     class Parser
 
-      #
-      # = whois.meregistry.net parser
-      #
-      # Parser for the whois.meregistry.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 WhoisMeregistryNet < Base
+      # Parser for the whois.dotmobiregistry.net server.
+      class WhoisMeregistryNet < BaseAfilias
 
         property_supported :status do
-          content_for_scanner.scan(/Domain Status:(.*?)\n/).flatten
-        end
-
-        property_supported :available? do
-          (content_for_scanner.strip == "NOT FOUND")
-        end
-
-        property_supported :registered? do
-          !available?
+          Array.wrap(node("Domain Status"))
         end
 
 
         property_supported :created_on do
-          if content_for_scanner =~ /Domain Create Date:(.+)\n/
-            Time.parse($1)
+          node("Domain Create Date") do |value|
+            Time.parse(value)
           end
         end
 
         property_supported :updated_on do
-          if content_for_scanner =~ /Domain Last Updated Date:(.+)\n/
-            Time.parse($1)
+          node("Domain Last Updated Date") do |value|
+            Time.parse(value) unless value.empty?
           end
         end
 
         property_supported :expires_on do
-          if content_for_scanner =~ /Domain Expiration Date:(.+)\n/
-            Time.parse($1)
+          node("Domain Expiration Date") do |value|
+            Time.parse(value)
           end
         end
 
 
         property_supported :nameservers do
-          content_for_scanner.scan(/Nameservers:([^\s]+)\n/).flatten.map do |name|
-            Record::Nameserver.new(name.downcase)
+          Array.wrap(node("Nameservers")).reject(&:empty?).map do |name|
+            Nameserver.new(name.downcase)
           end
         end
 
+
+        private
+
+          def contact(element, type)
+            node("#{element} ID") do
+              address = ["", "2", "3"].
+                  map { |i| node("#{element} Address#{i}") }.
+                  delete_if(&:empty?).
+                  join("\n")
+
+              Record::Contact.new(
+                :type         => type,
+                :id           => node("#{element} ID"),
+                :name         => node("#{element} Name"),
+                :organization => node("#{element} Organization"),
+                :address      => address,
+                :city         => node("#{element} City"),
+                :zip          => node("#{element} Postal Code"),
+                :state        => node("#{element} State/Province"),
+                :country_code => node("#{element} Country/Economy"),
+                :phone        => node("#{element} Phone"),
+                :fax          => node("#{element} FAX"),
+                :email        => node("#{element} E-mail")
+              )
+            end
+          end
+
+          def decompose_registrar(value)
+            if value =~ /^(.+?) ([^\s]+)$/
+              [$2, $1]
+            end
+          end
+
       end
 
     end

data/lib/whois/record/parser/whois.nic.af.rb

@@ -30,8 +30,12 @@ module Whois
         property_supported :status do
           if content_for_scanner =~ /Status:\s+(.+?)\n/
             case $1.downcase
-              when "active"         then :registered
-              when "not registered" then :available
+              when "active"
+                :registered
+              when "delegated"
+                :registered
+              when "not registered"
+                :available
               else
                 Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end

data/lib/whois/record/parser/whois.nic.ag.rb

@@ -7,64 +7,15 @@
 #++
 
 
-require 'whois/record/parser/base'
+require 'whois/record/parser/base_afilias'
 
 
 module Whois
   class Record
     class Parser
 
-      #
-      # = whois.nic.ag parser
-      #
       # Parser for the whois.nic.ag 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 WhoisNicAg < Base
-
-        property_supported :status do
-          content_for_scanner.scan(/Status:(.+?)\n+/).flatten
-        end
-
-        property_supported :available? do
-          (content_for_scanner.strip == "NOT FOUND")
-        end
-
-        property_supported :registered? do
-          !available?
-        end
-
-
-        property_supported :created_on do
-          if content_for_scanner =~ /Created On:(.*?)\n/
-            Time.parse($1)
-          end
-        end
-
-        property_supported :updated_on do
-          if content_for_scanner =~ /Last Updated On:(.*?)\n/
-            Time.parse($1)
-          end
-        end
-
-        property_supported :expires_on do
-          if content_for_scanner =~ /Expiration Date:(.*?)\n/
-            Time.parse($1)
-          end
-        end
-
-
-        property_supported :nameservers do
-          content_for_scanner.scan(/Name Server:([^\s]+)\n/).flatten.map do |name|
-            Record::Nameserver.new(name.downcase)
-          end
-        end
-
+      class WhoisNicAg < BaseAfilias
       end
 
     end