whois 2.5.1 → 2.6.0

data/lib/whois/record/parser/whois.eenet.ee.rb

@@ -62,7 +62,7 @@ module Whois
         property_supported :nameservers do
           if content_for_scanner =~ /Domain servers:\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.eu.rb

@@ -65,9 +65,9 @@ module Whois
           if content_for_scanner =~ /Name\sservers:\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.fi.rb

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

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

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

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

@@ -82,7 +82,7 @@ module Whois
         property_supported :nameservers do
           if content_for_scanner =~ /Domain servers in listed order:\n((.+\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.hkirc.hk.rb

@@ -14,16 +14,14 @@ module Whois
   class Record
     class Parser
 
-      #
-      # = whois.hkirc.hk parser
-      #
       # Parser for the whois.hkirc.hk 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 WhoisHkircHk < Base
 
@@ -36,7 +34,7 @@ module Whois
         end
 
         property_supported :available? do
-          (content_for_scanner.strip == "Domain Not Found")
+          content_for_scanner.strip == 'Domain Not Found'
         end
 
         property_supported :registered? do
@@ -45,7 +43,7 @@ module Whois
 
 
         property_supported :created_on do
-          if content_for_scanner =~ /Domain Name Commencement Date:\s(.*?)\n/
+          if content_for_scanner =~ /Domain Name Commencement Date:\s(.+?)\n/
             Time.parse($1)
           end
         end
@@ -53,8 +51,9 @@ module Whois
         property_not_supported :updated_on
 
         property_supported :expires_on do
-          if content_for_scanner =~ /Expiry Date:\s(.*?)\n/
-            Time.parse($1)
+          if content_for_scanner =~ /Expiry Date:\s(.+?)\n/
+            time = $1.strip
+            Time.parse(time) unless time == 'null'
           end
         end
 
@@ -62,7 +61,7 @@ module Whois
         property_supported :nameservers do
           if content_for_scanner =~ /Name Servers Information:\n\n((.+\n)+)\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.iana.org.rb

@@ -65,7 +65,8 @@ module Whois
         property_supported :nameservers do
           node("nameservers") do |raw|
             (raw["nserver"] || "").split("\n").map do |line|
-              Record::Nameserver.new(*line.downcase.split(/\s+/))
+              name, ipv4 = line.downcase.split(/\s+/)
+              Record::Nameserver.new(:name => name, :ipv4 => ipv4)
             end
           end
         end

data/lib/whois/record/parser/whois.in.ua.rb

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

data/lib/whois/record/parser/whois.isnic.is.rb

@@ -61,7 +61,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.isoc.org.il.rb

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

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

@@ -66,7 +66,8 @@ module Whois
         property_supported :nameservers do
           if content_for_scanner =~ /Servers:\n((.+\n)+)\n/
             $1.split("\n").map do |line|
-              Record::Nameserver.new(*line.strip.split("\t"))
+              name, ipv4 = line.strip.downcase.split("\t")
+              Record::Nameserver.new(:name => name, :ipv4 => ipv4)
             end
           end
         end

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

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

data/lib/whois/record/parser/whois.jprs.jp.rb

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

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

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

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

@@ -78,7 +78,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.meregistry.net.rb

@@ -43,7 +43,7 @@ module Whois
 
         property_supported :nameservers do
           Array.wrap(node("Nameservers")).reject(&:empty?).map do |name|
-            Nameserver.new(name.downcase)
+            Record::Nameserver.new(:name => name.downcase)
           end
         end
 

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

@@ -70,7 +70,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.na-nic.com.na.rb

@@ -21,6 +21,7 @@ module Whois
           if content_for_scanner =~ /Status:\s+(.+?)\n/
             case $1.downcase
             when "active"         then :registered
+            when "delegated"      then :registered
             when "not registered" then :available
             when "suspended"      then :inactive
             else

data/lib/whois/record/parser/whois.netcom.cm.rb

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

data/lib/whois/record/parser/whois.nic-se.se.rb

@@ -80,7 +80,7 @@ module Whois
         property_supported :nameservers do
           content_for_scanner.scan(/nserver:\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.nic.am.rb

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

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

@@ -55,7 +55,7 @@ module Whois
           if content_for_scanner =~ /Nameservers:\s((.+\n)+)\n/
             $1.split("\n").reject { |value| value.strip.empty? }.map do |line|
               line.strip =~ /(.+) \((.+)\)/
-              Record::Nameserver.new($1, $2)
+              Record::Nameserver.new(:name => $1, :ipv4 => $2)
             end
           end
         end

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

@@ -52,7 +52,7 @@ module Whois
 
         property_supported :nameservers do
           Array.wrap(node("Nameservers")).reject(&:empty?).map do |name|
-            Nameserver.new(name.downcase)
+            Record::Nameserver.new(:name => name.downcase)
           end
         end
 

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

@@ -57,7 +57,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.nic.cc.rb

@@ -75,7 +75,7 @@ module Whois
 
         property_supported :nameservers do
           Array.wrap(node("Name Server")).reject { |value| value =~ /no nameserver/i }.map do |name|
-            Nameserver.new(name.downcase)
+            Record::Nameserver.new(:name => name.downcase)
           end
         end
 

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

@@ -58,7 +58,7 @@ module Whois
         property_supported :nameservers do
           if content_for_scanner =~ /Name Servers:\n((.+\n)+)\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.nic.ch.rb

@@ -64,12 +64,12 @@ module Whois
               if line =~ /(.+)\t\[(.+)\]/
                 name, ip = $1, $2
                 order << name unless order.include?(name)
-                list[name] ||= Record::Nameserver.new(name)
+                list[name] ||= Record::Nameserver.new(:name => name)
                 list[name].ipv4 = ip if Whois::Server.valid_ipv4?(ip)
                 list[name].ipv6 = ip if Whois::Server.valid_ipv6?(ip)
               else
                 order << line unless order.include?(line)
-                list[line] ||= Record::Nameserver.new(line)
+                list[line] ||= Record::Nameserver.new(:name => line)
               end
             end
             order.map { |name| list[name] }

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

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

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

@@ -61,7 +61,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.nic.cl.rb

@@ -61,7 +61,7 @@ module Whois
             $1.split("\n").map do |line|
               line.strip!
               line =~ /(.+) \((.+)\)/
-              Record::Nameserver.new($1, $2)
+              Record::Nameserver.new(:name => $1, :ipv4 => $2)
             end
           end
         end

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

@@ -61,7 +61,7 @@ module Whois
 
         property_supported :nameservers do
           content_for_scanner.scan(/Name Server:\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.nic.coop.rb

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

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

@@ -30,13 +30,13 @@ module Whois
         property_supported :status do
           if content_for_scanner =~ /status:\s+(.+)\n/
             case $1.downcase
-              when "paid and in zone", "update prohibited"
-                :registered
-              # NEWSTATUS
-              when "expired"
-                :expired
-              else
-                Whois.bug!(ParserError, "Unknown status `#{$1}'.")
+            when "paid and in zone", "update prohibited"
+              :registered
+            # NEWSTATUS
+            when "expired"
+              :expired
+            else
+              Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end
           else
             :available
@@ -74,9 +74,11 @@ 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(", "))
+              name = $1
+              ipv4, ipv6 = $2.split(", ")
+              Record::Nameserver.new(:name => name, :ipv4 => ipv4, :ipv6 => ipv6)
             else
-              Record::Nameserver.new(line.strip)
+              Record::Nameserver.new(:name => line.strip)
             end
           end
         end

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

@@ -66,7 +66,7 @@ module Whois
         property_supported :nameservers do
           if content_for_scanner =~ /Servidores de dominio \(Name Servers\)\n((.+\n)+)\n/
             $1.split("\n").map do |name|
-              Record::Nameserver.new(name)
+              Record::Nameserver.new(:name => name)
             end
           end
         end

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

@@ -7,76 +7,15 @@
 #++
 
 
-require 'whois/record/parser/base'
+require 'whois/record/parser/base_cocca'
 
 
 module Whois
   class Record
     class Parser
 
-      #
-      # = whois.nic.gl parser
-      #
       # Parser for the whois.nic.gl 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 WhoisNicGl < Base
-
-        property_supported :status do
-          if content_for_scanner =~ /Status:\s+(.+?)\n/
-            case $1.downcase
-            when "active" then :registered
-            when "delegated" then :registered
-            when "not registered" then :available
-            else
-              Whois.bug!(ParserError, "Unknown status `#{$1}'.")
-            end
-          else
-            Whois.bug!(ParserError, "Unable to parse status.")
-          end
-        end
-
-        property_supported :available? do
-          status == :available
-        end
-
-        property_supported :registered? do
-          !available?
-        end
-
-
-        property_supported :created_on do
-          if content_for_scanner =~ /Created:\s+(.+?)\n/
-            Time.parse($1)
-          end
-        end
-
-        property_supported :updated_on do
-          if content_for_scanner =~ /Modified:\s+(.+?)\n/
-            Time.parse($1)
-          end
-        end
-
-        property_supported :expires_on do
-          if content_for_scanner =~ /Expires:\s+(.+?)\n/
-            Time.parse($1)
-          end
-        end
-
-
-        property_supported :nameservers do
-          if content_for_scanner =~ /Name Servers:\n((.+\n)+)\n/
-            $1.split("\n").map do |name|
-              Record::Nameserver.new(name.strip)
-            end
-          end
-        end
-
+      class WhoisNicGl < BaseCocca
       end
 
     end