whois 2.2.0 → 2.3.0

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

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -14,8 +14,9 @@ module Whois
   class Record
     class Parser
 
-      # Parser for the <tt>whois.centralnic.net</tt> server.
-      # Aliases the <tt>whois.centralnic.com</tt> parser.
+      # Parser for the whois.centralnic.net server.
+      #
+      # It aliases the whois.centralnic.com parser.
       class WhoisCentralnicNet < WhoisCentralnicCom
       end
 

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

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
 #++
 
 

data/lib/whois/record/parser/whois.cnnic.cn.rb

@@ -3,23 +3,19 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
 #++
 
 
 require 'whois/record/parser/base'
-require 'whois/record/parser/scanners/cnnic'
+require 'whois/record/parser/scanners/whois.cnnic.cn.rb'
 
 
 module Whois
   class Record
     class Parser
 
-      #
-      # = whois.cnnic.cn parser
-      #
       # Parser for the whois.cnnic.cn server.
-      #
       class WhoisCnnicCn < Base
         include Scanners::Ast
 
@@ -80,11 +76,11 @@ module Whois
         end
 
         property_supported :registrant_contacts do
-          contact("Registrant", Whois::Record::Contact::TYPE_REGISTRANT)
+          build_contact("Registrant", Whois::Record::Contact::TYPE_REGISTRANT)
         end
 
         property_supported :admin_contacts do
-          contact("Administrative", Whois::Record::Contact::TYPE_ADMIN)
+          build_contact("Administrative", Whois::Record::Contact::TYPE_ADMIN)
         end
 
         property_not_supported :technical_contacts
@@ -97,31 +93,31 @@ module Whois
         end
 
 
-        # Initializes a new {Scanners::Cnnic} instance
+        # Initializes a new {Scanners::WhoisCnnicCn} instance
         # passing the {#content_for_scanner}
         # and calls +parse+ on it.
         #
         # @return [Hash]
         def parse
-          Scanners::Cnnic.new(content_for_scanner).parse
+          Scanners::WhoisCnnicCn.new(content_for_scanner).parse
         end
 
 
-        private
+      private
 
-          def contact(element, type)
-            n = node("#{element} Name")
-            o = node("#{element} Organization")
-            e = node("#{element} Email")
-            return if n.nil? && o.nil? && e.nil?
+        def build_contact(element, type)
+          n = node("#{element} Name")
+          o = node("#{element} Organization")
+          e = node("#{element} Email")
+          return if n.nil? && o.nil? && e.nil?
 
-            Record::Contact.new(
-              :type         => type,
-              :name         => n,
-              :organization => o,
-              :email        => e
-            )
-          end
+          Record::Contact.new(
+            :type         => type,
+            :name         => n,
+            :organization => o,
+            :email        => e
+          )
+        end
 
       end
     end

data/lib/whois/record/parser/whois.cnnic.net.cn.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
 #++
 
 

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

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
 #++
 
 

data/lib/whois/record/parser/whois.co.pl.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
 #++
 
 

data/lib/whois/record/parser/whois.co.ug.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
 #++
 
 

data/lib/whois/record/parser/whois.coza.net.za.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
 #++
 
 

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

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -15,11 +15,7 @@ module Whois
   class Record
     class Parser
 
-      #
-      # = whois.crsnic.net parser
-      #
       # Parser for the whois.crsnic.net server.
-      #
       class WhoisCrsnicNet < Base
         include Scanners::Ast
 
@@ -87,6 +83,14 @@ module Whois
         end
 
 
+        # Checks whether this response contains a message
+        # that can be reconducted to a "WHOIS Server Unavailable" status.
+        #
+        # @return [Boolean]
+        def response_unavailable?
+          !!node("response:unavailable")
+        end
+
         # Initializes a new {Scanners::Verisign} instance
         # passing the {#content_for_scanner}
         # and calls +parse+ on it.
@@ -97,13 +101,13 @@ module Whois
         end
 
 
-        protected
+      private
 
-          # In case of "SPAM Response", the response contains more than one item
-          # for the same value and the value becomes an Array.
-          def last_useful_item(values)
-            values.is_a?(Array) ? values.last : values
-          end
+        # In case of "SPAM Response", the response contains more than one item
+        # for the same value and the value becomes an Array.
+        def last_useful_item(values)
+          values.is_a?(Array) ? values.last : values
+        end
 
       end
 

data/lib/whois/record/parser/whois.denic.de.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -15,9 +15,6 @@ module Whois
   class Record
     class Parser
 
-      #
-      # = whois.denic.de parser
-      #
       # Parser for the whois.denic.de server.
       #
       # @author Simone Carletti <weppos@weppos.net>
@@ -93,17 +90,17 @@ module Whois
         end
 
         property_supported :registrant_contacts do
-          contact("Holder", Whois::Record::Contact::TYPE_REGISTRANT)
+          build_contact("Holder", Whois::Record::Contact::TYPE_REGISTRANT)
         end
 
         property_supported :admin_contacts do
-          contact("Admin-C", Whois::Record::Contact::TYPE_ADMIN)
+          build_contact("Admin-C", Whois::Record::Contact::TYPE_ADMIN)
         end
 
         # FIXME: check against different schema
 
         property_supported :technical_contacts do
-          contact("Tech-C", Whois::Record::Contact::TYPE_TECHNICAL)
+          build_contact("Tech-C", Whois::Record::Contact::TYPE_TECHNICAL)
         end
 
 
@@ -161,15 +158,15 @@ module Whois
         end
 
 
-        protected
+      private
 
-          def contact(element, type)
-            node(element) do |raw|
-              Record::Contact.new(raw) do |c|
-                c.type = type
-              end
+        def build_contact(element, type)
+          node(element) do |raw|
+            Record::Contact.new(raw) do |c|
+              c.type = type
             end
           end
+        end
 
       end
     end

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

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
 #++
 
 

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

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -31,6 +31,11 @@ module Whois
           if content_for_scanner =~ /Status:\s+(.+?)\n/
             case $1.downcase
               when "registered" then :registered
+              when "quarantine" then :redemption
+              #when "blocked"    then :registered
+              when "out of service" then :redemption
+              #when "withdrawn"  then :registered
+              #when "reserved"   then :registered
               when "free"       then :available
               else
                 Whois.bug!(ParserError, "Unknown status `#{$1}'.")
@@ -77,7 +82,7 @@ module Whois
         #
         # @return [Boolean]
         def response_throttled?
-          !!(content_for_scanner =~ /^% Excessive querying/)
+          !!(content_for_scanner =~ /^% (Excessive querying|Maximum queries per hour reached)/)
         end
 
       end

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

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
 #++
 
 

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

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
 #++
 
 

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

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
 #++
 
 

data/lib/whois/record/parser/whois.domain-registry.nl.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -27,13 +27,25 @@ module Whois
       #
       class WhoisDomainRegistryNl < Base
 
+        # == Values for Status
+        #
+        # - free: the .nl domain name is still available for registration
+        # - withdrawn: the .nl domain name is barred from registration
+        # - excluded: the .nl domain name is excluded from registration
+        # - requested: an application for the .nl domain name is being processed
+        # - active: the .nl domain name has already been registered. (If you want to know who has registered the name, tick the ‘Extended search’ box. You will then be shown more information about whoever has registered the name.)
+        # - inactive: the .nl domain name has already been registered, but has not yet been added to the .nl zone file. (If you want to know who has registered the name, tick the ‘Extended search’ box. You will then be shown more information about whoever has registered the name.)
+        # - in quarantine: this .nl domain name's registration has been cancelled. Following cancellation, a domain name is placed in quarantine for forty days.
+        #
+        # @see https://www.sidn.nl/en/whois/
+        #
         property_supported :status do
           if content_for_scanner =~ /Status:\s+(.*?)\n/
             case $1.downcase
-              when "active"         then :registered
-              when "in quarantine"  then :quarantine
-              else
-                Whois.bug!(ParserError, "Unknown status `#{$1}'.")
+            when "active"         then :registered
+            when "in quarantine"  then :redemption
+            else
+              Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end
           else
             :available
@@ -41,22 +53,22 @@ module Whois
         end
 
         property_supported :available? do
-          (status == :available)
+          status == :available
         end
 
         property_supported :registered? do
-          [:registered, :quarantine].include?(status)
+          [:registered, :redemption].include?(status)
         end
 
 
         property_supported :created_on do
-          if content_for_scanner =~ /Date registered:\s+(.*)\n/
+          if content_for_scanner =~ /Date registered:\s+(.+)\n/
             Time.parse($1)
           end
         end
 
         property_supported :updated_on do
-          if content_for_scanner =~ /Record last updated:\s+(.*)\n/
+          if content_for_scanner =~ /Record last updated:\s+(.+)\n/
             Time.parse($1)
           end
         end
@@ -103,7 +115,6 @@ module Whois
           !!(content_for_scanner =~ /Server too busy, try again later/)
         end
 
-
       end
 
     end

data/lib/whois/record/parser/whois.domain.kg.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
 #++
 
 

data/lib/whois/record/parser/whois.domainregistry.ie.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
 #++
 
 

data/lib/whois/record/parser/whois.domainregistry.my.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
 #++