whois 3.1.3 → 3.2.0

data/lib/whois/record/parser/whois.cctld.by.rb

@@ -23,7 +23,10 @@ module Whois
       # @author Aliaksei Kliuchnikau <aliaksei.kliuchnikau@gmail.com>
       # @since  2.5.0
       class WhoisCctldBy < Base
-        include Scanners::Nodable
+        include Scanners::Scannable
+
+        self.scanner = Scanners::WhoisCctldBy
+
 
         property_not_supported :disclaimer
 
@@ -88,16 +91,6 @@ module Whois
           end
         end
 
-
-        # Initializes a new {Scanners::WhoisCctldBy} instance
-        # passing the {#content_for_scanner}
-        # and calls +parse+ on it.
-        #
-        # @return [Hash]
-        def parse
-          Scanners::WhoisCctldBy.new(content_for_scanner).parse
-        end
-
       end
     end
   end

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

@@ -17,7 +17,9 @@ module Whois
 
       # Parser for the whois.centralnic.net server.
       class WhoisCentralnicCom < Base
-        include Scanners::Nodable
+        include Scanners::Scannable
+
+        self.scanner = Scanners::WhoisCentralnicCom
 
 
         property_supported :disclaimer do
@@ -91,17 +93,7 @@ module Whois
         end
 
 
-        # Initializes a new {Scanners::WhoisCentralnicCom} instance
-        # passing the {#content_for_scanner}
-        # and calls +parse+ on it.
-        #
-        # @return [Hash]
-        def parse
-          Scanners::WhoisCentralnicCom.new(content_for_scanner).parse
-        end
-
-
-        private
+      private
 
         def build_contact(element, type)
           node("#{element} ID") do

data/lib/whois/record/parser/whois.cira.ca.rb

@@ -20,9 +20,11 @@ module Whois
       # @see Whois::Record::Parser::Example
       #   The Example parser for the list of all available methods.
       #
-      # @since  2.5.0
       class WhoisCiraCa < Base
-        include Scanners::Nodable
+        include Scanners::Scannable
+
+        self.scanner = Scanners::WhoisCiraCa
+
 
         property_supported :disclaimer do
            node("field:disclaimer")
@@ -129,19 +131,22 @@ module Whois
         end
 
 
-        # Attempts to detect and returns the
-        # schema version.
+        # Attempts to detect and returns the version.
         #
         # TODO: This is very empiric.
         #       Use the available status in combination with the creation date label.
-        def schema
-          @schema ||= if content_for_scanner =~ /^% \(c\) (.+?) Canadian Internet Registration Authority/
-            case $1
-            when "2007" then "1"
-            when "2010" then "2"
+        #
+        # NEWPROPERTY
+        def version
+          cached_properties_fetch :version do
+            version = if content_for_scanner =~ /^% \(c\) (.+?) Canadian Internet Registration Authority/
+              case $1
+              when "2007" then "1"
+              when "2010" then "2"
+              end
             end
+            version || Whois.bug!(ParserError, "Unable to detect version.")
           end
-          @schema || Whois.bug!(ParserError, "Unable to detect schema version.")
         end
 
         # NEWPROPERTY
@@ -159,16 +164,6 @@ module Whois
         end
 
 
-        # Initializes a new {Scanners::WhoisCiraCa} instance
-        # passing the {#content_for_scanner}
-        # and calls +parse+ on it.
-        #
-        # @return [Hash]
-        def parse
-          Scanners::WhoisCiraCa.new(content_for_scanner).parse
-        end
-
-
       private
 
         def build_contact(element, type)

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

@@ -17,7 +17,9 @@ module Whois
 
       # Parser for the whois.cnnic.cn server.
       class WhoisCnnicCn < Base
-        include Scanners::Nodable
+        include Scanners::Scannable
+
+        self.scanner = Scanners::WhoisCnnicCn
 
 
         property_not_supported :disclaimer
@@ -88,16 +90,6 @@ module Whois
         end
 
 
-        # Initializes a new {Scanners::WhoisCnnicCn} instance
-        # passing the {#content_for_scanner}
-        # and calls +parse+ on it.
-        #
-        # @return [Hash]
-        def parse
-          Scanners::WhoisCnnicCn.new(content_for_scanner).parse
-        end
-
-
       private
 
         def build_contact(element, type)

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

@@ -17,7 +17,10 @@ module Whois
 
       # Parser for the whois.crsnic.net server.
       class WhoisCrsnicNet < Base
-        include Scanners::Nodable
+        include Scanners::Scannable
+
+        self.scanner = Scanners::Verisign
+
 
         property_supported :disclaimer do
           node("Disclaimer")
@@ -94,17 +97,7 @@ module Whois
         end
 
 
-        # Initializes a new {Scanners::Verisign} instance
-        # passing the {#content_for_scanner}
-        # and calls +parse+ on it.
-        #
-        # @return [Hash]
-        def parse
-          Scanners::Verisign.new(content_for_scanner).parse
-        end
-
-
-        private
+      private
 
         # In case of "SPAM Response", the response contains more than one item
         # for the same value and the value becomes an Array.

data/lib/whois/record/parser/whois.denic.de.rb

@@ -21,7 +21,10 @@ module Whois
       # @author Aaron Mueller <mail@aaron-mueller.de>
       #
       class WhoisDenicDe < Base
-        include Scanners::Nodable
+        include Scanners::Scannable
+
+        self.scanner = Scanners::WhoisDenicDe
+
 
         property_supported :disclaimer do
           node("Disclaimer")
@@ -147,16 +150,6 @@ module Whois
         end
 
 
-        # Initializes a new {Scanners::WhoisDenicDe} instance
-        # passing the {#content_for_scanner}
-        # and calls +parse+ on it.
-        #
-        # @return [Hash]
-        def parse
-          Scanners::WhoisDenicDe.new(content_for_scanner).parse
-        end
-
-
       private
 
         def build_contact(element, type)

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

@@ -20,9 +20,11 @@ module Whois
       # @see Whois::Record::Parser::Example
       #   The Example parser for the list of all available methods.
       #
-      # @since  2.4.0
       class WhoisDnsHr < Base
-        include Scanners::Nodable
+        include Scanners::Scannable
+
+        self.scanner = Scanners::WhoisDnsHr
+
 
         property_not_supported :disclaimer
 
@@ -90,16 +92,6 @@ module Whois
 
         property_not_supported :nameservers
 
-
-        # Initializes a new {Scanners::WhoisDnsHr} instance
-        # passing the {#content_for_scanner}
-        # and calls +parse+ on it.
-        #
-        # @return [Hash]
-        def parse
-          Scanners::WhoisDnsHr.new(content_for_scanner).parse
-        end
-
       end
 
     end

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

@@ -96,8 +96,19 @@ module Whois
           end
         end
 
+        # Checks whether the response has been throttled.
+        #
+        # @return [Boolean]
+        #
+        # @example
+        #   Looup quota exceeded.
+        #
+        def response_throttled?
+          !!(content_for_scanner =~ /^request limit exceeded for/)
+        end
+
 
-        private
+      private
 
         def build_contact(element, type)
           match = content_for_scanner.slice(/#{element}:\n((.+\n)+)\n/, 1)

data/lib/whois/record/parser/whois.domainregistry.ie.rb

@@ -21,7 +21,10 @@ module Whois
       #   The Example parser for the list of all available methods.
       #
       class WhoisDomainregistryIe < Base
-        include Scanners::Nodable
+        include Scanners::Scannable
+
+        self.scanner = Scanners::WhoisDomainregistryIe
+
 
         property_supported :disclaimer do
           node("field:disclaimer")
@@ -100,16 +103,6 @@ module Whois
         end
 
 
-        # Initializes a new {Scanners::WhoisDomainregistryIe} instance
-        # passing the {#content_for_scanner}
-        # and calls +parse+ on it.
-        #
-        # @return [Hash]
-        def parse
-          Scanners::WhoisDomainregistryIe.new(content_for_scanner).parse
-        end
-
-
       private
 
         def build_contact(element, type)

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

@@ -8,6 +8,7 @@
 
 
 require 'whois/record/parser/base'
+require 'whois/record/scanners/whois.fi.rb'
 
 
 module Whois
@@ -16,23 +17,34 @@ module Whois
 
       # Parser for the whois.fi 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 Whois::Record::Parser::Example
       #   The Example parser for the list of all available methods.
       #
-      # @since  2.4.0
       class WhoisFi < Base
+        include Scanners::Scannable
+
+        self.scanner = Scanners::WhoisFi
+
+
+        property_supported :disclaimer do
+          node("field:disclaimer")
+        end
+
+
+        property_supported :domain do
+          node("domain")
+        end
+
+        property_not_supported :domain_id
+
 
         property_supported :status do
-          if content_for_scanner =~ /status:\s+(.+?)\n/
-            case $1.downcase
-              when "granted"
-                :registered
-              else
-                Whois.bug!(ParserError, "Unknown status `#{$1}'.")
+          if registered?
+            case node("status", &:downcase)
+            when "granted"
+              :registered
+            else
+              Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end
           else
             :available
@@ -40,7 +52,7 @@ module Whois
         end
 
         property_supported :available? do
-          (status == :available)
+          !!node("status:available")
         end
 
         property_supported :registered? do
@@ -49,23 +61,45 @@ module Whois
 
 
         property_supported :created_on do
-          if content_for_scanner =~ /created:\s+(.+)\n/
-            Time.parse($1)
-          end
+          node("created") { |value| Time.parse(value) }
         end
 
-        property_not_supported :updated_on
+        property_supported :updated_on do
+          node("modified") { |value| Time.parse(value) }
+        end
 
         property_supported :expires_on do
-          if content_for_scanner =~ /expires:\s+(.+)\n/
-            Time.parse($1)
+          node("expires") { |value| Time.parse(value) }
+        end
+
+
+        property_not_supported :registrar
+        
+        property_supported :registrant_contacts do
+          node("descr") do |array|
+            address = node("address")
+            
+            Record::Contact.new(
+              type:         Record::Contact::TYPE_REGISTRANT,
+              id:           array[1],
+              name:         address[0],
+              organization: array[0],
+              address:      address[1],
+              zip:          address[2],
+              city:         address[3],
+              phone:        node("phone")
+            )
           end
         end
 
+        property_not_supported :admin_contacts
+
+        property_not_supported :technical_contacts
+
 
         property_supported :nameservers do
-          content_for_scanner.scan(/nserver:\s+(.+)\n/).flatten.map do |line|
-            Record::Nameserver.new(:name => line.split(" ").first)
+          Array.wrap(node("nserver")).map do |line|
+            Record::Nameserver.new(name: line.split(" ").first)
           end
         end
 

data/lib/whois/record/parser/whois.iana.org.rb

@@ -17,7 +17,10 @@ module Whois
 
       # Parser for the whois.iana.org server.
       class WhoisIanaOrg < Base
-        include Scanners::Nodable
+        include Scanners::Scannable
+
+        self.scanner = Scanners::Iana
+
 
         property_supported :status do
           if available?
@@ -72,16 +75,6 @@ module Whois
         end
 
 
-        # Initializes a new {Scanners::Iana} instance
-        # passing the {#content_for_scanner}
-        # and calls +parse+ on it.
-        #
-        # @return [Hash]
-        def parse
-          Scanners::Iana.new(content_for_scanner).parse
-        end
-
-
       private
 
         def build_contact(element, type)

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

@@ -45,6 +45,8 @@ module Whois
               :registered
             when "deleted"
               :suspended
+            when "reserved"
+              :reserved
             else
               Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end
@@ -61,6 +63,11 @@ module Whois
           !available?
         end
 
+        # NEWPROPERTY
+        def reserved?
+          status == :reserved
+        end
+
 
         # TODO: timezone ('Asia/Tokyo')
         property_supported :created_on do