rroonga 4.0.4 → 4.0.5

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZWE2YmYxNmUyYjY1N2M0Mjk3NjA4OTIyNjIyNzY2ODgxODY4MTkwYg==
-  data.tar.gz: !binary |-
-    ZWU1ODAxN2JjNjAwNzQ3M2UzMmEzNzVjM2RiODM5NmRhMDVmYjQ1Mw==
+SHA1:
+  metadata.gz: 503d0a50ec18bb2f348918e9604d3d741789b742
+  data.tar.gz: e22349e0fc515632567417b2ac6a1da1d026a0ff
 SHA512:
-  metadata.gz: !binary |-
-    YmZkNjU3ZGVlYjM2YTNlMTQ2NDdhY2MxZWZhZjIwZWM2MjBhNzUyNWU4YWI4
-    NmYzYTkxZDAxNzNhMTk4ZGZiMmRlMjIyM2U1ODZlNTlkYjUzMzIxZDc0YmY1
-    MzQ4NzY2OGFhMWU3NDM3Mjk3OTExOGNlZWMwN2FkYzU2M2M5ZDI=
-  data.tar.gz: !binary |-
-    Mjg5Yjk4ZGRiNjJjNWVmOTdjODNkM2MyYTE2YzYwMDQ2YWQ5ODRmNDIwNWI5
-    NGY2NTAwMmYyMzU0ZjdmM2ZiNjllZTY4MDZkZjBjMWFhNjMxZDk3ZjE0MjE0
-    ZDVlNTIwYzBkNTI4Y2Y2YzdkMGJjYzk4NmQ4ZmQxYWYyYTg1ZjE=
+  metadata.gz: a50ee57fe8bad9362b36745e062026045e019784a87fc23c45f157ed4d1c618b890939b112f484315ee8f24379604a2f77f9ac38569cd92e5a3167c2c9ff34c2
+  data.tar.gz: 5038e0c3e321b54d00e8675727cbde1dd6a2590f1a30d9b82f86c725e54cbc98b991a014a10fdd9b8b8b6f425a83bf98e3863c8a73f5ebd1c0218e4844df6a09

data/README.md

@@ -0,0 +1,73 @@
+# README
+
+[![Gem Version](https://badge.fury.io/rb/rroonga.svg)](http://badge.fury.io/rb/rroonga)
+[![Build Status](https://travis-ci.org/ranguba/rroonga.svg?branch=master)](https://travis-ci.org/ranguba/rroonga)
+
+## Name
+
+Rroonga
+
+## Description
+
+Ruby bindings for Groonga that provide full text search and
+column store features.
+
+Rroonga is an extension library to use Groonga's DB-API
+layer. Rroonga provides Rubyish readable and writable API
+not C like API. You can use Groonga's fast and highly
+functional features from Ruby with Rubyish form.
+
+See the following URL about Groonga.
+
+* [The Groonga official site](http://groonga.org/)
+
+## Authors
+
+* Kouhei Sutou `<kou@clear-code.com>`
+* Tasuku SUENAGA `<a@razil.jp>`
+* Daijiro MORI `<morita@razil.jp>`
+* Yuto HAYAMIZU `<y.hayamizu@gmail.com>`
+* SHIDARA Yoji `<dara@shidara.net>`
+* yoshihara haruka `<yoshihara@clear-code.com>`
+
+## License
+
+LGPL 2.1. See license/LGPL for details.
+
+(Kouhei Sutou has a right to change the license including
+contributed patches.)
+
+## Dependencies
+
+* Ruby >= 1.9.3
+* Groonga >= 4.0.4
+
+## Install
+
+    % sudo gem install rroonga
+
+## Documents
+
+* [Reference manual in English](http://ranguba.org/rroonga/en/)
+* [Reference manual in Japanese](http://ranguba.org/rroonga/ja/)
+
+## Mailing list
+
+* English: [groonga-talk](http://lists.sourceforge.net/mailman/listinfo/groonga-talk)
+* Japanese: [groonga-dev](http://lists.sourceforge.jp/mailman/listinfo/groonga-dev)
+
+## Thanks
+
+* Daijiro MORI: sent patches to support the latest Groonga.
+* Tasuku SUENAGA: sent bug reports.
+* niku: sent bug reports.
+* dara:
+  * wrote tests.
+  * fixed bugs.
+* id:mat_aki: sent bug reports.
+* @yune_kotomi: sent a bug report.
+* m_seki: sent bug reports.
+* ono matope: sent bug reports.
+* @kamipo: send a bug report.
+* ongaeshi: sent a patch to build gem on Windows.
+* mallowlabs: send a patch.

data/Rakefile

@@ -163,4 +163,17 @@ namespace :clean do
   end
 end
 
+desc "Build cross compile binary with Vagrant"
+namespace :build do
+  task :windows do
+    pkg_dir = "#{base_dir}/pkg"
+    mkdir pkg_dir unless File.exist?(pkg_dir)
+    cd "build/windows" do
+      sh("vagrant", "up")
+      cp(Dir.glob("pkg/rroonga-*-mingw32.gem"), pkg_dir)
+      sh("vagrant", "destroy", "-f")
+    end
+  end
+end
+
 task :default => :test

data/doc/text/news.textile

@@ -1,10 +1,34 @@
 h1. NEWS
 
-h2(#4-0-4). 4.0.4: 2014-08-29 (planned)
+h2(#4-0-5). 4.0.5: 2014-10-05
 
 h3. Improvements
 
-* Supported Groonga 4.0.4. Groonga 4.0.3 or older are not supported.
+* [windows] Added cross build task.
+* Added {Groonga::DoubleArrayTrie#update}.
+  [GitHub#24] [Patch by Masafumi Yokoyama]
+* Added {Groonga::Record#rename}.
+* [windows] Disabled debug flags.
+
+h3. Fixes
+
+* Added @:id => true@ option to {Groonga::Table::KeySupport#delete}.
+  @Groonga::Table::KeySupport#delete@ accepts both ID and key. If passed
+  value is integer, it is handled as ID. But we can use @Int32@ as key.
+  In the case, we can't delete a record by key. Therefore, we added
+  @Groonga::Table::KeySupport#delete(id, :id => true)@ API. It introduces
+  a backward incompatibility, but it is OK because the current API is a
+  bug.
+
+h3. Thanks
+
+* Masafumi Yokoyama
+
+h2(#4-0-4). 4.0.4: 2014-08-29
+
+h3. Improvements
+
+* Supported Groonga 4.0.4 or later. Groonga 4.0.3 or older are not supported.
 * Added {Groonga::ProcedureType} that has constants as GRN_PROC_XXX.
 * Added {Groonga::Procedure#type} as grn_proc_get_type().
   <pre>

data/ext/groonga/extconf.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2009-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2014  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
@@ -268,6 +268,8 @@ $defs << "-DGRN_MICRO_VERSION=#{real_micro}"
 
 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_type("enum ruby_value_type", "ruby.h")
 
 checking_for(checking_message("--enable-debug-log option")) do

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

@@ -902,7 +902,7 @@ rb_grn_context_array_reference (VALUE self, VALUE name_or_id)
     context = SELF(self);
     switch (TYPE(name_or_id)) {
       case T_SYMBOL:
-        name = rb_id2name(SYM2ID(name_or_id));
+        name = RSYMBOL2CSTR(name_or_id);
         name_size = strlen(name);
         object = rb_grn_context_get_backward_compatibility(context,
                                                            name, name_size);

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

@@ -1,7 +1,8 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* vim: set sts=4 sw=4 ts=8 noet: */
 /*
-  Copyright (C) 2011  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2014  Masafumi Yokoyama <myokoym@gmail.com>
+  Copyright (C) 2011-2014  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
@@ -19,7 +20,7 @@
 
 #include "rb-grn.h"
 
-#define SELF(object) ((RbGrnTableKeySupport *)DATA_PTR(object))
+#define SELF(object) ((RbGrnDoubleArrayTrie *)DATA_PTR(object))
 
 VALUE rb_cGrnDoubleArrayTrie;
 
@@ -42,6 +43,74 @@ VALUE rb_cGrnDoubleArrayTrie;
  * {Groonga::PatriciaTrie} . It also supports cursor API.
  */
 
+static void
+rb_grn_double_array_trie_deconstruct (RbGrnDoubleArrayTrie *rb_grn_double_array_trie,
+                                      grn_obj **double_array_trie,
+                                      grn_ctx **context,
+                                      grn_obj **key,
+                                      grn_obj **new_key,
+                                      grn_id *domain_id,
+                                      grn_obj **domain,
+                                      grn_obj **value,
+                                      grn_id *range_id,
+                                      grn_obj **range,
+                                      VALUE *columns)
+{
+    RbGrnTableKeySupport *rb_grn_table_key_support;
+
+    rb_grn_table_key_support =
+        RB_GRN_TABLE_KEY_SUPPORT(rb_grn_double_array_trie);
+
+    rb_grn_table_key_support_deconstruct(rb_grn_table_key_support,
+                                         double_array_trie, context,
+                                         key, domain_id, domain,
+                                         value, range_id, range,
+                                         columns);
+
+    if (new_key)
+        *new_key = rb_grn_double_array_trie->new_key;
+}
+
+void
+rb_grn_double_array_trie_finalizer (grn_ctx *context,
+                                    grn_obj *grn_object,
+                                    RbGrnDoubleArrayTrie *rb_grn_double_array_trie)
+{
+    RbGrnTableKeySupport *rb_grn_table_key_support;
+
+    if (!context)
+        return;
+
+    if (rb_grn_double_array_trie->new_key)
+        grn_obj_unlink(context, rb_grn_double_array_trie->new_key);
+    rb_grn_double_array_trie->new_key = NULL;
+
+    rb_grn_table_key_support =
+        RB_GRN_TABLE_KEY_SUPPORT(rb_grn_double_array_trie);
+    rb_grn_table_key_support_finalizer(context, grn_object,
+                                       rb_grn_table_key_support);
+}
+
+void
+rb_grn_double_array_trie_bind (RbGrnDoubleArrayTrie *rb_grn_double_array_trie,
+                               grn_ctx *context,
+                               grn_obj *double_array_trie)
+{
+    RbGrnObject *rb_grn_object;
+    RbGrnTableKeySupport *rb_grn_table_key_support;
+
+    rb_grn_object = RB_GRN_OBJECT(rb_grn_double_array_trie);
+
+    rb_grn_table_key_support =
+        RB_GRN_TABLE_KEY_SUPPORT(rb_grn_double_array_trie);
+    rb_grn_table_key_support_bind(rb_grn_table_key_support,
+                                  context,
+                                  double_array_trie);
+
+    rb_grn_double_array_trie->new_key =
+        grn_obj_open(context, GRN_BULK, 0, rb_grn_object->domain_id);
+}
+
 /*
  * It creates a table that manages records by double array trie.
  * ブロックを指定すると、そのブロックに生成したテーブルが渡さ
@@ -307,8 +376,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;
 
-    rb_grn_table_key_support_deconstruct(SELF(self), &table, &context,
-                                         &key, &domain_id, &domain,
+    rb_grn_double_array_trie_deconstruct(SELF(self), &table, &context,
+                                         &key, NULL, &domain_id, &domain,
                                          NULL, NULL, NULL,
                                          NULL);
 
@@ -495,6 +564,90 @@ rb_grn_double_array_trie_open_prefix_cursor (int argc, VALUE *argv, VALUE self)
         return rb_cursor;
 }
 
+static VALUE
+rb_grn_double_array_trie_update_by_id (VALUE self, VALUE rb_id, VALUE rb_new_key)
+{
+    grn_ctx *context;
+    grn_obj *table;
+    grn_id id, domain_id;
+    grn_obj *new_key, *domain;
+    grn_rc rc;
+
+    rb_grn_double_array_trie_deconstruct(SELF(self), &table, &context,
+                                         NULL, &new_key, &domain_id, &domain,
+                                         NULL, NULL, NULL,
+                                         NULL);
+
+    id = NUM2UINT(rb_id);
+    RVAL2GRNKEY(rb_new_key, context, new_key, domain_id, domain, self);
+    rc = grn_table_update_by_id(context, table, id,
+                                GRN_BULK_HEAD(new_key), GRN_BULK_VSIZE(new_key));
+    rb_grn_rc_check(rc, self);
+
+    return Qnil;
+}
+
+static VALUE
+rb_grn_double_array_trie_update_by_key (VALUE self,
+                                        VALUE rb_current_key,
+                                        VALUE rb_new_key)
+{
+    grn_ctx *context;
+    grn_obj *table;
+    grn_id domain_id;
+    grn_obj *current_key, *new_key, *domain;
+    grn_rc rc;
+
+    rb_grn_double_array_trie_deconstruct(SELF(self), &table, &context,
+                                         &current_key, &new_key,
+                                         &domain_id, &domain,
+                                         NULL, NULL, NULL,
+                                         NULL);
+
+    RVAL2GRNKEY(rb_current_key, context, current_key, domain_id, domain, self);
+    RVAL2GRNKEY(rb_new_key, context, new_key, domain_id, domain, self);
+    rc = grn_table_update(context, table,
+                          GRN_BULK_HEAD(current_key),
+                          GRN_BULK_VSIZE(current_key),
+                          GRN_BULK_HEAD(new_key),
+                          GRN_BULK_VSIZE(new_key));
+    rb_grn_rc_check(rc, self);
+
+    return Qnil;
+}
+
+/*
+ * Renames key of a record.
+ *
+ * @overload update(current_key, new_key)
+ * @overload update(id, new_key, :id=>true)
+ *
+ * @since 4.0.5
+ */
+static VALUE
+rb_grn_double_array_trie_update (int argc, VALUE *argv, VALUE self)
+{
+    VALUE rb_current_key_or_id, rb_new_key, rb_options;
+    VALUE rb_option_id;
+
+    rb_scan_args(argc, argv, "21",
+                 &rb_current_key_or_id, &rb_new_key, &rb_options);
+    rb_grn_scan_options(rb_options,
+                        "id", &rb_option_id,
+                        NULL);
+    if (RVAL2CBOOL(rb_option_id)) {
+        VALUE rb_id;
+        rb_id = rb_current_key_or_id;
+        return rb_grn_double_array_trie_update_by_id(self, rb_id, rb_new_key);
+    } else {
+        VALUE rb_current_key;
+        rb_current_key = rb_current_key_or_id;
+        return rb_grn_double_array_trie_update_by_key(self,
+                                                      rb_current_key,
+                                                      rb_new_key);
+    }
+}
+
 void
 rb_grn_init_double_array_trie (VALUE mGrn)
 {
@@ -510,4 +663,7 @@ rb_grn_init_double_array_trie (VALUE mGrn)
 
     rb_define_method(rb_cGrnDoubleArrayTrie, "open_prefix_cursor",
                      rb_grn_double_array_trie_open_prefix_cursor, -1);
+
+    rb_define_method(rb_cGrnDoubleArrayTrie, "update",
+                     rb_grn_double_array_trie_update, -1);
 }

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

@@ -135,10 +135,13 @@ rb_grn_object_run_finalizer (grn_ctx *context, grn_obj *grn_object,
         break;
     case GRN_TABLE_HASH_KEY:
     case GRN_TABLE_PAT_KEY:
-    case GRN_TABLE_DAT_KEY:
         rb_grn_table_key_support_finalizer(context, grn_object,
                                            RB_GRN_TABLE_KEY_SUPPORT(rb_grn_object));
         break;
+    case GRN_TABLE_DAT_KEY:
+        rb_grn_double_array_trie_finalizer(context, grn_object,
+                                           RB_GRN_DOUBLE_ARRAY_TRIE(rb_grn_object));
+        break;
     case GRN_TABLE_NO_KEY:
         rb_grn_table_finalizer(context, grn_object,
                                RB_GRN_TABLE(rb_grn_object));
@@ -441,6 +444,12 @@ rb_grn_object_assign (VALUE klass, VALUE self, VALUE rb_context,
         rb_grn_object = ALLOC(RbGrnObject);
         rb_grn_object_bind_common(klass, self, rb_context, rb_grn_object,
                                   context, object);
+    } else if (klass == rb_cGrnDoubleArrayTrie) {
+        rb_grn_object = ALLOC(RbGrnDoubleArrayTrie);
+        rb_grn_object_bind_common(klass, self, rb_context, rb_grn_object,
+                                  context, object);
+        rb_grn_double_array_trie_bind(RB_GRN_DOUBLE_ARRAY_TRIE(rb_grn_object),
+                                      context, object);
     } else if (RVAL2CBOOL(rb_obj_is_kind_of(self, rb_mGrnTableKeySupport))) {
         rb_grn_object = ALLOC(RbGrnTableKeySupport);
         rb_grn_object_bind_common(klass, self, rb_context, rb_grn_object,

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

@@ -1,7 +1,7 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
   Copyright (C) 2011  Haruka Yoshihara <yoshihara@clear-code.com>
-  Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2012-2014  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
@@ -30,7 +30,7 @@ rb_grn_posting_new (grn_posting *posting, grn_id term_id,
     parameters = rb_hash_new();
 
 #define SET_PARAMETER(key, value) \
-    rb_hash_aset(parameters, ID2SYM(rb_intern((key))), INT2NUM((value)))
+    rb_hash_aset(parameters, RB_GRN_INTERN(key), INT2NUM((value)))
 
     SET_PARAMETER("record_id", posting->rid);
     SET_PARAMETER("section_id", posting->sid);
@@ -42,8 +42,8 @@ rb_grn_posting_new (grn_posting *posting, grn_id term_id,
 
 #undef SET_PARAMETER
 
-    rb_hash_aset(parameters, ID2SYM(rb_intern("table")), rb_table);
-    rb_hash_aset(parameters, ID2SYM(rb_intern("lexicon")), rb_lexicon);
+    rb_hash_aset(parameters, RB_GRN_INTERN("table"), rb_table);
+    rb_hash_aset(parameters, RB_GRN_INTERN("lexicon"), rb_lexicon);
 
     return rb_funcall(rb_cGrnPosting, rb_intern("new"), 1,
                       parameters);

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

@@ -1,5 +1,6 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
+  Copyright (C) 2014  Masafumi Yokoyama <myokoym@gmail.com>
   Copyright (C) 2009-2013  Kouhei Sutou <kou@clear-code.com>
 
   This library is free software; you can redistribute it and/or
@@ -378,7 +379,7 @@ rb_grn_table_key_support_delete_by_key (VALUE self, VALUE rb_key)
 }
 
 /*
- * @overload delete(id)
+ * @overload delete(id, :id=>true)
  *   Delete a record that has ID @id@.
  *
  *   @param id [Integer] The ID of delete target record.
@@ -405,14 +406,18 @@ rb_grn_table_key_support_delete_by_key (VALUE self, VALUE rb_key)
 static VALUE
 rb_grn_table_key_support_delete (int argc, VALUE *argv, VALUE self)
 {
-    VALUE rb_id_or_key;
+    VALUE rb_id_or_key, rb_options;
+    VALUE rb_option_id;
 
     if (rb_block_given_p()) {
         return rb_grn_table_delete_by_expression(self);
     }
 
-    rb_scan_args(argc, argv, "1", &rb_id_or_key);
-    if (FIXNUM_P(rb_id_or_key)) {
+    rb_scan_args(argc, argv, "11", &rb_id_or_key, &rb_options);
+    rb_grn_scan_options(rb_options,
+                        "id", &rb_option_id,
+                        NULL);
+    if (RVAL2CBOOL(rb_option_id)) {
         return rb_grn_table_delete_by_id(self, rb_id_or_key);
     } else {
         return rb_grn_table_key_support_delete_by_key(self, rb_id_or_key);