jgeoip 0.0.3-java → 0.0.4-java

data/lib/jgeoip/version.rb

@@ -1,3 +1,3 @@
 class JGeoIP
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

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

@@ -13,6 +13,7 @@ import java.util.HashSet;
 import java.util.Set;
 import java.lang.Object;
 import org.jruby.Ruby;
+import org.jruby.RubyNil;
 import org.jruby.RubyArray;
 import org.jruby.RubyClass;
 import org.jruby.RubyFixnum;
@@ -62,8 +63,12 @@ public class JGeoIPLibrary implements Library {
     }
 
     @JRubyMethod
-    public RubyHash city(ThreadContext context, IRubyObject searchString) throws IOException {
+    public IRubyObject city(ThreadContext context, IRubyObject searchString) throws IOException {
       Location location = cl.getLocation(searchString.toString());
+      if (location == null) {
+        RubyNil nil = new RubyNil(ruby);
+        return nil;
+      }
       
       RubyHash loc = new RubyHash(ruby);
       loc.put(RubySymbol.newSymbol(ruby, "city"), RubyString.newString(ruby, location.city));

data/test/unit/jgeoip_test.rb

@@ -18,5 +18,10 @@ class JGeoIPTest < Test::Unit::TestCase
       result = @geo.city('207.97.227.239')
       assert_equal 'San Francisco', result[:city] 
     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
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: jgeoip
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.0.3
+  version: 0.0.4
 platform: java
 authors:
 - Tobias Schlottke
@@ -82,7 +82,7 @@ files:
 - !binary |-
   bGliL2phdmEvZ2VvaXAtMS4yLjUuamFy
 - !binary |-
-  bGliL2phdmEvamdlb2lwLTAuMC4zLmphcg==
+  bGliL2phdmEvamdlb2lwLTAuMC40Lmphcg==
 - !binary |-
   bGliL2pnZW9pcC5yYg==
 - !binary |-