geoip-c 0.7.2 → 0.8.0.rc1

data/README.md

@@ -75,17 +75,23 @@ Some variation of the following should work.
         ./configure --prefix=/opt/GeoIP
         make && sudo make install
 
-    On Mac OS X, you can install using MacPorts:
+    On Mac OS X, you can install using [homebrew](http://github.com/mxcl/homebrew):
 
-        sudo port install libgeoip
+        brew install geoip
 
-  2. Now install the `geoip` gem 
+    Linux platforms utilizing Apt have several packages available:
 
-        gem install mtodd-geoip -s http://gems.github.com/ -- --with-geoip-dir=/opt/GeoIP
+        geoip-bin
+        geoip-database
+        libgeoip-dev
 
-    Alternatively, if you installed libgeoip using MacPorts:
+  2. Now install the `geoip` gem
 
-        env ARCHFLAGS="-arch x86_64" gem install geoip-c -- --with-opt-dir=/opt/local
+        gem install geoip-c -- --with-geoip-dir=/opt/GeoIP
+
+    Alternatively, if you installed libgeoip using homebrew:
+
+        gem install geoip-c
 
   3. Download the GeoLite City database file in binary format at http://www.maxmind.com/app/geolitecity
      Maybe this [direct link](http://www.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz) will work.
@@ -93,7 +99,7 @@ Some variation of the following should work.
 
         /opt/GeoIP/share/GeoIP/GeoLiteCity.dat
 
-    If you installed libgeoip using MacPorts then put it in:
+    If you installed libgeoip using homebrew then put it in:
 
         /opt/local/share/GeoIP/GeoLiteCity.dat
 
@@ -118,7 +124,7 @@ Hints
 
     Example:
 
-        env ARCHFLAGS="-arch i386" gem install mtodd-geoip -s http://gems.github.com/ -- --with-geoip-dir=/opt/GeoIP
+        env ARCHFLAGS="-arch i386" gem install geoip-c -- --with-geoip-dir=/opt/GeoIP
 
   2. You might find [this shell script](http://github.com/grimen/my_shell_scripts/blob/8cf04cb6829e68a47f2d6f9d9e057766ea72beb4/install_geoip-city.sh)
      helpful to install the C library.

data/Rakefile

@@ -16,24 +16,24 @@ Rake::RDocTask.new do |rdoc|
 end
 
 Rake::TestTask.new do |t|
-  t.test_files = 'test.rb'
+  t.test_files = ['test.rb']
   t.verbose = true
 end
 
 spec = Gem::Specification.new do |s|
   s.name              = 'geoip-c'
-  s.version           = "0.7.2"
+  s.version           = "0.8.0.rc1"
 
-  s.authors           = ['Ryah Dahl', 'Matt Todd']
-  s.email             = 'mtodd@highgroove.com'
+  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.test_files        = ['test.rb']
+  s.extensions        = ['extconf.rb']
   s.require_path      = '.'
 end
 

data/extconf.rb

@@ -7,6 +7,12 @@ unless have_func('iconv_open', 'iconv.h') or have_library('iconv', 'iconv_open',
 end
 
 if have_library('GeoIP', 'GeoIP_record_by_ipnum') and have_header('GeoIPCity.h')
+  # Defines HAVE_GEOIP_ADDR_TO_NUM
+  have_func('GeoIP_addr_to_num', 'GeoIP.h')
+
+  # Defines HAVE_GEOIP_NUM_TO_ADDR
+  have_func('GeoIP_num_to_addr', 'GeoIP.h')
+
   create_makefile('geoip')
 else
   abort("you must have geoip c library installed!")

data/geoip.c

@@ -21,6 +21,20 @@ static VALUE rb_geoip_memory;
 static VALUE rb_geoip_filesystem;
 static VALUE rb_geoip_index;
 
+#ifndef HAVE_GEOIP_ADDR_TO_NUM
+  // Support geoip <= 1.4.6
+  #define GeoIP_addr_to_num _GeoIP_addr_to_num
+#endif
+
+#ifndef HAVE_GEOIP_NUM_TO_ADDR
+  // Support geoip <= 1.4.6
+
+  // Fixes a bug with 64bit architectures where this delcaration doesn't exist
+  // in the GeoIP library causing segmentation faults.
+  char *_GeoIP_num_to_addr(GeoIP* gi, unsigned long ipnum);
+  #define GeoIP_num_to_addr(ipnum) _GeoIP_num_to_addr(NULL, ipnum)
+#endif
+
 /* helpers */
 void rb_hash_sset(VALUE hash, const char *str, VALUE v) {
   rb_hash_aset(hash, ID2SYM(rb_intern(str)), v);
@@ -320,12 +334,9 @@ VALUE rb_geoip_domain_look_up(VALUE self, VALUE addr) {
  */
 VALUE rb_geoip_addr_to_num(VALUE self, VALUE addr) {
   Check_Type(addr, T_STRING);
-  return UINT2NUM((unsigned int)_GeoIP_addr_to_num(StringValuePtr(addr)));
+  return UINT2NUM((unsigned int)GeoIP_addr_to_num(StringValuePtr(addr)));
 }
 
-// Fixes a bug with 64bit architectures where this delcaration doesn't exist
-// in the GeoIP library causing segmentation faults.
-char *_GeoIP_num_to_addr(GeoIP* gi, unsigned long ipnum);
 
 VALUE rb_geoip_num_to_addr(VALUE self, VALUE num) {
   VALUE num_type = TYPE(num);
@@ -334,7 +345,7 @@ VALUE rb_geoip_num_to_addr(VALUE self, VALUE num) {
     case T_BIGNUM: break;
     default: rb_raise(rb_eTypeError, "wrong argument type %s (expected Fixnum or Bignum)", rb_obj_classname(num));
   }
-  return rb_str_new2((char*)_GeoIP_num_to_addr(NULL, (unsigned long)NUM2ULONG(num)));
+  return rb_str_new2((char*)GeoIP_num_to_addr((unsigned long)NUM2ULONG(num)));
 }
 
 void Init_geoip()

metadata

@@ -1,27 +1,31 @@
 --- !ruby/object:Gem::Specification 
 name: geoip-c
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: 
+  hash: 15424151
+  prerelease: 6
   segments: 
   - 0
-  - 7
-  - 2
-  version: 0.7.2
+  - 8
+  - 0
+  - rc
+  - 1
+  version: 0.8.0.rc1
 platform: ruby
 authors: 
 - Ryah Dahl
 - Matt Todd
+- Andy Lindeman
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-03-21 00:00:00 -04:00
-default_executable: 
+date: 2011-09-28 00:00:00 Z
 dependencies: []
 
 description: Generic GeoIP lookup tool. Based on the geoip_city RubyGem by Ryah Dahl
-email: mtodd@highgroove.com
+email: 
+- alindeman@gmail.com
+- mtodd@highgroove.com
 executables: []
 
 extensions: 
@@ -34,7 +38,6 @@ files:
 - test.rb
 - geoip.c
 - README.md
-has_rdoc: true
 homepage: http://github.com/mtodd/geoip
 licenses: []
 
@@ -55,16 +58,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A Binding to the GeoIP C library