geoipdb 0.4.2 → 0.4.3

data/.gitignore

@@ -0,0 +1,12 @@
+.bundle
+.yardoc
+Gemfile.lock
+coverage
+doc
+ext/Makefile
+ext/geoipdb/Makefile
+ext/geoipdb/geoipdb.bundle
+ext/geoipdb/geoipdb.o
+ext/geoipdb/ipdb.o
+pkg
+rdoc

data/.rvmrc

@@ -0,0 +1 @@
+rvm use --create ruby-1.9.3-p286@geoipdb

data/Gemfile

@@ -1,13 +1,10 @@
-source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
+source :rubygems
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec", "~> 2.1.0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.1"
-  gem "rcov", ">= 0"
+  gem 'bundler'
+  gem 'rake'
+  gem 'redcarpet'
+  gem 'rspec'
+  gem 'simplecov'
+  gem 'yard'
 end

data/Rakefile

@@ -1,49 +1,8 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
+#!/usr/bin/env rake
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "geoipdb"
-  gem.homepage = "http://github.com/madvertise/geoipdb"
-  gem.license = "MIT"
-  gem.summary = %Q{Fast (>3 Mio queries/sec!!!) GeoIpDb implementation for Ruby using C-Extensions.}
-  gem.description = %Q{Returns a GeoLocation and additional information for given IP. Reads Data from CSV-Files and uses internal binary caching.}
-  gem.email = "eugeniusmartinus@googlemail.com"
-  gem.authors = ["Eugen Martin", "Martin Karlsch"]
-  gem.extensions   = ['ext/geoipdb/extconf.rb']
-  gem.require_paths = ["lib","ext"]
-   
-end
-Jeweler::RubygemsDotOrgTasks.new
+require "bundler/setup"
+require "bundler/gem_tasks"
 
-require 'rspec/core'
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-end
+Dir['tasks/**/*.rake'].each { |t| load t }
 
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "geoipdb #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+task :default => [:spec]

data/ext/geoipdb/ipdb.c

@@ -7,59 +7,59 @@
 #include <sys/time.h>
 
 const char country_iso2_codes[253][3] = { "--","ap","eu","ad","ae","af","ag","ai","al","am","an",
-	"ao","aq","ar","as","at","au","aw","az","ba","bb",
-	"bd","be","bf","bg","bh","bi","bj","bm","bn","bo",
-	"br","bs","bt","bv","bw","by","bz","ca","cc","cd",
-	"cf","cg","ch","ci","ck","cl","cm","cn","co","cr",
-	"cu","cv","cx","cy","cz","de","dj","dk","dm","do",
-	"dz","ec","ee","eg","eh","er","es","et","fi","fj",
-	"fk","fm","fo","fr","fx","ga","gb","gd","ge","gf",
-	"gh","gi","gl","gm","gn","gp","gq","gr","gs","gt",
-	"gu","gw","gy","hk","hm","hn","hr","ht","hu","id",
-	"ie","il","in","io","iq","ir","is","it","jm","jo",
-	"jp","ke","kg","kh","ki","km","kn","kp","kr","kw",
-	"ky","kz","la","lb","lc","li","lk","lr","ls","lt",
-	"lu","lv","ly","ma","mc","md","mg","mh","mk","ml",
-	"mm","mn","mo","mp","mq","mr","ms","mt","mu","mv",
-	"mw","mx","my","mz","na","nc","ne","nf","ng","ni",
-	"nl","no","np","nr","nu","nz","om","pa","pe","pf",
-	"pg","ph","pk","pl","pm","pn","pr","ps","pt","pw",
-	"py","qa","re","ro","ru","rw","sa","sb","sc","sd",
-	"se","sg","sh","si","sj","sk","sl","sm","sn","so",
-	"sr","st","sv","sy","sz","tc","td","tf","tg","th",
-	"tj","tk","tm","tn","to","tl","tr","tt","tv","tw",
-	"tz","ua","ug","um","us","uy","uz","va","vc","ve",
-	"vg","vi","vn","vu","wf","ws","ye","yt","rs","za",
-	"zm","me","zw","a1","a2","o1","ax","gg","im","je",
+  "ao","aq","ar","as","at","au","aw","az","ba","bb",
+  "bd","be","bf","bg","bh","bi","bj","bm","bn","bo",
+  "br","bs","bt","bv","bw","by","bz","ca","cc","cd",
+  "cf","cg","ch","ci","ck","cl","cm","cn","co","cr",
+  "cu","cv","cx","cy","cz","de","dj","dk","dm","do",
+  "dz","ec","ee","eg","eh","er","es","et","fi","fj",
+  "fk","fm","fo","fr","fx","ga","gb","gd","ge","gf",
+  "gh","gi","gl","gm","gn","gp","gq","gr","gs","gt",
+  "gu","gw","gy","hk","hm","hn","hr","ht","hu","id",
+  "ie","il","in","io","iq","ir","is","it","jm","jo",
+  "jp","ke","kg","kh","ki","km","kn","kp","kr","kw",
+  "ky","kz","la","lb","lc","li","lk","lr","ls","lt",
+  "lu","lv","ly","ma","mc","md","mg","mh","mk","ml",
+  "mm","mn","mo","mp","mq","mr","ms","mt","mu","mv",
+  "mw","mx","my","mz","na","nc","ne","nf","ng","ni",
+  "nl","no","np","nr","nu","nz","om","pa","pe","pf",
+  "pg","ph","pk","pl","pm","pn","pr","ps","pt","pw",
+  "py","qa","re","ro","ru","rw","sa","sb","sc","sd",
+  "se","sg","sh","si","sj","sk","sl","sm","sn","so",
+  "sr","st","sv","sy","sz","tc","td","tf","tg","th",
+  "tj","tk","tm","tn","to","tl","tr","tt","tv","tw",
+  "tz","ua","ug","um","us","uy","uz","va","vc","ve",
+  "vg","vi","vn","vu","wf","ws","ye","yt","rs","za",
+  "zm","me","zw","a1","a2","o1","ax","gg","im","je",
   "bl","mf"};
 
 static const unsigned num_countries = (unsigned)(sizeof(country_iso2_codes)/sizeof(country_iso2_codes[0]));
 
 const char country_iso3_codes[253][4] = { "--","ap","eu","and","are","afg","atg","aia","alb","arm","ant",
-	"ago","aq","arg","asm","aut","aus","abw","aze","bih","brb",
-	"bgd","bel","bfa","bgr","bhr","bdi","ben","bmu","brn","bol",
-	"bra","bhs","btn","bv","bwa","blr","blz","can","cc","cod",
-	"caf","cog","che","civ","cok","chl","cmr","chn","col","cri",
-	"cub","cpv","cx","cyp","cze","deu","dji","dnk","dma","dom",
-	"dza","ecu","est","egy","esh","eri","esp","eth","fin","fji",
-	"flk","fsm","fro","fra","fx","gab","gbr","grd","geo","guf",
-	"gha","gib","grl","gmb","gin","glp","gnq","grc","gs","gtm",
-	"gum","gnb","guy","hkg","hm","hnd","hrv","hti","hun","idn",
-	"irl","isr","ind","io","irq","irn","isl","ita","jam","jor",
-	"jpn","ken","kgz","khm","kir","com","kna","prk","kor","kwt",
-	"cym","kaz","lao","lbn","lca","lie","lka","lbr","lso","ltu",
-	"lux","lva","lby","mar","mco","mda","mdg","mhl","mkd","mli",
-	"mmr","mng","mac","mnp","mtq","mrt","msr","mlt","mus","mdv",
-	"mwi","mex","mys","moz","nam","ncl","ner","nfk","nga","nic",
-	"nld","nor","npl","nru","niu","nzl","omn","pan","per","pyf",
-	"png","phl","pak","pol","spm","pcn","pri","pse","prt","plw",
-	"pry","qat","reu","rou","rus","rwa","sau","slb","syc","sdn",
-	"swe","sgp","shn","svn","sjm","svk","sle","smr","sen","som",
-	"sur","stp","slv","syr","swz","tca","tcd","tf","tgo","tha",
-	"tjk","tkl","tkm","tun","ton","tls","tur","tto","tuv","twn",
-	"tza","ukr","uga","um","usa","ury","uzb","vat","vct","ven",
-	"vgb","vir","vnm","vut","wlf","wsm","yem","yt","srb","zaf",
-	"zmb","mne","zwe","a1","a2","o1","ala","ggy","imn","jey",
+  "ago","aq","arg","asm","aut","aus","abw","aze","bih","brb",
+  "bgd","bel","bfa","bgr","bhr","bdi","ben","bmu","brn","bol",
+  "bra","bhs","btn","bv","bwa","blr","blz","can","cc","cod",
+  "caf","cog","che","civ","cok","chl","cmr","chn","col","cri",
+  "cub","cpv","cx","cyp","cze","deu","dji","dnk","dma","dom",
+  "dza","ecu","est","egy","esh","eri","esp","eth","fin","fji",
+  "flk","fsm","fro","fra","fx","gab","gbr","grd","geo","guf",
+  "gha","gib","grl","gmb","gin","glp","gnq","grc","gs","gtm",
+  "gum","gnb","guy","hkg","hm","hnd","hrv","hti","hun","idn",
+  "irl","isr","ind","io","irq","irn","isl","ita","jam","jor",
+  "jpn","ken","kgz","khm","kir","com","kna","prk","kor","kwt",
+  "cym","kaz","lao","lbn","lca","lie","lka","lbr","lso","ltu",
+  "lux","lva","lby","mar","mco","mda","mdg","mhl","mkd","mli",
+  "mmr","mng","mac","mnp","mtq","mrt","msr","mlt","mus","mdv",
+  "mwi","mex","mys","moz","nam","ncl","ner","nfk","nga","nic",
+  "nld","nor","npl","nru","niu","nzl","omn","pan","per","pyf",
+  "png","phl","pak","pol","spm","pcn","pri","pse","prt","plw",
+  "pry","qat","reu","rou","rus","rwa","sau","slb","syc","sdn",
+  "swe","sgp","shn","svn","sjm","svk","sle","smr","sen","som",
+  "sur","stp","slv","syr","swz","tca","tcd","tf","tgo","tha",
+  "tjk","tkl","tkm","tun","ton","tls","tur","tto","tuv","twn",
+  "tza","ukr","uga","um","usa","ury","uzb","vat","vct","ven",
+  "vgb","vir","vnm","vut","wlf","wsm","yem","yt","srb","zaf",
+  "zmb","mne","zwe","a1","a2","o1","ala","ggy","imn","jey",
   "blm","maf"};
 
 
@@ -110,34 +110,34 @@ get_time(struct timeval *tim){
 
 unsigned long
 ip_to_int(const char *addr){
-	unsigned int    c, octet, t;
-	unsigned long   ipnum;
-	int             i = 3;
-
-	octet = ipnum = 0;
-	while ((c = *addr++)) {
-		if (c == '.') {
-			if (octet > 255)
-				return 0;
-			ipnum <<= 8;
-			ipnum += octet;
-			i--;
-			octet = 0;
-		} else {
-			t = octet;
-			octet <<= 3;
-			octet += t;
-			octet += t;
-			c -= '0';
-			if (c > 9)
-				return 0;
-			octet += c;
-		}
-	}
-	if ((octet > 255) || (i != 0))
-		return 0;
-	ipnum <<= 8;
-	return ipnum + octet;
+  unsigned int    c, octet, t;
+  unsigned long   ipnum;
+  int             i = 3;
+
+  octet = ipnum = 0;
+  while ((c = *addr++)) {
+    if (c == '.') {
+      if (octet > 255)
+        return 0;
+      ipnum <<= 8;
+      ipnum += octet;
+      i--;
+      octet = 0;
+    } else {
+      t = octet;
+      octet <<= 3;
+      octet += t;
+      octet += t;
+      c -= '0';
+      if (c > 9)
+        return 0;
+      octet += c;
+    }
+  }
+  if ((octet > 255) || (i != 0))
+    return 0;
+  ipnum <<= 8;
+  return ipnum + octet;
 }
 
 
@@ -166,12 +166,12 @@ unsigned char con_type_to_int(char* con_type) {
 int compare_ranges(const void *fa, const void *fb) {
   if(fa == NULL)
   {
-    printf("FA IS NULL!!!\n");
+    if(DEBUG){printf("FA IS NULL!!!\n");}
     return 0;
   }
   if(fb == NULL)
   {
-    printf("FB IS NULL!!!\n");
+    if(DEBUG){printf("FB IS NULL!!!\n");}
     return 0;
   }
 
@@ -262,13 +262,13 @@ IpRange* find_range_for_ip(IPDB *db, char *ip) {
 
   if(db == NULL)
   {
-    printf("ERROR: DB ist NULL! ");
+    if(DEBUG){printf("ERROR: DB ist NULL! \n");}
     return NULL;
   }
 
   if(db->ranges_count == 0)
   {
-    printf("ERROR: DB has no Ranges Data. Can not search!\n");
+    if(DEBUG){printf("ERROR: DB has no Ranges Data. Can not search!\n");}
     return NULL;
   }
 
@@ -319,7 +319,7 @@ City * find_city_for_ip_range(IPDB * db, IpRange* range)
 char* find_isp_for_ip_range(IPDB * db, IpRange* range)
 {
   if( range == NULL || range->isp_index < 0){
-    printf("Could not find isp for isp_index=%i", range->isp_index);
+    if(DEBUG){printf("Could not find isp for isp_index=%i\n", range->isp_index);}
     return NULL;
   }
   return db->isps[range->isp_index];
@@ -346,7 +346,7 @@ isp_index_by_name(IPDB * db, char* isp_name){
     db->isps_count++;
     return new_index;
   }else{
-    printf("ERROR: MAX_ISPS_COUNT = %i limit reached - this should not happen!", MAX_ISPS_COUNT);
+    if(DEBUG){printf("ERROR: MAX_ISPS_COUNT = %i limit reached - this should not happen!\n", MAX_ISPS_COUNT);}
     return -1;
   }
 }
@@ -368,7 +368,7 @@ read_ranges_csv(IPDB * db){
   if(f == NULL)
   {
     if(DEBUG)
-      printf("Could not open the CSV-file: %s", db->ranges_csv_file);
+      printf("Could not open the CSV-file: %s\n", db->ranges_csv_file);
     return;
   }
   char line[256];
@@ -378,7 +378,7 @@ read_ranges_csv(IPDB * db){
   int city_index;
 
   char* con_type;
-	char* isp_name;
+  char* isp_name;
   uint16 isp_index;
 
   int invalid_cities_count = 0;
@@ -392,7 +392,7 @@ read_ranges_csv(IPDB * db){
     city_index = 0;
 
     con_type = NULL;
-  	isp_name = NULL;
+    isp_name = NULL;
     int16 isp_index = -1;
 
     if(DEBUG && db->ranges_count % 1000000 == 0)
@@ -410,7 +410,7 @@ read_ranges_csv(IPDB * db){
     if(city_index < 0)
     {
       if(DEBUG)
-        printf("Could not find city for code: %i", atoi(city_code));
+        printf("Could not find city for code: %i\n", atoi(city_code));
       invalid_cities_count ++;
       continue;
     }else{
@@ -424,11 +424,11 @@ read_ranges_csv(IPDB * db){
       db->ranges_count++;
     }
   }
-  if(invalid_cities_count)
+  if(DEBUG)
   {
-    printf("Found invalid cities: %i", invalid_cities_count);
+    if(invalid_cities_count ){printf("Found invalid cities: %i\n", invalid_cities_count);}
+    printf("\n Parsing of %i records needed %.6lf seconds\n", db->ranges_count, get_time(&tim)-t1);
   }
-  printf("\n Parsing of %i records needed %.6lf seconds\n", db->ranges_count, get_time(&tim)-t1);
 }
 
 
@@ -463,7 +463,7 @@ read_cities_csv(IPDB * db){
   if(f == NULL)
   {
     if(DEBUG)
-      printf("Could not open the Cities-CSV-file: %s", db->cities_csv_file);
+      printf("Could not open the Cities-CSV-file: %s\n", db->cities_csv_file);
     return;
   }
   char line[256];
@@ -480,7 +480,7 @@ read_cities_csv(IPDB * db){
     {
       printf("Worked lines: %i\n", i);
     }
-   // COUNTRY,REGION,CITY-NAME,METRO-CODE,CITY-CODE,LATITUDE,LONGITUDE
+    // COUNTRY,REGION,CITY-NAME,METRO-CODE,CITY-CODE,LATITUDE,LONGITUDE
     country =    strtok(line, CITIES_DELIM);
     region =     strtok(NULL, CITIES_DELIM);
     name =       strtok(NULL, CITIES_DELIM);
@@ -506,14 +506,14 @@ read_cities_csv(IPDB * db){
 }
 
 /**
-cache-file is an exact binary copy of the ranges+cities-arrays from memory,
-the layout goes like this:
+  cache-file is an exact binary copy of the ranges+cities-arrays from memory,
+  the layout goes like this:
   db->cities_count [4 Bytes]
   db->ranges_count [4 Bytes]
 
   db->cities [sizeof(City)=24 x db->ranges_count Bytes]
   db->ranges [sizeof(IpRange)=24 x db->ranges_count Bytes]
-*/
+  */
 void
 write_cache_file(IPDB * db){
   struct timeval tim;
@@ -524,7 +524,7 @@ write_cache_file(IPDB * db){
   f = fopen(db->cache_file_name, "w");
   if(f==NULL){
     if(DEBUG)
-      printf("Could not open Cache-File: %s", db->cache_file_name);
+      printf("Could not open Cache-File: %s\n", db->cache_file_name);
     return;
   }
   if(DEBUG){
@@ -570,7 +570,7 @@ read_cache_file(IPDB * db){
   f = fopen(db->cache_file_name, "r");
   if(f==NULL){
     if(DEBUG)
-      printf("Could not open Cache-File: %s", db->cache_file_name);
+      printf("Could not open Cache-File: %s\n", db->cache_file_name);
     return 0;
   }
   int cities_header_read = fread(&(db->cities_count), sizeof(db->cities_count),1,f);
@@ -580,7 +580,7 @@ read_cache_file(IPDB * db){
 
   if(cities_header_read == 0 || isps_header_read == 0 || ranges_header_read == 0 || db->cities_count == 0 || db->isps_count ==0 || db->ranges_count ==0)
   {
-    printf("Could not read Cities-Header from Cache-File: %s", db->cache_file_name);
+    if(DEBUG){printf("Could not read Cities-Header from Cache-File: %s\n", db->cache_file_name);}
     return 0;
   }
   if(DEBUG)
@@ -593,7 +593,7 @@ read_cache_file(IPDB * db){
   objects_read += fread(db->cities, sizeof(City),db->cities_count,f);
 
   if(DEBUG)
-    printf("Reading in the isps into preallocated buffer of size: ", sizeof(db->isps));
+    printf("Reading in the isps into preallocated buffer of size: %lu\n", sizeof(db->isps));
   objects_read += fread(db->isps, MAX_ISP_NAME_LENGTH, db->isps_count,f);
 
   if(DEBUG)
@@ -627,7 +627,7 @@ benchmark_search(IPDB * db,int count){
 
 IPDB * init_db(char * cities_csv_file, char * ranges_csv_file, char * cache_file_name){
   if(DEBUG)
-    printf("Initializing db");
+    printf("Initializing db\n");
   IPDB *db;
   db = (IPDB*)malloc(sizeof(IPDB));
   if (db == NULL) //no memory left

data/geoipdb.gemspec

@@ -1,75 +1,21 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
-Gem::Specification.new do |s|
-  s.name = "geoipdb"
-  s.version = "0.4.2"
+Gem::Specification.new do |gem|
+  gem.name = "geoipdb"
+  gem.version = "0.4.3"
+  gem.licenses = ["MIT"]
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Eugen Martin", "Martin Karlsch"]
-  s.date = "2012-05-11"
-  s.description = "Returns a GeoLocation and additional information for given IP. Reads Data from CSV-Files and uses internal binary caching."
-  s.email = "eugeniusmartinus@googlemail.com"
-  s.extensions = ["ext/geoipdb/extconf.rb"]
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.markdown"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    "Gemfile",
-    "LICENSE.txt",
-    "README.markdown",
-    "Rakefile",
-    "VERSION",
-    "ext/geoipdb/Makefile",
-    "ext/geoipdb/build.sh",
-    "ext/geoipdb/extconf.rb",
-    "ext/geoipdb/geoipdb.c",
-    "ext/geoipdb/ipdb.c",
-    "ext/geoipdb/ipdb.h",
-    "geoipdb.gemspec",
-    "lib/geoipdb.rb",
-    "sample_data/cities.csv",
-    "sample_data/citiess_corrupt.csv",
-    "sample_data/ip_ranges.csv",
-    "sample_data/ip_ranges_corrupt.csv",
-    "spec/geoipdb_spec.rb",
-    "spec/spec_helper.rb",
-    "test.rb"
-  ]
-  s.homepage = "http://github.com/madvertise/geoipdb"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib", "ext"]
-  s.rubygems_version = "1.8.10"
-  s.summary = "Fast (>3 Mio queries/sec!!!) GeoIpDb implementation for Ruby using C-Extensions."
-  s.test_files = [
-    "spec/geoipdb_spec.rb",
-    "spec/spec_helper.rb"
-  ]
+  gem.authors = ["Eugen Martin", "Martin Karlsch"]
+  gem.email = ["eugeniusmartinus@googlemail.com", "martin.karlsch@madvertise.com"]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  gem.description = "Returns a GeoLocation and additional information for given IP. Reads Data from CSV-Files and uses internal binary caching."
+  gem.summary = "Fast (>3 Mio queries/sec!!!) GeoIpDb implementation for Ruby using C-Extensions."
+  gem.homepage = "http://github.com/madvertise/geoipdb"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, ["~> 2.1.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-    else
-      s.add_dependency(%q<rspec>, ["~> 2.1.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rspec>, ["~> 2.1.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-  end
-end
+  gem.extensions = ["ext/geoipdb/extconf.rb"]
 
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.files         = `git ls-files`.split("\n")
+  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.require_paths = ["lib", "ext"]
+end

data/spec/spec_helper.rb

@@ -1,13 +1,12 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'ext'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-
+require 'rubygems'
 require 'rspec'
-require 'lib/geoipdb'
 
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+require 'simplecov'
+SimpleCov.start
+
+$:.unshift(File.dirname(__FILE__) + '/../lib')
+$:.unshift(File.dirname(__FILE__) + '/../ext')
+require 'geoipdb'
 
 RSpec.configure do |config|
-  
 end

data/tasks/rspec.rake

@@ -0,0 +1,7 @@
+require 'rspec'
+require 'rspec/core/rake_task'
+
+desc "Run the specs"
+RSpec::Core::RakeTask.new do |t|
+  t.verbose = false
+end

data/tasks/yard.rake

@@ -0,0 +1,5 @@
+require 'yard'
+
+YARD::Rake::YardocTask.new do |t|
+  t.files = ['lib/**/*.rb', 'README.rdoc']
+end

metadata

@@ -1,104 +1,36 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: geoipdb
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 0.4.3
   prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 2
-  version: 0.4.2
 platform: ruby
-authors: 
+authors:
 - Eugen Martin
 - Martin Karlsch
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-11 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 1
-        - 0
-        version: 2.1.0
-  requirement: *id001
-  prerelease: false
-  name: rspec
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  requirement: *id002
-  prerelease: false
-  name: bundler
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 5
-        - 1
-        version: 1.5.1
-  requirement: *id003
-  prerelease: false
-  name: jeweler
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id004
-  prerelease: false
-  name: rcov
-  type: :development
-description: Returns a GeoLocation and additional information for given IP. Reads Data from CSV-Files and uses internal binary caching.
-email: eugeniusmartinus@googlemail.com
+date: 2012-11-14 00:00:00.000000000 Z
+dependencies: []
+description: Returns a GeoLocation and additional information for given IP. Reads
+  Data from CSV-Files and uses internal binary caching.
+email:
+- eugeniusmartinus@googlemail.com
+- martin.karlsch@madvertise.com
 executables: []
-
-extensions: 
+extensions:
 - ext/geoipdb/extconf.rb
-extra_rdoc_files: 
-- LICENSE.txt
-- README.markdown
-files: 
+extra_rdoc_files: []
+files:
 - .document
+- .gitignore
 - .rspec
+- .rvmrc
 - Gemfile
 - LICENSE.txt
 - README.markdown
 - Rakefile
 - VERSION
-- ext/geoipdb/Makefile
-- ext/geoipdb/build.sh
 - ext/geoipdb/extconf.rb
 - ext/geoipdb/geoipdb.c
 - ext/geoipdb/ipdb.c
@@ -111,41 +43,38 @@ files:
 - sample_data/ip_ranges_corrupt.csv
 - spec/geoipdb_spec.rb
 - spec/spec_helper.rb
-- test.rb
+- tasks/rspec.rake
+- tasks/yard.rake
 homepage: http://github.com/madvertise/geoipdb
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
 - ext
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 4023628714682434710
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Fast (>3 Mio queries/sec!!!) GeoIpDb implementation for Ruby using C-Extensions.
-test_files: 
+test_files:
 - spec/geoipdb_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

data/ext/geoipdb/Makefile

@@ -1,157 +0,0 @@
-
-SHELL = /bin/sh
-
-#### Start of system configuration section. ####
-
-srcdir = .
-topdir = /Users/eugen/.rvm/rubies/ree-1.8.7-2011.03/lib/ruby/1.8/i686-darwin10.7.0
-hdrdir = $(topdir)
-VPATH = $(srcdir):$(topdir):$(hdrdir)
-exec_prefix = $(prefix)
-prefix = $(DESTDIR)/Users/eugen/.rvm/rubies/ree-1.8.7-2011.03
-sharedstatedir = $(prefix)/com
-mandir = $(datarootdir)/man
-psdir = $(docdir)
-oldincludedir = $(DESTDIR)/usr/include
-localedir = $(datarootdir)/locale
-bindir = $(exec_prefix)/bin
-libexecdir = $(exec_prefix)/libexec
-sitedir = $(libdir)/ruby/site_ruby
-htmldir = $(docdir)
-vendorarchdir = $(vendorlibdir)/$(sitearch)
-includedir = $(prefix)/include
-infodir = $(datarootdir)/info
-vendorlibdir = $(vendordir)/$(ruby_version)
-sysconfdir = $(prefix)/etc
-libdir = $(exec_prefix)/lib
-sbindir = $(exec_prefix)/sbin
-rubylibdir = $(libdir)/ruby/$(ruby_version)
-docdir = $(datarootdir)/doc/$(PACKAGE)
-dvidir = $(docdir)
-vendordir = $(libdir)/ruby/vendor_ruby
-datarootdir = $(prefix)/share
-pdfdir = $(docdir)
-archdir = $(rubylibdir)/$(arch)
-sitearchdir = $(sitelibdir)/$(sitearch)
-datadir = $(datarootdir)
-localstatedir = $(prefix)/var
-sitelibdir = $(sitedir)/$(ruby_version)
-
-CC = gcc
-LIBRUBY = $(LIBRUBY_A)
-LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
-LIBRUBYARG_SHARED = 
-LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
-
-RUBY_EXTCONF_H = 
-CFLAGS   =  -fno-common -g -O2  -pipe -fno-common $(cflags) 
-INCFLAGS = $(PREINCFLAGS) -I. -I/opt/local/include -I$(topdir) -I$(hdrdir) -I$(srcdir)
-DEFS     = 
-CPPFLAGS =   -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE $(DEFS) $(cppflags)
-CXXFLAGS = $(CFLAGS) 
-ldflags  = -L. 
-dldflags = 
-archflag = 
-DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
-LDSHARED = cc -dynamic -bundle -undefined suppress -flat_namespace
-AR = ar
-EXEEXT = 
-
-RUBY_INSTALL_NAME = ruby
-RUBY_SO_NAME = ruby
-arch = i686-darwin10.7.0
-sitearch = i686-darwin10.7.0
-ruby_version = 1.8
-ruby = /Users/eugen/.rvm/rubies/ree-1.8.7-2011.03/bin/ruby
-RUBY = $(ruby)
-RM = rm -f
-MAKEDIRS = mkdir -p
-INSTALL = /usr/bin/install -c
-INSTALL_PROG = $(INSTALL) -m 0755
-INSTALL_DATA = $(INSTALL) -m 644
-COPY = cp
-
-#### End of system configuration section. ####
-
-preload = 
-
-libpath = . $(libdir)
-LIBPATH =  -L. -L$(libdir)
-DEFFILE = 
-
-CLEANFILES = mkmf.log
-DISTCLEANFILES = 
-
-extout = 
-extout_prefix = 
-target_prefix = /geoipdb
-LOCAL_LIBS = 
-LIBS =   -L/opt/local/lib -ldl -lobjc  
-SRCS = geoipdb.c ipdb.c
-OBJS = geoipdb.o ipdb.o
-TARGET = geoipdb
-DLLIB = $(TARGET).bundle
-EXTSTATIC = 
-STATIC_LIB = 
-
-BINDIR        = $(bindir)
-RUBYCOMMONDIR = $(sitedir)$(target_prefix)
-RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
-RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
-
-TARGET_SO     = $(DLLIB)
-CLEANLIBS     = $(TARGET).bundle $(TARGET).il? $(TARGET).tds $(TARGET).map
-CLEANOBJS     = *.o *.a *.s[ol] *.pdb *.exp *.bak
-
-all:		$(DLLIB)
-static:		$(STATIC_LIB)
-
-clean:
-		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
-
-distclean:	clean
-		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
-		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
-
-realclean:	distclean
-install: install-so install-rb
-
-install-so: $(RUBYARCHDIR)
-install-so: $(RUBYARCHDIR)/$(DLLIB)
-$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
-	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
-install-rb: pre-install-rb install-rb-default
-install-rb-default: pre-install-rb-default
-pre-install-rb: Makefile
-pre-install-rb-default: Makefile
-$(RUBYARCHDIR):
-	$(MAKEDIRS) $@
-
-site-install: site-install-so site-install-rb
-site-install-so: install-so
-site-install-rb: install-rb
-
-.SUFFIXES: .c .m .cc .cxx .cpp .C .o
-
-.cc.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.cxx.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.cpp.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.C.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.c.o:
-	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<
-
-$(DLLIB): $(OBJS) Makefile
-	@-$(RM) $@
-	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
-
-
-
-$(OBJS): ruby.h defines.h

data/ext/geoipdb/build.sh

@@ -1 +0,0 @@
-gcc -Wall -o test test.c ipdb.c ipdb.h

data/test.rb

@@ -1,9 +0,0 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'ext'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-
-require 'lib/geoipdb'
-
-
-db = GeoIpDb.init 'ext/data/cities.csv', 'ext/data/ip_ranges.csv', 'ext/data/ipdb.cache'
-
-puts db.information_for_ip("165.193.245.54").inspect