geoip 0.1.0 → 0.2.0

data/lib/geoip.rb

@@ -189,6 +189,7 @@ class GeoIP
     CANADA_OFFSET = 677
     WORLD_OFFSET = 1353
     FIPS_RANGE = 360
+    FULL_RECORD_LENGTH = 50
 
     STANDARD_RECORD_LENGTH = 3
     SEGMENT_RECORD_LENGTH = 3
@@ -203,13 +204,15 @@ class GeoIP
 	@databaseType = GEOIP_COUNTRY_EDITION
 	@record_length = STANDARD_RECORD_LENGTH
 	@file = File.open(filename, 'rb')
-	@file.seek(-31, IO::SEEK_END)
-	1.upto(STRUCTURE_INFO_MAX_SIZE) {
+	@file.seek(-3, IO::SEEK_END)
+	0.upto(STRUCTURE_INFO_MAX_SIZE-1) { |i|
 	    if @file.read(3) == "\xFF\xFF\xFF"
 		@databaseType = @file.getc
 		@databaseType -= 105 if @databaseType >= 106
 
-		puts "Old database file type #{@databaseType}, untested"
+		if (@databaseType != GEOIP_CITY_EDITION_REV0)
+		    puts "Old database file type #{@databaseType}, untested"
+		end
 
 		if (@databaseType == GEOIP_REGION_EDITION_REV0)
 		    # Region Edition, pre June 2003
@@ -232,9 +235,10 @@ class GeoIP
 			@record_length = 4
 		    end
 		end
+		break
 
 	    else
-		@file.seek(-41, IO::SEEK_CUR)
+		@file.seek(-4, IO::SEEK_CUR)
 	    end
 	}
 	if (@databaseType == GEOIP_COUNTRY_EDITION ||
@@ -257,6 +261,11 @@ class GeoIP
     # * The two-character continent code
     #
     def country(hostname)
+	if (@databaseType == GEOIP_CITY_EDITION_REV0 ||
+	    @databaseType == GEOIP_CITY_EDITION_REV1)
+	    return city(hostname)
+	end
+
 	ip = hostname
 	if ip.kind_of?(String) && ip !~ /^[0-9.]*$/
 	    # Lookup IP address, we were given a name
@@ -280,6 +289,79 @@ class GeoIP
 	    CountryContinent[code] ]	# Continent code.
     end
 
+    # Search the GeoIP database for the specified host, returning city info
+    #
+    # +hostname+ is a String holding the host's DNS name or numeric IP address
+    # Return an array of eleven or thirteen elements:
+    # * All elements from the country query
+    # * The region (state or territory) name
+    # * The city name
+    # * The postal code (zipcode)
+    # * The latitude
+    # * The longitude
+    # * The dma_code and area_code, if available (REV1 City database)
+    def city(hostname)
+	ip = hostname
+	if ip.kind_of?(String) && ip !~ /^[0-9.]*$/
+	    # Lookup IP address, we were given a name
+	    ip = IPSocket.getaddress(hostname)
+	end
+
+	# Convert numeric IP address to an integer
+	ipnum = iptonum(ip)
+	if (@databaseType != GEOIP_CITY_EDITION_REV0 && 
+	    @databaseType != GEOIP_CITY_EDITION_REV1)
+	    throw "Invalid GeoIP database type, can't look up City by IP"
+	end
+	pos = seek_record(ipnum);
+	@file.seek(pos + (2*@record_length-1) * @databaseSegments[0])
+	record = @file.read(FULL_RECORD_LENGTH)
+
+	# The country code is the first byte:
+	code = record[0]
+	record = record[1..-1]
+
+	# Get the region:
+	region = record.sub(/\x00.*/, "")
+	record.sub!(/[^\x00]*\x00/, '')
+
+	# Get the city:
+	city = record.sub(/\x00.*/, "")
+	record.sub!(/[^\x00]*\x00/, '')
+
+	# Get the postal code:
+	postal_code = record.sub(/\x00.*/, "")
+	record.sub!(/[^\x00]*\x00/, '')
+
+	# Get the latitude/longitude:
+	latitude = le_to_ui(record[0,3].unpack("C*"))/10000.0 - 180
+	longitude = le_to_ui(record[3,3].unpack("C*"))/10000.0 - 180
+
+	record = record[6..-1]
+	us_area_codes = []
+	if (@databaseType == GEOIP_CITY_EDITION_REV1 &&
+	    CountryCode[code] == "US")	# UNTESTED
+	    dmaarea_combo = le_to_ui(record[0,3].unpack("C*"))
+	    dma_code = dmaarea_combo/1000;
+	    area_code = dmaarea_combo%1000;
+	    us_area_codes = [ dma_code, area_code ]
+	end
+
+	[   hostname,			# Requested hostname
+	    ip,				# Ip address as dotted quad
+	    CountryCode[code],		# ISO3166-1 code
+	    CountryCode3[code],		# ISO3166-2 code
+	    CountryName[code],		# Country name, per IS03166
+	    CountryContinent[code],	# Continent code.
+	    region,			# Region name
+	    city,			# City name
+	    postal_code,		# Postal code
+	    latitude,
+	    longitude,
+	] + us_area_codes
+
+    end
+
     private
     def iptonum(ip)	# Convert numeric IP address to integer
 	if ip.kind_of?(String) &&

metadata

@@ -3,13 +3,13 @@ rubygems_version: 0.8.4
 specification_version: 1
 name: geoip
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2005-03-11
+  version: 0.2.0
+date: 2005-04-27
 summary: "GeoIP looks up a GeoIP database to provide geographical data for an IP address
   or Internet hostname. The free version of the GeoIP database available from
-  www.maxmind.com only contains country information, and so far that's all that
-  this library supports. The data is much more reliable than using the country
-  codes at the end of the hosts' domain names."
+  www.maxmind.com only contains country information. This library supports that
+  and the GeoIPCity file (both revisions). The data is much more reliable than
+  using the country codes at the end of the hosts' domain names."
 require_paths: 
   - lib
 email: cjh@polyplex.org
@@ -40,5 +40,5 @@ extra_rdoc_files: []
 executables: []
 extensions: []
 requirements: 
-  - The free GeoIP database from www.maxmind.com
+  - The free GeoIP database or a GeoIP city database from www.maxmind.com
 dependencies: []