geoip 1.2.0 → 1.2.2

data/README.rdoc

@@ -85,15 +85,19 @@ 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
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
+Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public
+You should have received a copy of the GNU Lesser 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
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+

data/Rakefile

@@ -9,7 +9,7 @@ Jeweler::Tasks.new do |gem|
   gem.name = "geoip"
   gem.version = GeoIP::VERSION
   gem.homepage = "http://github.com/cjheath/geoip"
-  gem.license = "GPL"
+  gem.license = "LGPL"
   gem.summary = %Q{GeoIP searches a GeoIP database for a given host or IP address, and returns information about the country where the IP address is allocated, and the city, ISP and other information, if you have that database version.}
   gem.description = %Q{GeoIP searches a GeoIP database for a given host or IP address, and
 returns information about the country where the IP address is allocated,
@@ -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.2"
 
   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 = "2013-08-05"
   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"]
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
     "website/template.rhtml"
   ]
   s.homepage = "http://github.com/cjheath/geoip"
-  s.licenses = ["GPL"]
+  s.licenses = ["LGPL"]
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.24"
   s.summary = "GeoIP searches a GeoIP database for a given host or IP address, and returns information about the country where the IP address is allocated, and the city, ISP and other information, if you have that database version."

data/lib/geoip.rb

@@ -8,19 +8,18 @@
 # 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
+# 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 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.
+# Lesser General Public License for more details.
 #
-# You should have received a copy of the GNU General Public
+# You should have received a copy of the GNU Lesser 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
-#
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 # = SYNOPSIS
 #
 #   require 'geoip'
@@ -59,7 +58,7 @@ require 'yaml'
 class GeoIP
 
   # The GeoIP GEM version number
-  VERSION = "1.2.0"
+  VERSION = "1.2.2"
 
   # The +data/+ directory for geoip
   DATA_DIR = File.expand_path(File.join(File.dirname(__FILE__),'..','data','geoip'))
@@ -92,6 +91,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:
@@ -136,6 +136,9 @@ class GeoIP
   # The Edition number that identifies which kind of database you've opened
   attr_reader :database_type
 
+  # An IP that is used instead of local IPs
+  attr_accessor :local_ip_alias
+
   alias databaseType database_type
 
   # Open the GeoIP database and determine the file format version.
@@ -182,18 +185,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 +398,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
@@ -439,7 +445,7 @@ class GeoIP
 
     # Get the postal code:
     postal_code = spl[2]
-    @iter_pos += (postal_code.size + 1) unless @iter_pos.nil?
+    @iter_pos += (postal_code.size + 1) unless @iter_pos.nil? || postal_code.nil?
 
     record = spl[3]
 
@@ -496,6 +502,10 @@ class GeoIP
   end
 
   def lookup_ip(ip_or_hostname) # :nodoc:
+    if is_local?(ip_or_hostname) && @local_ip_alias
+      ip_or_hostname = @local_ip_alias
+    end
+
     if !ip_or_hostname.kind_of?(String) or ip_or_hostname =~ /^[0-9.]+$/
       return ip_or_hostname
     end
@@ -506,6 +516,10 @@ class GeoIP
     ip
   end
 
+  def is_local?(ip_or_hostname) #:nodoc:
+    ["127.0.0.1", "localhost", "::1", "0000::1", "0:0:0:0:0:0:0:1"].include? ip_or_hostname
+  end
+
   # Convert numeric IP address to Integer.
   def iptonum(ip) #:nodoc:
     if (ip.kind_of?(String) &&

data/script/txt2html

@@ -2,9 +2,8 @@
 
 require 'rubygems'
 require 'redcloth'
-require 'syntax/convertors/html'
 require 'erb'
-require File.dirname(__FILE__) + '/../lib/geoip.rb'
+require './' + File.dirname(__FILE__) + '/../lib/geoip.rb'
 
 version  = GeoIP::VERSION
 download = 'http://rubyforge.org/projects/geoip'
@@ -15,9 +14,9 @@ class Fixnum
     return 'th' if (10..19).include?(self % 100)
     # others
     case self % 10
-    when 1: return 'st'
-    when 2: return 'nd'
-    when 3: return 'rd'
+    when 1; return 'st'
+    when 2; return 'nd'
+    when 3; return 'rd'
     else    return 'th'
     end
   end

data/website/index.txt

@@ -65,15 +65,15 @@ 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
+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 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.
+Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public
+You should have received a copy of the GNU Lesser 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
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoip
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies: []
 description: ! 'GeoIP searches a GeoIP database for a given host or IP address, and
 
@@ -49,7 +49,7 @@ files:
 - website/template.rhtml
 homepage: http://github.com/cjheath/geoip
 licenses:
-- GPL
+- LGPL
 post_install_message: 
 rdoc_options: []
 require_paths: