geoip 0.2.0 → 0.3.0

data/lib/geoip.rb

@@ -164,8 +164,7 @@ class GeoIP
 	"AS","AS","OC","AS","AF","OC","AS","AS","SA","OC","AS","AF","EU","AF",
 	"OC","NA","SA","AS","EU","SA","SA","SA","SA","AS","OC","OC","OC","AS",
 	"AF","EU","AF","AF","AF","AF"]
-
-    private
+    public
     # Edition enumeration:
     (GEOIP_COUNTRY_EDITION,
     GEOIP_CITY_EDITION_REV1,
@@ -178,6 +177,7 @@ class GeoIP
     GEOIP_ASNUM_EDITION,
     GEOIP_NETSPEED_EDITION,
     ) = *1..10
+    private
 
     COUNTRY_BEGIN = 16776960
     STATE_BEGIN_REV0 = 16700000
@@ -195,6 +195,7 @@ class GeoIP
     SEGMENT_RECORD_LENGTH = 3
 
     public
+    attr_reader :databaseType
     # Open the GeoIP database and determine the file format version
     #
     # +filename+ is a String holding the path to the GeoIP.dat file
@@ -300,51 +301,57 @@ class GeoIP
     # * 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
+private
 
-	# 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);
+    def read_city(pos, hostname = '', ip = '')
 	@file.seek(pos + (2*@record_length-1) * @databaseSegments[0])
-	record = @file.read(FULL_RECORD_LENGTH)
+        return nil if((record = @file.read(FULL_RECORD_LENGTH)).nil?)
 
 	# The country code is the first byte:
 	code = record[0]
 	record = record[1..-1]
+        @iter_pos += 1 unless @iter_pos.nil?
 
+        spl = record.split("\x00", 4)
 	# Get the region:
-	region = record.sub(/\x00.*/, "")
-	record.sub!(/[^\x00]*\x00/, '')
+        region = spl[0]
+        @iter_pos += (region.size + 1) unless @iter_pos.nil?
 
 	# Get the city:
-	city = record.sub(/\x00.*/, "")
-	record.sub!(/[^\x00]*\x00/, '')
+        city = spl[1]
+        @iter_pos += (city.size + 1) unless @iter_pos.nil?
 
 	# Get the postal code:
-	postal_code = record.sub(/\x00.*/, "")
-	record.sub!(/[^\x00]*\x00/, '')
+        postal_code = spl[2]
+        @iter_pos += (postal_code.size + 1) unless @iter_pos.nil?
 
+        record = spl[3]
 	# 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
+        if(record && record[0,3]) then
+            latitude  = le_to_ui(record[0,3].unpack('C*')) / 10000.0 - 180
+            record = record[3..-1]
+            @iter_pos += 3 unless @iter_pos.nil?
+        else
+            latitude = ''
+        end
+        if(record && record[0,3]) then
+            longitude = le_to_ui(record[0,3].unpack('C*')) / 10000.0 - 180
+            record = record[3..-1]
+            @iter_pos += 3 unless @iter_pos.nil?
+        else
+            longitude = ''
+        end
 
-	record = record[6..-1]
 	us_area_codes = []
+        if(record && record[0,3]) then
 	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;
+                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 ]
+                @iter_pos += 3 unless @iter_pos.nil?
+            end
 	end
 
 	[   hostname,			# Requested hostname
@@ -359,7 +366,39 @@ class GeoIP
 	    latitude,
 	    longitude,
 	] + us_area_codes
+    end
+public
+    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);
+        read_city(pos, hostname, ip)
+    end
 
+    def each
+        if (@databaseType != GEOIP_CITY_EDITION_REV0 &&
+            @databaseType != GEOIP_CITY_EDITION_REV1)
+            throw "Invalid GeoIP database type, can't iterate thru non-City database"
+        end
+
+        @iter_pos = @databaseSegments[0] + 1
+        num = 0
+        until((rec = read_city(@iter_pos)).nil?)
+            yield(rec)
+            print "#{num}: #{@iter_pos}\n" if((num += 1) % 1000 == 0)
+        end
+        @iter_pos = nil
+        self
     end
 
     private
@@ -375,21 +414,21 @@ class GeoIP
 	# Binary search in the file.
 	# Records are pairs of little-endian integers, each of @record_length.
 	offset = 0
-	mask = 2147483648
+        mask = 0x80000000
 	31.downto(0) { |depth|
 	    @file.seek(@record_length * 2 * offset);
-	    buf = @file.read(@record_length*2);
+            buf = @file.read(@record_length * 2);
 	    buf.slice!(0...@record_length) if ((ipnum & mask) != 0)
 	    offset = le_to_ui(buf[0...@record_length].unpack("C*"))
 	    return offset if (offset >= @databaseSegments[0])
-	    mask = mask/2
+            mask >>= 1
 	}
     end
 
     # Convert a big-endian array of numeric bytes to unsigned int
     def be_to_ui(s)
 	s.inject(0) { |m, o|
-	    (m<<8)+o.to_i
+            (m << 8) + o.to_i
 	}
     end
 
@@ -402,7 +441,8 @@ end
 if $0 == __FILE__
     g = GeoIP.new('/usr/share/GeoIP/GeoIP.dat');
 
+    req = ([GeoIP::GEOIP_CITY_EDITION_REV1, GeoIP::GEOIP_CITY_EDITION_REV0].include?(g.databaseType)) ? :city : :country
     ARGV.each { |a|
-	p g.country(a)
+        p g.send(req, a)
     }
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.4
+rubygems_version: 0.8.10
 specification_version: 1
 name: geoip
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2005-04-27
+  version: 0.3.0
+date: 2006-09-25
 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. This library supports that