jgeoip 0.1.5-java → 0.1.6-java

data/.rvmrc

@@ -1,2 +1,2 @@
-rvm use jruby-head
+rvm use jruby-1.6.7
 

data/README.md

@@ -1,32 +1,45 @@
-## Fast JRuby GeoIP Extension
+# 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
-
+## example
+### City Lookup
     p JGeoIP.new('/opt/MaxMind/GeoLiteCity.dat').city('github.com')
 
 Will return a Location object with all the result properties and a #to_hash method
+    
+### Distance between two locations (km)
+    p1 = @geo.city('github.com')
+    p2 = @geo.city('facebook.com')
+    
+    p p1.distance(p2)
+    # => 46.25354059751858
 
-
-### speed?
+## 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:
 
-    pure ruby GeoIP:
-     35.614000   0.000000  35.614000 ( 35.614000)
+#### JGeoIP
     JGeoIP (>=0.1.5):
       0.285000   0.000000   0.285000 (  0.286000)
-    JGeoIP (non extension version, <0.1.5):
+    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
-* switch back to an extension and a proxy object: this is surely faster. but time is money at the moment
 * 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/lib/jgeoip/version.rb

@@ -1,3 +1,3 @@
 class JGeoIP
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/script/benchmark.rb

@@ -1,4 +1,5 @@
 require 'benchmark'
+require 'rubygems'
 
 def benchmark(description, &block)
   puts description
@@ -13,24 +14,32 @@ def benchmark(description, &block)
     }
   }
 end
-# check the JGeoIP
-require File.expand_path('../../lib/jgeoip.rb', __FILE__)
 
-# check the pure lib
-# require 'geoip'
-# db = GeoIP.new('/opt/MaxMind/GeoLiteCity.dat')
-# benchmark 'pure ruby GeoIP:'   do
-#   result = db.city('github.com')
-# 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('/opt/MaxMind/GeoLiteCity.dat')
-benchmark 'JGeoIP:' do
-  result = db.city('github.com')
+  db = JGeoIP.new(DB_FILE)
+  benchmark 'JGeoIP:' do
+    result = db.city('github.com')
+  end
 end
 
-db = JGeoIPJava.new('/opt/MaxMind/GeoLiteCity.dat')
-benchmark 'JGeoIPJava:' do
+# 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/LocationProxy.java

@@ -79,6 +79,12 @@ public class LocationProxy extends RubyObject {
     }
   }
   
+  @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();

data/test/unit/jgeoip_test.rb

@@ -24,6 +24,22 @@ class JGeoIPTest < Test::Unit::TestCase
       assert_equal 'United States', result[:country_name]
     end
 
+    should 'find out the distance between to points' do
+      p1 = @geo.city('github.com')
+      p2 = @geo.city('alice.de')
+      p3 = @geo.city('facebook.com')
+      # from sf to hamburg
+      assert_equal 8893.200366609715, p1.distance(p2)
+      
+      # from sf to sf
+      assert_equal 46.25354059751858, p1.distance(p3)
+      
+      # no valid loation
+      assert_raises Java::JavaLang::ClassCastException do
+        p1.distance('foo')
+      end
+    end
+
     should 'return nil if an attribute does not exist' do
       result = @geo.city('207.97.227.239')
       assert_equal nil, result[:fooooooo]

metadata

@@ -2,7 +2,7 @@
 name: jgeoip
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.1.5
+  version: 0.1.6
 platform: java
 authors:
 - Tobias Schlottke
@@ -70,7 +70,7 @@ files:
 - Rakefile
 - jgeoip.gemspec
 - lib/java/geoip-1.2.5.jar
-- lib/java/jgeoip-0.1.5.jar
+- lib/java/jgeoip-0.1.6.jar
 - lib/jgeoip.rb
 - lib/jgeoip/version.rb
 - script/benchmark.rb