whois 2.7.0 → 3.0.0

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

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -15,7 +15,7 @@ module Whois
     class Parser
 
       # Parser for the whois.registry.om server.
-      # 
+      #
       # @see Whois::Record::Parser::Example
       #   The Example parser for the list of all available methods.
       #

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

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 

data/lib/whois/record/parser/whois.registrypro.pro.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -15,7 +15,7 @@ module Whois
     class Parser
 
       # Parser for the whois.registrypro.pro server.
-      # 
+      #
       # @see Whois::Record::Parser::Example
       #   The Example parser for the list of all available methods.
       #

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

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 

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

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -16,13 +16,13 @@ module Whois
     class Parser
 
       # Parser for the whois.rnids.rs server.
-      # 
+      #
       # @see Whois::Record::Parser::Example
       #   The Example parser for the list of all available methods.
       #
       # @since  2.4.0
       class WhoisRnidsRs < Base
-        include Scanners::Ast
+        include Scanners::Nodable
 
         property_not_supported :disclaimer
 
@@ -34,11 +34,6 @@ module Whois
         property_not_supported :domain_id
 
 
-        property_not_supported :referral_whois
-
-        property_not_supported :referral_url
-
-
         property_supported :status do
           case node("Domain status", &:downcase)
           when nil

data/lib/whois/record/parser/whois.rotld.ro.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 

data/lib/whois/record/parser/whois.samoanic.ws.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 

data/lib/whois/record/parser/whois.sgnic.sg.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 

data/lib/whois/record/parser/whois.sk-nic.sk.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 

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

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -20,7 +20,7 @@ module Whois
       # @author Mathieu Arnold <m@absolight.fr>
       #
       class WhoisSmallregistryNet < Base
-        include Scanners::Ast
+        include Scanners::Nodable
 
         property_supported :disclaimer do
           node("field:disclaimer") do |str|

data/lib/whois/record/parser/whois.srs.net.nz.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 

data/lib/whois/record/parser/whois.sx.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -16,35 +16,36 @@ module Whois
     class Parser
 
       # Parser for the whois.sx server.
-      # 
+      #
       # @see Whois::Record::Parser::Example
       #   The Example parser for the list of all available methods.
       #
       # @since  2.6.2
       class WhoisSx < Base
-        include Scanners::Ast
+        include Scanners::Nodable
 
-        property_not_supported :disclaimer
+        property_supported :disclaimer do
+          node("field:disclaimer")
+        end
 
 
         property_supported :domain do
-          "#{node('Domain')}.sx"
+          node("Domain Name", &:downcase)
         end
 
-        property_not_supported :domain_id
-
-
-        property_not_supported :referral_whois
-
-        property_not_supported :referral_url
+        property_supported :domain_id do
+          node("Domain ID")
+        end
 
 
         property_supported :status do
-          case (s = node('Status'))
-          when /free/
+          case (s = node("Domain Status", &:downcase))
+          when "available"
             :available
-          when 'active'
+          when "ok"
             :registered
+          when "premium name"
+            :unavailable
           else
             Whois.bug!(ParserError, "Unknown status `#{s}'.")
           end
@@ -55,41 +56,48 @@ module Whois
         end
 
         property_supported :registered? do
-          !available?
+          status == :registered
         end
 
 
-        property_not_supported :created_on
+        property_supported :created_on do
+          node("Creation Date") { |value| parse_time(value) }
+        end
 
-        property_not_supported :updated_on
+        property_supported :updated_on do
+          node("Updated Date") { |value| parse_time(value) }
+        end
 
-        property_not_supported :expires_on
+        property_supported :expires_on do
+          node("Registry Expiry Date") { |value| parse_time(value) }
+        end
 
 
         property_supported :registrar do
-          node('Registrar') do |hash|
+          node("Sponsoring Registrar") do |value|
             Record::Registrar.new(
-                :name         => hash['Name'],
-                :url          => hash['Website']
+                :name         => value
             )
           end
         end
 
 
         property_supported :registrant_contacts do
-          build_contact('Registrant', Whois::Record::Contact::TYPE_REGISTRANT)
+          build_contact("Registrant", Whois::Record::Contact::TYPE_REGISTRANT)
         end
 
-        property_not_supported :admin_contacts
+        property_supported :admin_contacts do
+          build_contact("Admin", Whois::Record::Contact::TYPE_ADMIN)
+        end
 
-        property_not_supported :technical_contacts
+        property_supported :technical_contacts do
+          build_contact("Tech", Whois::Record::Contact::TYPE_TECHNICAL)
+        end
 
 
         property_supported :nameservers do
-          node('Name servers') do |names|
-            names.map do |name|
-              Record::Nameserver.new(:name => name)
-            end
+          Array.wrap(node("Name Server")).map do |name|
+            Record::Nameserver.new(:name => name)
           end
         end
 
@@ -106,13 +114,23 @@ module Whois
 
         private
 
+        def parse_time(value)
+          # Hack to remove usec. Do you know a better way?
+          Time.utc(*Time.parse(value).to_a)
+        end
+
         def build_contact(element, type)
-          node("#{element}") do |array|
+          node("#{element} ID") do |id|
             Record::Contact.new(
                 :type         => type,
-                :id           => nil,
-                :name         => array[0],
-                :email        => nil
+                :id           => id,
+                :name         => node("#{element} Name"),
+                :organization => node("#{element} Organization"),
+                :address      => node("#{element} Street"),
+                :city        => node("#{element} City"),
+                :zip          => node("#{element} Postal Code"),
+                :country      => node("#{element} Country"),
+                :email        => node("#{element} Email")
             )
           end
         end

data/lib/whois/record/parser/whois.tcinet.ru.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -19,7 +19,7 @@ module Whois
       # @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 Whois::Record::Parser::Example
       #   The Example parser for the list of all available methods.
       #

data/lib/whois/record/parser/whois.thnic.co.th.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -41,7 +41,7 @@ module Whois
         end
 
         property_supported :available? do
-          !!(content_for_scanner =~ /^% No entries found for the selected source/)
+          !!(content_for_scanner =~ /^% No match for/)
         end
 
         property_supported :registered? do
@@ -50,19 +50,19 @@ module Whois
 
 
         property_supported :created_on do
-          if content_for_scanner =~ /^Created Date: (.+?)\n/
+          if content_for_scanner =~ /^Created date: (.+?)\n/
             Time.parse($1)
           end
         end
 
         property_supported :updated_on do
-          if content_for_scanner =~ /^Updated Date: (.+?)\n/
+          if content_for_scanner =~ /^Updated date: (.+?)\n/
             Time.parse($1)
           end
         end
 
         property_supported :expires_on do
-          if content_for_scanner =~ /^Exp Date: (.+?)\n/
+          if content_for_scanner =~ /^Exp date: (.+?)\n/
             Time.parse($1)
           end
         end

data/lib/whois/record/parser/whois.tld.ee.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -16,7 +16,7 @@ module Whois
     class Parser
 
       # Parser for the whois.tld.ee server.
-      # 
+      #
       # @see Whois::Record::Parser::Example
       #   The Example parser for the list of all available methods.
       #

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

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -28,11 +28,6 @@ module Whois
         property_not_supported :domain_id
 
 
-        property_not_supported :referral_whois
-
-        property_not_supported :referral_url
-
-
         property_supported :status do
           if response_incomplete?
             :incomplete

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

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 

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

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -15,7 +15,7 @@ module Whois
     class Parser
 
       # Parser for the whois.tznic.or.tz server.
-      # 
+      #
       # @see Whois::Record::Parser::Example
       #   The Example parser for the list of all available methods.
       #

data/lib/whois/record/parser/whois.ua.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -28,11 +28,6 @@ module Whois
         property_not_supported :domain_id
 
   
-        property_not_supported :referral_whois
-
-        property_not_supported :referral_url
-
-
         property_supported :status do
           if content_for_scanner =~ /status:\s+(.+?)\n/
             case (s = $1.downcase)