whois 2.0.7 → 2.1.0

data/lib/whois/record/parser/scanners/whois.tld.ee.rb

@@ -0,0 +1,41 @@
+#--
+# Ruby Whois
+#
+# An intelligent pure Ruby WHOIS client and parser.
+#
+# Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
+#++
+
+
+require 'whois/record/parser/scanners/base'
+
+
+module Whois
+  class Record
+    class Parser
+      module Scanners
+
+        class WhoisTldEe < Scanners::Base
+
+          def parse_content
+            if @input.scan(/contact:\s+(.*)\n/)
+              section = @input[1].strip
+              content = {}
+
+              while @input.scan(/(.*?):\s+(.*?)\n/)
+                content[@input[1]] = @input[2]
+              end
+
+              @ast[section] = content
+            # FIXME: incomplete scanner, it skips all the properties
+            else
+              @input.scan(/(.*)\n/)
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -7,69 +7,31 @@
 #++
 
 
-require 'whois/record/parser/base'
+require 'whois/record/parser/base_afilias'
 
 
 module Whois
   class Record
     class Parser
 
-      #
-      # = whois.aero parser
-      #
       # Parser for the whois.aero 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 WhoisAero < Base
+      class WhoisAero < BaseAfilias
 
-        property_supported :status do
-          if content_for_scanner =~ /Domain Status:(.+?)\n/
-            case $1.downcase
-              when "ok" then :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?
+        property_supported :status do
+          Array.wrap(node("Domain Status"))
         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 =~ /Updated On:(.+?)\n/
-            Time.parse($1)
+          node("Updated On") do |value|
+            Time.parse(value)
           end
         end
 
         property_supported :expires_on do
-          if content_for_scanner =~ /Expires On:(.+?)\n/
-            Time.parse($1)
-          end
-        end
-
-
-        property_supported :nameservers do
-          content_for_scanner.scan(/Name Server:([^\s]+)\n/).flatten.map do |name|
-            Record::Nameserver.new(name.downcase)
+          node("Expires On") do |value|
+            Time.parse(value)
           end
         end
 

data/lib/whois/record/parser/whois.afilias-grs.info.rb

@@ -7,64 +7,15 @@
 #++
 
 
-require 'whois/record/parser/base'
+require 'whois/record/parser/base_afilias'
 
 
 module Whois
   class Record
     class Parser
 
-      #
-      # = whois.afilias-grs.info parser
-      #
       # Parser for the whois.afilias-grs.info 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 WhoisAfiliasGrsInfo < Base
-
-        property_supported :status do
-          content_for_scanner.scan(/Status:(.*?)\n+/).flatten
-        end
-
-        property_supported :available? do
-          (content_for_scanner.strip == "NOT FOUND")
-        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 =~ /Last Updated On:(.*?)\n/
-            Time.parse($1)
-          end
-        end
-
-        property_supported :expires_on do
-          if content_for_scanner =~ /Expiration Date:(.*?)\n/
-            Time.parse($1)
-          end
-        end
-
-
-        property_supported :nameservers do
-          content_for_scanner.scan(/Name Server:([^\s]+)\n/).flatten.map do |name|
-            Record::Nameserver.new(name.downcase)
-          end
-        end
-
+      class WhoisAfiliasGrsInfo < BaseAfilias
       end
 
     end

data/lib/whois/record/parser/whois.afilias.info.rb

@@ -7,139 +7,15 @@
 #++
 
 
-require 'whois/record/parser/base'
-require 'whois/record/parser/scanners/afilias'
+require 'whois/record/parser/base_afilias'
 
 
 module Whois
   class Record
     class Parser
 
-      #
-      # = whois.afilias.info parser
-      #
       # Parser for the whois.afilias.info server.
-      #
-      class WhoisAfiliasInfo < Base
-        include Features::Ast
-
-
-        property_supported :disclaimer do
-          node("property-disclaimer")
-        end
-
-
-        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("Status") || []
-        end
-
-        property_supported :available? do
-          !!node("status-available")
-        end
-
-        property_supported :registered? do
-          !available?
-        end
-
-
-        property_supported :created_on do
-          node("Created On") do |value|
-            Time.parse(value)
-          end
-        end
-
-        property_supported :updated_on do
-          node("Last Updated On") do |value|
-            Time.parse(value)
-          end
-        end
-
-        property_supported :expires_on do
-          node("Expiration Date") do |value|
-            Time.parse(value)
-          end
-        end
-
-
-        property_supported :registrar do
-          node("Sponsoring Registrar") do |value|
-            value =~ /(.+?) \((.+?)\)/ || Whois.bug!("Unknown registrar format `#{value}'")
-            Record::Registrar.new(
-              :id =>            $2,
-              :name =>          $1,
-              :organization =>  $1
-            )
-          end
-        end
-
-        property_supported :registrant_contacts do
-          contact("Registrant", Whois::Record::Contact::TYPE_REGISTRANT)
-        end
-
-        property_supported :admin_contacts do
-          contact("Admin", Whois::Record::Contact::TYPE_ADMIN)
-        end
-
-        property_supported :technical_contacts do
-          contact("Tech", Whois::Record::Contact::TYPE_TECHNICAL)
-        end
-
-
-
-        property_supported :nameservers do
-          Array.wrap(node("Name Server")).reject(&:empty?).map do |name|
-            Nameserver.new(name.downcase)
-          end
-        end
-
-
-        # Initializes a new {Scanner} instance
-        # passing the {Whois::Record::Parser::Base#content_for_scanner}
-        # and calls +parse+ on it.
-        #
-        # @return [Hash]
-        def parse
-          Scanners::Afilias.new(content_for_scanner).parse
-        end
-
-
-        private
-
-          def contact(element, type)
-            node("#{element} ID") do
-              address = (1..3).map { |i| node("#{element} Street#{i}") }.delete_if(&:empty?).join(" ")
-
-              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"),
-                :phone        => node("#{element} Phone"),
-                :fax          => node("#{element} FAX"),
-                :email        => node("#{element} Email")
-              )
-            end
-          end
-
+      class WhoisAfiliasInfo < BaseAfilias
       end
 
     end

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

@@ -8,7 +8,7 @@
 
 
 require 'whois/record/parser/base'
-require 'whois/record/parser/scanners/whoisbiz'
+require 'whois/record/parser/scanners/whois.biz.rb'
 
 
 module Whois
@@ -21,7 +21,7 @@ module Whois
       # Parser for the whois.biz server.
       #
       class WhoisBiz < Base
-        include Features::Ast
+        include Scanners::Ast
 
         # Actually the :disclaimer is supported,
         # but extracting it with the current scanner
@@ -48,7 +48,7 @@ module Whois
         end
 
         property_supported :available? do
-          !!node("status-available")
+          !!node("status:available")
         end
 
         property_supported :registered? do
@@ -99,13 +99,13 @@ module Whois
         end
 
 
-        # Initializes a new {Scanners::Verisign} instance
-        # passing the {Whois::Record::Parser::Base#content_for_scanner}
+        # 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
+          Scanners::WhoisBiz.new(content_for_scanner).parse
         end
 
 

data/lib/whois/record/parser/whois.cnnic.cn.rb

@@ -21,7 +21,7 @@ module Whois
       # Parser for the whois.cnnic.cn server.
       #
       class WhoisCnnicCn < Base
-        include Features::Ast
+        include Scanners::Ast
 
 
         property_not_supported :disclaimer
@@ -46,7 +46,7 @@ module Whois
         end
 
         property_supported :available? do
-          !!node("status-available")
+          !!node("status:available")
         end
 
         property_supported :registered? do
@@ -94,12 +94,12 @@ module Whois
 
         # NEWPROPERTY
         def reserved?
-          !!node("status-reserved")
+          !!node("status:reserved")
         end
 
 
-        # Initializes a new {Scanner} instance
-        # passing the {Whois::Record::Parser::Base#content_for_scanner}
+        # Initializes a new {Scanners::Cnnic} instance
+        # passing the {#content_for_scanner}
         # and calls +parse+ on it.
         #
         # @return [Hash]

data/lib/whois/record/parser/whois.crsnic.net.rb

@@ -21,7 +21,7 @@ module Whois
       # Parser for the whois.crsnic.net server.
       #
       class WhoisCrsnicNet < Base
-        include Features::Ast
+        include Scanners::Ast
 
         property_supported :disclaimer do
           node("Disclaimer")
@@ -88,7 +88,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.denic.de.rb

@@ -8,7 +8,7 @@
 
 
 require 'whois/record/parser/base'
-require 'whois/record/parser/scanners/base'
+require 'whois/record/parser/scanners/whois.denic.de.rb'
 
 
 module Whois
@@ -24,7 +24,7 @@ module Whois
       # @author Aaron Mueller <mail@aaron-mueller.de>
       #
       class WhoisDenicDe < Base
-        include Features::Ast
+        include Scanners::Ast
 
         property_supported :disclaimer do
           node("Disclaimer")
@@ -64,7 +64,7 @@ module Whois
         end
 
         property_supported :available? do
-          !invalid? && (!!node("status-available") || node("Status") == "free")
+          !invalid? && (!!node("status:available") || node("Status") == "free")
         end
 
         property_supported :registered? do
@@ -130,7 +130,7 @@ module Whois
         #   % Error: 55000000002 Connection refused; access control limit reached.
         #
         def response_throttled?
-          !!node("response-throttled")
+          !!node("response:throttled")
         end
 
 
@@ -146,18 +146,18 @@ module Whois
         # NEWPROPERTY
         def invalid?
           cached_properties_fetch :invalid? do
-            !!node("status-invalid") || node("Status") == "invalid"
+            !!node("status:invalid") || node("Status") == "invalid"
           end
         end
 
 
-        # Initializes a new {Scanner} instance
-        # passing the {Whois::Record::Parser::Base#content_for_scanner}
+        # Initializes a new {Scanners::WhoisDenicDe} instance
+        # passing the {#content_for_scanner}
         # and calls +parse+ on it.
         #
         # @return [Hash]
         def parse
-          Scanner.new(content_for_scanner).parse
+          Scanners::WhoisDenicDe.new(content_for_scanner).parse
         end
 
 
@@ -171,103 +171,6 @@ module Whois
             end
           end
 
-
-          class Scanner < Scanners::Base
-
-            def parse_content
-              parse_throttled   ||
-              parse_disclaimer  ||
-              parse_invalid     ||    # 1.10.0, 1.11.0
-              parse_available   ||    # 1.10.0, 1.11.0
-              parse_pair(@ast)  ||
-              parse_contact     ||
-              parse_db_time     ||    # 2.0
-
-              trim_empty_line   ||
-              error!("Unexpected token")
-            end
-
-
-            def parse_throttled
-              if @input.match?(/^% Error: 55000000002/)
-                @ast["response-throttled"] = true
-                @input.skip(/^.+\n/)
-              end
-            end
-
-            def parse_disclaimer
-              if @input.match?(/% Copyright \(c\) *\d{4} by DENIC\n/)
-                @input.scan_until(/% Terms and Conditions of Use\n/)
-                lines = []
-                while @input.match?(/%/) && @input.scan(/%(.*)\n/)
-                  lines << @input[1].strip unless @input[1].strip == ""
-                end
-                @ast["Disclaimer"] = lines.join(" ")
-              end
-            end
-
-            def parse_pair(node)
-              if @input.scan(/([^  \[]*):(.*)\n/)
-                key, value = @input[1].strip, @input[2].strip
-                if node[key].nil?
-                  node[key] = value
-                else
-                  node[key].is_a?(Array) || node[key] = [node[key]]
-                  node[key] << value
-                end
-                true
-              end
-            end
-
-            def parse_contact
-              if @input.scan(/\[(.*)\]\n/)
-                contact_name = @input[1]
-                contact = {}
-                while parse_pair(contact)
-                end
-                @ast[contact_name] = {
-                  "id" => nil,
-                  "name" => contact['Name'],
-                  "organization" => contact['Organisation'],
-                  "address" => contact['Address'],
-                  "city" => contact['City'],
-                  # 1.10.0, 1.11.0 || 2.0
-                  "zip" => contact['Pcode'] || contact['PostalCode'],
-                  "state" => nil,
-                  "country" => contact['Country'],
-                  "country_code" => contact['CountryCode'],
-                  "phone" => contact['Phone'],
-                  "fax" => contact['Fax'],
-                  "email" => contact['Email'],
-                  "created_on" => nil,
-                  "updated_on" => contact['Changed']
-                }
-              end
-            end
-
-            # Compatibility with Version: 1.11.0, 1.10.0
-            def parse_available
-              if @input.match?(/% Object ".+" not found in database\n/)
-                while @input.scan(/%(.*)\n/)  # strip junk
-                end
-                @ast["status-available"] = true
-              end
-            end
-
-            def parse_invalid
-              if @input.match?(/% ".+" is not a valid domain name\n/)
-                @input.scan(/% "(.+?)" is not a valid domain name\n/)
-                @ast["Domain"] = @input[1]
-                @ast["status-invalid"] = true
-              end
-            end
-
-            def parse_db_time
-              @input.scan(/^% DB time is (.+)\n$/)
-            end
-
-          end
-
       end
     end
   end