geoip 0.7.0 → 0.8.0

data/History.txt

@@ -1,8 +1,12 @@
-== 0.5.0 2007-10-24
+== 0.8.0 2008-08-29
 
-* 1 major enhancement:
-  * Initial release
+* Added Mutex protection around file I/O for thread safety
 
 == 0.7.0 2008-05-03
 
 * Added Hez Ronningen's patch for using the ISP lookup data file
+
+== 0.5.0 2007-10-24
+
+* 1 major enhancement:
+  * Initial release

data/README.txt

@@ -1,5 +1,25 @@
+= GeoIP
+
+http://geoip.rubyforge.org/
+
+== DESCRIPTION:
+
 GeoIP searches a GeoIP database for a given host or IP address, and
-returns information about the country where the IP address is allocated.
+returns information about the country where the IP address is allocated,
+and the city, ISP and other information, if you have that database version.
+
+== FEATURES/PROBLEMS:
+
+This release applies a Mutex around file I/O operations, which should
+prevent GeoIP blowing up under multi-threaded usage.
+
+== SYNOPSIS:
+
+require 'geoip'
+GeoIP.new('GeoIP.dat').country("www.netscape.sk")
+=> ["www.netscape.sk", "217.67.16.35", 196, "SK", "SVK", "Slovakia", "EU"]
+
+== REQUIREMENTS:
 
 You need at least the free GeoIP.dat, for which the last known download
 location is <http://www.maxmind.com/download/geoip/database/GeoIP.dat.gz>,
@@ -10,3 +30,33 @@ of this database are available for purchase which contain more detailed
 information, but this information is not returned by this implementation.
 See www.maxmind.com for more information.
 
+== INSTALL:
+
+sudo gem install geoip
+
+== LICENSE:
+
+(The MIT License)
+
+Copyright (c) 2008 FIX
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+==

data/lib/geoip.rb

@@ -41,6 +41,7 @@ $:.unshift File.dirname(__FILE__)
 # See www.maxmind.com for more information.
 #
 #=end
+require 'thread'  # Needed for Mutex
 
 require 'socket'
 
@@ -421,11 +422,13 @@ class GeoIP
 
     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
     # +options+ is an integer holding caching flags (unimplemented)
     def initialize(filename, flags = 0)
+        @mutex = Mutex.new
         @flags = flags
         @databaseType = GEOIP_COUNTRY_EDITION
         @record_length = STANDARD_RECORD_LENGTH
@@ -525,8 +528,11 @@ class GeoIP
     private
 
     def read_city(pos, hostname = '', ip = '')
-        @file.seek(pos + (2*@record_length-1) * @databaseSegments[0])
-        return nil if((record = @file.read(FULL_RECORD_LENGTH)).nil?)
+        record = ""
+        @mutex.synchronize {
+            @file.seek(pos + (2*@record_length-1) * @databaseSegments[0])
+            return nil unless record = @file.read(FULL_RECORD_LENGTH)
+        }
 
         # The country code is the first byte:
         code = record[0]
@@ -632,22 +638,25 @@ class GeoIP
     # Return the ISP name
     #
     def isp(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_ISP_EDITION then
-          throw "Invalid GeoIP database type, can't look up Organization/ISP by IP"
-      end
-      pos = seek_record(ipnum);
-      @file.seek(pos + (2*@record_length-1) * @databaseSegments[0])
-      record = @file.read(MAX_ORG_RECORD_LENGTH)
-      record = record.sub(/\000.*/, '')
-      record
+        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_ISP_EDITION
+            throw "Invalid GeoIP database type, can't look up Organization/ISP by IP"
+        end
+        pos = seek_record(ipnum);
+        record = ""
+        @mutex.synchronize {
+            @file.seek(pos + (2*@record_length-1) * @databaseSegments[0])
+            record = @file.read(MAX_ORG_RECORD_LENGTH)
+        }
+        record = record.sub(/\000.*/, '')
+        record
     end
 
     # Search a ISP GeoIP database for the specified host, returning the organization
@@ -689,8 +698,10 @@ class GeoIP
         offset = 0
         mask = 0x80000000
         31.downto(0) { |depth|
-            @file.seek(@record_length * 2 * offset);
-            buf = @file.read(@record_length * 2);
+            buf = @mutex.synchronize {
+                @file.seek(@record_length * 2 * offset);
+                @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])

data/lib/geoip/version.rb

@@ -1,7 +1,7 @@
 module Geoip #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 7
+    MINOR = 8
     TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>geoip</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/geoip"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/geoip" class="numbers">0.7.0</a>
+      <a href="http://rubyforge.org/projects/geoip" class="numbers">0.8.0</a>
     </div>
     <h2>&#x2192; &#8216;Geographic info for an IP address&#8217;</h2>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: geoip
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Clifford Heath
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-03 00:00:00 +10:00
+date: 2008-08-29 00:00:00 +10:00
 default_executable: 
 dependencies: []
 
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: geoip
-rubygems_version: 1.1.0
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: description of gem