whois 2.7.0 → 3.0.0

data/lib/whois/record/parser/whois.nic.tv.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>
 #++
 
 
@@ -17,7 +17,7 @@ module Whois
 
       # Parser for the whois.nic.tv server.
       class WhoisNicTv < Base
-        include Scanners::Ast
+        include Scanners::Nodable
 
         property_supported :disclaimer do
           node("Disclaimer")
@@ -31,16 +31,6 @@ module Whois
         property_not_supported :domain_id
 
 
-
-        property_supported :referral_whois do
-          node("Whois Server")
-        end
-
-        property_supported :referral_url do
-          node("Referral URL")
-        end
-
-
         property_supported :status do
           node("Status")
         end
@@ -81,6 +71,15 @@ module Whois
         end
 
 
+        def referral_whois
+          node("Whois Server")
+        end
+
+        def referral_url
+          node("Referral URL")
+        end
+
+
         # Initializes a new {Scanners::Verisign} instance
         # passing the {#content_for_scanner}
         # and calls +parse+ on it.

data/lib/whois/record/parser/whois.nic.uk.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>
 #++
 
 
@@ -14,16 +14,11 @@ module Whois
   class Record
     class Parser
 
-      #
-      # = whois.nic.uk parser
-      #
       # Parser for the whois.nic.uk server.
       #
-      # 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 WhoisNicIt parser for an explanation of all available methods
-      # and examples.
+      # @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 http://www.nominet.org.uk/other/whois/detailedinstruct/
       #
@@ -88,23 +83,26 @@ module Whois
 
         # @see http://www.nic.uk/other/whois/instruct/
         property_supported :registrar do
-          if content_for_scanner =~ /Registrar:\n(.+) \[Tag = (.+)\]\n\s*URL: (.+)\n/
-            name, id, url = $1.strip, $2.strip, $3.strip
-            org, name = name.split(" t/a ")
+          if content_for_scanner =~ /Registrar:\n((.+\n)+)\n/
+            content = $1.strip
+            id = name = org = url = nil
+            
+            if content =~ /Tag =/
+              name, id = (content =~ /(.+) \[Tag = (.+)\]/) && [$1.strip, $2.strip]
+              org, name = name.split(" t/a ")
+              url = (content =~ /URL: (.+)/) && $1.strip
+            elsif content =~ /This domain is registered directly with Nominet/
+              name  = "Nominet"
+              org   = "Nominet UK"
+              url   = "http://www.nic.uk/"
+            end
 
             Record::Registrar.new(
               :id           => id,
-              :name         => (name || org),
+              :name         => name || org,
               :organization => org,
               :url          => url
             )
-          elsif content_for_scanner =~ /This domain is registered directly with Nominet/
-            Record::Registrar.new(
-              :id           => nil,
-              :name         => "Nominet",
-              :organization => "Nominet UK",
-              :url          => "http://www.nic.uk/"
-            )
           end
         end
 

data/lib/whois/record/parser/whois.nic.us.rb

@@ -3,68 +3,23 @@
 #
 # 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>
 #++
 
 
-require 'whois/record/parser/base'
+require 'whois/record/parser/base_shared2'
 
 
 module Whois
   class Record
     class Parser
 
-      #
-      # = whois.nic.us parser
-      #
       # Parser for the whois.nic.us server.
       #
-      # 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 WhoisNicIt parser for an explanation of all available methods
-      # and examples.
+      # @see Whois::Record::Parser::Example
+      #   The Example parser for the list of all available methods.
       #
-      class WhoisNicUs < Base
-
-        property_supported :status do
-          content_for_scanner.scan(/Domain Status:\s+(.+?)\n/).flatten
-        end
-
-        property_supported :available? do
-          !!(content_for_scanner =~ /Not found:/)
-        end
-
-        property_supported :registered? do
-          !available?
-        end
-
-
-        property_supported :created_on do
-          if content_for_scanner =~ /Domain Registration Date:\s+(.+?)\n/
-            Time.parse($1)
-          end
-        end
-
-        property_supported :updated_on do
-          if content_for_scanner =~ /Domain Last Updated Date:\s+(.+?)\n/
-            Time.parse($1)
-          end
-        end
-
-        property_supported :expires_on do
-          if content_for_scanner =~ /Domain Expiration Date:\s+(.+?)\n/
-            Time.parse($1)
-          end
-        end
-
-
-        property_supported :nameservers do
-          content_for_scanner.scan(/Name Server:\s+(.+)\n/).flatten.map do |name|
-            Record::Nameserver.new(:name => name.downcase)
-          end
-        end
-
+      class WhoisNicUs < BaseShared2
       end
 
     end

data/lib/whois/record/parser/whois.nic.ve.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.nic.xxx.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.norid.no.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.org.za.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>
 #++
 
 
@@ -29,11 +29,6 @@ module Whois
         property_not_supported :domain_id
 
 
-        property_not_supported :referral_whois
-
-        property_not_supported :referral_url
-
-
         property_supported :status do
           if available?
             :available

data/lib/whois/record/parser/whois.pandi.or.id.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.pir.org.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.pnina.ps.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.register.bg.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.register.com.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>
 #++
 
 
@@ -69,7 +69,7 @@ module Whois
 
 
         property_supported :nameservers do
-          if content_for_scanner =~ /(?:DNS|Name) Servers:\n((.+\n)+)\n/
+          if content_for_scanner =~ /(?:DNS|Name) Servers:\n((?:\s+.+\n)+)(?:\s+)\n/
             $1.split("\n").map do |line|
               Record::Nameserver.new(:name => line.strip)
             end

data/lib/whois/record/parser/whois.registro.br.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.registry.gy.rb

@@ -3,11 +3,11 @@
 #
 # 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>
 #++
 
 
-require 'whois/record/parser/base_cocca'
+require 'whois/record/parser/base_cocca2'
 
 
 module Whois
@@ -15,7 +15,11 @@ module Whois
     class Parser
 
       # Parser for the whois.registry.gy server.
-      class WhoisRegistryGy < BaseCocca
+      #
+      # @see Whois::Record::Parser::Example
+      #   The Example parser for the list of all available methods.
+      #
+      class WhoisRegistryGy < BaseCocca2
       end
 
     end

data/lib/whois/record/parser/whois.registry.hm.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.registry.in.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.registry.net.za.rb

@@ -0,0 +1,123 @@
+require 'whois/record/parser/base'
+require 'whois/record/scanners/whois.registry.net.za'
+
+
+module Whois
+  class Record
+    class Parser
+      # Parser for the whois.registry.za.net server.
+      #
+      # @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.
+      #
+      class WhoisRegistryNetZa < Base
+        include Scanners::Nodable
+
+        property_supported :disclaimer do
+          node("field:disclaimer")
+        end
+
+
+        property_supported :domain do
+          node("field:domain_name")
+        end
+
+        property_not_supported :domain_id
+
+
+        property_supported :status do
+          node("field:status")
+        end
+
+        property_supported :available? do
+          node("status:available") ? true : false
+        end
+
+        property_supported :registered? do
+          !available?
+        end
+
+
+        property_supported :created_on do
+          node("field:dates") do
+            node("field:dates") =~ /Registration Date:\s*(\d{4}-\d{2}-\d{2})/
+            parse_date($1)
+          end
+        end
+
+        property_not_supported :updated_on
+
+        property_supported :expires_on do
+          node("field:dates") do
+            node("field:dates") =~ /Renewal Date:\s*(\d{4}-\d{2}-\d{2})/
+            parse_date($1)
+          end
+        end
+
+
+        property_supported :registrar do
+          node("field:registrar") do
+            node("field:registrar") =~ /(.+) \[ ID = (.+) \]/
+            Whois::Record::Registrar.new(:name => $1.strip, :id => $2.strip)
+          end
+        end
+
+        property_supported :registrant_contacts do
+          node("field:registrant_details") do
+            build_registrant_contacts
+          end
+        end
+
+        property_not_supported :admin_contacts
+
+        property_not_supported :technical_contacts
+
+
+        property_supported :nameservers do
+          node("field:nameservers") do
+            nameservers = node("field:nameservers").gsub(/\n\s+/, ",").split(",")
+            Array.wrap(nameservers).map do |nameserver|
+              Record::Nameserver.new(:name => nameserver)
+            end
+          end
+        end
+
+
+        def parse
+          Scanners::WhoisRegistryNetZa.new(content_for_scanner).parse
+        end
+
+
+        private
+
+        def build_registrant_contacts
+          Whois::Record::Contact.new(
+            {:type => Whois::Record::Contact::TYPE_REGISTRANT}.merge(registrant_details).merge(registrant_address_details)
+          )
+        end
+
+        def registrant_details
+          registrant_lines = node("field:registrant_details").split("\n")
+          details = { :name => registrant_lines.shift }
+          [:email, :phone, :fax].each do |contact_method|
+            details[contact_method] = registrant_lines.shift.split(":").last.strip
+          end
+          details
+        end
+
+        def registrant_address_details
+          { :address => node("field:registrant_address").gsub(/\n\s+/, " ") }
+        end
+
+        def parse_date(date_string)
+          Time.parse(date_string) if date_string
+        end
+
+      end
+    end
+  end
+end