rroonga 1.2.6 → 1.2.7

data/Gemfile

@@ -0,0 +1,30 @@
+# -*- mode: ruby; coding: utf-8 -*-
+#
+# 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
+
+source "http://rubygems.org/"
+
+gem 'pkg-config'
+
+group :development, :test do
+  gem "test-unit"
+  gem "test-unit-notify"
+  gem "rake"
+  gem "rake-compiler"
+  gem "jeweler"
+  gem "yard"
+  gem "packnga"
+end

data/Rakefile

@@ -90,6 +90,7 @@ Jeweler::Tasks.new do |_spec|
                         "*.rb",
                         "example/*.rb",
                         "Rakefile",
+                        "Gemfile",
                         "ext/**/*"]
   spec.test_files = FileList["test/**/*.rb"]
 end

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

@@ -522,7 +522,6 @@ rb_grn_database_touch (VALUE self)
 static VALUE
 rb_grn_database_defrag (int argc, VALUE *argv, VALUE self)
 {
-    RbGrnColumn *rb_grn_column;
     grn_ctx *context;
     grn_obj *database;
     int n_segments;

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-utils.c

@@ -244,7 +244,7 @@ rb_grn_bulk_from_ruby_object (VALUE object, grn_ctx *context, grn_obj *bulk)
 	grn_obj_reinit(context, bulk, GRN_DB_VOID, 0);
 	break;
       case T_SYMBOL:
-	object = rb_sym_to_s(object);
+	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);

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 6
+#define RB_GRN_MICRO_VERSION 7
 
 #define RB_GRN_QUERY_DEFAULT_MAX_EXPRESSIONS 32
 

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/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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rroonga
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 2
-  - 6
-  version: 1.2.6
+  - 7
+  version: 1.2.7
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -149,6 +149,7 @@ extra_rdoc_files:
 - README.textile
 - TODO
 files: 
+- Gemfile
 - Rakefile
 - benchmark/common.rb
 - benchmark/create-wikipedia-database.rb