whois 1.0.5 → 1.0.6

data/CHANGELOG.rdoc

@@ -1,6 +1,29 @@
 = Changelog
 
 
+== Release 1.0.6
+
+* ADDED: Added simple .ve TLD parser (whois.nic.ve).
+
+* ADDED: Added support for 'nameservers' property for all existing parsers.
+
+* FIXED: With some .eu domains, whois.eu parser returns invalid values for nameservers.
+
+* CHANGED: jobswhois.verisign-grs.com now correctly raises PropertyNotSupported when a property is not supported.
+
+* CHANGED: whois.crsnic.net now correctly raises PropertyNotSupported when a property is not supported.
+
+* CHANGED: whois.denic.de now correctly raises PropertyNotSupported when a property is not supported.
+
+* CHANGED: whois.nic.cc now correctly raises PropertyNotSupported when a property is not supported.
+
+* CHANGED: whois.nic.hu now correctly raises PropertyNotSupported when a property is not supported.
+
+* CHANGED: whois.nic.it now correctly raises PropertyNotSupported when a property is not supported.
+
+* CHANGED: whois.nic.tv now correctly raises PropertyNotSupported when a property is not supported.
+
+
 == Release 1.0.5
 
 * SERVER: Sync definitions with Debian whois 5.0.1.
@@ -24,10 +47,10 @@
 
 == Release 1.0.4
 
-* FIXED: Normalize 'nameservers' property return value. Always return an Array even if there's no nameserver.
-
 * ADDED: Added Symbol.to_proc core extension to ensure compatibility with Ruby 1.8.6.
 
+* FIXED: Normalize 'nameservers' property return value. Always return an Array even if there's no nameserver.
+
 * CHANGED: Suppress Japanese output for the .js TLD [axic]
 
 
@@ -39,18 +62,18 @@
 
 * SERVER: Updated web address for the .co TLD (closes #13)
 
-* FIXED: The whois.nic.it parser extracts the wrong Contact country_code property [axic]
-
-* FIXED: With some .de domains, whois.denic.de parser returns invalid values for nameservers (closes #14)
-
-* FIXED: whois.crsnic.net crashes with reserved IANA domains (ex y.com)
-
 * ADDED: Support for 'Contact#zip' property for the whois.nic.it parser [axic]
 
 * ADDED: Support for 'nameservers' property for the whois.adamsnames.tc parser.
 
 * ADDED: Compatibility with semver.org
 
+* FIXED: The whois.nic.it parser extracts the wrong Contact country_code property [axic]
+
+* FIXED: With some .de domains, whois.denic.de parser returns invalid values for nameservers (closes #14)
+
+* FIXED: whois.crsnic.net crashes with reserved IANA domains (ex y.com)
+
 
 == Release 1.0.2
 
@@ -80,14 +103,6 @@
 
 * SERVER: .dk TLD server requires --show-handles option (closes REDMINE-426)
 
-* FIXED: Whois hosts containing a - are not correctly converted into a Ruby class, ex. whois.domain-registry.nl (closes REDMINE-389)
-
-* FIXED: In case of exception, the CLI doesn't exit nicely (closes REDMINE-333)
-
-* FIXED: Some tests are not compatible with Ruby 1.9
-
-* FIXED: Flagged created_on and expires_on properties as not supported for .de TLD.
-
 * ADDED: Simple .at TLD parser.
 
 * ADDED: Simple .be TLD parser.
@@ -180,6 +195,14 @@
 
 * ADDED: Whois::WebInterfaceError now exposes #url attribute.
 
+* FIXED: Whois hosts containing a - are not correctly converted into a Ruby class, ex. whois.domain-registry.nl (closes REDMINE-389)
+
+* FIXED: In case of exception, the CLI doesn't exit nicely (closes REDMINE-333)
+
+* FIXED: Some tests are not compatible with Ruby 1.9
+
+* FIXED: Flagged created_on and expires_on properties as not supported for .de TLD.
+
 * CHANGED: All not supported properties now raise a PropertyNotSupported error instead of returning nil.
 
 * CHANGED: Depending on where you ask for a property, the library now returns the most expected value according to property status.

data/Manifest

@@ -68,6 +68,7 @@ lib/whois/answer/parser/whois.nic.travel.rb
 lib/whois/answer/parser/whois.nic.tv.rb
 lib/whois/answer/parser/whois.nic.uk.rb
 lib/whois/answer/parser/whois.nic.us.rb
+lib/whois/answer/parser/whois.nic.ve.rb
 lib/whois/answer/parser/whois.norid.no.rb
 lib/whois/answer/parser/whois.publicinterestregistry.net.rb
 lib/whois/answer/parser/whois.register.bg.rb
@@ -149,6 +150,7 @@ test/answer/parser/whois.nic.travel_test.rb
 test/answer/parser/whois.nic.tv_test.rb
 test/answer/parser/whois.nic.uk_test.rb
 test/answer/parser/whois.nic.us_test.rb
+test/answer/parser/whois.nic.ve_test.rb
 test/answer/parser/whois.norid.no_test.rb
 test/answer/parser/whois.publicinterestregistry.net_test.rb
 test/answer/parser/whois.register.bg_test.rb
@@ -221,7 +223,7 @@ test/testcases/responses/whois.cira.ca/available.txt
 test/testcases/responses/whois.cira.ca/registered.txt
 test/testcases/responses/whois.crsnic.net/MULTIPLE.txt
 test/testcases/responses/whois.crsnic.net/available.txt
-test/testcases/responses/whois.crsnic.net/nameservers_with_nonameserver.txt
+test/testcases/responses/whois.crsnic.net/nameservers_with_no_nameserver.txt
 test/testcases/responses/whois.crsnic.net/registered.txt
 test/testcases/responses/whois.denic.de/1-10-0_available.txt
 test/testcases/responses/whois.denic.de/1-10-0_registered.txt
@@ -242,6 +244,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/registered.txt
 test/testcases/responses/whois.iana.org/MULTIPLE.txt
 test/testcases/responses/whois.iana.org/available.txt
@@ -317,6 +320,8 @@ test/testcases/responses/whois.nic.uk/invalid.txt
 test/testcases/responses/whois.nic.uk/registered.txt
 test/testcases/responses/whois.nic.us/available.txt
 test/testcases/responses/whois.nic.us/registered.txt
+test/testcases/responses/whois.nic.ve/available.txt
+test/testcases/responses/whois.nic.ve/registered.txt
 test/testcases/responses/whois.norid.no/available.txt
 test/testcases/responses/whois.norid.no/registered.txt
 test/testcases/responses/whois.publicinterestregistry.net/available.txt

data/lib/whois/answer/parser.rb

@@ -26,7 +26,7 @@ module Whois
         :disclaimer,
         :domain, :domain_id,
         :referral_whois, :referral_url,
-        :status, :registered?, :available?,
+        :status, :available?, :registered?,
         :created_on, :updated_on, :expires_on,
         :registrar, :registrant, :admin, :technical,
         :nameservers,

data/lib/whois/answer/parser/NOTES.txt

@@ -1,3 +1,12 @@
 .us == .biz == .travel
-.mobi == .info (afilias)
- (afilias)
+
+== afilias
+
+whois.dotmobyregistry.net (.mobi)
+whois.afilias.info (.info)
+whois.afilias-grs.info (.bz, .gi, .hn, .lc, .mn, .sc, .vc)
+whois.aero (.aero)
+
+
+whois.museum (.museum)
+whois.cat (.cat)

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

@@ -165,7 +165,7 @@ module Whois
             raise PropertyNotSupported
           end
         end
-        
+
         # Registers a <tt>property</tt> as <tt>:supported</tt>
         # and defines a method with the content of the block.
         #

data/lib/whois/answer/parser/jobswhois.verisign-grs.com.rb

@@ -39,9 +39,7 @@ module Whois
           node("Domain Name") { |raw| raw.downcase }
         end
 
-        property_supported :domain_id do
-          nil
-        end
+        property_not_supported :domain_id
 
 
         property_supported :referral_whois do
@@ -86,6 +84,12 @@ module Whois
         end
 
 
+        property_supported :nameservers do
+          @nameservers ||= node("Name Server") { |values| [*values].map(&:downcase) }
+          @nameservers ||= []
+        end
+
+
         protected
 
           def parse

data/lib/whois/answer/parser/whois.adamsnames.tc.rb

@@ -63,7 +63,7 @@ module Whois
         end
 
       end
-      
+
     end
   end
-end  
+end

data/lib/whois/answer/parser/whois.aeda.net.ae.rb

@@ -59,7 +59,7 @@ module Whois
         end
 
       end
-      
+
     end
   end
-end  
+end

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

@@ -54,21 +54,26 @@ module Whois
             Time.parse($1)
           end
         end
-        
+
         property_supported :updated_on do
           @updated_on ||= if content_for_scanner =~ /Updated On:(.*?)\n+/
             Time.parse($1)
           end
         end
-        
+
         property_supported :expires_on do
           @expires_on ||= if content_for_scanner =~ /Expires On:(.*?)\n+/
             Time.parse($1)
           end
         end
 
+
+        property_supported :nameservers do
+          @nameservers ||= content_for_scanner.scan(/Name Server:([^\s]*)\n/).flatten.map(&:downcase)
+        end
+
       end
-      
+
     end
   end
-end  
+end

data/lib/whois/answer/parser/whois.afilias-grs.info.rb

@@ -65,8 +65,13 @@ module Whois
           end
         end
 
+
+        property_supported :nameservers do
+          @nameservers ||= content_for_scanner.scan(/Name Server:([^\s]*)\n/).flatten.map(&:downcase)
+        end
+
       end
-      
+
     end
   end
-end  
+end

data/lib/whois/answer/parser/whois.afilias.info.rb

@@ -67,11 +67,11 @@ module Whois
 
 
         property_supported :nameservers do
-          @nameservers ||= content_for_scanner.scan(/Name Server:([^ ]*?)\n/).flatten.map(&:downcase)
+          @nameservers ||= content_for_scanner.scan(/Name Server:([^\s]*)\n/).flatten.map(&:downcase)
         end
 
       end
-      
+
     end
   end
-end  
+end

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

@@ -65,8 +65,13 @@ module Whois
           end
         end
 
+
+        property_supported :nameservers do
+          @nameservers ||= content_for_scanner.scan(/Name Server:\s+(.*)\n/).flatten.map(&:downcase)
+        end
+
       end
-      
+
     end
   end
-end  
+end

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

@@ -67,8 +67,18 @@ module Whois
           end
         end
 
+        # Nameservers are listed in the following formats:
+        # 
+        #   Name Server: dns2.gencat.cat 83.247.132.4
+        #   Name Server: dns.gencat.net
+        # 
+        # In both cases, always return only the name.
+        property_supported :nameservers do
+          @nameservers ||= content_for_scanner.scan(/Name Server:\s+(.*)\n/).flatten.map { |value| value.split(" ").first }
+        end
+
       end
-      
+
     end
   end
-end  
+end

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

@@ -57,21 +57,29 @@ module Whois
             Time.parse($1)
           end
         end
-        
+
         property_supported :updated_on do
           @updated_on ||= if content_for_scanner =~ /Updated date:\s+(.*?)\n/
             Time.parse($1)
           end
         end
-        
+
         property_supported :expires_on do
           @expires_on ||= if content_for_scanner =~ /Renewal date:\s+(.*?)\n/
             Time.parse($1)
           end
         end
 
+
+        property_supported :nameservers do
+          @nameservers ||= if content_for_scanner =~ /Name servers:\n((?:\s+([^\s]+)\s+([^\s]+)\n)+)/
+            $1.split("\n").map { |value| value.split(" ").first }
+          end
+          @nameservers ||= []
+        end
+
       end
-      
+
     end
   end
-end  
+end

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

@@ -39,9 +39,8 @@ module Whois
           node("Domain Name") { |raw| raw.downcase }
         end
 
-        property_supported :domain_id do
-          nil
-        end
+        property_not_supported :domain_id
+
 
 
         property_supported :referral_whois do
@@ -79,6 +78,13 @@ module Whois
         end
 
 
+        property_supported :registrar do
+          # Return nil because when the response contains more than one registrar section
+          # the response can be messy. See, for instance, the Verisign response for google.com.
+          nil
+        end
+
+
         property_supported :nameservers do
           @nameservers ||= node("Name Server") do |values|
             [*values].map do |value|
@@ -89,13 +95,6 @@ module Whois
         end
 
 
-        property_supported :registrar do
-          # Return nil because when the response contains more than one registrar section
-          # the response can be messy. See, for instance, the Verisign response for google.com.
-          nil
-        end
-
-
         protected
 
           def parse

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

@@ -32,9 +32,7 @@ module Whois
           node("Domain")
         end
 
-        property_supported :domain_id do
-          nil
-        end
+        property_not_supported :domain_id
 
 
         property_supported :status do
@@ -98,7 +96,7 @@ module Whois
           @nameservers ||= []
         end
 
-        
+
         protected
 
           def parse

data/lib/whois/answer/parser/whois.dk-hostmaster.dk.rb

@@ -69,7 +69,7 @@ module Whois
         end
 
       end
-      
+
     end
   end
-end  
+end

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

@@ -65,8 +65,16 @@ module Whois
 
         property_not_supported :expires_on
 
+
+        property_supported :nameservers do
+          @nameservers ||= if content_for_scanner =~ /Domain nameservers:\n((.+\n)+)\n/
+            $1.split("\n").map(&:strip)
+          end
+          @nameservers ||= []
+        end
+
       end
-      
+
     end
   end
-end  
+end