hive_geoip2 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8db3b40343a6db6c1c0ffc20f8f31fd8a62d82e5
-  data.tar.gz: 7627dbb58b18b2b34410993bebe29127f7ef36e6
+  metadata.gz: 4d4afa678b6f16d1b3930d2097190ffa062314b5
+  data.tar.gz: a28800070b21496a1ff4fcac98675de12f08f9c7
 SHA512:
-  metadata.gz: 6ba971888c29661ff3fddf3d46d00f67d0d734c82af1ef3fb1967f3eaa0d4b1fb5ae34f47b4e83f79563ae5be1a35c15a730aa42ca019dd0ec11c0327a321f37
-  data.tar.gz: 6c22963486413a1f7448d8a3483b8de9b4d97937b1cf1fd2556a0edc8defcf5eb33507db0e5660ad62d642336cb6449c9931ee1a930c35f638102be40f157107
+  metadata.gz: 7fb3f12ad482847d12f730b788a4670567d642c318bba406bd1c915576487ba999c51721fafa91a6ad7e05da3a02e21c76d3cc381a8e1b73b9d1fcf320e08da3
+  data.tar.gz: a617549a489b8e3895d61c75e46574d4efb80e365de2098c45999c8eea94ece737fad297bd6c35d3ed9924f49a3e05a7f10f2a76afaa1d31ec3cdbf26b1d9983

data/ext/hive_geoip2/hive_geoip2.c

@@ -5,9 +5,6 @@
 
 #include "maxminddb.h"
 
-#define WORDS_64 (64 / CHAR_BIT / SIZEOF_LONG)
-#define WORDS_128 (128/ CHAR_BIT / SIZEOF_LONG)
-
 VALUE rb_mHive;
 VALUE rb_cGeoIP2;
 
@@ -160,7 +157,21 @@ parse_data_list(MMDB_entry_data_list_s *data_list, VALUE *ret_obj) {
     
     case MMDB_DATA_TYPE_UINT64:
     {
-      *ret_obj = rb_big_unpack(&data_list->entry_data.uint64, WORDS_64);
+      const uint8_t *hex = "0123456789abcdef";
+      int i, idx = 0;
+      
+      size_t size = sizeof(uint64_t);
+      char buf[size * 2 + 1];
+      uint8_t *data = &data_list->entry_data.uint64;
+      
+      for (i = size - 1; i >= 0; i--) {
+        buf[idx++] = hex[data[i] >> 4];
+        buf[idx++] = hex[data[i] & 0x0f];
+      }
+      
+      buf[idx] = '\0';
+      
+      *ret_obj = rb_cstr2inum(buf, 16);
       
       data_list = data_list->next;
       
@@ -169,21 +180,30 @@ parse_data_list(MMDB_entry_data_list_s *data_list, VALUE *ret_obj) {
     
     case MMDB_DATA_TYPE_UINT128:
     {
+      const uint8_t *hex = "0123456789abcdef";
+      int i, idx = 0;
 #if MMDB_UINT128_IS_BYTE_ARRAY
-      char buf[16];
-      uint8_t i;
-      uint8_t idx = 15;
+      size_t size = 16;
+      char buf[size * 2 + 1];
       uint8_t *data = data_list->entry_data.uint128;
       
-      for (i = 0; i < 16; ++i) {
-        buf[i] = data[idx];
-        idx--;
+      for (i = 0; i < size; ++i) {
+        buf[idx++] = hex[data[i] >> 4];
+        buf[idx++] = hex[data[i] & 0x0f];
       }
-      
-      *ret_obj = rb_big_unpack(&buf, WORDS_128);
 #else
-      *ret_obj = rb_big_unpack(&data_list->entry_data.uint128, WORDS_128);
+      size_t size = sizeof(mmdb_uint128_t);
+      uint8_t buf[size * 2 + 1];
+      uint8_t *data = &data_list->entry_data.uint128;
+      
+      for (i = size - 1; i >= 0; i--) {
+        buf[idx++] = hex[data[i] >> 4];
+        buf[idx++] = hex[data[i] & 0x0f];
+      }
 #endif
+      buf[idx] = '\0';
+      
+      *ret_obj = rb_cstr2inum(buf, 16);
       
       data_list = data_list->next;
       

data/hive_geoip2.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'hive_geoip2'
-  s.version = '0.1.0'
+  s.version = '0.1.1'
   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.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Maxime Youdine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-22 00:00:00.000000000 Z
+date: 2014-10-06 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: 
@@ -17,10 +17,10 @@ extensions:
 - ext/hive_geoip2/extconf.rb
 extra_rdoc_files: []
 files:
-- ext/hive_geoip2/extconf.rb
-- ext/hive_geoip2/hive_geoip2.c
 - hive_geoip2.gemspec
 - lib/hive_geoip2/hive_geoip2.rb
+- ext/hive_geoip2/extconf.rb
+- ext/hive_geoip2/hive_geoip2.c
 homepage: https://github.com/desuwa/hive_geoip2
 licenses:
 - MIT
@@ -31,17 +31,17 @@ 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.4.1
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: libmaxminddb GeoIP2 Ruby bindings