whois 1.0.12 → 1.1.0

data/lib/whois/answer/parser/whois.nic.ac.rb

@@ -66,11 +66,11 @@ module Whois
 
         property_not_supported :registrar
 
-        property_not_supported :registrant
+        property_not_supported :registrant_contact
 
-        property_not_supported :admin
+        property_not_supported :admin_contact
 
-        property_not_supported :technical
+        property_not_supported :technical_contact
 
 
         property_not_supported :nameservers

data/lib/whois/answer/parser/whois.nic.am.rb

@@ -0,0 +1,83 @@
+#
+# = 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.nic.am parser
+      #
+      # Parser for the whois.nic.am 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 WhoisNicAm < Base
+
+        property_supported :status do
+          @status ||= if content_for_scanner =~ /\s+Status:\s+(.*)\n/
+            $1
+          end
+        end
+
+        property_supported :available? do
+          @available ||= !!(content_for_scanner =~ /No match/)
+        end
+
+        property_supported :registered? do
+          !available?
+        end
+
+
+        property_supported :created_on do
+          @created_on ||= if content_for_scanner =~ /\s+Registered:\s+(.*)\n/
+            Time.parse($1)
+          end
+        end
+
+        property_supported :updated_on do
+          @updated_on ||= if content_for_scanner =~ /\s+Last modified:\s+(.*)\n/
+            Time.parse($1)
+          end
+        end
+
+        property_supported :expires_on do
+          @expires_on ||= if content_for_scanner =~ /\s+Expires:\s+(.*)\n/
+            Time.parse($1)
+          end
+        end
+
+
+        property_supported :nameservers do
+          @nameservers ||= if content_for_scanner =~ /DNS servers:\n((.+\n)+)\n/
+            $1.split("\n").map { |value| value.strip }
+          else
+            []
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/whois/answer/parser/whois.nic.as.rb

@@ -0,0 +1,73 @@
+#
+# = 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.nic.as parser
+      #
+      # Parser for the whois.nic.as 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 WhoisNicAs < Base
+
+        property_supported :status do
+          @status ||= if available?
+            :available
+          else
+            :registered
+          end
+        end
+
+        property_supported :available? do
+          @available ||= !!(content_for_scanner =~ /Domain Not Found/)
+        end
+
+        property_supported :registered? do
+          !available?
+        end
+
+
+        property_not_supported :created_on
+
+        property_not_supported :updated_on
+
+        property_not_supported :expires_on
+
+
+        property_supported :nameservers do
+          @nameservers ||= if content_for_scanner =~ /Nameservers:\s((.+\n)+)\n/
+            $1.split("\n").map { |value| value.strip.split(" ").first }.compact
+          else
+            []
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/whois/answer/parser/whois.nic.hu.rb

@@ -83,13 +83,13 @@ module Whois
           end
         end
 
-        property_supported :registrant do
+        property_supported :registrant_contact do
           return unless registered?
-          return @registrant if @registrant
+          return @registrant_contact if @registrant_contact
 
           address, city, zip, country_code = decompose_address(node('address'))
 
-          @registrant = Answer::Contact.new(
+          @registrant_contact = Answer::Contact.new(
             :name         => node('name'),
             :organization => node('org'),
             :address      => address,
@@ -101,12 +101,12 @@ module Whois
           )
         end
 
-        property_supported :admin do
-          contact('admin-c')
+        property_supported :admin_contact do
+          @admin_contact ||= contact('admin-c')
         end
 
-        property_supported :technical do
-          contact('tech-c')
+        property_supported :technical_contact do
+          @tecnical_contact ||= contact('tech-c')
         end
 
 

data/lib/whois/answer/parser/whois.nic.it.rb

@@ -94,20 +94,20 @@ module Whois
 
         # If available, returns a <tt>Whois::Answer::Contact</tt> record
         # containing the registrant details extracted from the registry answer.
-        property_supported :registrant do
-          contact("Registrant")
+        property_supported :registrant_contact do
+          @registrant_contact ||= contact("Registrant")
         end
 
         # If available, returns a <tt>Whois::Answer::Contact</tt> record
         # containing the admin contact details extracted from the registry answer.
-        property_supported :admin do
-          contact("Admin Contact")
+        property_supported :admin_contact do
+          @admin_contact ||= contact("Admin Contact")
         end
 
         # If available, returns a <tt>Whois::Answer::Contact</tt> record
         # containing the technical contact details extracted from the registry answer.
-        property_supported :technical do
-          contact("Technical Contacts")
+        property_supported :technical_contact do
+          @technical_contact ||= contact("Technical Contacts")
         end
 
 

data/lib/whois/answer/parser/whois.nic.st.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.nic.st parser
+      #
+      # Parser for the whois.nic.st 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 WhoisNicSt < Base
+
+        property_supported :status do
+          @status ||= if available?
+            :available
+          else
+            :registered
+          end
+        end
+
+        property_supported :available? do
+          @available ||= !!(content_for_scanner =~ /No entries found for domain/)
+        end
+
+        property_supported :registered? do
+          !available?
+        end
+
+
+        property_supported :created_on do
+          @created_on ||= if content_for_scanner =~ /\s+Creation Date:\s+(.*)\n/
+            Time.parse($1)
+          end
+        end
+
+        property_supported :updated_on do
+          @updated_on ||= if content_for_scanner =~ /\s+Updated Date:\s+(.*)\n/
+            Time.parse($1)
+          end
+        end
+
+        property_not_supported :expires_on
+
+
+        property_supported :nameservers do
+          @nameservers ||= if content_for_scanner =~ /Name Servers:\n((.+\n)+)\n?/
+            $1.split("\n").map(&:strip)
+          else
+            []
+          end
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -83,15 +83,15 @@ module Whois
           end
         end
 
-        property_supported :registrant do
+        property_supported :registrant_contact do
           contact("Registrant")
         end
 
-        property_supported :admin do
+        property_supported :admin_contact do
           contact("Admin")
         end
 
-        property_supported :technical do
+        property_supported :technical_contact do
           contact("Tech")
         end
 

data/lib/whois/version.rb

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

data/test/answer/contact_test.rb

@@ -0,0 +1,14 @@
+require 'test_helper'
+
+class AnswerContactTest < Test::Unit::TestCase
+
+  def setup
+    @klass = Whois::Answer::Contact
+  end
+
+  def test_initialize
+    contact = @klass.new({})
+    assert_equal nil, contact.id
+  end
+
+end

data/test/answer/parser/base_test.rb

@@ -45,6 +45,24 @@ class AnswerParserBaseTest < Test::Unit::TestCase
   end
 
 
+  def test_contacts_should_return_empty_array_with_all_unsupported
+    parser = @klass.new(@part)
+    assert_equal [], parser.contacts
+  end
+
+  def test_contacts_should_return_all_supported_contacts
+    c1 = "1st"
+    c2 = "2nd"
+    c3 = "3rd"
+    klass = Class.new(@klass) do
+      register_property(:registrant_contact, :supported) { [c1, c2] }
+      register_property(:admin_contact, :supported) { nil }
+      register_property(:technical_contact, :supported) { c3 }
+    end
+    assert_equal [c1, c2, c3], klass.new(@part).contacts
+  end
+
+
   def test_self_property_registry
     assert_instance_of Hash, @klass.property_registry
   end

data/test/answer/parser/whois.ausregistry.net.au_test.rb

@@ -0,0 +1,70 @@
+require 'test_helper'
+require 'whois/answer/parser/whois.ausregistry.net.au'
+
+class AnswerParserWhoisAusregistryNetAuTest < Whois::Answer::Parser::TestCase
+
+  def setup
+    @klass  = Whois::Answer::Parser::WhoisAusregistryNetAu
+    @host   = "whois.ausregistry.net.au"
+  end
+
+
+  def test_status
+    parser    = @klass.new(load_part('/registered.txt'))
+    expected  = "ok"
+    assert_equal  expected, parser.status
+    assert_equal  expected, parser.instance_eval { @status }
+
+    parser    = @klass.new(load_part('/available.txt'))
+    expected  = nil
+    assert_equal  expected, parser.status
+    assert_equal  expected, parser.instance_eval { @status }
+  end
+
+  def test_available?
+    assert !@klass.new(load_part('/registered.txt')).available?
+    assert  @klass.new(load_part('/available.txt')).available?
+  end
+
+  def test_registered?
+    assert  @klass.new(load_part('/registered.txt')).registered?
+    assert !@klass.new(load_part('/available.txt')).registered?
+  end
+
+
+  def test_created_on
+    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/registered.txt')).created_on }
+    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/available.txt')).created_on }
+  end
+
+  def test_updated_on
+    parser    = @klass.new(load_part('/registered.txt'))
+    expected  = Time.parse("2009-10-12 16:05:44 UTC")
+    assert_equal  expected, parser.updated_on
+    assert_equal  expected, parser.instance_eval { @updated_on }
+
+    parser    = @klass.new(load_part('/available.txt'))
+    expected  = nil
+    assert_equal  expected, parser.updated_on
+    assert_equal  expected, parser.instance_eval { @updated_on }
+  end
+
+  def test_expires_on
+    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/registered.txt')).expires_on }
+    assert_raise(Whois::PropertyNotSupported) { @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