geoip-c 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91eed9251f7822fa17eb0cea5ebab05b6e51f57c
-  data.tar.gz: c7aa1ea30ea0f17ae49df12ae3bf6b54fec8f17d
+  metadata.gz: ae090a902a2c6012eef837411743d23201d98c3a
+  data.tar.gz: e057da0aa1d34651f91a26fa0c3c586529cc493f
 SHA512:
-  metadata.gz: 14e5521793aabd18dc0fa7c1a4b19a2b6b73a99060b2d23f5fc3c0dd6ab1ad68405a9dd02f552338aae3b49033f4cce4100ad19c81e374f7ac4056a90b7b277d
-  data.tar.gz: b0e6944f68b08ad9556692eb149a75c5386964e0f359442fbb799b5db240e8382cf64289d291584ede42aa0ec78f1e2acd1b528142001b7f65f1c324cf1cc5ac
+  metadata.gz: 19193af7ae5b8bfb762ab8d4b8a7eecde9c00d776f1c96a2ee3029a05845db26a2525eba3a365f478f2b591cd0ade6ae24c1e49d6942a502b7df2a8ee923c508
+  data.tar.gz: e77e7cb91f5e4775a35f8db2962850b9d85141c38ef4ede81a73261d66a7e1468b72e222074056534f73a6b3740361176a27e9ca153e676250fe4a6724b15473

data/.gitignore

@@ -0,0 +1,9 @@
+pkg/
+doc/
+mkmf.log
+Makefile
+conftest.dSYM/
+geoip.bundle
+geoip.so
+geoip.o
+Gemfile.lock

data/Changelog.md

@@ -0,0 +1,5 @@
+## 0.9.0 (21 August 2013)
+
+* Returns UTF-8 encoded strings in Ruby 1.9. (Andy Lindeman)
+* Adds license (WTFPL) to gemspec. (Andy Lindeman)
+* Fixes crash if region name cannot be found. (Andy Lindeman)

data/Gemfile

@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gemspec

data/Rakefile

@@ -1,8 +1,8 @@
 require 'rake'
+require 'bundler/gem_tasks'
 require 'rake/clean'
 require 'rake/testtask'
 require 'rdoc/task'
-require 'rubygems/package_task'
 
 task :default => [:compile, :test]
 
@@ -10,8 +10,8 @@ CLEAN.add "geoip.{o,bundle,so,obj,pdb,lib,def,exp}"
 CLOBBER.add ['Makefile', 'mkmf.log','doc']
 
 Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_files.add ['README', 'geoip.c']
-  rdoc.main = "README" # page to start on
+  rdoc.rdoc_files.add ['README.md', 'geoip.c']
+  rdoc.main = "README.md" # page to start on
   rdoc.rdoc_dir = 'doc/' # rdoc output folder
 end
 
@@ -20,36 +20,6 @@ Rake::TestTask.new do |t|
   t.verbose = true
 end
 
-spec = Gem::Specification.new do |s|
-  s.name              = 'geoip-c'
-  s.version           = "0.8.2"
-
-  s.authors           = ['Ryah Dahl', 'Matt Todd', 'Andy Lindeman']
-  s.email             = ['alindeman@gmail.com', 'mtodd@highgroove.com']
-
-  s.summary           = "A Binding to the GeoIP C library"
-  s.description       = 'Generic GeoIP lookup tool. Based on the geoip_city RubyGem by Ryah Dahl'
-  s.homepage          = "http://github.com/mtodd/geoip"
-
-  s.files             = ["Rakefile", "extconf.rb", "test.rb", "geoip.c", "README.md"]
-  s.test_files        = ['test.rb']
-  s.extensions        = ['extconf.rb']
-  s.require_path      = '.'
-end
-
-Gem::PackageTask.new(spec) do |p|
-  p.need_tar = true
-  p.gem_spec = spec
-end
-
 desc 'compile the extension'
 task(:compile => 'Makefile') { sh 'make' }
 file('Makefile' => "geoip.c") { ruby 'extconf.rb' }
-
-task :install => [:gem] do
-  `env ARCHFLAGS="-arch i386" gem install pkg/geoip-c-0.8.2.gem -- --with-geoip-dir=/usr/local/GeoIP`
-end
-
-task(:webpage) do
-  sh 'scp -r doc/* rydahl@rubyforge.org:/var/www/gforge-projects/geoip-city/'
-end

data/geoip-c.gemspec

@@ -0,0 +1,21 @@
+Gem::Specification.new do |s|
+  s.name         = 'geoip-c'
+  s.version      = "0.9.0"
+  s.licenses     = ['WTFPL']
+
+  s.authors      = ['Ryan Dahl', 'Matt Todd', 'Charles Brian Quinn', 'Michael Sheakoski', 'Silvio Quadri', 'Andy Lindeman']
+  s.email        = ['andy@andylindeman.com', 'mtodd@highgroove.com']
+
+  s.summary      = "A Binding to the GeoIP C library"
+  s.description  = 'Generic GeoIP lookup tool. Based on the geoip_city RubyGem by Ryan Dahl'
+  s.homepage     = "http://github.com/mtodd/geoip"
+
+  s.files        = `git ls-files`.split("\n")
+  s.test_files   = ['test.rb']
+  s.extensions   = ['extconf.rb']
+  s.require_path = '.'
+
+  s.add_development_dependency 'minitest', '~>5.0'
+  s.add_development_dependency 'rake', '~>10.0'
+  s.add_development_dependency 'rdoc', '~>4.0'
+end

data/geoip.c

@@ -10,6 +10,26 @@
 #include <GeoIPCity.h>
 #include "iconv.h"
 
+// String encoding support for 1.9 while maintaining 1.8 compatibility
+// <http://tenderlovemaking.com/2009/06/26/string-encoding-in-ruby-1-9-c-extensions.html>
+#ifdef HAVE_RUBY_ENCODING_H
+
+#include <ruby/encoding.h>
+#define ENCODED_STR_NEW2(str, encoding) \
+  ({ \
+    VALUE _string = rb_str_new2((const char *)str); \
+    int _enc = rb_enc_find_index(encoding); \
+    rb_enc_associate_index(_string, _enc); \
+    _string; \
+  })
+
+#else
+
+#define ENCODED_STR_NEW2(str, encoding) \
+  rb_str_new2((const char *)str)
+
+#endif
+
 static VALUE mGeoIP;
 static VALUE mGeoIP_City;
 static VALUE mGeoIP_Country;
@@ -56,7 +76,7 @@ static VALUE encode_to_utf8_and_return_rb_str(char *value) {
 
   *(pOut++) = 0; /* ensure we null terminate */
 
-  return rb_str_new2(dst);
+  return ENCODED_STR_NEW2(dst, "UTF-8");
 }
 
 int check_load_option(VALUE load_option) {
@@ -126,7 +146,11 @@ VALUE rb_city_record_to_hash(GeoIPRecord *record)
     rb_hash_sset(hash, "country_name", encode_to_utf8_and_return_rb_str(record->country_name));
   if(record->region) {
     rb_hash_sset(hash, "region", encode_to_utf8_and_return_rb_str(record->region));
-    rb_hash_sset(hash, "region_name", encode_to_utf8_and_return_rb_str(GeoIP_region_name_by_code(record->country_code, record->region)));
+
+    char *region_name = GeoIP_region_name_by_code(record->country_code, record->region);
+    if (region_name) {
+      rb_hash_sset(hash, "region_name", encode_to_utf8_and_return_rb_str(region_name));
+    }
   }
   if(record->city)
     rb_hash_sset(hash, "city", encode_to_utf8_and_return_rb_str(record->city));

data/test.rb

@@ -1,62 +1,60 @@
-require 'test/unit'
-require File.dirname(__FILE__) + '/geoip'
+# encoding: utf-8
 require 'rubygems'
-# require 'ruby-debug'
-# Debugger.start
+gem 'minitest'
+require 'minitest/autorun'
+require File.dirname(__FILE__) + '/geoip'
 
 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
-
+class Minitest::Test
   def assert_look_up(db, addr, field, value)
     h = db.look_up(addr)
     assert_equal value, h[field]
     h
   end
-
 end
 
-class GeoIPTest < Test::Unit::TestCase
-  
+class GeoIPTest < Minitest::Test
+
   def setup
     @ip = "24.24.24.24"
     @ipnum = 16777216*24 + 65536*24 + 256*24 + 24
-    
+
     @large_ip = "245.245.245.245"
     @large_ipnum = 16777216*245 + 65536*245 + 256*245 + 245
   end
-  
+
   # addr_to_num
-  
+
   def test_addr_to_num_converts_an_ip_to_an_ipnum
     assert_equal @ipnum, GeoIP.addr_to_num(@ip)
   end
-  
+
   def test_addr_to_num_converts_large_ips_to_an_ipnum_correctly
     assert_equal @large_ipnum, GeoIP.addr_to_num(@large_ip)
   end
-  
+
   def test_addr_to_num_expects_an_ip_string
-    assert_raises TypeError do 
-      GeoIP.addr_to_num(nil) 
+    assert_raises TypeError do
+      GeoIP.addr_to_num(nil)
     end
   end
-  
+
   def test_addr_to_num_returns_zero_for_an_illformed_ip_string
     assert_equal 0, GeoIP.addr_to_num("foo.bar")
   end
-  
+
   # num_to_addr
-  
+
   def test_num_to_addr_converts_an_ipnum_to_an_ip
     assert_equal @ip, GeoIP.num_to_addr(@ipnum)
   end
-  
+
   def test_num_to_addr_converts_large_ipnums_to_an_ip_correctly
     assert_equal @large_ip, GeoIP.num_to_addr(@large_ipnum)
   end
-  
+
   def test_num_to_addr_expects_a_numeric_ip
     assert_raises TypeError do
       GeoIP.num_to_addr(nil)
@@ -65,11 +63,11 @@ class GeoIPTest < Test::Unit::TestCase
       GeoIP.num_to_addr("foo.bar")
     end
   end
-  
+
 end
 
-class GeoIPCityTest < Test::Unit::TestCase
-  
+class GeoIPCityTest < Minitest::Test
+
   def setup
     ## Change me!
     @dbfile = CITY_DB
@@ -77,36 +75,36 @@ class GeoIPCityTest < Test::Unit::TestCase
 
   def test_construction_default
     db = GeoIP::City.new(@dbfile)
-    
-    assert_raises TypeError do 
-      db.look_up(nil) 
+
+    assert_raises TypeError do
+      db.look_up(nil)
     end
-    
+
     h = db.look_up('24.24.24.24')
     #debugger
     assert_kind_of Hash, h
-    assert_equal 'New York', h[:city]
+    assert_equal 'Deer Park', 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, 'New York')
+    assert_look_up(db, '24.24.24.24', :city, 'Deer Park')
   end
 
   def test_construction_filesystem
     db = GeoIP::City.new(@dbfile, :filesystem)
-    assert_look_up(db, '24.24.24.24', :city, 'New York')
+    assert_look_up(db, '24.24.24.24', :city, 'Deer Park')
   end
 
   def test_construction_memory
     db = GeoIP::City.new(@dbfile, :memory)
-    assert_look_up(db, '24.24.24.24', :city, 'New York')
+    assert_look_up(db, '24.24.24.24', :city, 'Deer Park')
   end
 
   def test_construction_filesystem_check
     db = GeoIP::City.new(@dbfile, :filesystem, true)
-    assert_look_up(db, '24.24.24.24', :city, 'New York')
+    assert_look_up(db, '24.24.24.24', :city, 'Deer Park')
   end
 
   def test_bad_db_file
@@ -117,13 +115,19 @@ class GeoIPCityTest < Test::Unit::TestCase
 
   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')
+    assert_look_up(db, '201.85.50.148', :city, "Jundiaí")
+  end
+
+  def test_empty_region_name_does_not_crash
+    db = GeoIP::City.new(@dbfile, :filesystem, true)
+    assert_look_up(db, '119.236.232.169', :region, "00")
+    assert_look_up(db, '119.236.232.169', :region_name, nil)
   end
 
 end
 
-class GeoIPOrgTest < Test::Unit::TestCase
-  
+class GeoIPOrgTest < Minitest::Test
+
   def setup
     ## Change me!
     @dbfile = ORG_DB
@@ -131,11 +135,11 @@ class GeoIPOrgTest < Test::Unit::TestCase
 
   def test_construction_default
     db = GeoIP::Organization.new(@dbfile)
-    
-    assert_raises TypeError do 
-      db.look_up(nil) 
+
+    assert_raises TypeError do
+      db.look_up(nil)
     end
-    
+
     h = db.look_up('24.24.24.24')
     assert_kind_of Hash, h
     assert_equal 'Road Runner', h[:name]

metadata

@@ -1,33 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: geoip-c
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
-- Ryah Dahl
+- Ryan Dahl
 - Matt Todd
+- Charles Brian Quinn
+- Michael Sheakoski
+- Silvio Quadri
 - Andy Lindeman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
-dependencies: []
-description: Generic GeoIP lookup tool. Based on the geoip_city RubyGem by Ryah Dahl
+date: 2013-08-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+description: Generic GeoIP lookup tool. Based on the geoip_city RubyGem by Ryan Dahl
 email:
-- alindeman@gmail.com
+- andy@andylindeman.com
 - mtodd@highgroove.com
 executables: []
 extensions:
 - extconf.rb
 extra_rdoc_files: []
 files:
+- .gitignore
+- Changelog.md
+- Gemfile
+- README.md
 - Rakefile
 - extconf.rb
-- test.rb
+- geoip-c.gemspec
 - geoip.c
-- README.md
+- test.rb
 homepage: http://github.com/mtodd/geoip
-licenses: []
+licenses:
+- WTFPL
 metadata: {}
 post_install_message: 
 rdoc_options: []