geoip 0.8.4 → 0.8.5

data/README.rdoc

@@ -40,25 +40,19 @@ sudo gem install geoip
 
 == LICENSE:
 
-(The MIT License)
-
-Copyright (c) 2009 Clifford Heath
-
-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.
+This version Copyright (C) 2005 Clifford Heath
+Derived from the C version, Copyright (C) 2003 MaxMind LLC
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

data/lib/geoip.rb

@@ -45,7 +45,7 @@ require 'thread'  # Needed for Mutex
 require 'socket'
 
 class GeoIP
-    VERSION = "0.8.4"
+    VERSION = "0.8.5"
     private
     CountryCode = [
         "--","AP","EU","AD","AE","AF","AG","AI","AL","AM","AN",
@@ -633,6 +633,7 @@ class GeoIP
             throw "Invalid GeoIP database type, can't look up City by IP"
         end
         pos = seek_record(ipnum);
+        return nil if pos == @databaseSegments[0]
         read_city(pos, hostname, ip)
     end
 
@@ -660,7 +661,7 @@ class GeoIP
             @file.seek(pos + (2*@record_length-1) * @databaseSegments[0])
             record = @file.read(MAX_ORG_RECORD_LENGTH)
         }
-        record = record.sub(/\000.*/, '')
+        record = record.sub(/\000.*/n, '')
         record
     end
     
@@ -691,7 +692,7 @@ class GeoIP
           @file.seek(pos + (2*@record_length-1) * @databaseSegments[0])
           record = @file.read(MAX_ASN_RECORD_LENGTH)
         }
-        record = record.sub(/\000.*/, '')
+        record = record.sub(/\000.*/n, '')
         
         if record =~ /^(AS\d+)\s(.*)$/
           # AS####, Description 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: geoip
 version: !ruby/object:Gem::Version 
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors: 
 - Clifford Heath
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-04 00:00:00 +10:00
+date: 2009-11-09 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency