whois 3.4.0 → 3.4.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 42ce09ac779c94795254e665e5d126542509c5d7
+  data.tar.gz: 1253b6280f08a7d1f00c47e9c59ed4968422b37c
+SHA512:
+  metadata.gz: 803338a05e1146ce3359093df7ff322cfde58e48c87855c82eae2bbf2c839a28c55faffa2c3028ef7e8d45e6b0240a238ecfac99f684ea58661c7cc7c47f4e5e
+  data.tar.gz: 18e02ea776d7a6bfbce15224b039e7815a95ee593d7ef6443716423c355e7999a5c4deb382f3a6cf27bc1235233be5afbc985da84311d43c94ecd2febbe7abc7

data/CHANGELOG.md

@@ -1,6 +1,29 @@
 # Changelog
 
 
+## Release 3.4.1
+
+- SERVER: Updated .XN--NGBC5AZD IDN TLD definition.
+
+- NEW: whois.whois.kenic.or.ke parser now recognizes invalid status.
+
+- NEW: Added whois.tucows.com parser (GH-260). [Thanks @takama]
+
+- NEW: Added whois.wildwestdomains.com parser (GH-271). [Thanks @gromnsk]
+
+- NEW: Added whois.pairnic.com parser (GH-275). [Thanks @gromnsk]
+
+- NEW: Added whois.1und1.info parser (GH-278). [Thanks @gromnsk]
+
+- FIXED: whois.dk-hostmaster.dk crashes when the status is `reserved` (GH-281). [Thanks @Pietr]
+
+- CHANGED: Updated whois.nic.hu parser to the new response format.
+
+- CHANGED: Updated whois.networksolutions.com parser to the new response format (GH-280). [Thanks @takama]
+
+- CHANGED: Updated whois.gandi.net parser to the new response format.
+
+
 ## Release 3.4.0
 
 - SERVER: Added .XN--MGBX4CD0AB (.ایران, Iran) IDN TLD definition.

data/README.md

@@ -15,7 +15,7 @@ An extensive test suite is available to verify the library correctness but you m
 
 [Support Whois at Pledgie](http://www.pledgie.com/campaigns/11383).
 
-<a href='http://www.pledgie.com/campaigns/11383'><img alt='Click here to lend your support to: whois and make a donation at www.pledgie.com !' src='http://www.pledgie.com/campaigns/11383.png?skin_name=chrome' border='0' /></a>
+<a href='https://pledgie.com/campaigns/11383'><img alt='Click here to lend your support to: whois and make a donation at pledgie.com !' src='https://pledgie.com/campaigns/11383.png?skin_name=chrome' border='0' ></a>
 
 *Whois* is free software, but it costs money to write, test, and distribute it. You can support the development by sending a donation. **Any amount, even $5, is greatly appreciated**.
 

data/data/tld.json

@@ -1154,6 +1154,9 @@
   ".ws": {
     "host": "whois.samoanic.ws"
   },
+  ".xxx": {
+    "host": "whois.nic.xxx"
+  },
   ".ye": {
     "host": null,
     "adapter": "none"
@@ -1185,9 +1188,6 @@
     "host": null,
     "adapter": "none"
   },
-  ".xxx": {
-    "host": "whois.nic.xxx"
-  },
   ".xn--3e0b707e": {
     "host": "whois.kr"
   },
@@ -1276,7 +1276,7 @@
     "host": "whois.domainregistry.my"
   },
   ".xn--ngbc5azd": {
-    "host": "whois.xn--ngbc5azd.aridnrs.net.au"
+    "host": "whois.nic.xn--ngbc5azd"
   },
   ".xn--o3cw4h": {
     "host": "whois.thnic.co.th"

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

@@ -22,7 +22,6 @@ module Whois
       # @author Simone Carletti
       # @author Igor Dolzhikov <bluesriverz@gmail.com>
       #
-
       class BaseIcannCompliant < Base
         include Scanners::Scannable
 
@@ -39,15 +38,11 @@ module Whois
 
 
         property_supported :status do
-          status = Array.wrap(node('Domain Status'))
-          if status.empty?
-            if available?
-              :available
-            else
-              :registered
-            end
+          # status = Array.wrap(node('Domain Status'))
+          if available?
+            :available
           else
-            status
+            :registered
           end
         end
 
@@ -124,17 +119,20 @@ module Whois
                 zip:          value_for_property(element, 'Postal Code'),
                 state:        value_for_property(element, 'State/Province'),
                 country_code: value_for_property(element, 'Country'),
-                phone:        [ value_for_property(element, 'Phone'),
-                                  value_for_property(element, 'Phone Ext')
-                              ].reject(&:empty?).join(' ext: '),
-                fax:          [ value_for_property(element, 'Fax'),
-                                  value_for_property(element, 'Fax Ext')
-                              ].reject(&:empty?).join(' ext: '),
+                phone:        value_for_phone_property(element, 'Phone'),
+                fax:          value_for_phone_property(element, 'Fax'),
                 email:        value_for_property(element, 'Email')
             )
           end
         end
 
+        def value_for_phone_property(element, property)
+          [
+            value_for_property(element, "#{property}"),
+            value_for_property(element, "#{property} Ext")
+          ].reject(&:empty?).join(' ext: ')
+        end
+
         def value_for_property(element, property)
           Array.wrap(node("#{element} #{property}")).reject(&:empty?).join(', ')
         end

data/lib/whois/record/parser/whois.1und1.info.rb

@@ -0,0 +1,30 @@
+#--
+# Ruby Whois
+#
+# An intelligent pure Ruby WHOIS client and parser.
+#
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
+#++
+
+
+require 'whois/record/parser/base_icann_compliant'
+
+
+module Whois
+  class Record
+    class Parser
+
+      # Parser for the whois.1und1.info server.
+      #
+      # @see Whois::Record::Parser::Example
+      #   The Example parser for the list of all available methods.
+      #
+      class Whois1und1Info < BaseIcannCompliant
+        self.scanner = Scanners::BaseIcannCompliant, {
+            pattern_available: /^Domain (.+) is not registered here.\n/
+        }
+      end
+
+    end
+  end
+end

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

@@ -20,9 +20,6 @@ module Whois
       # @see Whois::Record::Parser::Example
       #   The Example parser for the list of all available methods.
       #
-      # @author Simone Carletti
-      # @author Igor Dolzhikov <bluesriverz@gmail.com>
-      #
       class WhoisAscioCom < Base
         include Scanners::Scannable
 

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

@@ -18,6 +18,7 @@ module Whois
       #
       # @see Whois::Record::Parser::Example
       #   The Example parser for the list of all available methods.
+      #
       class WhoisComlaudeCom < Base
 
         property_not_supported :status

data/lib/whois/record/parser/whois.dk-hostmaster.dk.rb

@@ -35,6 +35,8 @@ module Whois
                 :registered
               when "deactivated"
                 :expired
+              when "reserved"
+                :reserved
               else
                 Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end

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

@@ -15,6 +15,10 @@ module Whois
     class Parser
 
       # Parser for the whois.enom.com server.
+      #
+      # @see Whois::Record::Parser::Example
+      #   The Example parser for the list of all available methods.
+      #
       class WhoisEnomCom < BaseIcannCompliant
         self.scanner = Scanners::BaseIcannCompliant, {
             pattern_available: /^Domain not found\.\n/

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

@@ -7,8 +7,7 @@
 #++
 
 
-require 'yaml'
-require 'whois/record/parser/base'
+require 'whois/record/parser/base_icann_compliant'
 
 
 module Whois
@@ -20,128 +19,14 @@ module Whois
       # @see Whois::Record::Parser::Example
       #   The Example parser for the list of all available methods.
       #
-      # @author Simone Carletti
-      # @author Igor Dolzhikov <bluesriverz@gmail.com>
-      #
-      class WhoisGandiNet < Base
-        include Scanners::Scannable
-
-
-        property_not_supported :disclaimer
-
-
-        property_supported :domain do
-          node("domain")
-        end
-
-        property_not_supported :domain_id
-
-
-        property_supported :status do
-          if available?
-            :available
-          else
-            :registered
-          end
-        end
+      class WhoisGandiNet < BaseIcannCompliant
 
         property_supported :available? do
-          !!node("status:available")
-        end
-
-        property_supported :registered? do
-          !available?
-        end
-
-
-        property_supported :created_on do
-          node("created")
-        end
-
-        property_supported :updated_on do
-          node("changed")
-        end
-
-        property_supported :expires_on do
-          node("expires")
-        end
-
-
-        property_supported :registrar do
-          Record::Registrar.new(
-              name:         "GANDI Registrar",
-              organization: "GANDI Registrar",
-          )
-        end
-
-
-        property_supported :registrant_contacts do
-          build_contact("owner-c", Whois::Record::Contact::TYPE_REGISTRANT)
-        end
-
-        property_supported :admin_contacts do
-          build_contact("admin-c", Whois::Record::Contact::TYPE_ADMINISTRATIVE)
-        end
-
-        property_supported :technical_contacts do
-          build_contact("tech-c", Whois::Record::Contact::TYPE_TECHNICAL)
-        end
-
-
-        property_supported :nameservers do
-          content_for_scanner.scan(/^ns\d{1}:\s(.*)/).flatten.map do |line|
-            name, ipv4 = line.strip.split(" ")
-            Record::Nameserver.new(name: name.downcase, ipv4: ipv4)
-          end
-        end
-
-
-        private
-
-        def parse
-          patched = content_for_scanner.dup
-          patched.gsub!(/(zipcode|phone|fax): (.+)/, %Q{\\1: "\\2"})
-
-          result = YAML.load(patched)
-          unless result
-            result = {}
-            result["status:available"] = true
-          end
-          result
-        end
-
-        def build_contact(element, type)
-          # nic-hdl: NG270-GANDI
-          # organisation: GANDI SAS
-          # person: NOC GANDI
-          # address: 63-65 Boulevard MASSENA
-          # zipcode: 75013
-          # city: Paris
-          # country: France
-          # phone: +33.143737851
-          # fax: +33.143731851
-          # email: 12e7da77f638acdf8d9f4d0b828ca80c-248842@contact.gandi.net
-          # lastupdated: 2013-04-04 15:53:42
-
-          node(element) do |section|
-            Record::Contact.new(
-                type:         type,
-                id:           section["nic-hdl"],
-                name:         section["person"],
-                organization: section["organisation"],
-                address:      section["address"],
-                zip:          section["zipcode"],
-                city:         section["city"],
-                country:      section["country"],
-                phone:        section["phone"],
-                fax:          section["fax"],
-                email:        section["email"],
-                updated_on:   section["lastupdated"],
-            )
-          end
+          content_for_scanner == "\n"
         end
 
       end
+
     end
   end
 end

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

@@ -19,9 +19,6 @@ module Whois
       # @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>
-      #
       class WhoisGodaddyCom < Base
 
         property_not_supported :status

data/lib/whois/record/parser/whois.kenic.or.ke.rb

@@ -14,28 +14,28 @@ module Whois
   class Record
     class Parser
 
-      #
-      # = whois.kenic.or.ke parser
-      #
       # Parser for the whois.kenic.or.ke 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.
+      # @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 WhoisKenicOrKe < Base
 
         property_supported :status do
           if content_for_scanner =~ /Status:\s+(.+?)\n/
             case $1.downcase
-              when "active"
-                :registered
-              when "not registered"
-                :available
-              else
-                Whois.bug!(ParserError, "Unknown status `#{$1}'.")
+            when "active"
+              :registered
+            when "not registered"
+              :available
+            when "this whois server does not have any records for that zone."
+              :invalid
+            else
+              Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end
           else
             Whois.bug!(ParserError, "Unable to parse status.")
@@ -43,11 +43,11 @@ module Whois
         end
 
         property_supported :available? do
-          status == :available
+          !invalid? && status == :available
         end
 
         property_supported :registered? do
-          !available?
+          !invalid? && !available?
         end
 
 
@@ -78,6 +78,14 @@ module Whois
           end
         end
 
+
+        # NEWPROPERTY
+        def invalid?
+          cached_properties_fetch(:invalid?) do
+            status == :invalid
+          end
+        end
+
       end
 
     end

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

@@ -18,6 +18,7 @@ module Whois
       #
       # @see Whois::Record::Parser::Example
       #   The Example parser for the list of all available methods.
+      #
       class WhoisMarkmonitorCom < Base
 
         property_not_supported :status

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

@@ -7,7 +7,7 @@
 #++
 
 
-require 'whois/record/parser/base'
+require 'whois/record/parser/base_icann_compliant'
 
 
 module Whois
@@ -19,136 +19,22 @@ module Whois
       # @see Whois::Record::Parser::Example
       #   The Example parser for the list of all available methods.
       #
-      # @author Andrew Brampton <me@bramp.net>
-      #
-      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
+      class WhoisNetworksolutionsCom < BaseIcannCompliant
+        self.scanner = Scanners::BaseIcannCompliant, {
+            pattern_available: /^No match for "[\w\.]+"\.\n/
+        }
 
-
-        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_ADMINISTRATIVE)
-        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
-
-        def response_throttled?
-          !!(content_for_scanner =~ /The IP address from which you have visited/)
-        end
-
-      private
+        private
 
         def build_contact(element, type)
-          match = content_for_scanner.slice(/#{element}.*\n((.+\n){4,7})/, 1)
-          return unless match
-
-          # 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
-          # 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+$/
-            # p lines.shift
-            # The record has a extra name and number line
-            name, email = lines.shift.scan(/^(.+)\s(\S+@\S+)$/).first
-            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
-            phone = phone.strip
-            fax   = fax.strip
-          elsif lines[-1].to_s.gsub(/[^\d]+/, '').length > 9
-            phone = lines.pop
+          if (contact = super) && !contact.state.present?
+            contact.state = value_for_property(element, 'State')
           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
-          )
+          contact
         end
+
       end
+
     end
   end
 end