whois 2.1.0 → 2.2.0

data/Rakefile

@@ -1,8 +1,4 @@
 require 'rubygems'
-require 'rspec/core/rake_task'
-require 'rubygems/package_task'
-require 'yard'
-require 'yard/rake/yardoc_task'
 
 $:.unshift(File.dirname(__FILE__) + '/lib')
 require 'whois'
@@ -18,14 +14,9 @@ end
 
 
 # Run test by default.
-task :default => :rspec
-task :test => :rspec
-
-# This builds the actual gem. For details of what all these options
-# mean, and other ones you can add, check the documentation here:
-#
-#   http://rubygems.org/read/chapter/20
-#
+task :default => :spec
+task :test => :spec
+
 spec = Gem::Specification.new do |s|
   s.name              = PKG_NAME
   s.version           = PKG_VERSION
@@ -51,13 +42,14 @@ spec = Gem::Specification.new do |s|
 
   # If your tests use any gems, include them here
   s.add_development_dependency "rake",  "~> 0.9"
-  s.add_development_dependency "rspec", "~> 2.6.0"
+  s.add_development_dependency "rspec", "~> 2.7.0"
   s.add_development_dependency "mocha"
   s.add_development_dependency "yard"
 end
 
-# This task actually builds the gem.
-# We also regenerate a static .gemspec file.
+
+require 'rubygems/package_task'
+
 Gem::PackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
@@ -69,8 +61,9 @@ task :gemspec do
 end
 
 
-# Run all the specs in the /spec folder
-RSpec::Core::RakeTask.new(:rspec)
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new
 
 
 namespace :multitest do
@@ -113,6 +106,9 @@ desc "Package the library and generates the gemspec"
 task :package => [:gemspec]
 
 
+require 'yard'
+require 'yard/rake/yardoc_task'
+
 YARD::Rake::YardocTask.new(:yardoc) do |y|
   y.options = ["--output-dir", "yardoc"]
 end

data/lib/core_ext.rb

@@ -1,4 +1,4 @@
-if defined?(ActiveSupport) && ActiveSupport::VERSION::MAJOR == 3
+if defined?(ActiveSupport::VERSION) && ActiveSupport::VERSION::MAJOR == 3
   require 'active_support/core_ext/array/wrap'
   require 'active_support/core_ext/date_time/conversions'
   require 'core_ext/class/attribute'

data/lib/core_ext/date_time/conversions.rb

@@ -1,10 +1,9 @@
 require 'date'
 
-
 class DateTime
   # Ruby 1.9 has DateTime#to_time which internally relies on Time. We define our own #to_time which allows
   # DateTimes outside the range of what can be created with Time.
-  remove_method :to_time if instance_methods.include?(:to_time)
+  # remove_method :to_time if instance_methods.include?(:to_time)
 
   # Attempts to convert self to a Ruby Time object; returns self if out of range of Ruby Time class.
   # If self has an offset other than 0, self will just be returned unaltered, since there's no clean way to map it to a Time.

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

@@ -0,0 +1,85 @@
+#--
+# Ruby Whois
+#
+# An intelligent pure Ruby WHOIS client and parser.
+#
+# Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
+#++
+
+
+require 'whois/record/parser/base'
+
+
+module Whois
+  class Record
+    class Parser
+
+      # Base parser for CoCCA servers.
+      #
+      # @abstract
+      #
+      class BaseCocca < Base
+
+        property_supported :domain do
+          content_for_scanner =~ /Query:\s+(.+?)\n/
+          $1 || Whois.bug!(ParserError, "Unable to parse domain.")
+        end
+
+        property_not_supported :domain_id
+
+
+        property_supported :status do
+          if content_for_scanner =~ /Status:\s+(.+?)\n/
+            case $1.downcase
+            when "active"         then :registered
+            when "delegated"      then :registered
+            when "not registered" then :available
+            else
+              Whois.bug!(ParserError, "Unknown status `#{$1}'.")
+            end
+          else
+            Whois.bug!(ParserError, "Unable to parse status.")
+          end
+        end
+
+        property_supported :available? do
+          status == :available
+        end
+
+        property_supported :registered? do
+          !available?
+        end
+
+
+        property_supported :created_on do
+          if content_for_scanner =~ /Created:\s+(.+?)\n/
+            Time.parse($1)
+          end
+        end
+
+        property_supported :updated_on do
+          if content_for_scanner =~ /Modified:\s+(.+?)\n/
+            Time.parse($1)
+          end
+        end
+
+        property_supported :expires_on do
+          if content_for_scanner =~ /Expires:\s+(.+?)\n/
+            Time.parse($1)
+          end
+        end
+
+
+        property_supported :nameservers do
+          if content_for_scanner =~ /Name Servers:\n((.+\n)+)\n/
+            $1.split("\n").map do |name|
+              Record::Nameserver.new(name.strip)
+            end
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/whois/record/parser/scanners/afilias.rb

@@ -19,6 +19,7 @@ module Whois
 
           def parse_content
             parse_available   ||
+            parse_reserved    ||  # .XXX
             parse_throttled   ||  # .ORG
             parse_disclaimer  ||
             parse_keyvalue    ||
@@ -33,6 +34,12 @@ module Whois
             end
           end
 
+          def parse_reserved
+            if @input.scan(/^Reserved by ICM Registry\n/)
+              @ast["status:reserved"] = true
+            end
+          end
+
           def parse_throttled
             if @input.match?(/^WHOIS LIMIT EXCEEDED/)
               @ast["response:throttled"] = true
@@ -41,7 +48,7 @@ module Whois
           end
 
           def parse_disclaimer
-            if @input.pos == 0
+            if @input.pos == 0 && @input.match?(/^(.+\n){3,}\n/)
               lines = []
               while @input.scan(/^(.+)\n/)
                 lines << @input[1].strip

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

@@ -17,7 +17,6 @@ module Whois
       # Parser for the whois.aero server.
       class WhoisAero < BaseAfilias
 
-
         property_supported :status do
           Array.wrap(node("Domain Status"))
         end

data/lib/whois/record/parser/whois.cnnic.cn.rb

@@ -53,6 +53,11 @@ module Whois
           reserved? || !available?
         end
 
+        # NEWPROPERTY
+        def reserved?
+          !!node("status:reserved")
+        end
+
 
         property_supported :created_on do
           node("Registration Date") { |value| Time.parse(value) }
@@ -92,12 +97,6 @@ module Whois
         end
 
 
-        # NEWPROPERTY
-        def reserved?
-          !!node("status:reserved")
-        end
-
-
         # Initializes a new {Scanners::Cnnic} instance
         # passing the {#content_for_scanner}
         # and calls +parse+ on it.

data/lib/whois/record/parser/whois.co.ca.rb

@@ -43,6 +43,11 @@ module Whois
           !available?
         end
 
+        # NEWPROPERTY
+        def reserved?
+          !!(content_for_scanner =~ /^Domain is not available or is reserved by the registry/)
+        end
+
 
         property_supported :created_on do
           if content_for_scanner =~ /date_approved:\s+(.+)\n/
@@ -65,12 +70,6 @@ module Whois
           end
         end
 
-
-        # NEWPROPERTY
-        def reserved?
-          !!(content_for_scanner =~ /^Domain is not available or is reserved by the registry/)
-        end
-
       end
 
     end

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

@@ -44,7 +44,7 @@ module Whois
               when "connect"    then :registered
               when "free"       then :available
               when "invalid"    then :invalid
-              # NEWSTATUS
+              # NEWSTATUS (inactive)
               # The domain is registered, but there is not DNS entry for it.
               when "failed"     then :registered
               else

data/lib/whois/record/parser/whois.dns.pt.rb

@@ -30,8 +30,9 @@ module Whois
         property_supported :status do
           if content_for_scanner =~ /^Estado \/ Status:\s+(.+)\n/
             case $1.downcase
-              when "active" then :registered
+              when "active"   then :registered
               when "reserved" then :reserved
+              when "tech-pro" then :inactive
               else
                 Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end
@@ -50,14 +51,18 @@ module Whois
 
 
         property_supported :created_on do
-          if content_for_scanner =~ / Creation Date .+?:\s+(.*)\n/
+          if content_for_scanner =~ / Creation Date .+?:\s+(.+)\n/
             Time.utc(*$1.split("/").reverse)
           end
         end
 
         property_not_supported :updated_on
 
-        property_not_supported :expires_on
+        property_supported :expires_on do
+          if content_for_scanner =~ / Expiration Date .+?:\s+(.+)\n/
+            Time.utc(*$1.split("/").reverse)
+          end
+        end
 
 
         property_supported :nameservers do

data/lib/whois/record/parser/whois.godaddy.com.rb

@@ -40,23 +40,23 @@ module Whois
         end
 
 
-        property_supported :created_on do
-          if content_for_scanner =~ /Created on: (.+)\n/
-            Time.parse($1)
-          end
-        end
-
-        property_supported :updated_on do
-          if content_for_scanner =~ /Last Updated on: (.+)\n/
-            Time.parse($1)
-          end
-        end
-
-        property_supported :expires_on do
-          if content_for_scanner =~ /Expires on: (.+)\n/
-            Time.parse($1)
-          end
-        end
+        # property_supported :created_on do
+        #   if content_for_scanner =~ /Created on: (.+)\n/
+        #     Time.parse($1)
+        #   end
+        # end
+        # 
+        # property_supported :updated_on do
+        #   if content_for_scanner =~ /Last Updated on: (.+)\n/
+        #     Time.parse($1)
+        #   end
+        # end
+        # 
+        # property_supported :expires_on do
+        #   if content_for_scanner =~ /Expires on: (.+)\n/
+        #     Time.parse($1)
+        #   end
+        # end
 
 
         property_supported :registrar do

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

@@ -28,10 +28,12 @@ module Whois
       class WhoisJe < Base
 
         property_supported :status do
-          if content_for_scanner =~ /status:(.+?)\n/
+          if content_for_scanner =~ /Status:\s+(.+?)\n/
             case $1.downcase
-              when "0" then :available
-              when "1" then :registered
+              when "active"
+                :registered
+              when "not registered"
+                :available
               else
                 Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end
@@ -49,17 +51,25 @@ module Whois
         end
 
 
-        property_not_supported :created_on
+        property_supported :created_on do
+          if content_for_scanner =~ /Created:\s+(.+?)\n/
+            Time.parse($1)
+          end
+        end
 
-        property_not_supported :updated_on
+        property_supported :updated_on do
+          if content_for_scanner =~ /Modified:\s+(.+?)\n/
+            Time.parse($1)
+          end
+        end
 
         property_not_supported :expires_on
 
 
         property_supported :nameservers do
-          if content_for_scanner =~ /Registered Nameservers\n[-]+\n((.+\n)+)\n/
+          if content_for_scanner =~ /Name Servers:\n((.+\n)+)\n/
             $1.split("\n").map do |name|
-              Record::Nameserver.new(name.chomp("."))
+              Record::Nameserver.new(name.strip)
             end
           end
         end

data/lib/whois/record/parser/whois.na-nic.com.na.rb

@@ -7,77 +7,30 @@
 #++
 
 
-require 'whois/record/parser/base'
+require 'whois/record/parser/base_cocca'
 
 
 module Whois
   class Record
     class Parser
 
-      #
-      # = whois.na-nic.com.na parser
-      #
       # Parser for the whois.na-nic.com.na 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.
-      #
-      class WhoisNaNicComNa < Base
+      class WhoisNaNicComNa < BaseCocca
 
         property_supported :status do
           if content_for_scanner =~ /Status:\s+(.+?)\n/
             case $1.downcase
-              when "active"
-                :registered
-              when "not registered"
-                :available
-              else
-                Whois.bug!(ParserError, "Unknown status `#{$1}'.")
+            when "active"         then :registered
+            when "not registered" then :available
+            when "suspended"      then :inactive
+            else
+              Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end
           else
             Whois.bug!(ParserError, "Unable to parse status.")
           end
         end
 
-        property_supported :available? do
-          status == :available
-        end
-
-        property_supported :registered? do
-          !available?
-        end
-
-
-        property_supported :created_on do
-          if content_for_scanner =~ /Created:\s+(.+?)\n/
-            Time.parse($1)
-          end
-        end
-
-        property_supported :updated_on do
-          if content_for_scanner =~ /Modified:\s+(.+?)\n/
-            Time.parse($1)
-          end
-        end
-
-        property_supported :expires_on do
-          if content_for_scanner =~ /Expires:\s+(.+?)\n/
-            Time.parse($1)
-          end
-        end
-
-
-        property_supported :nameservers do
-          if content_for_scanner =~ /Name Servers:\n((.+\n)+)\n/
-            $1.split("\n").map do |name|
-              Record::Nameserver.new(name.strip)
-            end
-          end
-        end
-
       end
 
     end