geoip2_c 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a385241251a43ddd2d075ae6edf6079eee160022
-  data.tar.gz: ba99231f74e179e16f3274eda636860123e2923b
+  metadata.gz: 2c4c6ed6506390f217b61759fe77b1523f159b7b
+  data.tar.gz: 4ea870d8984e94dd182827b07e5ebce843527ce4
 SHA512:
-  metadata.gz: 460dc2adc04bb35833fe48b27688a8d1709ad39526e067bc13ce41d64bb85ee10326c6ff5f493668fad85d135ff213aad862f292e9754db518770e023b2e8756
-  data.tar.gz: 81b9fb3f1b408568894747fe0695d5892250a94dfdc373c663c6fdcd3d6d9def2fc3eacdeffbfdff77fb303b8fff75cb12ae742284eadba62400cf3b0f5a445d
+  metadata.gz: 2f051648f8cc6144c5d952d455c70684246ee929c2db8d016c0a8b6ac802cd0638ff3f935c455b0205081aa3767c09b14a0bdb946d6fd58c60c0c0d542400133
+  data.tar.gz: 79e2869114777969696d0dcd0f5aeea37dc3245faf734a1595f72cb30543bd7d5e3d1876af313da9f1ba7992ae6377075b8025d2251fa0ef44fb0fba34d13046

data/.gitignore

@@ -12,3 +12,6 @@
 *.o
 *.a
 mkmf.log
+*.mmdb
+*.dat
+/benchmark/Gemfile.lock

data/.travis.yml

@@ -3,7 +3,12 @@ services:
   - docker
 
 env:
-  DOCKER_COMPOSE_VERSION: 1.8.1
+  global:
+    DOCKER_COMPOSE_VERSION: 1.8.1
+  matrix:
+    - TARGET_RUBY_VERSION=2.1
+    - TARGET_RUBY_VERSION=2.2
+    - TARGET_RUBY_VERSION=2.3
 
 before_install:
   #- sudo apt-get update
@@ -14,12 +19,12 @@ before_install:
   - sudo mv docker-compose /usr/local/bin/
 
 before_script:
-  - docker-compose build
+  - docker-compose build test-ruby${TARGET_RUBY_VERSION}
   - docker-compose ps
-  - docker-compose up -d
-  - docker-compose exec test bundle install
-  - docker-compose exec test bundle exec rake compile
+  - docker-compose up -d test-ruby${TARGET_RUBY_VERSION}
+  - docker-compose exec test-ruby${TARGET_RUBY_VERSION} bundle install
+  - docker-compose exec test-ruby${TARGET_RUBY_VERSION} bundle exec rake compile
 
 script:
-  - docker-compose exec test bundle exec rake test
+  - docker-compose exec test-ruby${TARGET_RUBY_VERSION} bundle exec rake test
 

data/Appraisals

@@ -0,0 +1,7 @@
+appraise "ruby 2.2" do
+  gem "dig_rb"
+end
+
+appraise "ruby 2.1" do
+  gem "dig_rb"
+end

data/Rakefile

@@ -1,4 +1,5 @@
 require "bundler/gem_tasks"
+require "bundler/setup"
 require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|

data/docker-compose.yml

@@ -1,6 +1,24 @@
 version: "2"
 services:
-  test:
+  test-ruby2.3:
     build:
       context: .
-    command: ruby -run -e httpd
+      dockerfile: dockerfiles/Dockerfile-ruby2.3
+    command: ruby -run -e httpd .
+    environment:
+      - BUNDLE_GEMFILE=Gemfile
+  test-ruby2.2:
+    build:
+      context: .
+      dockerfile: dockerfiles/Dockerfile-ruby2.2
+    command: ruby -run -e httpd .
+    environment:
+      - BUNDLE_GEMFILE=gemfiles/ruby_2.2.gemfile
+  test-ruby2.1:
+    build:
+      context: .
+      dockerfile: dockerfiles/Dockerfile-ruby2.1
+    command: ruby -run -e httpd .
+    environment:
+      - BUNDLE_GEMFILE=gemfiles/ruby_2.1.gemfile
+

data/{Dockerfile → dockerfiles/Dockerfile-ruby2.1}

@@ -1,4 +1,6 @@
-FROM ruby:2.3.3-alpine
+FROM ruby:2.1-alpine
+
+ENV BUNDLE_GEMFILE=$BUNDLE_GEMFILE
 
 RUN apk --no-cache --update add build-base ruby-dev libc6-compat libmaxminddb-dev git
 

data/dockerfiles/Dockerfile-ruby2.2

@@ -0,0 +1,8 @@
+FROM ruby:2.2-alpine
+
+ENV BUNDLE_GEMFILE=$BUNDLE_GEMFILE
+
+RUN apk --no-cache --update add build-base ruby-dev libc6-compat libmaxminddb-dev git
+
+WORKDIR /app
+COPY . .

data/dockerfiles/Dockerfile-ruby2.3

@@ -0,0 +1,8 @@
+FROM ruby:2.3-alpine
+
+ENV BUNDLE_GEMFILE=$BUNDLE_GEMFILE
+
+RUN apk --no-cache --update add build-base ruby-dev libc6-compat libmaxminddb-dev git
+
+WORKDIR /app
+COPY . .

data/ext/geoip2/extconf.rb

@@ -3,6 +3,7 @@ require "mkmf"
 dir_config("maxminddb")
 have_header("maxminddb.h")
 have_library("maxminddb")
+have_func("rb_sym2str", "ruby.h")
 
 $CFLAGS << " -std=c99"
 # $CFLAGS << " -g -O0"

data/ext/geoip2/geoip2.c

@@ -1,6 +1,7 @@
 #include <ruby.h>
 #include <ruby/encoding.h>
 #include <maxminddb.h>
+#include "rb_compat.h"
 
 VALUE rb_mGeoIP2;
 VALUE rb_cGeoIP2Database;
@@ -26,9 +27,6 @@ static VALUE rb_geoip2_lr_initialize(VALUE self);
 static VALUE rb_geoip2_lr_get_value(int argc, VALUE *argv, VALUE self);
 static VALUE rb_geoip2_lr_to_h(VALUE self);
 
-// static void lookup_result_free(void *pointer);
-// static size_t lookup_result_size(void *pointer);
-
 static const rb_data_type_t rb_mmdb_type = {
   "geoip2/mmdb", {
     0, mmdb_free, 0,
@@ -135,8 +133,11 @@ mmdb_entry_data_decode(MMDB_entry_data_s *entry_data)
   case MMDB_DATA_TYPE_UINT64:
     return UINT2NUM(entry_data->uint64);
   case MMDB_DATA_TYPE_UINT128:
-    /* FIXME I'm not sure */
+#if !(MMDB_UINT128_IS_BYTE_ARRAY)
     return UINT2NUM(entry_data->uint128);
+#else
+    rb_raise(rb_eNotImpError, "TODO: unit8_t[16] -> Integer");
+#endif
   case MMDB_DATA_TYPE_ARRAY:
     /* TODO: not implemented */
     return Qnil;
@@ -306,6 +307,16 @@ rb_geoip2_lr_initialize(VALUE self)
   return Qnil;
 }
 
+static inline char*
+rb_geoip2_lr_arg_convert_to_cstring(VALUE sym_or_str)
+{
+  if (TYPE(sym_or_str) == T_SYMBOL) {
+    return RSTRING_PTR(rb_sym2str(sym_or_str));
+  } else {
+    return StringValueCStr(sym_or_str);
+  }
+}
+
 static VALUE
 rb_geoip2_lr_get_value(int argc, VALUE *argv, VALUE self)
 {
@@ -321,7 +332,16 @@ rb_geoip2_lr_get_value(int argc, VALUE *argv, VALUE self)
   int status;
 
   rb_scan_args(argc, argv, "1*", &arg, &rest);
-  Check_Type(arg, T_STRING);
+  switch(TYPE(arg)) {
+    case T_STRING:
+    case T_SYMBOL:
+      {
+        break;
+      }
+    default:
+      rb_raise(rb_eArgError, "Expected a String or a Symbol");
+      break;
+  }
   path = malloc(sizeof(char *) * (RARRAY_LEN(rest) + 2));
 
   TypedData_Get_Struct(self,
@@ -329,11 +349,11 @@ rb_geoip2_lr_get_value(int argc, VALUE *argv, VALUE self)
                        &rb_lookup_result_type,
                        result);
 
-  path[i] = StringValueCStr(arg);
+  path[i] = rb_geoip2_lr_arg_convert_to_cstring(arg);
   while (RARRAY_LEN(rest) != 0) {
     ++i;
     e = rb_ary_shift(rest);
-    tmp = StringValueCStr(e);
+    tmp = rb_geoip2_lr_arg_convert_to_cstring(e);
     path[i] = tmp;
   }
 
@@ -345,7 +365,7 @@ rb_geoip2_lr_get_value(int argc, VALUE *argv, VALUE self)
 
   if (status != MMDB_SUCCESS) {
     free(path);
-    fprintf(stderr, "%s\n", MMDB_strerror(status));
+    /* fprintf(stderr, "%s:%s\n", __FUNCTION__, MMDB_strerror(status)); */
     return Qnil;
   }
 
@@ -379,9 +399,15 @@ rb_geoip2_lr_to_h(VALUE self)
   MMDB_lookup_result_s *result = NULL;
   MMDB_entry_data_list_s *entry_data_list = NULL;
   VALUE hash;
+  VALUE cache;
   int status = 0;
   int exception = 0;
 
+  cache = rb_ivar_get(self, rb_intern("rb_hash"));
+  if (!NIL_P(cache)) {
+    return cache;
+  }
+
   TypedData_Get_Struct(self,
                        struct MMDB_lookup_result_s,
                        &rb_lookup_result_type,
@@ -398,6 +424,8 @@ rb_geoip2_lr_to_h(VALUE self)
     rb_jump_tag(exception);
   }
 
+  rb_ivar_set(self, rb_intern("rb_hash"), hash);
+
   return hash;
 }
 

data/ext/geoip2/rb_compat.h

@@ -0,0 +1,10 @@
+#ifndef __RB_COMPAT_H__
+#define __RB_COMPAT_H__
+
+#include <ruby.h>
+
+#ifndef HAVE_RB_SYM2STR
+#  define rb_sym2str(name) (rb_id2str(SYM2ID(name)))
+#endif
+
+#endif

data/gemfiles/ruby_2.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "dig_rb"
+
+gemspec :path => "../"

data/gemfiles/ruby_2.2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "dig_rb"
+
+gemspec :path => "../"

data/geoip2_c.gemspec

@@ -15,13 +15,14 @@ Gem::Specification.new do |spec|
   spec.license       = "Apache-2.0"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
+    f.match(%r{^(test|spec|features|benchmark)/})
   end
   spec.bindir        = "bin"
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
   spec.extensions    = ["ext/geoip2/extconf.rb"]
 
+  spec.add_development_dependency "appraisal"
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 11.0"
   spec.add_development_dependency "rake-compiler"

data/lib/geoip2/version.rb

@@ -1,3 +1,3 @@
 module GeoIP2
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: geoip2_c
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - okkez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-20 00:00:00.000000000 Z
+date: 2016-12-21 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -77,14 +91,20 @@ files:
 - ".gitignore"
 - ".gitmodules"
 - ".travis.yml"
-- Dockerfile
+- Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - docker-compose.yml
+- dockerfiles/Dockerfile-ruby2.1
+- dockerfiles/Dockerfile-ruby2.2
+- dockerfiles/Dockerfile-ruby2.3
 - ext/geoip2/extconf.rb
 - ext/geoip2/geoip2.c
+- ext/geoip2/rb_compat.h
+- gemfiles/ruby_2.1.gemfile
+- gemfiles/ruby_2.2.gemfile
 - geoip2_c.gemspec
 - lib/geoip2.rb
 - lib/geoip2/database.rb