rroonga 1.0.9 → 1.1.0

data/NEWS.ja.rdoc

@@ -1,5 +1,12 @@
 = お知らせ
 
+== 1.1.0: 2011-02-09
+
+=== 改良
+
+* groonga 1.1.0対応。
+* Groonga::Plugin.registerを追加。
+
 == 1.0.9: 2011-01-29
 
 === 改良

data/NEWS.rdoc

@@ -1,5 +1,12 @@
 = NEWS
 
+== 1.1.0: 2011-02-09
+
+=== Improvements
+
+* Supported groonga 1.1.0.
+* Added Groonga::Plugin.register.
+
 == 1.0.9: 2011-01-29
 
 === Improvements

data/README.ja.rdoc

@@ -35,8 +35,8 @@ LGPL 2.1です。詳しくはlicense/LGPLを見てください。
 
 == 依存ソフトウェア
 
-* Ruby >= 1.8 （1.9.1, 1.9.2対応）
-* groonga >= 1.0.4
+* Ruby >= 1.8 （1.9.2対応）
+* groonga >= 1.1.0
 
 == インストール
 

data/README.rdoc

@@ -35,8 +35,8 @@ inclidng contributed patches.)
 
 == Dependencies
 
-* Ruby >= 1.8 (including 1.9.1 and 1.9.2)
-* groonga >= 1.0.4
+* Ruby >= 1.8 (including 1.9.2)
+* groonga >= 1.1.0
 
 == Install
 

data/ext/groonga/mkmf.log

@@ -63,7 +63,7 @@ checked program was:
 "gcc -o conftest -I. -I/usr/lib/ruby/1.8/x86_64-linux -I/home/kou/work/ruby/rroonga.18/ext/groonga    -fno-strict-aliasing -g -g -O2  -fPIC   -Wall -I/tmp/local/include/groonga   conftest.c  -L. -L/usr/lib -L.  -rdynamic -Wl,-export-dynamic -L/tmp/local/lib     -lgroonga   -lruby1.8-static  -lgroonga   -lpthread -lrt -ldl -lcrypt -lm   -lc"
 conftest.c: In function ‘t’:
 conftest.c:5: warning: implicit declaration of function ‘rb_errinfo’
-/tmp/ccjMtfaX.o: In function `t':
+/tmp/cclVRR3N.o: In function `t':
 /home/kou/work/ruby/rroonga.18/ext/groonga/conftest.c:5: undefined reference to `rb_errinfo'
 collect2: ld returned 1 exit status
 checked program was:

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

@@ -569,16 +569,22 @@ static VALUE
 rb_grn_context_receive (VALUE self)
 {
     grn_ctx *context;
-    char *string;
-    unsigned string_size;
+    char *result = NULL;
+    unsigned result_size;
+    VALUE rb_result;
     int flags = 0;
     unsigned int query_id;
 
     context = SELF(self);
-    query_id = grn_ctx_recv(context, &string, &string_size, &flags);
+    query_id = grn_ctx_recv(context, &result, &result_size, &flags);
+    if (result) {
+	rb_result = rb_str_new(result, result_size);
+    } else {
+	rb_result = Qnil;
+    }
     rb_grn_context_check(context, self);
 
-    return rb_ary_new3(2, UINT2NUM(query_id), rb_str_new(string, string_size));
+    return rb_ary_new3(2, UINT2NUM(query_id), rb_result);
 }
 
 static const char *

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

@@ -0,0 +1,134 @@
+/* -*- c-file-style: "ruby" -*- */
+/*
+  Copyright (C) 2011  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#include "rb-grn.h"
+
+#define SELF(object) (RVAL2GRNCONTEXT(object))
+
+static VALUE cGrnPlugin;
+
+/*
+ * Document-class: Groonga::Plugin
+ *
+ * プラグイン。現在のところ、Rubyでgroongaのプラグインを作成
+ * することはできず、Cで作成された既存のプラグインを登録する
+ * ことができるだけです。
+ */
+
+grn_id
+rb_grn_plugin_from_ruby_object (VALUE object)
+{
+    RbGrnPlugin *rb_grn_plugin;
+
+    if (!RVAL2CBOOL(rb_obj_is_kind_of(object, cGrnPlugin))) {
+	rb_raise(rb_eTypeError, "not a groonga plugin");
+    }
+
+    Data_Get_Struct(object, RbGrnPlugin, rb_grn_plugin);
+    if (!rb_grn_plugin)
+	rb_raise(rb_eGrnError, "groonga plugin is NULL");
+    return rb_grn_plugin->id;
+}
+
+void
+rb_grn_plugin_fin (grn_id id)
+{
+}
+
+static void
+rb_grn_plugin_free (void *pointer)
+{
+    RbGrnPlugin *rb_grn_plugin = pointer;
+
+    xfree(rb_grn_plugin);
+}
+
+static VALUE
+rb_grn_plugin_alloc (VALUE klass)
+{
+    return Data_Wrap_Struct(klass, NULL, rb_grn_plugin_free, NULL);
+}
+
+/*
+ * call-seq:
+ *   Groonga::Plugin.register(name, options=nil)
+ *   Groonga::Plugin.register({:path => path, :context => nil})
+ *
+ * 既存のプラグインをデータベースに登録する。
+ *
+ * _name_を指定した場合はその名前のプラグインを登録する。
+ *
+ * _path_を指定した場合はそのパスのプラグインを登録する。
+ *
+ * _options_にはハッシュでオプションを指定する。指定できるオ
+ * プションは以下の通り。
+ *
+ * [+:context+]
+ *   データベースを結びつけるコンテキスト。省略すると
+ *   Groonga::Context.defaultを利用する。
+ */
+static VALUE
+rb_grn_plugin_s_register (int argc, VALUE *argv, VALUE klass)
+{
+    const char *name = NULL, *path = NULL;
+    VALUE rb_options, rb_name = Qnil, rb_path, rb_context;
+    grn_ctx *context;
+
+    if (argc >= 1) {
+        rb_name = rb_check_string_type(argv[0]);
+    }
+
+    if (NIL_P(rb_name)) {
+        rb_scan_args(argc, argv, "01", &rb_options);
+        rb_grn_scan_options(rb_options,
+                            "path", &rb_path,
+                            "context", &rb_context,
+                            NULL);
+        path = StringValueCStr(rb_path);
+    } else {
+        rb_scan_args(argc, argv, "11", &rb_name, &rb_options);
+        rb_grn_scan_options(rb_options,
+                            "context", &rb_context,
+                            NULL);
+        name = StringValueCStr(rb_name);
+    }
+
+    if (NIL_P(rb_context)) {
+        rb_context = rb_grn_context_get_default();
+    }
+    context = RVAL2GRNCONTEXT(rb_context);
+
+    if (name) {
+        grn_plugin_register(context, name);
+    } else {
+        grn_plugin_register_by_path(context, path);
+    }
+
+    rb_grn_context_check(context, rb_ary_new4(argc, argv));
+    return Qnil;
+}
+
+void
+rb_grn_init_plugin (VALUE mGrn)
+{
+    cGrnPlugin = rb_define_class_under(mGrn, "Plugin", rb_cObject);
+    rb_define_alloc_func(cGrnPlugin, rb_grn_plugin_alloc);
+
+    rb_define_singleton_method(cGrnPlugin, "register",
+			       rb_grn_plugin_s_register, -1);
+}

data/ext/groonga/rb-grn.h

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby" -*- */
 /*
-  Copyright (C) 2009-2010  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2011  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
@@ -68,8 +68,8 @@ RB_GRN_BEGIN_DECLS
 #endif
 
 #define RB_GRN_MAJOR_VERSION 1
-#define RB_GRN_MINOR_VERSION 0
-#define RB_GRN_MICRO_VERSION 9
+#define RB_GRN_MINOR_VERSION 1
+#define RB_GRN_MICRO_VERSION 0
 
 #define RB_GRN_QUERY_DEFAULT_MAX_EXPRESSIONS 32
 
@@ -174,6 +174,14 @@ struct _RbGrnExpression
     grn_obj *value;
 };
 
+typedef struct _RbGrnPlugin RbGrnPlugin;
+struct _RbGrnPlugin
+{
+    VALUE self;
+    grn_ctx *context;
+    grn_id id;
+};
+
 RB_GRN_VAR grn_bool rb_grn_exited;
 
 RB_GRN_VAR VALUE rb_eGrnError;
@@ -213,6 +221,7 @@ RB_GRN_VAR VALUE rb_cGrnOperator;
 RB_GRN_VAR VALUE rb_cGrnExpression;
 RB_GRN_VAR VALUE rb_cGrnRecordExpressionBuilder;
 RB_GRN_VAR VALUE rb_cGrnColumnExpressionBuilder;
+RB_GRN_VAR VALUE rb_cGrnPlugin;
 
 void           rb_grn_init_utils                    (VALUE mGrn);
 void           rb_grn_init_exception                (VALUE mGrn);
@@ -250,6 +259,7 @@ void           rb_grn_init_expression               (VALUE mGrn);
 void           rb_grn_init_expression_builder       (VALUE mGrn);
 void           rb_grn_init_logger                   (VALUE mGrn);
 void           rb_grn_init_snippet                  (VALUE mGrn);
+void           rb_grn_init_plugin                   (VALUE mGrn);
 
 VALUE          rb_grn_rc_to_exception               (grn_rc rc);
 const char    *rb_grn_rc_to_message                 (grn_rc rc);

data/ext/groonga/rb-groonga.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby" -*- */
 /*
-  Copyright (C) 2009-2010  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2011  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
@@ -143,4 +143,5 @@ Init_groonga (void)
     rb_grn_init_expression_builder(mGrn);
     rb_grn_init_logger(mGrn);
     rb_grn_init_snippet(mGrn);
+    rb_grn_init_plugin(mGrn);
 }

data/html/index.html

@@ -49,7 +49,7 @@
 
 	<h3>rroongaの最新リリース</h3>
 	<p>
-	  2011-01-29にリリースされた1.0.9が最新です。
+	  2011-02-09にリリースされた1.1.0が最新です。
         </p>
 
 	<h3 id="install-rroonga">rroongaのインストール</h3>

data/lib/groonga/context.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2010  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2010-2011  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
@@ -51,6 +51,23 @@ module Groonga
       Database.create(options)
     end
 
+    # call-seq:
+    #   context.register_plugin(name)
+    #   context.register_plugin({:path => path})
+    #
+    # groongaのプラグインディレクトリにあるプラグイン_name_
+    # を登録する。_path_を指定するとプラグインディレクトリ以
+    # 外にあるプラグインを登録することができる。
+    def register_plugin(name_or_options)
+      options = {:context => self}
+      if name_or_options.is_a?(String)
+        name = name_or_options
+        Plugin.register(name, options)
+      else
+        Plugin.register(name_or_options.merge(options))
+      end
+    end
+
     # call-seq:
     #   context.select(table, options={}) -> SelectResult
     #

data/rroonga-build.rb

@@ -18,8 +18,8 @@
 module RroongaBuild
   module RequiredGroongaVersion
     MAJOR = 1
-    MINOR = 0
-    MICRO = 7
+    MINOR = 1
+    MICRO = 0
     VERSION = [MAJOR, MINOR, MICRO]
   end
 

data/test/test-plugin.rb

@@ -0,0 +1,29 @@
+# Copyright (C) 2011  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+class PluginTest < Test::Unit::TestCase
+  include GroongaTestUtils
+
+  setup :setup_sandbox
+  setup :setup_database
+  teardown :teardown_sandbox
+
+  def test_register
+    context = Groonga::Context.default
+    assert_nil(context["suggest"])
+    context.register_plugin("suggest/suggest")
+    assert_not_nil(context["suggest"])
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rroonga
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 19
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 9
-  version: 1.0.9
+  version: 1.1.0
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-28 00:00:00 +09:00
+date: 2011-02-08 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -98,6 +98,7 @@ files:
 - ext/groonga/rb-grn-operator.c
 - ext/groonga/rb-grn-patricia-trie-cursor.c
 - ext/groonga/rb-grn-patricia-trie.c
+- ext/groonga/rb-grn-plugin.c
 - ext/groonga/rb-grn-procedure.c
 - ext/groonga/rb-grn-query.c
 - ext/groonga/rb-grn-record.c
@@ -240,6 +241,7 @@ files:
 - test/test-logger.rb
 - test/test-pagination.rb
 - test/test-patricia-trie.rb
+- test/test-plugin.rb
 - test/test-procedure.rb
 - test/test-query.rb
 - test/test-record.rb