whois 2.2.0 → 2.3.0

data/lib/whois/record/parser/scanners/whois.denic.de.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -15,30 +15,46 @@ module Whois
     class Parser
       module Scanners
 
-        class WhoisDenicDe < Scanners::Base
+        class WhoisDenicDe < Base
 
-          def parse_content
-            parse_throttled   ||
-            parse_disclaimer  ||
-            parse_invalid     ||    # 1.10.0, 1.11.0
-            parse_available   ||    # 1.10.0, 1.11.0
-            parse_pair(@ast)  ||
-            parse_contact     ||
-            parse_db_time     ||    # 2.0
+          self.tokenizers += [
+              :skip_empty_line,
+              :scan_response_throttled,
+              :scan_disclaimer,
+              :scan_invalid,
+              :scan_available,
+              :scan_pair,
+              :scan_contact,
+              :skip_db_time,
+          ]
 
-            trim_empty_line   ||
-            error!("Unexpected token")
+
+          # Version 1.11.0, 1.10.0
+          tokenizer :scan_available do
+            if @input.match?(/% Object ".+" not found in database\n/)
+              while @input.skip(/%(.*)\n/)
+              end
+              @ast["status:available"] = true
+            end
           end
 
+          # Version 1.11.0, 1.10.0
+          tokenizer :scan_invalid do
+            if @input.match?(/% ".+" is not a valid domain name\n/)
+              @input.scan(/% "(.+?)" is not a valid domain name\n/)
+              @ast["Domain"] = @input[1]
+              @ast["status:invalid"] = true
+            end
+          end
 
-          def parse_throttled
+          tokenizer :scan_response_throttled do
             if @input.match?(/^% Error: 55000000002/)
               @ast["response:throttled"] = true
               @input.skip(/^.+\n/)
             end
           end
 
-          def parse_disclaimer
+          tokenizer :scan_disclaimer do
             if @input.match?(/% Copyright \(c\) *\d{4} by DENIC\n/)
               @input.scan_until(/% Terms and Conditions of Use\n/)
               lines = []
@@ -49,20 +65,11 @@ module Whois
             end
           end
 
-          def parse_pair(node)
-            if @input.scan(/([^  \[]*):(.*)\n/)
-              key, value = @input[1].strip, @input[2].strip
-              if node[key].nil?
-                node[key] = value
-              else
-                node[key].is_a?(Array) || node[key] = [node[key]]
-                node[key] << value
-              end
-              true
-            end
+          tokenizer :scan_pair do
+            parse_pair(@ast)
           end
 
-          def parse_contact
+          tokenizer :scan_contact do
             if @input.scan(/\[(.*)\]\n/)
               contact_name = @input[1]
               contact = {}
@@ -88,25 +95,25 @@ module Whois
             end
           end
 
-          # Compatibility with Version: 1.11.0, 1.10.0
-          def parse_available
-            if @input.match?(/% Object ".+" not found in database\n/)
-              while @input.scan(/%(.*)\n/)  # strip junk
-              end
-              @ast["status:available"] = true
-            end
+          # Version 2.0
+          tokenizer :skip_db_time do
+            @input.skip(/^% DB time is (.+)\n/)
           end
 
-          def parse_invalid
-            if @input.match?(/% ".+" is not a valid domain name\n/)
-              @input.scan(/% "(.+?)" is not a valid domain name\n/)
-              @ast["Domain"] = @input[1]
-              @ast["status:invalid"] = true
-            end
-          end
 
-          def parse_db_time
-            @input.scan(/^% DB time is (.+)\n$/)
+        private
+
+          def parse_pair(store)
+            if @input.scan(/([^  \[]*):(.*)\n/)
+              key, value = @input[1].strip, @input[2].strip
+              if store[key].nil?
+                store[key] = value
+              else
+                store[key].is_a?(Array) || store[key] = [store[key]]
+                store[key] << value
+              end
+              store
+            end
           end
 
         end

data/lib/whois/record/parser/scanners/whois.nic.hu.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -15,79 +15,71 @@ module Whois
     class Parser
       module Scanners
 
-        class WhoisNicHu < Scanners::Base
+        class WhoisNicHu < Base
 
-          def parse_content
-            parse_version     ||
-            parse_disclaimer  ||
-            parse_domain      ||
-            parse_available   ||
-            parse_in_progress ||
+          self.tokenizers += [
+              :scan_version,
+              :scan_disclaimer,
+              :scan_domain,
+              :scan_available,
+              :scan_in_progress,
 
-            # v2.0
-            parse_moreinfo    ||
+              # v2.0
+              :scan_moreinfo,
 
-            # v1.99
-            parse_domain_data ||
-            parse_contacts    ||
+              # v1.99
+              :scan_domain_data,
+              :scan_contacts,
 
-            trim_empty_line   ||
-            error!("Unexpected token")
-          end
+              :skip_empty_line,
+          ]
 
 
-          def parse_version
-            if @input.match?(/% Whois server .*\n/)
-              p("whois.nic.hu: parse_version") if 1 == 2 || $DEBUG
-              @input.scan(/% Whois server ([\w\d\.]*).*?\n/)
-              @ast["version"] = @input[1]
+          # FIXME: Requires UTF-8 Encoding (see #11)
+          tokenizer :scan_available do
+            if @input.match?(/Nincs (.*?) \/ No match\n/)
+              @input.scan(/Nincs (.*?) \/ No match\n/)
+              @ast["status:available"] = true
             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/)
+          tokenizer :scan_in_progress do
+            if @input.match?(/(.*?) folyamatban \/ Registration in progress\n/)
+              @input.scan(/(.*?) folyamatban \/ Registration in progress\n/)
+              @ast["status:inprogress"] = true
             end
           end
 
-          def parse_disclaimer
+          tokenizer :scan_disclaimer do
             if @input.match?(/^Rights.*\n/)
-              p("whois.nic.hu: parse_disclaimer") if 1 == 2 || $DEBUG
               lines = @input.scan_until(/^\n/)
-              @ast["disclaimer"] = lines.strip
+              @ast["field:disclaimer"] = lines.strip
             end
           end
 
-          def parse_domain
+          tokenizer :scan_domain do
             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
+              @ast["field:domain"] = @input[1].strip
             end
           end
 
           # FIXME: Requires UTF-8 Encoding (see #11)
-          def parse_available
-            if @input.match?(/Nincs (.*?) \/ No match\n/)
-              p("whois.nic.hu: parse_not_found") if 1 == 2 || $DEBUG
-              @input.scan(/Nincs (.*?) \/ No match\n/)
-              @ast["status:available"] = true
+          tokenizer :scan_moreinfo do
+            if @input.match?(/Tov.* ld\.:\n/)
+              @ast["field:moreinfo"] = @input.scan_until(/^\n/)
             end
           end
 
-          # FIXME: Requires UTF-8 Encoding (see #11)
-          def parse_in_progress
-            if @input.match?(/(.*?) folyamatban \/ Registration in progress\n/)
-              p("whois.nic.hu: parse_in_progress") if 1 == 2 || $DEBUG
-              @input.scan(/(.*?) folyamatban \/ Registration in progress\n/)
-              @ast["status:inprogress"] = true
+          tokenizer :scan_version do
+            if @input.match?(/% Whois server .*\n/)
+              @input.scan(/% Whois server ([\w\d\.]*).*?\n/)
+              @ast["field:version"] = @input[1]
             end
           end
 
-          def parse_domain_data
+          tokenizer :scan_domain_data do
             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'
@@ -112,9 +104,8 @@ module Whois
             end
           end
 
-          def parse_contacts
+          tokenizer :scan_contacts do
             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
@@ -123,9 +114,11 @@ module Whois
             end
           end
 
+
+        private
+
           def parse_contact
             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'

data/lib/whois/record/parser/scanners/whois.nic.it.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -15,25 +15,24 @@ module Whois
     class Parser
       module Scanners
 
-        class WhoisNicIt < Scanners::Base
+        class WhoisNicIt < Base
 
-          def parse_content
-            parse_response_unavailable ||
+          self.tokenizers += [
+              :skip_empty_line,
+              :scan_response_unavailable,
+              :scan_disclaimer,
+              :scan_keyvalue,
+              :scan_section,
+          ]
 
-            trim_newline      ||
-            parse_disclaimer  ||
-            parse_keyvalue    ||
-            parse_section     ||
-            error!("Unexpected token")
-          end
 
-          def parse_response_unavailable
+          tokenizer :scan_response_unavailable do
             if @input.scan(/Service temporarily unavailable\.\n/)
-              @ast["status:unavailable"] = true
+              @ast["response:unavailable"] = true
             end
           end
 
-          def parse_disclaimer
+          tokenizer :scan_disclaimer do
             if @input.match?(/\*(.*?)\*\n/)
               disclaimer = []
               while @input.scan(/\*(.*?)\*\n/)
@@ -44,19 +43,7 @@ module Whois
             end
           end
 
-          def parse_keyvalue
-            if @input.scan(/(.+?):(.*?)\n/)
-              key, value = @input[1].strip, @input[2].strip
-              if @ast[key].nil?
-                @ast[key] = value
-              else
-                @ast[key].is_a?(Array) || @ast[key] = [@ast[key]]
-                @ast[key] << value
-              end
-            end
-          end
-
-          def parse_section
+          tokenizer :scan_section do
             if @input.scan(/([^:]+?)\n/)
               section = @input[1].strip
               content = parse_section_pairs ||
@@ -66,52 +53,55 @@ module Whois
             end
           end
 
-            def parse_section_items
-              if @input.match?(/(\s+)([^:]+?)\n/)
-                items = []
-                indentation = @input[1].length
-                while item = parse_section_items_item(indentation)
-                  items << item
-                end
-                items
+
+        private
+
+          def parse_section_items
+            if @input.match?(/(\s+)([^:]+?)\n/)
+              items = []
+              indentation = @input[1].length
+              while item = parse_section_items_item(indentation)
+                items << item
               end
+              items
             end
+          end
 
-              def parse_section_items_item(indentation)
-                if @input.scan(/\s{#{indentation}}(.+)\n/)
-                  @input[1]
-                end
-              end
+          def parse_section_items_item(indentation)
+            if @input.scan(/\s{#{indentation}}(.+)\n/)
+              @input[1]
+            end
+          end
 
-            def parse_section_pairs
-              contents = {}
-              while content = parse_section_pair
-                contents.merge!(content)
-              end
-              if !contents.empty?
-                contents
-              else
-                false
-              end
+          def parse_section_pairs
+            contents = {}
+            while content = parse_section_pair
+              contents.merge!(content)
             end
+            if !contents.empty?
+              contents
+            else
+              false
+            end
+          end
 
-              def parse_section_pair
-                if @input.scan(/(\s+)(.+?):(\s+)(.*?)\n/)
-                  key = @input[2].strip
-                  values = [@input[4].strip]
-                  indentation = @input[1].length + @input[2].length + 1 + @input[3].length
-                  while value = parse_section_pair_newlinevalue(indentation)
-                    values << value
-                  end
-                  { key => values.join("\n") }
-                end
+          def parse_section_pair
+            if @input.scan(/(\s+)(.+?):(\s+)(.*?)\n/)
+              key = @input[2].strip
+              values = [@input[4].strip]
+              indentation = @input[1].length + @input[2].length + 1 + @input[3].length
+              while value = parse_section_pair_newlinevalue(indentation)
+                values << value
               end
+              { key => values.join("\n") }
+            end
+          end
 
-                def parse_section_pair_newlinevalue(indentation)
-                  if @input.scan(/\s{#{indentation}}(.+)\n/)
-                    @input[1]
-                  end
-                end
+          def parse_section_pair_newlinevalue(indentation)
+            if @input.scan(/\s{#{indentation}}(.+)\n/)
+              @input[1]
+            end
+          end
 
         end
 

data/lib/whois/record/parser/scanners/whois.registry.qa.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -15,37 +15,24 @@ module Whois
     class Parser
       module Scanners
 
-        # Scanner for the whois.registry.qa server response.
+        # Scanner for the whois.registry.qa record.
         #
         # @since  2.1.0
-        class WhoisRegistryQa < Scanners::Base
+        class WhoisRegistryQa < Base
 
-          def parse_content
-            parse_available ||
-            parse_keyvalue_spaced ||
+          self.tokenizers += [
+              :skip_empty_line,
+              :scan_available,
+              :scan_keyvalue,
+          ]
 
-            trim_empty_line ||
-            error!("Unexpected token")
-          end
 
-          def parse_available
+          tokenizer :scan_available do
             if @input.scan(/^No Data Found\n/)
               @ast["status:available"] = true
             end
           end
 
-          def parse_keyvalue_spaced
-            if @input.scan(/(.+?):\s+(.*?)\n/)
-              key, value = @input[1].strip, @input[2].strip
-              if @ast[key].nil?
-                @ast[key] = value
-              else
-                @ast[key].is_a?(Array) || @ast[key] = [@ast[key]]
-                @ast[key] << value
-              end
-            end
-          end
-
         end
 
       end