whois 2.5.0 → 2.5.1

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

@@ -14,31 +14,29 @@ module Whois
   class Record
     class Parser
 
-      #
-      # = whois.dns.be parser
-      #
       # Parser for the whois.dns.be 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 WhoisDnsBe < Base
 
         property_supported :status do
           if content_for_scanner =~ /Status:\s+(.+?)\n/
             case $1.downcase
-              when "registered" then :registered
-              when "quarantine" then :redemption
-              #when "blocked"    then :registered
-              when "out of service" then :redemption
-              #when "withdrawn"  then :registered
-              #when "reserved"   then :registered
-              when "free"       then :available
-              else
-                Whois.bug!(ParserError, "Unknown status `#{$1}'.")
+            when "available"        then :available
+            when "not available"    then :registered
+            when "quarantine"       then :redemption
+            when "out of service"   then :redemption
+            # old response
+            when "registered"       then :registered
+            when "free"             then :available
+            else
+              Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end
           else
             Whois.bug!(ParserError, "Unable to parse status.")

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

@@ -42,10 +42,14 @@ module Whois
 
         property_supported :status do
           case node("status", &:downcase)
-          when nil
-            :available
           when "active"
             :registered
+          when nil
+            if node("status:pending")
+              :registered
+            else
+              :available
+            end
           else
             Whois.bug!(ParserError, "Unknown status `#{node("status")}'.")
           end
@@ -112,7 +116,7 @@ module Whois
       private
 
         def build_contact(element, type)
-          node(element) do |id|
+          Array.wrap(node(element)).map do |id|
             contact = node("field:#{id}")
             Record::Contact.new(
               :type         => type,

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

@@ -97,7 +97,7 @@ module Whois
           # 6 US
 
           lines = match.split("\n").map(&:lstrip)
-          name, email = lines[1].match(/(.+) \((.*)\)/)[1..2].map(&:strip)
+          name, email = lines[1].match(/(.*)\((.*)\)/)[1..2].map(&:strip)
           fax = lines[3].match(/Fax: (.*)/)[1]
           city, state, zip = lines[-2].match(/(.*),(.+?)(\d*)$/)[1..3].map(&:strip)
 

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

@@ -37,19 +37,21 @@ module Whois
         property_supported :status do
           if content_for_scanner =~ /\s+Registration status:\s+(.+?)\n/
             case $1.downcase
-              when "registered until renewal date."
-                :registered
-              when "registration request being processed."
-                :registered
-              when "renewal request being processed."
-                :registered
-              when "no registration status listed."
-                :reserved
-              # NEWSTATUS (redemption?)
-              when "renewal required."
-                :registered
-              else
-                Whois.bug!(ParserError, "Unknown status `#{$1}'.")
+            when "registered until renewal date."
+              :registered
+            when "registered until expiry date."
+              :registered
+            when "registration request being processed."
+              :registered
+            when "renewal request being processed."
+              :registered
+            when "no registration status listed."
+              :reserved
+            # NEWSTATUS (redemption?)
+            when "renewal required."
+              :registered
+            else
+              Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end
           elsif invalid?
             :invalid

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

@@ -20,6 +20,7 @@ module Whois
         self.tokenizers += [
             :skip_empty_line,
             :scan_reserved,
+            :scan_reserved_list,
             :scan_available,
             :scan_keyvalue,
         ]
@@ -37,6 +38,12 @@ module Whois
           end
         end
 
+        tokenizer :scan_reserved_list do
+          if @input.scan(/^Sorry, The domain you requested is in the reserved list/)
+            @ast["status:reserved"] = true
+          end
+        end
+
       end
 
     end

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

@@ -23,6 +23,7 @@ module Whois
             :scan_contact,
             :scan_keyvalue,
             :scan_available,
+            :skip_application_pending,
         ]
 
         tokenizer :scan_available do
@@ -44,6 +45,13 @@ module Whois
           end
         end
 
+        tokenizer :skip_application_pending do
+          if @input.match?(/^% Application Pending/)
+            _scan_lines_to_array(/^%(.+)\n/)
+            @ast["status:pending"] = true
+          end
+        end
+
       end
     end
   end

data/lib/whois/version.rb

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

data/spec/fixtures/responses/whois.cnnic.cn/status_reserved_list.expected

@@ -0,0 +1,12 @@
+#status
+  should: %s == []
+
+#available?
+  should: %s == false
+
+#registered?
+  should: %s == true
+
+
+#reserved?
+  should: %s == true

data/spec/fixtures/responses/whois.cnnic.cn/status_reserved_list.txt

@@ -0,0 +1 @@
+Sorry, The domain you requested is in the reserved list

data/spec/fixtures/responses/whois.dns.be/property_status_available.expected

@@ -0,0 +1,8 @@
+#status
+  should: %s == :available
+
+#available?
+  should: %s == true
+
+#registered?
+  should: %s == false

data/spec/fixtures/responses/whois.dns.be/property_status_available.txt

@@ -0,0 +1,39 @@
+% .be Whois Server 5.0
+%
+% The WHOIS service offered by DNS.be and the access to the records in the DNS.be
+% WHOIS database are provided for information purposes only. It allows
+% persons to check whether a specific domain name is still available or not
+% and to obtain information related to the registration records of
+% existing domain names.
+%
+% DNS.be cannot, under any circumstances, be held liable where the stored
+% information would prove to be incomplete or inaccurate in any sense.
+%
+% By submitting a query you agree not to use the information made available
+% to:
+%   - allow, enable or otherwise support the transmission of unsolicited,
+%     commercial advertising or other solicitations whether via email or otherwise;
+%   - target advertising in any possible way;
+%   - to cause nuisance in any possible way to the domain name holders by sending 
+%     messages to them (whether by automated, electronic processes capable of
+%     enabling high volumes or other possible means).
+% 
+% Without prejudice to the above, it is explicitly forbidden to extract, copy
+% and/or use or re-utilise in any form and by any means (electronically or
+% not) the whole or a quantitatively or qualitatively substantial part
+% of the contents of the WHOIS database without prior and explicit permission
+% by DNS.be, nor in any attempt thereof, to apply automated, electronic
+% processes to DNS.be (or its systems).
+%
+% You agree that any reproduction and/or transmission of data for commercial
+% purposes will always be considered as the extraction of a substantial
+% part of the content of the WHOIS database.
+%
+% By submitting the query you agree to abide by this policy and accept that
+% DNS.be can take measures to limit the use of its whois services in order to
+% protect the privacy of its registrants or the integrity of the database.
+%
+
+Domain:	u34jedzcq.be
+Status:	AVAILABLE
+

data/spec/fixtures/responses/whois.dns.be/property_status_free.expected

@@ -0,0 +1,8 @@
+#status
+  should: %s == :available
+
+#available?
+  should: %s == true
+
+#registered?
+  should: %s == false

data/spec/fixtures/responses/whois.dns.be/property_status_free.txt

@@ -0,0 +1,41 @@
+% .be Whois Server 4.0
+%
+% (c) dns.be 2001-2004 (http://www.dns.be)
+%
+%- The WHOIS service offered by DNS and the access to the records in the DNS
+%- WHOIS database are provided for information purposes only. It allows
+%- persons to check whether a specific domain name is still available or not
+%- and to obtain information related to the registration records of
+%- existing domain names.
+%-
+%- DNS cannot, under any circumstances, be held liable where the stored
+%- information would prove to be incomplete or inaccurate in any sense.
+%-
+%- By submitting a query you agree not to use the information made available
+%- to:
+%-   - allow, enable or otherwise support the transmission of unsolicited,
+%-     commercial advertising or other solicitations whether via email or otherwise;
+%-   - target advertising in any possible way;
+%-   - to cause nuisance in any possible way to the domain name holders by sending 
+%-     messages to them (whether by automated, electronic processes capable of
+%-     enabling high volumes or other possible means).
+%- 
+%- Without prejudice to the above, it is explicitly forbidden to extract, copy
+%- and/or use or re-utilise in any form and by any means (electronically or
+%- not) the whole or a quantitatively or qualitatively substantial part
+%- of the contents of the WHOIS database without prior and explicit permission
+%- by DNS, nor in any attempt thereof, to apply automated, electronic
+%- processes to DNS (or its systems).
+%-
+%- You agree that any reproduction and/or transmission of data for commercial
+%- purposes will always be considered as the extraction of a substantial
+%- part of the content of the WHOIS database.
+%-
+%- By submitting the query you agree to abide by this policy and accept that
+%- DNS can take measures to limit the use of its whois services in order to
+%- protect the privacy of its registrants or the integrity of the database.
+%-
+% WHOIS u34jedzcq
+Domain:      u34jedzcq
+Status:      FREE
+

data/spec/fixtures/responses/whois.dns.be/property_status_not_available.expected

@@ -0,0 +1,8 @@
+#status
+  should: %s == :registered
+
+#available?
+  should: %s == false
+
+#registered?
+  should: %s == true

data/spec/fixtures/responses/whois.dns.be/property_status_not_available.txt

@@ -0,0 +1,63 @@
+% .be Whois Server 5.0
+%
+% The WHOIS service offered by DNS.be and the access to the records in the DNS.be
+% WHOIS database are provided for information purposes only. It allows
+% persons to check whether a specific domain name is still available or not
+% and to obtain information related to the registration records of
+% existing domain names.
+%
+% DNS.be cannot, under any circumstances, be held liable where the stored
+% information would prove to be incomplete or inaccurate in any sense.
+%
+% By submitting a query you agree not to use the information made available
+% to:
+%   - allow, enable or otherwise support the transmission of unsolicited,
+%     commercial advertising or other solicitations whether via email or otherwise;
+%   - target advertising in any possible way;
+%   - to cause nuisance in any possible way to the domain name holders by sending 
+%     messages to them (whether by automated, electronic processes capable of
+%     enabling high volumes or other possible means).
+% 
+% Without prejudice to the above, it is explicitly forbidden to extract, copy
+% and/or use or re-utilise in any form and by any means (electronically or
+% not) the whole or a quantitatively or qualitatively substantial part
+% of the contents of the WHOIS database without prior and explicit permission
+% by DNS.be, nor in any attempt thereof, to apply automated, electronic
+% processes to DNS.be (or its systems).
+%
+% You agree that any reproduction and/or transmission of data for commercial
+% purposes will always be considered as the extraction of a substantial
+% part of the content of the WHOIS database.
+%
+% By submitting the query you agree to abide by this policy and accept that
+% DNS.be can take measures to limit the use of its whois services in order to
+% protect the privacy of its registrants or the integrity of the database.
+%
+
+Domain:	gratisdatingplaza.be
+Status:	NOT AVAILABLE
+Registered:	Tue Feb 15 2011
+
+Registrant:
+	Not shown, please visit www.dns.be for webbased whois.
+
+Registrar Technical Contacts:
+	Name:	R. Bashir
+	Organisation:	AXC
+	Language:	nl
+	Phone:	+31.787112586
+	Fax:	+31.787112587
+	Email:	support@axc.nl
+
+
+Registrar:
+	Name:	 AXC
+	Website: axc.nl/
+
+Nameservers:
+	ns2594.hostgator.com
+	ns2593.hostgator.com
+
+Keys:
+
+Please visit www.dns.be for more info.

data/spec/fixtures/responses/whois.dns.be/property_status_registered.expected

@@ -0,0 +1,8 @@
+#status
+  should: %s == :registered
+
+#available?
+  should: %s == false
+
+#registered?
+  should: %s == true

data/spec/fixtures/responses/whois.dns.be/property_status_registered.txt

@@ -0,0 +1,66 @@
+% .be Whois Server 4.0
+%
+% (c) dns.be 2001-2004 (http://www.dns.be)
+%
+%- The WHOIS service offered by DNS and the access to the records in the DNS
+%- WHOIS database are provided for information purposes only. It allows
+%- persons to check whether a specific domain name is still available or not
+%- and to obtain information related to the registration records of
+%- existing domain names.
+%-
+%- DNS cannot, under any circumstances, be held liable where the stored
+%- information would prove to be incomplete or inaccurate in any sense.
+%-
+%- By submitting a query you agree not to use the information made available
+%- to:
+%-   - allow, enable or otherwise support the transmission of unsolicited,
+%-     commercial advertising or other solicitations whether via email or otherwise;
+%-   - target advertising in any possible way;
+%-   - to cause nuisance in any possible way to the domain name holders by sending 
+%-     messages to them (whether by automated, electronic processes capable of
+%-     enabling high volumes or other possible means).
+%- 
+%- Without prejudice to the above, it is explicitly forbidden to extract, copy
+%- and/or use or re-utilise in any form and by any means (electronically or
+%- not) the whole or a quantitatively or qualitatively substantial part
+%- of the contents of the WHOIS database without prior and explicit permission
+%- by DNS, nor in any attempt thereof, to apply automated, electronic
+%- processes to DNS (or its systems).
+%-
+%- You agree that any reproduction and/or transmission of data for commercial
+%- purposes will always be considered as the extraction of a substantial
+%- part of the content of the WHOIS database.
+%-
+%- By submitting the query you agree to abide by this policy and accept that
+%- DNS can take measures to limit the use of its whois services in order to
+%- protect the privacy of its registrants or the integrity of the database.
+%-
+% WHOIS google
+Domain:      google
+Status:      REGISTERED
+Registered:  Tue Dec 12 2000
+
+Licensee:
+   Not shown, please visit www.dns.be for webbased whois.
+
+Agent Technical Contacts:
+   Last Name:     CCOPS
+   Company Name:  MarkMonitor
+   Language:      en
+   Street:        10400 Overland Road PMB 155
+   Location:      ID 83709-1433 Boise
+   Country:       US
+   Phone:         +1.2083895740
+   Fax:           +1.2083895799
+   Email:         ccops@markmonitor.com
+
+Agent:
+   Name:      MarkMonitor
+   Website:   http://www.markmonitor.com
+
+Nameservers:
+   ns1.google.com
+   ns2.google.com
+   ns3.google.com
+   ns4.google.com
+

data/spec/fixtures/responses/whois.dns.be/status_available.txt

@@ -1,41 +1,39 @@
-% .be Whois Server 4.0
-%
-% (c) dns.be 2001-2004 (http://www.dns.be)
-%
-%- The WHOIS service offered by DNS and the access to the records in the DNS
-%- WHOIS database are provided for information purposes only. It allows
-%- persons to check whether a specific domain name is still available or not
-%- and to obtain information related to the registration records of
-%- existing domain names.
-%-
-%- DNS cannot, under any circumstances, be held liable where the stored
-%- information would prove to be incomplete or inaccurate in any sense.
-%-
-%- By submitting a query you agree not to use the information made available
-%- to:
-%-   - allow, enable or otherwise support the transmission of unsolicited,
-%-     commercial advertising or other solicitations whether via email or otherwise;
-%-   - target advertising in any possible way;
-%-   - to cause nuisance in any possible way to the domain name holders by sending 
-%-     messages to them (whether by automated, electronic processes capable of
-%-     enabling high volumes or other possible means).
-%- 
-%- Without prejudice to the above, it is explicitly forbidden to extract, copy
-%- and/or use or re-utilise in any form and by any means (electronically or
-%- not) the whole or a quantitatively or qualitatively substantial part
-%- of the contents of the WHOIS database without prior and explicit permission
-%- by DNS, nor in any attempt thereof, to apply automated, electronic
-%- processes to DNS (or its systems).
-%-
-%- You agree that any reproduction and/or transmission of data for commercial
-%- purposes will always be considered as the extraction of a substantial
-%- part of the content of the WHOIS database.
-%-
-%- By submitting the query you agree to abide by this policy and accept that
-%- DNS can take measures to limit the use of its whois services in order to
-%- protect the privacy of its registrants or the integrity of the database.
-%-
-% WHOIS u34jedzcq
-Domain:      u34jedzcq
-Status:      FREE
-
+% .be Whois Server 5.0
+%
+% The WHOIS service offered by DNS.be and the access to the records in the DNS.be
+% WHOIS database are provided for information purposes only. It allows
+% persons to check whether a specific domain name is still available or not
+% and to obtain information related to the registration records of
+% existing domain names.
+%
+% DNS.be cannot, under any circumstances, be held liable where the stored
+% information would prove to be incomplete or inaccurate in any sense.
+%
+% By submitting a query you agree not to use the information made available
+% to:
+%   - allow, enable or otherwise support the transmission of unsolicited,
+%     commercial advertising or other solicitations whether via email or otherwise;
+%   - target advertising in any possible way;
+%   - to cause nuisance in any possible way to the domain name holders by sending 
+%     messages to them (whether by automated, electronic processes capable of
+%     enabling high volumes or other possible means).
+% 
+% Without prejudice to the above, it is explicitly forbidden to extract, copy
+% and/or use or re-utilise in any form and by any means (electronically or
+% not) the whole or a quantitatively or qualitatively substantial part
+% of the contents of the WHOIS database without prior and explicit permission
+% by DNS.be, nor in any attempt thereof, to apply automated, electronic
+% processes to DNS.be (or its systems).
+%
+% You agree that any reproduction and/or transmission of data for commercial
+% purposes will always be considered as the extraction of a substantial
+% part of the content of the WHOIS database.
+%
+% By submitting the query you agree to abide by this policy and accept that
+% DNS.be can take measures to limit the use of its whois services in order to
+% protect the privacy of its registrants or the integrity of the database.
+%
+
+Domain:	u34jedzcq.be
+Status:	AVAILABLE
+