jgeoip 0.2.3-java → 0.2.5-java

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: dc1f71133149460ad25bf351bec24d4a9471beaa
+  data.tar.gz: 08a03294e91471c417056aae3d3fbe0009012fcf
+SHA512:
+  metadata.gz: 09c30ccf5ab9f03deb702724335d43678480448fee778a1d08937dc9ed06c750587ea2a52a0ee4a9b91a7a0436d30f849d256bd070ba99fc760ac574dce90837
+  data.tar.gz: 400ab61aa5345a0c52f5d96ff06cde1ba579346b990c0f6dcdb96508decaa3b00de3f5f8ff819b77743ad697196b1d2d5c72a1a0b7f1898e0ce707b2163dd26b

data/lib/jgeoip.rb

@@ -1,12 +1,6 @@
-require 'java'
+require 'geoip-jars'
 
-# Load the required jars
-require File.expand_path('../java/geoip-api-1.2.10', __FILE__)
+Dir[File.expand_path('../java/*.jar', __FILE__)].each { |jar| require(jar) }
 
-# load the version file
-require File.expand_path('../jgeoip/version', __FILE__)
-
-# import the jRuby Extension
-require File.expand_path("../java/jgeoip-#{JGeoIP::VERSION}", __FILE__)
 java_import 'org.github.tobsch.jgeoip.JGeoIPLibrary'
 JGeoIPLibrary.new.load(JRuby.runtime, false)

data/lib/jgeoip/version.rb

@@ -1,3 +1,3 @@
 class JGeoIP
-  VERSION = "0.2.3"
+  VERSION = "0.2.5"
 end

data/test/unit/jgeoip_test.rb

@@ -19,7 +19,8 @@ class JGeoIPTest < Test::Unit::TestCase
 
   context 'The Geoip City API' do
     setup do
-      @geo = JGeoIP.new('/opt/MaxMind/GeoLiteCity.dat')
+      @db_path = 'tmp/GeoLiteCity.dat'
+      @geo = JGeoIP.new(@db_path)
     end
 
     should 'find the correct city by hostname' do
@@ -37,8 +38,8 @@ class JGeoIPTest < Test::Unit::TestCase
     should 'find the city by ip too' do
       result = @geo.city('207.97.227.239')
       assert_equal 'United States', result[:country_name]
-      assert_in_delta 37.74839782714844, result.latitude, 10
-      assert_in_delta -122.41560363769531, result.longitude, 10
+      assert_in_delta 37.74839782714844, result.latitude, 100
+      assert_in_delta -122.41560363769531, result.longitude, 100
     end
 
     should 'find out the distance between to points' do
@@ -46,10 +47,10 @@ class JGeoIPTest < Test::Unit::TestCase
       p2 = @geo.city('alice.de')
       p3 = @geo.city('facebook.com')
       # from sa to hamburg
-      assert_in_delta 8537.271518247373, p1.distance(p2), 10
+      assert_in_delta 8537.271518247373, p1.distance(p2), 100
       
       # from sa to sf
-      assert_in_delta 2363.280770976432, p1.distance(p3), 10
+      assert_in_delta 2363.280770976432, p1.distance(p3), 100
     end
 
     should 'return nil if an attribute does not exist' do
@@ -71,7 +72,7 @@ class JGeoIPTest < Test::Unit::TestCase
 
     should 'be inspectable' do
       result = @geo.city('85.183.18.35').inspect
-      assert_match /:city=>"(Othmarschen|Sparrieshoop)"/, result
+      assert_match /:city=>"Hamburg"/, result
     end
 
     should 'throw a clean exception if the ip was not found' do
@@ -84,6 +85,15 @@ class JGeoIPTest < Test::Unit::TestCase
       assert_equal 'Osnabrück', result
       assert_equal 'UTF-8', result.encoding.to_s
     end
-    
+
+    should 'accept caching options' do
+      JGeoIP.new(@db_path, :caching => JGeoIP::GEOIP_STANDARD | JGeoIP::GEOIP_INDEX_CACHE)
+    end
+
+    should 'raises an error when the caching options are not a number' do
+      assert_raise ArgumentError do
+        JGeoIP.new(@db_path, :caching => 'yes please')
+      end
+    end
   end
 end

metadata

@@ -1,80 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: jgeoip
 version: !ruby/object:Gem::Version
-  version: 0.2.3
-  prerelease:
+  version: 0.2.5
 platform: java
 authors:
 - Tobias Schlottke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2014-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :development
+  name: geoip-jars
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
   name: shoulda-context
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   prerelease: false
-- !ruby/object:Gem::Dependency
   type: :development
-  requirement: !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency
+  name: buildr
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.4.6
-    none: false
-  name: buildr
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.4.6
-    none: false
   prerelease: false
-- !ruby/object:Gem::Dependency
   type: :development
-  requirement: !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency
+  name: ci_reporter
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: ci_reporter
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   prerelease: false
-- !ruby/object:Gem::Dependency
   type: :development
-  requirement: !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: test-unit
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   prerelease: false
+  type: :development
 description: This gem wraps maxminds original java library, which should make things faster than using other pure ruby libraries.
 email:
 - tobias.schlottke@gmail.com
@@ -82,26 +87,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
-- Buildfile
-- Gemfile
-- README.md
-- Rakefile
-- jgeoip.gemspec
-- lib/java/geoip-api-1.2.10.jar
-- lib/java/jgeoip-0.2.2.jar
-- lib/java/jgeoip-0.2.3.jar
+- lib/java/jgeoip.jar
 - lib/jgeoip.rb
 - lib/jgeoip/version.rb
-- script/benchmark.rb
-- src/main/java/org/github/tobsch/jgeoip/JGeoIP.java
-- src/main/java/org/github/tobsch/jgeoip/JGeoIPLibrary.java
-- src/main/java/org/github/tobsch/jgeoip/LocationProxy.java
 - test/test_helper.rb
 - test/unit/jgeoip_test.rb
 homepage: http://github.com/tobsch/jgeoip
 licenses: []
+metadata: {}
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -110,25 +103,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
       version: '0'
-      hash: 2
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
       version: '0'
-      hash: 2
-  none: false
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: Fast jRuby library for Maxminds GeoIP Databases
 test_files:
 - test/test_helper.rb

data/.gitignore

@@ -1,8 +0,0 @@
-*.gem
-.bundle
-Gemfile.lock
-pkg/*
-target/*
-.DS_Store
-**/.DS_Store
-test/reports/*

data/.ruby-version

@@ -1 +0,0 @@
-jruby-1.7.4

data/Buildfile

@@ -1,25 +0,0 @@
-require 'bundler/setup'
-
-$:.push File.expand_path("../lib", __FILE__)
-require "jgeoip/version"
-
-# add maven repositories
-repositories.remote << 'http://www.ibiblio.org/maven2'
-repositories.remote << 'http://repo1.maven.org/maven2'
-
-define 'jgeoip' do
-  project.version = JGeoIP::VERSION
-  
-  # add dependencies from jar
-  compile.using(:target => '1.6', :source => '1.6').with('com.maxmind.geoip:geoip-api:jar:1.2.10')
-  
-  # package our shiny little bidder jar
-  package :jar, :file => _("lib/java/jgeoip-#{JGeoIP::VERSION}.jar")
-  
-  desc 'copy all dependent jars to lib folder'
-  task :copy_dependencies do
-    cp project.compile.dependencies.collect(&:to_s), project.path_to('lib/java') 
-  end
-  
-  task :setup => [ :clean, :compile, :package, :copy_dependencies ]
-end

data/Gemfile

@@ -1,4 +0,0 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in jGeoIP.gemspec
-gemspec

data/README.md

@@ -1,53 +0,0 @@
-# Fast JRuby GeoIP Extension
-This jRuby extension will help you with all your GeoIP needs in JRuby.
-It is pretty small and simple right now but will surely grow up soon.
-You can easily use it with the free GeoIP Library from maxmind.com aswell as the commercial one.
-
-## example
-### City Lookup
-    p JGeoIP.new('/opt/MaxMind/GeoLiteCity.dat').city('github.com')
-    
-    # => {:city=>"San Francisco", :postal_code=>"94110", :country_code=>"US", :country_name=>"United States", :region=>"CA",  :latitude=>37.74839782714844, :longitude=>37.74839782714844, :dma_code=>807, :area_code=>415, :metro_code=>807}
-
-Will return a Location object with all the result properties and a #to_hash method
-  
-### Organization/ISP Lookup
-    p JGeoIP.new('/opt/MaxMind/GeoIPISP.dat').org('github.com')
-    
-Will return a string holding the organization/isp name
-  
-    
-### Distance between two locations (km)
-    p1 = @geo.city('github.com')
-    p2 = @geo.city('facebook.com')
-    
-    p p1.distance(p2)
-    # => 46.25354059751858
-
-## speed?
-There is a benchmark script included, so you'll be able to check it yourself.
-We compared it to the GeoIP gem so far (because geoip-c won't compile with jRuby).
-Results are promising:
-
-#### JGeoIP
-    JGeoIP (>=0.1.5):
-      0.285000   0.000000   0.285000 (  0.286000)
-    JGeoIP (old non extension version, <0.1.5):
-      1.047000   0.000000   1.047000 (  1.048000)    
-
-#### Others
-    pure ruby GeoIP (jRuby):
-     35.614000   0.000000  35.614000 ( 35.614000)
-    geoip-c (MRI 1.9.3-p0):
-      1.140000   0.000000   1.140000 (  1.145224)
-    pure ruby GeoIP (MRI 1.9.3-p0):
-      30.060000  16.420000  46.480000 ( 60.940723)        
-*Cool, eh?*
-
-Please note that we did a warmup to give the JIT a chance.
-The benchmark does 100k lookups.
-Those results are Java 7, jruby-1.6.5 based. Looking forward to 1.7.0.
-
-### TODO
-* integrate the other lookup methods: so far we're just able to do city lookups
-* check all the license related stuff: the maxmind lib is LGPL, which would be okay for me    

data/Rakefile

@@ -1,21 +0,0 @@
-require 'bundler/gem_tasks'
-require 'rake/testtask'
-
-desc 'Run all the tests'
-task :default => [ :test ]
-
-task :test => [ 'test:unit' ]
-namespace :test do
-  
-  task :environment do
-    ENV['RACK_ENV'] = 'test'
-  end
-  
-  [ :unit ].each do |category|
-    Rake::TestTask.new(category) do |t|
-      t.libs << "test"
-      t.test_files = Dir["test/#{category}/**/*_test.rb"]
-      t.verbose = true
-    end
-  end
-end

data/jgeoip.gemspec

@@ -1,28 +0,0 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path("../lib/jgeoip/version", __FILE__)
-
-Gem::Specification.new do |s|
-  s.name        = "jgeoip"
-  s.version     = JGeoIP::VERSION
-  s.authors     = ["Tobias Schlottke"]
-  s.email       = ["tobias.schlottke@gmail.com"]
-  s.homepage    = "http://github.com/tobsch/jgeoip"
-  s.summary     = 'Fast jRuby library for Maxminds GeoIP Databases'
-  s.description = 'This gem wraps maxminds original java library, which should make things faster than using other pure ruby libraries.'
-  s.platform    = 'java'
-  
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-
-  # specify any dependencies here; for example:
-  # s.add_development_dependency "rspec"
-  # s.add_runtime_dependency "rest-client"
-  s.add_development_dependency 'shoulda-context'
-  s.add_development_dependency 'buildr', '1.4.6'
-  s.add_development_dependency 'ci_reporter'
-  
-  # necessary instead of Mini:Unit as Mini:Unit cannot produce Jenkins-compatible test results
-  s.add_development_dependency 'test-unit'
-end

data/script/benchmark.rb

@@ -1,45 +0,0 @@
-require 'benchmark'
-require 'rubygems'
-
-def benchmark(description, &block)
-  puts description
-  # do a warmup
-  10_000.times {
-    block.call
-  }
-  # do the actual measurements
-  puts Benchmark.measure {
-    100_000.times {
-      block.call
-    }
-  }
-end
-
-jruby = defined?(JRUBY_VERSION)
-DB_FILE = '/opt/MaxMind/GeoLiteCity.dat'
-if jruby
-  # check the JGeoIP
-  require File.expand_path('../../lib/jgeoip.rb', __FILE__)
-
-  db = JGeoIP.new(DB_FILE)
-  benchmark 'JGeoIP:' do
-    result = db.city('github.com')
-  end
-end
-
-# check the pure lib
-gem 'geoip'
-require 'geoip'
-db = GeoIP.new(DB_FILE)
-benchmark 'pure ruby GeoIP:'   do
-  result = db.city('github.com')
-end
-
-unless jruby
-  gem 'geoip-c'
-  require 'geoip-c/geoip'
-  db = GeoIP::City.new(DB_FILE)
-  benchmark 'geoip-c:' do
-    db.look_up('207.97.227.239')
-  end
-end

data/src/main/java/org/github/tobsch/jgeoip/JGeoIP.java

@@ -1,64 +0,0 @@
-package org.github.tobsch.jgeoip;
-
-import com.maxmind.geoip.*;
-
-import java.io.IOException;
-
-import org.jruby.Ruby;
-
-import org.jruby.RubyClass;
-import org.jruby.RubyObject;
-
-import org.jruby.anno.JRubyMethod;
-import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.builtin.IRubyObject;
-
-
-public class JGeoIP extends RubyObject {
-  LookupService cl;
-  static RubyClass locationProxyClass;
-
-  public JGeoIP(final Ruby ruby, RubyClass rubyClass) {
-    super(ruby, rubyClass);
-    this.locationProxyClass = ruby.getClass("Location");
-  }
-    
-  @JRubyMethod
-  public IRubyObject initialize(ThreadContext context, IRubyObject databaseLocation) throws IOException {
-    cl = new LookupService(databaseLocation.toString(), LookupService.GEOIP_MEMORY_CACHE);
-      
-    return context.nil;
-  }
-
-  @JRubyMethod
-  public IRubyObject city(ThreadContext context, IRubyObject searchString) throws IOException {
-    Location location = cl.getLocation(searchString.toString());
-    if (location == null) {
-      return context.runtime.getNil();
-    }
-    
-    LocationProxy loc = new LocationProxy(context.runtime, locationProxyClass, location);
-        
-    return loc;
-  }
-  
-  @JRubyMethod
-  public IRubyObject org(ThreadContext context, IRubyObject searchString) throws IOException {
-    String org = cl.getOrg(searchString.toString());
-    if (org == null) {
-      return context.runtime.getNil();
-    }
-    
-    return context.runtime.newString(org);
-  }
-
-  @JRubyMethod
-  public IRubyObject id(ThreadContext context, IRubyObject searchString) throws IOException {
-    Integer id = cl.getID(searchString.toString());
-    if (id == null) {
-      return context.runtime.getNil();
-    }
-    
-    return context.runtime.newFixnum((long)id);
-  }
-}

data/src/main/java/org/github/tobsch/jgeoip/JGeoIPLibrary.java

@@ -1,43 +0,0 @@
-
-package org.github.tobsch.jgeoip;
-import org.github.tobsch.jgeoip.*;
-import com.maxmind.geoip.*;
-
-import java.io.IOException;
-
-import org.jruby.Ruby;
-import org.jruby.RubyClass;
-import org.jruby.runtime.ObjectAllocator;
-import org.jruby.runtime.builtin.IRubyObject;
-import org.jruby.runtime.load.Library;
-
-/**
- *
- * 
- */
-public class JGeoIPLibrary implements Library {
-  private Ruby ruby;
-
-  public void load(Ruby ruby, boolean bln) throws IOException {
-    this.ruby = ruby;
-    
-    // define the jgeoip class
-    final RubyClass jgeoip = ruby.defineClass("JGeoIP", ruby.getObject(), new ObjectAllocator() {
-      public IRubyObject allocate(Ruby ruby, RubyClass rc) {
-        return new JGeoIP(ruby, rc);
-      }
-    });
-
-    jgeoip.defineAnnotatedMethods(JGeoIP.class);
-    
-    // define the location class
-    final RubyClass location = ruby.defineClass("Location", ruby.getObject(), new ObjectAllocator() {
-      public IRubyObject allocate(Ruby ruby, RubyClass rc) {
-        return new LocationProxy(ruby, rc);
-      }
-    });
-
-    location.defineAnnotatedMethods(LocationProxy.class);
-    
-  }
-}

data/src/main/java/org/github/tobsch/jgeoip/LocationProxy.java

@@ -1,142 +0,0 @@
-package org.github.tobsch.jgeoip;
-import com.maxmind.geoip.*;
-
-import java.io.IOException;
-
-import org.jruby.Ruby;
-import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.ObjectAllocator;
-import org.jruby.runtime.builtin.IRubyObject;
-import org.jruby.runtime.load.Library;
-import org.jruby.runtime.Block;
-
-import org.jruby.anno.JRubyMethod;
-
-import org.jruby.RubyClass;
-import org.jruby.RubyArray;
-import org.jruby.RubyClass;
-import org.jruby.RubyObject;
-import org.jruby.RubyHash;
-import org.jruby.RubySymbol;
-
-import java.util.ArrayList;
-
-
-public class LocationProxy extends RubyObject {
-  Location location;
-  
-  private static final ArrayList<String> attributes = new ArrayList<String>();
-  
-  // a map with all properties
-  static {
-    attributes.add("city");
-    attributes.add("postal_code");
-    attributes.add("country_code");
-    attributes.add("country_name");
-    attributes.add("region");
-    attributes.add("latitude");
-    attributes.add("longitude");
-    attributes.add("dma_code");
-    attributes.add("area_code");
-    attributes.add("metro_code");    
-  }
-  
-  public LocationProxy(final Ruby ruby, RubyClass rubyClass) {
-    super(ruby, rubyClass);
-  }
-
-  public LocationProxy(final Ruby ruby, RubyClass rubyClass, Location location) {
-    super(ruby, rubyClass);
-    this.location = location;
-  }
-  
-  @JRubyMethod
-  public RubyArray keys(ThreadContext context) {
-    RubyArray res = RubyArray.newArray(context.runtime);
-    for (String key : attributes) {
-      res.add(RubySymbol.newSymbol(context.runtime, key));
-    }
-    
-    return res;
-  }
-  
-  @JRubyMethod(name = "to_hash")
-  public IRubyObject toHash(ThreadContext context) {
-    RubyHash hash = RubyHash.newHash(context.runtime);
-    for (String key : attributes) {
-      hash.put(RubySymbol.newSymbol(context.runtime, key), get(context, context.runtime.newString(key)));
-    }
-    
-    return hash;
-  }
-  
-  @JRubyMethod(name = "[]")
-  public IRubyObject get(ThreadContext context, IRubyObject key) {
-    if (attributes.contains(key.toString())) {
-      return send(context, key, Block.NULL_BLOCK);
-    } else {
-      return context.runtime.getNil();
-    }
-  }
-  
-  @JRubyMethod
-  public IRubyObject distance(ThreadContext context, IRubyObject p2) {
-    LocationProxy p2loc = (LocationProxy)p2;
-    return context.runtime.newFloat(location.distance(p2loc.location));
-  }
-  
-  @JRubyMethod
-  public IRubyObject inspect(ThreadContext context) {
-    return toHash(context).inspect();
-  }
-  
-  @JRubyMethod(name = "city")
-  public IRubyObject getCity(ThreadContext context) {
-    return location.city == null ? context.runtime.getNil() : context.runtime.newString(location.city);
-  }
-  
-  @JRubyMethod(name = "postal_code")
-  public IRubyObject getPostalCode(ThreadContext context) {
-    return location.postalCode == null ? context.runtime.getNil() : context.runtime.newString(location.postalCode);
-  }
-
-  @JRubyMethod(name = "country_code")
-  public IRubyObject getCountryCode(ThreadContext context) {
-    return location.countryCode == null ? context.runtime.getNil() : context.runtime.newString(location.countryCode);
-  }
-
-  @JRubyMethod(name = "country_name")
-  public IRubyObject getCountryName(ThreadContext context) {
-    return location.countryName == null ? context.runtime.getNil() : context.runtime.newString(location.countryName);
-  }
-
-  @JRubyMethod(name = "region")
-  public IRubyObject getRegion(ThreadContext context) {
-    return location.region == null ? context.runtime.getNil() : context.runtime.newString(location.region);
-  }
-  
-  @JRubyMethod(name = "latitude")
-  public IRubyObject getLatitude(ThreadContext context) {
-    return context.runtime.newFloat(location.latitude);
-  }
-
-  @JRubyMethod(name = "longitude")
-  public IRubyObject getLongitude(ThreadContext context) {
-    return context.runtime.newFloat(location.longitude);
-  }
-
-  @JRubyMethod(name = "dma_code")
-  public IRubyObject getDMACode(ThreadContext context) {
-    return context.runtime.newFixnum(location.dma_code);
-  }
-
-  @JRubyMethod(name = "area_code")
-  public IRubyObject getAreaCode(ThreadContext context) {
-    return context.runtime.newFixnum(location.area_code);
-  }
-
-  @JRubyMethod(name = "metro_code")
-  public IRubyObject getMetroCode(ThreadContext context) {
-    return context.runtime.newFixnum(location.metro_code);
-  }
-}