geoip 0.4.0 → 0.6.0

data/History.txt

@@ -0,0 +1,4 @@
+== 0.5.0 2007-10-24
+
+* 1 major enhancement:
+  * Initial release

data/License.txt

@@ -0,0 +1,16 @@
+This version Copyright (C) 2005-2007 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/Manifest.txt

@@ -0,0 +1,24 @@
+History.txt
+License.txt
+Manifest.txt
+README.txt
+Rakefile
+config/hoe.rb
+config/requirements.rb
+lib/geoip.rb
+lib/geoip/version.rb
+log/debug.log
+script/destroy
+script/generate
+script/txt2html
+setup.rb
+tasks/deployment.rake
+tasks/environment.rake
+tasks/website.rake
+test/test_geoip.rb
+test/test_helper.rb
+website/index.html
+website/index.txt
+website/javascripts/rounded_corners_lite.inc.js
+website/stylesheets/screen.css
+website/template.rhtml

data/README.txt

@@ -0,0 +1,10 @@
+GeoIP searches a GeoIP database for a given host or IP address, and
+returns information about the country where the IP address is allocated.
+
+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>
+This API requires the file to be decompressed for searching. Other versions
+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.
+

data/Rakefile

@@ -0,0 +1,4 @@
+require 'config/requirements'
+require 'config/hoe' # setup Hoe + all gem configuration
+
+Dir['tasks/**/*.rake'].each { |rake| load rake }

data/config/hoe.rb

@@ -0,0 +1,71 @@
+require 'geoip/version'
+
+AUTHOR = 'Clifford Heath'  # can also be an array of Authors
+EMAIL = "cjheath@rubyforge.org"
+DESCRIPTION = "description of gem"
+GEM_NAME = 'geoip' # what ppl will type to install your gem
+RUBYFORGE_PROJECT = 'geoip' # The unix name for your project
+HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
+DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
+
+@config_file = "~/.rubyforge/user-config.yml"
+@config = nil
+RUBYFORGE_USERNAME = "unknown"
+def rubyforge_username
+  unless @config
+    begin
+      @config = YAML.load(File.read(File.expand_path(@config_file)))
+    rescue
+      puts <<-EOS
+ERROR: No rubyforge config file found: #{@config_file}
+Run 'rubyforge setup' to prepare your env for access to Rubyforge
+ - See http://newgem.rubyforge.org/rubyforge.html for more details
+      EOS
+      exit
+    end
+  end
+  RUBYFORGE_USERNAME.replace @config["username"]
+end
+
+
+REV = nil 
+# UNCOMMENT IF REQUIRED: 
+# REV = `svn info`.each {|line| if line =~ /^Revision:/ then k,v = line.split(': '); break v.chomp; else next; end} rescue nil
+VERS = Geoip::VERSION::STRING + (REV ? ".#{REV}" : "")
+RDOC_OPTS = ['--quiet', '--title', 'geoip documentation',
+    "--opname", "index.html",
+    "--line-numbers", 
+    "--main", "README",
+    "--inline-source"]
+
+class Hoe
+  def extra_deps 
+    @extra_deps.reject! { |x| Array(x).first == 'hoe' } 
+    @extra_deps
+  end 
+end
+
+# Generate all the Rake tasks
+# Run 'rake -T' to see list of generated tasks (from gem root directory)
+hoe = Hoe.new(GEM_NAME, VERS) do |p|
+  p.author = AUTHOR 
+  p.description = DESCRIPTION
+  p.email = EMAIL
+  p.summary = DESCRIPTION
+  p.url = HOMEPATH
+  p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
+  p.test_globs = ["test/**/test_*.rb"]
+  p.clean_globs |= ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']  #An array of file patterns to delete on clean.
+  
+  # == Optional
+  p.changes = p.paragraphs_of("History.txt", 0..1).join("\\n\\n")
+  #p.extra_deps = []     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
+  
+  #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
+  
+end
+
+CHANGES = hoe.paragraphs_of('History.txt', 0..1).join("\\n\\n")
+PATH    = (RUBYFORGE_PROJECT == GEM_NAME) ? RUBYFORGE_PROJECT : "#{RUBYFORGE_PROJECT}/#{GEM_NAME}"
+hoe.remote_rdoc_dir = File.join(PATH.gsub(/^#{RUBYFORGE_PROJECT}\/?/,''), 'rdoc')
+hoe.rsync_args = '-av --delete --ignore-errors'

data/config/requirements.rb

@@ -0,0 +1,17 @@
+require 'fileutils'
+include FileUtils
+
+require 'rubygems'
+%w[rake hoe newgem rubigen].each do |req_gem|
+  begin
+    require req_gem
+  rescue LoadError
+    puts "This Rakefile requires the '#{req_gem}' RubyGem."
+    puts "Installation: gem install #{req_gem} -y"
+    exit
+  end
+end
+
+$:.unshift(File.join(File.dirname(__FILE__), %w[.. lib]))
+
+require 'geoip'

data/lib/geoip.rb

@@ -1,3 +1,4 @@
+$:.unshift File.dirname(__FILE__)
 #
 # Native Ruby reader for the GeoIP database
 # Lookup the country where IP address is allocated
@@ -46,24 +47,33 @@ require 'socket'
 class GeoIP
     private
     CountryCode = [
-	"--","AP","EU","AD","AE","AF","AG","AI","AL","AM","AN","AO","AQ","AR",
-	"AS","AT","AU","AW","AZ","BA","BB","BD","BE","BF","BG","BH","BI","BJ",
-	"BM","BN","BO","BR","BS","BT","BV","BW","BY","BZ","CA","CC","CD","CF",
-	"CG","CH","CI","CK","CL","CM","CN","CO","CR","CU","CV","CX","CY","CZ",
-	"DE","DJ","DK","DM","DO","DZ","EC","EE","EG","EH","ER","ES","ET","FI",
-	"FJ","FK","FM","FO","FR","FX","GA","GB","GD","GE","GF","GH","GI","GL",
-	"GM","GN","GP","GQ","GR","GS","GT","GU","GW","GY","HK","HM","HN","HR",
-	"HT","HU","ID","IE","IL","IN","IO","IQ","IR","IS","IT","JM","JO","JP",
-	"KE","KG","KH","KI","KM","KN","KP","KR","KW","KY","KZ","LA","LB","LC",
-	"LI","LK","LR","LS","LT","LU","LV","LY","MA","MC","MD","MG","MH","MK",
-	"ML","MM","MN","MO","MP","MQ","MR","MS","MT","MU","MV","MW","MX","MY",
-	"MZ","NA","NC","NE","NF","NG","NI","NL","NO","NP","NR","NU","NZ","OM",
-	"PA","PE","PF","PG","PH","PK","PL","PM","PN","PR","PS","PT","PW","PY",
-	"QA","RE","RO","RU","RW","SA","SB","SC","SD","SE","SG","SH","SI","SJ",
-	"SK","SL","SM","SN","SO","SR","ST","SV","SY","SZ","TC","TD","TF","TG",
-	"TH","TJ","TK","TM","TN","TO","TP","TR","TT","TV","TW","TZ","UA","UG",
-	"UM","US","UY","UZ","VA","VC","VE","VG","VI","VN","VU","WF","WS","YE",
-	"YT","YU","ZA","ZM","ZR","ZW","A1","A2","O1" ]
+	"--","AP","EU","AD","AE","AF","AG","AI","AL","AM","AN",
+	"AO","AQ","AR","AS","AT","AU","AW","AZ","BA","BB",
+	"BD","BE","BF","BG","BH","BI","BJ","BM","BN","BO",
+	"BR","BS","BT","BV","BW","BY","BZ","CA","CC","CD",
+	"CF","CG","CH","CI","CK","CL","CM","CN","CO","CR",
+	"CU","CV","CX","CY","CZ","DE","DJ","DK","DM","DO",
+	"DZ","EC","EE","EG","EH","ER","ES","ET","FI","FJ",
+	"FK","FM","FO","FR","FX","GA","GB","GD","GE","GF",
+	"GH","GI","GL","GM","GN","GP","GQ","GR","GS","GT",
+	"GU","GW","GY","HK","HM","HN","HR","HT","HU","ID",
+	"IE","IL","IN","IO","IQ","IR","IS","IT","JM","JO",
+	"JP","KE","KG","KH","KI","KM","KN","KP","KR","KW",
+	"KY","KZ","LA","LB","LC","LI","LK","LR","LS","LT",
+	"LU","LV","LY","MA","MC","MD","MG","MH","MK","ML",
+	"MM","MN","MO","MP","MQ","MR","MS","MT","MU","MV",
+	"MW","MX","MY","MZ","NA","NC","NE","NF","NG","NI",
+	"NL","NO","NP","NR","NU","NZ","OM","PA","PE","PF",
+	"PG","PH","PK","PL","PM","PN","PR","PS","PT","PW",
+	"PY","QA","RE","RO","RU","RW","SA","SB","SC","SD",
+	"SE","SG","SH","SI","SJ","SK","SL","SM","SN","SO",
+	"SR","ST","SV","SY","SZ","TC","TD","TF","TG","TH",
+	"TJ","TK","TM","TN","TO","TL","TR","TT","TV","TW",
+	"TZ","UA","UG","UM","US","UY","UZ","VA","VC","VE",
+	"VG","VI","VN","VU","WF","WS","YE","YT","RS","ZA",
+	"ZM","ME","ZW","A1","A2","O1","AX","GG","IM","JE",
+	"BL","MF"
+    ]
 
     CountryCode3 = [
 	"--","AP","EU","AND","ARE","AFG","ATG","AIA","ALB","ARM","ANT","AGO",
@@ -86,85 +96,294 @@ class GeoIP
 	"SYR","SWZ","TCA","TCD","TF","TGO","THA","TJK","TKL","TLS","TKM","TUN",
 	"TON","TUR","TTO","TUV","TWN","TZA","UKR","UGA","UM","USA","URY","UZB",
 	"VAT","VCT","VEN","VGB","VIR","VNM","VUT","WLF","WSM","YEM","YT","YUG",
-	"ZAF","ZMB","ZR","ZWE","A1","A2","O1"]
+	"ZAF","ZMB","ZR","ZWE","A1","A2","O1"
+    ]
 
     CountryName = [
-	"N/A","Asia/Pacific Region","Europe","Andorra","United Arab Emirates",
-	"Afghanistan","Antigua and Barbuda","Anguilla","Albania","Armenia",
-	"Netherlands Antilles","Angola","Antarctica","Argentina",
-	"American Samoa","Austria","Australia","Aruba","Azerbaijan",
-	"Bosnia and Herzegovina","Barbados","Bangladesh","Belgium",
-	"Burkina Faso","Bulgaria","Bahrain","Burundi","Benin","Bermuda",
-	"Brunei Darussalam","Bolivia","Brazil","Bahamas","Bhutan",
-	"Bouvet Island","Botswana","Belarus","Belize","Canada",
-	"Cocos (Keeling) Islands","Congo, The Democratic Republic of the",
-	"Central African Republic","Congo","Switzerland","Cote D'Ivoire",
-	"Cook Islands","Chile","Cameroon","China","Colombia","Costa Rica",
-	"Cuba","Cape Verde","Christmas Island","Cyprus","Czech Republic",
-	"Germany","Djibouti","Denmark","Dominica","Dominican Republic",
-	"Algeria","Ecuador","Estonia","Egypt","Western Sahara","Eritrea",
-	"Spain","Ethiopia","Finland","Fiji","Falkland Islands (Malvinas)",
-	"Micronesia, Federated States of","Faroe Islands","France",
-	"France, Metropolitan","Gabon","United Kingdom","Grenada","Georgia",
-	"French Guiana","Ghana","Gibraltar","Greenland","Gambia","Guinea",
-	"Guadeloupe","Equatorial Guinea","Greece",
-	"South Georgia and the South Sandwich Islands","Guatemala","Guam",
-	"Guinea-Bissau","Guyana","Hong Kong",
-	"Heard Island and McDonald Islands","Honduras","Croatia","Haiti",
-	"Hungary","Indonesia","Ireland","Israel","India",
-	"British Indian Ocean Territory","Iraq","Iran, Islamic Republic of",
-	"Iceland","Italy","Jamaica","Jordan","Japan","Kenya","Kyrgyzstan",
-	"Cambodia","Kiribati","Comoros","Saint Kitts and Nevis",
-	"Korea, Democratic People's Republic of","Korea, Republic of","Kuwait",
-	"Cayman Islands","Kazakhstan","Lao People's Democratic Republic",
-	"Lebanon","Saint Lucia","Liechtenstein","Sri Lanka","Liberia","Lesotho",
-	"Lithuania","Luxembourg","Latvia","Libyan Arab Jamahiriya","Morocco",
-	"Monaco","Moldova, Republic of","Madagascar","Marshall Islands",
-	"Macedonia","Mali","Myanmar","Mongolia","Macau",
-	"Northern Mariana Islands","Martinique","Mauritania","Montserrat",
-	"Malta","Mauritius","Maldives","Malawi","Mexico","Malaysia",
-	"Mozambique","Namibia","New Caledonia","Niger","Norfolk Island",
-	"Nigeria","Nicaragua","Netherlands","Norway","Nepal","Nauru","Niue",
-	"New Zealand","Oman","Panama","Peru","French Polynesia",
-	"Papua New Guinea","Philippines","Pakistan","Poland",
-	"Saint Pierre and Miquelon","Pitcairn Islands","Puerto Rico",
-	"Palestinian Territory, Occupied","Portugal","Palau","Paraguay","Qatar",
-	"Reunion","Romania","Russian Federation","Rwanda","Saudi Arabia",
-	"Solomon Islands","Seychelles","Sudan","Sweden","Singapore",
-	"Saint Helena","Slovenia","Svalbard and Jan Mayen","Slovakia",
-	"Sierra Leone","San Marino","Senegal","Somalia","Suriname",
-	"Sao Tome and Principe","El Salvador","Syrian Arab Republic",
-	"Swaziland","Turks and Caicos Islands","Chad",
-	"French Southern Territories","Togo","Thailand","Tajikistan","Tokelau",
-	"Turkmenistan","Tunisia","Tonga","East Timor","Turkey",
-	"Trinidad and Tobago","Tuvalu","Taiwan","Tanzania, United Republic of",
-	"Ukraine","Uganda","United States Minor Outlying Islands",
-	"United States","Uruguay","Uzbekistan","Holy See (Vatican City State)",
-	"Saint Vincent and the Grenadines","Venezuela",
-	"Virgin Islands, British","Virgin Islands, U.S.","Vietnam","Vanuatu",
-	"Wallis and Futuna", "Samoa","Yemen","Mayotte","Yugoslavia",
-	"South Africa","Zambia","Zaire", "Zimbabwe","Anonymous Proxy",
-	"Satellite Provider","Other"]
+	"N/A",
+	"Asia/Pacific Region",
+	"Europe",
+	"Andorra",
+	"United Arab Emirates",
+	"Afghanistan",
+	"Antigua and Barbuda",
+	"Anguilla",
+	"Albania",
+	"Armenia",
+	"Netherlands Antilles",
+	"Angola",
+	"Antarctica",
+	"Argentina",
+	"American Samoa",
+	"Austria",
+	"Australia",
+	"Aruba",
+	"Azerbaijan",
+	"Bosnia and Herzegovina",
+	"Barbados",
+	"Bangladesh",
+	"Belgium",
+	"Burkina Faso",
+	"Bulgaria",
+	"Bahrain",
+	"Burundi",
+	"Benin",
+	"Bermuda",
+	"Brunei Darussalam",
+	"Bolivia",
+	"Brazil",
+	"Bahamas",
+	"Bhutan",
+	"Bouvet Island",
+	"Botswana",
+	"Belarus",
+	"Belize",
+	"Canada",
+	"Cocos (Keeling) Islands",
+	"Congo, the Democratic Republic of the",
+	"Central African Republic",
+	"Congo",
+	"Switzerland",
+	"Cote D'Ivoire",
+	"Cook Islands",
+	"Chile",
+	"Cameroon",
+	"China",
+	"Colombia",
+	"Costa Rica",
+	"Cuba",
+	"Cape Verde",
+	"Christmas Island",
+	"Cyprus",
+	"Czech Republic",
+	"Germany",
+	"Djibouti",
+	"Denmark",
+	"Dominica",
+	"Dominican Republic",
+	"Algeria",
+	"Ecuador",
+	"Estonia",
+	"Egypt",
+	"Western Sahara",
+	"Eritrea",
+	"Spain",
+	"Ethiopia",
+	"Finland",
+	"Fiji",
+	"Falkland Islands (Malvinas)",
+	"Micronesia, Federated States of",
+	"Faroe Islands",
+	"France",
+	"France, Metropolitan",
+	"Gabon",
+	"United Kingdom",
+	"Grenada",
+	"Georgia",
+	"French Guiana",
+	"Ghana",
+	"Gibraltar",
+	"Greenland",
+	"Gambia",
+	"Guinea",
+	"Guadeloupe",
+	"Equatorial Guinea",
+	"Greece",
+	"South Georgia and the South Sandwich Islands",
+	"Guatemala",
+	"Guam",
+	"Guinea-Bissau",
+	"Guyana",
+	"Hong Kong",
+	"Heard Island and McDonald Islands",
+	"Honduras",
+	"Croatia",
+	"Haiti",
+	"Hungary",
+	"Indonesia",
+	"Ireland",
+	"Israel",
+	"India",
+	"British Indian Ocean Territory",
+	"Iraq",
+	"Iran, Islamic Republic of",
+	"Iceland",
+	"Italy",
+	"Jamaica",
+	"Jordan",
+	"Japan",
+	"Kenya",
+	"Kyrgyzstan",
+	"Cambodia",
+	"Kiribati",
+	"Comoros",
+	"Saint Kitts and Nevis",
+	"Korea, Democratic People's Republic of",
+	"Korea, Republic of",
+	"Kuwait",
+	"Cayman Islands",
+	"Kazakhstan",
+	"Lao People's Democratic Republic",
+	"Lebanon",
+	"Saint Lucia",
+	"Liechtenstein",
+	"Sri Lanka",
+	"Liberia",
+	"Lesotho",
+	"Lithuania",
+	"Luxembourg",
+	"Latvia",
+	"Libyan Arab Jamahiriya",
+	"Morocco",
+	"Monaco",
+	"Moldova, Republic of",
+	"Madagascar",
+	"Marshall Islands",
+	"Macedonia, the Former Yugoslav Republic of",
+	"Mali",
+	"Myanmar",
+	"Mongolia",
+	"Macau",
+	"Northern Mariana Islands",
+	"Martinique",
+	"Mauritania",
+	"Montserrat",
+	"Malta",
+	"Mauritius",
+	"Maldives",
+	"Malawi",
+	"Mexico",
+	"Malaysia",
+	"Mozambique",
+	"Namibia",
+	"New Caledonia",
+	"Niger",
+	"Norfolk Island",
+	"Nigeria",
+	"Nicaragua",
+	"Netherlands",
+	"Norway",
+	"Nepal",
+	"Nauru",
+	"Niue",
+	"New Zealand",
+	"Oman",
+	"Panama",
+	"Peru",
+	"French Polynesia",
+	"Papua New Guinea",
+	"Philippines",
+	"Pakistan",
+	"Poland",
+	"Saint Pierre and Miquelon",
+	"Pitcairn",
+	"Puerto Rico",
+	"Palestinian Territory, Occupied",
+	"Portugal",
+	"Palau",
+	"Paraguay",
+	"Qatar",
+	"Reunion",
+	"Romania",
+	"Russian Federation",
+	"Rwanda",
+	"Saudi Arabia",
+	"Solomon Islands",
+	"Seychelles",
+	"Sudan",
+	"Sweden",
+	"Singapore",
+	"Saint Helena",
+	"Slovenia",
+	"Svalbard and Jan Mayen",
+	"Slovakia",
+	"Sierra Leone",
+	"San Marino",
+	"Senegal",
+	"Somalia",
+	"Suriname",
+	"Sao Tome and Principe",
+	"El Salvador",
+	"Syrian Arab Republic",
+	"Swaziland",
+	"Turks and Caicos Islands",
+	"Chad",
+	"French Southern Territories",
+	"Togo",
+	"Thailand",
+	"Tajikistan",
+	"Tokelau",
+	"Turkmenistan",
+	"Tunisia",
+	"Tonga",
+	"Timor-Leste",
+	"Turkey",
+	"Trinidad and Tobago",
+	"Tuvalu",
+	"Taiwan, Province of China",
+	"Tanzania, United Republic of",
+	"Ukraine",
+	"Uganda",
+	"United States Minor Outlying Islands",
+	"United States",
+	"Uruguay",
+	"Uzbekistan",
+	"Holy See (Vatican City State)",
+	"Saint Vincent and the Grenadines",
+	"Venezuela",
+	"Virgin Islands, British",
+	"Virgin Islands, U.S.",
+	"Viet Nam",
+	"Vanuatu",
+	"Wallis and Futuna",
+	"Samoa",
+	"Yemen",
+	"Mayotte",
+	"Serbia",
+	"South Africa",
+	"Zambia",
+	"Montenegro",
+	"Zimbabwe",
+	"Anonymous Proxy",
+	"Satellite Provider",
+	"Other",
+	"Aland Islands",
+	"Guernsey",
+	"Isle of Man",
+	"Jersey",
+	"Saint Barthelemy",
+	"Saint Martin"
+    ]
 
     CountryContinent = [
-	"--","AS","EU","EU","AS","AS","SA","SA","EU","AS","SA","AF","AN","SA",
-	"OC","EU","OC","SA","AS","EU","SA","AS","EU","AF","EU","AS","AF","AF",
-	"SA","AS","SA","SA","SA","AS","AF","AF","EU","SA","NA","AS","AF","AF",
-	"AF","EU","AF","OC","SA","AF","AS","SA","SA","SA","AF","AS","AS","EU",
-	"EU","AF","EU","SA","SA","AF","SA","EU","AF","AF","AF","EU","AF","EU",
-	"OC","SA","OC","EU","EU","EU","AF","EU","SA","AS","SA","AF","EU","SA",
-	"AF","AF","SA","AF","EU","SA","SA","OC","AF","SA","AS","AF","SA","EU",
-	"SA","EU","AS","EU","AS","AS","AS","AS","AS","EU","EU","SA","AS","AS",
-	"AF","AS","AS","OC","AF","SA","AS","AS","AS","SA","AS","AS","AS","SA",
-	"EU","AS","AF","AF","EU","EU","EU","AF","AF","EU","EU","AF","OC","EU",
-	"AF","AS","AS","AS","OC","SA","AF","SA","EU","AF","AS","AF","NA","AS",
-	"AF","AF","OC","AF","OC","AF","SA","EU","EU","AS","OC","OC","OC","AS",
-	"SA","SA","OC","OC","AS","AS","EU","SA","OC","SA","AS","EU","OC","SA",
-	"AS","AF","EU","AS","AF","AS","OC","AF","AF","EU","AS","AF","EU","EU",
-	"EU","AF","EU","AF","AF","SA","AF","SA","AS","AF","SA","AF","AF","AF",
-	"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"]
+	"--","AS","EU","EU","AS","AS","SA","SA","EU","AS","SA",
+	"AF","AN","SA","OC","EU","OC","SA","AS","EU","SA",
+	"AS","EU","AF","EU","AS","AF","AF","SA","AS","SA",
+	"SA","SA","AS","AF","AF","EU","SA","NA","AS","AF",
+	"AF","AF","EU","AF","OC","SA","AF","AS","SA","SA",
+	"SA","AF","AS","AS","EU","EU","AF","EU","SA","SA",
+	"AF","SA","EU","AF","AF","AF","EU","AF","EU","OC",
+	"SA","OC","EU","EU","EU","AF","EU","SA","AS","SA",
+	"AF","EU","SA","AF","AF","SA","AF","EU","SA","SA",
+	"OC","AF","SA","AS","AF","SA","EU","SA","EU","AS",
+	"EU","AS","AS","AS","AS","AS","EU","EU","SA","AS",
+	"AS","AF","AS","AS","OC","AF","SA","AS","AS","AS",
+	"SA","AS","AS","AS","SA","EU","AS","AF","AF","EU",
+	"EU","EU","AF","AF","EU","EU","AF","OC","EU","AF",
+	"AS","AS","AS","OC","SA","AF","SA","EU","AF","AS",
+	"AF","NA","AS","AF","AF","OC","AF","OC","AF","SA",
+	"EU","EU","AS","OC","OC","OC","AS","SA","SA","OC",
+	"OC","AS","AS","EU","SA","OC","SA","AS","EU","OC",
+	"SA","AS","AF","EU","AS","AF","AS","OC","AF","AF",
+	"EU","AS","AF","EU","EU","EU","AF","EU","AF","AF",
+	"SA","AF","SA","AS","AF","SA","AF","AF","AF","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","EU","AF","--","--","--","EU","EU","EU","EU",
+	"SA","SA"
+    ]
+
     public
     # Edition enumeration:
     (GEOIP_COUNTRY_EDITION,
@@ -178,8 +397,8 @@ class GeoIP
     GEOIP_ASNUM_EDITION,
     GEOIP_NETSPEED_EDITION,
     ) = *1..10
-    private
 
+    private
     COUNTRY_BEGIN = 16776960
     STATE_BEGIN_REV0 = 16700000
     STATE_BEGIN_REV1 = 16000000
@@ -248,7 +467,7 @@ class GeoIP
 
     # Search the GeoIP database for the specified host, returning country info
     #
-    # +hostname+ is a String holding the host's DNS name or numeric IP address
+    # +hostname+ is a String holding the host's DNS name or numeric IP address.
     # Return an array of seven elements:
     # * The host or IP address string as requested
     # * The IP address string after looking up the host
@@ -290,7 +509,7 @@ class GeoIP
     # Search the GeoIP database for the specified host, returning city info
     #
     # +hostname+ is a String holding the host's DNS name or numeric IP address
-    # Return an array of eleven or thirteen elements:
+    # Return an array of twelve or fourteen elements:
     # * All elements from the country query
     # * The region (state or territory) name
     # * The city name
@@ -298,7 +517,7 @@ class GeoIP
     # * The latitude
     # * The longitude
     # * The dma_code and area_code, if available (REV1 City database)
-private
+    private
 
     def read_city(pos, hostname = '', ip = '')
 	@file.seek(pos + (2*@record_length-1) * @databaseSegments[0])
@@ -340,15 +559,15 @@ private
         end
 
 	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;
+        if (record &&
+		record[0,3] &&
+		@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;
 	    us_area_codes = [ dma_code, area_code ]
-                @iter_pos += 3 unless @iter_pos.nil?
-            end
+	    @iter_pos += 3 unless @iter_pos.nil?
 	end
 
 	[   hostname,			# Requested hostname
@@ -364,7 +583,27 @@ private
 	    longitude,
 	] + us_area_codes
     end
-public
+
+    public
+
+    # Search the GeoIP database for the specified host, returning city info.
+    #
+    # +hostname+ is a String holding the host's DNS name or numeric IP address.
+    # Return an array of twelve or fourteen elements:
+    # * The host or IP address string as requested
+    # * The IP address string after looking up the host
+    # * The GeoIP country-ID as an integer
+    # * The ISO3166-1 two-character country code
+    # * The ISO3166-2 three-character country code
+    # * The ISO3166 English-language name of the country
+    # * The two-character continent code
+    # * The region name
+    # * The city name
+    # * The postal code
+    # * The latitude
+    # * The longitude
+    # * The USA dma_code and area_code, if available (REV1 City database)
+    #
     def city(hostname)
         ip = hostname
         if ip.kind_of?(String) && ip !~ /^[0-9.]*$/
@@ -382,6 +621,7 @@ public
         read_city(pos, hostname, ip)
     end
 
+    # Iterate through a GeoIP city database
     def each
         if (@databaseType != GEOIP_CITY_EDITION_REV0 &&
             @databaseType != GEOIP_CITY_EDITION_REV1)
@@ -445,3 +685,4 @@ if $0 == __FILE__
         p g.send(req, a)
     }
 end
+