mmdb 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0276f5f017337d1f301c655e11e52c090d8114e
-  data.tar.gz: 3f462b56c286843a40c67011d3152bef5165d0d9
+  metadata.gz: 28afec18a26cb57a2d9274d5aca15b99e71036ab
+  data.tar.gz: 8a1111e0382d6a033288143fcce6a66d6db6a208
 SHA512:
-  metadata.gz: 7b0da96b547bae7bf9ee2edae5f019d56cd57a5904028c6b815921e9d92e9e240ff339f2885d9a0708a35007d4c5d142aa7234bba86a2c3601be48e9338a2f3f
-  data.tar.gz: 304f0280000e95fbcdfcbd5606b013903e53bd5b51b2aba04e17e42b1402b62aaf19993b099effdf2ca0aac2d939343bf5dc7807090ffda69b15bc835aca2aac
+  metadata.gz: a101f8fc21977db024fd74503f05030a91076a38375212c0315c7f2f0ddbee712d0be7684be84e900f71a7e3805ae2e313d4972116fc59798fce414a8c1108ea
+  data.tar.gz: eeecbe7c806621a46815525190897ed2c8c4777b286d6feb0560f89d93b01c1d661bb08408d5786a1d8721f9c072401d8f169fb9b9bb9312b9abe6f43dc84964

data/ext/mmdb/mmdb.c

@@ -15,6 +15,7 @@ static VALUE rb_sym_continent;
 static VALUE rb_sym_latitude;
 static VALUE rb_sym_longitude;
 static VALUE rb_sym_postcode;
+static VALUE rb_sym_subdivisions;
 
 const static char *en = "en";
 const static char *names = "names";
@@ -29,6 +30,7 @@ const static char *postal = "postal";
 const static char *code = "code";
 const static char *iso_code = "iso_code";
 const static char *postcode = "postcode";
+const static char *subdivisions = "subdivisions";
 
 struct MaxMindDB {
     MMDB_s *mmdb;
@@ -69,6 +71,10 @@ static const rb_data_type_t mmdb_data_type = {
 };
 
 #define check_maxminddb(self) ((struct MaxMindDB*)rb_check_typeddata((self), &mmdb_data_type))
+#define number_of_digits(n, count) do { \
+    n /= 10; \
+    count++; \
+} while (n != 0)
 
 static struct MaxMindDB*
 get_maxminddb(VALUE self) {
@@ -157,20 +163,54 @@ maxminddb_lookup(VALUE self, VALUE ip) {
         ret = rb_hash_new();
         MMDB_entry_data_s data;
         MMDB_entry_s *entry = &lookuped.entry;
+
         MMDB_get_value(entry, &data, city, names, en, NULL);
         maxminddb_set_result(ret, rb_sym_city, &data);
+
         MMDB_get_value(entry, &data, country, names, en, NULL);
         maxminddb_set_result(ret, rb_sym_country, &data);
+
         MMDB_get_value(entry, &data, country, iso_code, NULL);
         maxminddb_set_result(ret, rb_sym_country_code, &data);
+
         MMDB_get_value(entry, &data, continent, names, en, NULL);
         maxminddb_set_result(ret, rb_sym_continent, &data);
+
         MMDB_get_value(entry, &data, location, latitude, NULL);
         maxminddb_set_result(ret, rb_sym_latitude, &data);
+
         MMDB_get_value(entry, &data, location, longitude, NULL);
         maxminddb_set_result(ret, rb_sym_longitude, &data);
+
         MMDB_get_value(entry, &data, postal, code, NULL);
         maxminddb_set_result(ret, rb_sym_postcode, &data);
+
+        MMDB_get_value(entry, &data, subdivisions, NULL);
+        if (data.has_data) {
+            // subdivisions fields is basically array
+            if (data.type == MMDB_DATA_TYPE_ARRAY) {
+                VALUE ary = rb_ary_new();
+                int n, data_size;
+                int count = 0;
+                n = data_size = data.data_size;
+                number_of_digits(n, count);
+                char index[count+1];
+
+                for (int i = 0; i < data_size; i++) {
+                    sprintf(index, "%d", i);
+                    MMDB_get_value(entry, &data, subdivisions, index, names, en, NULL);
+                    if (data.has_data) {
+                        if (data.type == MMDB_DATA_TYPE_UTF8_STRING) {
+                            rb_ary_push(ary, rb_utf8_str_new(data.utf8_string, data.data_size));
+                        }
+                    }
+                }
+
+                rb_hash_aset(ret, rb_sym_subdivisions, ary);
+            }
+        } else {
+            rb_hash_aset(ret, rb_sym_subdivisions, Qnil);
+        }
     } else {
         ret = Qnil;
     }
@@ -201,6 +241,7 @@ maxminddb_init_rb_variables() {
     rb_sym_latitude = ID2SYM(rb_intern(latitude));
     rb_sym_longitude = ID2SYM(rb_intern(longitude));
     rb_sym_postcode = ID2SYM(rb_intern(postcode));
+    rb_sym_subdivisions = ID2SYM(rb_intern(subdivisions));
 }
 
 void

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mmdb
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - yoppi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-05 00:00:00.000000000 Z
+date: 2016-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler