whois 2.2.0 → 2.3.0

data/lib/whois/record/parser/whois.nic.ch.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.nic.ci.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.nic.ck.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.nic.cl.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.nic.co.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.nic.coop.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.nic.cx.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.nic.cz.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.nic.dz.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.nic.ec.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.nic.fr.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,9 +14,6 @@ module Whois
   class Record
     class Parser
 
-      #
-      # = whois.nic.fr parser
-      #
       # Parser for the whois.nic.fr server.
       #
       # NOTE: This parser is just a stub and provides only a few basic methods
@@ -30,14 +27,20 @@ module Whois
         property_supported :status do
           if content_for_scanner =~ /status:\s+(.+)\n/
             case $1.downcase
-              when "active"     then :registered
-              when "registered" then :registered
-              when "redemption" then :redemption
-              when "blocked"    then :inactive
-              # NEWSTATUS (reserved)
-              when "frozen"     then :frozen
-              else
-                Whois.bug!(ParserError, "Unknown status `#{$1}'.")
+            when "active"     then :registered
+            when "registered" then :registered
+            when "redemption" then :redemption
+            when "blocked"    then :inactive
+            # The 'frozen' status seems to be a status
+            # where a registered domain is placed to prevent changes
+            # and/or when changes can't be made.
+            when "frozen"     then :registered
+            # The 'not_open' status seems to indicate a domain
+            # that is already reserved and can't be registered directly.
+            # This is the case of second level names.
+            when "not_open"   then :reserved
+            else
+              Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end
           else
             :available
@@ -87,15 +90,26 @@ module Whois
         property_supported :nameservers do
           content_for_scanner.scan(/nserver:\s+(.+)\n/).flatten.map do |line|
             if line =~ /(.+) \[(.+)\]/
-              Record::Nameserver.new($1, *$2.split(/\s+/))
+              name = $1
+              ips  = $2.split(/\s+/)
+              ipv4 = ips.find { |ip| Whois::Server.valid_ipv4?(ip) }
+              ipv6 = ips.find { |ip| Whois::Server.valid_ipv6?(ip) }
+              Record::Nameserver.new(:name => name, :ipv4 => ipv4, :ipv6 => ipv6)
             else
-              Record::Nameserver.new(line)
+              Record::Nameserver.new(:name => line)
             end
           end
         end
 
+        # Checks whether the response has been throttled.
+        #
+        # @return [Boolean]
+        def response_throttled?
+          !!(content_for_scanner =~ /^%% Too many requests\.{3}/)
+        end
+
 
-        private
+      private
 
         MULTIVALUE_KEYS = %w( address )
 
@@ -113,12 +127,15 @@ module Whois
             address = values["address"].join("\n")
           else
             name = values["contact"]
-            if values["address"].size > 2
+            if values["address"].nil?
+              organization = nil
+              address      = nil
+            elsif values["address"].size > 2
               organization = values["address"][0]
-              address = values["address"][1..-1].join("\n")
+              address      = values["address"][1..-1].join("\n")
             else
               organization = nil
-              address = values["address"].join("\n")
+              address      = values["address"].join("\n")
             end
           end
 

data/lib/whois/record/parser/whois.nic.gl.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.nic.gov.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.nic.gs.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.nic.ht.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.nic.hu.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.nic.hu parser
-      #
       # Parser for the whois.nic.hu server.
       #
       # @author Simone Carletti <weppos@weppos.net>
@@ -27,16 +24,16 @@ module Whois
         include Scanners::Ast
 
         property_supported :disclaimer do
-          node("disclaimer")
+          node("field:disclaimer")
         end
 
 
         property_supported :domain do
-          node("domain")
+          node("field:domain")
         end
 
         property_supported :domain_id do
-          node('hun-id')
+          node("hun-id")
         end
 
 
@@ -60,11 +57,11 @@ module Whois
 
 
         property_supported :created_on do
-          node('registered') { |raw| Time.parse(raw) }
+          node("registered") { |raw| Time.parse(raw) }
         end
 
         property_supported :updated_on do
-          node('changed') { |raw| Time.parse(raw) }
+          node("changed") { |raw| Time.parse(raw) }
         end
 
         property_not_supported :expires_on
@@ -86,24 +83,24 @@ module Whois
           address, city, zip, country_code = decompose_address(node("address"))
 
           Whois::Record::Contact.new(
-            :type         => Whois::Record::Contact::TYPE_REGISTRANT,
-            :name         => node("name"),
-            :organization => node("org"),
-            :address      => address,
-            :city         => city,
-            :zip          => zip,
-            :country_code => country_code,
-            :phone        => node("phone"),
-            :fax          => node("fax-no")
+              :type         => Whois::Record::Contact::TYPE_REGISTRANT,
+              :name         => node("name"),
+              :organization => node("org"),
+              :address      => address,
+              :city         => city,
+              :zip          => zip,
+              :country_code => country_code,
+              :phone        => node("phone"),
+              :fax          => node("fax-no")
           )
         end
 
         property_supported :admin_contacts do
-          contact("admin-c", Whois::Record::Contact::TYPE_ADMIN)
+          build_contact("admin-c", Whois::Record::Contact::TYPE_ADMIN)
         end
 
         property_supported :technical_contacts do
-          contact("tech-c", Whois::Record::Contact::TYPE_TECHNICAL)
+          build_contact("tech-c", Whois::Record::Contact::TYPE_TECHNICAL)
         end
 
 
@@ -117,14 +114,14 @@ module Whois
         # NEWPROPERTY
         def registrar_contact
           cached_properties_fetch(:registrar_contact) do
-            contact("registrar", nil)
+            build_contact("registrar", nil)
           end
         end
 
         # NEWPROPERTY
         def zone_contact
           cached_properties_fetch(:zone_contact) do
-            contact("zone-c", nil)
+            build_contact("zone-c", nil)
           end
         end
 
@@ -139,32 +136,32 @@ module Whois
         end
 
 
-        protected
+      private
 
-          def contact(element, type)
-            node(node(element)) do |raw|
-              Whois::Record::Contact.new do |c|
-                c.type = type
-                raw.each { |k,v| c[k.to_sym] = v }
-              end
+        def build_contact(element, type)
+          node(node(element)) do |raw|
+            Whois::Record::Contact.new do |c|
+              c.type = type
+              raw.each { |k,v| c[k.to_sym] = v }
             end
           end
+        end
 
-          # Depending on record type, the address can be <tt>nil</tt>
-          # or an array containing different address parts.
-          def decompose_address(parts)
-            addresses = parts || []
-            address, city, zip, country_code = nil, nil, nil, nil
+        # Depending on record type, the address can be <tt>nil</tt>
+        # or an array containing different address parts.
+        def decompose_address(parts)
+          addresses = parts || []
+          address, city, zip, country_code = nil, nil, nil, nil
 
-            if !addresses.empty?
-              address       = addresses[0]                if addresses[0]
-              zip, city     = addresses[1].split(" ", 2)  if addresses[1]
-              country_code  = addresses[2]                if addresses[2]
-            end
-
-            [address, city, zip, country_code]
+          if !addresses.empty?
+            address       = addresses[0]                if addresses[0]
+            zip, city     = addresses[1].split(" ", 2)  if addresses[1]
+            country_code  = addresses[2]                if addresses[2]
           end
 
+          [address, city, zip, country_code]
+        end
+
       end
 
     end

data/lib/whois/record/parser/whois.nic.im.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.nic.io.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.nic.ir.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.nic.it.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.nic.it parser
-      #
       # Parser for the whois.nic.it server.
-      #
       class WhoisNicIt < Base
         include Scanners::Ast
 
@@ -30,7 +26,7 @@ module Whois
 
 
         property_supported :domain do
-          node("Domain") { |raw| raw.downcase }
+          node("Domain") { |str| str.downcase }
         end
 
         property_not_supported :domain_id
@@ -82,39 +78,38 @@ module Whois
 
 
         property_supported :created_on do
-          node("Created") { |raw| Time.parse(raw) }
+          node("Created") { |str| Time.parse(str) }
         end
 
         property_supported :updated_on do
-          node("Last Update") { |raw| Time.parse(raw) }
+          node("Last Update") { |str| Time.parse(str) }
         end
 
         property_supported :expires_on do
-          node("Expire Date") { |raw| Time.parse(raw) }
+          node("Expire Date") { |str| Time.parse(str) }
         end
 
 
         property_supported :registrar do
-          node("Registrar") do |raw|
+          node("Registrar") do |str|
             Record::Registrar.new(
-              :id           => raw["Name"],
-              :name         => raw["Name"],
-              :organization => raw["Organization"]
+              :id           => str["Name"],
+              :name         => str["Name"],
+              :organization => str["Organization"]
             )
           end
         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("Admin Contact", Whois::Record::Contact::TYPE_ADMIN)
+          build_contact("Admin Contact", Whois::Record::Contact::TYPE_ADMIN)
         end
 
         property_supported :technical_contacts do
-          contact("Technical Contacts", Whois::Record::Contact::TYPE_TECHNICAL)
+          build_contact("Technical Contacts", Whois::Record::Contact::TYPE_TECHNICAL)
         end
 
 
@@ -130,10 +125,10 @@ module Whois
         #
         # @return [Boolean]
         def response_unavailable?
-          !!node("status:unavailable")
+          !!node("response:unavailable")
         end
 
-        # Initializes a new {Scanners::WhoisIt} instance
+        # Initializes a new {Scanners::WhoisNicIt} instance
         # passing the {#content_for_scanner}
         # and calls +parse+ on it.
         #
@@ -143,27 +138,27 @@ module Whois
         end
 
 
-        protected
-
-          def contact(element, type)
-            node(element) do |raw|
-              address = (raw["Address"] || "").split("\n")
-              company = address.size == 6 ? address.shift : nil
-              Record::Contact.new(
-                :id           => raw["ContactID"],
-                :type         => type,
-                :name         => raw["Name"],
-                :organization => raw["Organization"] || company,
-                :address      => address[0],
-                :city         => address[1],
-                :zip          => address[2],
-                :state        => address[3],
-                :country_code => address[4],
-                :created_on   => raw["Created"] ? Time.parse(raw["Created"]) : nil,
-                :updated_on   => raw["Last Update"] ? Time.parse(raw["Last Update"]) : nil
-              )
-            end
+      private
+
+        def build_contact(element, type)
+          node(element) do |str|
+            address = (str["Address"] || "").split("\n")
+            company = address.size == 6 ? address.shift : nil
+            Record::Contact.new(
+              :id           => str["ContactID"],
+              :type         => type,
+              :name         => str["Name"],
+              :organization => str["Organization"] || company,
+              :address      => address[0],
+              :city         => address[1],
+              :zip          => address[2],
+              :state        => address[3],
+              :country_code => address[4],
+              :created_on   => str["Created"] ? Time.parse(str["Created"]) : nil,
+              :updated_on   => str["Last Update"] ? Time.parse(str["Last Update"]) : nil
+            )
           end
+        end
 
       end