whois 2.0.7 → 2.1.0

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

@@ -21,7 +21,7 @@ module Whois
       # Parser for the whois.nic.tv server.
       #
       class WhoisNicTv < Base
-        include Features::Ast
+        include Scanners::Ast
 
         property_supported :disclaimer do
           node("Disclaimer")
@@ -86,7 +86,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.us.rb

@@ -28,7 +28,7 @@ module Whois
       class WhoisNicUs < Base
 
         property_supported :status do
-          content_for_scanner.scan(/Domain Status:\s+(.*?)\n/).flatten
+          content_for_scanner.scan(/Domain Status:\s+(.+?)\n/).flatten
         end
 
         property_supported :available? do
@@ -41,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

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

@@ -15,128 +15,21 @@ module Whois
   class Record
     class Parser
 
-      #
-      # = whois.nic.xxx parser
-      #
       # Parser for the whois.nic.xxx server.
-      #
-      class WhoisNicXxx < 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
+      class WhoisNicXxx < BaseAfilias
 
         property_supported :updated_on do
           node("Last Updated On") do |value|
-            Time.parse(value)
+            Time.parse(value) unless value.empty?
           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")
-              )
+          def decompose_registrar(value)
+            if value =~ /(.+?) \((.+?)\)/
+              [$1, $2]
             end
           end
 

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

@@ -7,97 +7,15 @@
 #++
 
 
-require 'whois/record/parser/base'
-require 'whois/record/parser/scanners/base'
+require 'whois/record/parser/base_afilias'
 
 
 module Whois
   class Record
     class Parser
 
-      #
-      # = whois.publicinterestregistry.net parser
-      #
-      # Parser for the whois.publicinterestregistry.net server.
-      #
-      class WhoisPublicinterestregistryNet < Base
-        include Features::Ast
-
-        property_supported :disclaimer do
-          node("Disclaimer")
-        end
-
-
-        property_supported :domain do
-          node("Domain Name") { |value| value.downcase }
-        end
-
-        property_supported :domain_id do
-          node("Domain ID")
-        end
-
-
-        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") { |value| Time.parse(value) }
-        end
-
-        property_supported :updated_on do
-          node("Last Updated On") { |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 |registrar|
-            id, name = if registrar =~ /(.*?)\((.*?)\)/
-              [$2.strip, $1.strip]
-            else
-              [nil, registrar]
-            end
-            Whois::Record::Registrar.new(
-              :id   => id,
-              :name => name
-            )
-          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
-          node("Name Server") do |server|
-            server.reject(&:empty?).map do |name|
-              Record::Nameserver.new(name.downcase)
-            end
-          end
-        end
-
+      # Parser for the whois.publicinternetregistry.net server.
+      class WhoisPublicinterestregistryNet < BaseAfilias
 
         # Checks whether the response has been throttled.
         #
@@ -107,95 +25,17 @@ module Whois
         #   WHOIS LIMIT EXCEEDED - SEE WWW.PIR.ORG/WHOIS FOR DETAILS
         #
         def response_throttled?
-          !!node("response-throttled")
-        end
-
-
-        # Initializes a new {Scanner} instance
-        # passing the {Whois::Record::Parser::Base#content_for_scanner}
-        # and calls +parse+ on it.
-        #
-        # @return [Hash]
-        def parse
-          Scanner.new(content_for_scanner).parse
+          !!node("response:throttled")
         end
 
+        private
 
-        protected
-
-          def contact(element, type)
-            node("#{element} ID") do |registrant_id|
-              Whois::Record::Contact.new(
-                :id           => registrant_id,
-                :type         => type,
-                :name         => node("#{element} Name"),
-                :organization => node("#{element} Organization"),
-                :address      => [node("#{element} Street1"),
-                                  node("#{element} Street2"),
-                                  node("#{element} Street3")].reject { |value| value.to_s.empty? }.join(" "),
-                :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")
-              )
+          def decompose_registrar(value)
+            if value =~ /(.+?) \((.+?)\)/
+              [$2, $1]
             end
           end
 
-
-        class Scanner < Scanners::Base
-
-          def parse_content
-            parse_available   ||
-            parse_throttled   ||
-            parse_disclaimer  ||
-            parse_pair        ||
-
-            trim_empty_line   ||
-            error!("Unexpected token")
-          end
-
-
-          def parse_available
-            if @input.match?(/^NOT FOUND\n/)
-              @ast["status-available"] = true
-              @input.skip(/^.+\n/)
-            end
-          end
-
-          def parse_throttled
-            if @input.match?(/^WHOIS LIMIT EXCEEDED/)
-              @ast["response-throttled"] = true
-              @input.skip(/^.+\n/)
-            end
-          end
-
-          def parse_disclaimer
-            if @input.match?(/^NOTICE:/)
-              lines = []
-              while !@input.match?(/\n/) && @input.scan(/(.*)\n/)
-                lines << @input[1].strip
-              end
-              @ast["Disclaimer"] = lines.join(" ")
-            end
-          end
-
-          def parse_pair
-            if @input.scan(/(.+?):(.*?)\n/)
-              key, value = @input[1].strip, @input[2].strip
-              if @ast[key].nil?
-                @ast[key] = value
-              else
-                @ast[key].is_a?(Array) || @ast[key] = [@ast[key]]
-                @ast[key] << value
-              end
-            end
-          end
-
-        end
-
       end
 
     end

data/lib/whois/record/parser/whois.registry.in.rb

@@ -7,73 +7,15 @@
 #++
 
 
-require 'whois/record/parser/base'
+require 'whois/record/parser/base_afilias'
 
 
 module Whois
   class Record
     class Parser
 
-      #
-      # = whois.registry.in parser
-      #
       # Parser for the whois.registry.in 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 WhoisRegistryIn < Base
-
-        property_supported :status do
-          if content_for_scanner =~ /Status:(.+?)\n/
-            content_for_scanner.scan(/Status:(.+?)\n/).flatten.map(&:downcase)
-          end
-        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 :registrar do
-          if content_for_scanner =~ /Sponsoring Registrar:(.+)\s+\((R[0-9]+-AFIN)\)\n/
-            Record::Registrar.new(:id => $2, :name => $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 WhoisRegistryIn < BaseAfilias
       end
 
     end