whois 1.0.11 → 1.0.12

data/CHANGELOG.rdoc

@@ -1,6 +1,15 @@
 = Changelog
 
 
+== master
+
+* NEW: Added simple .in TLD parser (whois.registry.in).
+
+* NEW: Added simple .jp TLD parser (whois.jprs.jp).
+
+* FIXED: With some .lu domains, whois.dns.lu parser returns invalid values for nameservers.
+
+
 == Release 1.0.11
 
 * NEW: Added simple .af TLD parser (whois.nic.af).

data/Manifest

@@ -50,6 +50,7 @@ lib/whois/answer/parser/whois.eu.rb
 lib/whois/answer/parser/whois.hkdnr.net.hk.rb
 lib/whois/answer/parser/whois.iana.org.rb
 lib/whois/answer/parser/whois.isnic.is.rb
+lib/whois/answer/parser/whois.jprs.jp.rb
 lib/whois/answer/parser/whois.meregistry.net.rb
 lib/whois/answer/parser/whois.museum.rb
 lib/whois/answer/parser/whois.nic-se.se.rb
@@ -88,6 +89,7 @@ lib/whois/answer/parser/whois.pandi.or.id.rb
 lib/whois/answer/parser/whois.publicinterestregistry.net.rb
 lib/whois/answer/parser/whois.register.bg.rb
 lib/whois/answer/parser/whois.registro.br.rb
+lib/whois/answer/parser/whois.registry.in.rb
 lib/whois/answer/parser/whois.registrypro.pro.rb
 lib/whois/answer/parser/whois.ripe.net.rb
 lib/whois/answer/parser/whois.ripn.net.rb
@@ -148,6 +150,7 @@ test/answer/parser/whois.eu_test.rb
 test/answer/parser/whois.hkdnr.net.hk_test.rb
 test/answer/parser/whois.iana.org_test.rb
 test/answer/parser/whois.isnic.is_test.rb
+test/answer/parser/whois.jprs.jp_test.rb
 test/answer/parser/whois.meregistry.net_test.rb
 test/answer/parser/whois.museum_test.rb
 test/answer/parser/whois.nic-se.se_test.rb
@@ -186,6 +189,7 @@ test/answer/parser/whois.pandi.or.id_test.rb
 test/answer/parser/whois.publicinterestregistry.net_test.rb
 test/answer/parser/whois.register.bg_test.rb
 test/answer/parser/whois.registro.br_test.rb
+test/answer/parser/whois.registry.in_test.rb
 test/answer/parser/whois.registrypro.pro_test.rb
 test/answer/parser/whois.ripe.net_test.rb
 test/answer/parser/whois.ripn.net_test.rb
@@ -275,6 +279,7 @@ test/testcases/responses/whois.dk-hostmaster.dk/registered.txt
 test/testcases/responses/whois.dns.be/available.txt
 test/testcases/responses/whois.dns.be/registered.txt
 test/testcases/responses/whois.dns.lu/available.txt
+test/testcases/responses/whois.dns.lu/property_nameservers_with_ip.txt
 test/testcases/responses/whois.dns.lu/registered.txt
 test/testcases/responses/whois.domain-registry.nl/available.txt
 test/testcases/responses/whois.domain-registry.nl/registered.txt
@@ -299,6 +304,8 @@ test/testcases/responses/whois.iana.org/available.txt
 test/testcases/responses/whois.iana.org/registered.txt
 test/testcases/responses/whois.isnic.is/available.txt
 test/testcases/responses/whois.isnic.is/registered.txt
+test/testcases/responses/whois.jprs.jp/available.txt
+test/testcases/responses/whois.jprs.jp/registered.txt
 test/testcases/responses/whois.meregistry.net/available.txt
 test/testcases/responses/whois.meregistry.net/registered.txt
 test/testcases/responses/whois.museum/available.txt
@@ -397,6 +404,8 @@ test/testcases/responses/whois.register.bg/property_nameservers_with_ip.txt
 test/testcases/responses/whois.register.bg/registered.txt
 test/testcases/responses/whois.registro.br/available.txt
 test/testcases/responses/whois.registro.br/registered.txt
+test/testcases/responses/whois.registry.in/available.txt
+test/testcases/responses/whois.registry.in/registered.txt
 test/testcases/responses/whois.registrypro.pro/available.txt
 test/testcases/responses/whois.registrypro.pro/registered.txt
 test/testcases/responses/whois.ripe.net/fo/available.txt

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

@@ -7,7 +7,7 @@ whois.afilias.info (.info)
 whois.afilias-grs.info (.bz, .gi, .hn, .lc, .mn, .sc, .vc)
 whois.aero (.aero)
 whois.nic.af (.af)
-
+whois.registry.in (.in)
 
 whois.museum (.museum)
 whois.cat (.cat)

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

@@ -15,7 +15,7 @@
 
 
 require 'whois/answer/parser/base'
-require 'whois/answer/parser/whois.cnnic.cn.rb'
+require 'whois/answer/parser/whois.cnnic.cn'
 
 
 module Whois

data/lib/whois/answer/parser/whois.dns.lu.rb

@@ -62,7 +62,7 @@ module Whois
 
 
         property_supported :nameservers do
-          @nameservers ||= content_for_scanner.scan(/nserver:\s+(.+)\n/).flatten
+          @nameservers ||= content_for_scanner.scan(/nserver:\s+(.+)\n/).flatten.map { |value| value.split(" ").first }
         end
 
       end

data/lib/whois/answer/parser/whois.jprs.jp.rb

@@ -0,0 +1,82 @@
+#
+# = 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.jprs.jp parser
+      #
+      # Parser for the whois.jprs.jp 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 WhoisJprsJp < Base
+
+        property_supported :status do
+          @status ||= if content_for_scanner =~ /\[Status\]\s+(.*)\n/
+            $1
+          end
+        end
+
+        property_supported :available? do
+          @available ||= !!(content_for_scanner =~ /No match!!/)
+        end
+
+        property_supported :registered? do
+          !available?
+        end
+
+
+        # TODO: timezone ('Asia/Tokyo')
+        property_supported :created_on do
+          @created_on ||= if content_for_scanner =~ /\[Created on\]\s+(.*)\n/
+            Time.parse($1)
+          end
+        end
+
+        # TODO: timezone ('Asia/Tokyo')
+        property_supported :updated_on do
+          @updated_on ||= if content_for_scanner =~ /\[Last Updated\]\s+(.*)\n/
+            Time.parse($1)
+          end
+        end
+
+        # TODO: timezone ('Asia/Tokyo')
+        property_supported :expires_on do
+          @expires_on ||= if content_for_scanner =~ /\[Expires on\]\s+(.*)\n/
+            Time.parse($1)
+          end
+        end
+
+
+        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.registry.in.rb

@@ -0,0 +1,77 @@
+#
+# = 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.registry.in parser
+      #
+      # Parser for the whois.registry.in 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 WhoisRegistryIn < Base
+
+        property_supported :status do
+          @status ||= content_for_scanner.scan(/Status:(.*?)\n/).flatten
+        end
+
+        property_supported :available? do
+          @available ||= (content_for_scanner.strip == "NOT FOUND")
+        end
+
+        property_supported :registered? do
+          !available?
+        end
+
+
+        property_supported :created_on do
+          @created_on ||= if content_for_scanner =~ /Created On:(.*?)\n/
+            Time.parse($1)
+          end
+        end
+
+        property_supported :updated_on do
+          @updated_on ||= if content_for_scanner =~ /Last Updated On:(.*?)\n/
+            Time.parse($1)
+          end
+        end
+
+        property_supported :expires_on do
+          @expires_on ||= if content_for_scanner =~ /Expiration Date:(.*?)\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

data/lib/whois/version.rb

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

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

@@ -1,5 +1,5 @@
 require 'test_helper'
-require 'whois/answer/parser/jobswhois.verisign-grs.com.rb'
+require 'whois/answer/parser/jobswhois.verisign-grs.com'
 
 class AnswerParserJobswhoisVerisignGrsComTest < Whois::Answer::Parser::TestCase
 

data/test/answer/parser/whois.adamsnames.tc_test.rb

@@ -1,5 +1,5 @@
 require 'test_helper'
-require 'whois/answer/parser/whois.adamsnames.tc.rb'
+require 'whois/answer/parser/whois.adamsnames.tc'
 
 class AnswerParserWhoisAdamsnamesTcTest < Whois::Answer::Parser::TestCase
 

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

@@ -1,5 +1,5 @@
 require 'test_helper'
-require 'whois/answer/parser/whois.aero.rb'
+require 'whois/answer/parser/whois.aero'
 
 class AnswerParserWhoisAeroTest < Whois::Answer::Parser::TestCase
 

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

@@ -1,5 +1,5 @@
 require 'test_helper'
-require 'whois/answer/parser/whois.afilias-grs.info.rb'
+require 'whois/answer/parser/whois.afilias-grs.info'
 
 class AnswerParserWhoisAfiliasGrsInfoTest < Whois::Answer::Parser::TestCase
 

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

@@ -1,5 +1,5 @@
 require 'test_helper'
-require 'whois/answer/parser/whois.afilias.info.rb'
+require 'whois/answer/parser/whois.afilias.info'
 
 class AnswerParserWhoisAfiliasInfoTest < Whois::Answer::Parser::TestCase
 

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

@@ -1,5 +1,5 @@
 require 'test_helper'
-require 'whois/answer/parser/whois.ai.rb'
+require 'whois/answer/parser/whois.ai'
 
 class AnswerParserWhoisAiTest < Whois::Answer::Parser::TestCase
 

data/test/answer/parser/whois.arnes.si_test.rb

@@ -1,5 +1,5 @@
 require 'test_helper'
-require 'whois/answer/parser/whois.arnes.si.rb'
+require 'whois/answer/parser/whois.arnes.si'
 
 class AnswerParserWhoisArnesSiTest < Whois::Answer::Parser::TestCase
 

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

@@ -1,5 +1,5 @@
 require 'test_helper'
-require 'whois/answer/parser/whois.biz.rb'
+require 'whois/answer/parser/whois.biz'
 
 class AnswerParserWhoisBizTest < Whois::Answer::Parser::TestCase
 

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

@@ -1,5 +1,5 @@
 require 'test_helper'
-require 'whois/answer/parser/whois.cat.rb'
+require 'whois/answer/parser/whois.cat'
 
 class AnswerParserWhoisCatTest < Whois::Answer::Parser::TestCase
 

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

@@ -1,5 +1,5 @@
 require 'test_helper'
-require 'whois/answer/parser/whois.cira.ca.rb'
+require 'whois/answer/parser/whois.cira.ca'
 
 class AnswerParserWhoisCiraCaTest < Whois::Answer::Parser::TestCase
 

data/test/answer/parser/whois.cnnic.cn_test.rb

@@ -1,5 +1,5 @@
 require 'test_helper'
-require 'whois/answer/parser/whois.cnnic.cn.rb'
+require 'whois/answer/parser/whois.cnnic.cn'
 
 class AnswerParserWhoisCnnicCnTest < Whois::Answer::Parser::TestCase
 

data/test/answer/parser/whois.cnnic.net.cn_test.rb

@@ -1,5 +1,5 @@
 require 'test_helper'
-require 'whois/answer/parser/whois.cnnic.net.cn.rb'
+require 'whois/answer/parser/whois.cnnic.net.cn'
 
 class AnswerParserWhoisCnnicNetCnTest < AnswerParserWhoisCnnicCnTest
 

data/test/answer/parser/whois.dk-hostmaster.dk_test.rb

@@ -1,5 +1,5 @@
 require 'test_helper'
-require 'whois/answer/parser/whois.dk-hostmaster.dk.rb'
+require 'whois/answer/parser/whois.dk-hostmaster.dk'
 
 class AnswerParserWhoisDkHostmasterDkTest < Whois::Answer::Parser::TestCase
 

data/test/answer/parser/whois.dns.be_test.rb

@@ -1,5 +1,5 @@
 require 'test_helper'
-require 'whois/answer/parser/whois.dns.be.rb'
+require 'whois/answer/parser/whois.dns.be'
 
 class AnswerParserWhoisDnsBeTest < Whois::Answer::Parser::TestCase
 

data/test/answer/parser/whois.dns.lu_test.rb

@@ -1,5 +1,5 @@
 require 'test_helper'
-require 'whois/answer/parser/whois.dns.lu.rb'
+require 'whois/answer/parser/whois.dns.lu'
 
 class AnswerParserWhoisDnsLuTest < Whois::Answer::Parser::TestCase
 
@@ -67,4 +67,11 @@ class AnswerParserWhoisDnsLuTest < Whois::Answer::Parser::TestCase
     assert_equal  expected, parser.instance_eval { @nameservers }
   end
 
+  def test_nameservers_with_ip
+    parser    = @klass.new(load_part('/property_nameservers_with_ip.txt'))
+    expected  = %w( ns1.arbed.lu ns1.pt.lu ns2.arbed.lu )
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+  end
+
 end

data/test/answer/parser/whois.domain-registry.nl_test.rb

@@ -1,5 +1,5 @@
 require 'test_helper'
-require 'whois/answer/parser/whois.domain-registry.nl.rb'
+require 'whois/answer/parser/whois.domain-registry.nl'
 
 class AnswerParserWhoisDomainRegistryNlTest < Whois::Answer::Parser::TestCase
 

data/test/answer/parser/whois.domainregistry.ie_test.rb

@@ -1,5 +1,5 @@
 require 'test_helper'
-require 'whois/answer/parser/whois.domainregistry.ie.rb'
+require 'whois/answer/parser/whois.domainregistry.ie'
 
 class AnswerParserWhoisDomainregistryIeTest < Whois::Answer::Parser::TestCase
 

data/test/answer/parser/whois.domreg.lt_test.rb

@@ -1,5 +1,5 @@
 require 'test_helper'
-require 'whois/answer/parser/whois.domreg.lt.rb'
+require 'whois/answer/parser/whois.domreg.lt'
 
 class AnswerParserWhoisDomregLtTest < Whois::Answer::Parser::TestCase
 

data/test/answer/parser/whois.dotmobiregistry.net_test.rb

@@ -1,5 +1,5 @@
 require 'test_helper'
-require 'whois/answer/parser/whois.dotmobiregistry.net.rb'
+require 'whois/answer/parser/whois.dotmobiregistry.net'
 
 class AnswerParserWhoisDotmobiregistryNetTest < Whois::Answer::Parser::TestCase
 

data/test/answer/parser/whois.educause.edu_test.rb

@@ -1,5 +1,5 @@
 require 'test_helper'
-require 'whois/answer/parser/whois.educause.edu.rb'
+require 'whois/answer/parser/whois.educause.edu'
 
 class AnswerParserWhoisEducauseEduTest < Whois::Answer::Parser::TestCase