rroonga 1.2.5-x86-mingw32 → 1.2.7-x86-mingw32

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

@@ -79,19 +79,13 @@ rb_grn_object_from_ruby_object (VALUE object, grn_ctx **context)
     return rb_grn_object->object;
 }
 
-static grn_obj *
-rb_grn_object_finalizer (grn_ctx *context, int n_args, grn_obj **grn_objects,
-			 grn_user_data *user_data)
+static void
+rb_grn_object_run_finalizer (grn_ctx *context, grn_obj *grn_object,
+			     RbGrnObject *rb_grn_object)
 {
-    RbGrnObject *rb_grn_object;
-    grn_obj *grn_object = *grn_objects;
-
     if (rb_grn_exited)
-	return NULL;
-
-    rb_grn_object = user_data->ptr;
+	return;
 
-    grn_obj_user_data(context, grn_object)->ptr = NULL;
     grn_obj_set_finalizer(context, grn_object, NULL);
 
     debug("finalize: %p:%p:%p:%p:%p 0x%x\n",
@@ -101,11 +95,10 @@ rb_grn_object_finalizer (grn_ctx *context, int n_args, grn_obj **grn_objects,
 
     rb_grn_object->context = NULL;
     rb_grn_object->object = NULL;
+    rb_grn_object->have_finalizer = GRN_FALSE;
 
     switch (grn_object->header.type) {
       case GRN_DB:
-	grn_ctx_use(context, NULL);
-	break;
       case GRN_TYPE:
       case GRN_PROC:
       case GRN_CURSOR_TABLE_HASH_KEY:
@@ -148,6 +141,22 @@ rb_grn_object_finalizer (grn_ctx *context, int n_args, grn_obj **grn_objects,
 		 grn_object->header.type);
 	break;
     }
+}
+
+static grn_obj *
+rb_grn_object_finalizer (grn_ctx *context, int n_args, grn_obj **grn_objects,
+			 grn_user_data *user_data)
+{
+    RbGrnObject *rb_grn_object;
+    grn_obj *grn_object = *grn_objects;
+
+    if (rb_grn_exited)
+	return NULL;
+
+    rb_grn_object = user_data->ptr;
+
+    grn_obj_user_data(context, grn_object)->ptr = NULL;
+    rb_grn_object_run_finalizer(context, grn_object, rb_grn_object);
 
     return NULL;
 }
@@ -160,19 +169,26 @@ rb_grn_object_free (RbGrnObject *rb_grn_object)
 
     context = rb_grn_object->context;
     grn_object = rb_grn_object->object;
-    debug("rb-free: %p:%p:%p; %d\n", context, grn_object, rb_grn_object,
-	  rb_grn_object->have_finalizer);
-    if (!rb_grn_exited && context && grn_object && rb_grn_object->have_finalizer) {
-	grn_user_data *user_data;
-
-	user_data = grn_obj_user_data(context, grn_object);
-	debug("type: %x; need_close: %d; user_data: %p; ptr: %p\n",
+    debug("rb-free: %p:%p:%p; %d:%d\n", context, grn_object, rb_grn_object,
+	  rb_grn_object->have_finalizer, rb_grn_object->need_close);
+    if (!rb_grn_exited && context && grn_object &&
+	(rb_grn_object->have_finalizer || rb_grn_object->need_close)) {
+	grn_user_data *user_data = NULL;
+
+	if (rb_grn_object->have_finalizer) {
+	    user_data = grn_obj_user_data(context, grn_object);
+	}
+	debug("type: %#x; need_close: %d; user_data: %p; ptr: %p\n",
 	      grn_object->header.type,
 	      rb_grn_object->need_close,
 	      user_data,
 	      user_data ? user_data->ptr : NULL);
-	if (user_data && user_data->ptr) {
-	    rb_grn_object_finalizer(context, 1, &grn_object, user_data);
+	if (rb_grn_object->have_finalizer) {
+	    if (user_data && user_data->ptr) {
+		rb_grn_object_finalizer(context, 1, &grn_object, user_data);
+	    } else {
+		rb_grn_object_run_finalizer(context, grn_object, rb_grn_object);
+	    }
 	}
 	if (rb_grn_object->need_close) {
 	    grn_obj_unlink(context, grn_object);
@@ -297,15 +313,21 @@ rb_grn_object_bind_common (VALUE klass, VALUE self, VALUE rb_context,
 
     user_data = grn_obj_user_data(context, object);
     if (user_data) {
-	debug("set-finalizer: %p:%p:%p 0x%x\n",
+	debug("set-finalizer: %p:%p:%p %#x\n",
 	      context, object, rb_grn_object,
 	      object->header.type);
 	user_data->ptr = rb_grn_object;
 	grn_obj_set_finalizer(context, object, rb_grn_object_finalizer);
 	rb_grn_object->have_finalizer = GRN_TRUE;
+    } else if (object->header.type == GRN_ACCESSOR) {
+	debug("set-finalizer(implicit): %p:%p:%p %#x\n",
+	      context, object, rb_grn_object,
+	      object->header.type);
+	rb_grn_object->have_finalizer = GRN_TRUE;
     }
 
     switch (object->header.type) {
+      case GRN_DB:
       case GRN_PROC:
       case GRN_TYPE:
 	rb_grn_object->need_close = GRN_FALSE;
@@ -495,13 +517,17 @@ rb_grn_object_deconstruct (RbGrnObject *rb_grn_object,
 VALUE
 rb_grn_object_close (VALUE self)
 {
+    RbGrnObject *rb_grn_object;
     grn_obj *object;
     grn_ctx *context;
 
-    rb_grn_object_deconstruct(SELF(self), &object, &context,
+    rb_grn_object = SELF(self);
+    rb_grn_object_deconstruct(rb_grn_object, &object, &context,
 			      NULL, NULL, NULL, NULL);
-    if (object && context)
+    if (object && context) {
+	rb_grn_object_run_finalizer(context, object, rb_grn_object);
 	grn_obj_close(context, object);
+    }
 
     return Qnil;
 }
@@ -517,13 +543,19 @@ rb_grn_object_close (VALUE self)
 VALUE
 rb_grn_object_unlink (VALUE self)
 {
+    RbGrnObject *rb_grn_object;
     grn_obj *object;
     grn_ctx *context;
 
-    rb_grn_object_deconstruct(SELF(self), &object, &context,
+    rb_grn_object = SELF(self);
+    rb_grn_object_deconstruct(rb_grn_object, &object, &context,
 			      NULL, NULL, NULL, NULL);
-    if (object && context)
+    if (object && context) {
+	if (!(rb_grn_object->object->header.flags & GRN_OBJ_PERSISTENT)) {
+	    rb_grn_object_run_finalizer(context, object, rb_grn_object);
+	}
 	grn_obj_unlink(context, object);
+    }
 
     return Qnil;
 }

data/ext/groonga/rb-grn-patricia-trie.c

@@ -798,6 +798,7 @@ rb_grn_patricia_trie_open_grn_near_cursor (int argc, VALUE *argv, VALUE self,
     GRN_OBJ_INIT(&casted_key, GRN_BULK, 0, table->header.domain);
     if (key_p->header.domain != table->header.domain) {
 	grn_obj_cast(*context, key_p, &casted_key, 0);
+	grn_obj_unlink(*context, key_p);
 	key_p = &casted_key;
     }
 
@@ -862,7 +863,7 @@ rb_grn_patricia_trie_open_near_cursor (int argc, VALUE *argv, VALUE self)
     VALUE rb_cursor;
 
     cursor = rb_grn_patricia_trie_open_grn_near_cursor(argc, argv,
-								self, &context, GRN_CURSOR_RK);
+						       self, &context, GRN_CURSOR_RK);
     rb_cursor = GRNTABLECURSOR2RVAL(Qnil, context, cursor);
     rb_iv_set(rb_cursor, "@table", self); /* FIXME: cursor should mark table */
     if (rb_block_given_p())

data/ext/groonga/rb-grn-record.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
@@ -26,6 +26,16 @@ rb_grn_record_new (VALUE table, grn_id id, VALUE values)
     return rb_grn_record_new_raw(table, UINT2NUM(id), values);
 }
 
+VALUE
+rb_grn_record_new_added (VALUE table, grn_id id, VALUE values)
+{
+    VALUE record;
+
+    record = rb_grn_record_new(table, id, values);
+    rb_funcall(record, rb_intern("added="), 1, Qtrue);
+    return record;
+}
+
 VALUE
 rb_grn_record_new_raw (VALUE table, VALUE rb_id, VALUE values)
 {

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

@@ -66,7 +66,8 @@ rb_rb_grn_snippet_free (void *object)
 {
     RbGrnSnippet *rb_grn_snippet = object;
 
-    if (rb_grn_snippet->owner &&
+    if (!rb_grn_exited &&
+	rb_grn_snippet->owner &&
 	rb_grn_snippet->context && rb_grn_snippet->snippet)
         grn_snip_close(rb_grn_snippet->context,
                        rb_grn_snippet->snippet);
@@ -237,6 +238,12 @@ rb_grn_snippet_add_keyword (int argc, VALUE *argv, VALUE self)
 
     rb_grn_snippet = SELF(self);
 
+    if (!rb_grn_snippet->snippet) {
+	rb_raise(rb_eGrnClosed,
+		 "can't access already closed groonga object: %s",
+		 rb_grn_inspect(CLASS_OF(self)));
+    }
+
     keyword = StringValuePtr(rb_keyword);
     keyword_length = RSTRING_LEN(rb_keyword);
 
@@ -294,6 +301,12 @@ rb_grn_snippet_execute (VALUE self, VALUE rb_string)
     context = rb_grn_snippet->context;
     snippet = rb_grn_snippet->snippet;
 
+    if (!snippet) {
+	rb_raise(rb_eGrnClosed,
+		 "can't access already closed groonga object: %s",
+		 rb_grn_inspect(CLASS_OF(self)));
+    }
+
 #ifdef HAVE_RUBY_ENCODING_H
     rb_string = rb_grn_context_rb_string_encode(context, rb_string);
 #endif
@@ -320,6 +333,34 @@ rb_grn_snippet_execute (VALUE self, VALUE rb_string)
     return rb_results;
 }
 
+/*
+ * Document-method: close
+ *
+ * call-seq:
+ *   snippet.close
+ *
+ * _snippet_が使用しているリソースを開放する。これ以降_snippet_を
+ * 使うことはできない。
+ */
+static VALUE
+rb_grn_snippet_close (VALUE self)
+{
+    RbGrnSnippet *rb_grn_snippet;
+    grn_ctx *context;
+    grn_snip *snippet;
+
+    rb_grn_snippet = SELF(self);
+    context = rb_grn_snippet->context;
+    snippet = rb_grn_snippet->snippet;
+    if (context && snippet) {
+	grn_snip_close(context, snippet);
+	rb_grn_snippet->context = NULL;
+	rb_grn_snippet->snippet = NULL;
+    }
+
+    return Qnil;
+}
+
 void
 rb_grn_init_snippet (VALUE mGrn)
 {
@@ -332,4 +373,6 @@ rb_grn_init_snippet (VALUE mGrn)
                      rb_grn_snippet_add_keyword, -1);
     rb_define_method(rb_cGrnSnippet, "execute",
                      rb_grn_snippet_execute, 1);
+    rb_define_method(rb_cGrnSnippet, "close",
+                     rb_grn_snippet_close, 0);
 }

data/ext/groonga/rb-grn-table-key-support.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
@@ -88,7 +88,7 @@ rb_grn_table_key_support_bind (RbGrnTableKeySupport *rb_grn_table_key_support,
 }
 
 static grn_id
-rb_grn_table_key_support_add_raw (VALUE self, VALUE rb_key)
+rb_grn_table_key_support_add_raw (VALUE self, VALUE rb_key, int *added)
 {
     grn_ctx *context;
     grn_obj *table;
@@ -103,7 +103,7 @@ rb_grn_table_key_support_add_raw (VALUE self, VALUE rb_key)
     GRN_BULK_REWIND(key);
     RVAL2GRNKEY(rb_key, context, key, domain_id, domain, self);
     id = grn_table_add(context, table,
-                       GRN_BULK_HEAD(key), GRN_BULK_VSIZE(key), NULL);
+                       GRN_BULK_HEAD(key), GRN_BULK_VSIZE(key), added);
     rb_grn_context_check(context, self);
 
     return id;
@@ -116,6 +116,11 @@ rb_grn_table_key_support_add_raw (VALUE self, VALUE rb_key)
  * 主キーが_key_のレコード追加し、追加したレコードを返す。レ
  * コードの追加に失敗した場合は+nil+を返す。
  *
+ * すでに同じキーのレコードが存在する場合は追加せずに同じレ
+ * コードを返す。追加されたかどうかは
+ * +Groonga::Record#added?+で調べることができる。+true+を返
+ * したら追加されたということを示す。
+ *
  * _values_にはレコードのカラムに設定する値を指定する。省略
  * した場合または+nil+を指定した場合はカラムは設定しない。カ
  * ラムの値は<tt>{:カラム名1 => 値1, :カラム名2 => 値2,
@@ -126,13 +131,19 @@ rb_grn_table_key_support_add (int argc, VALUE *argv, VALUE self)
 {
     grn_id id;
     VALUE key, values;
+    int added = GRN_FALSE;
 
     rb_scan_args(argc, argv, "11", &key, &values);
-    id = rb_grn_table_key_support_add_raw(self, key);
-    if (GRN_ID_NIL == id)
+    id = rb_grn_table_key_support_add_raw(self, key, &added);
+    if (GRN_ID_NIL == id) {
 	return Qnil;
-    else
-	return rb_grn_record_new(self, id, values);
+    } else {
+	if (added) {
+	    return rb_grn_record_new_added(self, id, values);
+	} else {
+	    return rb_grn_record_new(self, id, values);
+	}
+    }
 }
 
 grn_id
@@ -364,7 +375,7 @@ rb_grn_table_key_support_array_set (VALUE self, VALUE rb_key, VALUE rb_values)
 					 NULL, NULL, NULL,
 					 NULL);
 
-    id = rb_grn_table_key_support_add_raw(self, rb_key);
+    id = rb_grn_table_key_support_add_raw(self, rb_key, NULL);
 
     if (id == GRN_ID_NIL) {
 	rb_raise(rb_eGrnError,
@@ -409,7 +420,7 @@ rb_grn_table_key_support_set_column_value (int argc, VALUE *argv, VALUE self)
     }
 
     rb_key = rb_id_or_key;
-    id = rb_grn_table_key_support_add_raw(self, rb_key);
+    id = rb_grn_table_key_support_add_raw(self, rb_key, NULL);
     if (id == GRN_ID_NIL) {
 	rb_raise(rb_eGrnError,
 		 "failed to add record: %s",
@@ -533,7 +544,7 @@ rb_grn_table_key_support_set_value_by_key (VALUE self,
 					 &value, NULL, NULL,
 					 NULL);
 
-    id = rb_grn_table_key_support_add_raw(self, rb_key);
+    id = rb_grn_table_key_support_add_raw(self, rb_key, NULL);
     if (GRN_ID_NIL == id) {
 	rb_raise(rb_eGrnError,
 		 "failed to add new record with key: <%s>: <%s>",

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

@@ -243,6 +243,8 @@ rb_grn_bulk_from_ruby_object (VALUE object, grn_ctx *context, grn_obj *bulk)
       case T_NIL:
 	grn_obj_reinit(context, bulk, GRN_DB_VOID, 0);
 	break;
+      case T_SYMBOL:
+	object = rb_funcall(object, rb_intern("to_s"), 0);
       case T_STRING:
 	grn_obj_reinit(context, bulk, GRN_DB_TEXT, 0);
 	rb_grn_context_text_set(context, bulk, object);
@@ -306,7 +308,7 @@ rb_grn_bulk_from_ruby_object (VALUE object, grn_ctx *context, grn_obj *bulk)
 	} else {
 	    rb_raise(rb_eTypeError,
 		     "bulked object should be one of "
-		     "[nil, true, false, String, Integer, Float, Time, "
+		     "[nil, true, false, String, Symbol, Integer, Float, Time, "
 		     "Groonga::Object, Groonga::Record]: %s",
 		     rb_grn_inspect(object));
 	}

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

@@ -18,7 +18,7 @@
 
 #include "rb-grn.h"
 
-#define SELF(object) ((RbGrnVariableSizeColumn *)DATA_PTR(object))
+#define SELF(object) ((RbGrnColumn *)DATA_PTR(object))
 
 VALUE rb_cGrnVariableSizeColumn;
 
@@ -28,9 +28,55 @@ VALUE rb_cGrnVariableSizeColumn;
  * 可変長データ用のカラム。
  */
 
+/*
+ * Document-method: defrag
+ *
+ * call-seq:
+ *   column.defrag(options={}) -> n_segments
+ *
+ * Defrags the column.
+ *
+ * @return [Integer] the number of defraged segments
+ * @option options [Integer] :threshold (0) the threshold to
+ *   determine whether a segment is defraged. Available
+ *   values are -4..22. -4 means all segments are defraged.
+ *   22 means no segment is defraged.
+ * @since 1.2.6
+ */
+static VALUE
+rb_grn_variable_size_column_defrag (int argc, VALUE *argv, VALUE self)
+{
+    RbGrnColumn *rb_grn_column;
+    grn_ctx *context = NULL;
+    grn_obj *column;
+    int n_segments;
+    VALUE options, rb_threshold;
+    int threshold = 0;
+
+    rb_scan_args(argc, argv, "01", &options);
+    rb_grn_scan_options(options,
+			"threshold", &rb_threshold,
+			NULL);
+    if (!NIL_P(rb_threshold)) {
+	threshold = NUM2INT(rb_threshold);
+    }
+
+    rb_grn_column = SELF(self);
+    rb_grn_object_deconstruct(RB_GRN_OBJECT(rb_grn_column), &column, &context,
+			      NULL, NULL,
+			      NULL, NULL);
+    n_segments = grn_obj_defrag(context, column, threshold);
+    rb_grn_context_check(context, self);
+
+    return INT2NUM(n_segments);
+}
+
 void
 rb_grn_init_variable_size_column (VALUE mGrn)
 {
     rb_cGrnVariableSizeColumn =
 	rb_define_class_under(mGrn, "VariableSizeColumn", rb_cGrnColumn);
+
+    rb_define_method(rb_cGrnVariableSizeColumn, "defrag",
+		     rb_grn_variable_size_column_defrag, -1);
 }

data/ext/groonga/rb-grn.h

@@ -69,7 +69,7 @@ RB_GRN_BEGIN_DECLS
 
 #define RB_GRN_MAJOR_VERSION 1
 #define RB_GRN_MINOR_VERSION 2
-#define RB_GRN_MICRO_VERSION 5
+#define RB_GRN_MICRO_VERSION 7
 
 #define RB_GRN_QUERY_DEFAULT_MAX_EXPRESSIONS 32
 
@@ -474,6 +474,9 @@ VALUE          rb_grn_posting_new                   (grn_posting *posting,
 VALUE          rb_grn_record_new                    (VALUE table,
 						     grn_id id,
 						     VALUE values);
+VALUE          rb_grn_record_new_added              (VALUE table,
+						     grn_id id,
+						     VALUE values);
 VALUE          rb_grn_record_new_raw                (VALUE table,
 						     VALUE id,
 						     VALUE values);

data/extconf.rb

@@ -34,6 +34,7 @@ Dir.chdir(source_ext_dir.to_s) do
   end
   ruby = "#{config['bindir']}/#{config['ruby_install_name']}#{config['EXEEXT']}"
   message("checking in #{ext_dir}...\n")
+  ENV["INSTALL_RB"] = "yes"
   system(ruby, (ext_dir + 'extconf.rb').to_s, *ARGV) or exit 1
   message("checking in #{ext_dir}: done.\n")
   File.open("Makefile") do |file|

data/lib/groonga/dumper.rb

@@ -88,9 +88,9 @@ module Groonga
       output = options[:output]
       plugins_dir_re = Regexp.escape(Groonga::Plugin.system_plugins_dir)
       suffix_re = Regexp.escape(Groonga::Plugin.suffix)
-      plugin_name = plugin.path.gsub!(/(?:\A#{plugins_dir_re}\/|
-                                          #{suffix_re}\z)/x,
-                                      '')
+      plugin_name = plugin.path.gsub(/(?:\A#{plugins_dir_re}\/|
+                                         #{suffix_re}\z)/x,
+                                     '')
       output.write("register #{plugin_name}\n")
     end
 

data/lib/groonga/pagination.rb

@@ -78,7 +78,7 @@ module Groonga
     #   selected_entries = entries.select do |record|
     #     entry.description =~ query
     #   end
-    #   paged_entries = selected_entries.paginate(["_score", :desc],
+    #   paged_entries = selected_entries.paginate([["_score", :desc]],
     #                                             :page => 1,
     #                                             :size => 10)
     #

data/lib/groonga/record.rb

@@ -32,6 +32,7 @@ module Groonga
     def initialize(table, id, values=nil)
       @table = table
       @id = id
+      @added = false
       if values
         values.each do |name, value|
           self[name] = value
@@ -380,6 +381,15 @@ module Groonga
       super or !@table.column(name.to_s.sub(/=\z/, '')).nil?
     end
 
+    def added?
+      @added
+    end
+
+    # @private
+    def added=(added)
+      @added = added
+    end
+
     private
     def normalize_column_name(name)
       name.to_s

data/rroonga-build.rb

@@ -19,7 +19,7 @@ module RroongaBuild
   module RequiredGroongaVersion
     MAJOR = 1
     MINOR = 2
-    MICRO = 2
+    MICRO = 5
     VERSION = [MAJOR, MINOR, MICRO]
   end
 

data/test/test-accessor.rb

@@ -22,6 +22,10 @@ class AccessorTest < Test::Unit::TestCase
     @id = @posts.column("_id")
   end
 
+  def teardown
+    @id = nil
+  end
+
   def test_name
     assert_nil(@id.name)
   end

data/test/test-array.rb

@@ -1,4 +1,4 @@
-# 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
@@ -91,4 +91,12 @@ class ArrayTest < Test::Unit::TestCase
     users.set_column_value(morita_id, "name", "morita")
     assert_equal("morita", users.column_value(morita_id, "name"))
   end
+
+  def test_added?
+    users = Groonga::Array.create(:name => "Users")
+    first_user = users.add
+    assert_predicate(first_user, :added?)
+    second_user = users.add
+    assert_predicate(second_user, :added?)
+  end
 end

data/test/test-database.rb

@@ -130,4 +130,20 @@ class DatabaseTest < Test::Unit::TestCase
       database.touch
     end
   end
+
+  def test_defrag
+    setup_database
+    Groonga::Schema.define do |schema|
+      schema.create_table("Users") do |table|
+        table.short_text("name")
+        table.short_text("address")
+      end
+    end
+    users = context["Users"]
+    1000.times do |i|
+      users.add(:name => "user #{i}" * 1000,
+                :address => "address #{i}" * 1000)
+    end
+    assert_equal(7, @database.defrag)
+  end
 end

data/test/test-expression.rb

@@ -106,6 +106,7 @@ class ExpressionTest < Test::Unit::TestCase
                                  "提供するプロジェクトです。groongaの機能を" +
                                  "Rubyらしい読み書きしやすい構文で利用できる" +
                                  "ことが利点です。"))
+    snippet.close
   end
 
   def test_snippet_without_tags
@@ -127,5 +128,6 @@ class ExpressionTest < Test::Unit::TestCase
     snippet = expression.snippet([], :width => 30)
     assert_equal(["ラングバプロジェクト"],
                  snippet.execute("ラングバプロジェクトはカラムストア機能も"))
+    snippet.close
   end
 end

data/test/test-hash.rb

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-# 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
@@ -75,7 +76,6 @@ class HashTest < Test::Unit::TestCase
     assert_equal(bookmark, bookmarks["http://google.com/"])
   end
 
-
   def test_inspect_anonymous
     path = @tables_dir + "anoymous.groonga"
     anonymous_table = Groonga::Hash.create(:path => path.to_s)
@@ -308,4 +308,13 @@ class HashTest < Test::Unit::TestCase
       }
     end
   end
+
+  def test_added?
+    users = Groonga::Hash.create(:name => "Users",
+                                 :key_type => "ShortText")
+    bob = users.add("bob")
+    assert_predicate(bob, :added?)
+    bob_again = users.add("bob")
+    assert_not_predicate(bob_again, :added?)
+  end
 end

data/test/test-patricia-trie.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# 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
@@ -379,4 +379,13 @@ class PatriciaTrieTest < Test::Unit::TestCase
     numbers.add(7)
     assert_equal([1, 2, 5, 7], numbers.collect {|number| number.key})
   end
+
+  def test_added?
+    users = Groonga::PatriciaTrie.create(:name => "Users",
+                                         :key_type => "ShortText")
+    bob = users.add("bob")
+    assert_predicate(bob, :added?)
+    bob_again = users.add("bob")
+    assert_not_predicate(bob_again, :added?)
+  end
 end