RubyGems - rroonga - Versions diffs - 4.0.3-x64-mingw32 → 4.0.4-x64-mingw32 - Mend

rroonga 4.0.3-x64-mingw32 → 4.0.4-x64-mingw32

Files changed (683) hide show

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

@@ -13,7 +13,7 @@
   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
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #include "rb-grn.h"
@@ -163,6 +163,7 @@ rb_grn_variable_size_column_array_reference (VALUE self, VALUE rb_id)
     grn_id id;
     grn_obj *value;
     VALUE rb_value;
+    VALUE rb_range;
     unsigned int i, n;
     rb_grn_variable_size_column_deconstruct(SELF(self), &column, &context,
@@ -181,25 +182,36 @@ rb_grn_variable_size_column_array_reference (VALUE self, VALUE rb_id)
     grn_obj_get_value(context, column, id, value);
     rb_grn_context_check(context, self);
+    rb_range = GRNTABLE2RVAL(context, range, GRN_FALSE);
     n = grn_vector_size(context, value);
     rb_value = rb_ary_new2(n);
     for (i = 0; i < n; i++) {
-        const char *element_value;
-        unsigned int element_value_length;
+        VALUE rb_element_value;
         unsigned int weight = 0;
         grn_id domain;
         VALUE rb_element;
-        element_value_length = grn_vector_get_element(context,
-                                                      value,
-                                                      i,
-                                                      &element_value,
-                                                      &weight,
-                                                      &domain);
+        if (value->header.type == GRN_UVECTOR) {
+            grn_id id;
+            id = grn_uvector_get_element(context, value, i, &weight);
+            rb_element_value = rb_grn_record_new(rb_range, id, Qnil);
+        } else {
+            const char *element_value;
+            unsigned int element_value_length;
+            element_value_length = grn_vector_get_element(context,
+                                                          value,
+                                                          i,
+                                                          &element_value,
+                                                          &weight,
+                                                          &domain);
+            rb_element_value = rb_str_new(element_value, element_value_length);
+        }
         rb_element = rb_hash_new();
         rb_hash_aset(rb_element,
                      ID2SYM(rb_intern("value")),
-                     rb_str_new(element_value, element_value_length));
+                     rb_element_value);
         rb_hash_aset(rb_element,
                      ID2SYM(rb_intern("weight")),
                      UINT2NUM(weight));
@@ -211,9 +223,11 @@ rb_grn_variable_size_column_array_reference (VALUE self, VALUE rb_id)
 }
 typedef struct {
+    VALUE self;
     grn_ctx *context;
     grn_obj *vector;
     grn_obj *element_value;
+    grn_obj *range;
 } HashElementToVectorElementData;
 static int
@@ -223,15 +237,21 @@ hash_element_to_vector_element(VALUE key, VALUE value, VALUE user_data)
         (HashElementToVectorElementData *)user_data;
     unsigned int weight;
-    GRN_BULK_REWIND(data->element_value);
-    RVAL2GRNBULK(key, data->context, data->element_value);
     weight = NUM2UINT(value);
-    grn_vector_add_element(data->context, data->vector,
-                           GRN_BULK_HEAD(data->element_value),
-                           GRN_BULK_VSIZE(data->element_value),
-                           weight,
-                           data->element_value->header.domain);
+    if (data->vector->header.type == GRN_UVECTOR) {
+        grn_id id = RVAL2GRNID(key, data->context, data->range, data->self);
+        grn_uvector_add_element(data->context, data->vector, id, weight);
+    } else {
+        GRN_BULK_REWIND(data->element_value);
+        RVAL2GRNBULK(key, data->context, data->element_value);
+        grn_vector_add_element(data->context, data->vector,
+                               GRN_BULK_HEAD(data->element_value),
+                               GRN_BULK_VSIZE(data->element_value),
+                               weight,
+                               data->element_value->header.domain);
+    }
     return ST_CONTINUE;
 }
@@ -373,6 +393,7 @@ rb_grn_variable_size_column_array_set (VALUE self, VALUE rb_id, VALUE rb_value)
     grn_obj_reinit(context, value,
                    value->header.domain,
                    value->header.flags | GRN_OBJ_VECTOR);
+    value->header.flags |= GRN_OBJ_WITH_WEIGHT;
     if (RVAL2CBOOL(rb_obj_is_kind_of(rb_value, rb_cArray))) {
         int i, n;
         n = RARRAY_LEN(rb_value);
@@ -389,22 +410,29 @@ rb_grn_variable_size_column_array_set (VALUE self, VALUE rb_id, VALUE rb_value)
                 weight = NUM2UINT(rb_weight);
             }
-            GRN_BULK_REWIND(element_value);
-            if (!NIL_P(rb_element_value)) {
-                RVAL2GRNBULK(rb_element_value, context, element_value);
+            if (value->header.type == GRN_UVECTOR) {
+                grn_id id = RVAL2GRNID(rb_element_value, context, range, self);
+                grn_uvector_add_element(context, value, id, weight);
+            } else {
+                GRN_BULK_REWIND(element_value);
+                if (!NIL_P(rb_element_value)) {
+                    RVAL2GRNBULK(rb_element_value, context, element_value);
+                }
+                grn_vector_add_element(context, value,
+                                       GRN_BULK_HEAD(element_value),
+                                       GRN_BULK_VSIZE(element_value),
+                                       weight,
+                                       element_value->header.domain);
             }
-            grn_vector_add_element(context, value,
-                                   GRN_BULK_HEAD(element_value),
-                                   GRN_BULK_VSIZE(element_value),
-                                   weight,
-                                   element_value->header.domain);
         }
     } else if (RVAL2CBOOL(rb_obj_is_kind_of(rb_value, rb_cHash))) {
         HashElementToVectorElementData data;
+        data.self = self;
         data.context = context;
         data.vector = value;
         data.element_value = element_value;
+        data.range = range;
         rb_hash_foreach(rb_value, hash_element_to_vector_element, (VALUE)&data);
     } else {
         rb_raise(rb_eArgError,

data/ext/groonga/rb-grn-variable.c CHANGED Viewed

@@ -13,7 +13,7 @@
   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
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #include "rb-grn.h"

data/ext/groonga/rb-grn.h CHANGED Viewed

@@ -13,7 +13,7 @@
   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
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #ifndef __RB_GRN_H__
@@ -84,7 +84,7 @@ RB_GRN_BEGIN_DECLS
 #define RB_GRN_MAJOR_VERSION 4
 #define RB_GRN_MINOR_VERSION 0
-#define RB_GRN_MICRO_VERSION 3
+#define RB_GRN_MICRO_VERSION 4
 #define RB_GRN_QUERY_DEFAULT_MAX_EXPRESSIONS 32
@@ -288,6 +288,7 @@ void           rb_grn_init_patricia_trie_cursor     (VALUE mGrn);
 void           rb_grn_init_double_array_trie_cursor (VALUE mGrn);
 void           rb_grn_init_type                     (VALUE mGrn);
 void           rb_grn_init_procedure                (VALUE mGrn);
+void           rb_grn_init_procedure_type           (VALUE mGrn);
 void           rb_grn_init_column                   (VALUE mGrn);
 void           rb_grn_init_fix_size_column          (VALUE mGrn);
 void           rb_grn_init_variable_size_column     (VALUE mGrn);
@@ -374,6 +375,7 @@ VALUE          rb_grn_object_set_raw                (RbGrnObject *rb_grn_object,
                                                      VALUE rb_value,
                                                      int flags,
                                                      VALUE related_object);
+void           rb_grn_object_close_raw              (RbGrnObject *rb_grn_object);
 VALUE          rb_grn_object_close                  (VALUE object);
 VALUE          rb_grn_object_closed_p               (VALUE object);
 VALUE          rb_grn_object_inspect_object         (VALUE inspected,

data/ext/groonga/rb-groonga.c CHANGED Viewed

@@ -1,6 +1,6 @@
 /* -*- coding: utf-8; mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
-  Copyright (C) 2009-2013  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2014  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
@@ -13,7 +13,7 @@
   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
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #include "rb-grn.h"
@@ -175,6 +175,7 @@ Init_groonga (void)
     rb_grn_init_posting(mGrn);
     rb_grn_init_type(mGrn);
     rb_grn_init_procedure(mGrn);
+    rb_grn_init_procedure_type(mGrn);
     rb_grn_init_column(mGrn);
     rb_grn_init_accessor(mGrn);
     rb_grn_init_geo_point(mGrn);

data/extconf.rb CHANGED Viewed

@@ -13,7 +13,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 require 'English'
 require 'pathname'

data/lib/1.9/groonga.so CHANGED Viewed

Binary file

data/lib/2.0/groonga.so CHANGED Viewed

Binary file

data/lib/2.1/groonga.so CHANGED Viewed

Binary file

data/lib/groonga/column.rb CHANGED Viewed

@@ -13,7 +13,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 module Groonga
   class Column

data/lib/groonga/context/command-executor.rb CHANGED Viewed

@@ -13,7 +13,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 require "groonga/command"
 require "groonga/client/response"

data/lib/groonga/context.rb CHANGED Viewed

@@ -13,7 +13,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 require "groonga/memory-pool"
 require "groonga/context/command-executor"

data/lib/groonga/database-inspector.rb CHANGED Viewed

@@ -13,7 +13,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 module Groonga
   # It is a class that inspects database. You can know details metadata

data/lib/groonga/database.rb CHANGED Viewed

@@ -13,7 +13,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 module Groonga
   class Database

data/lib/groonga/dumper.rb CHANGED Viewed

@@ -13,7 +13,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 require 'stringio'

data/lib/groonga/expression-builder-19.rb CHANGED Viewed

@@ -13,7 +13,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 module Groonga
   module ExpressionBuildable

data/lib/groonga/expression-builder.rb CHANGED Viewed

@@ -13,7 +13,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 module Groonga
   # @private

data/lib/groonga/geo-point.rb CHANGED Viewed

@@ -13,7 +13,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 module Groonga
   module GeoPointValueConverter

data/lib/groonga/grntest-log.rb CHANGED Viewed

@@ -13,7 +13,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 require "English"
 require "time"

data/lib/groonga/index-column.rb CHANGED Viewed

@@ -13,7 +13,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 require "fileutils"
 require "cgi"

data/lib/groonga/logger.rb CHANGED Viewed

@@ -13,7 +13,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 module Groonga
   class Logger

data/lib/groonga/memory-pool.rb CHANGED Viewed

@@ -13,7 +13,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 module Groonga
   # @api private
@@ -24,7 +24,6 @@ module Groonga
     def register(object)
       return unless object.temporary?
-      return unless object.is_a?(Groonga::Table)
       @temporary_objects[object] = true
     end

data/lib/groonga/pagination.rb CHANGED Viewed

@@ -13,7 +13,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 module Groonga
   class TooSmallPage < Error

data/lib/groonga/patricia-trie.rb CHANGED Viewed

@@ -13,7 +13,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 module Groonga
   class PatriciaTrie

data/lib/groonga/posting.rb CHANGED Viewed

@@ -13,7 +13,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 require 'English'

data/lib/groonga/query-logger.rb CHANGED Viewed

@@ -13,7 +13,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 module Groonga
   class QueryLogger

data/lib/groonga/record.rb CHANGED Viewed

@@ -13,7 +13,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 require "English"
 require "time"
@@ -352,7 +352,11 @@ module Groonga
     # @private
     def inspect
-      super.gsub(/>\z/, ", attributes: #{attributes.inspect}>")
+      if @table.closed?
+        super.gsub(/>\z/, " (closed)>")
+      else
+        super.gsub(/>\z/, ", attributes: #{attributes.inspect}>")
+      end
     end
     private

data/lib/groonga/schema.rb CHANGED Viewed

@@ -13,7 +13,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 require 'fileutils'

data/lib/groonga/statistic-measurer.rb CHANGED Viewed

@@ -13,7 +13,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 module Groonga
   # Measures statistic.

data/lib/groonga/sub-records.rb CHANGED Viewed

@@ -13,7 +13,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 module Groonga
   # Represents sub records of a {Record}. Grouped result set by

data/lib/groonga/table.rb CHANGED Viewed

@@ -13,7 +13,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 module Groonga
   class Table

data/lib/groonga.rb CHANGED Viewed

@@ -13,7 +13,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 require "pathname"

data/misc/grnop2ruby.rb CHANGED Viewed

@@ -13,7 +13,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 # This script expects "groonga.h" as a first argument, extracts the

data/rroonga-build.rb CHANGED Viewed

@@ -13,21 +13,21 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 module RroongaBuild
   module RequiredGroongaVersion
     MAJOR = 4
     MINOR = 0
-    MICRO = 1
+    MICRO = 4
     VERSION = [MAJOR, MINOR, MICRO]
-    RELEASED_DATE = Time.utc(2014, 3, 29)
+    RELEASED_DATE = Time.utc(2014, 7, 29)
   end
   module LatestGroongaVersion
     MAJOR = 4
     MINOR = 0
-    MICRO = 2
+    MICRO = 5
     VERSION = [MAJOR, MINOR, MICRO]
   end

data/rroonga.gemspec CHANGED Viewed

@@ -13,7 +13,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 require "English"
@@ -74,7 +74,7 @@ Gem::Specification.new do |s|
     end
   end
-  s.homepage = "http://groonga.rubyforge.org/#about-rroonga"
+  s.homepage = "http://ranguba.org/#about-rroonga"
   s.licenses = ["LGPLv2"]
   s.require_paths = ["lib", "ext/groonga"]
   s.rubyforge_project = "groonga"
@@ -91,7 +91,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency("rake-compiler")
   s.add_development_dependency("bundler")
   s.add_development_dependency("yard")
-  s.add_development_dependency("packnga", [">= 0.9.7"])
+  s.add_development_dependency("packnga", [">= 1.0.0"])
   s.add_development_dependency("RedCloth")
 end

data/test/groonga-test-utils.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-# Copyright (C) 2009  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2014  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
@@ -11,7 +11,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 require "fileutils"
 require "pathname"
@@ -43,6 +43,8 @@ module GroongaTestUtils
     setup_context
     @database = nil
+    name_for_path = name.gsub(/[\(\)\[\] ]/, "-")
+    @database_path = @tmp_dir + "#{name_for_path}.db"
   end
   def setup_tmp_directory
@@ -107,7 +109,6 @@ module GroongaTestUtils
   end
   def setup_database
-    @database_path = @tmp_dir + "database"
     @database = Groonga::Database.create(:path => @database_path.to_s)
   end
@@ -122,7 +123,6 @@ module GroongaTestUtils
     teardown_database
     Groonga::Context.default.close
     Groonga::Context.default = nil
-    GC.start
     teardown_log_path
     teardown_tmp_directory
   end

data/test/run-test.rb CHANGED Viewed

@@ -13,7 +13,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 $VERBOSE = true

data/test/test-accessor.rb CHANGED Viewed

@@ -11,7 +11,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 class AccessorTest < Test::Unit::TestCase
   include GroongaTestUtils

data/test/test-array.rb CHANGED Viewed

@@ -11,7 +11,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 class ArrayTest < Test::Unit::TestCase
   include GroongaTestUtils

data/test/test-column.rb CHANGED Viewed

@@ -11,7 +11,7 @@
 #
 # 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
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 class ColumnTest < Test::Unit::TestCase
   include GroongaTestUtils