whois 2.6.3 → 2.6.4

data/lib/whois/record/contact.rb

@@ -35,12 +35,13 @@ module Whois
     # @attr [String] phone
     # @attr [String] fax
     # @attr [String] email
+    # @attr [String] url - e. g. to the contact form
     # @attr [Time] created_on
     # @attr [Time] updated_on
     #
     class Contact < SuperStruct.new(:id, :type, :name, :organization,
                                     :address, :city, :zip, :state, :country, :country_code,
-                                    :phone, :fax, :email,
+                                    :phone, :fax, :email, :url,
                                     :created_on, :updated_on)
 
       TYPE_REGISTRANT = 1

data/lib/whois/record/parser/NOTES.txt

@@ -77,9 +77,6 @@ whois.nic.wf (CNAME whois.nic.fr)
 whois.nic.tf (CNAME whois.nic.fr)
 whois.nic.yt (CNAME whois.nic.fr)
 
-whois.nic.cz
-whois.tld.ee
-whois.tznic.or.tz
 whois.pandi.or.id
 whois.nic.ir
 ripe.net

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

@@ -0,0 +1,150 @@
+#--
+# 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/whoisd.rb'
+
+
+module Whois
+  class Record
+    class Parser
+
+      # Base parser for Whoisd servers.
+      #
+      # @abstract
+      #
+      # @since  RELEASE
+      class BaseWhoisd < Base
+        include Scanners::Ast
+
+        class_attribute :status_mapping
+        self.status_mapping = {
+          'paid and in zone' => :registered,
+          'expired' => :expired,
+        }
+
+
+        property_supported :domain do
+          node('domain')
+        end
+
+        property_not_supported :domain_id
+
+
+        property_supported :status do
+          node('status') do |string|
+            string = string.first if string.is_a?(Array)
+            self.class.status_mapping[string.downcase] ||
+            Whois.bug!(ParserError, "Unknown status `#{string}'.")
+          end || :available
+        end
+
+        property_supported :available? do
+          !!node('status:available')
+        end
+
+        property_supported :registered? do
+          !available?
+        end
+
+
+        property_supported :created_on do
+          node('registered') { |string| Time.parse(string) }
+        end
+
+        property_supported :updated_on do
+          node('changed') { |string| Time.parse(string) }
+        end
+
+        property_supported :expires_on do
+          node('expire') { |string| Time.parse(string) }
+        end
+
+
+        property_supported :registrar do
+          node('registrar') do |string|
+            Whois::Record::Registrar.new(
+                :id           => string,
+                :name         => string
+            )
+          end
+        end
+
+        property_supported :registrant_contacts do
+          node('registrant') do |value|
+            build_contact(value, Record::Contact::TYPE_REGISTRANT)
+          end
+        end
+
+        property_supported :admin_contacts do
+          node('admin-c') do |value|
+            build_contact(value, Record::Contact::TYPE_ADMIN)
+          end
+        end
+
+        property_supported :technical_contacts do
+          id = node(node('nsset'))['tech-c'] rescue nil
+          if id
+            build_contact(id, Record::Contact::TYPE_TECHNICAL)
+          end
+        end
+
+
+        property_supported :nameservers do
+          lines = node(node('nsset'))['nserver'] rescue nil
+          Array.wrap(lines).map do |line|
+            if line =~ /(.+) \((.+)\)/
+              name = $1
+              ipv4, ipv6 = $2.split(', ')
+              Record::Nameserver.new(:name => name, :ipv4 => ipv4, :ipv6 => ipv6)
+            else
+              Record::Nameserver.new(:name => line.strip)
+            end
+          end
+        end
+
+
+        # Initializes a new {Scanners::Whoisd} instance
+        # passing the {#content_for_scanner}
+        # and calls +parse+ on it.
+        #
+        # @return [Hash]
+        def parse
+          Scanners::Whoisd.new(content_for_scanner).parse
+        end
+
+
+      private
+
+        def build_contact(element, type)
+          node(element) do |hash|
+            address = hash['street'] || hash['address']
+            address = address.join("\n") if address.respond_to?(:join)
+
+            Record::Contact.new(
+                :type           => type,
+                :id             => element,
+                :name           => hash['name'],
+                :organization   => hash['org'],
+                :address        => address,
+                :city           => hash['city'],
+                :zip            => hash['postal code'],
+                :country_code   => hash['country'],
+                :phone          => hash['phone'],
+                :email          => hash['e-mail'],
+                :created_on     => Time.parse(hash['created'])
+            )
+          end
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -88,7 +88,9 @@ module Whois
           match = content_for_scanner.slice(/#{element}.*\n((.+\n){4,7})/, 1)
           return unless match
 
-          lines = match.split("\n").map(&:strip)
+          # Split lines but don't strip them now because in some cases
+          # we need the entire line, including extra-spaces.
+          lines = match.split("\n")
 
           # 0 XIF Communications                    |  mpowers LLC
           # 1  1200 New Hampshire Avenue NW         |  21010 Southbank St #575
@@ -106,11 +108,14 @@ module Whois
 
           # Does the first line end in something that looks like a email address?
           if lines[0].to_s =~ /\S+@\S+$/
+            # p lines.shift
             # The record has a extra name and number line
             name, email = lines.shift.scan(/^(.+)\s(\S+@\S+)$/).first
-            name = name.strip
+            name = name.strip if name
           end
 
+          lines.each(&:strip!)
+
           # 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

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

@@ -7,82 +7,20 @@
 #++
 
 
-require 'whois/record/parser/base'
+require 'whois/record/parser/base_whoisd'
 
 
 module Whois
   class Record
     class Parser
 
-      #
-      # = whois.nic.cz parser
-      #
       # Parser for the whois.nic.cz server.
+      # 
+      # @see Whois::Record::Parser::Example
+      #   The Example parser for the list of all available methods.
       #
-      # 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 WhoisNicCz < Base
-
-        property_supported :status do
-          if content_for_scanner =~ /status:\s+(.+)\n/
-            case $1.downcase
-            when "paid and in zone", "update prohibited"
-              :registered
-            # NEWSTATUS
-            when "expired"
-              :expired
-            else
-              Whois.bug!(ParserError, "Unknown status `#{$1}'.")
-            end
-          else
-            :available
-          end
-        end
-
-        property_supported :available? do
-          !!(content_for_scanner =~ /^%ERROR:101: no entries found/)
-        end
-
-        property_supported :registered? do
-          !available?
-        end
-
-
-        property_supported :created_on do
-          if content_for_scanner =~ /registered:\s+(.+?)\n/
-            Time.parse($1)
-          end
-        end
-
-        property_supported :updated_on do
-          if content_for_scanner =~ /changed:\s+(.+?)\n/
-            Time.parse($1)
-          end
-        end
-
-        property_supported :expires_on do
-          if content_for_scanner =~ /expire:\s+(.+?)\n/
-            Time.parse($1)
-          end
-        end
-
-
-        property_supported :nameservers do
-          content_for_scanner.scan(/nserver:\s+(.+)\n/).flatten.map do |line|
-            if line =~ /(.+) \((.+)\)/
-              name = $1
-              ipv4, ipv6 = $2.split(", ")
-              Record::Nameserver.new(:name => name, :ipv4 => ipv4, :ipv6 => ipv6)
-            else
-              Record::Nameserver.new(:name => line.strip)
-            end
-          end
-        end
-
+      class WhoisNicCz < BaseWhoisd
+        self.status_mapping.merge!('update prohibited' => :registered)
       end
 
     end

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

@@ -0,0 +1,46 @@
+#--
+# Ruby Whois
+#
+# An intelligent pure Ruby WHOIS client and parser.
+#
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+#++
+
+
+require 'whois/record/parser/base_whoisd'
+
+
+module Whois
+  class Record
+    class Parser
+
+      # Parser for the whois.nic.fo server.
+      # 
+      # @see Whois::Record::Parser::Example
+      #   The Example parser for the list of all available methods.
+      #
+      # @since  RELEASE
+      class WhoisNicFo < BaseWhoisd
+
+        property_not_supported :registrar
+
+        # whois.nic.fo is using an old whoisd version.
+        property_supported :technical_contacts do
+          node('tech-c') do |value|
+            build_contact(value, Record::Contact::TYPE_TECHNICAL)
+          end
+        end
+
+
+        # whois.nic.fo is using an old whoisd version.
+        property_supported :nameservers do
+          Array.wrap(node('nserver')).map do |line|
+            Record::Nameserver.new(:name => line.strip)
+          end
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -16,6 +16,22 @@ module Whois
 
       # Parser for the whois.nic.gs server.
       class WhoisNicGs < BaseCocca
+
+        property_supported :status do
+          if content_for_scanner =~ /Status:\s+(.+?)\n/
+            case s = $1.downcase
+            when "active"         then :registered
+            when "delegated"      then :registered
+            when "not registered" then :available
+            when /pending delete/ then :redemption
+            else
+              Whois.bug!(ParserError, "Unknown status `#{s}'.")
+            end
+          else
+            Whois.bug!(ParserError, "Unable to parse status.")
+          end
+        end
+
       end
 
     end

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

@@ -0,0 +1,43 @@
+#--
+# Ruby Whois
+#
+# An intelligent pure Ruby WHOIS client and parser.
+#
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+#++
+
+
+require 'whois/record/parser/base_afilias'
+
+
+module Whois
+  class Record
+    class Parser
+
+      # Parser for the whois.pir.org server.
+      class WhoisPirOrg < BaseAfilias
+
+        # Checks whether the response has been throttled.
+        #
+        # @return [Boolean]
+        #
+        # @example
+        #   WHOIS LIMIT EXCEEDED - SEE WWW.PIR.ORG/WHOIS FOR DETAILS
+        #
+        def response_throttled?
+          !!node("response:throttled")
+        end
+
+      private
+
+        def decompose_registrar(value)
+          if value =~ /(.+?) \((.+?)\)/
+            [$2, $1]
+          end
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -7,37 +7,17 @@
 #++
 
 
-require 'whois/record/parser/base_afilias'
+require 'whois/record/parser/whois.pir.org.rb'
 
 
 module Whois
   class Record
     class Parser
 
-      # Parser for the whois.publicinternetregistry.net server.
-      class WhoisPublicinterestregistryNet < BaseAfilias
-
-        # Checks whether the response has been throttled.
-        #
-        # @return [Boolean]
-        #
-        # @example
-        #   WHOIS LIMIT EXCEEDED - SEE WWW.PIR.ORG/WHOIS FOR DETAILS
-        #
-        def response_throttled?
-          !!node("response:throttled")
-        end
-
-        private
-
-          def decompose_registrar(value)
-            if value =~ /(.+?) \((.+?)\)/
-              [$2, $1]
-            end
-          end
-
-      end
+      # Parser for the <tt>whois.publicinterestregistry.net</tt> server.
+      # Aliases the <tt>whois.pir.org</tt> parser.
+      WhoisPublicinterestregistryNet = WhoisPirOrg
 
     end
   end
-end
+end