groonga 0.9.0 → 0.9.1

data/NEWS.ja.rdoc

@@ -1,5 +1,9 @@
 = お知らせ
 
+== 0.9.1: 2010-02-09
+
+* groonga 0.1.6対応
+
 == 0.9.0: 2010-02-09
 
 * groonga 0.1.5対応

data/NEWS.rdoc

@@ -1,5 +1,9 @@
 = NEWS
 
+== 0.9.1: 2010-02-09
+
+* Supported groonga 0.1.6
+
 == 0.9.0: 2010-02-09
 
 * Supported groonga 0.1.5

data/Rakefile

@@ -52,7 +52,7 @@ base_dir_included_components = %w(AUTHORS Rakefile
                                   README.rdoc README.ja.rdoc
                                   NEWS.rdoc NEWS.ja.rdoc
                                   extconf.rb pkg-config.rb)
-excluded_components = %w(.cvsignore .gdb_history CVS depend Makefile pkg
+excluded_components = %w(.cvsignore .gdb_history CVS depend Makefile doc pkg
                          .svn .git doc vendor data .test-result)
 excluded_suffixes = %w(.png .ps .pdf .o .so .a .txt .~)
 Find.find(base_dir) do |target|

data/ext/rb-grn.h

@@ -69,7 +69,7 @@ RB_GRN_BEGIN_DECLS
 
 #define RB_GRN_MAJOR_VERSION 0
 #define RB_GRN_MINOR_VERSION 9
-#define RB_GRN_MICRO_VERSION 0
+#define RB_GRN_MICRO_VERSION 1
 
 typedef int rb_grn_boolean;
 #define RB_GRN_FALSE (0)

data/extconf.rb

@@ -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, 5
+major, minor, micro = 0, 1, 6
 
 def local_groonga_base_dir
   File.join(File.dirname(__FILE__), "vendor")
@@ -115,7 +115,7 @@ def install_groonga_locally(major, minor, micro)
       end
 
       message("installing...")
-      if [major, minor, micro] == [0, 1, 5]
+      if [major, minor, micro] == [0, 1, 6]
         make_install_args = " MKDIR_P='mkdir -p --'"
       else
         make_install_args = ""

data/html/index.html

@@ -42,7 +42,7 @@
 
 	<h3>Ruby/groongaの最新リリース</h3>
 	<p>
-	  2010-02-29にリリースされた0.9.0が最新です。
+	  2010-02-09にリリースされた0.9.1が最新です。
         </p>
 
 	<h3 id="install-ruby-groonga">Ruby/groongaのインストール</h3>
@@ -79,7 +79,7 @@
 
 	<h3>ActiveGroongaの最新リリース</h3>
 	<p>
-	  2010-02-09にリリースされた0.9.0が最新です。
+	  2009-10-02にリリースされた0.0.7が最新です。
         </p>
 
 	<h3 id="install-active-groonga">ActiveGroongaのインストール</h3>

data/src/rb-grn-table-cursor.c

@@ -0,0 +1,296 @@
+/* -*- c-file-style: "ruby" -*- */
+/*
+  Copyright (C) 2009  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) (rb_rb_grn_table_cursor_from_ruby_object(object))
+
+typedef struct _RbGrnTableCursor RbGrnTableCursor;
+struct _RbGrnTableCursor
+{
+    grn_ctx *context;
+    grn_table_cursor *cursor;
+    rb_grn_boolean owner;
+};
+
+VALUE rb_cGrnTableCursor;
+
+static RbGrnTableCursor *
+rb_rb_grn_table_cursor_from_ruby_object (VALUE object)
+{
+    RbGrnTableCursor *rb_grn_table_cursor;
+
+    if (!RVAL2CBOOL(rb_obj_is_kind_of(object, rb_cGrnTableCursor))) {
+	rb_raise(rb_eTypeError, "not a groonga table cursor");
+    }
+
+    Data_Get_Struct(object, RbGrnTableCursor, rb_grn_table_cursor);
+    if (!rb_grn_table_cursor)
+	rb_raise(rb_eGrnError, "groonga table cursor is NULL");
+
+    return rb_grn_table_cursor;
+}
+
+grn_table_cursor *
+rb_grn_table_cursor_from_ruby_object (VALUE object)
+{
+    if (NIL_P(object))
+        return NULL;
+
+    return SELF(object)->cursor;
+}
+
+static void
+rb_rb_grn_table_cursor_free (void *object)
+{
+    RbGrnTableCursor *rb_grn_table_cursor = object;
+
+    if (rb_grn_table_cursor->context && rb_grn_table_cursor->cursor &&
+	rb_grn_table_cursor->owner) {
+	printf("close!\n");
+	grn_table_cursor_close(rb_grn_table_cursor->context,
+			       rb_grn_table_cursor->cursor);
+    }
+    xfree(object);
+}
+
+VALUE
+rb_grn_table_cursor_to_ruby_class (grn_obj *object)
+{
+    VALUE klass = Qnil;
+
+    switch (object->header.type) {
+      case GRN_CURSOR_TABLE_HASH_KEY:
+	klass = rb_cGrnHashCursor;
+	break;
+      case GRN_CURSOR_TABLE_PAT_KEY:
+	klass = rb_cGrnPatriciaTrieCursor;
+	break;
+      case GRN_CURSOR_TABLE_NO_KEY:
+	klass = rb_cGrnArrayCursor;
+	break;
+      default:
+	rb_raise(rb_eTypeError,
+		 "unsupported groonga object type: %d",
+		 object->header.type);
+	break;
+    }
+
+    return klass;
+}
+
+VALUE
+rb_grn_table_cursor_to_ruby_object (VALUE klass, grn_ctx *context,
+                                    grn_table_cursor *cursor)
+{
+    RbGrnTableCursor *rb_grn_table_cursor;
+
+    if (!cursor)
+        return Qnil;
+
+    rb_grn_table_cursor = ALLOC(RbGrnTableCursor);
+    rb_grn_table_cursor->context = context;
+    rb_grn_table_cursor->cursor = cursor;
+    rb_grn_table_cursor->owner = RB_GRN_TRUE; /* FIXME */
+
+    if (NIL_P(klass))
+        klass = GRNTABLECURSOR2RCLASS(cursor);
+
+    return Data_Wrap_Struct(klass, NULL,
+                            rb_rb_grn_table_cursor_free, rb_grn_table_cursor);
+}
+
+static VALUE
+rb_grn_table_cursor_alloc (VALUE klass)
+{
+    return Data_Wrap_Struct(klass, NULL, rb_rb_grn_table_cursor_free, NULL);
+}
+
+grn_ctx *
+rb_grn_table_cursor_ensure_context (VALUE cursor, VALUE rb_context)
+{
+    if (NIL_P(rb_context)) {
+	RbGrnTableCursor *rb_grn_table_cursor;
+
+	rb_grn_table_cursor = SELF(cursor);
+	if (rb_grn_table_cursor && rb_grn_table_cursor->context)
+	    return rb_grn_table_cursor->context;
+    }
+
+    return rb_grn_context_ensure(rb_context);
+}
+
+VALUE
+rb_grn_table_cursor_close (VALUE self)
+{
+    RbGrnTableCursor *rb_grn_table_cursor;
+
+    rb_grn_table_cursor = SELF(self);
+    if (rb_grn_table_cursor->context && rb_grn_table_cursor->cursor) {
+        grn_rc rc = GRN_SUCCESS;
+
+	if (rb_grn_table_cursor->owner)
+	    rc = grn_table_cursor_close(rb_grn_table_cursor->context,
+					rb_grn_table_cursor->cursor);
+        rb_grn_table_cursor->context = NULL;
+        rb_grn_table_cursor->cursor = NULL;
+	rb_grn_table_cursor->owner = RB_GRN_FALSE;
+        rb_grn_rc_check(rc, self);
+    }
+    return Qnil;
+}
+
+static VALUE
+rb_grn_table_cursor_closed_p (VALUE self)
+{
+    RbGrnTableCursor *rb_grn_table_cursor;
+
+    rb_grn_table_cursor = SELF(self);
+    if (rb_grn_table_cursor->context && rb_grn_table_cursor->cursor)
+        return Qfalse;
+    else
+        return Qtrue;
+}
+
+static VALUE
+rb_grn_table_cursor_get_value (VALUE self)
+{
+    VALUE rb_value = Qnil;
+    RbGrnTableCursor *rb_grn_table_cursor;
+
+    rb_grn_table_cursor = SELF(self);
+    if (rb_grn_table_cursor->context && rb_grn_table_cursor->cursor) {
+        int n;
+        void *value;
+
+        n = grn_table_cursor_get_value(rb_grn_table_cursor->context,
+                                       rb_grn_table_cursor->cursor,
+                                       &value);
+        rb_value = rb_str_new(value, n);
+    }
+
+    return rb_value;
+}
+
+static VALUE
+rb_grn_table_cursor_set_value (VALUE self, VALUE value)
+{
+    RbGrnTableCursor *rb_grn_table_cursor;
+
+    rb_grn_table_cursor = SELF(self);
+    if (rb_grn_table_cursor->context && rb_grn_table_cursor->cursor) {
+        grn_rc rc;
+
+        rc = grn_table_cursor_set_value(rb_grn_table_cursor->context,
+                                        rb_grn_table_cursor->cursor,
+                                        StringValuePtr(value), GRN_OBJ_SET);
+        rb_grn_rc_check(rc, self);
+    }
+
+    return Qnil;
+}
+
+static VALUE
+rb_grn_table_cursor_delete (VALUE self)
+{
+    RbGrnTableCursor *rb_grn_table_cursor;
+
+    rb_grn_table_cursor = SELF(self);
+    if (rb_grn_table_cursor->context && rb_grn_table_cursor->cursor) {
+        grn_rc rc;
+
+        rc = grn_table_cursor_delete(rb_grn_table_cursor->context,
+                                     rb_grn_table_cursor->cursor);
+        rb_grn_rc_check(rc, self);
+    }
+
+    return Qnil;
+}
+
+static VALUE
+rb_grn_table_cursor_next (VALUE self)
+{
+    VALUE rb_record = Qnil;
+    RbGrnTableCursor *rb_grn_table_cursor;
+
+    rb_grn_table_cursor = SELF(self);
+    if (rb_grn_table_cursor->context && rb_grn_table_cursor->cursor) {
+        grn_id record_id;
+
+        record_id = grn_table_cursor_next(rb_grn_table_cursor->context,
+                                          rb_grn_table_cursor->cursor);
+        if (record_id != GRN_ID_NIL) /* FIXME: use grn_table_cursor_table */
+            rb_record = rb_grn_record_new(rb_iv_get(self, "@table"), record_id);
+    }
+
+    return rb_record;
+}
+
+static VALUE
+rb_grn_table_cursor_each (VALUE self)
+{
+    grn_id record_id;
+    RbGrnTableCursor *rb_grn_table_cursor;
+    grn_ctx *context;
+    grn_table_cursor *cursor;
+
+    rb_grn_table_cursor = SELF(self);
+    if (!rb_grn_table_cursor->context)
+        return Qnil;
+    if (!rb_grn_table_cursor->cursor)
+        return Qnil;
+
+    context = rb_grn_table_cursor->context;
+    cursor = rb_grn_table_cursor->cursor;
+    while ((record_id = grn_table_cursor_next(context, cursor))) {
+        rb_yield(rb_grn_record_new(rb_iv_get(self, "@table"), record_id));
+    }
+
+    return Qnil;
+}
+
+void
+rb_grn_init_table_cursor (VALUE mGrn)
+{
+    rb_cGrnTableCursor = rb_define_class_under(mGrn, "TableCurosr", rb_cObject);
+    rb_define_alloc_func(rb_cGrnTableCursor, rb_grn_table_cursor_alloc);
+
+    rb_include_module(rb_cGrnTableCursor, rb_mEnumerable);
+
+    rb_define_method(rb_cGrnTableCursor, "close",
+                     rb_grn_table_cursor_close, 0);
+    rb_define_method(rb_cGrnTableCursor, "closed?",
+                     rb_grn_table_cursor_closed_p, 0);
+
+    rb_define_method(rb_cGrnTableCursor, "value",
+                     rb_grn_table_cursor_get_value, 0);
+    rb_define_method(rb_cGrnTableCursor, "value=",
+                     rb_grn_table_cursor_set_value, 1);
+    rb_define_method(rb_cGrnTableCursor, "delete",
+                     rb_grn_table_cursor_delete, 0);
+    rb_define_method(rb_cGrnTableCursor, "next",
+                     rb_grn_table_cursor_next, 0);
+
+    rb_define_method(rb_cGrnTableCursor, "each",
+                     rb_grn_table_cursor_each, 0);
+
+    rb_grn_init_table_cursor_key_support(mGrn);
+    rb_grn_init_array_cursor(mGrn);
+    rb_grn_init_hash_cursor(mGrn);
+    rb_grn_init_patricia_trie_cursor(mGrn);
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: groonga
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -15,8 +15,27 @@ cert_chain: []
 
 date: 2010-02-09 00:00:00 +09:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rubyforge
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: gemcutter
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.3.0
+    version: 
 description: |-
   Ruby/groonga is a extension library to use groonga's DB-API
   layer. Ruby/groonga provides Rubyish readable and writable
@@ -30,11 +49,11 @@ executables: []
 extensions: 
 - extconf.rb
 extra_rdoc_files: 
-- README.ja.rdoc
+- README.rdoc
 - NEWS.ja.rdoc
 - text/TUTORIAL.ja.rdoc
 - text/expression.rdoc
-- README.rdoc
+- README.ja.rdoc
 - NEWS.rdoc
 files: 
 - AUTHORS
@@ -110,6 +129,7 @@ files:
 - license/RUBY
 - misc/grnop2ruby.rb
 - pkg-config.rb
+- src/rb-grn-table-cursor.c
 - test-unit/Rakefile
 - test-unit/TODO
 - test-unit/bin/testrb