whois 1.3.1 → 1.3.2

data/CHANGELOG.rdoc

@@ -1,6 +1,17 @@
 = Changelog
 
 
+== Release 1.3.2
+
+* FIXED: .nl TLD parser doesn't understand quarantine status (closes #34)
+
+* CHANGED: Parser aliases are now created aliasing constants instead subclassing.
+
+* CHANGED: Updated .hk parser to whois.hkirc.hk (closes #30)
+
+* CHANGED: Updated .tw parser to whois.twnic.net.tw (closes #31)
+
+
 == Release 1.3.1
 
 * SERVER: Added the following 10 new IDN TLD:

data/README.rdoc

@@ -16,19 +16,20 @@ An extensive test suite is available to verify the library correctness but you m
 * Flexible and extensible interface (e.g. You can define custom servers on the fly)
 * Object oriented design, featuring 10 different design patterns
 * Pure Ruby library, without any external dependency other than Ruby itself
-* Compatible with Ruby 1.8.6 and greater, including Ruby 1.9 branch
-* Successfully tested against multiple Ruby platforms and versions including Ruby, Ruby Enterprise Edition and MacRuby
+* Compatible with {Ruby 1.8.6 and greater}[http://www.ruby-whois.org/manual/installation.html#s-requirements], including Ruby 1.9 branch
+* Successfully tested against multiple Ruby versions and interpreters, including Ruby, Ruby Enterprise Edition, jRuby, and MacRuby
 
 
 == Requirements
 
 * Ruby >= 1.8.6
 
-Whois has been {successfully tested}[http://www.ruby-whois.org/manual/installation.html] against the following Ruby interpreters:
+Whois has been successfully tested against several Ruby interpreters, including
 
-* Ruby 1.8.6 / 1.8.7 / 1.9.1 / 1.9.2
-* MacRuby
+* Ruby 1.8.6 / 1.8.7 / 1.9.1 / 1.9.2 (MRI)
 * Ruby Enterprise Edition
+* MacRuby
+* jRuby
 
 Do you run any other Ruby platform or version? Are you experiencing any problem? Join our {discussion group}[http://groups.google.com/group/ruby-whois].
 

data/lib/whois/answer/parser/saudinic.net.sa.rb

@@ -14,7 +14,6 @@
 #++
 
 
-require 'whois/answer/parser/base'
 require 'whois/answer/parser/whois.nic.net.sa'
 
 
@@ -22,14 +21,9 @@ module Whois
   class Answer
     class Parser
 
-      #
-      # = saudinic.net.sa parser
-      #
-      # Parser for the saudinic.net.sa server.
-      # Aliases the whois.nic.net.sa parser.
-      #
-      class SaudinicNetSa < WhoisNicNetSa
-      end
+      # Parser for the <tt>saudinic.net.sa</tt> server.
+      # Aliases the <tt>whois.nic.net.sa</tt> parser.
+      SaudinicNetSa = WhoisNicNetSa
 
     end
   end

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

@@ -21,14 +21,9 @@ module Whois
   class Answer
     class Parser
 
-      #
-      # = whois.ausregistry.net.au parser
-      #
-      # Parser for the whois.ausregistry.net.au server.
-      # Aliases the whois.audns.net.au.
-      #
-      class WhoisAusregistryNetAu < WhoisAudnsNetAu
-      end
+      # Parser for the <tt>whois.ausregistry.net.au</tt> server.
+      # Aliases the <tt>whois.audns.net.au</tt>.
+      WhoisAusregistryNetAu = WhoisAudnsNetAu
 
     end
   end

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

@@ -36,19 +36,22 @@ module Whois
 
         property_supported :status do
           @status ||= if content_for_scanner =~ /Domain status:\s+(.*?)\n/
-            case $1.downcase.to_sym
-              when :exist then :registered
-              when :avail then :available
+            case $1.downcase
+              when "exist"  then :registered
+              when "avail"  then :available
+              else
+                raise ParserError, "Unknown status `#{$1}'. " +
+                      "Please report the issue at http://github.com/weppos/whois/issues"
             end
           end
         end
 
         property_supported :available? do
-          @available ||= (status == :available)
+          @available  ||= (status == :available)
         end
 
         property_supported :registered? do
-          !available?
+          @registered ||= !available?
         end
 
 

data/lib/whois/answer/parser/whois.cnnic.net.cn.rb

@@ -21,14 +21,9 @@ module Whois
   class Answer
     class Parser
 
-      #
-      # = whois.cnnic.net.cn parser
-      #
-      # Parser for the whois.cnnic.net.cn server.
-      # Aliases the whois.cnnic.cn parser.
-      #
-      class WhoisCnnicNetCn < WhoisCnnicCn
-      end
+      # Parser for the <tt>whois.cnnic.net.cn</tt> server.
+      # Aliases the <tt>whois.cnnic.cn</tt> parser.
+      WhoisCnnicNetCn = WhoisCnnicCn
 
     end
   end

data/lib/whois/answer/parser/whois.domain-registry.nl.rb

@@ -35,19 +35,25 @@ module Whois
       class WhoisDomainRegistryNl < Base
 
         property_supported :status do
-          if available?
-            :available
+          @status ||= if content_for_scanner =~ /Status:\s+(.*?)\n/
+            case $1.downcase
+              when "active"         then :registered
+              when "in quarantine"  then :quarantine
+              else
+                raise ParserError, "Unknown status `#{$1}'. " +
+                      "Please report the issue at http://github.com/weppos/whois/issues"
+            end
           else
-            :registered
+            :available
           end
         end
 
         property_supported :available? do
-          @available ||= !(content_for_scanner =~ /Status: active/)
+          @available  ||= (status == :available)
         end
 
         property_supported :registered? do
-          !available?
+          @registered ||= [:registered, :quarantine].include?(status)
         end
 
 

data/lib/whois/answer/parser/whois.hkdnr.net.hk.rb

@@ -14,67 +14,16 @@
 #++
 
 
-require 'whois/answer/parser/base'
+require 'whois/answer/parser/whois.hkirc.hk'
 
 
 module Whois
   class Answer
     class Parser
 
-      #
-      # = whois.hkdnr.net.hk parser
-      #
-      # Parser for the whois.hkdnr.net.hk 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 WhoisHkdnrNetHk < Base
-
-        property_supported :status do
-          @status ||= if available?
-            :available
-          else
-            :registered
-          end
-        end
-
-        property_supported :available? do
-          @available ||= (content_for_scanner.strip == "Domain Not Found")
-        end
-
-        property_supported :registered? do
-          !available?
-        end
-
-
-        property_supported :created_on do
-          @created_on ||= if content_for_scanner =~ /Domain Name Commencement Date:\s(.*?)\n/
-            Time.parse($1)
-          end
-        end
-
-        property_not_supported :updated_on
-
-        property_supported :expires_on do
-          @expires_on ||= if content_for_scanner =~ /Expiry Date:\s(.*?)\n/
-            Time.parse($1)
-          end
-        end
-
-
-        property_supported :nameservers do
-          @nameservers ||= if content_for_scanner =~ /Name Servers Information:\n\n((.+\n)+)\n/
-            $1.split("\n").map { |value| value.strip.downcase }
-          else
-            []
-          end
-        end
-
-      end
+      # Parser for the <tt>whois.hkdnr.net.hk</tt> server.
+      # Aliases the <tt>whois.hkirc.hk</tt> parser.
+      WhoisHkdnrNetHk = WhoisHkircHk
 
     end
   end

data/lib/whois/answer/parser/whois.hkirc.hk.rb

@@ -0,0 +1,81 @@
+#
+# = 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.hkirc.hk parser
+      #
+      # Parser for the whois.hkirc.hk 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 WhoisHkircHk < Base
+
+        property_supported :status do
+          @status ||= if available?
+            :available
+          else
+            :registered
+          end
+        end
+
+        property_supported :available? do
+          @available ||= (content_for_scanner.strip == "Domain Not Found")
+        end
+
+        property_supported :registered? do
+          !available?
+        end
+
+
+        property_supported :created_on do
+          @created_on ||= if content_for_scanner =~ /Domain Name Commencement Date:\s(.*?)\n/
+            Time.parse($1)
+          end
+        end
+
+        property_not_supported :updated_on
+
+        property_supported :expires_on do
+          @expires_on ||= if content_for_scanner =~ /Expiry Date:\s(.*?)\n/
+            Time.parse($1)
+          end
+        end
+
+
+        property_supported :nameservers do
+          @nameservers ||= if content_for_scanner =~ /Name Servers Information:\n\n((.+\n)+)\n/
+            $1.split("\n").map { |value| value.strip.downcase }
+          else
+            []
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/whois/definitions/tlds.rb

@@ -141,7 +141,7 @@ Whois::Server.define :tld, ".gt", nil, {:adapter=>Whois::Server::Adapters::Web,
 Whois::Server.define :tld, ".gu", nil, {:adapter=>Whois::Server::Adapters::Web, :web=>"http://gadao.gov.gu/domainsearch.htm"}
 Whois::Server.define :tld, ".gw", nil, {:adapter=>Whois::Server::Adapters::None}
 Whois::Server.define :tld, ".gy", "whois.registry.gy"
-Whois::Server.define :tld, ".hk", "whois.hkdnr.net.hk"
+Whois::Server.define :tld, ".hk", "whois.hkirc.hk"
 Whois::Server.define :tld, ".hm", "whois.registry.hm"
 Whois::Server.define :tld, ".hn", "whois.afilias-grs.info", {:adapter=>Whois::Server::Adapters::Afilias}
 Whois::Server.define :tld, ".hr", nil, {:web=>"http://www.dns.hr/pretrazivanje.html", :adapter=>Whois::Server::Adapters::Web}
@@ -275,7 +275,7 @@ Whois::Server.define :tld, ".tp", nil, {:adapter=>Whois::Server::Adapters::None}
 Whois::Server.define :tld, ".tr", "whois.nic.tr"
 Whois::Server.define :tld, ".tt", nil, {:web=>"http://www.nic.tt/cgi-bin/search.pl", :adapter=>Whois::Server::Adapters::Web}
 Whois::Server.define :tld, ".tv", "whois.nic.tv", {:adapter=>Whois::Server::Adapters::Verisign}
-Whois::Server.define :tld, ".tw", "whois.twnic.net"
+Whois::Server.define :tld, ".tw", "whois.twnic.net.tw"
 Whois::Server.define :tld, ".tz", "whois.tznic.or.tz"
 Whois::Server.define :tld, ".in.ua", "whois.in.ua"
 Whois::Server.define :tld, ".ua", "whois.net.ua"

data/lib/whois/version.rb

@@ -19,7 +19,7 @@ module Whois
   module Version
     MAJOR = 1
     MINOR = 3
-    PATCH = 1
+    PATCH = 2
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join(".")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: whois
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 1
   - 3
-  - 1
-  version: 1.3.1
+  - 2
+  version: 1.3.2
 platform: ruby
 authors: 
 - Simone Carletti
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-24 00:00:00 +02:00
+date: 2010-08-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -91,6 +91,7 @@ files:
 - lib/whois/answer/parser/whois.eu.org.rb
 - lib/whois/answer/parser/whois.eu.rb
 - lib/whois/answer/parser/whois.hkdnr.net.hk.rb
+- lib/whois/answer/parser/whois.hkirc.hk.rb
 - lib/whois/answer/parser/whois.iana.org.rb
 - lib/whois/answer/parser/whois.in.ua.rb
 - lib/whois/answer/parser/whois.isnic.is.rb