rroonga 9.0.7 → 10.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b746af2f9292a37577708353f345c6d07f4555be55e75656fe442beadde5ed6b
-  data.tar.gz: 035b93cdea5b21cb27eba8e9d7780287e8efb7684560c0cda8769ed23de7b27d
+  metadata.gz: d4f0e0fdf1d23daf834ebb866894d0f05955af7187e07821154e151090273e06
+  data.tar.gz: e1bff6c3547943e270b04f1c2674845ef26bf2f1a64f40ec72f682a0d3b30843
 SHA512:
-  metadata.gz: 984a7bbf57965efeaa6167d8258be509a1bce1d3e688fc7b80b83bacdd9393e75a2d43a852f557c44a18007de92171e86218b0db0a5a19acc47d3b956f1f691c
-  data.tar.gz: 9f2071147b1c8bf0b921f00c52e7fbea18193100e71f9b47610e252425db346680dfed472a73ec5614e1a34c693c94bb73e1d117523a20ea31e664ecc2d6e21a
+  metadata.gz: ee1389b602d9544eb31a7273bf313f83da7599bb6317ffd9e83614bfd334af52d2fad638f23790095a4c2f56e8c70f66dc38a43d968e777e0c2fd0c0fa2e33a1
+  data.tar.gz: 3de057e696486314205762ea1bc6160c892d422cc04dbc8a98e5458ce2cf3404ba28901668158eb65e8b0af0493e5dad1bb5fd4f3ff7c32d02a7cdec65f22e11

data/Rakefile

@@ -1,6 +1,6 @@
-# -*- coding: utf-8; mode: ruby -*-
+# -*- ruby -*-
 #
-# Copyright (C) 2009-2019  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2020  Sutou Kouhei <kou@clear-code.com>
 # Copyright (C) 2017  Masafumi Yokoyama <yokoyama@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -16,15 +16,9 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-require "find"
-require "fileutils"
-require "shellwords"
-require "pathname"
-require "erb"
-require "yard"
 require "bundler/gem_helper"
-require "rake/extensiontask"
 require "packnga"
+require "yard"
 
 base_dir = File.join(File.dirname(__FILE__))
 
@@ -74,51 +68,6 @@ module YARD
   end
 end
 
-def windows?(platform=nil)
-  platform ||= RUBY_PLATFORM
-  platform =~ /mswin(?!ce)|mingw|cygwin|bccwin/
-end
-
-def collect_binary_files(binary_dir)
-  binary_files = []
-  Find.find(binary_dir) do |name|
-    next unless File.file?(name)
-    next if /\.zip\z/i =~ name
-    binary_files << name
-  end
-  binary_files
-end
-
-def windows_gem_name(spec, architecture)
-  "#{spec.name}-#{spec.version}-#{architecture}-mingw32.gem"
-end
-
-relative_vendor_dir = "vendor"
-relative_binary_dir = File.join("vendor", "local")
-vendor_dir = File.join(base_dir, relative_vendor_dir)
-binary_dir = File.join(base_dir, relative_binary_dir)
-
-groonga_win32_i386_p = ENV["RROONGA_USE_GROONGA_X64"].nil?
-
-Rake::ExtensionTask.new("groonga", spec) do |ext|
-  if groonga_win32_i386_p
-    ext.cross_platform = ["x86-mingw32"]
-  else
-    ext.cross_platform = ["x64-mingw32"]
-  end
-  if windows?
-    ext.gem_spec.files += collect_binary_files(relative_binary_dir)
-  else
-    ext.cross_compile = true
-    ext.cross_compiling do |_spec|
-      if windows?(_spec.platform.to_s)
-        binary_files = collect_binary_files(relative_binary_dir)
-        _spec.files += binary_files
-      end
-    end
-  end
-end
-
 file "Makefile" => ["extconf.rb", "ext/groonga/extconf.rb"] do
   extconf_args = []
   if ENV["TRAVIS"]
@@ -147,64 +96,4 @@ namespace :test do
   end
 end
 
-desc "Remove Groonga binary directory"
-namespace :clean do
-  task :groonga do
-    rm_rf binary_dir
-  end
-end
-
-windows_architectures = [:x86, :x64]
-
-namespace :build do
-  namespace :windows do
-    ruby_versions = "2.3.0:2.4.0:2.5.0:2.6.0"
-
-    windows_architectures.each do |architecture|
-      desc "Build gem for Windows #{architecture}"
-      task architecture do
-        build_dir = "tmp/windows"
-        rm_rf build_dir
-        mkdir_p build_dir
-
-        commands = [
-          ["git", "clone", "file://#{Dir.pwd}/.git", build_dir],
-          ["cd", build_dir],
-          ["gem", "install", "json"],
-          ["bundle"],
-          ["rake", "cross", "native", "gem", "RUBY_CC_VERSION=#{ruby_versions}"],
-        ]
-        if architecture == :x64
-          commands.unshift(["export", "RROONGA_USE_GROONGA_X64=true"])
-        end
-        raw_commands = commands.collect do |command|
-          Shellwords.join(command)
-        end
-        raw_command_line = raw_commands.join(" && ")
-
-        require "rake_compiler_dock"
-        RakeCompilerDock.sh(raw_command_line)
-
-        cp("#{build_dir}/pkg/#{windows_gem_name(spec, architecture)}",
-           "pkg/")
-      end
-    end
-  end
-
-  desc "Build gems for Windows"
-  build_tasks = windows_architectures.collect do |architecture|
-    "windows:#{architecture}"
-  end
-  task :windows => build_tasks
-end
-
-namespace :release do
-  desc "Push gems for Windows to RubyGems.org"
-  task :windows do
-    windows_architectures.each do |architecture|
-      ruby("-S", "gem", "push", "pkg/#{windows_gem_name(spec, architecture)}")
-    end
-  end
-end
-
 task :default => :test

data/doc/text/news.md

@@ -1,5 +1,19 @@
 # NEWS
 
+## 10.0.1: 2020-04-02 {#version-10-0-1}
+
+### Improvements
+
+  * Added support for creating a table with normalizer with options
+
+  * Windows: Added Ruby 2.7 support.
+
+  * Windows: Dropped Ruby 2.3.
+
+    * This version has been EOL.
+
+  * Dropped fat gem support.
+
 ## 9.0.7: 2019-08-29 {#version-9-0-7}
 
 ### Improvements

data/ext/groonga/extconf.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2009-2019  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2020  Sutou Kouhei <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -49,30 +49,11 @@ def win32?
   /cygwin|mingw|mswin/ =~ RUBY_PLATFORM
 end
 
-checking_for(checking_message("Win32 OS")) do
-  win32 = win32?
-  if win32
-    $defs << "-DRB_GRN_PLATFORM_WIN32"
-    import_library_name = "libruby-#{module_name}.a"
-    $DLDFLAGS << " -Wl,--out-implib=#{import_library_name}"
-    $cleanfiles << import_library_name
-    binary_base_dir = base_dir + "vendor" + "local"
-    pkg_config_dir = binary_base_dir + "lib" + "pkgconfig"
-    PKGConfig.add_path(pkg_config_dir.to_s)
-    PKGConfig.set_override_variable("prefix", binary_base_dir.to_s)
-  end
-  win32
-end
-
 def install_groonga_locally
   FileUtils.mkdir_p(local_groonga_base_dir)
 
   Dir.chdir(local_groonga_base_dir) do
-    if win32?
-      extract_groonga_win32_binary
-    else
-      build_groonga
-    end
+    build_groonga
   end
 
   prepend_pkg_config_path_for_local_groonga
@@ -107,50 +88,6 @@ def download(url)
   end
 end
 
-def extract_zip(filename, destrination_dir)
-  require "archive/zip"
-
-  Archive::Zip.extract(filename, destrination_dir)
-rescue LoadError
-  command_line = ["unzip", filename, "-d", destrination_dir]
-  unless system(*command_line)
-    raise "Failed to unzip: #{command_line.join(' ')}"
-  end
-end
-
-def extract_groonga_win32_binary
-  if ENV["RROONGA_USE_GROONGA_X64"]
-    architecture = "x64"
-  else
-    architecture = "x86"
-  end
-  zip = "groonga-latest-#{architecture}.zip"
-  url = "https://packages.groonga.org/windows/groonga/#{zip}"
-  install_dir = local_groonga_install_dir
-
-  download(url)
-
-  message("extracting...")
-  before_paths = Dir.glob("*")
-  extract_zip(zip, ".")
-  extracted_dir = (Dir.glob("*") - before_paths).first
-  message(" done\n")
-
-  if File.exist?(install_dir)
-    message("removing old install... #{install_dir}")
-    FileUtils.rm_rf(install_dir)
-    message(" done\n")
-  end
-
-  message("installing...")
-  FileUtils.mv(extracted_dir, install_dir)
-  message(" done\n")
-
-  message("removing binary archive...")
-  FileUtils.rm_rf(zip)
-  message(" done\n")
-end
-
 def run_command(start_message, command)
   message(start_message)
   if xsystem(command)
@@ -247,6 +184,7 @@ def build_groonga_from_tar_gz
   FileUtils.mkdir_p(groonga_source_dir)
 
   message("extracting...")
+  # TODO: Use Zlip::GzipReader and Gem::Package::TarReader
   if xsystem("tar xfz #{tar_gz} -C #{groonga_source_dir} --strip-components=1")
     message(" done\n")
   else
@@ -285,14 +223,8 @@ def install_local_groonga(package_name, major, minor, micro)
   add_rpath_for_local_groonga
 end
 
-if win32?
-  unless have_local_groonga?(package_name, major, minor, micro)
-    install_local_groonga(package_name, major, minor, micro)
-  end
-else
-  unless PKGConfig.have_package(package_name, major, minor, micro)
-    install_local_groonga(package_name, major, minor, micro)
-  end
+unless PKGConfig.have_package(package_name, major, minor, micro)
+  install_local_groonga(package_name, major, minor, micro)
 end
 
 real_version = PKGConfig.modversion(package_name)

data/ext/groonga/rb-grn-table-key-support.c

@@ -1,6 +1,6 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2009-2014  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2020  Kouhei Sutou <kou@clear-code.com>
   Copyright (C) 2014-2016  Masafumi Yokoyama <yokoyama@clear-code.com>
 
   This library is free software; you can redistribute it and/or
@@ -911,7 +911,9 @@ rb_grn_table_key_support_get_normalizer (VALUE self)
  *   # Specifies normalizer object.
  *   table.normalizer = Groonga::Context["NormalizerNFKC51"]
  *   # Uses auto normalizer that is a normalizer for backward compatibility.
- *   table.normalizer = "TNormalizerAuto"
+ *   table.normalizer = "NormalizerAuto"
+ *   # Uses a normalizer with options.
+ *   table.normalizer = "NormalizerNFKC121('unify_kana', true)"
  *
  * @overload normalizer=(name)
  *    @param [String] name Set a nomalizer named @name@.
@@ -927,7 +929,6 @@ rb_grn_table_key_support_set_normalizer (VALUE self, VALUE rb_normalizer)
 {
     grn_ctx *context;
     grn_obj *table;
-    grn_obj *normalizer;
     grn_rc rc;
 
     rb_grn_table_key_support_deconstruct(SELF(self), &table, &context,
@@ -935,9 +936,25 @@ rb_grn_table_key_support_set_normalizer (VALUE self, VALUE rb_normalizer)
                                          NULL, NULL, NULL,
                                          NULL);
 
-    normalizer = RVAL2GRNOBJECT(rb_normalizer, &context);
-    rc = grn_obj_set_info(context, table, GRN_INFO_NORMALIZER, normalizer);
-    rb_grn_context_check(context, self);
+    if (RB_TYPE_P(rb_normalizer, RUBY_T_STRING)) {
+        grn_obj normalizer;
+        VALUE exception;
+        GRN_TEXT_INIT(&normalizer, GRN_OBJ_DO_SHALLOW_COPY);
+        GRN_TEXT_SET(context,
+                     &normalizer,
+                     RSTRING_PTR(rb_normalizer),
+                     RSTRING_LEN(rb_normalizer));
+        rc = grn_obj_set_info(context, table, GRN_INFO_NORMALIZER, &normalizer);
+        exception = rb_grn_context_to_exception(context, self);
+        GRN_OBJ_FIN(context, &normalizer);
+        if (!NIL_P(exception)) {
+            rb_exc_raise(exception);
+        }
+    } else {
+        grn_obj *normalizer = RVAL2GRNOBJECT(rb_normalizer, &context);
+        rc = grn_obj_set_info(context, table, GRN_INFO_NORMALIZER, normalizer);
+        rb_grn_context_check(context, self);
+    }
     rb_grn_rc_check(rc, self);
 
     return Qnil;

data/ext/groonga/rb-grn-table.c

@@ -525,8 +525,8 @@ ruby_object_to_column_name (VALUE rb_name,
 }
 
 /*
- * テーブルの _name_ に対応するカラムを返す。カラムが存在しな
- * い場合は +nil+ を返す。
+ * It returns the column has the specified name.
+ * If the specified column does not exist, it returns `nil`.
  *
  * @overload column(name)
  *   @return [Groonga::Column, nil]
@@ -606,11 +606,15 @@ rb_grn_table_get_column_surely (VALUE self, VALUE rb_name)
 }
 
 /*
- * テーブルの全てのカラムを返す。 _name_ が指定された場合はカ
- * ラム名の先頭が _name_ で始まるカラムを返す。
+ * @overload columns(prefix=nil)
+ *   It returns the specified columns in the table.
  *
- * @overload columns(name=nil)
- *   @return [Groonga::Columnの配列]
+ *   @param prefix [String, nil]
+ *     If this is `nil`, it returns the all columns in table.
+ *
+ *     Otherwise it returns columns which have name starts with `prefix`.
+ *
+ *   @return [::Array<Groonga::Column>]
  */
 static VALUE
 rb_grn_table_get_columns (int argc, VALUE *argv, VALUE self)
@@ -622,9 +626,9 @@ rb_grn_table_get_columns (int argc, VALUE *argv, VALUE self)
     grn_rc rc;
     int n;
     grn_table_cursor *cursor;
-    VALUE rb_name, rb_columns;
-    char *name = NULL;
-    unsigned name_size = 0;
+    VALUE rb_prefix, rb_columns;
+    char *prefix = NULL;
+    unsigned prefix_size = 0;
     VALUE exception;
 
     rb_grn_table_deconstruct(SELF(self), &table, &context,
@@ -632,18 +636,18 @@ rb_grn_table_get_columns (int argc, VALUE *argv, VALUE self)
                              NULL, NULL, NULL,
                              NULL);
 
-    rb_scan_args(argc, argv, "01", &rb_name);
+    rb_scan_args(argc, argv, "01", &rb_prefix);
 
-    if (!NIL_P(rb_name)) {
-        name = StringValuePtr(rb_name);
-        name_size = RSTRING_LEN(rb_name);
+    if (!NIL_P(rb_prefix)) {
+        prefix = StringValuePtr(rb_prefix);
+        prefix_size = RSTRING_LEN(rb_prefix);
     }
 
     key_type = grn_ctx_at(context, GRN_DB_SHORT_TEXT);
     columns = grn_table_create(context, NULL, 0, NULL, GRN_TABLE_HASH_KEY,
                                key_type, 0);
     rb_grn_context_check(context, self);
-    n = grn_table_columns(context, table, name, name_size, columns);
+    n = grn_table_columns(context, table, prefix, prefix_size, columns);
     rb_grn_context_check(context, self);
 
     rb_columns = rb_ary_new2(n);
@@ -701,9 +705,10 @@ rb_grn_table_get_columns (int argc, VALUE *argv, VALUE self)
 }
 
 /*
- * テーブルが _name_ カラムを持っている場合は +true+ を返す。
+ * Checks whether the table has a specified column or not.
  *
  * @overload have_column?(name)
+ *   @return [Boolean] `true` if the table has a `name` column, `false` otherwise.
  */
 static VALUE
 rb_grn_table_have_column (VALUE self, VALUE rb_name)
@@ -884,11 +889,10 @@ rb_grn_table_open_cursor (int argc, VALUE *argv, VALUE self)
 }
 
 /*
- * テーブルに登録されている全てのレコードが入っている配列を
- * 返す。
- *
  * @overload records
- *   @return [Groonga::Recordの配列]
+ *   It returns all records in the table.
+ *
+ *   @return [::Array<Groonga::Record>]
  */
 static VALUE
 rb_grn_table_get_records (int argc, VALUE *argv, VALUE self)
@@ -909,9 +913,9 @@ rb_grn_table_get_records (int argc, VALUE *argv, VALUE self)
 }
 
 /*
- * テーブルに登録されているレコード数を返す。
- *
  * @overload size
+ *   It returns the number of records in the table.
+ *
  *   @return [Integer]
  */
 static VALUE
@@ -930,9 +934,10 @@ rb_grn_table_get_size (VALUE self)
 }
 
 /*
- * テーブルにレコードが登録されていなければ +true+ を返す。
- *
  * @overload empty?
+ *
+ *   @return [Boolean] `true` if the table has no records,
+ *     `false` otherwise.
  */
 static VALUE
 rb_grn_table_empty_p (VALUE self)
@@ -950,9 +955,11 @@ rb_grn_table_empty_p (VALUE self)
 }
 
 /*
- * テーブルの全レコードを一括して削除する。
+ * Deletes all records in the table at once.
  *
  * @overload truncate
+ *
+ *   @return [void]
  */
 static VALUE
 rb_grn_table_truncate (VALUE self)
@@ -1123,7 +1130,7 @@ rb_grn_table_delete_by_expression (VALUE self)
  *
  *   @param id [Integer] The ID of delete target record.
  *
- *   @return void
+ *   @return [void]
  *
  * @overload delete
  *   Delete records that are matched with the given condition
@@ -1141,7 +1148,7 @@ rb_grn_table_delete_by_expression (VALUE self)
  *   @yieldreturn [Groonga::ExpressionBuilder]
  *     TODO: See #select.
  *
- *   @return void
+ *   @return [void]
  */
 static VALUE
 rb_grn_table_delete (int argc, VALUE *argv, VALUE self)
@@ -1624,9 +1631,10 @@ rb_grn_table_each_sub_record (VALUE self, VALUE rb_id)
 }
 
 /*
- * _table_ の _id_ に対応する {Groonga::Record} を返す。
+ * It returns the {Groonga::Record} for the `id` in the `table`.
  *
- * 0.9.0から値ではなく {Groonga::Record} を返すようになった。
+ * The return value has been changed to {Groonga::Record} from `id`
+ * itself since 0.9.0.
  *
  * @overload [](id)
  *   @return [Groonga::Record]
@@ -1664,16 +1672,16 @@ rb_grn_table_get_value (VALUE self, VALUE rb_id)
 }
 
 /*
- * _table_ の _id_ に対応する値を返す。
+ * It returns the value for the `id` in the `table`.
  *
- * @:id => true@ が指定できるのは利便性のため。
- * {Groonga::Array} でも {Groonga::Hash} や {Groonga::PatriciaTrie} と
- * 同じ引数で動くようになる。
+ * You can specify `id: true` for the convenience. `id: true` works
+ * with {Groonga::Array} like for {Groonga::Hash},
+ * {Groonga::PatriciaTrie} and so on.
  *
  * @overload value(id)
- *   @return [値]
- * @overload value(id, :id => true)
- *   @return [値]
+ *   @return [value]
+ * @overload value(id, id: true)
+ *   @return [value]
  */
 static VALUE
 rb_grn_table_get_value_convenience (int argc, VALUE *argv, VALUE self)
@@ -2509,11 +2517,11 @@ rb_grn_table_support_value_p (VALUE self)
 }
 
 /*
- * グループ化したとき、テーブルにグループに含まれるレコード
- * 数を格納できる場合は +true+ 、格納できない場合は +false+ を返
- * す。
- *
  * @overload support_sub_records?
+ *
+ *   @return [Boolean] `true` if the table can store the number of
+ *     records for each group when the table is grouped, `false`
+ *     otherwise.
  */
 static VALUE
 rb_grn_table_support_sub_records_p (VALUE self)
@@ -2578,13 +2586,11 @@ rb_grn_table_have_n_sub_records_space_p (VALUE self)
 }
 
 /*
- * _table_ に _id_ で指定したIDのレコードが存在する場合は +true+ 、
- * 存在しない場合は +false+ を返す。
- *
- * 注意: 実行には相応のコストがかかるのであまり頻繁に呼ばな
- * いようにして下さい。
- *
  * @overload exist?(id)
+ *   @return [Boolean] `true` if the table has a record specified ID
+ *      by `id`, `false` otherwise.
+ *
+ *   @note This method is heavy. You should not call this as much as possible.
  */
 static VALUE
 rb_grn_table_exist_p (VALUE self, VALUE id)

data/ext/groonga/rb-grn.h

@@ -1,6 +1,6 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2009-2018  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2020  Sutou Kouhei <kou@clear-code.com>
   Copyright (C) 2015-2017  Masafumi Yokoyama <yokoyama@clear-code.com>
 
   This library is free software; you can redistribute it and/or
@@ -73,15 +73,7 @@ RB_GRN_BEGIN_DECLS
 #  define RB_GRN_GNUC_NULL_TERMINATED
 #endif
 
-#if defined(RUBY_GRN_PLATFORM_WIN32) && !defined(RB_GRN_PLATFORM_WIN32)
-#  define RB_GRN_PLATFORM_WIN32 RUBY_GRN_PLATFORM_WIN32
-#endif
-
-#if defined(RUBY_GRN_STATIC_COMPILATION) && !defined(RB_GRN_STATIC_COMPILATION)
-#  define RB_GRN_STATIC_COMPILATION RUBY_GRN_STATIC_COMPILATION
-#endif
-
-#if defined(RB_GRN_PLATFORM_WIN32) && !defined(RB_GRN_STATIC_COMPILATION)
+#ifdef __WIN32__
 #  ifdef RB_GRN_COMPILATION
 #    define RB_GRN_VAR __declspec(dllexport)
 #  else
@@ -97,9 +89,9 @@ RB_GRN_BEGIN_DECLS
 #  define debug(...)
 #endif
 
-#define RB_GRN_MAJOR_VERSION 9
+#define RB_GRN_MAJOR_VERSION 10
 #define RB_GRN_MINOR_VERSION 0
-#define RB_GRN_MICRO_VERSION 7
+#define RB_GRN_MICRO_VERSION 1
 
 #define RB_GRN_OBJECT(object) ((RbGrnObject *)(object))
 #define RB_GRN_NAMED_OBJECT(object) ((RbGrnNamedObject *)(object))

data/lib/groonga.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2018  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2020  Sutou Kouhei <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -44,12 +44,8 @@ require "groonga/record"
 require "groonga/expression-builder"
 require "groonga/posting"
 require "groonga/index"
-begin
-  major, minor, _ = RUBY_VERSION.split(/\./)
-  require "#{major}.#{minor}/groonga.so"
-rescue LoadError
-  require "groonga.so"
-end
+
+require "groonga.so"
 
 ##
 # rroonga用のネームスペース。rroongaのクラスやメソッ

data/rroonga.gemspec

@@ -1,6 +1,6 @@
-# -*- mode: ruby; coding: utf-8 -*-
+# -*- ruby -*-
 #
-# Copyright (C) 2012-2016  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2020  Sutou Kouhei <kou@clear-code.com>
 # Copyright (C) 2017  Masafumi Yokoyama <yokoyama@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -85,14 +85,13 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("pkg-config")
   s.add_runtime_dependency("groonga-client", ">= 0.0.3")
   s.add_runtime_dependency("json")
-  s.add_runtime_dependency("archive-zip")
   s.add_development_dependency("test-unit", [">= 3.0.0"])
   s.add_development_dependency("rake")
-  s.add_development_dependency("rake-compiler", [">= 0.9.5"])
-  s.add_development_dependency("rake-compiler-dock", [">= 0.6.2"])
   s.add_development_dependency("bundler")
   s.add_development_dependency("yard")
   s.add_development_dependency("packnga", [">= 1.0.0"])
   s.add_development_dependency("kramdown")
+
+  s.metadata["msys2_mingw_dependencies"] = "groonga"
 end
 

data/test/test-remote.rb

@@ -26,6 +26,7 @@ class RemoteTest < Test::Unit::TestCase
     else
       package_config = PKGConfig.package_config("groonga")
       groonga = package_config.variable("groonga")
+      groonga = "groonga" unless File.exist?(groonga)
     end
 
     @host = "127.0.0.1"
@@ -83,6 +84,7 @@ class RemoteTest < Test::Unit::TestCase
                    "command_version",
                    "default_command_version",
                    "max_command_version",
+                   "n_jobs",
                    "n_queries",
                    "start_time",
                    "starttime",

data/test/test-schema.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2020  Kouhei Sutou <kou@clear-code.com>
 # Copyright (C) 2014  Masafumi Yokoyama <myokoym@gmail.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -920,6 +920,14 @@ class SchemaTest < Test::Unit::TestCase
     end
   end
 
+  def test_normalizer_with_options
+    Groonga::Schema.create_table("Names",
+                                 key_type: :short_text,
+                                 normalizer: "NormalizerNFKC121('unify_kana', true)")
+    assert_equal(Groonga["NormalizerNFKC121"],
+                 Groonga["Names"].normalizer)
+  end
+
   private
   def columns_directory_path(table)
     "#{table.path}.columns"

data/test/test-table-arrow.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2018  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2017-2020  Sutou Kouhei <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -20,6 +20,9 @@ class TableArrowTest < Test::Unit::TestCase
     setup_database
 
     omit("Apache Arrow support is required") unless context.support_arrow?
+    if (Groonga::VERSION[0, 3] <=> [9, 1, 2]) <= 0
+      omit("Groonga 9.1.2 is buggy")
+    end
   end
 
   def assert_dump_load(type, n_records)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rroonga
 version: !ruby/object:Gem::Version
-  version: 9.0.7
+  version: 10.0.1
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-29 00:00:00.000000000 Z
+date: 2020-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
@@ -56,20 +56,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: archive-zip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -98,34 +84,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.5
-- !ruby/object:Gem::Dependency
-  name: rake-compiler-dock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -194,8 +152,8 @@ email:
 - y.hayamizu@gmail.com
 - dara@shidara.net
 executables:
-- grndump
 - groonga-database-inspect
+- grndump
 - grntest-log-analyze
 - groonga-index-dump
 extensions:
@@ -396,7 +354,8 @@ files:
 homepage: http://ranguba.org/#about-rroonga
 licenses:
 - LGPL-2.1
-metadata: {}
+metadata:
+  msys2_mingw_dependencies: groonga
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -413,79 +372,79 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for Groonga that provide full text search and column store
   features.
 test_files:
-- test/test-column-cache.rb
-- test/test-remote.rb
-- test/run-test.rb
-- test/test-query-logger.rb
-- test/test-data-column.rb
-- test/test-database-inspector.rb
-- test/test-type.rb
-- test/test-column.rb
-- test/test-expression.rb
-- test/test-fix-size-column.rb
-- test/test-table-offset-and-limit.rb
-- test/test-windows-event-logger.rb
-- test/test-lock-timeout.rb
+- test/test-request-canceler.rb
 - test/test-convert.rb
-- test/test-accessor.rb
+- test/test-table-select.rb
+- test/test-table-dumper.rb
+- test/test-table.rb
+- test/test-thread.rb
+- test/test-gqtp.rb
+- test/test-geo-point.rb
+- test/test-variable.rb
+- test/test-operator.rb
+- test/test-table-select-mecab.rb
+- test/test-version.rb
+- test/test-patricia-trie.rb
 - test/test-context.rb
-- test/test-procedure.rb
 - test/test-table-traverse.rb
-- test/test-sub-records.rb
-- test/test-package-label.rb
-- test/test-logger.rb
-- test/test-table-select.rb
+- test/test-memory-pool.rb
 - test/test-config.rb
-- test/test-table-select-weight.rb
-- test/test-flushable.rb
+- test/test-data-column.rb
+- test/test-table-offset-and-limit.rb
+- test/test-variable-size-column.rb
+- test/test-fix-size-column.rb
+- test/test-database.rb
 - test/test-token-regexp.rb
-- test/test-variable.rb
-- test/test-thread.rb
-- test/test-index-cursor.rb
-- test/test-table.rb
-- test/test-operator.rb
-- test/test-default-cache.rb
-- test/test-error-message.rb
-- test/test-vector-column.rb
-- test/test-index-column.rb
-- test/test-exception.rb
-- test/test-expression-builder.rb
-- test/test-double-array-trie.rb
-- test/test-plugin.rb
-- test/test-table-group.rb
-- test/test-snippet.rb
 - test/test-schema-dumper.rb
-- test/test-table-dumper.rb
-- test/test-gqtp.rb
-- test/test-memory-pool.rb
-- test/test-array.rb
+- test/test-database-inspector.rb
+- test/test-logger.rb
+- test/test-windows-event-logger.rb
+- test/test-package-label.rb
+- test/test-flushable.rb
+- test/test-expression-builder.rb
+- test/test-table-arrow.rb
 - test/groonga-test-utils.rb
-- test/test-geo-point.rb
-- test/test-table-select-mecab.rb
+- test/test-array.rb
+- test/test-procedure.rb
+- test/test-index-cursor.rb
+- test/test-lock-timeout.rb
+- test/test-double-array-trie.rb
+- test/test-exception.rb
+- test/test-accessor.rb
+- test/test-schema-create-table.rb
+- test/run-test.rb
+- test/test-column-cache.rb
+- test/test-request-timer.rb
+- test/test-sub-records.rb
 - test/test-normalizer.rb
-- test/test-pagination.rb
-- test/test-schema-type.rb
-- test/test-patricia-trie.rb
+- test/test-error-message.rb
+- test/test-type.rb
 - test/test-table-select-normalize.rb
-- test/test-version.rb
-- test/test-hash.rb
-- test/test-encoding.rb
+- test/test-snippet.rb
+- test/test-index-column.rb
+- test/test-query-logger.rb
+- test/test-column.rb
 - test/test-name.rb
-- test/test-table-arrow.rb
-- test/test-variable-size-column.rb
-- test/test-database.rb
-- test/test-command-select.rb
+- test/test-table-select-weight.rb
+- test/test-pagination.rb
+- test/test-vector-column.rb
+- test/test-default-cache.rb
+- test/test-id.rb
+- test/test-schema.rb
+- test/test-plugin.rb
+- test/test-table-group.rb
 - test/test-record.rb
+- test/test-expression.rb
 - test/test-table-key-support.rb
-- test/test-id.rb
-- test/test-request-timer.rb
-- test/test-request-canceler.rb
+- test/test-remote.rb
+- test/test-encoding.rb
 - test/test-database-dumper.rb
-- test/test-schema-create-table.rb
-- test/test-schema.rb
+- test/test-command-select.rb
+- test/test-hash.rb
+- test/test-schema-type.rb