whois 1.0.5 → 1.0.6

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

@@ -65,8 +65,13 @@ module Whois
           end
         end
 
+
+        property_supported :nameservers do
+          @nameservers ||= content_for_scanner.scan(/nserver:\s+(.+)\n/).flatten.map { |value| value.chomp(".") }
+        end
+
       end
-      
+
     end
   end
-end  
+end

data/lib/whois/answer/parser/whois.rotld.ro.rb

@@ -57,8 +57,13 @@ module Whois
 
         property_not_supported :expires_on
 
+
+        property_supported :nameservers do
+          @nameservers ||= content_for_scanner.scan(/Name Server:\s+(.+)\n/).flatten
+        end
+
       end
-      
+
     end
   end
-end  
+end

data/lib/whois/answer/parser/whois.samoanic.ws.rb

@@ -69,8 +69,16 @@ module Whois
           end
         end
 
+
+        property_supported :nameservers do
+          @nameservers ||= if content_for_scanner =~ /Current Nameservers:\n\n((.+\n)+)\n/
+            $1.split("\n").map { |value| value.strip.downcase }
+          end
+          @nameservers ||= []
+        end
+
       end
-      
+
     end
   end
-end  
+end

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

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

data/lib/whois/answer/parser/whois.za.org.rb

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

data/lib/whois/server/adapters/afilias.rb

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

data/lib/whois/server/adapters/arpa.rb

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

data/lib/whois/server/adapters/base.rb

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

data/lib/whois/server/adapters/formatted.rb

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

data/lib/whois/server/adapters/none.rb

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

data/lib/whois/server/adapters/not_implemented.rb

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

data/lib/whois/server/adapters/standard.rb

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

data/lib/whois/server/adapters/web.rb

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

data/lib/whois/version.rb

@@ -19,7 +19,7 @@ module Whois
   module Version
     MAJOR = 1
     MINOR = 0
-    PATCH = 5
+    PATCH = 6
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/test/answer/parser/jobswhois.verisign-grs.com_test.rb

@@ -50,10 +50,8 @@ EOS
   end
 
   def test_domain_id
-    assert_equal  nil,
-                  @klass.new(load_part('/registered.txt')).domain_id
-    assert_equal  nil,
-                  @klass.new(load_part('/available.txt')).domain_id
+    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/registered.txt')).domain_id }
+    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/available.txt')).domain_id }
   end
 
 
@@ -119,4 +117,17 @@ EOS
                   @klass.new(load_part('/available.txt')).registrar
   end
 
+
+  def test_nameservers
+    parser    = @klass.new(load_part('/registered.txt'))
+    expected  = %w( ns2.registry.jobs ns1.registry.jobs )
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+
+    parser    = @klass.new(load_part('/available.txt'))
+    expected  = %w()
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+  end
+
 end

data/test/answer/parser/whois.aero_test.rb

@@ -22,8 +22,8 @@ class AnswerParserWhoisAeroTest < Whois::Answer::Parser::TestCase
   end
 
   def test_registered?
-    assert !@klass.new(load_part('/available.txt')).registered?
     assert  @klass.new(load_part('/registered.txt')).registered?
+    assert !@klass.new(load_part('/available.txt')).registered?
   end
 
 
@@ -48,4 +48,17 @@ class AnswerParserWhoisAeroTest < Whois::Answer::Parser::TestCase
                   @klass.new(load_part('/available.txt')).expires_on
   end
 
+
+  def test_nameservers
+    parser    = @klass.new(load_part('/registered.txt'))
+    expected  = %w( dns2.srilankan.aero dns1.srilankan.aero s1.ns.slt.lk s2.ns.slt.lk )
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+
+    parser    = @klass.new(load_part('/available.txt'))
+    expected  = %w()
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+  end
+
 end

data/test/answer/parser/whois.afilias-grs.info_test.rb

@@ -51,6 +51,19 @@ class AnswerParserWhoisAfiliasGrsInfoBzTest < AnswerParserWhoisAfiliasGrsInfoTes
                   @klass.new(load_part('/bz/available.txt')).expires_on
   end
 
+
+  def test_nameservers
+    parser    = @klass.new(load_part('/bz/registered.txt'))
+    expected  = %w( ns1.google.com ns2.google.com ns3.google.com ns4.google.com )
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+
+    parser    = @klass.new(load_part('/bz/available.txt'))
+    expected  = %w()
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+  end
+
 end
 
 class AnswerParserWhoisAfiliasGrsInfoGiTest < AnswerParserWhoisAfiliasGrsInfoTest
@@ -94,6 +107,19 @@ class AnswerParserWhoisAfiliasGrsInfoGiTest < AnswerParserWhoisAfiliasGrsInfoTes
                   @klass.new(load_part('/gi/available.txt')).expires_on
   end
 
+
+  def test_nameservers
+    parser    = @klass.new(load_part('/gi/registered.txt'))
+    expected  = %w( ns1-a.sapphire.gi ns2-a.sapphire.gi )
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+
+    parser    = @klass.new(load_part('/gi/available.txt'))
+    expected  = %w()
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+  end
+
 end
 
 class AnswerParserWhoisAfiliasGrsInfoHnTest < AnswerParserWhoisAfiliasGrsInfoTest
@@ -137,6 +163,19 @@ class AnswerParserWhoisAfiliasGrsInfoHnTest < AnswerParserWhoisAfiliasGrsInfoTes
                   @klass.new(load_part('/hn/available.txt')).expires_on
   end
 
+
+  def test_nameservers
+    parser    = @klass.new(load_part('/hn/registered.txt'))
+    expected  = %w( ns1.google.com ns2.google.com )
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+
+    parser    = @klass.new(load_part('/hn/available.txt'))
+    expected  = %w()
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+  end
+
 end
 
 class AnswerParserWhoisAfiliasGrsInfoLcTest < AnswerParserWhoisAfiliasGrsInfoTest
@@ -180,6 +219,19 @@ class AnswerParserWhoisAfiliasGrsInfoLcTest < AnswerParserWhoisAfiliasGrsInfoTes
                   @klass.new(load_part('/lc/available.txt')).expires_on
   end
 
+
+  def test_nameservers
+    parser    = @klass.new(load_part('/lc/registered.txt'))
+    expected  = %w( ns1.nic.ag ns.patricklay.com )
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+
+    parser    = @klass.new(load_part('/lc/available.txt'))
+    expected  = %w()
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+  end
+
 end
 
 class AnswerParserWhoisAfiliasGrsInfoMnTest < AnswerParserWhoisAfiliasGrsInfoTest
@@ -223,6 +275,19 @@ class AnswerParserWhoisAfiliasGrsInfoMnTest < AnswerParserWhoisAfiliasGrsInfoTes
                   @klass.new(load_part('/mn/available.txt')).expires_on
   end
 
+
+  def test_nameservers
+    parser    = @klass.new(load_part('/mn/registered.txt'))
+    expected  = %w( ns1.google.com ns2.google.com ns3.google.com ns4.google.com )
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+
+    parser    = @klass.new(load_part('/mn/available.txt'))
+    expected  = %w()
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+  end
+
 end
 
 class AnswerParserWhoisAfiliasGrsInfoScTest < AnswerParserWhoisAfiliasGrsInfoTest
@@ -266,6 +331,19 @@ class AnswerParserWhoisAfiliasGrsInfoScTest < AnswerParserWhoisAfiliasGrsInfoTes
                   @klass.new(load_part('/sc/available.txt')).expires_on
   end
 
+
+  def test_nameservers
+    parser    = @klass.new(load_part('/sc/registered.txt'))
+    expected  = %w( ns1.google.com ns2.google.com )
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+
+    parser    = @klass.new(load_part('/sc/available.txt'))
+    expected  = %w()
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+  end
+
 end
 
 class AnswerParserWhoisAfiliasGrsInfoVcTest < AnswerParserWhoisAfiliasGrsInfoTest
@@ -309,4 +387,17 @@ class AnswerParserWhoisAfiliasGrsInfoVcTest < AnswerParserWhoisAfiliasGrsInfoTes
                   @klass.new(load_part('/vc/available.txt')).expires_on
   end
 
+
+  def test_nameservers
+    parser    = @klass.new(load_part('/vc/registered.txt'))
+    expected  = %w( ns1.google.com ns2.google.com ns3.google.com ns4.google.com )
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+
+    parser    = @klass.new(load_part('/vc/available.txt'))
+    expected  = %w()
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+  end
+
 end

data/test/answer/parser/whois.biz_test.rb

@@ -48,4 +48,17 @@ class AnswerParserWhoisBizTest < Whois::Answer::Parser::TestCase
                   @klass.new(load_part('/available.txt')).expires_on
   end
 
+
+  def test_nameservers
+    parser    = @klass.new(load_part('/registered.txt'))
+    expected  = %w( ns1.google.com ns2.google.com ns3.google.com ns4.google.com )
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+
+    parser    = @klass.new(load_part('/available.txt'))
+    expected  = %w()
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+  end
+
 end

data/test/answer/parser/whois.cat_test.rb

@@ -48,4 +48,17 @@ class AnswerParserWhoisCatTest < Whois::Answer::Parser::TestCase
                   @klass.new(load_part('/available.txt')).expires_on
   end
 
+
+  def test_nameservers
+    parser    = @klass.new(load_part('/registered.txt'))
+    expected  = %w( dns2.gencat.cat dns.gencat.net )
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+
+    parser    = @klass.new(load_part('/available.txt'))
+    expected  = %w()
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+  end
+
 end

data/test/answer/parser/whois.cira.ca_test.rb

@@ -22,8 +22,8 @@ class AnswerParserWhoisCiraCaTest < Whois::Answer::Parser::TestCase
   end
 
   def test_registered?
-    assert !@klass.new(load_part('/available.txt')).registered?
     assert  @klass.new(load_part('/registered.txt')).registered?
+    assert !@klass.new(load_part('/available.txt')).registered?
   end
 
 
@@ -48,4 +48,17 @@ class AnswerParserWhoisCiraCaTest < Whois::Answer::Parser::TestCase
                   @klass.new(load_part('/available.txt')).expires_on
   end
 
+
+  def test_nameservers
+    parser    = @klass.new(load_part('/registered.txt'))
+    expected  = %w( ns1.google.com ns2.google.com ns3.google.com ns4.google.com )
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+
+    parser    = @klass.new(load_part('/available.txt'))
+    expected  = %w()
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+  end
+
 end