hive_geoip2 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fe3470b078e2bf46cf9b391cd5a456c3e52caf6b
-  data.tar.gz: c96648099b911c55fd8824a4d8d2769621b17872
+SHA256:
+  metadata.gz: 209e8f8c9e603be8bde6f15e6c09ae9e2665c63fb427c0b3af48920e1a6b2179
+  data.tar.gz: 903ca36a7999f737f31407badf8a70abcd2284a371850ad636c5e0acbc964fec
 SHA512:
-  metadata.gz: 81ef5704d1f94de520e00aeb1da544d5b80f4aea542b82ec68e65949fefdc06fc471241c761d7bf9a61a0a35ae0f058ecfe8af1f7c6797796d803716ccd35137
-  data.tar.gz: 2b76aed3ee0d715d8aa18abf7e700442df377dda7bd7cb1461a4df2d81458bc540a2e747317d0e1bfafc0750d6a6a4a4db79c6ed99cbbd1b636e486a2c27d81f
+  metadata.gz: 66dee7bd11266d7481e3d01127c3232aa31336ac0a2aa020bd81308c471511d5e549f059fc8b7c90991fc881b553b518cc6b08fef43c3aab35eee6af903183a9
+  data.tar.gz: 1465bc69a609a0f3ba147e37a4241a53c5e1f9f880aa87b5f7f0a93466838cde8202c730f2fc2379089badd993cc1c5a9c64ef5ee88b73bc5ff8a127c03a663d

data/ext/hive_geoip2/hive_geoip2.c

@@ -8,7 +8,7 @@
 VALUE rb_mHive;
 VALUE rb_cGeoIP2;
 
-static void guard_parse_data_list(VALUE arg);
+static VALUE guard_parse_data_list(VALUE arg);
 static MMDB_entry_data_list_s * parse_data_list(
   MMDB_entry_data_list_s *data_list, VALUE *ret_obj
 );
@@ -19,6 +19,8 @@ static VALUE mmdb_lookup(MMDB_s *mmdb, char *ip_addr, bool cleanup);
 
 static VALUE rb_hive_geo_lookup(VALUE self, VALUE ip_arg);
 static VALUE rb_hive_geo_lookup2(VALUE self, VALUE ip_arg, VALUE db_arg);
+static VALUE rb_hive_geo_lookup_with_prefix_length(VALUE self, VALUE ip_arg);
+static VALUE rb_hive_geo_lookup_with_prefix_length2(VALUE self, VALUE ip_arg, VALUE db_arg);
 static VALUE rb_hive_geo_is_closed(VALUE self);
 static VALUE rb_hive_geo_close(VALUE self);
 static void rb_hive_geo_free(MMDB_s *mmdb);
@@ -30,10 +32,12 @@ struct args_parse_data_list {
   VALUE *ret_obj;
 };
 
-static void guard_parse_data_list(VALUE arg) {
+static VALUE guard_parse_data_list(VALUE arg) {
   struct args_parse_data_list *args = (struct args_parse_data_list *)arg;
   
   parse_data_list(args->data_list, args->ret_obj);
+
+  return RUBY_Qnil;
 }
 
 static MMDB_entry_data_list_s *
@@ -318,11 +322,22 @@ static VALUE mmdb_lookup(MMDB_s *mmdb, char *ip_addr, bool cleanup) {
     if (exception) {
       rb_jump_tag(exception);
     }
-    
-    return ret_obj;
+
+    // Return [data, prefix_length] tuple
+    VALUE result_array = rb_ary_new2(2);
+    rb_ary_push(result_array, ret_obj);
+    rb_ary_push(result_array, INT2NUM(result.netmask));
+    return result_array;
   }
   else {
-    return Qnil;
+    if (cleanup) {
+      mmdb_close(mmdb);
+    }
+    // Return [nil, 0] for not found
+    VALUE result_array = rb_ary_new2(2);
+    rb_ary_push(result_array, Qnil);
+    rb_ary_push(result_array, INT2NUM(0));
+    return result_array;
   }
 }
 
@@ -338,8 +353,8 @@ static VALUE rb_hive_geo_lookup(VALUE self, VALUE ip_arg) {
   if (mmdb_is_closed(mmdb)) {
     rb_raise(rb_eIOError, "GeoIP2 - closed database");
   }
-  
-  return mmdb_lookup(mmdb, ip_addr, false);
+  VALUE result_tuple = mmdb_lookup(mmdb, ip_addr, false);
+  return rb_ary_entry(result_tuple, 0);  // Extract just the data part
 }
 
 static VALUE rb_hive_geo_lookup2(VALUE self, VALUE ip_arg, VALUE db_arg) {
@@ -352,8 +367,29 @@ static VALUE rb_hive_geo_lookup2(VALUE self, VALUE ip_arg, VALUE db_arg) {
   MMDB_s mmdb;
   
   mmdb_try_open(db_path, &mmdb);
-  
-  return mmdb_lookup(&mmdb, ip_addr, true);
+  VALUE result_tuple = mmdb_lookup(&mmdb, ip_addr, true);
+  return rb_ary_entry(result_tuple, 0);  // Extract just the data part
+}
+
+static VALUE rb_hive_geo_lookup_with_prefix_length(VALUE self, VALUE ip_arg) {
+  Check_Type(ip_arg, T_STRING);
+  char *ip_addr = StringValuePtr(ip_arg);
+  MMDB_s *mmdb;
+  Data_Get_Struct(self, MMDB_s, mmdb);
+  if (mmdb_is_closed(mmdb)) {
+    rb_raise(rb_eIOError, "GeoIP2 - closed database");
+  }
+  return mmdb_lookup(mmdb, ip_addr, false); // Return full tuple with prefix length
+}
+
+static VALUE rb_hive_geo_lookup_with_prefix_length2(VALUE self, VALUE ip_arg, VALUE db_arg) {
+  Check_Type(ip_arg, T_STRING);
+  Check_Type(db_arg, T_STRING);
+  char *ip_addr = StringValuePtr(ip_arg);
+  char *db_path = StringValuePtr(db_arg);
+  MMDB_s mmdb;
+  mmdb_try_open(db_path, &mmdb);
+  return mmdb_lookup(&mmdb, ip_addr, true);  // Return full tuple with prefix length
 }
 
 static VALUE rb_hive_geo_is_closed(VALUE self) {
@@ -411,9 +447,11 @@ void Init_hive_geoip2() {
   rb_define_alloc_func(rb_cGeoIP2, rb_hive_geo_alloc);
   
   rb_define_singleton_method(rb_cGeoIP2, "lookup", rb_hive_geo_lookup2, 2);
-  
+  rb_define_singleton_method(rb_cGeoIP2, "lookup_with_prefix_length", rb_hive_geo_lookup_with_prefix_length2, 2);
+
   rb_define_method(rb_cGeoIP2, "initialize", rb_hive_geo_init, 1);
   rb_define_method(rb_cGeoIP2, "close", rb_hive_geo_close, 0);
   rb_define_method(rb_cGeoIP2, "closed?", rb_hive_geo_is_closed, 0);
   rb_define_method(rb_cGeoIP2, "lookup", rb_hive_geo_lookup, 1);
+  rb_define_method(rb_cGeoIP2, "lookup_with_prefix_length", rb_hive_geo_lookup_with_prefix_length, 1);
 }

data/hive_geoip2.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'hive_geoip2'
-  s.version = '0.1.2'
+  s.version = '0.1.4'
   s.summary = 'libmaxminddb GeoIP2 Ruby bindings'
   s.author = 'Maxime Youdine'
   s.license = 'MIT'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hive_geoip2
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Maxime Youdine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2025-08-19 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: 
@@ -17,10 +17,10 @@ extensions:
 - ext/hive_geoip2/extconf.rb
 extra_rdoc_files: []
 files:
-- hive_geoip2.gemspec
-- lib/hive_geoip2/hive_geoip2.rb
 - ext/hive_geoip2/extconf.rb
 - ext/hive_geoip2/hive_geoip2.c
+- hive_geoip2.gemspec
+- lib/hive_geoip2/hive_geoip2.rb
 homepage: https://github.com/desuwa/hive_geoip2
 licenses:
 - MIT
@@ -31,17 +31,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: libmaxminddb GeoIP2 Ruby bindings