geoip-c 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae090a902a2c6012eef837411743d23201d98c3a
-  data.tar.gz: e057da0aa1d34651f91a26fa0c3c586529cc493f
+  metadata.gz: b214921f3c6c8e001c5c4ba8f6644abd409eb82a
+  data.tar.gz: ba47aa25fe030a3a2ed16b6823920bd493a78145
 SHA512:
-  metadata.gz: 19193af7ae5b8bfb762ab8d4b8a7eecde9c00d776f1c96a2ee3029a05845db26a2525eba3a365f478f2b591cd0ade6ae24c1e49d6942a502b7df2a8ee923c508
-  data.tar.gz: e77e7cb91f5e4775a35f8db2962850b9d85141c38ef4ede81a73261d66a7e1468b72e222074056534f73a6b3740361176a27e9ca153e676250fe4a6724b15473
+  metadata.gz: 70537ae991d10c7ed6125e3311a2e94053ddb07db4cb009e134cb6a3da7a7387fe27184cc5e7bad41c313a9e28a0c719d2841e465eecb8e06ca3e9df49278546
+  data.tar.gz: 4b0e83e9f990e518a7bed7b57ee1263bb0ac73782fcf8ce4667a3297ab9acb8b9885644548a22d847b9a4a9bb9233a482bb8c86d379ead0baf77312c8cc4d72d

data/.gitignore

@@ -1,5 +1,6 @@
-pkg/
-doc/
+/.bundle
+/pkg
+/doc
 mkmf.log
 Makefile
 conftest.dSYM/
@@ -7,3 +8,5 @@ geoip.bundle
 geoip.so
 geoip.o
 Gemfile.lock
+/tmp
+/data

data/Changelog.md

@@ -1,3 +1,7 @@
+## 0.9.1 (14 October 2013)
+
+* Improves gem structure. (Luis Lavena)
+
 ## 0.9.0 (21 August 2013)
 
 * Returns UTF-8 encoded strings in Ruby 1.9. (Andy Lindeman)

data/Rakefile

@@ -3,23 +3,39 @@ require 'bundler/gem_tasks'
 require 'rake/clean'
 require 'rake/testtask'
 require 'rdoc/task'
+require "rake/extensiontask"
 
-task :default => [:compile, :test]
+task :default => [:test]
 
-CLEAN.add "geoip.{o,bundle,so,obj,pdb,lib,def,exp}"
-CLOBBER.add ['Makefile', 'mkmf.log','doc']
+CLOBBER.add 'doc', 'data'
 
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_files.add ['README.md', 'geoip.c']
+RDoc::Task.new do |rdoc|
   rdoc.main = "README.md" # page to start on
-  rdoc.rdoc_dir = 'doc/' # rdoc output folder
+  rdoc.rdoc_files.add ["README.md", "ext/geoip/geoip.c"]
+  rdoc.rdoc_dir = 'doc' # rdoc output folder
 end
 
 Rake::TestTask.new do |t|
-  t.test_files = ['test.rb']
   t.verbose = true
 end
 
-desc 'compile the extension'
-task(:compile => 'Makefile') { sh 'make' }
-file('Makefile' => "geoip.c") { ruby 'extconf.rb' }
+spec = Gem::Specification.load "geoip-c.gemspec"
+
+Rake::ExtensionTask.new("geoip", spec) do |ext|
+end
+
+directory "data"
+
+file "data/GeoLiteCity.dat" => ["data"] do |f|
+  url = "http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz"
+
+  sh "curl #{url} -o data/GeoLiteCity.dat.gz"
+  sh "gunzip data/GeoLiteCity.dat.gz"
+  touch f.name
+end
+
+task :database => ["data/GeoLiteCity.dat"] do
+  ENV['CITY'] = File.expand_path("data/GeoLiteCity.dat")
+end
+
+task :test => [:compile, :database]

data/{geoip.c → ext/geoip/geoip.c}

@@ -137,6 +137,7 @@ static VALUE generic_single_value_lookup_response(char *key, char *value)
 VALUE rb_city_record_to_hash(GeoIPRecord *record)
 {
   VALUE hash = rb_hash_new();
+  char *region_name;
 
   if(record->country_code)
     rb_hash_sset(hash, "country_code", encode_to_utf8_and_return_rb_str(record->country_code));
@@ -147,10 +148,9 @@ VALUE rb_city_record_to_hash(GeoIPRecord *record)
   if(record->region) {
     rb_hash_sset(hash, "region", encode_to_utf8_and_return_rb_str(record->region));
 
-    char *region_name = GeoIP_region_name_by_code(record->country_code, record->region);
-    if (region_name) {
+    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/geoip-c.gemspec

@@ -1,6 +1,8 @@
+# -*- encoding: utf-8 -*-
+
 Gem::Specification.new do |s|
   s.name         = 'geoip-c'
-  s.version      = "0.9.0"
+  s.version      = "0.9.1"
   s.licenses     = ['WTFPL']
 
   s.authors      = ['Ryan Dahl', 'Matt Todd', 'Charles Brian Quinn', 'Michael Sheakoski', 'Silvio Quadri', 'Andy Lindeman']
@@ -11,11 +13,11 @@ Gem::Specification.new do |s|
   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.test_files   = ['test/test_geoip.rb']
+  s.extensions   = ["ext/geoip/extconf.rb"]
 
-  s.add_development_dependency 'minitest', '~>5.0'
-  s.add_development_dependency 'rake', '~>10.0'
-  s.add_development_dependency 'rdoc', '~>4.0'
+  s.add_development_dependency 'minitest', '~> 5.0'
+  s.add_development_dependency 'rake', '~> 10.0'
+  s.add_development_dependency 'rdoc', '~> 4.0'
+  s.add_development_dependency "rake-compiler", "~> 0.9.1"
 end

data/{test.rb → test/test_geoip.rb}

@@ -1,8 +1,9 @@
 # encoding: utf-8
+
 require 'rubygems'
 gem 'minitest'
 require 'minitest/autorun'
-require File.dirname(__FILE__) + '/geoip'
+require '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')
@@ -115,7 +116,7 @@ class GeoIPCityTest < Minitest::Test
 
   def test_character_encoding_converted_to_utf8_first
     db = GeoIP::City.new(@dbfile, :filesystem, true)
-    assert_look_up(db, '201.85.50.148', :city, "Jundiaí")
+    assert_look_up(db, '201.85.50.148', :city, "São Paulo")
   end
 
   def test_empty_region_name_does_not_crash
@@ -124,6 +125,10 @@ class GeoIPCityTest < Minitest::Test
     assert_look_up(db, '119.236.232.169', :region_name, nil)
   end
 
+  def test_hong_kong_segfault
+    db = GeoIP::City.new(@dbfile, :filesystem, true)
+    assert_look_up(db, "61.93.14.4", :country_name, "Hong Kong")
+  end
 end
 
 class GeoIPOrgTest < Minitest::Test
@@ -170,5 +175,4 @@ class GeoIPOrgTest < Minitest::Test
       GeoIP::Organization.new('/supposed-to-fail')
     end
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoip-c
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Ryan Dahl
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-21 00:00:00.000000000 Z
+date: 2013-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -57,13 +57,27 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.1
 description: Generic GeoIP lookup tool. Based on the geoip_city RubyGem by Ryan Dahl
 email:
 - andy@andylindeman.com
 - mtodd@highgroove.com
 executables: []
 extensions:
-- extconf.rb
+- ext/geoip/extconf.rb
 extra_rdoc_files: []
 files:
 - .gitignore
@@ -71,10 +85,10 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- extconf.rb
+- ext/geoip/extconf.rb
+- ext/geoip/geoip.c
 - geoip-c.gemspec
-- geoip.c
-- test.rb
+- test/test_geoip.rb
 homepage: http://github.com/mtodd/geoip
 licenses:
 - WTFPL
@@ -82,7 +96,7 @@ metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
-- .
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -100,4 +114,4 @@ signing_key:
 specification_version: 4
 summary: A Binding to the GeoIP C library
 test_files:
-- test.rb
+- test/test_geoip.rb