whois 3.4.2 → 3.4.3

data/lib/whois/record/parser/ccwhois.verisign-grs.com.rb

@@ -0,0 +1,27 @@
+#--
+# Ruby Whois
+#
+# An intelligent pure Ruby WHOIS client and parser.
+#
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
+#++
+
+
+require 'whois/record/parser/base_verisign'
+
+
+module Whois
+  class Record
+    class Parser
+
+      # Parser for the ccwhois.verisign-grs.com server.
+      #
+      # @see Whois::Record::Parser::Example
+      #   The Example parser for the list of all available methods.
+      #
+      class CcwhoisVerisignGrsCom < BaseVerisign
+      end
+
+    end
+  end
+end

data/lib/whois/record/parser/jobswhois.verisign-grs.com.rb

@@ -7,8 +7,7 @@
 #++
 
 
-require 'whois/record/parser/base'
-require 'whois/record/scanners/verisign'
+require 'whois/record/parser/base_verisign'
 
 
 module Whois
@@ -20,79 +19,7 @@ module Whois
       # @see Whois::Record::Parser::Example
       #   The Example parser for the list of all available methods.
       #
-      class JobswhoisVerisignGrsCom < Base
-        include Scanners::Scannable
-
-        self.scanner = Scanners::Verisign
-
-
-        property_supported :disclaimer do
-          node("Disclaimer")
-        end
-
-
-        property_supported :domain do
-          node("Domain Name", &:downcase)
-        end
-
-        property_supported :domain_id do
-          node("Domain ID")
-        end
-
-
-        property_supported :status do
-          node("Domain Status")
-        end
-
-        property_supported :available? do
-          node("Sponsoring Registrar").nil?
-        end
-
-        property_supported :registered? do
-          !available?
-        end
-
-
-        property_supported :created_on do
-          node("Creation Date") { |value| Time.parse(value) }
-        end
-
-        property_supported :updated_on do
-          node("Updated Date") { |value| Time.parse(value) }
-        end
-
-        property_supported :expires_on do
-          node("Expiration Date") { |value| Time.parse(value) }
-        end
-
-
-        property_supported :registrar do
-          node("Sponsoring Registrar") do |value|
-            Whois::Record::Registrar.new(
-                :id           => node("Sponsoring Registrar IANA ID"),
-                :name         => value,
-                :organization => value,
-                :url          => referral_url
-            )
-          end
-        end
-
-
-        property_supported :nameservers do
-          Array.wrap(node("Name Server")).reject { |value| value =~ /no nameserver/i }.map do |name|
-            Nameserver.new(:name => name.downcase)
-          end
-        end
-
-
-        def referral_whois
-          node("Whois Server")
-        end
-
-        def referral_url
-          node("Referral URL")
-        end
-
+      class JobswhoisVerisignGrsCom < BaseVerisign
       end
 
     end

data/lib/whois/record/parser/whois.hkirc.hk.rb

@@ -34,7 +34,7 @@ module Whois
         end
 
         property_supported :available? do
-          content_for_scanner.strip == 'Domain Not Found'
+          content_for_scanner.strip == 'The domain has not been registered.'
         end
 
         property_supported :registered? do

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

@@ -7,7 +7,7 @@
 #++
 
 
-require 'whois/record/parser/base'
+require 'whois/record/parser/base_icann_compliant'
 
 
 module Whois
@@ -19,99 +19,10 @@ module Whois
       # @see Whois::Record::Parser::Example
       #   The Example parser for the list of all available methods.
       #
-      class WhoisMarkmonitorCom < Base
-
-        property_not_supported :status
-
-        # The server is contacted only in case of a registered domain.
-        property_supported :available? do
-          false
-        end
-
-        property_supported :registered? do
-          !available?
-        end
-
-
-        property_supported :created_on do
-          if content_for_scanner =~ /Created on\.+: (.+)\.\n/
-            Time.parse($1)
-          end
-        end
-
-        property_supported :updated_on do
-          if content_for_scanner =~ /Record last updated on\.+: (.+)\.\n/
-            Time.parse($1)
-          end
-        end
-
-        property_supported :expires_on do
-          if content_for_scanner =~ /Expires on\.+: (.+)\.\n/
-            Time.parse($1)
-          end
-        end
-
-
-        property_supported :registrar do
-          Record::Registrar.new(
-            name: content_for_scanner.slice(/Registrar Name: (.+)\n/, 1),
-            url:  content_for_scanner.slice(/Registrar Homepage: (.+)\n/, 1)
-          )
-        end
-
-        property_supported :registrant_contacts do
-          build_contact('Registrant:', Record::Contact::TYPE_REGISTRANT)
-        end
-
-        property_supported :admin_contacts do
-          build_contact('Administrative Contact:', Record::Contact::TYPE_ADMINISTRATIVE)
-        end
-
-        property_supported :technical_contacts do
-          build_contact('Technical Contact, Zone Contact:', Record::Contact::TYPE_TECHNICAL)
-        end
-
-
-        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(:name => line.strip)
-            end
-          end
-        end
-
-
-      private
-
-        def build_contact(element, type)
-          match = content_for_scanner.slice(/#{element}\n((.+\n){6})/, 1)
-          return unless match
-
-          lines = match.split("\n").map(&:strip)
-
-          # 0 DNS Admin
-          # 1 Google Inc.
-          # 2 1600 Amphitheatre Parkway
-          # 3 Mountain View CA 94043
-          # 4 US
-          # 5 dns-admin@google.com +1.6506234000 Fax: +1.6506188571
-          city, state, zip = lines[3].scan(/^(.+) ([A-Z]{2}) ([0-9]+)$/).first
-          email, phone, fax = lines[5].scan(/^(.+) (.+) Fax: (.+)$/).first
-          Record::Contact.new(
-            :type => type,
-            :name => lines[0],
-            :organization => lines[1],
-            :address => lines[2],
-            :city => city,
-            :state => state,
-            :zip => zip,
-            :country_code => lines[4],
-            :email => email,
-            :phone => phone,
-            :fax => fax
-          )
-        end
-
+      class WhoisMarkmonitorCom < BaseIcannCompliant
+        self.scanner = Scanners::BaseIcannCompliant, {
+            pattern_available: /^No match for/
+        }
       end
 
     end

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

@@ -20,12 +20,6 @@ module Whois
       #   The Example parser for the list of all available methods.
       #
       class WhoisNicAf < BaseCocca2
-
-        property_supported :status do
-          list = Array.wrap(node("Domain Status")).map(&:downcase)
-          list.include?("no object found") ? :available : super()
-        end
-
       end
 
     end

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

@@ -20,6 +20,12 @@ module Whois
       #   The Example parser for the list of all available methods.
       #
       class WhoisNicCd < BaseCocca2
+
+        property_supported :status do
+          list = Array.wrap(node("Domain Status")).map(&:downcase)
+          list.include?("available") ? :available : super()
+        end
+
       end
 
     end

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

@@ -28,14 +28,10 @@ module Whois
       class WhoisNicDz < Base
 
         property_supported :status do
-          if content_for_scanner =~ /ETAT:\.+(.+?)\n/
-            case $1.downcase
-              when "actif" then :registered
-              else
-                Whois.bug!(ParserError, "Unknown status `#{$1}'.")
-            end
-          else
+          if available?
             :available
+          else
+            :registered
           end
         end
 

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

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

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

@@ -20,6 +20,12 @@ module Whois
       #   The Example parser for the list of all available methods.
       #
       class WhoisNicGs < BaseCocca2
+
+        property_supported :status do
+          list = Array.wrap(node("Domain Status")).map(&:downcase)
+          list.include?("available") ? :available : super()
+        end
+
       end
 
     end

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

@@ -20,6 +20,12 @@ module Whois
       #   The Example parser for the list of all available methods.
       #
       class WhoisNicMu < BaseCocca2
+
+        property_supported :status do
+          list = Array.wrap(node("Domain Status")).map(&:downcase)
+          list.include?("available") ? :available : super()
+        end
+
       end
 
     end

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

@@ -30,7 +30,7 @@ module Whois
         end
 
         property_supported :available? do
-          !!(content_for_scanner =~ /No match/)
+          !!(content_for_scanner =~ /^No match/)
         end
 
         property_supported :registered? do

data/lib/whois/record/parser/whois.nic.net.ng.rb

@@ -16,6 +16,12 @@ module Whois
 
       # Parser for the whois.nic.net.ng server.
       class WhoisNicNetNg < BaseCocca2
+
+        property_supported :status do
+          list = Array.wrap(node("Domain Status")).map(&:downcase)
+          list.include?("available") ? :available : super()
+        end
+
       end
 
     end

data/lib/whois/record/parser/whois.nic.net.sb.rb

@@ -20,6 +20,12 @@ module Whois
       #   The Example parser for the list of all available methods.
       #
       class WhoisNicNetSb < BaseCocca2
+
+        property_supported :status do
+          list = Array.wrap(node("Domain Status")).map(&:downcase)
+          list.include?("available") ? :available : super()
+        end
+
       end
 
     end

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

@@ -7,8 +7,7 @@
 #++
 
 
-require 'whois/record/parser/base'
-require 'whois/record/scanners/verisign'
+require 'whois/record/parser/base_verisign'
 
 
 module Whois
@@ -16,72 +15,11 @@ module Whois
     class Parser
 
       # Parser for the whois.nic.tv server.
-      class WhoisNicTv < Base
-        include Scanners::Scannable
-
-        self.scanner = Scanners::Verisign
-
-
-        property_supported :disclaimer do
-          node("Disclaimer")
-        end
-
-
-        property_supported :domain do
-          node("Domain Name") { |raw| raw.downcase }
-        end
-
-        property_not_supported :domain_id
-
-
-        property_supported :status do
-          node("Status")
-        end
-
-        property_supported :available? do
-          node("Registrar").nil?
-        end
-
-        property_supported :registered? do
-          !available?
-        end
-
-
-        property_supported :created_on do
-          node("Creation Date") { |raw| Time.parse(raw) }
-        end
-
-        property_supported :updated_on do
-          node("Updated Date") { |raw| Time.parse(raw) }
-        end
-
-        property_supported :expires_on do
-          node("Expiration Date") { |raw| Time.parse(raw) }
-        end
-
-
-        property_supported :registrar do
-          # Return nil because when the response contains more than one registrar section
-          # the response can be messy. See, for instance, the Verisign response for google.com.
-          nil
-        end
-
-
-        property_supported :nameservers do
-          Array.wrap(node("Name Server")).reject { |value| value =~ /no nameserver/i }.map do |name|
-            Record::Nameserver.new(:name => name.downcase)
-          end
-        end
-
-
-        def referral_whois
-          node("Whois Server")
-        end
-
-        def referral_url
-          node("Referral URL")
-        end
-
+      #
+      # @see Whois::Record::Parser::Example
+      #   The Example parser for the list of all available methods.
+      #
+      class WhoisNicTv < BaseVerisign
       end
 
     end