geoipdb 0.5.6-java → 0.5.7-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 132f6fde9a253cfc08c90276c6ff39a6b03ba48a
-  data.tar.gz: 8abeb447c126c6011c817a34f6284fea52eb32db
+  metadata.gz: 04aed61b867c130f48ebdd7c29b2b3264a58fb4f
+  data.tar.gz: bbcfea82ac72215a26f7d9d5e4dabb39644f1999
 SHA512:
-  metadata.gz: 70c1b265c2f42c0daf177b6c4f9c47e572f616fdc0ef63a30b558cdc1278d5100504b730770255c6534c250ffce8b567989ee0d5dc41d0740b0863ffd4f0a3df
-  data.tar.gz: 751b2acfdbaa3864ea689624eab464fed95d2a00cf3dcb731e559f73b89f9c55ff6b5e1b31c8ee3e9ad84ff6fe9738c1068d574b78a078f3be985b801e621b8f
+  metadata.gz: 1090dc70e2660b9706ac3fb29376e97403425f9631852f9249576600709b2cf8d6cd943c64b7a33cc12a4ce52aa8c48c18b4b31440aa487446159f08c2b2078f
+  data.tar.gz: 87803d3ad3ae4d2bd0daaf59693913ba4b14328fb44140e9ea85e178887d2bc68adaa8ee61ebd767539cddc74b204f85537a74629d0501f7f19b7dcb29865270

data/ext/geoipdb/geoipdb.c

@@ -74,7 +74,7 @@ VALUE build_ip_information_object(IpRange *range, City *city, char* isp) {
   rb_ivar_set(ip_information, rb_intern("@lng"), rb_float_new(city->lng) );
   rb_ivar_set(ip_information, rb_intern("@lat"), rb_float_new(city->lat) );
   rb_ivar_set(ip_information, rb_intern("@is_mobile"), range->is_mobile == 1 ? Qtrue : Qfalse );
-  rb_ivar_set(ip_information, rb_intern("@isp_name"), isp == NULL || strcmp(isp, "?") == 0 ? Qnil : ID2SYM( rb_intern(isp) ) );
+  rb_ivar_set(ip_information, rb_intern("@isp_name"), isp == NULL ? Qnil : ID2SYM( rb_intern(isp) ) );
 
   return ip_information;
 }

data/ext/geoipdb/src/IpRange.java

@@ -12,11 +12,8 @@ public class IpRange implements Comparable<IpRange>
         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];
-        }
+        // 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)

data/geoipdb.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "geoipdb"
-  spec.version       = "0.5.6"
+  spec.version       = "0.5.7"
   spec.authors       = ["LiquidM, Inc."]
   spec.email         = ["opensource@liquidm.com"]
   spec.description   = "Fast GeoIpDb implementation for Ruby"

data/lib/cgeoipdb.rb

@@ -1,2 +1 @@
-require 'rbconfig'
 require File.expand_path('../geoipdb.so', __FILE__)

data/lib/jgeoipdb.rb

@@ -1,4 +1,3 @@
-require 'rbconfig'
 require 'java'
 require File.expand_path('../geoipdb.jar', __FILE__)
 
@@ -6,7 +5,7 @@ class GeoIpDb
 
   def self.init(cities_file, ranges_file, cache_file)
     self.new(cities_file, ranges_file, cache_file)
-  rescue java.io.FileNotFoundException => e
+  rescue java.io.FileNotFoundException
     return nil
   end
 
@@ -35,7 +34,7 @@ class GeoIpDb
     info.lng = city.lng
     info.lat = city.lat
     info.is_mobile  = range.is_mobile
-    info.isp_name = isp ? isp.to_sym : :"?"
+    info.isp_name = isp && isp.to_sym
     info
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoipdb
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: java
 authors:
 - LiquidM, Inc.