whois 2.5.1 → 2.6.0

data/lib/whois/record/parser/whois.tonic.to.rb

@@ -14,11 +14,10 @@ module Whois
   class Record
     class Parser
 
-      #
-      # = whois.tonic.to parser
-      #
       # Parser for the whois.tonic.to server.
       #
+      # @see Whois::Record::Parser::Example
+      #   The Example parser for the list of all available methods.
       class WhoisTonicTo < Base
 
         property_not_supported :disclaimer

data/lib/whois/record/parser/whois.twnic.net.tw.rb

@@ -62,7 +62,7 @@ module Whois
         property_supported :nameservers do
           if content_for_scanner =~ /Domain servers in listed order:\n((.+\n)+)\n/
             $1.split("\n").map do |name|
-              Record::Nameserver.new(name.strip)
+              Record::Nameserver.new(:name => name.strip)
             end
           end
         end

data/lib/whois/record/parser/whois.tznic.or.tz.rb

@@ -30,9 +30,13 @@ module Whois
         property_supported :status do
           if content_for_scanner =~ /status:\s+(.+)\n/
             case $1.downcase
-              when "paid and in zone" then :registered
-              else
-                Whois.bug!(ParserError, "Unknown status `#{$1}'.")
+            when "paid and in zone"
+              :registered
+            # NEWSTATUS (redemption?)
+            when "expired"
+              :expired
+            else
+              Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end
           else
             :available
@@ -69,7 +73,7 @@ module Whois
 
         property_supported :nameservers do
           content_for_scanner.scan(/nserver:\s+(.+)\n/).flatten.map do |name|
-            Record::Nameserver.new(name.strip)
+            Record::Nameserver.new(:name => name.strip)
           end
         end
 

data/lib/whois/record/parser/whois.usp.ac.fj.rb

@@ -30,9 +30,10 @@ module Whois
         property_supported :status do
           if content_for_scanner =~ /Status:\s+(.+?)\n/
             case $1.downcase
-              when "active" then :registered
-              else
-                Whois.bug!(ParserError, "Unknown status `#{$1}'.")
+            when "active"
+              :registered
+            else
+              Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end
           else
             :available
@@ -62,7 +63,7 @@ module Whois
         property_supported :nameservers do
           if content_for_scanner =~ /Domain servers:\n\n((.+\n)+)\n/
             $1.split("\n").map do |name|
-              Record::Nameserver.new(name.strip.downcase)
+              Record::Nameserver.new(:name => name.strip.downcase)
             end
           end
         end

data/lib/whois/record/parser/whois.za.net.rb

@@ -62,7 +62,7 @@ module Whois
         property_supported :nameservers do
           if content_for_scanner =~ /Domain Name Servers listed in order:\n\n((.+\n)+)\n/
             $1.split("\n").reject { |value| value.strip.empty? }.map do |name|
-              Record::Nameserver.new(name.strip)
+              Record::Nameserver.new(:name => name.strip)
             end
           end
         end

data/lib/whois/record/parser/whois.za.org.rb

@@ -62,7 +62,7 @@ module Whois
         property_supported :nameservers do
           if content_for_scanner =~ /Domain Name Servers listed in order:\n\n((.+\n)+)\n/
             $1.split("\n").reject { |value| value.strip.empty? }.map do |name|
-              Record::Nameserver.new(name.strip)
+              Record::Nameserver.new(:name => name.strip)
             end
           end
         end

data/lib/whois/record/scanners/whois.ati.tn.rb

@@ -0,0 +1,46 @@
+#--
+# Ruby Whois
+#
+# An intelligent pure Ruby WHOIS client and parser.
+#
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+#++
+
+
+require 'whois/record/scanners/base'
+
+
+module Whois
+  class Record
+    module Scanners
+
+      # Scanner for the whois.ati.tn record.
+      #
+      # @since RELEASE
+      class WhoisAtiTn < Base
+
+        self.tokenizers += [
+            :skip_empty_line,
+            :scan_available,
+            :scan_disclaimer,
+            :scan_keyvalue,
+        ]
+
+
+        tokenizer :scan_available do
+          if @input.skip(/^Domain (.+) not found/)
+            @ast["status:available"] = true
+          end
+        end
+
+        tokenizer :scan_disclaimer do
+          if @input.match?(/^All rights reserved/)
+            @ast["field:disclaimer"] = _scan_lines_to_array(/(.+)\n/).join("\n")
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/whois/record/scanners/whois.cira.ca.rb

@@ -29,7 +29,6 @@ module Whois
         ]
 
         
-
         tokenizer :scan_disclaimer do
           if @input.match?(/^% Use of CIRA/)
             @ast["field:disclaimer"] = _scan_lines_to_array(/^%(.*)\n/).join("\n")

data/lib/whois/record/scanners/whois.registry.om.rb

@@ -0,0 +1,39 @@
+#--
+# Ruby Whois
+#
+# An intelligent pure Ruby WHOIS client and parser.
+#
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+#++
+
+
+require 'whois/record/scanners/base'
+
+
+module Whois
+  class Record
+    module Scanners
+
+      # Scanner for the whois.registry.om record.
+      #
+      # @since RELEASE
+      class WhoisRegistryOm < Base
+
+        self.tokenizers += [
+            :skip_empty_line,
+            :scan_available,
+            :scan_keyvalue,
+        ]
+
+
+        tokenizer :scan_available do
+          if @input.skip(/^No Data Found\n/)
+            @ast['status:available'] = true
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/whois/record/scanners/whois.rnids.rs.rb

@@ -26,6 +26,7 @@ module Whois
             :scan_group_keyvalue,
             :flag_group_end,
             :skip_empty_line,
+            :skip_privacy,
         ]
 
 
@@ -68,6 +69,10 @@ module Whois
           @input.skip(/^%.*\n/)
         end
 
+        tokenizer :skip_privacy do
+          @input.skip(/^Whois privacy has been activated for domain.\n/)
+        end
+
       end
 
     end

data/lib/whois/record/super_struct.rb

@@ -43,18 +43,21 @@ class SuperStruct < Struct
   def initialize(*args)
     if args.first.is_a? Hash
       initialize_with_hash(args.first)
+    elsif args.size == 0
+      super
     else
+      Whois.deprecate "Passing a list of arguments to #{self.class} is deprecated, please use the Hash syntax."
       super
     end
     yield(self) if block_given?
   end
 
-  private
+private
 
-    def initialize_with_hash(attributes = {})
-      attributes.each do |key, value|
-        self[key] = value
-      end
+  def initialize_with_hash(attributes = {})
+    attributes.each do |key, value|
+      self[key] = value
     end
+  end
 
 end

data/lib/whois/server/adapters/base.rb

@@ -133,66 +133,66 @@ module Whois
 
         private
 
-          # Store a record part in {#buffer}.
-          #
-          # @param  [String] body
-          # @param  [String] host
-          # @return [void]
-          #
-          # @api public
-          def buffer_append(body, host)
-            @buffer << Whois::Record::Part.new(body, host)
-          end
+        # Store a record part in {#buffer}.
+        #
+        # @param  [String] body
+        # @param  [String] host
+        # @return [void]
+        #
+        # @api public
+        def buffer_append(body, host)
+          @buffer << Whois::Record::Part.new(:body => body, :host => host)
+        end
 
-          # @api internal
-          def buffer_start
-            @buffer = []
-            result = yield(@buffer)
-            @buffer = [] # reset
-            result
-          end
+        # @api internal
+        def buffer_start
+          @buffer = []
+          result = yield(@buffer)
+          @buffer = [] # reset
+          result
+        end
 
-          # @api public
-          def query_the_socket(query, host, port = nil)
-            args = []
-            args.push(host)
-            args.push(port || options[:port] || DEFAULT_WHOIS_PORT)
-
-            # This is a hack to prevent +TCPSocket.new+ to crash
-            # when resolv-replace.rb file is required.
-            #
-            # +TCPSocket.new+ defaults +local_host+ and +local_port+ to nil
-            # but when you require resolv-replace.rb, +local_host+
-            # is resolved when you pass any local parameter and in case of nil
-            # it raises the following error
-            #
-            #   ArgumentError: cannot interpret as DNS name: nil
-            #
-            if options[:bind_host] || options[:bind_port]
-              args.push(options[:bind_host] || DEFAULT_BIND_HOST)
-              args.push(options[:bind_port]) if options[:bind_port]
-            end
-
-            ask_the_socket(query, *args)
-
-          rescue *RESCUABLE_CONNECTION_ERRORS => error
-            raise ConnectionError, "#{error.class}: #{error.message}"
-          end
+        # @api public
+        def query_the_socket(query, host, port = nil)
+          args = []
+          args.push(host)
+          args.push(port || options[:port] || DEFAULT_WHOIS_PORT)
 
-          # This method handles the lowest connection
-          # to the WHOIS server.
+          # This is a hack to prevent +TCPSocket.new+ to crash
+          # when resolv-replace.rb file is required.
+          #
+          # +TCPSocket.new+ defaults +local_host+ and +local_port+ to nil
+          # but when you require resolv-replace.rb, +local_host+
+          # is resolved when you pass any local parameter and in case of nil
+          # it raises the following error
           #
-          # This is for internal use only!
+          #   ArgumentError: cannot interpret as DNS name: nil
           #
-          # @api internal
-          def ask_the_socket(query, *args)
-            client = TCPSocket.new(*args)
-            client.write("#{query}\r\n")    # I could use put(foo) and forget the \n
-            client.read                     # but write/read is more symmetric than puts/read
-          ensure                            # and I really want to use read instead of gets.
-            client.close if client          # If != client something went wrong.
+          if options[:bind_host] || options[:bind_port]
+            args.push(options[:bind_host] || DEFAULT_BIND_HOST)
+            args.push(options[:bind_port]) if options[:bind_port]
           end
 
+          ask_the_socket(query, *args)
+
+        rescue *RESCUABLE_CONNECTION_ERRORS => error
+          raise ConnectionError, "#{error.class}: #{error.message}"
+        end
+
+        # This method handles the lowest connection
+        # to the WHOIS server.
+        #
+        # This is for internal use only!
+        #
+        # @api internal
+        def ask_the_socket(query, *args)
+          client = TCPSocket.new(*args)
+          client.write("#{query}\r\n")    # I could use put(foo) and forget the \n
+          client.read                     # but write/read is more symmetric than puts/read
+        ensure                            # and I really want to use read instead of gets.
+          client.close if client          # If != client something went wrong.
+        end
+
       end
 
     end

data/lib/whois/version.rb

@@ -12,8 +12,8 @@ module Whois
   # Holds information about library version.
   module Version
     MAJOR = 2
-    MINOR = 5
-    PATCH = 1
+    MINOR = 6
+    PATCH = 0
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join(".")

data/spec/fixtures/responses/whois.ati.tn/status_available.expected

@@ -0,0 +1,57 @@
+#disclaimer
+  should: %s == "All rights reserved.\nCopyright \"Tunisian Internet Agency - http://whois.tn\""
+
+
+#domain
+  should: %s == nil
+
+#domain_id
+  should: %s raise_error(Whois::PropertyNotSupported)
+
+
+#referral_url
+  should: %s raise_error(Whois::PropertyNotSupported)
+
+#referral_whois
+  should: %s raise_error(Whois::PropertyNotSupported)
+
+
+#status
+  should: %s == :available
+
+#available?
+  should: %s == true
+
+#registered?
+  should: %s == false
+
+
+#created_on
+  should: %s == nil
+
+#updated_on
+  should: %s raise_error(Whois::PropertyNotSupported)
+
+#expires_on
+  should: %s raise_error(Whois::PropertyNotSupported)
+
+
+#registrar
+  should: %s == nil
+
+#registrant_contacts
+  should: %s CLASS(array)
+  should: %s == []
+
+#admin_contacts
+  should: %s CLASS(array)
+  should: %s == []
+
+#technical_contacts
+  should: %s CLASS(array)
+  should: %s == []
+
+
+#nameservers
+  should: %s CLASS(array)
+  should: %s == []

data/spec/fixtures/responses/whois.ati.tn/status_available.txt

@@ -0,0 +1,4 @@
+All rights reserved.
+Copyright "Tunisian Internet Agency - http://whois.tn"
+
+Domain u34jedzcq.tn not found

data/spec/fixtures/responses/whois.ati.tn/status_registered.expected

@@ -0,0 +1,122 @@
+#disclaimer
+  should: %s == "All rights reserved.\nCopyright \"Tunisian Internet Agency - http://whois.tn\""
+
+
+#domain
+  should: %s == "google.tn"
+
+#domain_id
+  should: %s raise_error(Whois::PropertyNotSupported)
+
+
+#referral_url
+  should: %s raise_error(Whois::PropertyNotSupported)
+
+#referral_whois
+  should: %s raise_error(Whois::PropertyNotSupported)
+
+
+#status
+  should: %s == :registered
+
+#available?
+  should: %s == false
+
+#registered?
+  should: %s == true
+
+
+#created_on
+  should: %s CLASS(time)
+  should: %s == Time.parse("2009-05-14 00:00:00")
+
+#updated_on
+  should: %s raise_error(Whois::PropertyNotSupported)
+
+#expires_on
+  should: %s raise_error(Whois::PropertyNotSupported)
+
+
+#registrar
+  should: %s CLASS(registrar)
+  should: %s.id           == nil
+  should: %s.name         == "3S Global Net"
+  should: %s.organization == nil
+  should: %s.url          == nil
+
+#registrant_contacts
+  should: %s CLASS(array)
+  should: %s SIZE(1)
+  should: %s[0] CLASS(contact)
+  should: %s[0].type          == Whois::Record::Contact::TYPE_REGISTRANT
+  should: %s[0].id            == nil
+  should: %s[0].name          == "GOOGLE Inc"
+  should: %s[0].organization  == nil
+  should: %s[0].address       == "PO BOX 2050 Moutain view CA 94042 USA"
+  should: %s[0].city          == nil
+  should: %s[0].zip           == nil
+  should: %s[0].state         == nil
+  should: %s[0].country       == nil
+  should: %s[0].country_code  == nil
+  should: %s[0].phone         == "+1 925 685 9600"
+  should: %s[0].fax           == "+1 925 685 9620"
+  should: %s[0].email         == "dns-admin@google.com"
+  should: %s[0].created_on    == Time.parse("2009-05-14 00:00:00")
+  should: %s[0].updated_on    == Time.parse("2010-07-18 00:00:00")
+
+#admin_contacts
+  should: %s CLASS(array)
+  should: %s SIZE(1)
+  should: %s[0] CLASS(contact)
+  should: %s[0].type          == Whois::Record::Contact::TYPE_ADMIN
+  should: %s[0].id            == nil
+  should: %s[0].name          == "GOOGLE Inc"
+  should: %s[0].organization  == nil
+  should: %s[0].address       == "PO BOX 2050 Moutain view CA 94042 USA"
+  should: %s[0].city          == nil
+  should: %s[0].zip           == nil
+  should: %s[0].state         == nil
+  should: %s[0].country       == nil
+  should: %s[0].country_code  == nil
+  should: %s[0].phone         == "+1 925 685 9600"
+  should: %s[0].fax           == "+1 925 685 9620"
+  should: %s[0].email         == "dns-admin@google.com"
+  should: %s[0].created_on    == Time.parse("2009-05-14 00:00:00")
+  should: %s[0].updated_on    == Time.parse("2010-07-18 00:00:00")
+
+#technical_contacts
+  should: %s CLASS(array)
+  should: %s SIZE(1)
+  should: %s[0] CLASS(contact)
+  should: %s[0].type          == Whois::Record::Contact::TYPE_TECHNICAL
+  should: %s[0].id            == nil
+  should: %s[0].name          == "GOOGLE Inc"
+  should: %s[0].organization  == nil
+  should: %s[0].address       == "PO BOX 2050 Moutain view CA 94042 USA"
+  should: %s[0].city          == nil
+  should: %s[0].zip           == nil
+  should: %s[0].state         == nil
+  should: %s[0].country       == nil
+  should: %s[0].country_code  == nil
+  should: %s[0].phone         == "+1 925 685 9600"
+  should: %s[0].fax           == "+1 925 685 9620"
+  should: %s[0].email         == "dns-admin@google.com"
+  should: %s[0].created_on    == Time.parse("2009-05-14 00:00:00")
+  should: %s[0].updated_on    == Time.parse("2010-07-18 00:00:00")
+
+
+#nameservers
+  should: %s CLASS(array)
+  should: %s SIZE(4)
+  should: %s[0] CLASS(nameserver)
+  should: %s[0].name == "ns1.google.com"
+  should: %s[0].ipv4 == "216.239.32.10"
+  should: %s[1] CLASS(nameserver)
+  should: %s[1].name == "ns2.google.com"
+  should: %s[1].ipv4 == "216.239.34.10"
+  should: %s[2] CLASS(nameserver)
+  should: %s[2].name == "ns3.google.com"
+  should: %s[2].ipv4 == "216.239.36.10"
+  should: %s[3] CLASS(nameserver)
+  should: %s[3].name == "ns4.google.com"
+  should: %s[3].ipv4 == "216.239.38.10"