whois 1.1.8 → 1.2.0

data/CHANGELOG.rdoc

@@ -1,6 +1,19 @@
 = Changelog
 
 
+== Release 1.2.0
+
+* NEW: Whois::Answer#throttle? returns true in case of throttle response (see whois.publicinternetregistry.com for a real example)
+
+* FIXED: With some .tr domains, whois.nic.tr parser returns inconsistent values for nameservers.
+
+* FIXED: Unexpected token error when trying to parse a .hu whois response. The whois.nic.hu has changed response format.
+
+* FIXED: RuntimeError "Unexpected token: WHOIS LIMIT EXCEEDED - SEE WWW.PIR.ORG/WHOIS FOR DETAILS" for whois.publicinternetregistry.com
+
+* CHANGED: Lazy-load adapters using Ruby autoload feature.
+
+
 == Release 1.1.8
 
 * NEW: Added simple .pt TLD parser (whois.dns.pt).

data/Manifest

@@ -132,113 +132,7 @@ lib/whois/server/adapters/verisign.rb
 lib/whois/server/adapters/web.rb
 lib/whois/version.rb
 tasks/server.rake
-test/answer/contact_test.rb
-test/answer/parser/base_test.rb
-test/answer/parser/blank_test.rb
-test/answer/parser/jobswhois.verisign-grs.com_test.rb
-test/answer/parser/whois.adamsnames.tc_test.rb
-test/answer/parser/whois.aeda.net.ae_test.rb
-test/answer/parser/whois.aero_test.rb
-test/answer/parser/whois.afilias-grs.info_test.rb
-test/answer/parser/whois.afilias.info_test.rb
-test/answer/parser/whois.ai_test.rb
-test/answer/parser/whois.arnes.si_test.rb
-test/answer/parser/whois.ausregistry.net.au_test.rb
-test/answer/parser/whois.biz_test.rb
-test/answer/parser/whois.cat_test.rb
-test/answer/parser/whois.cira.ca_test.rb
-test/answer/parser/whois.cnnic.cn_test.rb
-test/answer/parser/whois.cnnic.net.cn_test.rb
-test/answer/parser/whois.crsnic.net_test.rb
-test/answer/parser/whois.denic.de_test.rb
-test/answer/parser/whois.dk-hostmaster.dk_test.rb
-test/answer/parser/whois.dns.be_test.rb
-test/answer/parser/whois.dns.lu_test.rb
-test/answer/parser/whois.dns.pt_test.rb
-test/answer/parser/whois.domain-registry.nl_test.rb
-test/answer/parser/whois.domainregistry.ie_test.rb
-test/answer/parser/whois.domreg.lt_test.rb
-test/answer/parser/whois.dot.tk_test.rb
-test/answer/parser/whois.dotmobiregistry.net_test.rb
-test/answer/parser/whois.educause.edu_test.rb
-test/answer/parser/whois.eu.org_test.rb
-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.in.ua_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.net.ua_test.rb
-test/answer/parser/whois.nic-se.se_test.rb
-test/answer/parser/whois.nic.ac_test.rb
-test/answer/parser/whois.nic.af_test.rb
-test/answer/parser/whois.nic.ag_test.rb
-test/answer/parser/whois.nic.am_test.rb
-test/answer/parser/whois.nic.as_test.rb
-test/answer/parser/whois.nic.asia_test.rb
-test/answer/parser/whois.nic.at_test.rb
-test/answer/parser/whois.nic.cc_test.rb
-test/answer/parser/whois.nic.cd_test.rb
-test/answer/parser/whois.nic.ch_test.rb
-test/answer/parser/whois.nic.coop_test.rb
-test/answer/parser/whois.nic.fr_test.rb
-test/answer/parser/whois.nic.gl_test.rb
-test/answer/parser/whois.nic.gov_test.rb
-test/answer/parser/whois.nic.ht_test.rb
-test/answer/parser/whois.nic.hu_test.rb
-test/answer/parser/whois.nic.im_test.rb
-test/answer/parser/whois.nic.io_test.rb
-test/answer/parser/whois.nic.it_test.rb
-test/answer/parser/whois.nic.lv_test.rb
-test/answer/parser/whois.nic.ly_test.rb
-test/answer/parser/whois.nic.mu_test.rb
-test/answer/parser/whois.nic.mx_test.rb
-test/answer/parser/whois.nic.name_test.rb
-test/answer/parser/whois.nic.nu_test.rb
-test/answer/parser/whois.nic.or.kr_test.rb
-test/answer/parser/whois.nic.sn_test.rb
-test/answer/parser/whois.nic.st_test.rb
-test/answer/parser/whois.nic.tel_test.rb
-test/answer/parser/whois.nic.tl_test.rb
-test/answer/parser/whois.nic.tr_test.rb
-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.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
-test/answer/parser/whois.rotld.ro_test.rb
-test/answer/parser/whois.samoanic.ws_test.rb
-test/answer/parser/whois.srs.net.nz_test.rb
-test/answer/parser/whois.za.net_test.rb
-test/answer/parser/whois.za.org_test.rb
-test/answer/parser_test.rb
-test/answer_test.rb
-test/client_test.rb
-test/deprecated_test.rb
-test/errors_test.rb
-test/integration_test.rb
 test/list_tld
-test/server/adapters/afilias_test.rb
-test/server/adapters/base_test.rb
-test/server/adapters/formatted_test.rb
-test/server/adapters/none_test.rb
-test/server/adapters/not_implemented_test.rb
-test/server/adapters/pir_test.rb
-test/server/adapters/standard_test.rb
-test/server/adapters/verisign_test.rb
-test/server/adapters/web_test.rb
-test/server_test.rb
 test/test_helper.rb
 test/testcases/referrals/afilias.bz.txt
 test/testcases/referrals/crsnic.com.txt
@@ -250,7 +144,6 @@ test/testcases/responses/UTF8.txt
 test/testcases/responses/jobswhois.verisign-grs.com/available.txt
 test/testcases/responses/jobswhois.verisign-grs.com/property_registrar.txt
 test/testcases/responses/jobswhois.verisign-grs.com/registered.txt
-test/testcases/responses/super_struct_test.rb
 test/testcases/responses/whois.adamsnames.tc/gd/available.txt
 test/testcases/responses/whois.adamsnames.tc/gd/registered.txt
 test/testcases/responses/whois.adamsnames.tc/tc/available.txt
@@ -391,12 +284,14 @@ test/testcases/responses/whois.nic.gov/available.txt
 test/testcases/responses/whois.nic.gov/registered.txt
 test/testcases/responses/whois.nic.ht/available.txt
 test/testcases/responses/whois.nic.ht/registered.txt
-test/testcases/responses/whois.nic.hu/available.txt
-test/testcases/responses/whois.nic.hu/in_progress.txt
-test/testcases/responses/whois.nic.hu/property_registrant_as_company.txt
-test/testcases/responses/whois.nic.hu/property_registrant_as_private_person.txt
-test/testcases/responses/whois.nic.hu/property_registrant_without_address.txt
-test/testcases/responses/whois.nic.hu/registered.txt
+test/testcases/responses/whois.nic.hu/current/available.txt
+test/testcases/responses/whois.nic.hu/current/registered.txt
+test/testcases/responses/whois.nic.hu/v1.99/available.txt
+test/testcases/responses/whois.nic.hu/v1.99/in_progress.txt
+test/testcases/responses/whois.nic.hu/v1.99/property_registrant_as_company.txt
+test/testcases/responses/whois.nic.hu/v1.99/property_registrant_as_private_person.txt
+test/testcases/responses/whois.nic.hu/v1.99/property_registrant_without_address.txt
+test/testcases/responses/whois.nic.hu/v1.99/registered.txt
 test/testcases/responses/whois.nic.im/available.txt
 test/testcases/responses/whois.nic.im/registered.txt
 test/testcases/responses/whois.nic.io/available.txt
@@ -434,6 +329,7 @@ test/testcases/responses/whois.nic.tel/registered.txt
 test/testcases/responses/whois.nic.tl/available.txt
 test/testcases/responses/whois.nic.tl/registered.txt
 test/testcases/responses/whois.nic.tr/available.txt
+test/testcases/responses/whois.nic.tr/property_nameservers_with_trailing_space.txt
 test/testcases/responses/whois.nic.tr/registered.txt
 test/testcases/responses/whois.nic.travel/available.txt
 test/testcases/responses/whois.nic.travel/registered.txt
@@ -452,6 +348,7 @@ test/testcases/responses/whois.pandi.or.id/available.txt
 test/testcases/responses/whois.pandi.or.id/registered.txt
 test/testcases/responses/whois.publicinterestregistry.net/available.txt
 test/testcases/responses/whois.publicinterestregistry.net/registered.txt
+test/testcases/responses/whois.publicinterestregistry.net/throttle.txt
 test/testcases/responses/whois.register.bg/available.txt
 test/testcases/responses/whois.register.bg/property_nameservers_with_ip.txt
 test/testcases/responses/whois.register.bg/registered.txt
@@ -487,5 +384,111 @@ test/testcases/responses/whois.za.net/available.txt
 test/testcases/responses/whois.za.net/registered.txt
 test/testcases/responses/whois.za.org/available.txt
 test/testcases/responses/whois.za.org/registered.txt
+test/whois/answer/contact_test.rb
+test/whois/answer/parser/base_test.rb
+test/whois/answer/parser/blank_test.rb
+test/whois/answer/parser/jobswhois.verisign-grs.com_test.rb
+test/whois/answer/parser/whois.adamsnames.tc_test.rb
+test/whois/answer/parser/whois.aeda.net.ae_test.rb
+test/whois/answer/parser/whois.aero_test.rb
+test/whois/answer/parser/whois.afilias-grs.info_test.rb
+test/whois/answer/parser/whois.afilias.info_test.rb
+test/whois/answer/parser/whois.ai_test.rb
+test/whois/answer/parser/whois.arnes.si_test.rb
+test/whois/answer/parser/whois.ausregistry.net.au_test.rb
+test/whois/answer/parser/whois.biz_test.rb
+test/whois/answer/parser/whois.cat_test.rb
+test/whois/answer/parser/whois.cira.ca_test.rb
+test/whois/answer/parser/whois.cnnic.cn_test.rb
+test/whois/answer/parser/whois.cnnic.net.cn_test.rb
+test/whois/answer/parser/whois.crsnic.net_test.rb
+test/whois/answer/parser/whois.denic.de_test.rb
+test/whois/answer/parser/whois.dk-hostmaster.dk_test.rb
+test/whois/answer/parser/whois.dns.be_test.rb
+test/whois/answer/parser/whois.dns.lu_test.rb
+test/whois/answer/parser/whois.dns.pt_test.rb
+test/whois/answer/parser/whois.domain-registry.nl_test.rb
+test/whois/answer/parser/whois.domainregistry.ie_test.rb
+test/whois/answer/parser/whois.domreg.lt_test.rb
+test/whois/answer/parser/whois.dot.tk_test.rb
+test/whois/answer/parser/whois.dotmobiregistry.net_test.rb
+test/whois/answer/parser/whois.educause.edu_test.rb
+test/whois/answer/parser/whois.eu.org_test.rb
+test/whois/answer/parser/whois.eu_test.rb
+test/whois/answer/parser/whois.hkdnr.net.hk_test.rb
+test/whois/answer/parser/whois.iana.org_test.rb
+test/whois/answer/parser/whois.in.ua_test.rb
+test/whois/answer/parser/whois.isnic.is_test.rb
+test/whois/answer/parser/whois.jprs.jp_test.rb
+test/whois/answer/parser/whois.meregistry.net_test.rb
+test/whois/answer/parser/whois.museum_test.rb
+test/whois/answer/parser/whois.net.ua_test.rb
+test/whois/answer/parser/whois.nic-se.se_test.rb
+test/whois/answer/parser/whois.nic.ac_test.rb
+test/whois/answer/parser/whois.nic.af_test.rb
+test/whois/answer/parser/whois.nic.ag_test.rb
+test/whois/answer/parser/whois.nic.am_test.rb
+test/whois/answer/parser/whois.nic.as_test.rb
+test/whois/answer/parser/whois.nic.asia_test.rb
+test/whois/answer/parser/whois.nic.at_test.rb
+test/whois/answer/parser/whois.nic.cc_test.rb
+test/whois/answer/parser/whois.nic.cd_test.rb
+test/whois/answer/parser/whois.nic.ch_test.rb
+test/whois/answer/parser/whois.nic.coop_test.rb
+test/whois/answer/parser/whois.nic.fr_test.rb
+test/whois/answer/parser/whois.nic.gl_test.rb
+test/whois/answer/parser/whois.nic.gov_test.rb
+test/whois/answer/parser/whois.nic.ht_test.rb
+test/whois/answer/parser/whois.nic.hu_test.rb
+test/whois/answer/parser/whois.nic.im_test.rb
+test/whois/answer/parser/whois.nic.io_test.rb
+test/whois/answer/parser/whois.nic.it_test.rb
+test/whois/answer/parser/whois.nic.lv_test.rb
+test/whois/answer/parser/whois.nic.ly_test.rb
+test/whois/answer/parser/whois.nic.mu_test.rb
+test/whois/answer/parser/whois.nic.mx_test.rb
+test/whois/answer/parser/whois.nic.name_test.rb
+test/whois/answer/parser/whois.nic.nu_test.rb
+test/whois/answer/parser/whois.nic.or.kr_test.rb
+test/whois/answer/parser/whois.nic.sn_test.rb
+test/whois/answer/parser/whois.nic.st_test.rb
+test/whois/answer/parser/whois.nic.tel_test.rb
+test/whois/answer/parser/whois.nic.tl_test.rb
+test/whois/answer/parser/whois.nic.tr_test.rb
+test/whois/answer/parser/whois.nic.travel_test.rb
+test/whois/answer/parser/whois.nic.tv_test.rb
+test/whois/answer/parser/whois.nic.uk_test.rb
+test/whois/answer/parser/whois.nic.us_test.rb
+test/whois/answer/parser/whois.nic.ve_test.rb
+test/whois/answer/parser/whois.norid.no_test.rb
+test/whois/answer/parser/whois.pandi.or.id_test.rb
+test/whois/answer/parser/whois.publicinterestregistry.net_test.rb
+test/whois/answer/parser/whois.register.bg_test.rb
+test/whois/answer/parser/whois.registro.br_test.rb
+test/whois/answer/parser/whois.registry.in_test.rb
+test/whois/answer/parser/whois.registrypro.pro_test.rb
+test/whois/answer/parser/whois.ripe.net_test.rb
+test/whois/answer/parser/whois.ripn.net_test.rb
+test/whois/answer/parser/whois.rotld.ro_test.rb
+test/whois/answer/parser/whois.samoanic.ws_test.rb
+test/whois/answer/parser/whois.srs.net.nz_test.rb
+test/whois/answer/parser/whois.za.net_test.rb
+test/whois/answer/parser/whois.za.org_test.rb
+test/whois/answer/parser_test.rb
+test/whois/answer/super_struct_test.rb
+test/whois/answer_test.rb
+test/whois/client_test.rb
+test/whois/errors_test.rb
+test/whois/integration_test.rb
+test/whois/server/adapters/afilias_test.rb
+test/whois/server/adapters/base_test.rb
+test/whois/server/adapters/formatted_test.rb
+test/whois/server/adapters/none_test.rb
+test/whois/server/adapters/not_implemented_test.rb
+test/whois/server/adapters/pir_test.rb
+test/whois/server/adapters/standard_test.rb
+test/whois/server/adapters/verisign_test.rb
+test/whois/server/adapters/web_test.rb
+test/whois/server_test.rb
 utils/bm_delegation_vs_inheritance.rb
 utils/bm_shell_vs_pure.rb

data/lib/whois/answer.rb

@@ -134,8 +134,8 @@ module Whois
 
       # Delegates all method calls to the internal parser.
       def method_missing(method, *args, &block)
-        if (Parser::PROPERTIES + Parser::METHODS).include?(method)
-          self.class.class_eval foo = %{
+        if Parser::PROPERTIES.include?(method)
+          self.class.class_eval <<-RUBY, __FILE__, __LINE__ + 1
             def #{method}(*args, &block)
               if property_supported?(:#{method})
                 parser.#{method}(*args, &block)
@@ -143,15 +143,25 @@ module Whois
                 nil
               end
             end
-          }, __FILE__, __LINE__
+          RUBY
+          send(method, *args, &block)
+
+        elsif Parser::METHODS.include?(method)
+          self.class.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+            def #{method}(*args, &block)
+              if parser.respond_to?(:#{method})
+                parser.#{method}(*args, &block)
+              end
+            end
+          RUBY
           send(method, *args, &block)
 
         elsif method.to_s =~ /([a-z_]+)\?/ and (Parser::PROPERTIES + Parser::METHODS).include?($1.to_sym)
-          self.class.class_eval %{
+          self.class.class_eval <<-RUBY, __FILE__, __LINE__ + 1
             def #{$1}?
               !#{$1}.nil?
             end
-          }, __FILE__, __LINE__
+          RUBY
           send($1)
 
         else

data/lib/whois/answer/parser.rb

@@ -23,7 +23,7 @@ module Whois
     class Parser
 
       METHODS = [
-        :contacts,
+        :contacts, :throttle?,
         # deprecated methods
         :registrant, :admin, :technical,
       ]

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

@@ -16,6 +16,7 @@ whois.cat (.cat)
 == Property Proposals
 
 * changed_by
+* version
 
 
 == Feature Proposals

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

@@ -221,7 +221,9 @@ module Whois
         end
 
 
-        # Returns an array of all supported contacts.
+        # Gets all supported contacts merged into a single Array.
+        #
+        # Returns an Array of Whois::Aswer::Contact.
         def contacts
           contacts = []
           contacts.concat(registrant_contact.is_a?(Array) ? registrant_contact : [registrant_contact]) if property_supported?(:registrant_contact)
@@ -230,6 +232,16 @@ module Whois
           contacts.compact
         end
 
+        # Checks whether this is a throttle response.
+        # The default implementation always returns false.
+        #
+        # This method is intended to be overrridden by child classes.
+        #
+        # Returns false by default.
+        def throttle?
+          false
+        end
+
 
         # @deprecated {#registrant} is deprecated
         #   and will be removed in a future version.

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

@@ -30,12 +30,12 @@ module Whois
         include Ast
 
         property_supported :disclaimer do
-          node('Disclaimer')
+          node("disclaimer")
         end
 
 
         property_supported :domain do
-          node('Domain')
+          @domain ||= node("domain")
         end
 
         property_supported :domain_id do
@@ -172,7 +172,6 @@ module Whois
           def parse
             @ast = {}
             while !@input.eos?
-              trim_newline  ||
               parse_content
             end
             @ast
@@ -180,37 +179,59 @@ module Whois
 
           private
 
-            def trim_newline
-              @input.scan(/\n/)
+            def trim_empty_line
+              @input.scan(/^\n/)
             end
 
             def parse_content
+              parse_version     ||
               parse_disclaimer  ||
               parse_domain      ||
               parse_not_found   ||
               parse_in_progress ||
+
+              # v2.0
+              parse_moreinfo    ||
+
+              # v1.99
               parse_domain_data ||
               parse_contacts    ||
-              trim_newline      ||
+
+              trim_empty_line   ||
               error("Unexpected token")
             end
 
-            def parse_disclaimer
+
+            def parse_version
               if @input.match?(/% Whois server .*\n/)
-                @input.scan_until(/\n\n/)
-                lines = []
-                while @input.match?(/\S+/) && @input.scan(/(.*)\n/)
-                  lines << @input[1].strip
-                end
-                @ast['Disclaimer'] = lines.join("\n")
+                p("whois.nic.hu: parse_version") if 1 == 2 || $DEBUG
+                @input.scan(/% Whois server ([\w\d\.]*).*?\n/)
+                @ast["version"] = @input[1]
+              end
+            end
+
+            # FIXME: Requires UTF-8 Encoding (see #11)
+            def parse_moreinfo
+              if @input.match?(/Tov.* ld\.:\n/)
+                p("whois.nic.hu: parse_moreinfo") if 1 == 2 || $DEBUG
+                @ast["moreinfo"] = @input.scan_until(/^\n/)
+              end
+            end
+
+            def parse_disclaimer
+              if @input.match?(/^Rights.*\n/)
+                p("whois.nic.hu: parse_disclaimer") if 1 == 2 || $DEBUG
+                lines = @input.scan_until(/^\n/)
+                @ast["disclaimer"] = lines.strip
                 true
               end
               false
             end
 
             def parse_domain
-              if @input.match?(/\ndomain:\s+\S+\n/) && @input.scan(/\ndomain:\s+(\S+)\n/)
-                @ast['Domain'] = @input[1].strip
+              if @input.match?(/^domain:\s+(.*)\n/) && @input.scan(/^domain:\s+(.*?)\n/)
+                p("whois.nic.hu: parse_domain") if 1 == 2 || $DEBUG
+                @ast["domain"] = @input[1].strip
                 true
               end
               false
@@ -218,8 +239,9 @@ module Whois
 
             # FIXME: Requires UTF-8 Encoding (see #11)
             def parse_not_found
-              if @input.match?(/\nNincs (.*?) \/ No match\n/)
-                @input.scan(/\nNincs (.*?) \/ No match\n/)
+              if @input.match?(/Nincs (.*?) \/ No match\n/)
+                p("whois.nic.hu: parse_not_found") if 1 == 2 || $DEBUG
+                @input.scan(/Nincs (.*?) \/ No match\n/)
                 return @ast['NotFound'] = true
               end
               @ast['NotFound'] = false
@@ -228,15 +250,17 @@ module Whois
             # FIXME: Requires UTF-8 Encoding (see #11)
             def parse_in_progress
               if @input.match?(/(.*?) folyamatban \/ Registration in progress\n/)
-                 @input.scan(/(.*?) folyamatban \/ Registration in progress\n/)
-                 return @ast['InProgress'] = true
+                p("whois.nic.hu: parse_in_progress") if 1 == 2 || $DEBUG
+                @input.scan(/(.*?) folyamatban \/ Registration in progress\n/)
+                return @ast['InProgress'] = true
               end
               @ast['InProgress'] = false
             end
 
             def parse_domain_data
-              if @input.match?(/\S+:\s+.*\n/)
-                while @input.match?(/\S+:\s+.*\n/) && @input.scan(/(\S+):\s+(.*)\n/)
+              if @input.match?(/(.+?):\s+(.*)\n/)
+                p("whois.nic.hu: parse_domain_data") if 1 == 2 || $DEBUG
+                while @input.scan(/(.+?):\s+(.*)\n/)
                   key, value = @input[1].strip, @input[2].strip
                   if key == 'person'
                     @ast['name'] = value
@@ -262,9 +286,10 @@ module Whois
             end
 
             def parse_contacts
-              if @input.match?(/\n\S+:\s+.*\n/)
-                while @input.match?(/\n\S+:\s+.*\n/)
-                  @input.scan(/\n/)
+              if @input.match?(/\n(person|org):/)
+                p("whois.nic.hu: parse_contacts") if 1 == 2 || $DEBUG
+                @input.scan(/\n/)
+                while @input.match?(/(.+?):\s+(.*)\n/)
                   parse_contact
                 end
                 true
@@ -274,71 +299,69 @@ module Whois
             end
 
             def parse_contact
-              if @input.match?(/\S+:\s+.*\n/)
-                contact ||= {}
-                while @input.match?(/\S+:\s+.*\n/) && @input.scan(/(\S+):\s+(.*)\n/)
-                  key, value = @input[1].strip, @input[2].strip
-                  if key == 'hun-id'
-                    a1 = contact['address'][1].split(/\s/)
-                    zip = a1.shift
-                    city = a1.join(' ')
-                    # we should keep the old values if this is an already
-                    # defined contact
-                    if @ast[value].nil?
-                      @ast[value] = {
-                        "id" => value,
-                        "name" => contact['name'],
-                        "organization" => contact['org'],
-                        "address" => contact['address'][0],
-                        "city" => city,
-                        "zip" => zip,
-                        "country_code" => contact['address'][2],
-                        "phone" => contact['phone'],
-                        "fax" => contact['fax-no'],
-                        "email" => contact['e-mail']
-                      }
-                    else
-                      @ast[value]["id"] ||= value
-                      @ast[value]["name"] ||= contact['name']
-                      @ast[value]["organization"] ||= contact['org']
-                      @ast[value]["address"] ||= contact['address'][0]
-                      @ast[value]["city"] ||= city
-                      @ast[value]["zip"] ||= zip
-                      @ast[value]["country_code"] ||= contact['address'][2]
-                      @ast[value]["phone"] ||= contact['phone']
-                      @ast[value]["fax"] ||= contact['fax-no']
-                      @ast[value]["email"] ||= contact['e-mail']
-                    end
-                    contact = {}
-                  elsif key == 'person'
-                    contact['name'] = value
-                  elsif key == 'org'
-                    if value =~ /org_name_hun:\s+(.*)\Z/
-                      contact['name'] = $1
-                    elsif value =~ /org_name_eng:\s+(.*)\Z/
-                      contact['org'] = $1
-                    else
-                      contact['org'] = value
-                    end
-                  elsif key == 'address' && !contact['address'].nil?
-                    contact['address'] = [contact['address'], value].flatten
+              contact ||= {}
+              p("whois.nic.hu: parse_contact") if 1 == 2 || $DEBUG
+              while @input.scan(/(.+?):\s+(.*)\n/)
+                key, value = @input[1].strip, @input[2].strip
+                if key == 'hun-id'
+                  a1 = contact['address'][1].split(/\s/)
+                  zip = a1.shift
+                  city = a1.join(' ')
+                  # we should keep the old values if this is an already
+                  # defined contact
+                  if @ast[value].nil?
+                    @ast[value] = {
+                      "id" => value,
+                      "name" => contact['name'],
+                      "organization" => contact['org'],
+                      "address" => contact['address'][0],
+                      "city" => city,
+                      "zip" => zip,
+                      "country_code" => contact['address'][2],
+                      "phone" => contact['phone'],
+                      "fax" => contact['fax-no'],
+                      "email" => contact['e-mail']
+                    }
+                  else
+                    @ast[value]["id"] ||= value
+                    @ast[value]["name"] ||= contact['name']
+                    @ast[value]["organization"] ||= contact['org']
+                    @ast[value]["address"] ||= contact['address'][0]
+                    @ast[value]["city"] ||= city
+                    @ast[value]["zip"] ||= zip
+                    @ast[value]["country_code"] ||= contact['address'][2]
+                    @ast[value]["phone"] ||= contact['phone']
+                    @ast[value]["fax"] ||= contact['fax-no']
+                    @ast[value]["email"] ||= contact['e-mail']
+                  end
+                  contact = {}
+                elsif key == 'person'
+                  contact['name'] = value
+                elsif key == 'org'
+                  if value =~ /org_name_hun:\s+(.*)\Z/
+                    contact['name'] = $1
+                  elsif value =~ /org_name_eng:\s+(.*)\Z/
+                    contact['org'] = $1
                   else
-                    contact[key] = value
+                    contact['org'] = value
                   end
+                elsif key == 'address' && !contact['address'].nil?
+                  contact['address'] = [contact['address'], value].flatten
+                else
+                  contact[key] = value
                 end
-                true
               end
-              false
+              true
             end
 
             def error(message)
-              raise "#{message}: #{@input.peek(@input.string.length)}"
+              raise "#{message}: `#{@input.peek(@input.string.length)}'"
             end
 
         end
-        
+
       end
 
     end
   end
-end
+end