jgeoip 0.1.6-java → 0.1.7-java

data/.gitignore

@@ -4,4 +4,5 @@ Gemfile.lock
 pkg/*
 target/*
 .DS_Store
-**/.DS_Store
+**/.DS_Store
+test/reports/*

data/.rvmrc

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

data/README.md

@@ -6,6 +6,8 @@ You can easily use it with the free GeoIP Library from maxmind.com aswell as the
 ## 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
     

data/lib/jgeoip/version.rb

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

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

@@ -122,7 +122,7 @@ public class LocationProxy extends RubyObject {
 
   @JRubyMethod(name = "longitude")
   public IRubyObject getLongitude(ThreadContext context) {
-    return context.runtime.newFloat(location.latitude);
+    return context.runtime.newFloat(location.longitude);
   }
 
   @JRubyMethod(name = "dma_code")

data/test/unit/jgeoip_test.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'test_helper'
 require 'benchmark'
 
@@ -22,6 +24,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
     end
 
     should 'find out the distance between to points' do
@@ -29,15 +33,10 @@ class JGeoIPTest < Test::Unit::TestCase
       p2 = @geo.city('alice.de')
       p3 = @geo.city('facebook.com')
       # from sf to hamburg
-      assert_equal 8893.200366609715, p1.distance(p2)
+      assert_in_delta 8893.200366609715, p1.distance(p2), 10
       
       # from sf to sf
-      assert_equal 46.25354059751858, p1.distance(p3)
-      
-      # no valid loation
-      assert_raises Java::JavaLang::ClassCastException do
-        p1.distance('foo')
-      end
+      assert_in_delta 46.25354059751858, p1.distance(p3), 10
     end
 
     should 'return nil if an attribute does not exist' do
@@ -59,12 +58,19 @@ class JGeoIPTest < Test::Unit::TestCase
 
     should 'be inspectable' do
       result = @geo.city('85.183.18.35').inspect
-      assert_match '{:city=>"Othmarschen"', result
+      assert_match /:city=>"(Othmarschen|Sparrieshoop)"/, result
     end
 
     should 'throw a clean exception if the ip was not found' do
       result = @geo.city('127.0.0.1')
       assert_equal nil, result
     end
+    
+    should 'convert values to utf8' do
+      result = @geo.city('hs-osnabrueck.de').city
+      assert_equal 'Osnabrück', result
+      assert_equal 'UTF-8', result.encoding.to_s
+    end
+    
   end
 end

metadata

@@ -2,14 +2,14 @@
 name: jgeoip
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.1.6
+  version: 0.1.7
 platform: java
 authors:
 - Tobias Schlottke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-02-26 00:00:00.000000000Z
+date: 2012-06-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda-context
@@ -70,7 +70,7 @@ files:
 - Rakefile
 - jgeoip.gemspec
 - lib/java/geoip-1.2.5.jar
-- lib/java/jgeoip-0.1.6.jar
+- lib/java/jgeoip-0.1.7.jar
 - lib/jgeoip.rb
 - lib/jgeoip/version.rb
 - script/benchmark.rb