whois 2.5.1 → 2.6.0

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

@@ -90,7 +90,7 @@ module Whois
 
         property_supported :nameservers do
           Array.wrap(node("Name Server")).map do |name|
-            Nameserver.new(name.downcase)
+            Nameserver.new(:name => name.downcase)
           end
         end
 

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

@@ -68,7 +68,7 @@ module Whois
         property_supported :nameservers do
           content_for_scanner.scan(/Name Server:\s+(.+)\n/).flatten.map do |line|
             name, ipv4 = line.split(/\s+/)
-            Record::Nameserver.new(name, ipv4)
+            Record::Nameserver.new(:name => name, :ipv4 => ipv4)
           end
         end
 

data/lib/whois/record/parser/whois.cctld.uz.rb

@@ -31,6 +31,7 @@ module Whois
           if content_for_scanner =~ /^Status: (.+?)\n/
             case $1.downcase
               when "active" then :registered
+              when "reserved" then :reserved
               else
                 Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end
@@ -57,8 +58,8 @@ module Whois
         property_not_supported :updated_on
 
         property_supported :expires_on do
-          if content_for_scanner =~ /^Expiration Date:(.*)\n/
-            Time.parse($1)
+          if content_for_scanner =~ /^Expiration Date:\s+(.*)\n/
+            Time.parse($1) unless $1 == '-'
           end
         end
 
@@ -66,7 +67,7 @@ module Whois
         property_supported :nameservers do
           if content_for_scanner =~ /Domain servers in listed order:\n((.+\n)+)\n/
             $1.split("\n").map do |name|
-              Record::Nameserver.new(name.strip.chomp("."))
+              Record::Nameserver.new(:name => name.strip.chomp("."))
             end
           end
         end

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

@@ -92,9 +92,7 @@ module Whois
 
         property_supported :nameservers do
           Array.wrap(node("Name Server")).map do |name|
-            Record::Nameserver.new(
-                :name => name.downcase
-            )
+            Record::Nameserver.new(:name => name.downcase)
           end
         end
 

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

@@ -88,7 +88,7 @@ module Whois
 
         property_supported :nameservers do
           Array.wrap(node("Name Server")).map do |name|
-            Nameserver.new(name.downcase)
+            Nameserver.new(:name => name.downcase)
           end
         end
 

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

@@ -66,7 +66,7 @@ module Whois
 
         property_supported :nameservers do
           content_for_scanner.scan(/ns[\d]_hostname:\s+(.+)\n/).flatten.map do |name|
-            Record::Nameserver.new(name)
+            Record::Nameserver.new(:name => name)
           end
         end
 

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

@@ -78,7 +78,7 @@ module Whois
 
         property_supported :nameservers do
           content_for_scanner.scan(/nserver:\s+(.+)\n/).flatten.map do |name|
-            Record::Nameserver.new(name)
+            Record::Nameserver.new(:name => name)
           end
         end
 

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

@@ -14,16 +14,14 @@ module Whois
   class Record
     class Parser
 
-      #
-      # = whois.co.ug parser
-      #
       # Parser for the whois.co.ug 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.
       #
       # @author Simone Carletti <weppos@weppos.net>
       # @author Moritz Heidkamp <moritz.heidkamp@bevuta.com>
@@ -33,9 +31,12 @@ module Whois
         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}'.")
+            when 'active'
+              :registered
+            when 'unconfirmed'
+              :registered
+            else
+              Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end
           else
             :available
@@ -72,7 +73,7 @@ module Whois
 
         property_supported :nameservers do
           content_for_scanner.scan(/Nameserver:\s+(.+)\n/).flatten.map do |name|
-            Record::Nameserver.new(name.downcase)
+            Record::Nameserver.new(:name => name.downcase)
           end
         end
 

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

@@ -71,14 +71,18 @@ module Whois
 
         property_supported :registrar do
           node("Registrar") do |raw|
-            Whois::Record::Registrar.new(:name => last_useful_item(raw), :organization => last_useful_item(raw), :url => referral_url)
+            Whois::Record::Registrar.new(
+                :name         => last_useful_item(raw),
+                :organization => last_useful_item(raw),
+                :url          => referral_url
+            )
           end
         end
 
 
         property_supported :nameservers do
           Array.wrap(node("Name Server")).reject { |value| value =~ / / }.map do |name|
-            Record::Nameserver.new(name.downcase)
+            Record::Nameserver.new(:name => name.downcase)
           end
         end
 

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

@@ -113,7 +113,7 @@ module Whois
           node("Nserver") do |values|
             values.map do |line|
               name, ipv4 = line.split(/\s+/)
-              Record::Nameserver.new(name.chomp("."), ipv4)
+              Record::Nameserver.new(:name => name.chomp("."), :ipv4 => ipv4)
             end
           end
         end

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

@@ -68,7 +68,7 @@ module Whois
 
         property_supported :nameservers do
           content_for_scanner.scan(/Hostname:\s+(.+)\n/).flatten.map do |name|
-            Record::Nameserver.new(name)
+            Record::Nameserver.new(:name => name)
           end
         end
 

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

@@ -67,9 +67,9 @@ module Whois
           if content_for_scanner =~ /Nameservers:\s((.+\n)+)\n/
             $1.split("\n").map do |line|
               if line.strip =~ /(.+) \((.+)\)/
-                Record::Nameserver.new($1, $2)
+                Record::Nameserver.new(:name => $1, :ipv4 => $2)
               else
-                Record::Nameserver.new(line.strip)
+                Record::Nameserver.new(:name => line.strip)
               end
             end
           end

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

@@ -63,9 +63,9 @@ module Whois
         property_supported :nameservers do
           content_for_scanner.scan(/nserver:\s+(.+)\n/).flatten.map do |line|
             if line =~ /(.+) \[(.+)\]/
-              Record::Nameserver.new($1, $2)
+              Record::Nameserver.new(:name => $1, :ipv4 => $2)
             else
-              Record::Nameserver.new(line)
+              Record::Nameserver.new(:name => line)
             end
           end
         end

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

@@ -63,9 +63,9 @@ module Whois
           content_for_scanner.scan(/nameservers:\s+(.+)\n(.+)\n/).flatten.map do |line|
             line.strip!
             if line =~ /(.+) \[(.+)\]/
-              Record::Nameserver.new($1.chomp("."), $2)
+              Record::Nameserver.new(:name => $1.chomp("."), :ipv4 => $2)
             else
-              Record::Nameserver.new(line.chomp("."))
+              Record::Nameserver.new(:name => line.chomp("."))
             end
           end
         end

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

@@ -67,7 +67,7 @@ module Whois
 
         property_supported :nameservers do
           content_for_scanner.scan(/Nameserver:\s(?:.+\t)?(.+?)\.\n/).flatten.map do |name|
-            Record::Nameserver.new(name)
+            Record::Nameserver.new(:name => name)
           end
         end
 

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

@@ -80,7 +80,7 @@ module Whois
           if content_for_scanner =~ /Domain nameservers:\n((.+\n)+)\n/
             $1.split("\n").map do |line|
               name, ipv4 = line.strip.split(/\s+/)
-              Record::Nameserver.new(name, ipv4)
+              Record::Nameserver.new(:name => name, :ipv4 => ipv4)
             end
           end
         end

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

@@ -66,7 +66,7 @@ module Whois
         property_supported :nameservers do
           if content_for_scanner =~ /Name servers in the listed order:\n\n((.+\n)+)\n/
             $1.split("\n").map do |name|
-              Record::Nameserver.new(name.downcase)
+              Record::Nameserver.new(:name => name.downcase)
             end
           end
         end

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

@@ -63,7 +63,7 @@ module Whois
         property_supported :nameservers do
           content_for_scanner.scan(/\[(?:Primary|Secondary) Name Server\](?:.+?)\n(.+\n)/).flatten.map do |line|
             name, ipv4 = line.strip.split(/\s+/)
-            Record::Nameserver.new(name, ipv4)
+            Record::Nameserver.new(:name => name, :ipv4 => ipv4)
           end
         end
 

data/lib/whois/record/parser/whois.domreg.lt.rb

@@ -56,9 +56,9 @@ module Whois
         property_supported :nameservers do
           content_for_scanner.scan(/Nameserver:\s+(.+)\n/).flatten.map do |line|
             if line =~ /(.+)\t\[(.+)\]/
-              Record::Nameserver.new($1, $2)
+              Record::Nameserver.new(:name => $1, :ipv4 => $2)
             else
-              Record::Nameserver.new(line.strip)
+              Record::Nameserver.new(:name => line.strip)
             end
           end
         end

data/lib/whois/record/parser/whois.dot.tk.rb

@@ -62,7 +62,7 @@ module Whois
         property_supported :nameservers do
           if content_for_scanner =~ /Domain Nameservers:\n((.+\n)+)\s+\n/
             $1.split("\n").map do |name|
-              Record::Nameserver.new(name.strip.downcase)
+              Record::Nameserver.new(:name => name.strip.downcase)
             end
           end
         end

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

@@ -73,7 +73,7 @@ module Whois
         property_supported :nameservers do
           if content_for_scanner =~ /Domain servers in listed order:\n\n((?:\s*[^\s\n]+\n)+)/
             $1.split("\n").map do |line|
-              Record::Nameserver.new(line.strip)
+              Record::Nameserver.new(:name => line.strip)
             end
           end
         end

data/lib/whois/record/parser/whois.educause.edu.rb

@@ -24,6 +24,29 @@ module Whois
       #
       class WhoisEducauseEdu < Base
 
+        property_supported :disclaimer do
+          if content_for_scanner =~ /\A((.*\n)+)\n--------------------------\n/
+            $1
+          else
+            Whois.bug!(ParserError, "Unable to parse disclaimer.")
+          end
+        end
+
+
+        property_supported :domain do
+          if content_for_scanner =~ /Domain Name:\s(.+?)\n/
+            $1.downcase
+          end
+        end
+
+        property_not_supported :domain_id
+
+
+        property_not_supported :referral_whois
+
+        property_not_supported :referral_url
+
+
         property_supported :status do
           if available?
             :available
@@ -49,7 +72,7 @@ module Whois
 
         property_supported :updated_on do
           if content_for_scanner =~ /Domain record last updated:\s+(.+?)\n/
-            Time.parse($1) unless $1 == "unknown"
+            Time.parse($1) unless $1 == 'unknown'
           end
         end
 
@@ -59,36 +82,121 @@ module Whois
           end
         end
 
+
+        property_not_supported :registrar
+
         property_supported :registrant_contacts do
-          if content_for_scanner =~ /Registrant:\n((.+\n)+)\n/
+          build_contact_registrant("Registrant", Whois::Record::Contact::TYPE_REGISTRANT)
+        end
+
+        property_supported :admin_contacts do
+          build_contact("Administrative Contact", Whois::Record::Contact::TYPE_ADMIN)
+        end
+
+        property_supported :technical_contacts do
+          build_contact("Technical Contact", Whois::Record::Contact::TYPE_TECHNICAL)
+        end
+
+
+        property_supported :nameservers do
+          if content_for_scanner =~ /Name Servers: \n((.+\n)+)\n/
+            $1.split("\n").map do |line|
+              name, ipv4 = line.strip.split(/\s+/)
+              Record::Nameserver.new(:name => name.downcase, :ipv4 => ipv4)
+            end
+          end
+        end
+
+
+      private
+
+        # [NAME] | EMPTY
+        # [ROLE]?
+        # [ORGANIZATION]
+        # [ADDRESS]*
+        # [CITY, ST ZIP]
+        # [COUNTRY]
+        # [PHONE]
+        # [EMAIL]
+        def build_contact(element, type)
+          if content_for_scanner =~ /#{element}:\n+((.+\n)+)\n/
             lines = $1.split("\n").map(&:strip)
+            items = lines.dup
+
+            # Extract variables
+
+            # items.shift if items[0].strip == ''
+
+            v13 = items.delete_at(-1)
 
-            case lines[-2]
-              when /([^\n,]+),\s([A-Z]{2})(?:\s(\d{5}))/
-                city, state, zip = $1, $2, $3
-              else
-                city = lines[-2]
+            v11 = items.delete_at(-1)
+
+            v9 = items.delete_at(-1)
+
+            v6 = items.delete_at(-1)
+            if v6 =~ /([^\n,]+),\s([A-Z]{2})(?:\s(\d{5}(?:-\d{4})?))/
+              v6, v7, v8 = $1, $2, $3
+            end
+
+            v4 = []
+            until items[0] =~ /^\d+/ || items.empty?
+              v4 << items.shift
             end
+            v4 = v4.join("\n")
+
+            v5 = items.empty? ? nil : items.join("\n")
+
+            # Create Contact
 
             Record::Contact.new(
-              :type         => Whois::Record::Contact::TYPE_REGISTRANT,
-              :name         => nil,
-              :organization => lines[0],
-              :address      => lines[1..-3].join("\n"),
-              :city         => city,
-              :state        => state,
-              :zip          => zip,
-              :country      => lines[-1]
+                :type         => type,
+                :name         => v4,
+                :organization => nil,
+                :address      => v5,
+                :city         => v6,
+                :state        => v7,
+                :zip          => v8,
+                :country      => v9,
+                :phone        => v11,
+                :email        => v13
             )
           end
         end
 
-        property_supported :nameservers do
-          if content_for_scanner =~ /Name Servers: \n((.+\n)+)\n/
-            $1.split("\n").map do |line|
-              name, ipv4 = line.strip.split(/\s+/)
-              Record::Nameserver.new(name.downcase, ipv4)
+        # [ORGANIZATION]
+        # [ADDRESS]*
+        # [CITY, ST ZIP] | [CITY]
+        # [COUNTRY]
+        def build_contact_registrant(element, type)
+          if content_for_scanner =~ /#{element}:\n((.+\n)+)\n/
+            lines = $1.split("\n").map(&:strip)
+            items = lines.dup
+
+            # Extract variables
+
+            v9 = items.delete_at(-1)
+
+            v4 = items.delete_at(0)
+
+            v6 = items.delete_at(-1)
+            if v6 =~ /([^\n,]+),\s([A-Z]{2})(?:\s(\d{5}))/
+              v6, v7, v8 = $1, $2, $3
             end
+
+            v5 = items.empty? ? nil : items.join("\n")
+
+            # Create Contact
+
+            Record::Contact.new(
+                :type         => type,
+                :name         => nil,
+                :organization => v4,
+                :address      => v5,
+                :city         => v6,
+                :state        => v7,
+                :zip          => v8,
+                :country      => v9
+            )
           end
         end