geoip-c 0.7.0 → 0.7.1

data/Rakefile

@@ -22,7 +22,7 @@ end
 
 spec = Gem::Specification.new do |s|
   s.name              = 'geoip-c'
-  s.version           = "0.7.0"
+  s.version           = "0.7.1"
 
   s.authors           = ['Ryah Dahl', 'Matt Todd', 'Charles Brian Quinn', 'Michael Sheakoski', 'Silvio Quadri']
   s.email             = 'mtodd@highgroove.com'

data/extconf.rb

@@ -2,6 +2,10 @@ require 'mkmf'
 
 dir_config("geoip")
 
+unless have_func('iconv_open', 'iconv.h') or have_library('iconv', 'iconv_open', 'iconv.h')
+  abort "you must have iconv library installed!"
+end
+
 if have_library('GeoIP', 'GeoIP_record_by_ipnum') and have_header('GeoIPCity.h')
   create_makefile('geoip')
 else

data/geoip.c

@@ -8,6 +8,7 @@
 #include <ruby.h>
 #include <GeoIP.h>
 #include <GeoIPCity.h>
+#include "iconv.h"
 
 static VALUE mGeoIP;
 static VALUE mGeoIP_City;
@@ -25,6 +26,25 @@ void rb_hash_sset(VALUE hash, const char *str, VALUE v) {
   rb_hash_aset(hash, ID2SYM(rb_intern(str)), v);
 }
 
+/*  pulled from http://blog.inventic.eu/?p=238 and
+    https://github.com/Vagabond/erlang-iconv/blob/master/c_src/iconv_drv.c */
+static VALUE encode_to_utf8_and_return_rb_str(char *value) {
+  char dst[BUFSIZ];
+  size_t srclen = strlen(value);
+  size_t dstlen = srclen * 2;
+
+  char * pIn = value;
+  char * pOut = ( char*)dst;
+
+  iconv_t cd = iconv_open("UTF-8","ISO-8859-1");
+  iconv(cd, &pIn, &srclen, &pOut, &dstlen);
+  iconv_close(cd);
+
+  *(pOut++) = 0; /* ensure we null terminate */
+
+  return rb_str_new2(dst);
+}
+
 int check_load_option(VALUE load_option) {
   if(load_option == rb_geoip_memory) {
     return GEOIP_MEMORY_CACHE;
@@ -71,7 +91,7 @@ static VALUE generic_single_value_lookup_response(char *key, char *value)
 {
   VALUE result = rb_hash_new();
   if(value) {
-    rb_hash_sset(result, key, rb_str_new2(value));
+    rb_hash_sset(result, key, encode_to_utf8_and_return_rb_str(value));
     return result;
   } else {
     return Qnil;
@@ -85,17 +105,17 @@ VALUE rb_city_record_to_hash(GeoIPRecord *record)
   VALUE hash = rb_hash_new();
 
   if(record->country_code)
-    rb_hash_sset(hash, "country_code", rb_str_new2(record->country_code));
+    rb_hash_sset(hash, "country_code", encode_to_utf8_and_return_rb_str(record->country_code));
   if(record->country_code3)
-    rb_hash_sset(hash, "country_code3", rb_str_new2(record->country_code3));
+    rb_hash_sset(hash, "country_code3", encode_to_utf8_and_return_rb_str(record->country_code3));
   if(record->country_name)
-    rb_hash_sset(hash, "country_name", rb_str_new2(record->country_name));
+    rb_hash_sset(hash, "country_name", encode_to_utf8_and_return_rb_str(record->country_name));
   if(record->region)
-    rb_hash_sset(hash, "region", rb_str_new2(record->region));
+    rb_hash_sset(hash, "region", encode_to_utf8_and_return_rb_str(record->region));
   if(record->city)
-    rb_hash_sset(hash, "city", rb_str_new2(record->city));
+    rb_hash_sset(hash, "city", encode_to_utf8_and_return_rb_str(record->city));
   if(record->postal_code)
-    rb_hash_sset(hash, "postal_code", rb_str_new2(record->postal_code));
+    rb_hash_sset(hash, "postal_code", encode_to_utf8_and_return_rb_str(record->postal_code));
   if(record->latitude)
     rb_hash_sset(hash, "latitude", rb_float_new((double)record->latitude));
   if(record->longitude)

data/test.rb

@@ -4,6 +4,9 @@ require 'rubygems'
 # require 'ruby-debug'
 # Debugger.start
 
+CITY_DB = ENV.fetch("CITY", '/usr/local/GeoIP/share/GeoIP/GeoLiteCity.dat')
+ORG_DB  = ENV.fetch("ORG",  '/usr/local/GeoIP/share/GeoIP/GeoIPOrg.dat')
+
 class Test::Unit::TestCase
 
   def assert_look_up(db, addr, field, value)
@@ -69,7 +72,7 @@ class GeoIPCityTest < Test::Unit::TestCase
   
   def setup
     ## Change me!
-    @dbfile = '/usr/local/GeoIP/share/GeoIP/GeoLiteCity.dat'
+    @dbfile = CITY_DB
   end
 
   def test_construction_default
@@ -82,43 +85,48 @@ class GeoIPCityTest < Test::Unit::TestCase
     h = db.look_up('24.24.24.24')
     #debugger
     assert_kind_of Hash, h
-    assert_equal 'Jamaica', h[:city]
+    assert_equal 'New York', h[:city]
     assert_equal 'United States', h[:country_name]
   end
 
   def test_construction_index
     db = GeoIP::City.new(@dbfile, :index)
-    assert_look_up(db, '24.24.24.24', :city, 'Jamaica')
+    assert_look_up(db, '24.24.24.24', :city, 'New York')
   end
 
   def test_construction_filesystem
     db = GeoIP::City.new(@dbfile, :filesystem)
-    assert_look_up(db, '24.24.24.24', :city, 'Jamaica')
+    assert_look_up(db, '24.24.24.24', :city, 'New York')
   end
 
   def test_construction_memory
     db = GeoIP::City.new(@dbfile, :memory)
-    assert_look_up(db, '24.24.24.24', :city, 'Jamaica')
+    assert_look_up(db, '24.24.24.24', :city, 'New York')
   end
 
   def test_construction_filesystem_check
     db = GeoIP::City.new(@dbfile, :filesystem, true)
-    assert_look_up(db, '24.24.24.24', :city, 'Jamaica')
+    assert_look_up(db, '24.24.24.24', :city, 'New York')
   end
 
   def test_bad_db_file
     assert_raises Errno::ENOENT do
-      GeoIP::City.new('/blah')
+      GeoIP::City.new('/supposed-to-fail')
     end
   end
 
+  def test_character_encoding_converted_to_utf8_first
+    db = GeoIP::City.new(@dbfile, :filesystem, true)
+    assert_look_up(db, '201.85.50.148', :city, 'São Paulo')
+  end
+
 end
 
 class GeoIPOrgTest < Test::Unit::TestCase
   
   def setup
     ## Change me!
-    @dbfile = '/usr/local/GeoIP/share/GeoIP/GeoIPOrg.dat'
+    @dbfile = ORG_DB
   end
 
   def test_construction_default
@@ -155,7 +163,7 @@ class GeoIPOrgTest < Test::Unit::TestCase
 
   def test_bad_db_file
     assert_raises Errno::ENOENT do
-      GeoIP::Organization.new('/blah')
+      GeoIP::Organization.new('/supposed-to-fail')
     end
   end
 

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: geoip-c
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  hash: 1
+  prerelease: 
+  segments: 
+  - 0
+  - 7
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Ryah Dahl
@@ -13,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-29 00:00:00 -05:00
+date: 2011-03-08 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -41,21 +47,27 @@ rdoc_options: []
 require_paths: 
 - .
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: A Binding to the GeoIP C library