geoipdb 0.4.3 → 0.5.2

data/.gitignore

@@ -1,3 +1,5 @@
+*.class
+*build
 .bundle
 .yardoc
 Gemfile.lock
@@ -8,5 +10,9 @@ ext/geoipdb/Makefile
 ext/geoipdb/geoipdb.bundle
 ext/geoipdb/geoipdb.o
 ext/geoipdb/ipdb.o
+ext/geoipdb/test
+ext/geoipdb/test.o
 pkg
 rdoc
+tags
+tmp/

data/.jrubyrc

@@ -0,0 +1,12 @@
+compat.version=1.9
+compile.mode=JIT
+
+cext.enabled=true
+native.enabled=true
+compile.invokedynamic=false
+
+invokedynamic.all=true
+
+errno.backtrace=true
+
+fiber.coroutines=false

data/.rvmrc

@@ -1 +1 @@
-rvm use --create ruby-1.9.3-p286@geoipdb
+rvm use --create jruby-1.7.2@geoipdb

data/Gemfile

@@ -1,9 +1,9 @@
 source :rubygems
 
-group :development do
+group :development, :test do
   gem 'bundler'
   gem 'rake'
-  gem 'redcarpet'
+  gem 'rake-compiler'
   gem 'rspec'
   gem 'simplecov'
   gem 'yard'

data/README.markdown

@@ -1,6 +1,6 @@
 # geoipdb: fast (in memory!) geo location db.
 
-Fast (>3 Mio queries/sec!!!) GeoIpDb implementation for Ruby using C-Extensions. 
+Fast (>3 Mio queries/sec!!!) GeoIpDb implementation for Ruby using C/Java-Extensions.
 
   * Returns a GeoLocation and additional information for a given IP. 
   * Reads Data from CSV-Files and uses internal binary caching.
@@ -15,4 +15,4 @@ Fast (>3 Mio queries/sec!!!) GeoIpDb implementation for Ruby using C-Extensions.
 == Copyright
 
 Copyright (c) 2010 madvertise GmbH. See LICENSE.txt for
-further details.
+further details.

data/Rakefile

@@ -1,8 +1,8 @@
-#!/usr/bin/env rake
-
-require "bundler/setup"
-require "bundler/gem_tasks"
+require 'bundler/setup'
+require 'bundler/gem_tasks'
 
 Dir['tasks/**/*.rake'].each { |t| load t }
 
 task :default => [:spec]
+task :build => :compile
+task :spec => :compile

data/ext/geoipdb/extconf.rb

@@ -1,5 +1,3 @@
 require "mkmf"
 
-#extension_name = "geoipdb"
-#dir_config(extension_name)
-create_makefile("geoipdb/geoipdb")
+create_makefile("geoipdb/geoipdb")

data/ext/geoipdb/src/City.java

@@ -0,0 +1,120 @@
+public class City implements Comparable<City>
+{
+    int cityCode;
+    String name;
+    double lat;
+    double lng;
+    String countryISO3;
+    String countryISO2;
+
+
+    public static final String[] country_iso2_codes = {
+        "--", "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"
+    };
+
+    public static final String[] country_iso3_codes = {
+        "--",  "ap",  "eu",  "and", "are", "afg", "atg", "aia", "alb", "arm",
+        "ant", "ago", "aq",  "arg", "asm", "aut", "aus", "abw", "aze", "bih",
+        "brb", "bgd", "bel", "bfa", "bgr", "bhr", "bdi", "ben", "bmu", "brn",
+        "bol", "bra", "bhs", "btn", "bv",  "bwa", "blr", "blz", "can", "cc",
+        "cod", "caf", "cog", "che", "civ", "cok", "chl", "cmr", "chn", "col",
+        "cri", "cub", "cpv", "cx",  "cyp", "cze", "deu", "dji", "dnk", "dma",
+        "dom", "dza", "ecu", "est", "egy", "esh", "eri", "esp", "eth", "fin",
+        "fji", "flk", "fsm", "fro", "fra", "fx",  "gab", "gbr", "grd", "geo",
+        "guf", "gha", "gib", "grl", "gmb", "gin", "glp", "gnq", "grc", "gs",
+        "gtm", "gum", "gnb", "guy", "hkg", "hm",  "hnd", "hrv", "hti", "hun",
+        "idn", "irl", "isr", "ind", "io",  "irq", "irn", "isl", "ita", "jam",
+        "jor", "jpn", "ken", "kgz", "khm", "kir", "com", "kna", "prk", "kor",
+        "kwt", "cym", "kaz", "lao", "lbn", "lca", "lie", "lka", "lbr", "lso",
+        "ltu", "lux", "lva", "lby", "mar", "mco", "mda", "mdg", "mhl", "mkd",
+        "mli", "mmr", "mng", "mac", "mnp", "mtq", "mrt", "msr", "mlt", "mus",
+        "mdv", "mwi", "mex", "mys", "moz", "nam", "ncl", "ner", "nfk", "nga",
+        "nic", "nld", "nor", "npl", "nru", "niu", "nzl", "omn", "pan", "per",
+        "pyf", "png", "phl", "pak", "pol", "spm", "pcn", "pri", "pse", "prt",
+        "plw", "pry", "qat", "reu", "rou", "rus", "rwa", "sau", "slb", "syc",
+        "sdn", "swe", "sgp", "shn", "svn", "sjm", "svk", "sle", "smr", "sen",
+        "som", "sur", "stp", "slv", "syr", "swz", "tca", "tcd", "tf",  "tgo",
+        "tha", "tjk", "tkl", "tkm", "tun", "ton", "tls", "tur", "tto", "tuv",
+        "twn", "tza", "ukr", "uga", "um",  "usa", "ury", "uzb", "vat", "vct",
+        "ven", "vgb", "vir", "vnm", "vut", "wlf", "wsm", "yem", "yt",  "srb",
+        "zaf", "zmb", "mne", "zwe", "a1",  "a2",  "o1",  "ala", "ggy", "imn",
+        "jey", "blm", "maf"
+    };
+
+    public City(String[] cityValues)
+    {
+        this.cityCode = Integer.parseInt(cityValues[4]);
+        this.name = cityValues[2];
+        this.countryISO2 = iso2_code(cityValues[0]);
+        this.countryISO3 = cityValues[0];
+        this.lat = Double.parseDouble(cityValues[5]);
+        this.lng = Double.parseDouble(cityValues[6]);
+    }
+
+    private String iso2_code(String iso3_code)
+    {
+        int index = 0;
+        for (index = 0; index < country_iso3_codes.length; index++) {
+            if (country_iso3_codes[index].equals(iso3_code)) {
+                return country_iso2_codes[index];
+            }
+        }
+        return country_iso2_codes[0];
+    }
+
+    @Override
+    public int compareTo(City other)
+    {
+        return this.cityCode - other.cityCode;
+    }
+
+    public int getCityCode()
+    {
+        return cityCode;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+
+    public double getLat()
+    {
+        return lat;
+    }
+
+    public double getLng() {
+        return lng;
+    }
+
+    public String getCountryISO3()
+    {
+        return countryISO3;
+    }
+
+    public String getCountryISO2()
+    {
+        return countryISO2;
+    }
+}

data/ext/geoipdb/src/CsvReader.java

@@ -0,0 +1,29 @@
+import java.io.BufferedReader;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+
+public class CsvReader
+{
+    private BufferedReader reader = null;
+
+    public CsvReader(String file_name) throws FileNotFoundException {
+        reader = new BufferedReader(new FileReader(file_name));
+    }
+
+    public String[] readLine()
+    {
+        try {
+            String line = "";
+            String[] token = null;
+
+            if ((line = reader.readLine()) != null) {
+                token = line.split(",");
+            }
+
+            return token;
+        } catch (IOException e) {
+            return null;
+        }
+    }
+}

data/ext/geoipdb/src/GeoIpDb.java

@@ -0,0 +1,101 @@
+import java.io.FileNotFoundException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+
+public class GeoIpDb
+{
+    private static final int MAX_CITY_COUNT = 1000000;
+    private static final int MAX_RANGE_COUNT = 10000000;
+
+    HashMap<Integer, City> cities;
+    ArrayList<String> isps;
+    ArrayList<IpRange> ranges;
+
+    public GeoIpDb(String citiesFileName, String rangesFileName) throws FileNotFoundException
+    {
+        cities = new HashMap<Integer, City>();
+        isps = new ArrayList<String>();
+        ranges = new ArrayList<IpRange>();
+
+        readCitiesCSV(citiesFileName);
+        readRangesCSV(rangesFileName);
+    }
+
+    public IpRange findRangeForIp(String ip)
+    {
+        if (ranges.isEmpty()) {
+            System.out.println("ERROR: DB has no ranges data. Can not search!");
+            return null;
+        }
+
+        int index = 0;
+        IpRange search = new IpRange(ip, "0");
+        index = Collections.binarySearch(ranges, search);
+        if (index < 0)
+            return null;
+
+        return ranges.get(index);
+    }
+
+    public City findCityForIpRange(IpRange range)
+    {
+        if (range == null) {
+            System.out.println("Cannot find city for no given range, right?");
+            return null;
+        }
+        if (cities.isEmpty()) {
+            System.out.println("ERROR: DB has no city data. Can not search!");
+            return null;
+        }
+
+        if (range.cityCode == 0) {
+            System.out.format("ERROR: Could not find city with index: %d\n", range.cityCode);
+        }
+
+        return cities.get(range.cityCode);
+    }
+
+    public ArrayList<IpRange> get_ranges()
+    {
+        return ranges;
+    }
+
+    private void readCitiesCSV(String file_name) throws FileNotFoundException
+    {
+        CsvReader reader = new CsvReader(file_name);
+        String[] line = null;
+        City city = null;
+
+        reader.readLine(); // skip first line
+
+        while ((line = reader.readLine()) != null) {
+            if (cities.size() >= MAX_CITY_COUNT){
+                System.out.format("ERROR: MAX_CITY_COUNT = %d limit reached - mek it bigger  :-(\n", MAX_CITY_COUNT);
+                return;
+            }
+            city = new City(line);
+            cities.put(city.cityCode, city);
+        }
+    }
+
+    private void readRangesCSV(String file_name) throws FileNotFoundException
+    {
+        CsvReader reader = new CsvReader(file_name);
+        String[] line = null;
+
+        reader.readLine(); // skip first line
+
+        while ((line = reader.readLine()) != null) {
+            if (line.length < 5)
+                continue;
+
+            if (ranges.size() >= MAX_RANGE_COUNT){
+                System.out.format("ERROR: MAX_RANGE_COUNT = %d limit reached - mek it bigger  :-(\n", MAX_RANGE_COUNT);
+                return;
+            }
+
+            ranges.add(new IpRange(line));
+        }
+    }
+}

data/ext/geoipdb/src/IpRange.java

@@ -0,0 +1,110 @@
+public class IpRange implements Comparable<IpRange>
+{
+    long from;
+    long to;
+    boolean isMobile;
+    int cityCode;
+    String ispName;
+
+    public IpRange(String[] rangeValues)
+    {
+        this.from = ipToLong(rangeValues[0]);
+        this.to = ipToLong(rangeValues[1]);
+        this.isMobile = conTypeToBool(rangeValues[2]);
+        this.cityCode = Integer.parseInt(rangeValues[3]);
+
+        if (!rangeValues[4].equals("?")) {
+            // Use only the first 100 chars to be compliant with the c implementation
+            this.ispName = rangeValues[4].length() > 100 ? rangeValues[4].substring(0, 100) : rangeValues[4];
+        }
+    }
+
+    public IpRange(String from, String to)
+    {
+        this.from = ipToLong(from);
+        this.to = ipToLong(to);
+    }
+
+    public int getCityCode()
+    {
+        return cityCode;
+    }
+
+    public void setCityCode(int cityCode)
+    {
+        this.cityCode = cityCode;
+    }
+
+    public long getFrom()
+    {
+        return from;
+    }
+
+    public long getTo()
+    {
+        return to;
+    }
+
+    public boolean getIsMobile()
+    {
+        return isMobile;
+    }
+
+    public String getIspName()
+    {
+        return ispName;
+    }
+
+    private boolean conTypeToBool(String conType)
+    {
+        return (conType.length() > 0) && (conType.charAt(0) == 'm');
+    }
+
+    private long ipToLong(String ip)
+    {
+        long result = 0;
+
+        if (!(ip == null || ip.equals(""))) {
+            for (String octet : ip.split("\\.")) {
+                result = (result << 8) | Integer.parseInt(octet);
+            }
+        }
+
+        return result;
+    }
+
+    @Override
+    public int compareTo(IpRange other)
+    {
+        if (other == null) {
+            return 0;
+        }
+
+        if (other.from > 0 && other.to > 0 && this.from > 0 && this.to > 0) {
+            if (other.from < this.from)
+                return 1;
+            else if (other.from > this.to)
+                return -1;
+            else
+                return 0;
+        } else if (other.to == 0 && this.to > 0) {
+            if (other.from < this.from)
+                return 1;
+            else if (other.from > this.to)
+                return -1;
+            else
+                return 0;
+        } else if (this.to == 0 && other.to > 0) {
+            if (this.from < other.from)
+                return 1;
+            else if (this.from > other.from)
+                return -1;
+            else
+                return 0;
+        } else if (other.to == 0 && this.to == 0) {
+            return (int)(other.from - this.from);
+        }
+
+        return 0;
+    }
+}

data/geoipdb.gemspec

@@ -2,18 +2,16 @@
 
 Gem::Specification.new do |gem|
   gem.name = "geoipdb"
-  gem.version = "0.4.3"
+  gem.version = "0.5.2"
   gem.licenses = ["MIT"]
 
-  gem.authors = ["Eugen Martin", "Martin Karlsch"]
-  gem.email = ["eugeniusmartinus@googlemail.com", "martin.karlsch@madvertise.com"]
+  gem.authors = ["Eugen Martin", "Martin Karlsch", "Thomas Hirsch", "Benedikt Böhm"]
+  gem.email = ["eugeniusmartinus@googlemail.com", "martin.karlsch@madvertise.com", "thomas.hirsch@madvertise.com", "benedikt.boehm@madvertise.com"]
 
   gem.description = "Returns a GeoLocation and additional information for given IP. Reads Data from CSV-Files and uses internal binary caching."
   gem.summary = "Fast (>3 Mio queries/sec!!!) GeoIpDb implementation for Ruby using C-Extensions."
   gem.homepage = "http://github.com/madvertise/geoipdb"
 
-  gem.extensions = ["ext/geoipdb/extconf.rb"]
-
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/geoipdb.rb

@@ -1,17 +1,8 @@
-require 'rbconfig'
+require 'ip_information'
 
-require 'geoipdb/geoipdb'
-
-class IpInformation
-  attr_accessor :country_iso_code
-  attr_accessor :city_code
-  attr_accessor :city_name
-  attr_accessor :lat
-  attr_accessor :lng
-  attr_accessor :is_mobile
-  attr_accessor :isp_name
-  
-  def mobile?
-    @is_mobile
-  end
+if defined?(JRUBY_VERSION)
+  require 'jgeoipdb'
+  require 'rbconfig'
+else
+  require 'geoipdb/geoipdb'
 end

data/lib/ip_information.rb

@@ -0,0 +1,27 @@
+class IpInformation
+
+  ATTRIBS = [
+    :country_iso_code,
+    :city_code,
+    :city_name,
+    :lat,
+    :lng,
+    :is_mobile,
+    :isp_name,
+  ]
+
+  ATTRIBS.each do |attrib|
+    attr_accessor attrib
+  end
+
+  def mobile?
+    @is_mobile
+  end
+
+  def to_h
+    Hash[ATTRIBS.map do |attrib|
+      [attrib, send(attrib)]
+    end]
+  end
+
+end

data/lib/jgeoipdb.rb

@@ -0,0 +1,43 @@
+require 'java'
+require File.expand_path('../geoipdb.jar', __FILE__)
+
+class GeoIpDb
+
+  def self.init(cities_file, ranges_file, cache_file)
+    self.new(cities_file, ranges_file, cache_file)
+  rescue java.io.FileNotFoundException => e
+    return nil
+  end
+
+  def initialize(cities_file, ranges_file, cache_file)
+    # the Java implementation does not support cache files,
+    # since the java serialisation is slower than the actual csv parsing
+    @jdb = Java::GeoIpDb.new(cities_file, ranges_file)
+  end
+
+  def information_for_ip(ip)
+    range = @jdb.find_range_for_ip(ip)
+    return nil unless range
+
+    city = @jdb.find_city_for_ip_range(range)
+    return nil unless city
+
+    isp = range.isp_name
+    build_ip_information_object(range, city, isp)
+  end
+
+  def build_ip_information_object(range, city, isp)
+    info = IpInformation.new
+
+    info.country_iso_code = city.country_iso2
+    info.city_name = city.name
+    info.city_code = city.city_code
+    info.lng = city.lng
+    info.lat = city.lat
+    info.is_mobile  = range.is_mobile
+    info.isp_name = isp && isp.to_sym
+
+    info
+  end
+
+end

data/sample_data/cities.csv

@@ -1,7 +1,7 @@
 COUNTRY,REGION,CITY-NAME,METRO-CODE,CITY-CODE,LATITUDE,LONGITUDE
 ***,***,?,0,7,0,0
 afg,?,?,0,1,33,1
-afg,no region,herat,-1,2,34.3452,62.
+afg,no region,herat,-1,2,34.3452,62.12
 afg,no region,kabul,-1,3,34.5167,69.1833
 afg,no region,kandahar,-1,4,31.6111,65.702
 afg,no region,mazar-e sharif,-1,5,36.7041,67.1096

data/sample_data/ip_ranges.csv

@@ -1,11 +1,11 @@
-start_ip,end_ip,field 4,field 13,
-0.0.0.0,0.0.0.255,mobile,0
+start_ip,end_ip,connection_type,city_code,isp_name
+0.0.0.0,0.0.0.255,mobile,0,?
 0.0.1.0,0.255.255.255,mobile,1,asdf,
 1.0.0.0,1.0.0.255,xdsl,2,vodafone
-1.0.1.0,1.1.0.255,wireless,3,
+1.0.1.0,1.1.0.255,wireless,3,?
 1.1.1.0,1.1.1.255,mobile,4,1vodafone2vodafone3vodafone4vodafone5vodafone1vodafone2vodafone3vodafone4vodafone5vodafone1vodafone2vodafone3vodafone4vodafone5vodafone1vodafone2vodafone3vodafone4vodafone5vodafone
-1.1.2.0,1.2.2.255,mobile,5,
-1.2.3.0,1.2.3.255,mobile,5,
-1.2.4.0,1.3.255.255,mobile,2,
-1.4.0.0,1.4.0.255,mobile,5,
-1.4.1.0,1.8.255.255,mobile,3,
+1.1.2.0,1.2.2.255,mobile,5,?
+1.2.3.0,1.2.3.255,mobile,5,?
+1.2.4.0,1.3.255.255,mobile,2,?
+1.4.0.0,1.4.0.255,mobile,5,?
+1.4.1.0,1.8.255.255,mobile,3,?

data/spec/geoipdb_spec.rb

@@ -1,14 +1,14 @@
 require File.expand_path(File.dirname(__FILE__)+'/spec_helper')
 
 
-describe GeoIpDb do                                                               
-  
+describe GeoIpDb do
+
   CACHE_FILE = 'sample_data/ipdb.cache'
-  
+
   def init_db
-    @db = GeoIpDb.init './sample_data/cities.csv', './sample_data/ip_ranges.csv', CACHE_FILE 
-  end       
-  
+    @db = GeoIpDb.init './sample_data/cities.csv', './sample_data/ip_ranges.csv', CACHE_FILE
+  end
+
   it "should not throw an exception fault if data is corrupt" do
     @db = GeoIpDb.init './sample_data/cities_corrupt.csv', './sample_data/ip_ranges_corrupt.csv', CACHE_FILE
   end
@@ -16,40 +16,46 @@ describe GeoIpDb do
   it "should not init a db object if data files are missing" do
     GeoIpDb.init( './sample_data/bla.csv', './sample_data/blubb.csv', CACHE_FILE ).should be_nil
   end
-  
-  it "should init correctly with sample data and create the cache-file" do
+
+  it "should init correctly with sample data" do
     init_db
     @db.should_not be_nil
-    File.exist?(CACHE_FILE).should be_true
   end
-  
-  it "sould find the sample cities correcty" do 
+
+  unless defined? JRUBY_VERSION
+    it "initializes cache_file correctly with sample data" do
+      init_db
+      File.exist?(CACHE_FILE).should be_true
+    end
+  end
+
+  it "sould find the sample cities correcty" do
     init_db
     #afg,no region,kabul,-1,3,34.5167,69.1833
-    info = @db.information_for_ip "1.1.0.254"         
+    info = @db.information_for_ip "1.1.0.254"
     info.city_code.should == 3
-    info.city_name.should == 'kabul'             
+    info.city_name.should == 'kabul'
     info.country_iso_code.should == 'af'
     info.lat.should == 34.5167
     info.lng.should == 69.1833
     info.should_not be_mobile
   end
-  
+
   it 'should return correct is_mobile information' do
-    init_db           
-    @db.information_for_ip("1.0.0.1").should_not be_mobile             
+    init_db
+    @db.information_for_ip("1.0.0.1").should_not be_mobile
     @db.information_for_ip("1.1.1.1").should be_mobile
-  end 
-  
+  end
+
   it 'should return correct isp_name in ip_information' do
-    init_db           
+    init_db
     @db.information_for_ip("1.0.0.1").isp_name.should == :vodafone
     @db.information_for_ip("1.1.1.1").isp_name.should == "1vodafone2vodafone3vodafone4vodafone5vodafone1vodafone2vodafone3vodafone4vodafone5vodafone1vodafone2vodafone3vodafone4vodafone5vodafone1vodafone2vodafone3vodafone4vodafone5vodafone"[0..99].to_sym
     @db.information_for_ip("1.2.1.1").isp_name.should == nil
   end
 
   it "should write and read the cachefile correctly"
-  
+
   after :each do
     File.unlink CACHE_FILE if File.exist? CACHE_FILE
   end

data/tasks/compile.rake

@@ -0,0 +1,8 @@
+case RUBY_PLATFORM
+when 'java'
+  require 'rake/javaextensiontask'
+  Rake::JavaExtensionTask.new('geoipdb')
+else
+  require 'rake/extensiontask'
+  Rake::ExtensionTask.new('geoipdb')
+end

metadata

@@ -1,80 +1,92 @@
 --- !ruby/object:Gem::Specification
 name: geoipdb
 version: !ruby/object:Gem::Version
-  version: 0.4.3
-  prerelease: 
+  version: 0.5.2
+  prerelease:
 platform: ruby
 authors:
 - Eugen Martin
 - Martin Karlsch
-autorequire: 
+- Thomas Hirsch
+- Benedikt Böhm
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-11-14 00:00:00.000000000 Z
+date: 2013-01-10 00:00:00.000000000 Z
 dependencies: []
-description: Returns a GeoLocation and additional information for given IP. Reads
-  Data from CSV-Files and uses internal binary caching.
+description: Returns a GeoLocation and additional information for given IP. Reads Data from CSV-Files and uses internal binary caching.
 email:
 - eugeniusmartinus@googlemail.com
 - martin.karlsch@madvertise.com
+- thomas.hirsch@madvertise.com
+- benedikt.boehm@madvertise.com
 executables: []
-extensions:
-- ext/geoipdb/extconf.rb
+extensions: []
 extra_rdoc_files: []
 files:
-- .document
-- .gitignore
-- .rspec
-- .rvmrc
+- ".document"
+- ".gitignore"
+- ".jrubyrc"
+- ".rspec"
+- ".rvmrc"
 - Gemfile
 - LICENSE.txt
 - README.markdown
 - Rakefile
-- VERSION
 - ext/geoipdb/extconf.rb
 - ext/geoipdb/geoipdb.c
 - ext/geoipdb/ipdb.c
 - ext/geoipdb/ipdb.h
+- ext/geoipdb/src/City.java
+- ext/geoipdb/src/CsvReader.java
+- ext/geoipdb/src/GeoIpDb.java
+- ext/geoipdb/src/IpRange.java
 - geoipdb.gemspec
+- lib/geoipdb.jar
 - lib/geoipdb.rb
+- lib/ip_information.rb
+- lib/jgeoipdb.rb
 - sample_data/cities.csv
 - sample_data/citiess_corrupt.csv
 - sample_data/ip_ranges.csv
 - sample_data/ip_ranges_corrupt.csv
 - spec/geoipdb_spec.rb
 - spec/spec_helper.rb
+- tasks/compile.rake
 - tasks/rspec.rake
 - tasks/yard.rake
 homepage: http://github.com/madvertise/geoipdb
 licenses:
 - MIT
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: 4023628714682434710
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: !binary |-
+        MA==
+      hash: 2
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
+  none: false
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 1.8.24
-signing_key: 
+signing_key:
 specification_version: 3
 summary: Fast (>3 Mio queries/sec!!!) GeoIpDb implementation for Ruby using C-Extensions.
 test_files:
 - spec/geoipdb_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 
+has_rdoc:

data/VERSION

@@ -1 +0,0 @@
-0.4.2