whois 2.1.0 → 2.2.0

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

@@ -7,79 +7,15 @@
 #++
 
 
-require 'whois/record/parser/base'
+require 'whois/record/parser/base_cocca'
 
 
 module Whois
   class Record
     class Parser
 
-      #
-      # = whois.nic.af parser
-      #
       # Parser for the whois.nic.af 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 WhoisNicAf < Base
-
-        property_supported :status do
-          if content_for_scanner =~ /Status:\s+(.+?)\n/
-            case $1.downcase
-              when "active"
-                :registered
-              when "delegated"
-                :registered
-              when "not registered"
-                :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 WhoisNicAf < BaseCocca
       end
 
     end

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

@@ -28,15 +28,7 @@ module Whois
       class WhoisNicCoop < Base
 
         property_supported :status do
-          if content_for_scanner =~ /Status:\s+(.+?)\n/
-            case $1.downcase
-              when "ok" then :registered
-              else
-                Whois.bug!(ParserError, "Unknown status `#{$1}'.")
-            end
-          else
-            :available
-          end
+          content_for_scanner.scan(/Status:\s+(.+?)\n/).flatten
         end
 
         property_supported :available? do

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

@@ -7,77 +7,15 @@
 #++
 
 
-require 'whois/record/parser/base'
+require 'whois/record/parser/base_cocca'
 
 
 module Whois
   class Record
     class Parser
 
-      #
-      # = whois.nic.cx parser
-      #
       # Parser for the whois.nic.cx 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 WhoisNicCx < Base
-
-        property_supported :status do
-          if content_for_scanner =~ /Status:\s+(.+?)\n/
-            case $1.downcase
-              when "active"
-                :registered
-              when "not registered"
-                :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 WhoisNicCx < BaseCocca
       end
 
     end

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

@@ -74,7 +74,7 @@ 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($1, *$2.split(", "))
             else
               Record::Nameserver.new(line.strip)
             end

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

@@ -30,12 +30,12 @@ module Whois
         property_supported :status do
           if content_for_scanner =~ /status:\s+(.+)\n/
             case $1.downcase
-              when "active" then :registered
+              when "active"     then :registered
               when "registered" then :registered
-              # NEWSTATUS
               when "redemption" then :redemption
-              # NEWSTATUS
-              when "frozen" then :frozen
+              when "blocked"    then :inactive
+              # NEWSTATUS (reserved)
+              when "frozen"     then :frozen
               else
                 Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end
@@ -54,14 +54,14 @@ module Whois
 
 
         property_supported :created_on do
-          if content_for_scanner =~ /created:\s+(.*)\n/
+          if content_for_scanner =~ /created:\s+(.+)\n/
             d, m, y = $1.split("/")
             Time.parse("#{y}-#{m}-#{d}")
           end
         end
 
         property_supported :updated_on do
-          if content_for_scanner =~ /last-update:\s+(.*)\n/
+          if content_for_scanner =~ /last-update:\s+(.+)\n/
             d, m, y = $1.split("/")
             Time.parse("#{y}-#{m}-#{d}")
           end
@@ -71,6 +71,19 @@ module Whois
         property_not_supported :expires_on
 
 
+        property_supported :registrant_contacts do
+          parse_contact("holder-c", Whois::Record::Contact::TYPE_REGISTRANT)
+        end
+
+        property_supported :admin_contacts do
+          parse_contact("admin-c", Whois::Record::Contact::TYPE_ADMIN)
+        end
+
+        property_supported :technical_contacts do
+          parse_contact("tech-c", Whois::Record::Contact::TYPE_TECHNICAL)
+        end
+
+
         property_supported :nameservers do
           content_for_scanner.scan(/nserver:\s+(.+)\n/).flatten.map do |line|
             if line =~ /(.+) \[(.+)\]/
@@ -81,6 +94,67 @@ module Whois
           end
         end
 
+
+        private
+
+        MULTIVALUE_KEYS = %w( address )
+
+        def parse_contact(element, type)
+          return unless content_for_scanner =~ /#{element}:\s+(.+)\n/
+
+          id = $1
+          content_for_scanner.scan(/nic-hdl:\s+#{id}\n((.+\n)+)\n/).any? ||
+              Whois.bug!(ParserError, "Unable to parse contact block for nic-hdl: #{id}")
+          values = build_hash($1.scan(/(.+?):\s+(.+?)\n/))
+
+          if values["type"] == "ORGANIZATION"
+            name = nil
+            organization = values["contact"]
+            address = values["address"].join("\n")
+          else
+            name = values["contact"]
+            if values["address"].size > 2
+              organization = values["address"][0]
+              address = values["address"][1..-1].join("\n")
+            else
+              organization = nil
+              address = values["address"].join("\n")
+            end
+          end
+
+          Record::Contact.new({
+            :type         => type,
+            :id           => id,
+            :name         => name,
+            :organization => organization,
+            :address      => address,
+            # :city         => nil,
+            # :zip          => nil,
+            # :state        => nil,
+            # :country      => nil,
+            :country_code => values["country"],
+            :phone        => values["phone"],
+            :fax          => values["fax-no"],
+            :email        => values["e-mail"],
+            # :created_on   => nil,
+            :updated_on   => Time.utc(*values["changed"].split(" ").first.split("/").reverse),
+          })
+        end
+
+        def build_hash(tokens)
+          {}.tap do |hash|
+            tokens.each do |key, value|
+              if MULTIVALUE_KEYS.include?(key)
+                hash[key] ||= []
+                hash[key] <<  value
+              else
+                hash[key] = value
+              end
+            end
+          end
+        end
+
+
       end
 
     end

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

@@ -7,77 +7,15 @@
 #++
 
 
-require 'whois/record/parser/base'
+require 'whois/record/parser/base_cocca'
 
 
 module Whois
   class Record
     class Parser
 
-      #
-      # = whois.nic.gs parser
-      #
       # Parser for the whois.nic.gs 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 WhoisNicGs < Base
-
-        property_supported :status do
-          if content_for_scanner =~ /Status:\s+(.+?)\n/
-            case $1.downcase
-              when "active"
-                :registered
-              when "not registered"
-                :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 WhoisNicGs < BaseCocca
       end
 
     end

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

@@ -7,78 +7,15 @@
 #++
 
 
-require 'whois/record/parser/base'
+require 'whois/record/parser/base_cocca'
 
 
 module Whois
   class Record
     class Parser
 
-      #
-      # = whois.nic.ht parser
-      #
       # Parser for the whois.nic.ht 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 WhoisNicHt < Base
-
-        property_supported :status do
-          if content_for_scanner =~ /Status:\s+(.+?)\n/
-            case $1.downcase
-              when "active"         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 = Time.parse($1)
-            Time.utc(time.year, time.month, time.day)
-          end
-        end
-
-        property_supported :updated_on do
-          if content_for_scanner =~ /Modified:\s+(.*)\n/
-            time = Time.parse($1)
-            Time.utc(time.year, time.month, time.day)
-          end
-        end
-
-        property_supported :expires_on do
-          if content_for_scanner =~ /Expires:\s+(.*)\n/
-            time = Time.parse($1)
-            Time.utc(time.year, time.month, time.day)
-          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 WhoisNicHt < BaseCocca
       end
 
     end