RubyGems - whois - Versions diffs - 2.2.0 → 2.3.0 - Mend

whois 2.2.0 → 2.3.0

Files changed (1036) hide show

data/.rspec CHANGED

	@@ -1 +1,2 @@
1	+ --format Fuubar
1 2	--colour

data/LICENSE CHANGED

@@ -1,6 +1,6 @@
 The MIT License
-Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
+Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile CHANGED

@@ -33,16 +33,11 @@ spec = Gem::Specification.new do |s|
   s.files             = %w( Rakefile LICENSE .gemtest .rspec .yardopts ) +
                         Dir.glob("*.{rdoc,gemspec}") +
                         Dir.glob("{bin,lib,spec}/**/*")
-  s.executables       = ["ruby-whois"]
-  s.require_paths     = ["lib"]
+  s.executables       = %w( ruby-whois )
+  s.require_paths     = %w( lib )
-  # If you want to depend on other gems, add them here, along with any
-  # relevant versions
-  # s.add_dependency("some_other_gem", "~> 0.1.0")
-  # If your tests use any gems, include them here
   s.add_development_dependency "rake",  "~> 0.9"
-  s.add_development_dependency "rspec", "~> 2.7.0"
+  s.add_development_dependency "rspec", "~> 2.8.0"
   s.add_development_dependency "mocha"
   s.add_development_dependency "yard"
 end
@@ -63,11 +58,13 @@ end
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new
+RSpec::Core::RakeTask.new do |t|
+  t.verbose = !!ENV["VERBOSE"]
+end
 namespace :multitest do
-  RUBIES = %w( ruby-1.8.7-p334 ruby-1.9.2-p180 jruby-1.6.0.RC2 ree-1.8.7-2011.03 )
+  RUBIES = %w( ruby-1.8.7 ruby-1.9.2 jruby ree )
   desc "Run tests for all rubies"
   task :all => :ensure_rvm do

data/lib/core_ext/date_time/conversions.rb CHANGED

@@ -9,6 +9,6 @@ class DateTime
   # 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.
   def to_time
     self.offset == 0 ? ::Time.utc(year, month, day, hour, min, sec, sec_fraction * (RUBY_VERSION < '1.9' ? 86400000000 : 1000000)) : self
-  end
+  end unless method_defined?(:to_time)
 end

data/lib/whois.rb CHANGED

@@ -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>
 #++

data/lib/whois/client.rb CHANGED

@@ -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>
 #++

data/lib/whois/definitions/tlds.rb CHANGED

@@ -125,6 +125,18 @@ Whois::Server.define :tld, ".fj", "whois.usp.ac.fj"
 Whois::Server.define :tld, ".fk", nil, { :adapter => Whois::Server::Adapters::None }
 Whois::Server.define :tld, ".fm", nil, { :web => "http://www.dot.fm/whois.html", :adapter => Whois::Server::Adapters::Web }
 Whois::Server.define :tld, ".fo", "whois.ripe.net"
+# keep before .fr
+Whois::Server.define :tld, ".aeroport.fr", "whois.smallregistry.net"
+Whois::Server.define :tld, ".avocat.fr", "whois.smallregistry.net"
+Whois::Server.define :tld, ".chambagri.fr", "whois.smallregistry.net"
+Whois::Server.define :tld, ".chirurgiens-dentistes.fr", "whois.smallregistry.net"
+Whois::Server.define :tld, ".experts-comptables.fr", "whois.smallregistry.net"
+Whois::Server.define :tld, ".geometre-expert.fr", "whois.smallregistry.net"
+Whois::Server.define :tld, ".medecin.fr", "whois.smallregistry.net"
+Whois::Server.define :tld, ".notaires.fr", "whois.smallregistry.net"
+Whois::Server.define :tld, ".pharmacien.fr", "whois.smallregistry.net"
+Whois::Server.define :tld, ".port.fr", "whois.smallregistry.net"
+Whois::Server.define :tld, ".veterinaire.fr", "whois.smallregistry.net"
 Whois::Server.define :tld, ".fr", "whois.nic.fr"
 Whois::Server.define :tld, ".ga", nil, { :adapter => Whois::Server::Adapters::None }
 Whois::Server.define :tld, ".gb", nil, { :adapter => Whois::Server::Adapters::None }
@@ -300,7 +312,7 @@ Whois::Server.define :tld, ".us", "whois.nic.us"
 Whois::Server.define :tld, ".com.uy", nil, { :web => "https://nic.anteldata.com.uy/dns/", :adapter => Whois::Server::Adapters::Web }
 Whois::Server.define :tld, ".uy", "whois.nic.org.uy"
 Whois::Server.define :tld, ".uz", "whois.cctld.uz"
-Whois::Server.define :tld, ".va", "whois.ripe.net"
+Whois::Server.define :tld, ".va", nil, { :adapter => Whois::Server::Adapters::None }
 Whois::Server.define :tld, ".vc", "whois.afilias-grs.info", { :adapter => Whois::Server::Adapters::Afilias }
 Whois::Server.define :tld, ".ve", "whois.nic.ve"
 Whois::Server.define :tld, ".vg", "whois.adamsnames.tc"

data/lib/whois/errors.rb CHANGED

@@ -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>
 #++

data/lib/whois/record.rb CHANGED

@@ -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>
 #++

data/lib/whois/record/contact.rb CHANGED

@@ -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>
 #++

data/lib/whois/record/nameserver.rb CHANGED

@@ -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>
 #++

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

@@ -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>
 #++

data/lib/whois/record/parser/base.rb CHANGED

@@ -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>
 #++
@@ -42,7 +42,7 @@ module Whois
         #   # => nil
         #
         # @example Defined property
-        #   property_register(:discaimer, :supported) {}
+        #   property_register(:disclaimer, :supported) {}
         #   property_status(:disclaimer)
         #   # => :supported
         #
@@ -62,7 +62,7 @@ module Whois
         #   # => false
         #
         # @example Registered property
-        #   property_register(:discaimer) {}
+        #   property_register(:disclaimer) {}
         #   property_registered?(:disclaimer)
         #   # => true
         #

data/lib/whois/record/parser/base_afilias.rb CHANGED

@@ -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>
 #++
@@ -80,23 +80,23 @@ module Whois
                 Whois.bug!(ParserError, "Unknown registrar format `#{value}'")
             Record::Registrar.new(
-              :id =>            parts[0],
-              :name =>          parts[1],
-              :organization =>  parts[1]
+                :id =>            parts[0],
+                :name =>          parts[1],
+                :organization =>  parts[1]
             )
           end
         end
         property_supported :registrant_contacts do
-          contact("Registrant", Whois::Record::Contact::TYPE_REGISTRANT)
+          build_contact("Registrant", Whois::Record::Contact::TYPE_REGISTRANT)
         end
         property_supported :admin_contacts do
-          contact("Admin", Whois::Record::Contact::TYPE_ADMIN)
+          build_contact("Admin", Whois::Record::Contact::TYPE_ADMIN)
         end
         property_supported :technical_contacts do
-          contact("Tech", Whois::Record::Contact::TYPE_TECHNICAL)
+          build_contact("Tech", Whois::Record::Contact::TYPE_TECHNICAL)
         end
@@ -117,16 +117,16 @@ module Whois
         end
-        private
+      private
-          def contact(element, type)
-            node("#{element} ID") do
-              address = (1..3).
-                  map { |i| node("#{element} Street#{i}") }.
-                  delete_if { |i| i.nil? || i.empty? }.
-                  join("\n")
+        def build_contact(element, type)
+          node("#{element} ID") do
+            address = (1..3).
+                map { |i| node("#{element} Street#{i}") }.
+                delete_if { |i| i.nil? || i.empty? }.
+                join("\n")
-              Record::Contact.new(
+            Record::Contact.new(
                 :type         => type,
                 :id           => node("#{element} ID"),
                 :name         => node("#{element} Name"),
@@ -139,15 +139,15 @@ module Whois
                 :phone        => node("#{element} Phone"),
                 :fax          => node("#{element} FAX"),
                 :email        => node("#{element} Email")
-              )
-            end
+            )
           end
-          def decompose_registrar(value)
-            if value =~ /(.+?) \((.+?)\)/
-              [$2, $1]
-            end
+        end
+        def decompose_registrar(value)
+          if value =~ /(.+?) \((.+?)\)/
+            [$2, $1]
           end
+        end
       end

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

@@ -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>
 #++

data/lib/whois/record/parser/blank.rb CHANGED

@@ -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>
 #++

data/lib/whois/record/parser/example.rb CHANGED

@@ -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>
 #++

data/lib/whois/record/parser/jobswhois.verisign-grs.com.rb CHANGED

@@ -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,11 +15,7 @@ module Whois
   class Record
     class Parser
-      #
-      # = jobswhois.verisign-grs.com parser
-      #
       # Parser for the jobswhois.verisign-grs.com server.
-      #
       class JobswhoisVerisignGrsCom < Base
         include Scanners::Ast

data/lib/whois/record/parser/kero.yachay.pe.rb CHANGED

@@ -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>
 #++

data/lib/whois/record/parser/saudinic.net.sa.rb CHANGED

@@ -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>
 #++

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

@@ -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,39 +15,41 @@ module Whois
     class Parser
       module Scanners
-        class Afilias < Scanners::Base
+        # Scanner for the Afilias record.
+        class Afilias < Base
-          def parse_content
-            parse_available   ||
-            parse_reserved    ||  # .XXX
-            parse_throttled   ||  # .ORG
-            parse_disclaimer  ||
-            parse_keyvalue    ||
+          self.tokenizers += [
+              :skip_empty_line,
+              :scan_available,
+              :scan_reserved,
+              :scan_throttled,
+              :scan_disclaimer,
+              :scan_keyvalue,
+          ]
-            trim_empty_line   ||
-            error!("Unexpected token")
-          end
-          def parse_available
+          tokenizer :scan_available do
             if @input.scan(/^NOT FOUND\n/)
               @ast["status:available"] = true
             end
           end
-          def parse_reserved
+          # .XXX
+          tokenizer :scan_reserved do
             if @input.scan(/^Reserved by ICM Registry\n/)
               @ast["status:reserved"] = true
             end
           end
-          def parse_throttled
+          # .ORG
+          tokenizer :scan_throttled do
             if @input.match?(/^WHOIS LIMIT EXCEEDED/)
               @ast["response:throttled"] = true
               @input.skip(/^.+\n/)
             end
           end
-          def parse_disclaimer
+          tokenizer :scan_disclaimer do
             if @input.pos == 0 && @input.match?(/^(.+\n){3,}\n/)
               lines = []
               while @input.scan(/^(.+)\n/)
@@ -56,19 +58,6 @@ module Whois
               @ast["property:disclaimer"] = lines.join(" ")
             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
         end
       end

data/lib/whois/record/parser/scanners/ast.rb CHANGED

@@ -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>
 #++
@@ -41,10 +41,6 @@ module Whois
         #
         module Ast
-          def ast
-            @ast ||= parse
-          end
           def node(key)
             if block_given?
               value = ast[key]
@@ -59,6 +55,12 @@ module Whois
             !ast[key].nil?
           end
+        private
+          def ast
+            @ast ||= parse
+          end
         end
       end