geoip 1.2.0 → 1.2.1

data/README.rdoc

@@ -85,9 +85,12 @@ 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.
+modify it under the terms of the GNU Lesser 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 follows the
+license applied by Maxmind to their C library, for example in the
+version here:
+<http://www.maxmind.com/download/geoip/api/c/GeoIP-1.4.2.tar.gz>.
 
 This library is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of

data/Rakefile

@@ -31,7 +31,7 @@ Rake::TestTask.new(:test) do |test|
 end
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "geoip #{GeoIP::VERSION}"

data/geoip.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "geoip"
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Clifford Heath", "Roland Moriz"]
-  s.date = "2012-10-16"
+  s.date = "2012-12-18"
   s.description = "GeoIP searches a GeoIP database for a given host or IP address, and\nreturns information about the country where the IP address is allocated,\nand the city, ISP and other information, if you have that database version."
   s.email = ["clifford.heath@gmail.com", "rmoriz@gmail.com"]
   s.executables = ["geoip"]

data/lib/geoip.rb

@@ -59,7 +59,7 @@ require 'yaml'
 class GeoIP
 
   # The GeoIP GEM version number
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 
   # The +data/+ directory for geoip
   DATA_DIR = File.expand_path(File.join(File.dirname(__FILE__),'..','data','geoip'))
@@ -92,6 +92,7 @@ class GeoIP
   GEOIP_PROXY_EDITION = 8
   GEOIP_ASNUM_EDITION = 9
   GEOIP_NETSPEED_EDITION = 10
+  GEOIP_COUNTRY_EDITION_V6 = 12
   GEOIP_CITY_EDITION_REV1_V6 = 30
 
   COUNTRY_BEGIN = 16776960          #:nodoc:
@@ -182,18 +183,20 @@ class GeoIP
       return city(hostname)
     end
 
-    if (@database_type != GEOIP_COUNTRY_EDITION &&
-        @database_type != GEOIP_PROXY_EDITION &&
-        @database_type != GEOIP_NETSPEED_EDITION)
+    ip = lookup_ip(hostname)
+    if (@database_type == GEOIP_COUNTRY_EDITION ||
+        @database_type == GEOIP_PROXY_EDITION ||
+        @database_type == GEOIP_NETSPEED_EDITION)
+        # Convert numeric IP address to an integer
+        ipnum = iptonum(ip)
+        code = (seek_record(ipnum) - COUNTRY_BEGIN)
+    elsif @database_type == GEOIP_COUNTRY_EDITION_V6
+      ipaddr = IPAddr.new ip
+      code = (seek_record_v6(ipaddr.to_i) - COUNTRY_BEGIN)
+    else
       throw "Invalid GeoIP database type, can't look up Country by IP"
     end
 
-    ip = lookup_ip(hostname)
-
-    ipnum = iptonum(ip)           # Convert numeric IP address to an integer
-
-    code = (seek_record(ipnum) - COUNTRY_BEGIN)
-
     Country.new(
       hostname,                   # Requested hostname
       ip,                         # Ip address as dotted quad
@@ -393,6 +396,7 @@ class GeoIP
 
     if (@database_type == GEOIP_COUNTRY_EDITION ||
         @database_type == GEOIP_PROXY_EDITION ||
+        @database_type == GEOIP_COUNTRY_EDITION_V6 ||
         @database_type == GEOIP_NETSPEED_EDITION)
       @database_segments = [COUNTRY_BEGIN]
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoip
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2012-12-18 00:00:00.000000000 Z
 dependencies: []
 description: ! 'GeoIP searches a GeoIP database for a given host or IP address, and