whois 1.0.12 → 1.1.0

data/CHANGELOG.rdoc

@@ -1,7 +1,22 @@
 = Changelog
 
 
-== master
+== Release 1.1.0
+
+* NEW: Added simple .am TLD parser (whois.nic.am).
+
+* NEW: Added simple .as TLD parser (whois.nic.as).
+
+* NEW: Added simple .au TLD parser (whois.ausregistry.net.au).
+
+* NEW: Added simple .st TLD parser (whois.nic.st).
+
+* NEW: New methods Whois::Answer#contacts, Whois::Answer::Parser#contacts, and Whois::Answer::Parser::Base#contacts returns all supported contacts.
+
+* CHANGED: Renamed Whois::Answer::Parser::Base#(admin|technical|registrant) to Whois::Answer::Parser::Base#(admin|technical|registrant)_contact.
+
+
+== Release 1.0.12
 
 * NEW: Added simple .in TLD parser (whois.registry.in).
 

data/Manifest

@@ -30,6 +30,7 @@ lib/whois/answer/parser/whois.afilias-grs.info.rb
 lib/whois/answer/parser/whois.afilias.info.rb
 lib/whois/answer/parser/whois.ai.rb
 lib/whois/answer/parser/whois.arnes.si.rb
+lib/whois/answer/parser/whois.ausregistry.net.au.rb
 lib/whois/answer/parser/whois.biz.rb
 lib/whois/answer/parser/whois.cat.rb
 lib/whois/answer/parser/whois.cira.ca.rb
@@ -57,6 +58,8 @@ lib/whois/answer/parser/whois.nic-se.se.rb
 lib/whois/answer/parser/whois.nic.ac.rb
 lib/whois/answer/parser/whois.nic.af.rb
 lib/whois/answer/parser/whois.nic.ag.rb
+lib/whois/answer/parser/whois.nic.am.rb
+lib/whois/answer/parser/whois.nic.as.rb
 lib/whois/answer/parser/whois.nic.asia.rb
 lib/whois/answer/parser/whois.nic.at.rb
 lib/whois/answer/parser/whois.nic.cc.rb
@@ -77,6 +80,7 @@ lib/whois/answer/parser/whois.nic.mx.rb
 lib/whois/answer/parser/whois.nic.name.rb
 lib/whois/answer/parser/whois.nic.nu.rb
 lib/whois/answer/parser/whois.nic.or.kr.rb
+lib/whois/answer/parser/whois.nic.st.rb
 lib/whois/answer/parser/whois.nic.tel.rb
 lib/whois/answer/parser/whois.nic.tl.rb
 lib/whois/answer/parser/whois.nic.travel.rb
@@ -120,6 +124,7 @@ lib/whois/server/adapters/verisign.rb
 lib/whois/server/adapters/web.rb
 lib/whois/version.rb
 tasks/server.rake
+test/answer/contact_test.rb
 test/answer/parser/base_test.rb
 test/answer/parser/blank_test.rb
 test/answer/parser/jobswhois.verisign-grs.com_test.rb
@@ -130,6 +135,7 @@ test/answer/parser/whois.afilias-grs.info_test.rb
 test/answer/parser/whois.afilias.info_test.rb
 test/answer/parser/whois.ai_test.rb
 test/answer/parser/whois.arnes.si_test.rb
+test/answer/parser/whois.ausregistry.net.au_test.rb
 test/answer/parser/whois.biz_test.rb
 test/answer/parser/whois.cat_test.rb
 test/answer/parser/whois.cira.ca_test.rb
@@ -157,6 +163,8 @@ test/answer/parser/whois.nic-se.se_test.rb
 test/answer/parser/whois.nic.ac_test.rb
 test/answer/parser/whois.nic.af_test.rb
 test/answer/parser/whois.nic.ag_test.rb
+test/answer/parser/whois.nic.am_test.rb
+test/answer/parser/whois.nic.as_test.rb
 test/answer/parser/whois.nic.asia_test.rb
 test/answer/parser/whois.nic.at_test.rb
 test/answer/parser/whois.nic.cc_test.rb
@@ -177,6 +185,7 @@ test/answer/parser/whois.nic.mx_test.rb
 test/answer/parser/whois.nic.name_test.rb
 test/answer/parser/whois.nic.nu_test.rb
 test/answer/parser/whois.nic.or.kr_test.rb
+test/answer/parser/whois.nic.st_test.rb
 test/answer/parser/whois.nic.tel_test.rb
 test/answer/parser/whois.nic.tl_test.rb
 test/answer/parser/whois.nic.travel_test.rb
@@ -256,6 +265,8 @@ test/testcases/responses/whois.ai/available.txt
 test/testcases/responses/whois.ai/registered.txt
 test/testcases/responses/whois.arnes.si/available.txt
 test/testcases/responses/whois.arnes.si/registered.txt
+test/testcases/responses/whois.ausregistry.net.au/available.txt
+test/testcases/responses/whois.ausregistry.net.au/registered.txt
 test/testcases/responses/whois.biz/available.txt
 test/testcases/responses/whois.biz/registered.txt
 test/testcases/responses/whois.cat/available.txt
@@ -272,7 +283,8 @@ test/testcases/responses/whois.denic.de/1-10-0_available.txt
 test/testcases/responses/whois.denic.de/1-10-0_registered.txt
 test/testcases/responses/whois.denic.de/available.txt
 test/testcases/responses/whois.denic.de/error_invalid_domain_name.txt
-test/testcases/responses/whois.denic.de/nameservers_with_ip.txt
+test/testcases/responses/whois.denic.de/property_nameservers_with_ip.txt
+test/testcases/responses/whois.denic.de/property_technical_contact.txt
 test/testcases/responses/whois.denic.de/registered.txt
 test/testcases/responses/whois.dk-hostmaster.dk/available.txt
 test/testcases/responses/whois.dk-hostmaster.dk/registered.txt
@@ -295,7 +307,7 @@ test/testcases/responses/whois.educause.edu/registered.txt
 test/testcases/responses/whois.eu.org/available.txt
 test/testcases/responses/whois.eu.org/registered.txt
 test/testcases/responses/whois.eu/available.txt
-test/testcases/responses/whois.eu/nameservers_with_ip.txt
+test/testcases/responses/whois.eu/property_nameservers_with_ip.txt
 test/testcases/responses/whois.eu/registered.txt
 test/testcases/responses/whois.hkdnr.net.hk/available.txt
 test/testcases/responses/whois.hkdnr.net.hk/registered.txt
@@ -311,7 +323,7 @@ test/testcases/responses/whois.meregistry.net/registered.txt
 test/testcases/responses/whois.museum/available.txt
 test/testcases/responses/whois.museum/registered.txt
 test/testcases/responses/whois.nic-se.se/available.txt
-test/testcases/responses/whois.nic-se.se/nameservers_with_ip.txt
+test/testcases/responses/whois.nic-se.se/property_nameservers_with_ip.txt
 test/testcases/responses/whois.nic-se.se/registered.txt
 test/testcases/responses/whois.nic.ac/available.txt
 test/testcases/responses/whois.nic.ac/registered.txt
@@ -319,6 +331,10 @@ test/testcases/responses/whois.nic.af/available.txt
 test/testcases/responses/whois.nic.af/registered.txt
 test/testcases/responses/whois.nic.ag/available.txt
 test/testcases/responses/whois.nic.ag/registered.txt
+test/testcases/responses/whois.nic.am/available.txt
+test/testcases/responses/whois.nic.am/registered.txt
+test/testcases/responses/whois.nic.as/available.txt
+test/testcases/responses/whois.nic.as/registered.txt
 test/testcases/responses/whois.nic.asia/available.txt
 test/testcases/responses/whois.nic.asia/registered.txt
 test/testcases/responses/whois.nic.at/available.txt
@@ -357,7 +373,9 @@ test/testcases/responses/whois.nic.im/registered.txt
 test/testcases/responses/whois.nic.io/available.txt
 test/testcases/responses/whois.nic.io/registered.txt
 test/testcases/responses/whois.nic.it/available.txt
-test/testcases/responses/whois.nic.it/contact.txt
+test/testcases/responses/whois.nic.it/property_admin_contact.txt
+test/testcases/responses/whois.nic.it/property_registrant_contact.txt
+test/testcases/responses/whois.nic.it/property_technical_contact.txt
 test/testcases/responses/whois.nic.it/registered.txt
 test/testcases/responses/whois.nic.it/status_active.txt
 test/testcases/responses/whois.nic.it/status_available.txt
@@ -378,6 +396,8 @@ test/testcases/responses/whois.nic.nu/available.txt
 test/testcases/responses/whois.nic.nu/registered.txt
 test/testcases/responses/whois.nic.or.kr/available.txt
 test/testcases/responses/whois.nic.or.kr/registered.txt
+test/testcases/responses/whois.nic.st/available.txt
+test/testcases/responses/whois.nic.st/registered.txt
 test/testcases/responses/whois.nic.tel/available.txt
 test/testcases/responses/whois.nic.tel/registered.txt
 test/testcases/responses/whois.nic.tl/available.txt

data/lib/whois.rb

@@ -63,8 +63,8 @@ module Whois
   def self.available?(qstring)
     query(qstring).available?
   rescue ParserNotFound => e
-    $stderr.puts  "This method is not supported for this kind of object.\n" +
-                  "Use Whois.query('#{qstring}') instead."
+    warn  "This method is not supported for this kind of object.\n" +
+          "Use Whois.query('#{qstring}') instead."
     nil
   end
 
@@ -87,8 +87,8 @@ module Whois
   def self.registered?(qstring)
     query(qstring).registered?
   rescue ParserNotFound => e
-    $stderr.puts  "This method is not supported for this kind of object.\n" +
-                  "Use Whois.query('#{qstring}') instead."
+    warn  "This method is not supported for this kind of object.\n" +
+          "Use Whois.query('#{qstring}') instead."
     nil
   end
 
@@ -101,7 +101,7 @@ module Whois
 
   def self.deprecate(message = nil)
     message ||= "You are using deprecated behavior which will be removed from the next major or minor release."
-    $stderr.puts("DEPRECATION WARNING: #{message}")
+    warn("DEPRECATION WARNING: #{message}")
   end
 
 end

data/lib/whois/answer.rb

@@ -82,6 +82,7 @@ module Whois
       @content ||= parts.map(&:response).join("\n")
     end
 
+
     # Returns whether this answer changed compared to <tt>other</tt>.
     #
     # Comparing the Answer contents is not always as trivial as it seems.
@@ -102,6 +103,9 @@ module Whois
       parser.unchanged?(other.parser)
     end
 
+    def contacts
+      parser.contacts
+    end
 
 
     # Lazy-loads and returns a <tt>Whois::Answer::Parser</tt> proxy for current answer.
@@ -130,7 +134,7 @@ module Whois
 
       # Delegates all method calls to the internal parser.
       def method_missing(method, *args, &block)
-        if Parser.properties.include?(method)
+        if (Parser.properties + Parser::METHODS).include?(method)
           self.class.class_eval foo = %{
             def #{method}(*args, &block)
               if property_supported?(:#{method})
@@ -142,7 +146,7 @@ module Whois
           }, __FILE__, __LINE__
           send(method, *args, &block)
 
-        elsif method.to_s =~ /([a-z_]+)\?/ and Parser.properties.include?($1.to_sym)
+        elsif method.to_s =~ /([a-z_]+)\?/ and (Parser.properties + Parser::METHODS).include?($1.to_sym)
           self.class.class_eval %{
             def #{$1}?
               !#{$1}.nil?

data/lib/whois/answer/contact.rb

@@ -23,29 +23,30 @@ module Whois
     #
     # = Contacts
     #
-    # Holds the details of a Contact extracted from the WHOIS answer.
+    # Holds the details of a <tt>Contact</tt> extracted from the WHOIS <tt>Answer</tt>.
     #
-    # A Contact is composed by the following attributes:
+    # A <tt>Contact</tt> is composed by the following attributes:
     #
-    # <tt>:id</tt>::
-    # <tt>:name</tt>::
-    # <tt>:organization</tt>::
-    # <tt>:address</tt>::
-    # <tt>:city</tt>::
-    # <tt>:zip</tt>::
-    # <tt>:state</tt>::
-    # <tt>:country</tt>::
-    # <tt>:country_code</tt>::
-    # <tt>:phone</tt>::
-    # <tt>:fax</tt>::
-    # <tt>:email</tt>::
-    # <tt>:created_on</tt>::
-    # <tt>:updated_on</tt>::
+    #  * <tt>:id</tt>:
+    #  * <tt>:type</tt>: the contact type.
+    #  * <tt>:name</tt>:
+    #  * <tt>:organization</tt>:
+    #  * <tt>:address</tt>:
+    #  * <tt>:city</tt>:
+    #  * <tt>:zip</tt>:
+    #  * <tt>:state</tt>:
+    #  * <tt>:country</tt>:
+    #  * <tt>:country_code</tt>:
+    #  * <tt>:phone</tt>:
+    #  * <tt>:fax</tt>:
+    #  * <tt>:email</tt>:
+    #  * <tt>:created_on</tt>:
+    #  * <tt>:updated_on</tt>:
     #
     # Be aware that every WHOIS server can return a different number of details
     # or no details at all.
     #
-    class Contact < SuperStruct.new(:id, :name, :organization,
+    class Contact < SuperStruct.new(:id, :name, :organization, :type,
                                     :address, :city, :zip, :state, :country, :country_code,
                                     :phone, :fax, :email,
                                     :created_on, :updated_on)

data/lib/whois/answer/parser.rb

@@ -22,13 +22,20 @@ module Whois
     #
     class Parser
 
+      METHODS = [
+        :contacts,
+        # deprecated methods
+        :registrant, :admin, :technical,
+      ]
+
       @@properties = [
         :disclaimer,
         :domain, :domain_id,
         :referral_whois, :referral_url,
         :status, :available?, :registered?,
         :created_on, :updated_on, :expires_on,
-        :registrar, :registrant, :admin, :technical,
+        :registrar,
+        :registrant_contact, :admin_contact, :technical_contact,
         :nameservers,
       ]
 
@@ -61,11 +68,19 @@ module Whois
       end
 
 
+      # Collects and returns all the contacts from all parsers.
+      def contacts
+        parsers.inject([]) { |all, parser| all.concat(parser.contacts) }
+      end
+
+
       private
 
         def method_missing(method, *args, &block)
           if Parser.properties.include?(method)
             delegate_to_parsers(method, *args, &block)
+          elsif Parser::METHODS.include?(method)
+            delegate_to_parsers(method, *args, &block)
           else
             super
           end

data/lib/whois/answer/parser/base.rb

@@ -188,10 +188,6 @@ module Whois
           @part = part
         end
 
-        ::Whois::Answer::Parser.properties.each do |property|
-          property_not_implemented(property)
-        end
-
         def part
           @part
         end
@@ -219,6 +215,46 @@ module Whois
         end
 
 
+        ::Whois::Answer::Parser.properties.each do |property|
+          property_not_implemented(property)
+        end
+
+
+        # Returns an array of all supported contacts.
+        def contacts
+          contacts = []
+          contacts.concat([*registrant_contact])  if property_supported?(:registrant_contact)
+          contacts.concat([*admin_contact])       if property_supported?(:admin_contact)
+          contacts.concat([*technical_contact])   if property_supported?(:technical_contact)
+          contacts.compact
+        end
+
+
+        # @deprecated {#registrant} is deprecated
+        #   and will be removed in a future version.
+        #   Use {#registrant_contact}.
+        def registrant
+          Whois.deprecate "Whois::Answer::Parser::Base#registrant is deprecated and will be removed in a future version. Use Whois::Answer::Parser::Base#registrant_contact."
+          registrant_contact
+        end
+
+        # @deprecated {#admin} is deprecated
+        #   and will be removed in a future version.
+        #   Use {#admin_contact}.
+        def admin
+          Whois.deprecate "Whois::Answer::Parser::Base#admin is deprecated and will be removed in a future version. Use Whois::Answer::Parser::Base#admin_contact."
+          admin_contact
+        end
+
+        # @deprecated {#technical} is deprecated
+        #   and will be removed in a future version.
+        #   Use {#technical_contact}.
+        def technical
+          Whois.deprecate "Whois::Answer::Parser::Base#technical is deprecated and will be removed in a future version. Use Whois::Answer::Parser::Base#technical_contact."
+          technical_contact
+        end
+
+
         protected
 
           def content_for_scanner

data/lib/whois/answer/parser/whois.ausregistry.net.au.rb

@@ -0,0 +1,71 @@
+#
+# = Ruby Whois
+#
+# An intelligent pure Ruby WHOIS client and parser.
+#
+#
+# Category::    Net
+# Package::     Whois
+# Author::      Simone Carletti <weppos@weppos.net>
+# License::     MIT License
+#
+#--
+#
+#++
+
+
+require 'whois/answer/parser/base'
+
+
+module Whois
+  class Answer
+    class Parser
+
+      #
+      # = whois.ausregistry.net.au parser
+      #
+      # Parser for the whois.ausregistry.net.au 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 WhoisAusregistryNetAu < Base
+
+        property_supported :status do
+          @status ||= if content_for_scanner =~ /Status:\s+(.*)\n/
+            $1
+          end
+        end
+
+        property_supported :available? do
+          @available ||= (content_for_scanner.strip == "No Data Found")
+        end
+
+        property_supported :registered? do
+          !available?
+        end
+
+
+        property_not_supported :created_on
+
+        property_supported :updated_on do
+          @updated_on ||= if content_for_scanner =~ /Last Modified:\s+(.*)\n/
+            Time.parse($1)
+          end
+        end
+
+        property_not_supported :expires_on
+
+
+        property_supported :nameservers do
+          @nameservers ||= content_for_scanner.scan(/Name Server:\s+(.+)\n/).flatten
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -68,16 +68,16 @@ module Whois
           end
         end
 
-        property_supported :registrant do
-          node("Holder")
+        property_supported :registrant_contact do
+          @registrant_contact ||= node("Holder")
         end
 
-        property_supported :admin do
-          node("Admin-C")
+        property_supported :admin_contact do
+          @admin_contact ||= node("Admin-C")
         end
 
-        property_supported :technical do
-          node("Tech-C")
+        property_supported :technical_contact do
+          @technical_contact ||= node("Tech-C")
         end