geoip 0.8.1 → 0.8.4

data/Manifest.txt

@@ -1,24 +1,7 @@
 History.txt
-License.txt
 Manifest.txt
-README.txt
+README.rdoc
 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 → README.rdoc}

@@ -1,6 +1,6 @@
-= GeoIP
+= geoip
 
-http://geoip.rubyforge.org/
+* http://github.com/cjheath/geoip
 
 == DESCRIPTION:
 
@@ -10,20 +10,24 @@ 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.
+This release adds support for ASN data files, thanks to Roland Matiz
 
 == SYNOPSIS:
 
-require 'geoip'
-GeoIP.new('GeoIP.dat').country("www.netscape.sk")
-=> ["www.netscape.sk", "217.67.16.35", 196, "SK", "SVK", "Slovakia", "EU"]
+  require 'geoip'
+  GeoIP.new('GeoIP.dat').country("www.netscape.sk")
+  => ["www.netscape.sk", "217.67.16.35", 196, "SK", "SVK", "Slovakia", "EU"]
+
+  GeoIP.new('GeoIPASNum.dat').asn("www.fsb.ru")
+  => ["AS8342", "RTComm.RU Autonomous System"]
 
 == 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>,
 or the city database from <http://www.maxmind.com/app/geolitecity>.
+The ASN database location is
+<http://geolite.maxmind.com/download/geoip/database/asnum/GeoIPASNum.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
@@ -38,7 +42,7 @@ sudo gem install geoip
 
 (The MIT License)
 
-Copyright (c) 2008 FIX
+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
@@ -58,5 +62,3 @@ 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/Rakefile

@@ -1,4 +1,23 @@
-require 'config/requirements'
-require 'config/hoe' # setup Hoe + all gem configuration
+require 'rubygems'
+gem 'hoe', '>= 2.1.0'
+require 'hoe'
+require 'fileutils'
+require './lib/geoip'
 
-Dir['tasks/**/*.rake'].each { |rake| load rake }
+Hoe.plugin :newgem
+Hoe.plugin :website
+
+# Generate all the Rake tasks
+# Run 'rake -T' to see list of generated tasks (from gem root directory)
+$hoe = Hoe.spec 'geoip' do
+  self.developer 'Clifford Heath', 'clifford.heath@gmail.com'
+  self.developer 'Roland Moriz', 'rmoriz@gmail.com'
+  self.rubyforge_name       = self.name # TODO this is default value
+end
+
+require 'newgem/tasks'
+Dir['tasks/**/*.rake'].each { |t| load t }
+
+# TODO - want other tests/tasks run by default? Add them to the list
+# remove_task :default
+# task :default => [:spec, :features]

data/lib/geoip.rb

@@ -42,10 +42,10 @@ $:.unshift File.dirname(__FILE__)
 #
 #=end
 require 'thread'  # Needed for Mutex
-
 require 'socket'
 
 class GeoIP
+    VERSION = "0.8.4"
     private
     CountryCode = [
         "--","AP","EU","AD","AE","AF","AG","AI","AL","AM","AN",
@@ -411,6 +411,7 @@ class GeoIP
     STRUCTURE_INFO_MAX_SIZE = 20
     DATABASE_INFO_MAX_SIZE = 100
     MAX_ORG_RECORD_LENGTH = 300
+    MAX_ASN_RECORD_LENGTH = 300 # unverified
     US_OFFSET = 1
     CANADA_OFFSET = 677
     WORLD_OFFSET = 1353
@@ -436,7 +437,7 @@ class GeoIP
         @file.seek(-3, IO::SEEK_END)
         0.upto(STRUCTURE_INFO_MAX_SIZE-1) { |i|
             if @file.read(3) == "\xFF\xFF\xFF"
-                @databaseType = @file.getc
+                @databaseType = @file.respond_to?(:getbyte) ? @file.getbyte : @file.getc
                 @databaseType -= 105 if @databaseType >= 106
 
                 if (@databaseType == GEOIP_REGION_EDITION_REV0)
@@ -473,11 +474,6 @@ class GeoIP
         end
     end
 
-    # Close the file handle for the GeoIP data file.
-    def close
-      @file.close
-    end
-
     # 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.
@@ -500,6 +496,7 @@ class GeoIP
         if ip.kind_of?(String) && ip !~ /^[0-9.]*$/
             # Lookup IP address, we were given a name
             ip = IPSocket.getaddress(hostname)
+            ip = '0.0.0.0' if ip == '::1'
         end
 
         # Convert numeric IP address to an integer
@@ -541,6 +538,7 @@ class GeoIP
 
         # The country code is the first byte:
         code = record[0]
+        code = code.ord if code.respond_to?(:ord)
         record = record[1..-1]
         @iter_pos += 1 unless @iter_pos.nil?
 
@@ -625,6 +623,7 @@ class GeoIP
         if ip.kind_of?(String) && ip !~ /^[0-9.]*$/
             # Lookup IP address, we were given a name
             ip = IPSocket.getaddress(hostname)
+            ip = '0.0.0.0' if ip == '::1'
         end
 
         # Convert numeric IP address to an integer
@@ -647,6 +646,7 @@ class GeoIP
         if ip.kind_of?(String) && ip !~ /^[0-9.]*$/
             # Lookup IP address, we were given a name
             ip = IPSocket.getaddress(hostname)
+            ip = '0.0.0.0' if ip == '::1'
         end
 
         # Convert numeric IP address to an integer
@@ -663,6 +663,41 @@ class GeoIP
         record = record.sub(/\000.*/, '')
         record
     end
+    
+    # Search a ASN GeoIP database for the specified host, returning the AS number + description
+    #
+    # +hostname+ is a String holding the host's DNS name or numeric IP address.
+    # Return the AS number + description
+    #
+    # Source:
+    # http://geolite.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz
+    #   
+    def asn(hostname)
+        ip = hostname
+        if ip.kind_of?(String) && ip !~ /^[0-9.]*$/
+            # Lookup IP address, we were given a name
+            ip = IPSocket.getaddress(hostname)
+            ip = '0.0.0.0' if ip == '::1'
+        end
+
+        # Convert numeric IP address to an integer
+        ipnum = iptonum(ip)
+        if (@databaseType != GEOIP_ASNUM_EDITION)
+            throw "Invalid GeoIP database type, can't look up ASN by IP"
+        end
+        pos = seek_record(ipnum);
+        record = ""
+        @mutex.synchronize {
+          @file.seek(pos + (2*@record_length-1) * @databaseSegments[0])
+          record = @file.read(MAX_ASN_RECORD_LENGTH)
+        }
+        record = record.sub(/\000.*/, '')
+        
+        if record =~ /^(AS\d+)\s(.*)$/
+          # AS####, Description 
+          return [$1, $2]
+        end
+    end
 
     # Search a ISP GeoIP database for the specified host, returning the organization
     #
@@ -689,6 +724,7 @@ class GeoIP
     end
 
     private
+      
     def iptonum(ip)     # Convert numeric IP address to integer
         if ip.kind_of?(String) &&
             ip =~ /^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)$/

data/test/test_helper.rb

@@ -1,2 +1,3 @@
+require 'stringio'
 require 'test/unit'
 require File.dirname(__FILE__) + '/../lib/geoip'

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: geoip
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.8.4
 platform: ruby
 authors: 
 - Clifford Heath
+- Roland Moriz
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-06-04 00:00:00 +10:00
+date: 2009-09-04 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,53 +21,38 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.0
+        version: 2.3.2
     version: 
-description: description of gem
-email: cjheath@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,
+  and the city, ISP and other information, if you have that database version.
+email: 
+- clifford.heath@gmail.com
+- rmoriz@gmail.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
 - History.txt
-- License.txt
 - Manifest.txt
-- README.txt
-- website/index.txt
 files: 
 - History.txt
-- License.txt
 - Manifest.txt
-- README.txt
+- README.rdoc
 - 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
 has_rdoc: true
-homepage: http://geoip.rubyforge.org
+homepage: http://github.com/cjheath/geoip
 licenses: []
 
 post_install_message: 
 rdoc_options: 
 - --main
-- README.txt
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -84,10 +70,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: geoip
-rubygems_version: 1.3.3
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: description of gem
+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.
 test_files: 
 - test/test_geoip.rb
 - test/test_helper.rb

data/License.txt

@@ -1,16 +0,0 @@
-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/config/hoe.rb

@@ -1,71 +0,0 @@
-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

@@ -1,17 +0,0 @@
-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/version.rb

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