whois 1.1.1 → 1.1.2

data/CHANGELOG.rdoc

@@ -1,6 +1,13 @@
 = Changelog
 
 
+== Release 1.1.2
+
+* NEW: Whois::Answer::Contact#type property returns the type of the contact (ADMIN, TECHNICAL, ...).
+
+* FIXED: Whois::Answer::Parser::Base#contacts decomposes each Contact property in a single contact.
+
+
 == Release 1.1.1
 
 * FIXED: Deprecated methods Whois::Answer::Parser::Base#(admin|technical|registrant) didn't figure as supported with Whois::Answer#property_supported?(:method)

data/Manifest

@@ -375,10 +375,10 @@ test/testcases/responses/whois.nic.io/registered.txt
 test/testcases/responses/whois.nic.it/available.txt
 test/testcases/responses/whois.nic.it/property_admin_contact.txt
 test/testcases/responses/whois.nic.it/property_registrant_contact.txt
+test/testcases/responses/whois.nic.it/property_status_active.txt
+test/testcases/responses/whois.nic.it/property_status_available.txt
 test/testcases/responses/whois.nic.it/property_technical_contact.txt
 test/testcases/responses/whois.nic.it/registered.txt
-test/testcases/responses/whois.nic.it/status_active.txt
-test/testcases/responses/whois.nic.it/status_available.txt
 test/testcases/responses/whois.nic.lv/available.txt
 test/testcases/responses/whois.nic.lv/registered.txt
 test/testcases/responses/whois.nic.ly/available.txt

data/lib/whois/answer/contact.rb

@@ -28,7 +28,7 @@ module Whois
     # A <tt>Contact</tt> is composed by the following attributes:
     #
     #  * <tt>:id</tt>:
-    #  * <tt>:type</tt>: the contact type.
+    #  * <tt>:type</tt>: the contact type (1 = registrant, 2 = admin, 3 = technical).
     #  * <tt>:name</tt>:
     #  * <tt>:organization</tt>:
     #  * <tt>:address</tt>:
@@ -46,10 +46,15 @@ module Whois
     # Be aware that every WHOIS server can return a different number of details
     # or no details at all.
     #
-    class Contact < SuperStruct.new(:id, :name, :organization, :type,
+    class Contact < SuperStruct.new(:id, :type, :name, :organization,
                                     :address, :city, :zip, :state, :country, :country_code,
                                     :phone, :fax, :email,
                                     :created_on, :updated_on)
+
+      TYPE_REGISTRANT = 1
+      TYPE_ADMIN = 2
+      TYPE_TECHNICAL = 3
+
     end
 
   end

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

@@ -224,9 +224,9 @@ module Whois
         # Returns an array of all supported contacts.
         def contacts
           contacts = []
-          contacts.concat([*registrant_contact])  if property_supported?(:registrant_contact)
-          contacts.concat([*admin_contact])       if property_supported?(:admin_contact)
-          contacts.concat([*technical_contact])   if property_supported?(:technical_contact)
+          contacts.concat(registrant_contact.is_a?(Array) ? registrant_contact : [registrant_contact]) if property_supported?(:registrant_contact)
+          contacts.concat(admin_contact.is_a?(Array) ? admin_contact : [admin_contact]) if property_supported?(:admin_contact)
+          contacts.concat(technical_contact.is_a?(Array) ? technical_contact : [technical_contact]) if property_supported?(:technical_contact)
           contacts.compact
         end
 

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

@@ -61,23 +61,23 @@ module Whois
           node("Zone-C") do |raw|
             Answer::Registrar.new(
                 :id => nil,
-                :name => raw.name,
-                :organization => raw.organization,
+                :name => raw["name"],
+                :organization => raw["organization"],
                 :url => nil
             )
           end
         end
 
         property_supported :registrant_contact do
-          @registrant_contact ||= node("Holder")
+          @registrant_contact ||= contact("Holder", Whois::Answer::Contact::TYPE_REGISTRANT)
         end
 
         property_supported :admin_contact do
-          @admin_contact ||= node("Admin-C")
+          @admin_contact ||= contact("Admin-C", Whois::Answer::Contact::TYPE_ADMIN)
         end
 
         property_supported :technical_contact do
-          @technical_contact ||= node("Tech-C")
+          @technical_contact ||= contact("Tech-C", Whois::Answer::Contact::TYPE_TECHNICAL)
         end
 
         # @deprecated
@@ -110,6 +110,14 @@ module Whois
             Scanner.new(content_for_scanner).parse
           end
 
+          def contact(element, type)
+            node(element) do |raw|
+              Answer::Contact.new(raw) do |c|
+                c.type = type
+              end
+            end
+          end
+
 
         class Scanner
 
@@ -176,22 +184,22 @@ module Whois
                 contact = {}
                 while parse_pair(contact)
                 end
-                @ast[contact_name] = Answer::Contact.new(
-                    :id => nil,
-                    :name => contact['Name'],
-                    :organization => contact['Organisation'],
-                    :address => contact['Address'],
-                    :city => contact['City'],
-                    :zip => contact['Pcode'],
-                    :state => nil,
-                    :country => nil,
-                    :country_code => contact['Country'],
-                    :phone => contact['Phone'],
-                    :fax => contact['Fax'],
-                    :email => contact['Email'],
-                    :created_on => nil,
-                    :updated_on => contact['Changed']
-                )
+                @ast[contact_name] = {
+                  "id" => nil,
+                  "name" => contact['Name'],
+                  "organization" => contact['Organisation'],
+                  "address" => contact['Address'],
+                  "city" => contact['City'],
+                  "zip" => contact['Pcode'],
+                  "state" => nil,
+                  "country" => nil,
+                  "country_code" => contact['Country'],
+                  "phone" => contact['Phone'],
+                  "fax" => contact['Fax'],
+                  "email" => contact['Email'],
+                  "created_on" => nil,
+                  "updated_on" => contact['Changed']
+                }
                 true
               else
                 false

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

@@ -87,26 +87,27 @@ module Whois
           return unless registered?
           return @registrant_contact if @registrant_contact
 
-          address, city, zip, country_code = decompose_address(node('address'))
+          address, city, zip, country_code = decompose_address(node("address"))
 
-          @registrant_contact = Answer::Contact.new(
-            :name         => node('name'),
-            :organization => node('org'),
+          @registrant_contact = Whois::Answer::Contact.new(
+            :type         => Whois::Answer::Contact::TYPE_REGISTRANT,
+            :name         => node("name"),
+            :organization => node("org"),
             :address      => address,
             :city         => city,
             :zip          => zip,
             :country_code => country_code,
-            :phone        => node('phone'),
-            :fax          => node('fax-no')
+            :phone        => node("phone"),
+            :fax          => node("fax-no")
           )
         end
 
         property_supported :admin_contact do
-          @admin_contact ||= contact('admin-c')
+          @admin_contact ||= contact("admin-c", Whois::Answer::Contact::TYPE_ADMIN)
         end
 
         property_supported :technical_contact do
-          @tecnical_contact ||= contact('tech-c')
+          @tecnical_contact ||= contact("tech-c", Whois::Answer::Contact::TYPE_TECHNICAL)
         end
 
         # @deprecated
@@ -118,16 +119,16 @@ module Whois
 
 
         property_supported :nameservers do
-          @nameservers ||= node('nameserver') || []
+          @nameservers ||= node("nameserver") || []
         end
 
 
         def registrar_contact
-          contact('registrar')
+          contact("registrar", nil)
         end
 
         def zone_contact
-          contact('zone-c')
+          contact("zone-c", nil)
         end
 
 
@@ -137,9 +138,10 @@ module Whois
             Scanner.new(content_for_scanner).parse
           end
 
-          def contact(element)
+          def contact(element, type)
             node(node(element)) do |raw|
-              Answer::Contact.new do |c|
+              Whois::Answer::Contact.new do |c|
+                c.type = type
                 raw.each { |k,v| c[k.to_sym] = v }
               end
             end

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

@@ -31,13 +31,13 @@ module Whois
 
         # Returns the registry disclaimer that comes with the answer.
         property_supported :disclaimer do
-          node("Disclaimer")
+          @disclaimer ||= node("Disclaimer")
         end
 
 
         # If available, returns the domain name as stored by the registry.
         property_supported :domain do
-          node("Domain") { |raw| raw.downcase }
+          @domain ||= node("Domain") { |raw| raw.downcase }
         end
 
         # If available, returns the unique domain ID set by the registry.
@@ -47,7 +47,7 @@ module Whois
         # Returns the record status or an array of status,
         # in case the registry supports it.
         property_supported :status do
-          node("Status") { |raw| raw.downcase.to_sym }
+          @status ||= node("Status") { |raw| raw.downcase.to_sym }
         end
 
         # Returns whether this record is available.
@@ -64,26 +64,26 @@ module Whois
         # If available, returns a Time object representing the date
         # the record was created, according to the registry answer.
         property_supported :created_on do
-          node("Created") { |raw| Time.parse(raw) }
+          @created_on ||= node("Created") { |raw| Time.parse(raw) }
         end
         
         # If available, returns a Time object representing the date
         # the record was last updated, according to the registry answer.
         property_supported :updated_on do
-          node("Last Update") { |raw| Time.parse(raw) }
+          @updated_on ||= node("Last Update") { |raw| Time.parse(raw) }
         end
         
         # If available, returns a Time object representing the date
         # the record is set to expire, according to the registry answer.
         property_supported :expires_on do
-          node("Expire Date") { |raw| Time.parse(raw) }
+          @expires_on ||= node("Expire Date") { |raw| Time.parse(raw) }
         end
 
 
         # If available, returns a <tt>Whois::Answer::Registrar</tt> record
         # containing the registrar details extracted from the registry answer.
         property_supported :registrar do
-          node("Registrar") do |raw|
+          @registrar ||= node("Registrar") do |raw|
             Answer::Registrar.new(
               :id           => raw["Name"],
               :name         => raw["Name"],
@@ -95,19 +95,19 @@ module Whois
         # If available, returns a <tt>Whois::Answer::Contact</tt> record
         # containing the registrant details extracted from the registry answer.
         property_supported :registrant_contact do
-          @registrant_contact ||= contact("Registrant")
+          @registrant_contact ||= contact("Registrant", Whois::Answer::Contact::TYPE_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_contact do
-          @admin_contact ||= contact("Admin Contact")
+          @admin_contact ||= contact("Admin Contact", Whois::Answer::Contact::TYPE_ADMIN)
         end
 
         # If available, returns a <tt>Whois::Answer::Contact</tt> record
         # containing the technical contact details extracted from the registry answer.
         property_supported :technical_contact do
-          @technical_contact ||= contact("Technical Contacts")
+          @technical_contact ||= contact("Technical Contacts", Whois::Answer::Contact::TYPE_TECHNICAL)
         end
 
         # @deprecated
@@ -166,11 +166,12 @@ module Whois
             Scanner.new(content_for_scanner).parse
           end
 
-          def contact(element)
+          def contact(element, type)
             node(element) do |raw|
               address = (raw["Address"] || "").split("\n")
               Answer::Contact.new(
                 :id           => raw["ContactID"],
+                :type         => type,
                 :name         => raw["Name"],
                 :organization => raw["Organization"],
                 :address      => address[0],

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

@@ -30,21 +30,21 @@ module Whois
         include Ast
 
         property_supported :disclaimer do
-          node("Disclaimer")
+          @disclaimer ||= node("Disclaimer")
         end
 
 
         property_supported :domain do
-          node("Domain Name") { |value| value.downcase }
+          @domain ||= node("Domain Name") { |value| value.downcase }
         end
 
         property_supported :domain_id do
-          node("Domain ID")
+          @domain_id ||= node("Domain ID")
         end
 
 
         property_supported :status do
-          node("Status")
+          @status ||= node("Status")
         end
 
         property_supported :available? do
@@ -57,26 +57,26 @@ module Whois
 
 
         property_supported :created_on do
-          node("Created On") { |value| Time.parse(value) }
+          @created_on ||= node("Created On") { |value| Time.parse(value) }
         end
 
         property_supported :updated_on do
-          node("Last Updated On") { |value| Time.parse(value) }
+          @updated_on ||= node("Last Updated On") { |value| Time.parse(value) }
         end
 
         property_supported :expires_on do
-          node("Expiration Date") { |value| Time.parse(value) }
+          @expires_on ||= node("Expiration Date") { |value| Time.parse(value) }
         end
 
-        
+
         property_supported :registrar do
-          node("Sponsoring Registrar") do |registrar|
+          @registrar ||= node("Sponsoring Registrar") do |registrar|
             id, name = if registrar =~ /(.*?)\((.*?)\)/
               [$2.strip, $1.strip]
             else
               [nil, registrar]
             end
-            Answer::Registrar.new(
+            Whois::Answer::Registrar.new(
               :id           => id,
               :name         => name
             )
@@ -84,15 +84,15 @@ module Whois
         end
 
         property_supported :registrant_contact do
-          contact("Registrant")
+          @registrant_contact ||= contact("Registrant", Whois::Answer::Contact::TYPE_REGISTRANT)
         end
 
         property_supported :admin_contact do
-          contact("Admin")
+          @admin_contact ||= contact("Admin", Whois::Answer::Contact::TYPE_ADMIN)
         end
 
         property_supported :technical_contact do
-          contact("Tech")
+          @technical_contact ||= contact("Tech", Whois::Answer::Contact::TYPE_TECHNICAL)
         end
 
         # @deprecated
@@ -125,10 +125,11 @@ module Whois
             Scanner.new(content_for_scanner).parse
           end
 
-          def contact(element)
+          def contact(element, type)
             node("#{element} ID") do |registrant_id|
-              Answer::Contact.new(
+              Whois::Answer::Contact.new(
                 :id           => registrant_id,
+                :type         => type,
                 :name         => node("#{element} Name"),
                 :organization => node("#{element} Organization"),
                 :address      => [node("#{element} Street1"),

data/lib/whois/version.rb

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

data/test/answer/parser/base_test.rb

@@ -51,15 +51,15 @@ class AnswerParserBaseTest < Test::Unit::TestCase
   end
 
   def test_contacts_should_return_all_supported_contacts
-    c1 = "1st"
-    c2 = "2nd"
-    c3 = "3rd"
+    c1 = Whois::Answer::Contact.new(:id => "1st", :name => "foo")
+    c2 = Whois::Answer::Contact.new(:id => "2nd", :name => "foo")
+    c3 = Whois::Answer::Contact.new(:id => "3rd", :name => "foo")
     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
+    assert_equal ["1st", "2nd", "3rd"], klass.new(@part).contacts.map(&:id)
   end
 
 

data/test/answer/parser/whois.denic.de_test.rb

@@ -185,6 +185,7 @@ http://www.denic.de/en/background/whois-service/webwhois.html
 
     assert_instance_of Whois::Answer::Contact, result
     assert_equal nil,                     result.id
+    assert_equal Whois::Answer::Contact::TYPE_TECHNICAL, result.type
     assert_equal 'Google Inc.',           result.name
     assert_equal nil,                     result.organization
     assert_equal ['Google Inc.', '1600 Amphitheatre Parkway'], result.address

data/test/answer/parser/whois.nic.hu_test.rb

@@ -138,6 +138,7 @@ EOS
     result    = parser.registrant_contact
 
     assert_instance_of Whois::Answer::Contact,  result
+    assert_equal Whois::Answer::Contact::TYPE_REGISTRANT, result.type
     assert_equal 'Google, Inc.',                result.name
     assert_equal 'Google, Inc.',                result.organization
     assert_equal 'Amphitheatre Pkwy 1600.',     result.address
@@ -153,6 +154,7 @@ EOS
     result    = parser.registrant_contact
 
     assert_instance_of Whois::Answer::Contact,  result
+    assert_equal Whois::Answer::Contact::TYPE_REGISTRANT, result.type
     assert_match /Buruzs/,                      result.name             # UTF-8 hack
     assert_equal nil,                           result.organization
     assert_equal nil,                           result.address
@@ -174,16 +176,17 @@ EOS
   end
 
   def test_admin_contact_with_registered
-    admin = @klass.new(load_part('/registered.txt')).admin_contact
-    assert_instance_of Whois::Answer::Contact, admin
-    assert_equal '2000466366', admin.id
-    assert_equal '3C Kft. (Registrar)', admin.name
-    assert_equal 'Konkoly Thege út 29-33.', admin.address
-    assert_equal 'H-1121', admin.zip
-    assert_equal 'Budapest', admin.city
-    assert_equal 'HU', admin.country_code
-    assert_equal '+36 1 275 52 00', admin.phone
-    assert_equal '+36 1 275 58 87', admin.fax
+    result = @klass.new(load_part('/registered.txt')).admin_contact
+    assert_instance_of Whois::Answer::Contact,    result
+    assert_equal Whois::Answer::Contact::TYPE_ADMIN, result.type
+    assert_equal '2000466366',                    result.id
+    assert_equal '3C Kft. (Registrar)',           result.name
+    assert_equal 'Konkoly Thege út 29-33.',       result.address
+    assert_equal 'H-1121',                        result.zip
+    assert_equal 'Budapest',                      result.city
+    assert_equal 'HU',                            result.country_code
+    assert_equal '+36 1 275 52 00',               result.phone
+    assert_equal '+36 1 275 58 87',               result.fax
   end
 
   def test_admin_contact_with_unregistered
@@ -199,17 +202,18 @@ EOS
   end
 
   def test_technical_contact_with_registered
-    technical = @klass.new(load_part('/registered.txt')).technical_contact
-    assert_instance_of Whois::Answer::Contact, technical
-    assert_equal '2000578125', technical.id
-    assert_equal 'Markmonitor', technical.name
-    assert_equal 'Overland Road 10400, PMB155', technical.address
-    assert_equal 'ID-83709', technical.zip
-    assert_equal 'Boise', technical.city
-    assert_equal 'US', technical.country_code
-    assert_equal '+ 1 208 389 5798', technical.phone
-    assert_equal '+ 1 208 389 5771', technical.fax
-    assert_equal 'ccops@markmonitor.com', technical.email
+    result = @klass.new(load_part('/registered.txt')).technical_contact
+    assert_instance_of Whois::Answer::Contact,    result
+    assert_equal Whois::Answer::Contact::TYPE_TECHNICAL, result.type
+    assert_equal '2000578125',                    result.id
+    assert_equal 'Markmonitor',                   result.name
+    assert_equal 'Overland Road 10400, PMB155',   result.address
+    assert_equal 'ID-83709',                      result.zip
+    assert_equal 'Boise',                         result.city
+    assert_equal 'US',                            result.country_code
+    assert_equal '+ 1 208 389 5798',              result.phone
+    assert_equal '+ 1 208 389 5771',              result.fax
+    assert_equal 'ccops@markmonitor.com',         result.email
   end
 
   def test_technical_contact_with_unregistered