whois 2.6.4 → 2.7.0

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

@@ -7,8 +7,7 @@
 #++
 
 
-require 'whois/record/parser/base'
-require 'whois/record/scanners/whois.biz.rb'
+require 'whois/record/parser/base_shared2'
 
 
 module Whois
@@ -16,117 +15,11 @@ module Whois
     class Parser
 
       # Parser for the whois.biz server.
-      class WhoisBiz < Base
-        include Scanners::Ast
-
-        # Actually the :disclaimer is supported,
-        # but extracting it with the current scanner
-        # would require too much effort.
-        # property_supported :disclaimer
-
-
-        property_supported :domain do
-          node("Domain Name", &:downcase)
-        end
-
-        property_supported :domain_id do
-          node("Domain ID")
-        end
-
-
-        property_not_supported :referral_whois
-
-        property_not_supported :referral_url
-
-
-        property_supported :status do
-          node("Domain Status")
-        end
-
-        property_supported :available? do
-          !!node("status:available")
-        end
-
-        property_supported :registered? do
-          !available?
-        end
-
-
-        property_supported :created_on do
-          node("Domain Registration Date") { |value| Time.parse(value) }
-        end
-
-        property_supported :updated_on do
-          node("Domain Last Updated Date") { |value| Time.parse(value) }
-        end
-
-        property_supported :expires_on do
-          node("Domain Expiration Date") { |value| Time.parse(value) }
-        end
-
-
-        property_supported :registrar do
-          node("Sponsoring Registrar") do |str|
-            Record::Registrar.new(
-              :id           => node("Sponsoring Registrar IANA ID"),
-              :name         => node("Sponsoring Registrar")
-            )
-          end
-        end
-
-
-        property_supported :registrant_contacts do
-          build_contact("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
-          Array.wrap(node("Name Server")).map do |name|
-            Nameserver.new(:name => name.downcase)
-          end
-        end
-
-
-        # Initializes a new {Scanners::WhoisBiz} instance
-        # passing the {#content_for_scanner}
-        # and calls +parse+ on it.
-        #
-        # @return [Hash]
-        def parse
-          Scanners::WhoisBiz.new(content_for_scanner).parse
-        end
-
-
-      private
-
-        def build_contact(element, type)
-          node("#{element} ID") do |str|
-            Record::Contact.new(
-              :type         => type,
-              :id           => node("#{element} ID"),
-              :name         => node("#{element} Name"),
-              :organization => node("#{element} Organization"),
-              :address      => node("#{element} Address1"),
-              :city         => node("#{element} City"),
-              :zip          => node("#{element} Postal Code"),
-              :state        => node("#{element} State/Province"),
-              :country      => node("#{element} Country"),
-              :country_code => node("#{element} Country Code"),
-              :phone        => node("#{element} Phone Number"),
-              :fax          => node("#{element} Facsimile Number"),
-              :email        => node("#{element} Email")
-            )
-          end
-        end
-
+      #
+      # @see Whois::Record::Parser::Example
+      #   The Example parser for the list of all available methods.
+      #
+      class WhoisBiz < BaseShared2
       end
 
     end

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

@@ -76,7 +76,6 @@ module Whois
           end
         end
 
-
         property_supported :registrant_contacts do
           build_contact("Registrant", Whois::Record::Contact::TYPE_REGISTRANT)
         end

data/lib/whois/record/parser/whois.cmc.iq.rb

@@ -0,0 +1,24 @@
+#--
+# Ruby Whois
+#
+# An intelligent pure Ruby WHOIS client and parser.
+#
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+#++
+
+
+require 'whois/record/parser/base_cocca'
+
+
+module Whois
+  class Record
+    class Parser
+
+      # Parser for the whois.cmc.iq server.
+      class WhoisCmcIq < BaseCocca
+        property_not_supported :nameservers
+      end
+
+    end
+  end
+end

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

@@ -14,16 +14,14 @@ module Whois
   class Record
     class Parser
 
-      #
-      # = whois.dk-hostmaster.dk
-      #
       # Parser for the whois.dk-hostmaster.dk 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 Mikkel Kristensen <mikkel@tdx.dk>
@@ -33,7 +31,10 @@ module Whois
         property_supported :status do
           if content_for_scanner =~ /Status:\s+(.+?)\n/
             case $1.downcase
-              when "active" then :registered
+              when "active"
+                :registered
+              when "deactivated"
+                :expired
               else
                 Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end

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

@@ -56,7 +56,11 @@ module Whois
           end
         end
 
-        property_not_supported :expires_on
+        property_supported :expires_on do
+          if content_for_scanner =~ /renewal date:\s+(.+?)\n/
+            Time.parse($1)
+          end
+        end
 
 
         property_supported :nameservers do

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

@@ -14,16 +14,14 @@ module Whois
   class Record
     class Parser
 
-      #
-      # = whois.domain-registry.nl parser
-      #
       # Parser for the whois.domain-registry.nl 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 WhoisDomainRegistryNl < Base
 
@@ -38,12 +36,17 @@ module Whois
         # - in quarantine: this .nl domain name's registration has been cancelled. Following cancellation, a domain name is placed in quarantine for forty days.
         #
         # @see https://www.sidn.nl/en/whois/
+        # @see https://www.sidn.nl/en/about-nl/whois/looking-up-a-domain-name/
         #
         property_supported :status do
-          if content_for_scanner =~ /Status:\s+(.*?)\n/
+          if content_for_scanner =~ /Status:\s+(.+?)\n/
             case $1.downcase
-            when "active"         then :registered
-            when "in quarantine"  then :redemption
+            when "active"
+              :registered
+            when "in quarantine"
+              :redemption
+            when "inactive"
+              :inactive
             else
               Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end
@@ -57,7 +60,7 @@ module Whois
         end
 
         property_supported :registered? do
-          [:registered, :redemption].include?(status)
+          status != :available
         end
 
 

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

@@ -90,8 +90,6 @@ module Whois
           match = content_for_scanner.slice(/#{element}\n((.+\n)+)\n/, 1)
           return unless match
 
-          lines = $1.split("\n").map(&:strip)
-
           # Lines 1 and 5 may be absent, depending on the record.
           # The parser attempts to correct for this, but may be a bit flaky
           # on non-standard data.
@@ -102,6 +100,9 @@ module Whois
           # 3 Scottsdale, Arizona 85260
           # 4 United States
           # 5 +1.4805058800      Fax -- +1.4805058844
+
+          lines = $1.split("\n").map(&:strip)
+
           phone = nil
           fax   = nil
           if lines[-1].to_s =~ /Fax --/

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

@@ -33,6 +33,8 @@ module Whois
               :reserved
             when "to be suspended"
               :redemption
+            when "suspended"
+              :expired
             else
               Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end

data/lib/whois/record/parser/whois.monic.mo.rb

@@ -0,0 +1,90 @@
+#--
+# Ruby Whois
+#
+# An intelligent pure Ruby WHOIS client and parser.
+#
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+#++
+
+
+require 'whois/record/parser/base'
+
+
+module Whois
+  class Record
+    class Parser
+
+      # Parser for the whois.monic.mo server.
+      #
+      # @see Whois::Record::Parser::Example
+      #   The Example parser for the list of all available methods.
+      #
+      class WhoisMonicMo < Base
+
+        property_not_supported :disclaimer
+
+
+        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
+          else
+            :registered
+          end
+        end
+
+        property_supported :available? do
+          !!(content_for_scanner =~ /No match for/)
+        end
+
+        property_supported :registered? do
+          !available?
+        end
+
+
+        property_not_supported :created_on
+
+        property_not_supported :updated_on
+
+        property_not_supported :expires_on
+
+
+        property_supported :registrar do
+          if content_for_scanner =~ /Registrar:\s+(.+)\n/
+            Record::Registrar.new(
+                :name         => $1
+            )
+          end
+        end
+
+        property_not_supported :registrant_contacts
+
+        property_not_supported :admin_contacts
+
+        property_not_supported :technical_contacts
+
+
+        property_supported :nameservers do
+          content_for_scanner.scan(/Name Server:\s+(.+)\n/).flatten.map do |name|
+            Record::Nameserver.new(:name => name.downcase)
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/whois/record/parser/whois.na-nic.com.na.rb

@@ -20,10 +20,14 @@ module Whois
         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
-            when "suspended"      then :inactive
+            when "active"
+              :registered
+            when "delegated"
+              :registered
+            when "not registered"
+              :available
+            when "suspended"
+              :inactive
             else
               Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end

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

@@ -7,77 +7,15 @@
 #++
 
 
-require 'whois/record/parser/base'
+require 'whois/record/parser/base_cocca'
 
 
 module Whois
   class Record
     class Parser
 
-      #
-      # = whois.netcom.cm parser
-      #
       # Parser for the whois.netcom.cm 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 WhoisNetcomCm < 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 => name.strip)
-            end
-          end
-        end
-
+      class WhoisNetcomCm < BaseCocca
       end
 
     end