mmdb 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c277732d781d5af075093218d48ca835861c071
-  data.tar.gz: 9bcdfc506dbaef0e3266f41fb3dcac470cbce7f6
+  metadata.gz: 04e83203d350b85813210cb63cd2f47cab9d7f53
+  data.tar.gz: dac172b67b0bfa2c3591a82819f3adf7f24dabec
 SHA512:
-  metadata.gz: 6d29a077fb62a5a3fe7c88fb7de3c93c8f06bce27c0ae9ae717e5a270a8b0b6f3b8c6b02fdb2381f03eca94f485c3703b828eacad8e0f41e5b5864c83f6d2287
-  data.tar.gz: 3efa13c0ae818c60b62234649fdf852226eaf8fa1ffeee3803ff7907d35079e91f2dae8703b35b0319da274200e616441797659a7b5162a9ec906a1f3b2ea3f5
+  metadata.gz: d3e877c123d0f8cab6d60fd405b7b0936f5aa1e0c71c83eefde0419d0b851c2d0b0df716a47d654839b8f87ba2ef84e92e695a3629ab10931a6f65a20067e4f5
+  data.tar.gz: 3e0b05ed42c42590b4aa36a1e07a38a96a62e33729cdbbf8007745483791668131619b9380e1c0f17feb20184105cc3254b8af00198dc4a8c3145049f55d5e49

data/ext/mmdb/mmdb.c

@@ -108,14 +108,14 @@ static void
 maxminddb_set_result(VALUE hash, VALUE key, MMDB_entry_data_s *data) {
     if (data->has_data) {
         switch (data->type) {
-        case MMDB_DATA_TYPE_UTF8_STRING:
-            rb_hash_aset(hash, key, rb_utf8_str_new(data->utf8_string, data->data_size));
-            break;
-        case MMDB_DATA_TYPE_DOUBLE:
-            rb_hash_aset(hash, key, rb_float_new(data->double_value));
-            break;
-        default:
-            rb_hash_aset(hash, key, Qnil);
+            case MMDB_DATA_TYPE_UTF8_STRING:
+                rb_hash_aset(hash, key, rb_utf8_str_new(data->utf8_string, data->data_size));
+                break;
+            case MMDB_DATA_TYPE_DOUBLE:
+                rb_hash_aset(hash, key, rb_float_new(data->double_value));
+                break;
+            default:
+                rb_hash_aset(hash, key, Qnil);
         }
     } else {
         rb_hash_aset(hash, key, Qnil);
@@ -145,25 +145,37 @@ maxminddb_initialize(int argc, VALUE* argv, VALUE self) {
 
 /**
  *
- * mmdb.lookup("123.45.67.89") -> Hash
+ * mmdb.lookup("123.45.67.89") -> Hash (Default values is English)
+ * mmdb.lookup("123.45.67.89", "ja") -> Hash (Values is Japanese)
  *
- * TODO:
- *   To receive `opts` argument that have language code and respond specified language data.
  */
 VALUE
-maxminddb_lookup(VALUE self, VALUE ip) {
+maxminddb_lookup(int argc, VALUE* argv, VALUE self) {
     VALUE ret;
+
     int gai_error, mmdb_error;
+    const char *ip, *lang;
     struct MaxMindDB *ptr = MaxMindDB(self);
     MMDB_lookup_result_s lookuped;
     MMDB_entry_data_s data;
     MMDB_entry_s *entry;
 
-    if (NIL_P(ip)) {
+    if (NIL_P(argv[0])) {
         return Qnil;
     }
+    ip = StringValuePtr(argv[0]);
+
+    switch (argc) {
+        case 1:
+            lang = en;
+            break;
+        case 2:
+            lang = StringValuePtr(argv[1]);
+            break;
+    }
+
 
-    lookuped = MMDB_lookup_string(ptr->mmdb, StringValuePtr(ip), &gai_error, &mmdb_error);
+    lookuped = MMDB_lookup_string(ptr->mmdb, ip, &gai_error, &mmdb_error);
     if (gai_error) {
         rb_raise(rb_eTypeError, "%s", gai_strerror(gai_error));
     }
@@ -175,16 +187,16 @@ maxminddb_lookup(VALUE self, VALUE ip) {
         ret = rb_hash_new();
         entry = &lookuped.entry;
 
-        MMDB_get_value(entry, &data, city, names, en, NULL);
+        MMDB_get_value(entry, &data, city, names, lang, NULL);
         maxminddb_set_result(ret, rb_sym_city, &data);
 
-        MMDB_get_value(entry, &data, country, names, en, NULL);
+        MMDB_get_value(entry, &data, country, names, lang, 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);
+        MMDB_get_value(entry, &data, continent, names, lang, NULL);
         maxminddb_set_result(ret, rb_sym_continent, &data);
 
         MMDB_get_value(entry, &data, location, latitude, NULL);
@@ -213,7 +225,7 @@ maxminddb_lookup(VALUE self, VALUE ip) {
 
                 for (i = 0; i < data.data_size; i++) {
                     sprintf(index, "%d", i);
-                    MMDB_get_value(entry, &data, subdivisions, index, names, en, NULL);
+                    MMDB_get_value(entry, &data, subdivisions, index, names, lang, 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));
@@ -268,7 +280,7 @@ Init_mmdb() {
     rb_define_alloc_func(rb_cMaxMindDB, maxminddb_alloc);
 
     rb_define_method(rb_cMaxMindDB, "initialize", maxminddb_initialize, -1);
-    rb_define_method(rb_cMaxMindDB, "lookup", maxminddb_lookup, 1);
+    rb_define_method(rb_cMaxMindDB, "lookup", maxminddb_lookup, -1);
     rb_define_method(rb_cMaxMindDB, "close", maxminddb_close, 0);
 
     maxminddb_init_rb_variables();

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mmdb
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - yoppi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-10 00:00:00.000000000 Z
+date: 2017-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler