whois 3.2.0 → 3.2.1

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

@@ -42,7 +42,7 @@ module Whois
 
 
         property_supported :admin_contacts do
-          build_contact("Administrative", Whois::Record::Contact::TYPE_ADMIN)
+          build_contact("Administrative", Whois::Record::Contact::TYPE_ADMINISTRATIVE)
         end
 
         property_supported :technical_contacts do

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

@@ -14,16 +14,14 @@ module Whois
   class Record
     class Parser
 
-      #
-      # = whois.registrypro.pro parser
-      #
       # Parser for the whois.nic.bo 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 WhoisNicBo < Base
 

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

@@ -7,62 +7,19 @@
 #++
 
 
-require 'whois/record/parser/base'
+require 'whois/record/parser/base_cocca2'
 
 
 module Whois
   class Record
     class Parser
 
-      #
-      # = whois.nic.cd parser
-      #
       # Parser for the whois.nic.cd 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.
+      # @see Whois::Record::Parser::Example
+      #   The Example parser for the list of all available methods.
       #
-      class WhoisNicCd < Base
-
-        property_supported :status do
-          content_for_scanner.scan(/^\s+Domain Status:\s+(.+?)\n/).flatten
-        end
-
-        property_supported :available? do
-          !!(content_for_scanner.strip == "Domain Not Found")
-        end
-
-        property_supported :registered? do
-          !available?
-        end
-
-
-        property_supported :created_on do
-          if content_for_scanner =~ /^\s+Creation Date:\s+(.*)\n/
-            Time.parse($1)
-          end
-        end
-
-        property_not_supported :updated_on
-
-        property_supported :expires_on do
-          if content_for_scanner =~ /^\s+Expiration Date:\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 => name.strip.downcase)
-            end
-          end
-        end
-
+      class WhoisNicCd < BaseCocca2
       end
 
     end

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

@@ -21,10 +21,10 @@ module Whois
       #
       class WhoisNicCz < BaseWhoisd
         self.status_mapping = {
-          'paid and in zone' => :registered,
-          'update prohibited' => :registered,
-          'expired' => :expired,
-          'to be deleted' => :expired,
+          "paid and in zone" => :registered,
+          "update prohibited" => :registered,
+          "expired" => :expired,
+          "to be deleted" => :expired,
         }
       end
 

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

@@ -79,7 +79,7 @@ module Whois
         end
 
         property_supported :admin_contacts do
-          parse_contact("admin-c", Whois::Record::Contact::TYPE_ADMIN)
+          parse_contact("admin-c", Whois::Record::Contact::TYPE_ADMINISTRATIVE)
         end
 
         property_supported :technical_contacts do

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

@@ -7,7 +7,7 @@
 #++
 
 
-require 'whois/record/parser/base_cocca'
+require 'whois/record/parser/base_cocca2'
 
 
 module Whois
@@ -19,8 +19,7 @@ module Whois
       # @see Whois::Record::Parser::Example
       #   The Example parser for the list of all available methods.
       #
-      # @since  RELEASE
-      class WhoisNicHn < BaseCocca
+      class WhoisNicHn < BaseCocca2
       end
 
     end

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

@@ -99,7 +99,7 @@ module Whois
         end
 
         property_supported :admin_contacts do
-          build_contact("admin-c", Whois::Record::Contact::TYPE_ADMIN)
+          build_contact("admin-c", Whois::Record::Contact::TYPE_ADMINISTRATIVE)
         end
 
         property_supported :technical_contacts do

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

@@ -107,7 +107,7 @@ module Whois
         end
 
         property_supported :admin_contacts do
-          build_contact("Admin Contact", Whois::Record::Contact::TYPE_ADMIN)
+          build_contact("Admin Contact", Whois::Record::Contact::TYPE_ADMINISTRATIVE)
         end
 
         property_supported :technical_contacts do

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

@@ -7,79 +7,19 @@
 #++
 
 
-require 'whois/record/parser/base'
+require 'whois/record/parser/base_cocca2'
 
 
 module Whois
   class Record
     class Parser
 
-      #
-      # = whois.nic.mg parser
-      #
       # Parser for the whois.nic.mg 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.
+      # @see Whois::Record::Parser::Example
+      #   The Example parser for the list of all available methods.
       #
-      class WhoisNicMg < 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 => name.strip)
-            end
-          end
-        end
-
+      class WhoisNicMg < BaseCocca2
       end
 
     end

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

@@ -80,7 +80,7 @@ module Whois
 
         property_supported :admin_contacts do
           if content_for_scanner =~ /Administrative Contact's handle:\s+(.+)\n/
-            build_contact($1, Whois::Record::Contact::TYPE_ADMIN)
+            build_contact($1, Whois::Record::Contact::TYPE_ADMINISTRATIVE)
           end
         end
 

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

@@ -14,19 +14,21 @@ module Whois
   class Record
     class Parser
 
-      #
-      # = whois.nic.tr parser
-      #
       # Parser for the whois.nic.tr 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.
+      # @see Whois::Record::Parser::Example
+      #   The Example parser for the list of all available methods.
       #
       class WhoisNicTr < Base
 
+        property_not_supported :disclaimer
+
+
+        property_not_supported :domain
+
+        property_not_supported :domain_id
+
+
         property_supported :status do
           if available?
             :available
@@ -61,6 +63,44 @@ module Whois
         end
 
 
+        property_not_supported :registrar
+
+
+        property_supported :registrant_contacts do
+          textblock = content_for_scanner.slice(/^\*\* Registrant:\n((?:\s+.+\n)+)/, 1)
+          return unless textblock
+
+          lines = textblock.lines.map(&:strip)
+
+          name = lines[0]
+          address = lines[1..2].delete_if(&:blank?).join("\n")
+          city, country = if (lines[3] == "Out of Turkey,")
+            [nil, lines[4]]
+          else
+            [lines[3].chomp(","), lines[4]]
+          end
+
+          Record::Contact.new(
+            type:         Record::Contact::TYPE_REGISTRANT,
+            name:         name,
+            address:      address,
+            city:         city,
+            country:      country,
+            email:        lines[5],
+            phone:        lines[6],
+            fax:          lines[7]
+          )
+        end
+
+        property_supported :admin_contacts do
+          build_contact("Administrative Contact", Whois::Record::Contact::TYPE_ADMINISTRATIVE)
+        end
+
+        property_supported :technical_contacts do
+          build_contact("Technical Contact", Whois::Record::Contact::TYPE_TECHNICAL)
+        end
+
+
         property_supported :nameservers do
           if content_for_scanner =~ /Domain Servers:\n((.+\n)+)\n/
             $1.split("\n").map do |line|
@@ -70,6 +110,33 @@ module Whois
           end
         end
 
+      private
+
+        def build_contact(element, type)
+          textblock = content_for_scanner.slice(/^\*\* #{element}:\n((?:.+\n)+)\n/, 1)
+          return unless textblock
+
+          lines = []
+          textblock.lines.each do |line|
+            if line =~ /^\s+.+/
+              lines.last.last << "\n" << line.strip
+            else
+              lines << line.match(/([^\t]+)\t+:\s+(.+)/).to_a[1..2]
+            end
+          end
+          lines = Hash[lines]
+
+          Record::Contact.new(
+              type:         type,
+              id:           lines["NIC Handle"],
+              name:         lines["Person"],
+              organization: lines["Organization Name"],
+              address:      lines["Address"],
+              phone:        lines["Phone"],
+              fax:          lines["Fax"]
+            )
+        end
+
       end
 
     end

data/lib/whois/record/parser/whois.pnina.ps.rb

@@ -7,73 +7,25 @@
 #++
 
 
-require 'whois/record/parser/base'
+require 'whois/record/parser/base_cocca'
 
 
 module Whois
   class Record
     class Parser
 
-      #
-      # = whois.pnina.ps parser
-      #
       # Parser for the whois.pnina.ps 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.
+      # @see Whois::Record::Parser::Example
+      #   The Example parser for the list of all available methods.
       #
-      class WhoisPninaPs < Base
-
-        property_supported :status do
-          if content_for_scanner =~ /Status:\s+(.+?)\n/
-            case (s = $1.downcase)
-            when /^active/
-              :registered
-            when "not registered"
-              :available
-            else
-              Whois.bug!(ParserError, "Unknown status `#{s}'.")
-            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_not_supported :updated_on
-
-        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").delete_if { |value| value =~ /nodns\.ns$/i  }.map do |name|
-              Record::Nameserver.new(:name => name.strip)
-            end
-          end
-        end
-
+      class WhoisPninaPs < BaseCocca
+        self.status_mapping = {
+          "active" => :registered,
+          "delegated" => :registered,
+          "not registered" => :available,
+          "active - pending transfer" => :registered,
+        }
       end
 
     end