whois 3.1.3 → 3.2.0

data/lib/whois/record/parser/whois.nc.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 WhoisNc < Base
-        include Scanners::Nodable
+        include Scanners::Scannable
+
+        self.scanner = Scanners::WhoisNc
+
 
         property_not_supported :disclaimer
 
@@ -104,7 +106,7 @@ module Whois
 
         property_supported :nameservers do
           nameservers = []
-          index   = 1
+          index = 1
           while line = node("Domain server #{index}")
             nameservers << line
             index += 1
@@ -115,16 +117,6 @@ module Whois
           end
         end
 
-
-        # Initializes a new {Scanners::WhoisNc} instance
-        # passing the {#content_for_scanner}
-        # and calls +parse+ on it.
-        #
-        # @return [Hash]
-        def parse
-          Scanners::WhoisNc.new(content_for_scanner).parse
-        end
-
       end
 
     end

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

@@ -7,67 +7,19 @@
 #++
 
 
-require 'whois/record/parser/base'
+require 'whois/record/parser/base_icb'
 
 
 module Whois
   class Record
     class Parser
 
-      #
-      # = whois.nic.ac parser
-      #
       # Parser for the whois.nic.ac server.
       #
-      class WhoisNicAc < Base
-
-        property_not_supported :disclaimer
-
-
-        property_supported :domain do
-          if content_for_scanner =~ /Domain "(.+?)"/
-            $1.downcase
-          end
-        end
-
-        property_not_supported :domain_id
-
-
-        property_supported :status do
-          if available?
-            :available
-          else
-            :registered
-          end
-        end
-
-        property_supported :available? do
-          !!(content_for_scanner =~ /- Available/)
-        end
-
-        property_supported :registered? do
-          !available?
-        end
-
-
-        property_not_supported :created_on
-
-        property_not_supported :updated_on
-
-        property_not_supported :expires_on
-
-
-        property_not_supported :registrar
-
-        property_not_supported :registrant_contacts
-
-        property_not_supported :admin_contacts
-
-        property_not_supported :technical_contacts
-
-
-        property_not_supported :nameservers
-
+      # @see Whois::Record::Parser::Example
+      #   The Example parser for the list of all available methods.
+      #
+      class WhoisNicAc < BaseIcb
       end
 
     end

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

@@ -17,7 +17,10 @@ module Whois
 
       # Parser for the whois.nic.cc server.
       class WhoisNicCc < Base
-        include Scanners::Nodable
+        include Scanners::Scannable
+
+        self.scanner = Scanners::Verisign
+
 
         property_supported :disclaimer do
           node("Disclaimer")
@@ -86,16 +89,6 @@ module Whois
           node("Referral URL")
         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
-
       end
 
     end

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

@@ -21,7 +21,10 @@ module Whois
       # @author Gábor Vészi <veszig@done.hu>
       #
       class WhoisNicHu < Base
-        include Scanners::Nodable
+        include Scanners::Scannable
+
+        self.scanner = Scanners::WhoisNicHu
+
 
         property_supported :disclaimer do
           node("field:disclaimer")
@@ -126,16 +129,6 @@ module Whois
         end
 
 
-        # Initializes a new {Scanners::WhoisNicHu} instance
-        # passing the {#content_for_scanner}
-        # and calls +parse+ on it.
-        #
-        # @return [Hash]
-        def parse
-          Scanners::WhoisNicHu.new(content_for_scanner).parse
-        end
-
-
       private
 
         def build_contact(element, type)

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

@@ -7,67 +7,19 @@
 #++
 
 
-require 'whois/record/parser/base'
+require 'whois/record/parser/base_icb'
 
 
 module Whois
   class Record
     class Parser
 
-      #
-      # = whois.nic.io parser
-      #
       # Parser for the whois.nic.io server.
       #
-      class WhoisNicIo < Base
-
-        property_not_supported :disclaimer
-
-
-        property_supported :domain do
-          if content_for_scanner =~ /Domain "(.+?)"/
-            $1.downcase
-          end
-        end
-
-        property_not_supported :domain_id
-
-
-        property_supported :status do
-          if available?
-            :available
-          else
-            :registered
-          end
-        end
-
-        property_supported :available? do
-          !!(content_for_scanner =~ /- Available/)
-        end
-
-        property_supported :registered? do
-          !available?
-        end
-
-
-        property_not_supported :created_on
-
-        property_not_supported :updated_on
-
-        property_not_supported :expires_on
-
-
-        property_not_supported :registrar
-
-        property_not_supported :registrant_contacts
-
-        property_not_supported :admin_contacts
-
-        property_not_supported :technical_contacts
-
-
-        property_not_supported :nameservers
-
+      # @see Whois::Record::Parser::Example
+      #   The Example parser for the list of all available methods.
+      #
+      class WhoisNicIo < BaseIcb
       end
 
     end

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

@@ -17,7 +17,9 @@ module Whois
 
       # Parser for the whois.nic.it server.
       class WhoisNicIt < Base
-        include Scanners::Nodable
+        include Scanners::Scannable
+
+        self.scanner = Scanners::WhoisNicIt
 
 
         property_supported :disclaimer do
@@ -128,15 +130,6 @@ module Whois
           !!node("response:unavailable")
         end
 
-        # Initializes a new {Scanners::WhoisNicIt} instance
-        # passing the {#content_for_scanner}
-        # and calls +parse+ on it.
-        #
-        # @return [Hash]
-        def parse
-          Scanners::WhoisNicIt.new(content_for_scanner).parse
-        end
-
 
       private
 

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

@@ -7,67 +7,19 @@
 #++
 
 
-require 'whois/record/parser/base'
+require 'whois/record/parser/base_icb'
 
 
 module Whois
   class Record
     class Parser
 
-      #
-      # = whois.nic.sh parser
-      #
       # Parser for the whois.nic.sh server.
       #
-      class WhoisNicSh < Base
-
-        property_not_supported :disclaimer
-
-
-        property_supported :domain do
-          if content_for_scanner =~ /Domain "(.+?)"/
-            $1.downcase
-          end
-        end
-
-        property_not_supported :domain_id
-
-
-        property_supported :status do
-          if available?
-            :available
-          else
-            :registered
-          end
-        end
-
-        property_supported :available? do
-          !!(content_for_scanner =~ /- Available/)
-        end
-
-        property_supported :registered? do
-          !available?
-        end
-
-
-        property_not_supported :created_on
-
-        property_not_supported :updated_on
-
-        property_not_supported :expires_on
-
-
-        property_not_supported :registrar
-
-        property_not_supported :registrant_contacts
-
-        property_not_supported :admin_contacts
-
-        property_not_supported :technical_contacts
-
-
-        property_not_supported :nameservers
-
+      # @see Whois::Record::Parser::Example
+      #   The Example parser for the list of all available methods.
+      #
+      class WhoisNicSh < BaseIcb
       end
 
     end

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

@@ -17,7 +17,10 @@ module Whois
 
       # Parser for the whois.nic.tv server.
       class WhoisNicTv < Base
-        include Scanners::Nodable
+        include Scanners::Scannable
+
+        self.scanner = Scanners::Verisign
+
 
         property_supported :disclaimer do
           node("Disclaimer")
@@ -79,16 +82,6 @@ module Whois
           node("Referral URL")
         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
-
       end
 
     end

data/lib/whois/record/parser/whois.norid.no.rb

@@ -14,16 +14,14 @@ module Whois
   class Record
     class Parser
 
-      #
-      # = whois.norid.no parser
-      #
       # Parser for the whois.norid.no 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.
+      # @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.
       #
       class WhoisNoridNo < Base
 
@@ -36,7 +34,7 @@ module Whois
         end
 
         property_supported :available? do
-          !!(content_for_scanner =~ /% no matches/)
+          !!(content_for_scanner =~ /^% No match/)
         end
 
         property_supported :registered? do

data/lib/whois/record/parser/whois.registry.net.za.rb

@@ -25,7 +25,10 @@ module Whois
       #   The Example parser for the list of all available methods.
       #
       class WhoisRegistryNetZa < Base
-        include Scanners::Nodable
+        include Scanners::Scannable
+
+        self.scanner = Scanners::WhoisRegistryNetZa
+
 
         property_supported :disclaimer do
           node("node:disclaimer")
@@ -98,12 +101,7 @@ module Whois
         end
 
 
-        def parse
-          Scanners::WhoisRegistryNetZa.new(content_for_scanner).parse
-        end
-
-
-        private
+      private
 
         def build_registrant_contacts
           Whois::Record::Contact.new(
@@ -127,6 +125,7 @@ module Whois
         def parse_date(date_string)
           Time.parse(date_string) if date_string
         end
+
       end
 
     end

data/lib/whois/record/parser/whois.rnids.rs.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 WhoisRnidsRs < Base
-        include Scanners::Nodable
+        include Scanners::Scannable
+
+        self.scanner = Scanners::WhoisRnidsRs
+
 
         property_not_supported :disclaimer
 
@@ -105,16 +107,6 @@ module Whois
         end
 
 
-        # Initializes a new {Scanners::WhoisRnidsRs} instance
-        # passing the {#content_for_scanner}
-        # and calls +parse+ on it.
-        #
-        # @return [Hash]
-        def parse
-          Scanners::WhoisRnidsRs.new(content_for_scanner).parse
-        end
-
-
       private
 
         def build_contact(element, type)