rroonga 5.0.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e080d48d06e47c3504eef74495e62193e30b3ff8
-  data.tar.gz: bd3b0cd6fe3b2a26e550d9c7b8dfc16e786710c3
+  metadata.gz: f9abb0782118ae8bf3bc7ae7fd91b2947d23568f
+  data.tar.gz: d4cd06feff63ea165f725fcc667de0d6e35d7ed3
 SHA512:
-  metadata.gz: b5c5eb1bf9999062382965a37ee20dd8dcdfffd9afd50516c8a1882165f41231602c6ed1c80efab9fbaa97272d8b2a17aa07db599d7c339621e6285cbf8e6327
-  data.tar.gz: 77a6604d8fd4c3831a2ee42016c1e25a8273623812d9a8582830458163f08a6ec735fe5a64af064b7a67b3150bfa429d3b0212d1decc719612390fadffd1c318
+  metadata.gz: a537e4dab40a080c59a801492b55b0aa103734cd3103ae616dceecdde3fd9fdd8b7ef400c67962854dfe4cba8685ef4ea24431e0eade2b7df7eb8360d57ea840
+  data.tar.gz: 2cf053bf2f30202391d013839f394d344280ef5666abac6d75cb4564043977b965f55a8320bd29cda9cccdf19eec0f96c34edb35c870121322f080bf6aacefb5

data/.yardopts

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

data/Rakefile

@@ -1,6 +1,6 @@
 # -*- coding: utf-8; mode: ruby -*-
 #
-# Copyright (C) 2009-2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2015  Kouhei Sutou <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
@@ -114,15 +114,6 @@ Rake::ExtensionTask.new("groonga", spec) do |ext|
       if windows?(_spec.platform.to_s)
         binary_files = collect_binary_files(relative_binary_dir)
         _spec.files += binary_files
-        stage_path = "#{ext.tmp_dir}/#{_spec.platform}/stage"
-        binary_files.each do |binary_file|
-          stage_binary_file = "#{stage_path}/#{binary_file}"
-          stage_binary_dir = File.dirname(stage_binary_file)
-          directory stage_binary_dir
-          file stage_binary_file => [stage_binary_dir, binary_file] do
-            cp binary_file, stage_binary_file
-          end
-        end
       end
     end
   end

data/ext/groonga/extconf.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2009-2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2015  Kouhei Sutou <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
@@ -282,6 +282,8 @@ have_header("ruby/st.h") unless have_macro("HAVE_RUBY_ST_H", "ruby.h")
 have_func("rb_errinfo", "ruby.h")
 have_func("rb_sym2str", "ruby.h")
 have_func("rb_to_symbol", "ruby.h")
+have_func("rb_ary_new_from_args", "ruby.h")
+have_func("rb_ary_new_from_values", "ruby.h")
 have_type("enum ruby_value_type", "ruby.h")
 
 checking_for(checking_message("--enable-debug-log option")) do

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

@@ -131,7 +131,7 @@ rb_grn_array_s_create (int argc, VALUE *argv, VALUE klass)
     table = grn_table_create(context, name, name_size, path,
                              flags, NULL, value_type);
     if (!table)
-        rb_grn_context_check(context, rb_ary_new4(argc, argv));
+        rb_grn_context_check(context, rb_ary_new_from_values(argc, argv));
     rb_table = GRNOBJECT2RVAL(klass, context, table, GRN_TRUE);
     rb_grn_context_check(context, rb_table);
     rb_iv_set(rb_table, "@context", rb_context);

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

@@ -1,7 +1,7 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* vim: set sts=4 sw=4 ts=8 noet: */
 /*
-  Copyright (C) 2009-2014  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2015  Kouhei Sutou <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
@@ -195,13 +195,13 @@ rb_grn_column_get_local_name (VALUE self)
  * {Groonga::Expression#snippet} を使うことにより、指定した条件
  * 用のスニペットを簡単に生成できる。
  *
- * bc. !!!ruby
+ * @example Shows texts around "Groonga"
  *   results = description_column.select do |column|
- *     column =~ "groonga"
+ *     column =~ "Groonga"
  *   end
  *   snippet = results.expression.snippet([["<em>", "</em>"]])
  *   results.each do |record|
- *     puts "#{record['name']}の説明文の中で「groonga」が含まれる部分"
+ *     puts "#{record['name']}の説明文の中で「Groonga」を含む部分"
  *     snippet.execute(record["description"]).each do |snippet|
  *       puts "---"
  *       puts "#{snippet}..."
@@ -209,15 +209,12 @@ rb_grn_column_get_local_name (VALUE self)
  *     end
  *   end
  *
- * 出力例
- *
- * <pre>
- * !!!text
- * rroongaの説明文の中で「groonga」が含まれる部分
- * ---
- * rroongaは<em>groonga</em>のいわゆるDB-APIの層の...
- * ---
- * </pre>
+ *   # Sample output:
+ *   #
+ *   # Rroongaの説明文の中で「Groonga」を含む部分
+ *   # ---
+ *   # Rroongaは<em>Groonga</em>のいわゆるDB-APIの層の...
+ *   # ---
  *
  * @return [Groonga::Hash] 検索結果
  * @overload select(options)
@@ -351,7 +348,7 @@ rb_grn_column_select (int argc, VALUE *argv, VALUE self)
                      "should be [query_string, option_hash], "
                      "[expression, option_hash] "
                      "or [option_hash]: %s",
-                     rb_grn_inspect(rb_ary_new4(argc, argv)));
+                     rb_grn_inspect(rb_ary_new_from_values(argc, argv)));
         options = condition_or_options;
     }
 
@@ -504,72 +501,42 @@ rb_grn_column_lock (int argc, VALUE *argv, VALUE self)
 }
 
 /*
- * _column_ のロックを強制的に解除する。
- * @overload clear_lock(options={})
- *   @param [::Hash] options 利用可能なオプションは以下の通り。
- *   @option options :id
- *     _:id_で指定したレコードのロックを強制的に解除する。
- *     （注: groonga側が未実装のため、現在は無視される。実装さ
- *     れるのではないかと思っているが、実装されないかもしれな
- *     い。）
+ * Forces to clear lock of the `column`.
+ *
+ * @overload clear_lock
+ *   @return [void]
  */
 static VALUE
-rb_grn_column_clear_lock (int argc, VALUE *argv, VALUE self)
+rb_grn_column_clear_lock (VALUE self)
 {
-    grn_id id = GRN_ID_NIL;
     grn_ctx *context;
     grn_obj *column;
-    VALUE options, rb_id;
-
-    rb_scan_args(argc, argv, "01",  &options);
 
     rb_grn_column_deconstruct(SELF(self), &column, &context,
                              NULL, NULL,
                              NULL, NULL, NULL);
 
-    rb_grn_scan_options(options,
-                        "id", &rb_id,
-                        NULL);
-
-    if (!NIL_P(rb_id))
-        id = NUM2UINT(rb_id);
-
     grn_obj_clear_lock(context, column);
 
     return Qnil;
 }
 
 /*
- * _column_ がロックされていれば +true+ を返す。
- * @overload locked?(options={})
- *   @param [::Hash] options 利用可能なオプションは以下の通り。
- *   @option options :id
- *     _:id_で指定したレコードがロックされていれば +true+ を返す。
- *     （注: groonga側が未実装のため、現在は無視される。実装さ
- *     れるのではないかと思っているが、実装されないかもしれな
- *     い。）
+ * Checks whether the `column` is locked or not.
+ *
+ * @overload locked?
+ *   @return [Boolean] `true` if the `column` is locked, `false` otherwise.
  */
 static VALUE
-rb_grn_column_is_locked (int argc, VALUE *argv, VALUE self)
+rb_grn_column_locked_p (VALUE self)
 {
-    grn_id id = GRN_ID_NIL;
     grn_ctx *context;
     grn_obj *column;
-    VALUE options, rb_id;
-
-    rb_scan_args(argc, argv, "01",  &options);
 
     rb_grn_column_deconstruct(SELF(self), &column, &context,
                              NULL, NULL,
                              NULL, NULL, NULL);
 
-    rb_grn_scan_options(options,
-                        "id", &rb_id,
-                        NULL);
-
-    if (!NIL_P(rb_id))
-        id = NUM2UINT(rb_id);
-
     return CBOOL2RVAL(grn_obj_is_locked(context, column));
 }
 
@@ -742,9 +709,9 @@ rb_grn_column_with_weight_p(VALUE self)
 }
 
 /*
- * _operator_ を実行できる _column_ のインデックスを返す。
+ * Return indexes on `column` which can execute `operator`.
  * @since 1.0.9
- * @return [Array<index_column>] _operator_ を実行できる _column_ のインデックス
+ * @return [Array<index_column>] Indexes on `column` which can execute `operator`.
  * @overload indexes(operator=Groonga::Operator::MATCH)
  *   @param [Groonga::Operator::XXX] operator
  */
@@ -753,7 +720,7 @@ rb_grn_column_get_indexes (int argc, VALUE *argv, VALUE self)
 {
     grn_ctx *context;
     grn_obj *column;
-    grn_obj **indexes = NULL;
+    grn_index_datum *index_data = NULL;
     int i, n_indexes;
     grn_operator operator = GRN_OP_MATCH;
     VALUE rb_operator, rb_indexes;
@@ -769,21 +736,20 @@ rb_grn_column_get_indexes (int argc, VALUE *argv, VALUE self)
     }
 
     rb_indexes = rb_ary_new();
-    n_indexes = grn_column_index(context, column, operator,
-                                 NULL, 0, NULL);
+    n_indexes = grn_column_find_index_data(context, column, operator, NULL, 0);
     if (n_indexes == 0)
         return rb_indexes;
 
-    indexes = xmalloc(sizeof(grn_obj *) * n_indexes);
-    n_indexes = grn_column_index(context, column, operator,
-                                 indexes, n_indexes, NULL);
+    index_data = xmalloc(sizeof(grn_index_datum) * n_indexes);
+    n_indexes = grn_column_find_index_data(context, column, operator,
+                                           index_data, n_indexes);
     for (i = 0; i < n_indexes; i++) {
         VALUE rb_index;
-        rb_index = GRNOBJECT2RVAL(Qnil, context, indexes[i], GRN_FALSE);
+        rb_index = GRNOBJECT2RVAL(Qnil, context, index_data[i].index, GRN_FALSE);
         rb_ary_push(rb_indexes, rb_index);
-        grn_obj_unlink(context, indexes[i]);
+        grn_obj_unlink(context, index_data[i].index);
     }
-    xfree(indexes);
+    xfree(index_data);
     return rb_indexes;
 }
 
@@ -829,8 +795,8 @@ rb_grn_init_column (VALUE mGrn)
     rb_define_method(rb_cGrnColumn, "select", rb_grn_column_select, -1);
     rb_define_method(rb_cGrnColumn, "lock", rb_grn_column_lock, -1);
     rb_define_method(rb_cGrnColumn, "unlock", rb_grn_column_unlock, -1);
-    rb_define_method(rb_cGrnColumn, "clear_lock", rb_grn_column_clear_lock, -1);
-    rb_define_method(rb_cGrnColumn, "locked?", rb_grn_column_is_locked, -1);
+    rb_define_method(rb_cGrnColumn, "clear_lock", rb_grn_column_clear_lock, 0);
+    rb_define_method(rb_cGrnColumn, "locked?", rb_grn_column_locked_p, 0);
     rb_define_method(rb_cGrnColumn, "reference?", rb_grn_column_reference_p, 0);
     rb_define_method(rb_cGrnColumn, "truncate", rb_grn_column_truncate, 0);
     /* deprecated: backward compatibility */

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

@@ -49,15 +49,15 @@ rb_grn_context_from_ruby_object (VALUE object)
     RbGrnContext *rb_grn_context;
 
     if (!RVAL2CBOOL(rb_obj_is_kind_of(object, cGrnContext))) {
-        rb_raise(rb_eTypeError, "not a groonga context");
+        rb_raise(rb_eTypeError, "not a Groonga context");
     }
 
     Data_Get_Struct(object, RbGrnContext, rb_grn_context);
     if (!rb_grn_context)
-        rb_raise(rb_eGrnError, "groonga context is NULL");
+        rb_raise(rb_eGrnError, "Groonga context is NULL");
     if (!rb_grn_context->context)
         rb_raise(rb_eGrnClosed,
-                 "can't access already closed groonga context");
+                 "can't access already closed Groonga context");
     return rb_grn_context->context;
 }
 
@@ -534,7 +534,7 @@ rb_grn_context_inspect (VALUE self)
 
     context = SELF(self);
 
-    inspected = rb_str_new2("#<");
+    inspected = rb_str_new_cstr("#<");
     rb_str_concat(inspected, rb_inspect(rb_obj_class(self)));
     rb_str_cat2(inspected, " ");
 
@@ -817,7 +817,7 @@ rb_grn_context_receive (VALUE self)
     }
     rb_grn_context_check(context, self);
 
-    return rb_ary_new3(2, UINT2NUM(query_id), rb_result);
+    return rb_ary_new_from_args(2, UINT2NUM(query_id), rb_result);
 }
 
 static const char *

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

@@ -200,13 +200,13 @@ rb_grn_database_s_create (int argc, VALUE *argv, VALUE klass)
         grn_obj_unlink(context, old_database);
     reset_floating_objects(rb_context);
     database = grn_db_create(context, path, &create_args);
-    rb_grn_context_check(context, rb_ary_new4(argc, argv));
+    rb_grn_context_check(context, rb_ary_new_from_values(argc, argv));
     owner = (context->flags & GRN_CTX_PER_DB) ? GRN_FALSE : GRN_TRUE;
     rb_database = GRNOBJECT2RVAL(klass, context, database, owner);
     rb_iv_set(rb_database, "@context", rb_context);
     if (!NIL_P(rb_context))
         rb_iv_set(rb_context, "database", rb_database);
-    rb_grn_context_check(context, rb_ary_new4(argc, argv));
+    rb_grn_context_check(context, rb_ary_new_from_values(argc, argv));
 
     if (rb_block_given_p())
         return rb_ensure(rb_yield, rb_database,

data/ext/groonga/rb-grn-double-array-trie.c

@@ -309,7 +309,7 @@ rb_grn_double_array_trie_s_create (int argc, VALUE *argv, VALUE klass)
     table = grn_table_create(context, name, name_size, path,
                              flags, key_type, value_type);
     if (!table)
-        rb_grn_context_check(context, rb_ary_new4(argc, argv));
+        rb_grn_context_check(context, rb_ary_new_from_values(argc, argv));
     rb_table = GRNOBJECT2RVAL(klass, context, table, GRN_TRUE);
 
     if (!NIL_P(rb_default_tokenizer))
@@ -385,6 +385,8 @@ rb_grn_double_array_trie_search (int argc, VALUE *argv, VALUE self)
     grn_bool search_options_is_set = GRN_FALSE;
     VALUE rb_key, options, rb_result, rb_operator, rb_type;
 
+    memset(&search_options, 0, sizeof(grn_search_optarg));
+
     rb_grn_double_array_trie_deconstruct(SELF(self), &table, &context,
                                          &key, NULL, &domain_id, &domain,
                                          NULL, NULL, NULL,
@@ -456,7 +458,7 @@ rb_grn_double_array_trie_open_grn_prefix_cursor (int argc, VALUE *argv,
     if (!NIL_P(rb_key_bytes) && !NIL_P(rb_key_bits)) {
         rb_raise(rb_eArgError,
                  "should not specify both :key_bytes and :key_bits once: %s",
-                 rb_grn_inspect(rb_ary_new4(argc, argv)));
+                 rb_grn_inspect(rb_ary_new_from_values(argc, argv)));
     } else if (!NIL_P(rb_key_bytes)) {
         prefix_size = NUM2UINT(rb_key_bytes);
     } else if (!NIL_P(rb_key_bits)) {

data/ext/groonga/rb-grn-encoding-support.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-2015  Kouhei Sutou <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,6 +44,12 @@ rb_grn_encoding_support_get_encoding (VALUE self)
 
     rb_grn_object_deconstruct(SELF(self), &object, &context,
                               NULL, NULL, NULL, NULL);
+    if (!object) {
+        rb_raise(rb_eGrnClosed,
+                 "can't access already closed Groonga object: <%s>",
+                 rb_grn_inspect(self));
+    }
+
     encoding_value = grn_obj_get_info(context, object, GRN_INFO_ENCODING, NULL);
     rb_grn_context_check(context, self);
 

data/ext/groonga/rb-grn-equal-operator.c

@@ -0,0 +1,85 @@
+/* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+  Copyright (C) 2015  Kouhei Sutou <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
+  License version 2.1 as published by the Free Software Foundation.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "rb-grn.h"
+
+VALUE rb_cGrnEqualOperator;
+
+/*
+ * Executes an equal operation.
+ *
+ * @example Executes equal operations with the default context
+ *   Groonga::Operator::EQUAL.exec("hello", "hello") # => true
+ *   Groonga::Operator::EQUAL.exec("hello", "Hello") # => false
+ *
+ * @example Executes equal operations with the specified context
+ *   context = Groonga::Context.new
+ *   Groonga::Operator::EQUAL.exec("hello", "hello",
+ *                                 :context => context) # => true
+ *   Groonga::Operator::EQUAL.exec("hello", "Hello",
+ *                                 :context => context) # => false
+ *
+ * @overload exec(x, y, options={})
+ *   @param x [::Object] The left hand side value.
+ *   @param y [::Object] The right hand side value.
+ *   @param options [::Hash] The options.
+ *   @option options [Groonga::Context] (Groonga::Context.default)
+ *      The context to executes the operation.
+ *   @return [Boolean] `true` if `x` equals to `y`, `false`
+ *      otherwise.
+ */
+static VALUE
+rb_grn_equal_operator_exec (int argc, VALUE *argv, VALUE self)
+{
+    grn_bool equal;
+    VALUE rb_x;
+    VALUE rb_y;
+    VALUE rb_options;
+    VALUE rb_context;
+    grn_ctx *context;
+    grn_obj x;
+    grn_obj y;
+
+    rb_scan_args(argc, argv, "21", &rb_x, &rb_y, &rb_options);
+
+    rb_grn_scan_options(rb_options,
+                        "context", &rb_context,
+                        NULL);
+    context = rb_grn_context_ensure(&rb_context);
+
+    GRN_VOID_INIT(&x);
+    GRN_VOID_INIT(&y);
+    RVAL2GRNBULK(rb_x, context, &x);
+    RVAL2GRNBULK(rb_y, context, &y);
+    equal = grn_operator_exec_equal(context, &x, &y);
+    GRN_OBJ_FIN(context, &x);
+    GRN_OBJ_FIN(context, &y);
+
+    return CBOOL2RVAL(equal);
+}
+
+void
+rb_grn_init_equal_operator (VALUE mGrn)
+{
+    rb_cGrnEqualOperator = rb_define_class_under(mGrn,
+                                                 "EqualOperator",
+                                                 rb_cGrnOperator);
+
+    rb_define_method(rb_cGrnEqualOperator, "exec",
+                     rb_grn_equal_operator_exec, -1);
+}