mtodd-geoip 0.5.4 → 0.5.5

data/Rakefile

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

data/geoip.c

@@ -181,6 +181,16 @@ VALUE rb_geoip_addr_to_num(VALUE self, VALUE addr) {
   return UINT2NUM((unsigned long)_GeoIP_addr_to_num(STR2CSTR(addr)));
 }
 
+VALUE rb_geoip_num_to_addr(VALUE self, VALUE num) {
+  VALUE num_type = TYPE(num);
+  switch(num_type) {
+    case T_FIXNUM: break;
+    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)NUM2UINT(num)));
+}
+
 void Init_geoip()
 {
   mGeoIP = rb_define_module("GeoIP");
@@ -198,4 +208,5 @@ void Init_geoip()
   rb_define_method(           mGeoIP_Organization, "look_up", rb_geoip_org_look_up, 1);
   
   rb_define_singleton_method(mGeoIP, "addr_to_num", rb_geoip_addr_to_num, 1);
+  rb_define_singleton_method(mGeoIP, "num_to_addr", rb_geoip_num_to_addr, 1);
 }

data/test.rb

@@ -16,16 +16,22 @@ end
 
 class GeoIPTest < Test::Unit::TestCase
   
+  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
-    ip = "24.24.24.24"
-    ipnum = 16777216*24 + 65536*24 + 256*24 + 24
-    assert_equal ipnum, GeoIP.addr_to_num(ip)
+    assert_equal @ipnum, GeoIP.addr_to_num(@ip)
   end
   
   def test_addr_to_num_converts_large_ips_to_an_ipnum_correctly
-    ip = "245.245.245.245"
-    ipnum = 16777216*245 + 65536*245 + 256*245 + 245
-    assert_equal ipnum, GeoIP.addr_to_num(ip)
+    assert_equal @large_ipnum, GeoIP.addr_to_num(@large_ip)
   end
   
   def test_addr_to_num_expects_an_ip_string
@@ -38,13 +44,32 @@ class GeoIPTest < Test::Unit::TestCase
     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)
+    end
+    assert_raises TypeError do
+      GeoIP.num_to_addr("foo.bar")
+    end
+  end
+  
 end
 
 class GeoIPCityTest < Test::Unit::TestCase
   
   def setup
     ## Change me!
-    @dbfile = '/opt/GeoIP/share/GeoIP/GeoLiteCity.dat'
+    @dbfile = '/usr/local/GeoIP/share/GeoIP/GeoLiteCity.dat'
   end
 
   def test_construction_default
@@ -93,7 +118,7 @@ class GeoIPOrgTest < Test::Unit::TestCase
   
   def setup
     ## Change me!
-    @dbfile = '/opt/GeoIP/share/GeoIP/GeoIPOrg.dat'
+    @dbfile = '/usr/local/GeoIP/share/GeoIP/GeoIPOrg.dat'
   end
 
   def test_construction_default

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mtodd-geoip
 version: !ruby/object:Gem::Version 
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors: 
 - Ryan Dahl