rroonga 2.0.2 → 2.0.3

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

@@ -17,15 +17,4 @@
 
 source "http://rubygems.org/"
 
-gem 'pkg-config'
-gem 'json'
-
-group :development, :test do
-  gem "test-unit", ">= 2.4.6"
-  gem "test-unit-notify"
-  gem "rake"
-  gem "rake-compiler"
-  gem "jeweler"
-  gem "yard"
-  gem "packnga"
-end
+gemspec

data/Rakefile

@@ -24,7 +24,7 @@ require 'erb'
 require 'rubygems'
 require 'rubygems/package_task'
 require 'yard'
-require 'jeweler'
+require 'bundler/gem_helper'
 require 'rake/extensiontask'
 require 'packnga'
 
@@ -43,62 +43,9 @@ $LOAD_PATH.unshift(groonga_ext_dir)
 $LOAD_PATH.unshift(groonga_lib_dir)
 ENV["RUBYLIB"] = "#{groonga_lib_dir}:#{groonga_ext_dir}:#{ENV['RUBYLIB']}"
 
-def guess_version(groonga_ext_dir)
-  version = {}
-  File.open(File.join(groonga_ext_dir, "rb-grn.h")) do |rb_grn_h|
-    rb_grn_h.each_line do |line|
-      case line
-      when /\A#define RB_GRN_([A-Z]+)_VERSION (\d+)/
-        version[$1.downcase] = $2
-      end
-    end
-  end
-  [version["major"], version["minor"], version["micro"]].join(".")
-end
-
-def cleanup_white_space(entry)
-  entry.gsub(/(\A\n+|\n+\z)/, '') + "\n"
-end
-
-ENV["VERSION"] ||= guess_version(groonga_ext_dir)
-version = ENV["VERSION"].dup
-spec = nil
-Jeweler::Tasks.new do |_spec|
-  spec = _spec
-  spec.name = "rroonga"
-  spec.version = version
-  spec.rubyforge_project = "groonga"
-  spec.homepage = "http://groonga.rubyforge.org/"
-  authors = File.join(base_dir, "AUTHORS")
-  spec.authors = File.readlines(authors).collect do |line|
-    if /\s*<[^<>]*>$/ =~ line
-      $PREMATCH
-    else
-      nil
-    end
-  end.compact
-  spec.email = [
-    'groonga-users-en@rubyforge.org',
-    'groonga-dev@lists.sourceforge.jp',
-  ]
-  entries = File.read("README.textile").split(/^h2\.\s(.*)$/)
-  description = cleanup_white_space(entries[entries.index("Description") + 1])
-  spec.summary, spec.description, = description.split(/\n\n+/, 3)
-  spec.license = "LGPLv2"
-  spec.files = FileList["{lib,benchmark,misc}/**/*.rb",
-                        "bin/*",
-                        "extconf.rb",
-                        "rroonga-build.rb",
-                        "example/*.rb",
-                        "Rakefile",
-                        "Gemfile",
-                        "ext/**/*.{c,h,rb,def}"]
-  spec.test_files = FileList["test/**/*.rb"]
-end
-
-Rake::Task["release"].prerequisites.clear
-Jeweler::RubygemsDotOrgTasks.new do
-end
+helper = Bundler::GemHelper.new(base_dir)
+helper.install
+spec = helper.gemspec
 
 Gem::PackageTask.new(spec) do |pkg|
   pkg.need_tar_gz = true

data/bin/grndump

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2011  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2011-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
@@ -27,6 +27,7 @@ options.tables = []
 options.exclude_tables = []
 options.dump_schema = true
 options.dump_tables = true
+options.order_by = "id"
 option_parser = OptionParser.new do |parser|
   parser.banner += " DB_PATH"
 
@@ -63,6 +64,14 @@ option_parser = OptionParser.new do |parser|
       options.exclude_tables << table
     end
   end
+
+  types = ["id", "key"]
+  parser.on("--order-by=TYPE", types,
+            "sort output recoreds by TYPE.",
+            "available TYPEs: #{types.join(', ')}",
+            "(#{options.type})") do |type|
+    options.order_by = type
+  end
 end
 args = option_parser.parse!(ARGV)
 
@@ -80,6 +89,7 @@ dumper_options = {
   :dump_tables => options.dump_tables,
   :tables => options.tables,
   :exclude_tables => options.exclude_tables,
+  :order_by => options.order_by,
 }
 database_dumper = Groonga::DatabaseDumper.new(dumper_options)
 database_dumper.dump

data/ext/groonga/extconf.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2009-2010  Kouhei Sutou <kou@clear-code.com>
+# 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
@@ -15,21 +15,24 @@
 # 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 'English'
-require 'pathname'
-require 'mkmf'
+require "English"
+require "pathname"
+require "mkmf"
+require "fileutils"
+require "shellwords"
+require "open-uri"
 
 begin
-  require 'pkg-config'
+  require "pkg-config"
 rescue LoadError
-  require 'rubygems'
-  require 'pkg-config'
+  require "rubygems"
+  require "pkg-config"
 end
 
-base_dir = Pathname(__FILE__).dirname.parent.parent
+base_dir = Pathname(__FILE__).dirname.parent.parent.expand_path
 $LOAD_PATH.unshift(base_dir.to_s)
 
-require 'rroonga-build'
+require "rroonga-build"
 
 include RroongaBuild
 
@@ -39,15 +42,19 @@ major, minor, micro = RequiredGroongaVersion::VERSION
 
 checking_for(checking_message("GCC")) do
   if macro_defined?("__GNUC__", "")
-    $CFLAGS += ' -Wall'
+    $CFLAGS += " -Wall"
     true
   else
     false
   end
 end
 
+def win32?
+  /cygwin|mingw|mswin/ =~ RUBY_PLATFORM
+end
+
 checking_for(checking_message("Win32 OS")) do
-  win32 = /cygwin|mingw|mswin/ =~ RUBY_PLATFORM
+  win32 = win32?
   if win32
     $defs << "-DRB_GRN_PLATFORM_WIN32"
     import_library_name = "libruby-#{module_name}.a"
@@ -62,68 +69,132 @@ checking_for(checking_message("Win32 OS")) do
 end
 
 def install_groonga_locally(major, minor, micro)
-  require 'open-uri'
-  require 'shellwords'
-
-  tar_gz = "groonga-#{major}.#{minor}.#{micro}.tar.gz"
   FileUtils.mkdir_p(local_groonga_base_dir)
 
-  install_dir = local_groonga_install_dir
   Dir.chdir(local_groonga_base_dir) do
-    url = "http://packages.groonga.org/source/groonga/#{tar_gz}"
-    message("downloading %s...", url)
+    if win32?
+      extract_groonga_win32_binary(major, minor, micro)
+    else
+      build_groonga(major, minor, micro)
+    end
+  end
+
+  prepend_pkg_config_path_for_local_groonga
+end
+
+def download(url)
+  message("downloading %s...", url)
+  base_name = File.basename(url)
+  if File.exist?(base_name)
+    message(" skip (use downloaded file)\n")
+  else
     open(url, "rb") do |input|
-      File.open(tar_gz, "wb") do |output|
+      File.open(base_name, "wb") do |output|
         while (buffer = input.read(1024))
           output.print(buffer)
         end
       end
     end
     message(" done\n")
+  end
+end
+
+def extract_zip(filename, destrination_dir)
+  begin
+    require "archive/zip"
+  rescue LoadError
+    require "rubygems"
+    require "archive/zip"
+  end
+
+  Archive::Zip.extract(filename, destrination_dir)
+end
+
+def extract_groonga_win32_binary(major, minor, micro)
+  if ENV["RROONGA_USE_GROONGA_X64"]
+    architecture = "x64"
+  else
+    architecture = "x86"
+  end
+  zip = "groonga-#{major}.#{minor}.#{micro}-#{architecture}.zip"
+  url = "http://packages.groonga.org/windows/groonga/#{zip}"
+  install_dir = local_groonga_install_dir
+
+  download(url)
+
+  message("extracting...")
+  extract_zip(zip, ".")
+  message(" done\n")
+
+  if File.exist?(install_dir)
+    message("remove old install... #{install_dir}")
+    FileUtils.rm_rf(install_dir)
+    message(" done\n")
+  end
+
+  message("install...")
+  FileUtils.mv(File.basename(zip, ".zip"), install_dir)
+  message(" done\n")
+end
+
+def configure_command_line(prefix)
+  command_line = ["./configure"]
+  debug_build_p = ENV["RROONGA_DEBUG_BUILD"] == "yes"
+  debug_flags = ["CFLAGS=-ggdb3 -O0", "CXXFLAGS=-ggdb3 -O0"]
+  command_line.concat(debug_flags) if debug_build_p
+  command_line << "--prefix=#{prefix}"
+  escaped_command_line = command_line.collect do |command|
+    Shellwords.escape(command)
+  end
+  escaped_command_line.join(" ")
+end
+
+def build_groonga(major, minor, micro)
+  tar_gz = "groonga-#{major}.#{minor}.#{micro}.tar.gz"
+  url = "http://packages.groonga.org/source/groonga/#{tar_gz}"
+  install_dir = local_groonga_install_dir
+
+  download(url)
+
+  message("extracting...")
+  if xsystem("tar xfz #{tar_gz}")
+    message(" done\n")
+  else
+    message(" failed\n")
+    exit(false)
+  end
 
-    message("extracting...")
-    if xsystem("tar xfz #{tar_gz}")
+  groonga_source_dir = "groonga-#{major}.#{minor}.#{micro}"
+  Dir.chdir(groonga_source_dir) do
+    message("configuring...")
+    if xsystem(configure_command_line(install_dir))
       message(" done\n")
     else
       message(" failed\n")
-      exit 1
+      exit(false)
     end
 
-    groonga_source_dir = "groonga-#{major}.#{minor}.#{micro}"
-    Dir.chdir(groonga_source_dir) do
-      message("configuring...")
-      prefix = Shellwords.escape(install_dir)
-      if xsystem("./configure CFLAGS='-g -O0' --prefix=#{prefix}")
-        message(" done\n")
-      else
-        message(" failed\n")
-        exit 1
-      end
-
-      message("building (maybe long time)...")
-      if xsystem("make")
-        message(" done\n")
-      else
-        message(" failed\n")
-        exit 1
-      end
+    message("building (maybe long time)...")
+    if xsystem("make")
+      message(" done\n")
+    else
+      message(" failed\n")
+      exit(false)
+    end
 
-      message("installing...")
-      if [major, minor, micro] == [0, 1, 6]
-        make_install_args = " MKDIR_P='mkdir -p --'"
-      else
-        make_install_args = ""
-      end
-      if xsystem("make install#{make_install_args}")
-        message(" done\n")
-      else
-        message(" failed\n")
-        exit 1
-      end
+    message("installing...")
+    if [major, minor, micro] == [0, 1, 6]
+      make_install_args = " MKDIR_P='mkdir -p --'"
+    else
+      make_install_args = ""
+    end
+    if xsystem("make install#{make_install_args}")
+      message(" done\n")
+    else
+      message(" failed\n")
+      exit(false)
     end
   end
-
-  prepend_pkg_config_path_for_local_groonga
 end
 
 unless PKGConfig.have_package(package_name, major, minor, micro)

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

@@ -66,9 +66,13 @@ rb_grn_context_register_floating_object (RbGrnObject *rb_grn_object)
     grn_ctx *context;
     grn_hash *floating_objects;
 
-    Data_Get_Struct(rb_grn_object->rb_context, RbGrnContext, rb_grn_context);
+    rb_grn_context = rb_grn_object->rb_grn_context;
     context = rb_grn_context->context;
     floating_objects = rb_grn_context->floating_objects;
+    if (!floating_objects) {
+	rb_grn_context_reset_floating_objects(rb_grn_context);
+	floating_objects = rb_grn_context->floating_objects;
+    }
     grn_hash_add(context, floating_objects,
 		 (const void *)(&rb_grn_object), sizeof(RbGrnObject *),
 		 NULL, NULL);
@@ -85,7 +89,10 @@ rb_grn_context_unregister_floating_object (RbGrnObject *rb_grn_object)
     if (!rb_grn_object->floating)
 	return;
 
-    Data_Get_Struct(rb_grn_object->rb_context, RbGrnContext, rb_grn_context);
+    rb_grn_context = rb_grn_object->rb_grn_context;
+    if (!rb_grn_context)
+	return;
+
     context = rb_grn_context->context;
     floating_objects = rb_grn_context->floating_objects;
     grn_hash_delete(context, floating_objects,
@@ -94,7 +101,7 @@ rb_grn_context_unregister_floating_object (RbGrnObject *rb_grn_object)
     rb_grn_object->floating = GRN_FALSE;
 }
 
-static void
+void
 rb_grn_context_close_floating_objects (RbGrnContext *rb_grn_context)
 {
     grn_ctx *context;
@@ -114,6 +121,19 @@ rb_grn_context_close_floating_objects (RbGrnContext *rb_grn_context)
     grn_hash_close(context, floating_objects);
 }
 
+void
+rb_grn_context_reset_floating_objects (RbGrnContext *rb_grn_context)
+{
+    grn_ctx *context;
+
+    rb_grn_context_close_floating_objects(rb_grn_context);
+    context = rb_grn_context->context;
+    rb_grn_context->floating_objects = grn_hash_create(context, NULL,
+						       sizeof(RbGrnObject *),
+						       0,
+						       GRN_OBJ_TABLE_HASH_KEY);
+}
+
 static void
 rb_grn_context_unlink_database (grn_ctx *context)
 {
@@ -421,10 +441,8 @@ rb_grn_context_initialize (int argc, VALUE *argv, VALUE self)
     rb_grn_context_check(context, self);
 
     GRN_CTX_USER_DATA(context)->ptr = rb_grn_context;
-    rb_grn_context->floating_objects = grn_hash_create(context, NULL,
-						       sizeof(RbGrnObject *),
-						       0,
-						       GRN_OBJ_TABLE_HASH_KEY);
+    rb_grn_context->floating_objects = NULL;
+    rb_grn_context_reset_floating_objects(rb_grn_context);
     grn_ctx_set_finalizer(context, rb_grn_context_finalizer);
 
     if (!NIL_P(rb_encoding)) {

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

@@ -119,6 +119,21 @@ rb_grn_database_deconstruct (RbGrnObject *rb_grn_database,
 			      range_id, range);
 }
 
+void
+rb_grn_database_finalizer (grn_ctx *context,
+			   RbGrnContext *rb_grn_context,
+			   grn_obj *column,
+			   RbGrnObject *rb_grn_database)
+{
+    if (rb_grn_context) {
+	rb_grn_context_close_floating_objects(rb_grn_context);
+    }
+
+    if (!(context->flags & GRN_CTX_PER_DB)) {
+	grn_ctx_use(context, NULL);
+    }
+}
+
 /*
  * Document-method: close
  *
@@ -140,6 +155,14 @@ rb_grn_database_close (VALUE self)
     return rb_grn_object_close(self);
 }
 
+static void
+reset_floating_objects (VALUE rb_context)
+{
+    RbGrnContext *rb_grn_context;
+    Data_Get_Struct(rb_context, RbGrnContext, rb_grn_context);
+    rb_grn_context_reset_floating_objects(rb_grn_context);
+}
+
 /*
  * call-seq:
  *   Groonga::Database.create(options=nil) -> Groonga::Database
@@ -195,6 +218,7 @@ rb_grn_database_s_create (int argc, VALUE *argv, VALUE klass)
     old_database = grn_ctx_db(context);
     if (old_database)
 	grn_obj_unlink(context, old_database);
+    reset_floating_objects(rb_context);
     database = grn_db_create(context, path, &create_args);
     rb_grn_context_check(context, rb_ary_new4(argc, argv));
     owner = (context->flags & GRN_CTX_PER_DB) ? GRN_FALSE : GRN_TRUE;
@@ -249,6 +273,7 @@ rb_grn_database_initialize (int argc, VALUE *argv, VALUE self)
     old_database = grn_ctx_db(context);
     if (old_database)
 	grn_obj_unlink(context, old_database);
+    reset_floating_objects(rb_context);
     database = grn_db_open(context, path);
     rb_grn_object_assign(Qnil, self, rb_context, context, database);
     rb_grn_context_check(context, self);