groonga 0.0.7 → 0.9.0

data/ext/rb-grn-variable.c

@@ -22,6 +22,12 @@
 
 VALUE rb_cGrnVariable;
 
+/*
+ * Document-class: Groonga::Variable < Groonga::Object
+ *
+ * Groonga::Expressionで使われる変数。
+ */
+
 grn_obj *
 rb_grn_variable_from_ruby_object (VALUE variable, grn_ctx **context)
 {
@@ -52,6 +58,12 @@ rb_grn_variable_deconstruct (RbGrnVariable *rb_grn_variable,
 			      range_id, range);
 }
 
+/*
+ * call-seq:
+ *   variable.value -> Groonga::Object
+ *
+ * 変数の値を返す。
+ */
 static VALUE
 rb_grn_variable_get_value (VALUE self)
 {
@@ -65,6 +77,12 @@ rb_grn_variable_get_value (VALUE self)
     return GRNOBJ2RVAL(Qnil, context, variable, self);
 }
 
+/*
+ * call-seq:
+ *   variable.value=(value)
+ *
+ * 変数の値を_value_に設定する。
+ */
 static VALUE
 rb_grn_variable_set_value (VALUE self, VALUE value)
 {

data/ext/rb-grn.h

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby" -*- */
 /*
-  Copyright (C) 2009  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2010  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
@@ -62,14 +62,14 @@ RB_GRN_BEGIN_DECLS
 #endif
 
 #ifdef RB_GRN_DEBUG
-#  define debug(...) printf(__VA_ARGS__)
+#  define debug(...) fprintf(stderr, __VA_ARGS__)
 #else
 #  define debug(...)
 #endif
 
 #define RB_GRN_MAJOR_VERSION 0
-#define RB_GRN_MINOR_VERSION 0
-#define RB_GRN_MICRO_VERSION 7
+#define RB_GRN_MINOR_VERSION 9
+#define RB_GRN_MICRO_VERSION 0
 
 typedef int rb_grn_boolean;
 #define RB_GRN_FALSE (0)
@@ -80,11 +80,13 @@ typedef int rb_grn_boolean;
 #include <stdint.h>
 
 #define RB_GRN_OBJECT(object) ((RbGrnObject *)(object))
+#define RB_GRN_NAMED_OBJECT(object) ((RbGrnNamedObject *)(object))
 #define RB_GRN_TABLE(object) ((RbGrnTable *)(object))
 #define RB_GRN_TABLE_KEY_SUPPORT(object) ((RbGrnTableKeySupport *)(object))
 #define RB_GRN_TABLE_CURSOR(object) ((RbGrnTableCursort *)(object))
 #define RB_GRN_COLUMN(object) ((RbGrnColumn *)(object))
 #define RB_GRN_INDEX_COLUMN(object) ((RbGrnIndexColumn *)(object))
+#define RB_GRN_ACCESSOR(object) ((RbGrnAccessor *)(object))
 #define RB_GRN_EXPRESSION(object) ((RbGrnExpression *)(object))
 #define RB_GRN_UNBIND_FUNCTION(function) ((RbGrnUnbindFunction)(function))
 
@@ -94,6 +96,7 @@ typedef struct _RbGrnContext RbGrnContext;
 struct _RbGrnContext
 {
     grn_ctx *context;
+    VALUE self;
 };
 
 typedef struct _RbGrnObject RbGrnObject;
@@ -109,11 +112,20 @@ struct _RbGrnObject
     rb_grn_boolean need_close;
 };
 
+typedef struct _RbGrnNamedObject RbGrnNamedObject;
+struct _RbGrnNamedObject
+{
+    RbGrnObject parent;
+    char *name;
+    unsigned name_size;
+};
+
 typedef struct _RbGrnTable RbGrnTable;
 struct _RbGrnTable
 {
     RbGrnObject parent;
     grn_obj *value;
+    VALUE columns;
 };
 
 typedef struct _RbGrnTableKeySupport RbGrnTableKeySupport;
@@ -126,7 +138,7 @@ struct _RbGrnTableKeySupport
 typedef struct _RbGrnColumn RbGrnColumn;
 struct _RbGrnColumn
 {
-    RbGrnObject parent;
+    RbGrnNamedObject parent;
     grn_obj *value;
 };
 
@@ -139,6 +151,12 @@ struct _RbGrnIndexColumn
     grn_obj *string_query;
 };
 
+typedef struct _RbGrnAccessor RbGrnAccessor;
+struct _RbGrnAccessor
+{
+    RbGrnNamedObject parent;
+};
+
 typedef struct _RbGrnTableCursor RbGrnTableCursor;
 struct _RbGrnTableCursor
 {
@@ -161,6 +179,8 @@ struct _RbGrnExpression
 RB_GRN_VAR rb_grn_boolean rb_grn_exited;
 
 RB_GRN_VAR VALUE rb_eGrnError;
+RB_GRN_VAR VALUE rb_eGrnObjectClosed;
+RB_GRN_VAR VALUE rb_eGrnNoSuchColumn;
 RB_GRN_VAR VALUE rb_cGrnObject;
 RB_GRN_VAR VALUE rb_mGrnEncodingSupport;
 RB_GRN_VAR VALUE rb_cGrnDatabase;
@@ -267,8 +287,14 @@ void           rb_grn_object_deconstruct            (RbGrnObject *rb_grn_object,
 						     grn_id *range_id,
 						     grn_obj **range);
 
+VALUE          rb_grn_object_get_id                 (VALUE object);
 VALUE          rb_grn_object_array_reference        (VALUE object,
 						     VALUE rb_id);
+VALUE          rb_grn_object_set_raw                (RbGrnObject *rb_grn_object,
+						     grn_id id,
+						     VALUE rb_value,
+						     int flags,
+						     VALUE related_object);
 VALUE          rb_grn_object_close                  (VALUE object);
 VALUE          rb_grn_object_closed_p               (VALUE object);
 VALUE          rb_grn_object_inspect_object         (VALUE inspected,
@@ -284,17 +310,22 @@ VALUE          rb_grn_object_inspect_content        (VALUE object,
 VALUE          rb_grn_object_inspect_footer         (VALUE object,
 						     VALUE inspected);
 
+void           rb_grn_named_object_bind             (RbGrnNamedObject *rb_grn_named_object,
+						     grn_ctx *context,
+						     grn_obj *object);
+void           rb_grn_named_object_finalizer        (grn_ctx *context,
+						     grn_obj *column,
+						     RbGrnNamedObject *rb_grn_named_object);
+void           rb_grn_named_object_set_name         (RbGrnNamedObject *rb_grn_named_object,
+						     const char *name,
+						     unsigned name_size);
+
 void           rb_grn_table_bind                    (RbGrnTable *rb_grn_table,
 						     grn_ctx *context,
 						     grn_obj *table_key_support);
 void           rb_grn_table_finalizer               (grn_ctx *context,
 						     grn_obj *grn_object,
 						     RbGrnTable *rb_grn_table);
-void           rb_grn_table_assign                  (VALUE self,
-						     VALUE rb_context,
-						     grn_ctx *context,
-						     grn_obj *table,
-						     rb_grn_boolean owner);
 void           rb_grn_table_deconstruct             (RbGrnTable *rb_grn_table,
 						     grn_obj **table,
 						     grn_ctx **context,
@@ -302,16 +333,13 @@ void           rb_grn_table_deconstruct             (RbGrnTable *rb_grn_table,
 						     grn_obj **domain,
 						     grn_obj **value,
 						     grn_id *range_id,
-						     grn_obj **range);
+						     grn_obj **range,
+						     VALUE *columns);
 
 grn_obj       *rb_grn_table_open_raw                (int argc,
 						     VALUE *argv,
 						     grn_ctx **context,
 						     VALUE *rb_context);
-VALUE          rb_grn_table_s_create                (int argc,
-						     VALUE *argv,
-						     VALUE klass,
-						     grn_obj_flags key_store);
 
 VALUE          rb_grn_table_delete                  (VALUE self,
 						     VALUE rb_id);
@@ -320,6 +348,29 @@ VALUE          rb_grn_table_array_reference         (VALUE self,
 VALUE          rb_grn_table_array_set               (VALUE self,
 						     VALUE rb_id,
 						     VALUE rb_value);
+VALUE          rb_grn_table_get_value               (VALUE self,
+						     VALUE rb_id);
+VALUE          rb_grn_table_set_value               (VALUE self,
+						     VALUE rb_id,
+						     VALUE rb_value);
+VALUE          rb_grn_table_get_column              (VALUE self,
+						     VALUE rb_name);
+VALUE          rb_grn_table_get_column_surely       (VALUE self,
+						     VALUE rb_name);
+VALUE          rb_grn_table_get_column_value_raw    (VALUE self,
+						     grn_id id,
+						     VALUE rb_name);
+VALUE          rb_grn_table_get_column_value        (VALUE self,
+						     VALUE rb_id,
+						     VALUE rb_name);
+VALUE          rb_grn_table_set_column_value_raw    (VALUE self,
+						     grn_id id,
+						     VALUE rb_name,
+						     VALUE rb_value);
+VALUE          rb_grn_table_set_column_value        (VALUE self,
+						     VALUE rb_id,
+						     VALUE rb_name,
+						     VALUE rb_value);
 
 grn_ctx       *rb_grn_table_cursor_ensure_context   (VALUE cursor,
 						     VALUE *rb_context);
@@ -338,7 +389,8 @@ void           rb_grn_table_key_support_deconstruct (RbGrnTableKeySupport *rb_gr
 						     grn_obj **domain,
 						     grn_obj **value,
 						     grn_id *range_id,
-						     grn_obj **range);
+						     grn_obj **range,
+						     VALUE *columns);
 grn_id         rb_grn_table_key_support_get         (VALUE self,
 						     VALUE rb_key);
 
@@ -375,6 +427,13 @@ void           rb_grn_index_column_deconstruct      (RbGrnIndexColumn *rb_grn_in
 						     grn_obj **id_query,
 						     grn_obj **string_query);
 
+void           rb_grn_accessor_bind                 (RbGrnAccessor *rb_grn_accessor,
+						     grn_ctx *context,
+						     grn_obj *accessor);
+void           rb_grn_accessor_finalizer            (grn_ctx *context,
+						     grn_obj *accessor,
+						     RbGrnAccessor *rb_grn_accessor);
+
 void           rb_grn_expression_bind               (RbGrnExpression *rb_grn_expression,
 						     grn_ctx *context,
 						     grn_obj *expression);
@@ -385,6 +444,9 @@ void           rb_grn_expression_finalizer          (grn_ctx *context,
 VALUE          rb_grn_record_new                    (VALUE table,
 						     grn_id id,
 						     VALUE values);
+VALUE          rb_grn_record_new_raw                (VALUE table,
+						     VALUE id,
+						     VALUE values);
 
 VALUE          rb_grn_record_expression_builder_new (VALUE table,
 						     VALUE name);
@@ -450,16 +512,16 @@ VALUE          rb_grn_column_expression_builder_build
     (rb_grn_bulk_from_ruby_object(object, context, bulk))
 #define RVAL2GRNBULK_WITH_TYPE(object, context, bulk, type_id, type)	\
     (rb_grn_bulk_from_ruby_object_with_type(object, context, bulk, type_id, type))
-#define GRNBULK2RVAL(context, bulk, related_object) \
-    (rb_grn_bulk_to_ruby_object(context, bulk, related_object))
+#define GRNBULK2RVAL(context, bulk, range, related_object)	\
+    (rb_grn_bulk_to_ruby_object(context, bulk, range, related_object))
 
 #define RVAL2GRNVECTOR(object, context, vector)	\
     (rb_grn_vector_from_ruby_object(object, context, vector))
 #define GRNVECTOR2RVAL(context, vector) \
     (rb_grn_vector_to_ruby_object(context, vector))
 
-#define RVAL2GRNUVECTOR(object, context, uvector) \
-    (rb_grn_uvector_from_ruby_object(object, context, uvector))
+#define RVAL2GRNUVECTOR(object, context, uvector, related_object)	\
+    (rb_grn_uvector_from_ruby_object(object, context, uvector, related_object))
 #define GRNUVECTOR2RVAL(context, uvector) \
     (rb_grn_uvector_to_ruby_object(context, uvector))
 
@@ -563,6 +625,7 @@ grn_obj       *rb_grn_bulk_from_ruby_object_with_type
 						     grn_obj *type);
 VALUE          rb_grn_bulk_to_ruby_object           (grn_ctx *context,
 						     grn_obj *bulk,
+						     grn_obj *range,
 						     VALUE related_object);
 grn_obj       *rb_grn_vector_from_ruby_object       (VALUE object,
 						     grn_ctx *context,
@@ -571,7 +634,8 @@ VALUE          rb_grn_vector_to_ruby_object         (grn_ctx *context,
 						     grn_obj *vector);
 grn_obj       *rb_grn_uvector_from_ruby_object      (VALUE object,
 						     grn_ctx *context,
-						     grn_obj *uvector);
+						     grn_obj *uvector,
+						     VALUE related_object);
 VALUE          rb_grn_uvector_to_ruby_object        (grn_ctx *context,
 						     grn_obj *uvector);
 

data/ext/rb-groonga.c

@@ -21,8 +21,8 @@
 rb_grn_boolean rb_grn_exited = RB_GRN_FALSE;
 extern grn_ctx grn_gctx;
 
-static void
-finish_groonga (VALUE data)
+static VALUE
+finish_groonga (VALUE self, VALUE object_id)
 {
     grn_ctx *context = grn_gctx.next;
 
@@ -34,6 +34,8 @@ finish_groonga (VALUE data)
     grn_fin();
     debug("finish: done\n");
     rb_grn_exited = RB_GRN_TRUE;
+
+    return Qnil;
 }
 
 void
@@ -41,9 +43,18 @@ Init_groonga (void)
 {
     VALUE mGrn;
     VALUE cGrnBuildVersion, cGrnBindingsVersion;
+    VALUE groonga_finalizer, groonga_finalizer_keeper;
 
     mGrn = rb_define_module("Groonga");
 
+    groonga_finalizer = rb_funcall(rb_cObject, rb_intern("new"), 0);
+    rb_define_singleton_method(groonga_finalizer, "call", finish_groonga, 1);
+    groonga_finalizer_keeper = rb_funcall(rb_cObject, rb_intern("new"), 0);
+    rb_funcall(rb_const_get(rb_cObject, rb_intern("ObjectSpace")),
+	       rb_intern("define_finalizer"),
+	       2, groonga_finalizer_keeper, groonga_finalizer);
+    rb_iv_set(mGrn, "finalizer", groonga_finalizer_keeper);
+
     cGrnBuildVersion = rb_ary_new3(3,
 				   INT2NUM(GRN_MAJOR_VERSION),
 				   INT2NUM(GRN_MINOR_VERSION),
@@ -78,7 +89,6 @@ Init_groonga (void)
     rb_grn_init_exception(mGrn);
 
     rb_grn_rc_check(grn_init(), Qnil);
-    rb_set_end_proc(finish_groonga, Qnil);
 
     rb_grn_init_utils(mGrn);
     rb_grn_init_encoding(mGrn);

data/extconf.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2009  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2010  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
@@ -36,7 +36,7 @@ package_name = "groonga"
 module_name = "groonga"
 ext_dir_name = "ext"
 src_dir = File.join(File.expand_path(File.dirname(__FILE__)), ext_dir_name)
-major, minor, micro = 0, 1, 4
+major, minor, micro = 0, 1, 5
 
 def local_groonga_base_dir
   File.join(File.dirname(__FILE__), "vendor")
@@ -98,7 +98,8 @@ def install_groonga_locally(major, minor, micro)
     groonga_source_dir = "groonga-#{major}.#{minor}.#{micro}"
     Dir.chdir(groonga_source_dir) do
       message("configuring...")
-      if xsystem("./configure CFLAGS='-g -O0' --prefix=#{Shellwords.escape(install_dir)}")
+      prefix = Shellwords.escape(install_dir)
+      if xsystem("./configure CFLAGS='-g -O0' --prefix=#{prefix}")
         message(" done\n")
       else
         message(" failed\n")
@@ -114,7 +115,12 @@ def install_groonga_locally(major, minor, micro)
       end
 
       message("installing...")
-      if xsystem("make install")
+      if [major, minor, micro] == [0, 1, 5]
+        make_install_args = " MKDIR_P='mkdir -p --'"
+      else
+        make_install_args = ""
+      end
+      if xsystem("make install#{make_install_args}")
         message(" done\n")
       else
         message(" failed\n")
@@ -139,6 +145,15 @@ $defs << "-DGRN_MAJOR_VERSION=#{real_major}"
 $defs << "-DGRN_MINOR_VERSION=#{real_minor}"
 $defs << "-DGRN_MICRO_VERSION=#{real_micro}"
 
+checking_for(checking_message("debug flag")) do
+  debug = with_config("debug")
+  if debug
+    debug_flag = "-DRB_GRN_DEBUG"
+    $defs << debug_flag unless $defs.include?(debug_flag)
+  end
+  debug
+end
+
 have_header("ruby/st.h") unless have_macro("HAVE_RUBY_ST_H", "ruby.h")
 have_func("rb_errinfo", "ruby.h")
 have_type("enum ruby_value_type", "ruby.h")

data/html/developer.html

@@ -21,7 +21,7 @@
       </div>
       <ul class="menu">
 	<li id="menu-reference"><a href="groonga/">リファレンスマニュアル</a></li>
-	<li id="menu-tutorial"><a href="groonga/TUTORIAL_ja_rdoc.html">チュートリアル</a></li>
+	<li id="menu-tutorial"><a href="groonga/text/TUTORIAL_ja_rdoc.html">チュートリアル</a></li>
 	<li id="menu-install"><a href="./#install-ruby-groonga">インストール</a></li>
 	<li id="menu-developer"><a href="developer.html">開発者向け情報</a></li>
       </ul>

data/html/header.html.erb

@@ -8,7 +8,7 @@
   </div>
   <ul class="menu">
     <li id="menu-reference"><a href="/groonga/">リファレンスマニュアル</a></li>
-    <li id="menu-tutorial"><a href="/groonga/TUTORIAL_ja_rdoc.html">チュートリアル</a></li>
+    <li id="menu-tutorial"><a href="/groonga/text/TUTORIAL_ja_rdoc.html">チュートリアル</a></li>
     <li id="menu-install"><a href="/#install-ruby-groonga">インストール</a></li>
     <li id="menu-developer"><a href="/developer.html">開発者向け情報</a></li>
   </ul>

data/html/index.html

@@ -21,7 +21,7 @@
       </div>
       <ul class="menu">
 	<li id="menu-reference"><a href="groonga/">リファレンスマニュアル</a></li>
-	<li id="menu-tutorial"><a href="groonga/TUTORIAL_ja_rdoc.html">チュートリアル</a></li>
+	<li id="menu-tutorial"><a href="groonga/text/TUTORIAL_ja_rdoc.html">チュートリアル</a></li>
 	<li id="menu-install"><a href="./#install-ruby-groonga">インストール</a></li>
 	<li id="menu-developer"><a href="developer.html">開発者向け情報</a></li>
       </ul>
@@ -42,7 +42,7 @@
 
 	<h3>Ruby/groongaの最新リリース</h3>
 	<p>
-	  2009-10-02にリリースされた0.0.7が最新です。
+	  2010-02-29にリリースされた0.9.0が最新です。
         </p>
 
 	<h3 id="install-ruby-groonga">Ruby/groongaのインストール</h3>
@@ -58,7 +58,7 @@
         </p>
         <ul>
 	  <li><a href="groonga/">Ruby/groongaのリファレンスマニュアル</a></li>
-	  <li><a href="groonga/TUTORIAL_ja_rdoc.html">Ruby/groongaのチュートリアル</a></li>
+	  <li><a href="groonga/text/TUTORIAL_ja_rdoc.html">Ruby/groongaのチュートリアル</a></li>
         </ul>
 
 	<h2 id="about-active-groonga">ActiveGroonga</h2>
@@ -79,7 +79,7 @@
 
 	<h3>ActiveGroongaの最新リリース</h3>
 	<p>
-	  2009-10-02にリリースされた0.0.7が最新です。
+	  2010-02-09にリリースされた0.9.0が最新です。
         </p>
 
 	<h3 id="install-active-groonga">ActiveGroongaのインストール</h3>