rroonga 3.0.5 → 3.0.6

data/AUTHORS

@@ -0,0 +1,5 @@
+Kouhei Sutou <kou@clear-code.com>
+Tasuku SUENAGA <a@razil.jp>
+daijiro <morita@razil.jp>
+Yuto HAYAMIZU <y.hayamizu@gmail.com>
+SHIDARA Yoji <dara@shidara.net>

data/Gemfile

@@ -0,0 +1,20 @@
+# -*- mode: ruby; coding: utf-8 -*-
+#
+# Copyright (C) 2011-2013  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 "https://rubygems.org/"
+
+gemspec

data/Rakefile

@@ -0,0 +1,187 @@
+# -*- coding: utf-8; mode: ruby -*-
+#
+# Copyright (C) 2009-2012  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
+
+require "find"
+require "fileutils"
+require "pathname"
+require "erb"
+require "rubygems"
+require "rubygems/package_task"
+require "yard"
+require "bundler/gem_helper"
+require "rake/extensiontask"
+require "packnga"
+
+if YAML.const_defined?(:ENGINE)
+  begin
+    YAML::ENGINE.yamler = "psych"
+  rescue LoadError
+  end
+end
+
+base_dir = File.join(File.dirname(__FILE__))
+
+groonga_ext_dir = File.join(base_dir, "ext", "groonga")
+groonga_lib_dir = File.join(base_dir, "lib")
+$LOAD_PATH.unshift(groonga_ext_dir)
+$LOAD_PATH.unshift(groonga_lib_dir)
+ENV["RUBYLIB"] = "#{groonga_lib_dir}:#{groonga_ext_dir}:#{ENV['RUBYLIB']}"
+
+helper = Bundler::GemHelper.new(base_dir)
+def helper.version_tag
+  version
+end
+
+helper.install
+spec = helper.gemspec
+
+Gem::PackageTask.new(spec) do |pkg|
+  pkg.need_tar_gz = true
+end
+
+Packnga::DocumentTask.new(spec) do |task|
+  task.original_language = "en"
+  task.translate_language = "ja"
+end
+
+ranguba_org_dir = Dir.glob("{..,../../www}/ranguba.org").first
+Packnga::ReleaseTask.new(spec) do |task|
+  task.index_html_dir = ranguba_org_dir
+end
+
+module YARD
+  module CodeObjects
+    class Proxy
+      alias_method :initialize_original, :initialize
+      def initialize(namespace, name, type=nil)
+        name = name.to_s.gsub(/\AGrn(.*)\z/) do
+          suffix = $1
+          case suffix
+          when ""
+            "Groonga"
+          when "TableKeySupport"
+            "Groonga::Table::KeySupport"
+          else
+            "Groonga::#{suffix}"
+          end
+        end
+        initialize_original(namespace, name, type)
+      end
+    end
+  end
+end
+
+def windows?(platform=nil)
+  platform ||= RUBY_PLATFORM
+  platform =~ /mswin(?!ce)|mingw|cygwin|bccwin/
+end
+
+def collect_binary_files(binary_dir)
+  binary_files = []
+  Find.find(binary_dir) do |name|
+    next unless File.file?(name)
+    next if /\.zip\z/i =~ name
+    binary_files << name
+  end
+  binary_files
+end
+
+relative_vendor_dir = "vendor"
+relative_binary_dir = File.join("vendor", "local")
+vendor_dir = File.join(base_dir, relative_vendor_dir)
+binary_dir = File.join(base_dir, relative_binary_dir)
+
+groonga_win32_i386_p = ENV["GROONGA64"] != "yes"
+
+namespace :win32 do
+  namespace :groonga do
+    task :download do
+      require "open-uri"
+      require "rroonga-build"
+      groonga_version = RroongaBuild::RequiredGroongaVersion::VERSION.join(".")
+      base_name = "groonga-#{groonga_version}-"
+      if groonga_win32_i386_p
+        base_name << "x86"
+      else
+        base_name << "x64"
+      end
+      base_name << ".zip"
+      base_url = "http://packages.groonga.org/windows/groonga/"
+      Dir.chdir(base_dir) do
+        unless File.exist?(base_name)
+          open("#{base_url}#{base_name}", "rb") do |zip|
+            File.open(base_name, "wb") do |output|
+              output.print(zip.read)
+            end
+          end
+        end
+        sh("unzip", base_name)
+        rm_rf(relative_binary_dir)
+        mkdir_p(File.dirname(relative_binary_dir))
+        mv(File.basename(base_name, ".*"), relative_binary_dir)
+      end
+    end
+  end
+end
+
+Rake::ExtensionTask.new("groonga", spec) do |ext|
+  if groonga_win32_i386_p
+    ext.cross_platform = ["x86-mingw32"]
+  else
+    ext.cross_platform = ["x64-mingw32"]
+  end
+  if windows?
+    ext.gem_spec.files += collect_binary_files(relative_binary_dir)
+  else
+    ext.cross_compile = true
+    ext.cross_compiling do |_spec|
+      if windows?(_spec.platform.to_s)
+        _spec.files += collect_binary_files(relative_binary_dir)
+      end
+    end
+  end
+end
+
+file "Makefile" => ["extconf.rb", "ext/groonga/extconf.rb"] do
+  extconf_args = []
+  if ENV["TRAVIS"]
+    extconf_args << "--enable-debug-build"
+  end
+  ruby("extconf.rb", *extconf_args)
+end
+
+desc "Configure"
+task :configure => "Makefile"
+
+desc "Run test"
+task :test => :configure do
+  ruby("-rubygems", "test/run-test.rb")
+end
+
+namespace :test do
+  task :install do
+    gemspec_helper = Rake.application.jeweler.gemspec_helper
+    ruby("-S gem install --user-install #{gemspec_helper.gem_path}")
+
+    gem_spec = Gem.source_index.find_name("rroonga").last
+    installed_path = gem_spec.full_gem_path
+    ENV["NO_MAKE"] = "yes"
+    ruby("-rubygems", "#{installed_path}/test/run-test.rb")
+  end
+end
+
+task :default => :test

data/doc/text/news.textile

@@ -1,14 +1,22 @@
 h1. NEWS
 
+h2(#3-0-6). 3.0.6: 2013-09-13
+
+h3. Improvements
+
+* Supported accessing reference column that referes a table that uses
+  Int8/UInt8/Int16/UInt16 key.
+
 h2(#3-0-5). 3.0.5: 2013-07-29
 
 h3. Improvements
 
-* [dumper] supported dumping of DoubleArrayTrie
+* [dumper] supported dumping of DoubleArrayTrie.
 * Supported Int8/UInt8/Int16/UInt16 to Ruby conversion.
   [groonga-dev,01524][Reported by Masaharu YOSHIOKA]
 * Added memory pool mechanism to reduce GC easily.
-  Context#push_memory_pool and Context#pop_memory_pool are added.
+  {Groonga::Context#push_memory_pool} and {Groonga::Context#pop_memory_pool}
+  are added.
   You can close temporary table objects automatically:
   <pre>
   context.push_memory_pool do

data/doc/text/tutorial.textile

@@ -26,8 +26,6 @@ Now you use UTF-8 as the encoding of database.
 
 <pre>
 !!!irb
->> $KCODE = "UTF-8"
-=> "UTF-8"
 >> Groonga::Context.default_options = {:encoding => :utf8}
 => {:encoding=>:utf8}
 </pre>

data/ext/groonga/extconf.rb

@@ -231,7 +231,13 @@ end
 
 unless PKGConfig.have_package(package_name, major, minor, micro)
   unless have_local_groonga?(package_name, major, minor, micro)
-    install_groonga_locally(major, minor, micro)
+    required_version = [major, minor, micro]
+    if (required_version <=> LatestGroongaVersion::VERSISON) > 0
+      target_version = LatestGroongaVersion::VERSISON
+    else
+      target_version = required_version
+    end
+    install_groonga_locally(*target_version)
   end
   unless PKGConfig.have_package(package_name, major, minor, micro)
     exit(false)

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

@@ -26,7 +26,7 @@ grn_obj *
 rb_grn_accessor_from_ruby_object (VALUE object)
 {
     if (!RVAL2CBOOL(rb_obj_is_kind_of(object, rb_cGrnAccessor))) {
-	rb_raise(rb_eTypeError, "not a groonga accessor");
+        rb_raise(rb_eTypeError, "not a groonga accessor");
     }
 
     return RVAL2GRNOBJECT(object, NULL);
@@ -34,14 +34,14 @@ rb_grn_accessor_from_ruby_object (VALUE object)
 
 VALUE
 rb_grn_accessor_to_ruby_object (grn_ctx *context, grn_obj *table,
-				grn_bool owner)
+                                grn_bool owner)
 {
     return GRNOBJECT2RVAL(rb_cGrnAccessor, context, table, owner);
 }
 
 void
 rb_grn_accessor_bind (RbGrnAccessor *rb_accessor,
-		      grn_ctx *context, grn_obj *accessor)
+                      grn_ctx *context, grn_obj *accessor)
 {
     RbGrnObject *rb_grn_object;
     RbGrnNamedObject *rb_grn_named_object;
@@ -54,22 +54,22 @@ rb_grn_accessor_bind (RbGrnAccessor *rb_accessor,
 
     name_size = grn_column_name(context, accessor, name, sizeof(name));
     if (name_size > 0) {
-	rb_grn_named_object_set_name(rb_grn_named_object, name, name_size);
+        rb_grn_named_object_set_name(rb_grn_named_object, name, name_size);
     }
 
     rb_accessor->value = grn_obj_open(context, GRN_BULK, 0,
-				      rb_grn_object->range_id);
+                                      rb_grn_object->range_id);
 }
 
 
 void
 rb_grn_accessor_finalizer (grn_ctx *context, grn_obj *grn_object,
-			   RbGrnAccessor *rb_accessor)
+                           RbGrnAccessor *rb_accessor)
 {
     rb_grn_named_object_finalizer(context, grn_object,
-				  RB_GRN_NAMED_OBJECT(rb_accessor));
+                                  RB_GRN_NAMED_OBJECT(rb_accessor));
     if (context && rb_accessor->value)
-	grn_obj_unlink(context, rb_accessor->value);
+        grn_obj_unlink(context, rb_accessor->value);
     rb_accessor->value = NULL;
 }
 
@@ -93,10 +93,10 @@ rb_grn_accessor_get_local_name (VALUE self)
     rb_grn_accessor = SELF(self);
     rb_grn_named_object = RB_GRN_NAMED_OBJECT(rb_grn_accessor);
     if (rb_grn_named_object->name_size == 0)
-	return Qnil;
+        return Qnil;
 
     return rb_str_new(rb_grn_named_object->name,
-		      rb_grn_named_object->name_size);
+                      rb_grn_named_object->name_size);
 }
 
 /*
@@ -111,5 +111,5 @@ rb_grn_init_accessor (VALUE mGrn)
     rb_cGrnAccessor = rb_define_class_under(mGrn, "Accessor", rb_cGrnObject);
 
     rb_define_method(rb_cGrnAccessor, "local_name",
-		     rb_grn_accessor_get_local_name, 0);
+                     rb_grn_accessor_get_local_name, 0);
 }

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

@@ -98,40 +98,40 @@ rb_grn_array_s_create (int argc, VALUE *argv, VALUE klass)
     rb_scan_args(argc, argv, "01", &options);
 
     rb_grn_scan_options(options,
-			"context", &rb_context,
-			"name", &rb_name,
+                        "context", &rb_context,
+                        "name", &rb_name,
                         "path", &rb_path,
-			"persistent", &rb_persistent,
-			"value_type", &rb_value_type,
-			"sub_records", &rb_sub_records,
-			NULL);
+                        "persistent", &rb_persistent,
+                        "value_type", &rb_value_type,
+                        "sub_records", &rb_sub_records,
+                        NULL);
 
     context = rb_grn_context_ensure(&rb_context);
 
     if (!NIL_P(rb_name)) {
         name = StringValuePtr(rb_name);
-	name_size = RSTRING_LEN(rb_name);
-	flags |= GRN_OBJ_PERSISTENT;
+        name_size = RSTRING_LEN(rb_name);
+        flags |= GRN_OBJ_PERSISTENT;
     }
 
     if (!NIL_P(rb_path)) {
         path = StringValueCStr(rb_path);
-	flags |= GRN_OBJ_PERSISTENT;
+        flags |= GRN_OBJ_PERSISTENT;
     }
 
     if (RVAL2CBOOL(rb_persistent))
-	flags |= GRN_OBJ_PERSISTENT;
+        flags |= GRN_OBJ_PERSISTENT;
 
     if (!NIL_P(rb_value_type))
-	value_type = RVAL2GRNOBJECT(rb_value_type, &context);
+        value_type = RVAL2GRNOBJECT(rb_value_type, &context);
 
     if (RVAL2CBOOL(rb_sub_records))
-	flags |= GRN_OBJ_WITH_SUBREC;
+        flags |= GRN_OBJ_WITH_SUBREC;
 
     table = grn_table_create(context, name, name_size, path,
-			     flags, NULL, value_type);
+                             flags, NULL, value_type);
     if (!table)
-	rb_grn_context_check(context, rb_ary_new4(argc, argv));
+        rb_grn_context_check(context, rb_ary_new4(argc, argv));
     rb_table = GRNOBJECT2RVAL(klass, context, table, GRN_TRUE);
     rb_grn_context_check(context, rb_table);
     rb_iv_set(rb_table, "@context", rb_context);
@@ -186,9 +186,9 @@ rb_grn_array_add (int argc, VALUE *argv, VALUE self)
     rb_grn_context_check(context, self);
 
     if (GRN_ID_NIL == id) {
-	return Qnil;
+        return Qnil;
     } else {
-	return rb_grn_record_new_added(self, id, values);
+        return rb_grn_record_new_added(self, id, values);
     }
 }
 
@@ -207,9 +207,9 @@ yield_record (VALUE user_data)
     volatile VALUE record;
 
     if (data->id == GRN_ID_NIL) {
-	record = Qnil;
+        record = Qnil;
     } else {
-	record = rb_grn_record_new(data->self, data->id, Qnil);
+        record = rb_grn_record_new(data->self, data->id, Qnil);
     }
     data->record = record;
 
@@ -307,7 +307,7 @@ rb_grn_array_push (VALUE self)
     YieldRecordCallbackData data;
 
     if (!rb_block_given_p()) {
-	rb_raise(rb_eArgError,
+        rb_raise(rb_eArgError,
                  "tried to call Groonga::Array#push without a block");
     }
 
@@ -318,7 +318,7 @@ rb_grn_array_push (VALUE self)
     data.status = 0;
     grn_array_push(context, (grn_array *)table, yield_record_callback, &data);
     if (data.status != 0) {
-	rb_jump_tag(data.status);
+        rb_jump_tag(data.status);
     }
     rb_grn_context_check(context, self);
 
@@ -394,11 +394,11 @@ rb_grn_array_pull (int argc, VALUE *argv, VALUE self)
     rb_scan_args(argc, argv, "01", &options);
 
     rb_grn_scan_options(options,
-			"block?", &rb_block_p,
-			NULL);
+                        "block?", &rb_block_p,
+                        NULL);
 
     if (!rb_block_given_p()) {
-	rb_raise(rb_eArgError,
+        rb_raise(rb_eArgError,
                  "tried to call Groonga::Array#pull without a block");
     }
 
@@ -414,7 +414,7 @@ rb_grn_array_pull (int argc, VALUE *argv, VALUE self)
     grn_array_pull(context, (grn_array *)table, RVAL2CBOOL(rb_block_p),
                    yield_record_callback, &data);
     if (data.status != 0) {
-	rb_jump_tag(data.status);
+        rb_jump_tag(data.status);
     }
     rb_grn_context_check(context, self);
 
@@ -466,7 +466,7 @@ rb_grn_init_array (VALUE mGrn)
     rb_cGrnArray = rb_define_class_under(mGrn, "Array", rb_cGrnTable);
 
     rb_define_singleton_method(rb_cGrnArray, "create",
-			       rb_grn_array_s_create, -1);
+                               rb_grn_array_s_create, -1);
 
     rb_define_method(rb_cGrnArray, "add", rb_grn_array_add, -1);
     rb_define_method(rb_cGrnArray, "push", rb_grn_array_push, 0);