rroonga 10.0.1 → 10.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4f0e0fdf1d23daf834ebb866894d0f05955af7187e07821154e151090273e06
-  data.tar.gz: e1bff6c3547943e270b04f1c2674845ef26bf2f1a64f40ec72f682a0d3b30843
+  metadata.gz: 323ef18fd80d19942c261d4a8c8ae7f67c39542fc2804b9c6692f013948fd542
+  data.tar.gz: 1e116cc58914ea3252988d5c6fa246919870814c7697b0794323aee20008ac16
 SHA512:
-  metadata.gz: ee1389b602d9544eb31a7273bf313f83da7599bb6317ffd9e83614bfd334af52d2fad638f23790095a4c2f56e8c70f66dc38a43d968e777e0c2fd0c0fa2e33a1
-  data.tar.gz: 3de057e696486314205762ea1bc6160c892d422cc04dbc8a98e5458ce2cf3404ba28901668158eb65e8b0af0493e5dad1bb5fd4f3ff7c32d02a7cdec65f22e11
+  metadata.gz: ec001925838d04408d420bef49008758d4011a32489885c7e6983d9958d8d83b4f889e32beff7a8ecf86b8738f67f4d0eda3f9f7a53e8b7b719cdbd4c196fef5
+  data.tar.gz: cb9e589771596b4ed1dc481897af4b41e6fcad7cfcf40488c9298814dc28e93b246bf45c2227dc027f24f1396827a2e407792035caf0c28dc725e38591e3cf69

data/.yardopts

@@ -1,6 +1,7 @@
 --output-dir doc/reference/en
 --markup markdown
 --markup-provider kramdown
+--asset doc/images:images
 lib/**/*.rb
 ext/**/*.c
 -

data/Rakefile

@@ -46,28 +46,6 @@ Packnga::ReleaseTask.new(spec) do |task|
   task.index_html_dir = ranguba_org_dir
 end
 
-module YARD
-  module CodeObjects
-    class Proxy
-      alias_method :initialize_original, :initialize
-      def initialize(namespace, name, type=nil)
-        name = name.to_s.gsub(/\AGrn(.*)\z/) do
-          suffix = $1
-          case suffix
-          when ""
-            "Groonga"
-          when "TableKeySupport"
-            "Groonga::Table::KeySupport"
-          else
-            "Groonga::#{suffix}"
-          end
-        end
-        initialize_original(namespace, name, type)
-      end
-    end
-  end
-end
-
 file "Makefile" => ["extconf.rb", "ext/groonga/extconf.rb"] do
   extconf_args = []
   if ENV["TRAVIS"]
@@ -85,12 +63,12 @@ task :test => :configure do
 end
 
 namespace :test do
-  task :install do
-    gemspec_helper = Rake.application.jeweler.gemspec_helper
-    ruby("-S gem install --user-install #{gemspec_helper.gem_path}")
-
-    gem_spec = Gem.source_index.find_name("rroonga").last
-    installed_path = gem_spec.full_gem_path
+  task :install => "install" do
+    rroonga_specs = Gem.source_index.find_name("rroonga")
+    target_rroonga_spec = rroonga_specs.find do |rroonga_spec|
+      rroonga_spec.version == helper.gemspec.version
+    end
+    installed_path = target_rroonga_spec.full_gem_path
     ENV["NO_MAKE"] = "yes"
     ruby("#{installed_path}/test/run-test.rb")
   end

data/doc/text/news.md

@@ -1,5 +1,17 @@
 # NEWS
 
+## 10.0.2: 2020-04-29 {#version-10-0-2}
+
+### Improvements
+
+  * Added support for Float32 in Groonga 10.0.2.
+
+  * [doc] Fixed markup of a image in tutorial [GitHub#192][Patched by takahashim]
+
+### Thanks
+
+  * takahashim
+
 ## 10.0.1: 2020-04-02 {#version-10-0-1}
 
 ### Improvements
@@ -22,11 +34,15 @@
 
   * {Groonga::IndexColumn} Added support "INDEX_LARGE".
 
-  * {Groonga::IndexCursor.min_enable?/min_enable=} Added.
+  * {Groonga::IndexCursor#set_min?} Added.
+
+  * {Groonga::IndexCursor#set_min=} Added.
+
+  * {Groonga::Context#force_match_escalation?} Added.
 
-  * {Groonga::Context#match_escalation?/match_escalation=} Added.
+  * {Groonga::Context#force_match_escalation=} Added.
 
-  * {Groona::Object#id_accessor?} Added.
+  * {Groonga::Object#id_accessor?} Added.
 
   * {Groonga::Logger.flags} Added support for thread id option.
 
@@ -36,7 +52,7 @@
 
   * {Groonga::Table} Delegate support_score? from Groonga::Record to Groonga::Table.
 
-  * {Groonga::Flashable} Added support dependent option.
+  * Groonga::Flashable Added support dependent option.
 
   * {Groonga::Object#score_accessor?} Added.
 
@@ -59,7 +75,7 @@
   * Added support for "--with-groonga-configure-options".
     [GitHub#146][Reported by Tomás Pollak]
 
-  * {Groonga::RegexpExpressionBuilder}: Added support (?-mix:XXX) for searching of regular expression.
+  * Groonga::RegexpExpressionBuilder: Added support (?-mix:XXX) for searching of regular expression.
     [groonga-dev,04694][Reported by Masatoshi SEKI]
 
   * Use "groonga-latest.tar.gz" for build Groonga.

data/doc/text/tutorial.md

@@ -178,7 +178,7 @@ bookmarks.
 
 First, you add tables for users and for comments like below:
 
-!http://qwik.jp/senna/senna2.files/rect4605.png!
+![Sample schema](images/sample-schema.png)
 
 Let's add the table for users, `Users`.
 

data/ext/groonga/extconf.rb

@@ -267,7 +267,7 @@ end
 
 def enable_debug_build_flag(flags)
   if gcc?
-    flags.gsub(/(^|\s)?-g\d?(\s|$)?/, '\\1-ggdb3\\2')
+    flags.gsub(/(^|\s)?-g\d?(\s|$)/, '\\1-ggdb3\\2')
   else
     flags
   end
@@ -279,6 +279,9 @@ checking_for(checking_message("--enable-debug-build option")) do
     $CFLAGS = disable_optimization_build_flag($CFLAGS)
     $CFLAGS = enable_debug_build_flag($CFLAGS)
 
+    CONFIG["optflags"] = disable_optimization_build_flag(CONFIG["optflags"])
+    CONFIG["debugflags"] = enable_debug_build_flag(CONFIG["debugflags"])
+
     CONFIG["CXXFLAGS"] = disable_optimization_build_flag(CONFIG["CXXFLAGS"])
     CONFIG["CXXFLAGS"] = enable_debug_build_flag(CONFIG["CXXFLAGS"])
   end

data/ext/groonga/rb-grn-expression-builder.c

@@ -1,6 +1,6 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2009  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
@@ -42,9 +42,9 @@ build (VALUE self)
 }
 
 static VALUE
-build_block (VALUE self)
+build_block (RB_BLOCK_CALL_FUNC_ARGLIST(yielded_arg, callback_arg))
 {
-    return rb_funcall(rb_block_proc(), rb_intern("call"), 1, self);
+    return rb_funcall(rb_block_proc(), rb_intern("call"), 1, yielded_arg);
 }
 
 VALUE

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-2020  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2020  Sutou Kouhei <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
@@ -481,8 +481,10 @@ typedef struct _SetValueData
 } SetValueData;
 
 static VALUE
-set_value (VALUE args, SetValueData *data)
+set_value (RB_BLOCK_CALL_FUNC_ARGLIST(yielded_arg, callback_arg))
 {
+    VALUE args = yielded_arg;
+    SetValueData *data = (SetValueData *)callback_arg;
     VALUE rb_name, rb_value, rb_column;
     RbGrnObject *rb_grn_object;
 

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

@@ -1,6 +1,6 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2009-2016  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
@@ -304,6 +304,10 @@ rb_grn_init_type (VALUE mGrn)
     rb_define_const(rb_cGrnType, "INT64", INT2NUM(GRN_DB_INT64));
     /* 64bit符号なし整数。 */
     rb_define_const(rb_cGrnType, "UINT64", INT2NUM(GRN_DB_UINT64));
+#if RB_GRN_HAVE_FLOAT32
+    /* 32bit floating pointer number in IEEE754 format. */
+    rb_define_const(rb_cGrnType, "FLOAT32", INT2NUM(GRN_DB_FLOAT32));
+#endif
     /* ieee754形式の64bit浮動小数点数。 */
     rb_define_const(rb_cGrnType, "FLOAT", INT2NUM(GRN_DB_FLOAT));
     /* 1970年1月1日0時0分0秒からの経過マイクロ秒数を64bit符

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

@@ -1,7 +1,7 @@
 /* -*- mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* vim: set sts=4 sw=4 ts=8 noet: */
 /*
-  Copyright (C) 2009-2017  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
@@ -201,6 +201,11 @@ rb_grn_bulk_to_ruby_object_by_range_id (grn_ctx *context, grn_obj *bulk,
     case GRN_DB_UINT64:
         *rb_value = ULL2NUM(GRN_UINT64_VALUE(bulk));
         break;
+#if RB_GRN_HAVE_FLOAT32
+    case GRN_DB_FLOAT32:
+        *rb_value = rb_float_new(GRN_FLOAT32_VALUE(bulk));
+        break;
+#endif
     case GRN_DB_FLOAT:
         *rb_value = rb_float_new(GRN_FLOAT_VALUE(bulk));
         break;
@@ -447,6 +452,7 @@ rb_grn_bulk_from_ruby_object_with_type (VALUE object, grn_ctx *context,
         int64_t int64_value;
         uint64_t uint64_value;
         int64_t time_value;
+        float float_value;
         double double_value;
         grn_geo_point geo_point_value;
         grn_id record_id;
@@ -525,6 +531,16 @@ rb_grn_bulk_from_ruby_object_with_type (VALUE object, grn_ctx *context,
         string = (const char *)&(value.uint64_value);
         size = sizeof(value.uint64_value);
         break;
+#if RB_GRN_HAVE_FLOAT32
+    case GRN_DB_FLOAT32:
+        if (string_p) {
+            object = rb_Float(object);
+        }
+        value.float_value = NUM2DBL(object);
+        string = (const char *)&(value.float_value);
+        size = sizeof(value.float_value);
+        break;
+#endif
     case GRN_DB_FLOAT:
         if (string_p) {
             object = rb_Float(object);

data/ext/groonga/rb-grn.h

@@ -89,9 +89,11 @@ RB_GRN_BEGIN_DECLS
 #  define debug(...)
 #endif
 
+#define RB_GRN_HAVE_FLOAT32 GRN_VERSION_OR_LATER(10, 0, 2)
+
 #define RB_GRN_MAJOR_VERSION 10
 #define RB_GRN_MINOR_VERSION 0
-#define RB_GRN_MICRO_VERSION 1
+#define RB_GRN_MICRO_VERSION 2
 
 #define RB_GRN_OBJECT(object) ((RbGrnObject *)(object))
 #define RB_GRN_NAMED_OBJECT(object) ((RbGrnNamedObject *)(object))

data/ext/groonga/rb-groonga.c

@@ -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) 2016  Masafumi Yokoyama <yokoyama@clear-code.com>
 
   This library is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
 grn_bool rb_grn_exited = GRN_FALSE;
 
 static VALUE
-finish_groonga (VALUE data)
+finish_groonga (RB_BLOCK_CALL_FUNC_ARGLIST(yielded_arg, callback_arg))
 {
     debug("finish\n");
     grn_fin();

data/rroonga.gemspec

@@ -92,6 +92,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency("packnga", [">= 1.0.0"])
   s.add_development_dependency("kramdown")
 
-  s.metadata["msys2_mingw_dependencies"] = "groonga"
+  s.metadata["msys2_mingw_dependencies"] = "groonga>=10.0.1"
 end
 

data/test/groonga-test-utils.rb

@@ -209,4 +209,10 @@ module GroongaTestUtils
   def check_mecab_availability
     omit("MeCab isn't available") if context["TokenMecab"].nil?
   end
+
+  def need_groonga(major, minor, micro)
+    if (Groonga::BUILD_VERSION[0, 3] <=> [major, minor, micro]) < 0
+      omit("Groonga #{major}.#{minor}.#{micro} or later is required")
+    end
+  end
 end

data/test/test-column.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2016  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2020  Sutou Kouhei <kou@clear-code.com>
 # Copyright (C) 2016  Masafumi Yokoyama <yokoyama@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -307,6 +307,17 @@ class ColumnTest < Test::Unit::TestCase
     assert_false(post["hidden"])
   end
 
+  def test_float32
+    need_groonga(10, 0, 2)
+
+    numbers = Groonga::Array.create(:name => "Numbers")
+    numbers.define_column("data", "Float32")
+
+    number = numbers.add
+    number["data"] = 1.1
+    assert_in_delta(1.1, number["data"])
+  end
+
   def test_indexes
     Groonga::Schema.define do |schema|
       schema.create_table("Comments") do |table|

data/test/test-table-arrow.rb

@@ -20,9 +20,6 @@ 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: 10.0.1
+  version: 10.0.2
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-06 00:00:00.000000000 Z
+date: 2020-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
@@ -355,7 +355,7 @@ homepage: http://ranguba.org/#about-rroonga
 licenses:
 - LGPL-2.1
 metadata:
-  msys2_mingw_dependencies: groonga
+  msys2_mingw_dependencies: groonga>=10.0.1
 post_install_message: 
 rdoc_options: []
 require_paths: