whois 2.0.4 → 2.0.5

data/CHANGELOG.rdoc

@@ -1,12 +1,47 @@
 = Changelog
 
 
+== Release 2.0.5
+
+* SERVER: Updated .BI TLD definition.
+
+* SERVER: Added .XXX TLD definition.
+
+* SERVER: Updated .SM TLD definition (#97).
+
+* NEW: Ability to detect whois.dns.be throttled responses.
+
+* NEW: Added base whois.nic.sm parser (#97).
+
+* FIXED: whois.meregistry.net parser raises `no time information in ""' when updated_at property is blank.
+
+* FIXED: whois.nic.it parser must support `NO-PROVIDER' status.
+
+* FIXED: whois.nic.it parser must support `pendingDelete / pendingDelete' status.
+
+* FIXED: whois.nic.asia parser must support `CLIENT' status.
+
+* FIXED: whois.nic.cz parser must support `Update prohibited' status.
+
+* FIXED: The Verisign WHOIS adapter crashes in some rare circumstances 
+  when the response from the Verisign database doesn't contain a
+  referral (#103)
+
+* FIXED: whois.eu parser changed the format of the nameserver property (#99).
+
+* FIXED: whois.nic.uk parser should return `:invalid' status when the domain is invalid.
+
+* FIXED: whois.cira.ca parser must support `unavailable' status (#102).
+
+* FIXED: whois.sk-nic.sk parser must support `DOM_EXP', `DOM_LNOT', `DOM_WARN' statuses.
+
+
 == Release 2.0.4
 
 * SERVER: Added the following new IDN TLDs:
     * .XN--90A3AC (.СРБ, Serbia) (#94)
 
-* FIXED: whois.nic.it parser must support pendinUpdate and pendingTransfer statuses.
+* FIXED: whois.nic.it parser must support pendingUpdate and pendingTransfer statuses.
 
 * FIXED: whois.nic-se.se crashes in some cases where the modified: attribute is an invalid date.
 

data/Rakefile

@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'rspec/core/rake_task'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 require 'yard'
 require 'yard/rake/yardoc_task'
 
@@ -50,14 +50,15 @@ spec = Gem::Specification.new do |s|
   # s.add_dependency("some_other_gem", "~> 0.1.0")
 
   # If your tests use any gems, include them here
-  s.add_development_dependency("rspec", "~> 2.5.0")
-  s.add_development_dependency("mocha")
-  s.add_development_dependency("yard")
+  s.add_development_dependency "rake",  "~> 0.9"
+  s.add_development_dependency "rspec", "~> 2.6.0"
+  s.add_development_dependency "mocha"
+  s.add_development_dependency "yard"
 end
 
 # This task actually builds the gem.
 # We also regenerate a static .gemspec file.
-Rake::GemPackageTask.new(spec) do |pkg|
+Gem::PackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
 

data/lib/whois/definitions/tlds.rb

@@ -72,7 +72,7 @@ Whois::Server.define :tld, ".be", "whois.dns.be"
 Whois::Server.define :tld, ".bf", nil, { :adapter => Whois::Server::Adapters::None }
 Whois::Server.define :tld, ".bg", "whois.register.bg"
 Whois::Server.define :tld, ".bh", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".bi", nil, { :web => "http://whois.nic.bi/register/whois.hei", :adapter => Whois::Server::Adapters::Web }
+Whois::Server.define :tld, ".bi", nil, { :web => "https://whois.nic.bi/whois.php", :adapter => Whois::Server::Adapters::Web }
 Whois::Server.define :tld, ".bj", "whois.nic.bj"
 Whois::Server.define :tld, ".bm", nil, { :web => "http://207.228.133.14/cgi-bin/lansaweb?procfun+BMWHO+BMWHO2+WHO", :adapter => Whois::Server::Adapters::Web }
 Whois::Server.define :tld, ".bn", nil, { :adapter => Whois::Server::Adapters::None }
@@ -252,7 +252,7 @@ Whois::Server.define :tld, ".si", "whois.arnes.si"
 Whois::Server.define :tld, ".sj", nil, { :adapter => Whois::Server::Adapters::None }
 Whois::Server.define :tld, ".sk", "whois.sk-nic.sk"
 Whois::Server.define :tld, ".sl", "whois.nic.sl"
-Whois::Server.define :tld, ".sm", "whois.ripe.net"
+Whois::Server.define :tld, ".sm", "whois.nic.sm"
 Whois::Server.define :tld, ".sn", "whois.nic.sn"
 Whois::Server.define :tld, ".so", "whois.nic.so"
 Whois::Server.define :tld, ".sr", nil, { :adapter => Whois::Server::Adapters::None }
@@ -315,6 +315,7 @@ Whois::Server.define :tld, ".org.za", "whois.org.za"
 Whois::Server.define :tld, ".za", nil, { :adapter => Whois::Server::Adapters::None }
 Whois::Server.define :tld, ".zm", nil, { :adapter => Whois::Server::Adapters::None }
 Whois::Server.define :tld, ".zw", nil, { :adapter => Whois::Server::Adapters::None }
+Whois::Server.define :tld, ".xxx", "whois.nic.xxx"
 Whois::Server.define :tld, ".xn--3e0b707e", "whois.kr"
 Whois::Server.define :tld, ".xn--45brj9c", nil, { :adapter => Whois::Server::Adapters::None }
 Whois::Server.define :tld, ".xn--90a3ac", nil, { :adapter => Whois::Server::Adapters::None }

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

@@ -26,6 +26,7 @@ whois.dotmobyregistry.net
 whois.afilias.info
 whois.afilias-grs.info
 whois.aero
+whois.nic.xxx
 
 whois.nic.af
 whois.nic.mu

data/lib/whois/record/parser/whois.audns.net.au.rb

@@ -45,7 +45,7 @@ module Whois
         property_not_supported :created_on
 
         property_supported :updated_on do
-          if content_for_scanner =~ /Last Modified:\s+(.*)\n/
+          if content_for_scanner =~ /Last Modified:\s+(.+)\n/
             Time.parse($1)
           end
         end

data/lib/whois/record/parser/whois.cira.ca.rb

@@ -36,6 +36,7 @@ module Whois
               when "auto-renew grace" then :registered
               when "to be released"   then :registered
               when "available"        then :available
+              when "unavailable"      then :invalid
               # schema-1
               when "exist"      then :registered
               when "avail"      then :available
@@ -96,11 +97,11 @@ module Whois
 
         # Nameservers are listed in the following formats:
         #
-        #       ns1.google.com
-        #       ns2.google.com
+        #   ns1.google.com
+        #   ns2.google.com
         #
-        #       ns1.google.com                 216.239.32.10
-        #       ns2.google.com                 216.239.34.10
+        #   ns1.google.com  216.239.32.10
+        #   ns2.google.com  216.239.34.10
         #
         property_supported :nameservers do
           if content_for_scanner =~ /Name servers:\n((?:\s+([^\s]+)\s+([^\s]+)\n)+)/
@@ -114,6 +115,9 @@ module Whois
 
         # Attempts to detect and returns the
         # schema version.
+        #
+        # TODO: This is very empiric.
+        #       Use the available status in combination with the creation date label.
         def schema
           @schema ||= if content_for_scanner =~ /^% \(c\) (.+?) Canadian Internet Registration Authority/
             case $1
@@ -124,6 +128,21 @@ module Whois
           @schema || Whois.bug!(ParserError, "Unable to detect schema version.")
         end
 
+        # NEWPROPERTY
+        def valid?
+          cached_properties_fetch(:valid?) do
+            !invalid?
+          end
+        end
+
+        # NEWPROPERTY
+        def invalid?
+          cached_properties_fetch(:invalid?) do
+            status == :invalid
+          end
+        end
+
+
       end
 
     end

data/lib/whois/record/parser/whois.dns.be.rb

@@ -72,6 +72,14 @@ module Whois
           end
         end
 
+
+        # Checks whether the response has been throttled.
+        #
+        # @return [Boolean]
+        def response_throttled?
+          !!(content_for_scanner =~ /^% Excessive querying/)
+        end
+
       end
 
     end

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

@@ -53,16 +53,16 @@ module Whois
 
         # Nameservers are listed in the following formats:
         #
-        #   Nameservers:
+        #   Name servers:
         #           dns1.servicemagic.eu
         #           dns2.servicemagic.eu
         #
-        #   Nameservers:
+        #   Name servers:
         #           dns1.servicemagic.eu (91.121.133.61)
         #           dns2.servicemagic.eu (91.121.103.77)
         #
         property_supported :nameservers do
-          if content_for_scanner =~ /Nameservers:\s((.+\n)+)\n/
+          if content_for_scanner =~ /Name\sservers:\s((.+\n)+)\n/
             $1.split("\n").map do |line|
               if line.strip =~ /(.+) \((.+)\)/
                 Record::Nameserver.new($1, $2)

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

@@ -41,19 +41,19 @@ module Whois
 
 
         property_supported :created_on do
-          if content_for_scanner =~ /Domain Create Date:(.*)\n/
+          if content_for_scanner =~ /Domain Create Date:(.+)\n/
             Time.parse($1)
           end
         end
 
         property_supported :updated_on do
-          if content_for_scanner =~ /Domain Last Updated Date:(.*)\n/
+          if content_for_scanner =~ /Domain Last Updated Date:(.+)\n/
             Time.parse($1)
           end
         end
 
         property_supported :expires_on do
-          if content_for_scanner =~ /Domain Expiration Date:(.*)\n/
+          if content_for_scanner =~ /Domain Expiration Date:(.+)\n/
             Time.parse($1)
           end
         end

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

@@ -30,7 +30,8 @@ module Whois
         property_supported :status do
           if content_for_scanner =~ /Domain Status:(.+?)\n/
             case $1.downcase
-              when "ok" then :registered
+              when /^ok/, /\bclient/
+                :registered
               else
                 Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end

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

@@ -30,9 +30,11 @@ module Whois
         property_supported :status do
           if content_for_scanner =~ /status:\s+(.+)\n/
             case $1.downcase
-              when "paid and in zone" then :registered
+              when "paid and in zone", "update prohibited"
+                :registered
               # NEWSTATUS
-              when "expired" then :expired
+              when "expired"
+                :expired
               else
                 Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end

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

@@ -45,10 +45,12 @@ module Whois
           case node("Status").to_s.downcase
           when /^ok/, "active", /\bclient/
             :registered
-          when "grace-period", "pendingupdate", "pendingtransfer"
-            :registered
-          when "pendingdelete / redemptionperiod"
+          when "grace-period", "pendingupdate", "pendingtransfer", "no-provider"
             :registered
+          when "pendingdelete / redemptionperiod", /redemption\-/,
+          # The domain will be deleted in 5 days
+               "pendingdelete / pendingdelete"
+            :redemption
           when "unassignable"
             :reserved
           when "available"
@@ -61,11 +63,11 @@ module Whois
         end
 
         property_supported :available? do
-          node("Status") == "AVAILABLE"
+          status == :available
         end
 
         property_supported :registered? do
-          node("Status") != "UNASSIGNABLE" &&
+          status != :reserved &&
           !available?
         end
 

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

@@ -0,0 +1,78 @@
+#--
+# 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
+
+      #
+      # = whois.nic.sm parser
+      #
+      # Parser for the whois.nic.sm 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 WhoisNicSm < Base
+
+        property_supported :status do
+          if content_for_scanner =~ /Status:\s+(.+?)\n/
+            case $1.downcase
+              when "active"         then :registered
+              else
+                Whois.bug!(ParserError, "Unknown status `#{$1}'.")
+            end
+          else
+            :available
+          end
+        end
+
+        property_supported :available? do
+          (content_for_scanner.strip == "No entries found.")
+        end
+
+        property_supported :registered? do
+          !available?
+        end
+
+
+        property_supported :created_on do
+          if content_for_scanner =~ /Registration date: (.+)\n/
+            Time.utc(*$1.split('/').reverse)
+          end
+        end
+
+        property_supported :updated_on do
+          if content_for_scanner =~ /Last Update: (.+)\n/
+            Time.utc(*$1.split('/').reverse)
+          end
+        end
+
+        property_not_supported :expires_on
+
+
+        property_supported :nameservers do
+          if content_for_scanner =~ /DNS Servers:\n((.*\n)+)(?:\n|\z)/
+            $1.split("\n").map do |name|
+              Record::Nameserver.new(name.strip)
+            end
+          end
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -42,6 +42,8 @@ module Whois
               else
                 Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end
+          elsif invalid?
+            :invalid
           else
             :available
           end

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

@@ -0,0 +1,147 @@
+#--
+# 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/afilias'
+
+
+module Whois
+  class Record
+    class Parser
+
+      #
+      # = whois.nic.xxx parser
+      #
+      # Parser for the whois.nic.xxx server.
+      #
+      class WhoisNicXxx < Base
+        include Features::Ast
+
+
+        property_supported :disclaimer do
+          node("property-disclaimer")
+        end
+
+
+        property_supported :domain do
+          node("Domain Name", &:downcase)
+        end
+
+        property_supported :domain_id do
+          node("Domain ID")
+        end
+
+
+        property_not_supported :referral_whois
+
+        property_not_supported :referral_url
+
+
+        property_supported :status do
+          node("Status") || []
+        end
+
+        property_supported :available? do
+          !!node("status-available")
+        end
+
+        property_supported :registered? do
+          !available?
+        end
+
+
+        property_supported :created_on do
+          node("Created On") do |value|
+            Time.parse(value)
+          end
+        end
+
+        property_supported :updated_on do
+          node("Last Updated On") do |value|
+            Time.parse(value)
+          end
+        end
+
+        property_supported :expires_on do
+          node("Expiration Date") do |value|
+            Time.parse(value)
+          end
+        end
+
+
+        property_supported :registrar do
+          node("Sponsoring Registrar") do |value|
+            value =~ /(.+?) \((.+?)\)/ || Whois.bug!("Unknown registrar format `#{value}'")
+            Record::Registrar.new(
+              :id =>            $2,
+              :name =>          $1,
+              :organization =>  $1
+            )
+          end
+        end
+
+        property_supported :registrant_contacts do
+          contact("Registrant", Whois::Record::Contact::TYPE_REGISTRANT)
+        end
+
+        property_supported :admin_contacts do
+          contact("Admin", Whois::Record::Contact::TYPE_ADMIN)
+        end
+
+        property_supported :technical_contacts do
+          contact("Tech", Whois::Record::Contact::TYPE_TECHNICAL)
+        end
+
+
+
+        property_supported :nameservers do
+          Array.wrap(node("Name Server")).reject(&:empty?).map do |name|
+            Nameserver.new(name.downcase)
+          end
+        end
+
+
+        # Initializes a new {Scanner} instance
+        # passing the {Whois::Record::Parser::Base#content_for_scanner}
+        # and calls +parse+ on it.
+        #
+        # @return [Hash]
+        def parse
+          Scanners::Afilias.new(content_for_scanner).parse
+        end
+
+
+        private
+
+          def contact(element, type)
+            node("#{element} ID") do
+              address = (1..3).map { |i| node("#{element} Street#{i}") }.delete_if(&:empty?).join(" ")
+
+              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"),
+                :phone        => node("#{element} Phone"),
+                :fax          => node("#{element} FAX"),
+                :email        => node("#{element} Email")
+              )
+            end
+          end
+
+      end
+
+    end
+  end
+end