whois 0.2.1 → 0.3.0

data/CHANGELOG

@@ -1,5 +1,15 @@
 = Whois CHANGELOG
 
+== 0.3.0
+ 
+ * Add possibility construct the Whois Object with a IPAddr object
+ 
+ * Add the host information when you search a whois with an Ipv4. 
+   This information is optionnal. By default it's false.
+   For that the host is resolv, the second arg to Whois.new must be true
+ 
+ * Add request whois whith a host String.
+
 == 0.2.1
 
  * Fix bug in gem where the data/ipv4.yaml is not load

data/EXAMPLES

@@ -1,18 +1,82 @@
 = Whois examples
 
-== Whois request for IP 72.14.207.99
+== Whois request for IP 72.14.207.99, with IP like a string
 
-require 'rubygems'
-require 'whois'
+	require 'rubygems'
+	require 'whois'
 
-w = Whois::Whois.new '72.14.207.99'
-w.search_whois
+	w = Whois::Whois.new '72.14.207.99'
+	w.search_whois
 
-# All return of request
-w.all
+	# All return of request
+	w.all
 
-# The ip return with object IPAddr
-w.ip
+	# The ip return with object IPAddr
+	w.ip
 
-# The server where the request has send
-w.server
+	# The server where the request has send
+	w.server
+
+	# The host of this IPv4
+	w.host
+
+== Whois request for IP 72.14.207.99, with IP like a IPAddr instance
+
+	require 'rubygems'
+	require 'whois'
+	require 'ipaddr'
+
+	ip = IPAddr.new '72.17.207.99'
+	w = Whois::Whois.new ip
+	w.search_whois
+
+	# All return of request
+	w.all
+
+	# The ip return with object IPAddr
+	w.ip
+
+	# The server where the request has send
+	w.server
+
+	# The host of this IPv4
+	w.host
+
+== Whois request for IP 72.14.207.99 with resolv host
+
+	require 'rubygems'
+	require 'whois'
+
+	w = Whois::Whois.new '72.14.221.147', true
+	w.search_whois
+
+	# All return of request
+	w.all
+
+	# The ip return with object IPAddr
+	w.ip
+
+	# The server where the request has send
+	w.server
+
+	# The host of this IPv4
+	w.host #=> fg-in-f147.google.com
+
+== Whois request for a Host
+
+	require 'rubygems'
+	require 'whois'
+	
+	w = Whois::Whois.new 'fg-in-f147.google.com'
+	
+	# All return of request
+	w.all
+
+	# The ip return with object IPAddr
+	w.ip
+
+	# The server where the request has send
+	w.server
+
+	# The host of this host
+	w.host #=> fg-in-f147.google.com

data/NOTES

@@ -1,5 +1,14 @@
 = Whois Release Notes
 
+== 0.3.0
+
+Now you can create a Whois class with an object IPAddr (require 'ipaddr')
+
+You can obtains the host name for your IP when you made a request Ipv4. This 
+resolv must be made if you put a true in second arguments for the initialize
+
+You can too made a request Whois with a host, now
+
 == 0.2.1
 
 Release for fix bugs

data/README

@@ -18,6 +18,9 @@ If you are just starting, check out the EXAMPLES[link://files/EXAMPLES.html] fil
 
 Copyright (c) 2007 by Cyril Mougel (cyril.mougel@gmail.com)
 
+If you want more information on me see my blog (http://shingara.free.fr/blog), 
+it's in french, because my english is not really good :)
+
 == License
 
 This library is distributed under the GPL.  Please see the LICENSE file.

data/lib/whois.rb

@@ -6,28 +6,70 @@ require 'ipaddr'
 require 'yaml'
 require 'server/server'
 
+# Module for manage all Whois Class
 module Whois
 
+	# Base exception of Whois
     class WhoisException < Exception
     end
 
-    # Class to get all information about Host or IP with the Whois
+	# Exception of Whois who made report a bug
+	class WhoisExceptionError < WhoisException
+		def initialize (i)
+			WhoisException.initialize('Report a bug with error #{i} to http://rubyforge.org/projects/whois/')
+		end
+	end
+
+    # Class to get all information about Host or IP with the Whois request
     class Whois
 
+		Version = '0.3.0'
+
         attr_reader :all
         attr_reader :server
         attr_reader :ip
-
-        # Initialize with a request. The request must be an IPv4
-        def initialize(request)
-            if /^\d+\.\d+\.\d+\.\d+$/ =~ request
+		attr_reader :host
+		attr_accessor :host_search
+
+        # Initialize with a request. The request must be an IPv4, or a host string
+		#
+		# The first params now is :
+		#  * a string which a Ipv4 or a host. Ipv6 not implement now
+		#  * A IPAddr instance only Ipv4 work now, no Ipv6
+		#
+		# A second param, host_search is optionnal. By default he is false.
+	   	# If this value is true, a resolv host is made for know the host to this IPv4
+		def initialize(request, host_search=false)
+			@host_search = host_search
+			if request.instance_of? IPAddr
+				if request.ipv4?
+					@ip = request
+					@server = server_ipv4
+				elsif request.ipv6?
+					raise WhoisException.new('not implement now, only Ipv4')
+				else
+					raise WhoisExceptionError.new(1)
+				end
+            elsif Resolv::IPv4::Regex =~ request
                 ipv4_init request
                 unless self.server
                     raise WhoisException.new("no server found for this IPv4 : #{request}")
                 end
-            else
-                raise WhoisException.new('not implement now, only Ipv4')
+            elsif Resolv::IPv6::Regex =~ request
+				raise WhoisException.new('Ipv6 not implement now')
+			else
+				# Test if the request is an host or not
+				begin
+					ip = Resolv.getaddress request
+					@ip = IPAddr.new ip
+					@server = server_ipv4
+					@host = request
+				rescue Resolv::ResolvError
+					raise WhoisException.new('host #{request} has no DNS result')
+				end
             end
+			
+			search_host self.ip.to_s
         end
         
         # Ask of whois server
@@ -40,7 +82,21 @@ module Whois
             @all = ret
         end
 
-    private
+
+		# Search the host for this IPv4, if the value host_search is true, else host = nil
+		def search_host
+			begin
+				if @host_search
+					@host = Resolv.getname self.ip.to_s
+				else
+					@host = nil
+				end
+			rescue Resolv::ResolvError
+				@host = nil
+			end
+		end
+    
+	private
     
         # Init value for a ipv4 request
         def ipv4_init (ip)
@@ -50,7 +106,8 @@ module Whois
         
         # Define the server of Whois in IPV4 list of YAML
         def server_ipv4
-            ipv4_list = YAML::load_file(File.dirname(__FILE__) + '/data/ipv4.yaml')
+			
+			ipv4_list = YAML::load_file(File.dirname(__FILE__) + '/data/ipv4.yaml')
             # Search good Server class for this IP
             ipv4_list.each do |ip, server|
                 ip_range = IPAddr.new ip
@@ -100,6 +157,10 @@ if $0 == __FILE__
     w = Whois::Whois.new '200.14.221.147'
     puts w.search_whois
 
+	a = IPAddr.new '200.14.221.147'
+    w = Whois::Whois.new(a)
+    puts w.search_whois
+
 # ip = Resolv.getname '72.14.221.147'
 # puts ip
 # 
@@ -111,5 +172,16 @@ if $0 == __FILE__
 # 
     w = Whois::Whois.new 'fg-in-f147.google.com'
     puts w.search_whois
+
+	w = Whois::Whois.new '72.14.221.147', true
+    puts w.search_whois
+	puts w.host
+
+	puts '#################################'
+
+	w = Whois::Whois.new '72.14.221.147'
+    puts w.search_whois
+	puts w.host
+	
 # puts w.all
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: whois
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
-date: 2007-03-21 00:00:00 +01:00
+  version: 0.3.0
+date: 2007-03-22 00:00:00 +01:00
 summary: Whois provides a library for request whois server
 require_paths: 
 - lib