whois 2.0.7 → 2.1.0

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

@@ -7,73 +7,82 @@
 #++
 
 
-require 'whois/record/parser/base'
+require 'whois/record/parser/base_afilias'
 
 
 module Whois
   class Record
     class Parser
 
-      #
-      # = whois.nic.asia parser
-      #
       # Parser for the whois.nic.asia 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 WhoisNicAsia < Base
+      class WhoisNicAsia < BaseAfilias
 
         property_supported :status do
-          if content_for_scanner =~ /Domain Status:(.+?)\n/
-            case $1.downcase
-              when /^ok/, /\bclient/
-                :registered
-              else
-                Whois.bug!(ParserError, "Unknown status `#{$1}'.")
-            end
-          else
-            :available
-          end
-        end
-
-        property_supported :available? do
-          (content_for_scanner.strip == "NOT FOUND")
-        end
-
-        property_supported :registered? do
-          !available?
+          Array.wrap(node("Domain Status"))
         end
 
 
         property_supported :created_on do
-          if content_for_scanner =~ /Domain Create Date:(.*?)\n/
-            Time.parse($1)
+          node("Domain Create Date") do |value|
+            Time.parse(value)
           end
         end
 
         property_supported :updated_on do
-          if content_for_scanner =~ /Domain Last Updated Date:(.*?)\n/
-            Time.parse($1)
+          node("Domain Last Updated Date") do |value|
+            Time.parse(value)
           end
         end
 
         property_supported :expires_on do
-          if content_for_scanner =~ /Domain Expiration Date:(.*?)\n/
-            Time.parse($1)
+          node("Domain Expiration Date") do |value|
+            Time.parse(value)
           end
         end
 
 
+        property_supported :admin_contacts do
+          contact("Administrative", Whois::Record::Contact::TYPE_ADMIN)
+        end
+
+        property_supported :technical_contacts do
+          contact("Technical", Whois::Record::Contact::TYPE_TECHNICAL)
+        end
+
+
         property_supported :nameservers do
-          content_for_scanner.scan(/Nameservers:([^\s]+)\n/).flatten.map do |name|
-            Record::Nameserver.new(name.downcase)
+          Array.wrap(node("Nameservers")).reject(&:empty?).map do |name|
+            Nameserver.new(name.downcase)
           end
         end
 
+
+        private
+
+          def contact(element, type)
+            node("#{element} ID") do
+              address = ["", "2", "3"].
+                  map { |i| node("#{element} Address#{i}") }.
+                  delete_if(&:empty?).
+                  join("\n")
+
+              Record::Contact.new(
+                :type         => type,
+                :id           => node("#{element} ID"),
+                :name         => node("#{element} Name"),
+                :organization => node("#{element} Organization"),
+                :address      => address,
+                :city         => node("#{element} City"),
+                :zip          => node("#{element} Postal Code"),
+                :state        => node("#{element} State/Province"),
+                :country_code => node("#{element} Country/Economy"),
+                :phone        => node("#{element} Phone"),
+                :fax          => node("#{element} FAX"),
+                :email        => node("#{element} E-mail")
+              )
+            end
+          end
+
       end
 
     end

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

@@ -21,7 +21,7 @@ module Whois
       # Parser for the whois.nic.cc server.
       #
       class WhoisNicCc < Base
-        include Features::Ast
+        include Scanners::Ast
 
         property_supported :disclaimer do
           node("Disclaimer")
@@ -85,7 +85,7 @@ module Whois
 
 
         # Initializes a new {Scanners::Verisign} instance
-        # passing the {Whois::Record::Parser::Base#content_for_scanner}
+        # passing the {#content_for_scanner}
         # and calls +parse+ on it.
         #
         # @return [Hash]

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

@@ -8,7 +8,7 @@
 
 
 require 'whois/record/parser/base'
-require 'whois/record/parser/scanners/base'
+require 'whois/record/parser/scanners/whois.nic.hu.rb'
 
 
 module Whois
@@ -24,7 +24,7 @@ module Whois
       # @author Gábor Vészi <veszig@done.hu>
       #
       class WhoisNicHu < Base
-        include Features::Ast
+        include Scanners::Ast
 
         property_supported :disclaimer do
           node("disclaimer")
@@ -41,9 +41,9 @@ module Whois
 
 
         property_supported :status do
-          if node("status-available")
+          if node("status:available")
             :available
-          elsif node("status-inprogress")
+          elsif node("status:inprogress")
             :registered
           else
             :registered
@@ -129,13 +129,13 @@ module Whois
         end
 
 
-        # Initializes a new {Scanner} instance
-        # passing the {Whois::Record::Parser::Base#content_for_scanner}
+        # Initializes a new {Scanners::WhoisNicHu} instance
+        # passing the {#content_for_scanner}
         # and calls +parse+ on it.
         #
         # @return [Hash]
         def parse
-          Scanner.new(content_for_scanner).parse
+          Scanners::WhoisNicHu.new(content_for_scanner).parse
         end
 
 
@@ -165,173 +165,6 @@ module Whois
             [address, city, zip, country_code]
           end
 
-
-        class Scanner < Scanners::Base
-
-          def parse_content
-            parse_version     ||
-            parse_disclaimer  ||
-            parse_domain      ||
-            parse_available   ||
-            parse_in_progress ||
-
-            # v2.0
-            parse_moreinfo    ||
-
-            # v1.99
-            parse_domain_data ||
-            parse_contacts    ||
-
-            trim_empty_line   ||
-            error!("Unexpected token")
-          end
-
-
-          def parse_version
-            if @input.match?(/% Whois server .*\n/)
-              p("whois.nic.hu: parse_version") if 1 == 2 || $DEBUG
-              @input.scan(/% Whois server ([\w\d\.]*).*?\n/)
-              @ast["version"] = @input[1]
-            end
-          end
-
-          # FIXME: Requires UTF-8 Encoding (see #11)
-          def parse_moreinfo
-            if @input.match?(/Tov.* ld\.:\n/)
-              p("whois.nic.hu: parse_moreinfo") if 1 == 2 || $DEBUG
-              @ast["moreinfo"] = @input.scan_until(/^\n/)
-            end
-          end
-
-          def parse_disclaimer
-            if @input.match?(/^Rights.*\n/)
-              p("whois.nic.hu: parse_disclaimer") if 1 == 2 || $DEBUG
-              lines = @input.scan_until(/^\n/)
-              @ast["disclaimer"] = lines.strip
-            end
-          end
-
-          def parse_domain
-            if @input.match?(/^domain:\s+(.*)\n/) && @input.scan(/^domain:\s+(.*?)\n/)
-              p("whois.nic.hu: parse_domain") if 1 == 2 || $DEBUG
-              @ast["domain"] = @input[1].strip
-            end
-          end
-
-          # FIXME: Requires UTF-8 Encoding (see #11)
-          def parse_available
-            if @input.match?(/Nincs (.*?) \/ No match\n/)
-              p("whois.nic.hu: parse_not_found") if 1 == 2 || $DEBUG
-              @input.scan(/Nincs (.*?) \/ No match\n/)
-              @ast["status-available"] = true
-            end
-          end
-
-          # FIXME: Requires UTF-8 Encoding (see #11)
-          def parse_in_progress
-            if @input.match?(/(.*?) folyamatban \/ Registration in progress\n/)
-              p("whois.nic.hu: parse_in_progress") if 1 == 2 || $DEBUG
-              @input.scan(/(.*?) folyamatban \/ Registration in progress\n/)
-              @ast["status-inprogress"] = true
-            end
-          end
-
-          def parse_domain_data
-            if @input.match?(/(.+?):\s+(.*)\n/)
-              p("whois.nic.hu: parse_domain_data") if 1 == 2 || $DEBUG
-              while @input.scan(/(.+?):\s+(.*)\n/)
-                key, value = @input[1].strip, @input[2].strip
-                if key == 'person'
-                  @ast['name'] = value
-                elsif key == 'org'
-                  if value =~ /org_name_hun:\s+(.*)\Z/
-                    @ast['name'] = $1
-                  elsif value =~ /org_name_eng:\s+(.*)\Z/
-                    @ast['org'] = $1
-                  elsif value != 'Private person'
-                    contact['org'] = value
-                  end
-                elsif @ast[key].nil?
-                  @ast[key] = value
-                elsif @ast[key].is_a? Array
-                  @ast[key] << value
-                else
-                  @ast[key] = [@ast[key], value].flatten
-                end
-              end
-              true
-            end
-          end
-
-          def parse_contacts
-            if @input.match?(/\n(person|org):/)
-              p("whois.nic.hu: parse_contacts") if 1 == 2 || $DEBUG
-              @input.scan(/\n/)
-              while @input.match?(/(.+?):\s+(.*)\n/)
-                parse_contact
-              end
-              true
-            end
-          end
-
-          def parse_contact
-            contact ||= {}
-            p("whois.nic.hu: parse_contact") if 1 == 2 || $DEBUG
-            while @input.scan(/(.+?):\s+(.*)\n/)
-              key, value = @input[1].strip, @input[2].strip
-              if key == 'hun-id'
-                a1 = contact['address'][1].split(/\s/)
-                zip = a1.shift
-                city = a1.join(' ')
-                # we should keep the old values if this is an already
-                # defined contact
-                if @ast[value].nil?
-                  @ast[value] = {
-                    "id" => value,
-                    "name" => contact['name'],
-                    "organization" => contact['org'],
-                    "address" => contact['address'][0],
-                    "city" => city,
-                    "zip" => zip,
-                    "country_code" => contact['address'][2],
-                    "phone" => contact['phone'],
-                    "fax" => contact['fax-no'],
-                    "email" => contact['e-mail']
-                  }
-                else
-                  @ast[value]["id"] ||= value
-                  @ast[value]["name"] ||= contact['name']
-                  @ast[value]["organization"] ||= contact['org']
-                  @ast[value]["address"] ||= contact['address'][0]
-                  @ast[value]["city"] ||= city
-                  @ast[value]["zip"] ||= zip
-                  @ast[value]["country_code"] ||= contact['address'][2]
-                  @ast[value]["phone"] ||= contact['phone']
-                  @ast[value]["fax"] ||= contact['fax-no']
-                  @ast[value]["email"] ||= contact['e-mail']
-                end
-                contact = {}
-              elsif key == 'person'
-                contact['name'] = value
-              elsif key == 'org'
-                if value =~ /org_name_hun:\s+(.*)\Z/
-                  contact['name'] = $1
-                elsif value =~ /org_name_eng:\s+(.*)\Z/
-                  contact['org'] = $1
-                else
-                  contact['org'] = value
-                end
-              elsif key == 'address' && !contact['address'].nil?
-                contact['address'] = [contact['address'], value].flatten
-              else
-                contact[key] = value
-              end
-            end
-            true
-          end
-
-        end
-
       end
 
     end

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

@@ -8,7 +8,7 @@
 
 
 require 'whois/record/parser/base'
-require 'whois/record/parser/scanners/whoisit'
+require 'whois/record/parser/scanners/whois.nic.it.rb'
 
 
 module Whois
@@ -21,7 +21,7 @@ module Whois
       # Parser for the whois.nic.it server.
       #
       class WhoisNicIt < Base
-        include Features::Ast
+        include Scanners::Ast
 
 
         property_supported :disclaimer do
@@ -121,16 +121,16 @@ module Whois
         #
         # @return [Boolean]
         def response_unavailable?
-          !!node("status-unavailable")
+          !!node("status:unavailable")
         end
 
-        # Initializes a new {Scanner} instance
-        # passing the {Whois::Record::Parser::Base#content_for_scanner}
+        # Initializes a new {Scanners::WhoisIt} instance
+        # passing the {#content_for_scanner}
         # and calls +parse+ on it.
         #
         # @return [Hash]
         def parse
-          Scanners::Whoisit.new(content_for_scanner).parse
+          Scanners::WhoisNicIt.new(content_for_scanner).parse
         end
 
 

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

@@ -28,11 +28,7 @@ module Whois
       class WhoisNicName < Base
 
         property_supported :status do
-          if available?
-            :available
-          else
-            :registered
-          end
+          content_for_scanner.scan(/Domain Status:\s+(.+?)\n/).flatten
         end
 
         property_supported :available? do

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

@@ -28,15 +28,7 @@ module Whois
       class WhoisNicTravel < Base
 
         property_supported :status do
-          if content_for_scanner =~ /Domain 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(/Domain Status:\s+(.+?)\n/).flatten
         end
 
         property_supported :available? do
@@ -49,19 +41,19 @@ module Whois
 
 
         property_supported :created_on do
-          if content_for_scanner =~ /Domain Registration Date:\s+(.*)\n/
+          if content_for_scanner =~ /Domain Registration Date:\s+(.+?)\n/
             Time.parse($1)
           end
         end
 
         property_supported :updated_on do
-          if content_for_scanner =~ /Domain Last Updated Date:\s+(.*)\n/
+          if content_for_scanner =~ /Domain Last Updated Date:\s+(.+?)\n/
             Time.parse($1)
           end
         end
 
         property_supported :expires_on do
-          if content_for_scanner =~ /Domain Expiration Date:\s+(.*)\n/
+          if content_for_scanner =~ /Domain Expiration Date:\s+(.+?)\n/
             Time.parse($1)
           end
         end