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

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

@@ -26,6 +26,7 @@ require 'rubygems/package_task'
 require 'yard'
 require 'jeweler'
 require 'rake/extensiontask'
+require 'packnga'
 
 if YAML.const_defined?(:ENGINE)
   begin
@@ -89,6 +90,7 @@ Jeweler::Tasks.new do |_spec|
                         "*.rb",
                         "example/*.rb",
                         "Rakefile",
+                        "Gemfile",
                         "ext/**/*"]
   spec.test_files = FileList["test/**/*.rb"]
 end
@@ -101,6 +103,28 @@ Gem::PackageTask.new(spec) do |pkg|
   pkg.need_tar_gz = true
 end
 
+document_task = Packnga::DocumentTask.new(spec) do |t|
+  t.yard do |yard_task|
+    yard_task.files += FileList["ext/**/*.c"]
+  end
+end
+
+namespace :reference do
+  namespace :publication do
+    task :keep_compatible do
+      File.open(document_task.htaccess, "a") do |file|
+        file.puts("Redirect permanent /#{spec.name}/text/TUTORIAL_ja_rdoc.html " +
+                  "#{spec.homepage}#{spec.name}/ja/file.tutorial.html")
+      end
+    end
+
+    task :generate => :keep_compatible
+  end
+end
+
+Packnga::ReleaseTask.new(spec) do |task|
+end
+
 module YARD
   module CodeObjects
     class Proxy
@@ -123,33 +147,6 @@ module YARD
   end
 end
 
-reference_base_dir = Pathname.new("doc/reference")
-doc_en_dir = reference_base_dir + "en"
-html_base_dir = Pathname.new("doc/html")
-html_reference_dir = html_base_dir + spec.name
-YARD::Rake::YardocTask.new do |task|
-  task.options += ["--title", spec.name]
-  # task.options += ["--charset", "UTF-8"]
-  task.options += ["--readme", "README.textile"]
-  task.options += ["--files", "doc/text/**/*"]
-  task.options += ["--output-dir", doc_en_dir.to_s]
-  task.options += ["--charset", "utf-8"]
-  task.files += FileList["ext/groonga/**/*.c"]
-  task.files += FileList["lib/**/*.rb"]
-end
-
-task :yard do
-  doc_en_dir.find do |path|
-    next if path.extname != ".html"
-    html = path.read
-    html = html.gsub(/<div id="footer">.+<\/div>/m,
-                     "<div id=\"footer\"></div>")
-    path.open("w") do |html_file|
-      html_file.print(html)
-    end
-  end
-end
-
 def windows?(platform=nil)
   platform ||= RUBY_PLATFORM
   platform =~ /mswin(?!ce)|mingw|cygwin|bccwin/
@@ -191,264 +188,6 @@ Rake::ExtensionTask.new("groonga", spec) do |ext|
   end
 end
 
-include ERB::Util
-
-def apply_template(content, paths, templates, language)
-  content = content.sub(/lang="en"/, "lang=\"#{language}\"")
-
-  title = nil
-  content = content.sub(/<title>(.+?)<\/title>/m) do
-    title = $1
-    templates[:head].result(binding)
-  end
-
-  content = content.sub(/<body(?:.*?)>/) do |body_start|
-    "#{body_start}\n#{templates[:header].result(binding)}\n"
-  end
-
-  content = content.sub(/<\/body/) do |body_end|
-    "\n#{templates[:footer].result(binding)}\n#{body_end}"
-  end
-
-  content
-end
-
-def erb_template(name)
-  file = File.join("doc/templates", "#{name}.html.erb")
-  template = File.read(file)
-  erb = ERB.new(template, nil, "-")
-  erb.filename = file
-  erb
-end
-
-def rsync_to_rubyforge(spec, source, destination, options={})
-  config = YAML.load(File.read(File.expand_path("~/.rubyforge/user-config.yml")))
-  host = "#{config["username"]}@rubyforge.org"
-
-  rsync_args = "-av --exclude '*.erb' --chmod=ug+w"
-  rsync_args << " --delete" if options[:delete]
-  remote_dir = "/var/www/gforge-projects/#{spec.rubyforge_project}/"
-  sh("rsync #{rsync_args} #{source} #{host}:#{remote_dir}#{destination}")
-end
-
-def rake(*arguments)
-  ruby($0, *arguments)
-end
-
-namespace :reference do
-  translate_languages = [:ja]
-  supported_languages = [:en, *translate_languages]
-  html_files = FileList[doc_en_dir + "**/*.html"].to_a
-
-  directory reference_base_dir.to_s
-  CLOBBER.include(reference_base_dir.to_s)
-
-  po_dir = "doc/po"
-  namespace :pot do
-    pot_file = "#{po_dir}/#{spec.name}.pot"
-
-    directory po_dir
-    file pot_file => ["po", *html_files] do |t|
-      sh("xml2po", "--keep-entities", "--output", t.name, *html_files)
-    end
-
-    desc "Generates pot file."
-    task :generate => pot_file
-  end
-
-  namespace :po do
-    translate_languages.each do |language|
-      namespace language do
-        po_file = "#{po_dir}/#{language}.po"
-
-        file po_file => html_files do |t|
-          sh("xml2po", "--keep-entities", "--update", t.name, *html_files)
-        end
-
-        desc "Updates po file for #{language}."
-        task :update => po_file
-      end
-    end
-
-    desc "Updates po files."
-    task :update do
-      ruby($0, "clobber")
-      ruby($0, "yard")
-      translate_languages.each do |language|
-        ruby($0, "reference:po:#{language}:update")
-      end
-    end
-  end
-
-  namespace :translate do
-    translate_languages.each do |language|
-      po_file = "#{po_dir}/#{language}.po"
-      translate_doc_dir = "#{reference_base_dir}/#{language}"
-
-      desc "Translates documents to #{language}."
-      task language => [po_file, reference_base_dir, *html_files] do
-        doc_en_dir.find do |path|
-          base_path = path.relative_path_from(doc_en_dir)
-          translated_path = "#{translate_doc_dir}/#{base_path}"
-          if path.directory?
-            mkdir_p(translated_path)
-            next
-          end
-          case path.extname
-          when ".html"
-            sh("xml2po --keep-entities " +
-               "--po-file #{po_file} --language #{language} " +
-               "#{path} > #{translated_path}")
-          else
-            cp(path.to_s, translated_path, :preserve => true)
-          end
-        end
-      end
-    end
-  end
-
-  translate_task_names = translate_languages.collect do |language|
-    "reference:translate:#{language}"
-  end
-  desc "Translates references."
-  task :translate => translate_task_names
-
-  desc "Generates references."
-  task :generate => [:yard, :translate]
-
-  namespace :publication do
-    task :prepare do
-      supported_languages.each do |language|
-        raw_reference_dir = reference_base_dir + language.to_s
-        prepared_reference_dir = html_reference_dir + language.to_s
-        rm_rf(prepared_reference_dir.to_s)
-        head = erb_template("head.#{language}")
-        header = erb_template("header.#{language}")
-        footer = erb_template("footer.#{language}")
-        raw_reference_dir.find do |path|
-          relative_path = path.relative_path_from(raw_reference_dir)
-          prepared_path = prepared_reference_dir + relative_path
-          if path.directory?
-            mkdir_p(prepared_path.to_s)
-          else
-            case path.basename.to_s
-            when /(?:file|method|class)_list\.html\z/
-              cp(path.to_s, prepared_path.to_s)
-            when /\.html\z/
-              relative_dir_path = relative_path.dirname
-              current_path = relative_dir_path + path.basename
-              if current_path.basename.to_s == "index.html"
-                current_path = current_path.dirname
-              end
-              top_path = html_base_dir.relative_path_from(prepared_path.dirname)
-              paths = {
-                :top => top_path,
-                :current => current_path,
-              }
-              templates = {
-                :head => head,
-                :header => header,
-                :footer => footer
-              }
-              content = apply_template(File.read(path.to_s),
-                                       paths,
-                                       templates,
-                                       language)
-              File.open(prepared_path.to_s, "w") do |file|
-                file.print(content)
-              end
-            else
-              cp(path.to_s, prepared_path.to_s)
-            end
-          end
-        end
-      end
-      File.open("#{html_reference_dir}/.htaccess", "w") do |file|
-        file.puts("Redirect permanent /#{spec.name}/text/TUTORIAL_ja_rdoc.html " +
-                  "#{spec.homepage}#{spec.name}/ja/file.tutorial.html")
-        file.puts("RedirectMatch permanent ^/#{spec.name}/$ " +
-                  "#{spec.homepage}#{spec.name}/en/")
-      end
-    end
-  end
-
-  desc "Upload document to rubyforge."
-  task :publish => [:generate, "reference:publication:prepare"] do
-    rsync_to_rubyforge(spec, "#{html_reference_dir}/", spec.name)
-  end
-end
-
-namespace :html do
-  desc "Publish HTML to Web site."
-  task :publish do
-    rsync_to_rubyforge(spec, "#{html_base_dir}/", "")
-  end
-end
-
-desc "Upload document and HTML to rubyforge."
-task :publish => ["html:publish", "reference:publish"]
-
-desc "Tag the current revision."
-task :tag do
-  sh("git tag -a #{version} -m 'release #{version}!!!'")
-end
-
-namespace :release do
-  namespace :info do
-    desc "update version in index HTML."
-    task :update do
-      old_version = ENV["OLD_VERSION"]
-      old_release_date = ENV["OLD_RELEASE_DATE"]
-      new_release_date = ENV["RELEASE_DATE"] || Time.now.strftime("%Y-%m-%d")
-      new_version = ENV["VERSION"]
-
-      empty_options = []
-      empty_options << "OLD_VERSION" if old_version.nil?
-      empty_options << "OLD_RELEASE_DATE" if old_release_date.nil?
-
-      unless empty_options.empty?
-        raise ArgumentError, "Specify option(s) of #{empty_options.join(",")}."
-      end
-
-      indexes = ["doc/html/index.html", "doc/html/index.html.ja"]
-      indexes.each do |index|
-        content = replaced_content = File.read(index)
-        [[old_version, new_version],
-         [old_release_date, new_release_date]].each do |old, new|
-          replaced_content = replaced_content.gsub(/#{Regexp.escape(old)}/, new)
-          if /\./ =~ old
-            old_undnerscore = old.gsub(/\./, '-')
-            new_underscore = new.gsub(/\./, '-')
-            replaced_content =
-              replaced_content.gsub(/#{Regexp.escape(old_underscore)}/,
-                                    new_underscore)
-          end
-        end
-
-        next if replaced_content == content
-        File.open(index, "w") do |output|
-          output.print(replaced_content)
-        end
-      end
-    end
-  end
-
-  namespace :rubyforge do
-    desc "Upload tar.gz to RubyForge."
-    task :upload => "package" do
-      ruby("-S", "rubyforge",
-           "add_release",
-           spec.rubyforge_project,
-           spec.name,
-           spec.version.to_s,
-           "pkg/#{spec.name}-#{spec.version}.tar.gz")
-    end
-  end
-
-  desc "Release to RubyForge."
-  task :rubyforge => "release:rubyforge:upload"
-end
-
 namespace :test do
   task :install do
     gemspec_helper = Rake.application.jeweler.gemspec_helper

data/ext/groonga/extconf.rb

@@ -158,7 +158,9 @@ checking_for(checking_message("debug flag")) do
   debug
 end
 
-$INSTALLFILES ||= []
-$INSTALLFILES << ["../../lib/**/*.rb", "$(RUBYLIBDIR)", "../../lib"]
+if ENV["INSTALL_RB"] == "yes"
+  $INSTALLFILES ||= []
+  $INSTALLFILES << ["../../lib/**/*.rb", "$(RUBYLIBDIR)", "../../lib"]
+end
 
 create_makefile(module_name)

data/ext/groonga/rb-grn-array.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
@@ -192,10 +192,11 @@ rb_grn_array_add (int argc, VALUE *argv, VALUE self)
     id = grn_table_add(context, table, NULL, 0, NULL);
     rb_grn_context_check(context, self);
 
-    if (GRN_ID_NIL == id)
+    if (GRN_ID_NIL == id) {
 	return Qnil;
-    else
-	return rb_grn_record_new(self, id, values);
+    } else {
+	return rb_grn_record_new_added(self, id, values);
+    }
 }
 
 void

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

@@ -59,27 +59,12 @@ rb_grn_context_from_ruby_object (VALUE object)
     return rb_grn_context->context;
 }
 
-static void
-rb_grn_context_unlink_database (grn_ctx *context)
-{
-    grn_obj *database;
-
-    database = grn_ctx_db(context);
-    debug("context:database: %p:%p\n", context, database);
-    if (database && database->header.type == GRN_DB) {
-	debug("context:database: %p:%p: unlink\n", context, database);
-	grn_obj_unlink(context, database);
-    }
-    debug("context:database: %p:%p: done\n", context, database);
-}
-
 void
 rb_grn_context_fin (grn_ctx *context)
 {
     if (context->stat == GRN_CTX_FIN)
 	return;
 
-    rb_grn_context_unlink_database(context);
     grn_ctx_fin(context);
 }
 
@@ -122,8 +107,6 @@ rb_grn_context_finalizer (grn_ctx *context, int n_args, grn_obj **grn_objects,
 
     rb_grn_context->context = NULL;
 
-    rb_grn_context_unlink_database(context);
-
     debug("context-finalize: %p:%p:%p: done\n",
 	  context, rb_grn_context, rb_grn_context->context);
 
@@ -315,7 +298,7 @@ rb_grn_context_initialize (int argc, VALUE *argv, VALUE self)
 {
     RbGrnContext *rb_grn_context;
     grn_ctx *context;
-    int flags = 0;
+    int flags = GRN_CTX_PER_DB;
     VALUE options, default_options;
     VALUE rb_encoding;
 
@@ -369,10 +352,12 @@ rb_grn_context_close (VALUE self)
     RbGrnContext *rb_grn_context;
 
     context = SELF(self);
-    rc = grn_ctx_fin(context);
-    Data_Get_Struct(self, RbGrnContext, rb_grn_context);
-    rb_grn_context->context = NULL;
-    rb_grn_rc_check(rc, self);
+    if (context) {
+	rc = grn_ctx_fin(context);
+	Data_Get_Struct(self, RbGrnContext, rb_grn_context);
+	rb_grn_context->context = NULL;
+	rb_grn_rc_check(rc, self);
+    }
 
     return Qnil;
 }

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

@@ -195,7 +195,7 @@ rb_grn_database_s_create (int argc, VALUE *argv, VALUE klass)
 	grn_obj_unlink(context, old_database);
     database = grn_db_create(context, path, &create_args);
     rb_grn_context_check(context, rb_ary_new4(argc, argv));
-    rb_database = GRNOBJECT2RVAL(klass, context, database, GRN_TRUE);
+    rb_database = GRNOBJECT2RVAL(klass, context, database, GRN_FALSE);
     rb_iv_set(rb_database, "@context", rb_context);
     if (!NIL_P(rb_context))
 	rb_iv_set(rb_context, "database", rb_database);
@@ -504,6 +504,46 @@ rb_grn_database_touch (VALUE self)
     return Qnil;
 }
 
+/*
+ * Document-method: defrag
+ *
+ * call-seq:
+ *   database.defrag(options={}) -> n_segments
+ *
+ * Defrags all variable size columns in the database.
+ *
+ * @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_database_defrag (int argc, VALUE *argv, VALUE self)
+{
+    grn_ctx *context;
+    grn_obj *database;
+    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_database_deconstruct(SELF(self), &database, &context,
+				NULL, NULL, NULL, NULL);
+    n_segments = grn_obj_defrag(context, database, threshold);
+    rb_grn_context_check(context, self);
+
+    return INT2NUM(n_segments);
+}
+
 void
 rb_grn_init_database (VALUE mGrn)
 {
@@ -534,4 +574,5 @@ rb_grn_init_database (VALUE mGrn)
     rb_define_method(rb_cGrnDatabase, "locked?", rb_grn_database_is_locked, 0);
 
     rb_define_method(rb_cGrnDatabase, "touch", rb_grn_database_touch, 0);
+    rb_define_method(rb_cGrnDatabase, "defrag", rb_grn_database_defrag, -1);
 }

data/ext/groonga/rb-grn-index-column.c

@@ -276,6 +276,7 @@ resolve_source_id (grn_ctx *context, grn_obj *column, grn_id range_id,
 	source_id = NUM2UINT(rb_source);
     } else {
 	grn_obj *source;
+	grn_bool need_source_unlink = GRN_FALSE;
 
 	if (TYPE(rb_source) == T_STRING) {
 	    grn_obj *table;
@@ -304,6 +305,7 @@ resolve_source_id (grn_ctx *context, grn_obj *column, grn_id range_id,
 		name = dot_point + 1;
 	    }
 	    source = grn_obj_column(context, table, name, length);
+	    need_source_unlink = GRN_TRUE;
 	} else {
 	    source = RVAL2GRNOBJECT(rb_source, &context);
 	}
@@ -321,6 +323,9 @@ resolve_source_id (grn_ctx *context, grn_obj *column, grn_id range_id,
 	} else {
 	    source_id = grn_obj_id(context, source);
 	}
+	if (need_source_unlink) {
+	    grn_obj_unlink(context, source);
+	}
     }
 
     return source_id;