rroonga 1.2.4 → 1.2.5

data/Rakefile

@@ -22,6 +22,7 @@ require 'fileutils'
 require 'pathname'
 require 'erb'
 require 'rubygems'
+require 'rubygems/package_task'
 require 'yard'
 require 'jeweler'
 require 'rake/extensiontask'
@@ -59,12 +60,12 @@ def cleanup_white_space(entry)
 end
 
 ENV["VERSION"] ||= guess_version(groonga_ext_dir)
-version = ENV["VERSION"]
+version = ENV["VERSION"].dup
 spec = nil
 Jeweler::Tasks.new do |_spec|
   spec = _spec
   spec.name = "rroonga"
-  spec.version = version.dup
+  spec.version = version
   spec.rubyforge_project = "groonga"
   spec.homepage = "http://groonga.rubyforge.org/"
   authors = File.join(base_dir, "AUTHORS")
@@ -92,9 +93,14 @@ Jeweler::Tasks.new do |_spec|
   spec.test_files = FileList["test/**/*.rb"]
 end
 
+Rake::Task["release"].prerequisites.clear
 Jeweler::RubygemsDotOrgTasks.new do
 end
 
+Gem::PackageTask.new(spec) do |pkg|
+  pkg.need_tar_gz = true
+end
+
 module YARD
   module CodeObjects
     class Proxy
@@ -117,10 +123,12 @@ module YARD
   end
 end
 
-reference_base_dir = Pathname.new("doc/html")
+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} - #{version}"]
+  task.options += ["--title", spec.name]
   # task.options += ["--charset", "UTF-8"]
   task.options += ["--readme", "README.textile"]
   task.options += ["--files", "doc/text/**/*"]
@@ -185,31 +193,28 @@ end
 
 include ERB::Util
 
-def apply_template(file, top_path, current_page, head, header, footer, language)
-  content = File.read(file)
-  content = content.sub(/lang="en"/, 'lang="#{language}"')
+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
-    head.result(binding)
+    templates[:head].result(binding)
   end
 
   content = content.sub(/<body(?:.*?)>/) do |body_start|
-    "#{body_start}\n#{header.result(binding)}\n"
+    "#{body_start}\n#{templates[:header].result(binding)}\n"
   end
 
   content = content.sub(/<\/body/) do |body_end|
-    "\n#{footer.result(binding)}\n#{body_end}"
+    "\n#{templates[:footer].result(binding)}\n#{body_end}"
   end
 
-  File.open(file, "w") do |file|
-    file.print(content)
-  end
+  content
 end
 
 def erb_template(name)
-  file = File.join("html", "#{name}.html.erb")
+  file = File.join("doc/templates", "#{name}.html.erb")
   template = File.read(file)
   erb = ERB.new(template, nil, "-")
   erb.filename = file
@@ -233,7 +238,7 @@ end
 namespace :reference do
   translate_languages = [:ja]
   supported_languages = [:en, *translate_languages]
-  html_files = FileList["doc/html/en/**/*.html"].to_a
+  html_files = FileList[doc_en_dir + "**/*.html"].to_a
 
   directory reference_base_dir.to_s
   CLOBBER.include(reference_base_dir.to_s)
@@ -314,50 +319,144 @@ namespace :reference do
   namespace :publication do
     task :prepare do
       supported_languages.each do |language|
-        doc_dir = Pathname.new("#{reference_base_dir}/#{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}")
-        doc_dir.find do |file|
-          case file.basename.to_s
-          when "_index.html", /\A(?:class|method|file)_list.html\z/
-            next
-          when /\.html\z/
-            relative_dir_path = file.relative_path_from(doc_dir).dirname
-            current_page = relative_dir_path + file.basename
-            top_path = doc_dir.relative_path_from(file.dirname).to_s
-            apply_template(file, top_path, current_page,
-                           head, header, 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("#{reference_base_dir}/.htaccess", "w") do |file|
-        file.puts("Redirect permanent /rroonga/text/TUTORIAL_ja_rdoc.html " +
-                  "http://groonga.rubyforge.org/rroonga/ja/file.tutorial.html")
-        file.puts("RedirectMatch permanent ^/rroonga/$ " +
-                  "http://groonga.rubyforge.org/rroonga/en/")
+      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, "#{reference_base_dir}/", spec.name,
-                       :delete => true)
+    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/", "")
+    rsync_to_rubyforge(spec, "#{html_base_dir}/", "")
   end
 end
 
 desc "Upload document and HTML to rubyforge."
-task :publish => ["reference:publish", "html:publish"]
+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
+    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

data/bin/grndump

@@ -24,6 +24,7 @@ require 'groonga'
 
 options = OpenStruct.new
 options.tables = []
+options.exclude_tables = []
 options.dump_schema = true
 options.dump_tables = true
 option_parser = OptionParser.new do |parser|
@@ -50,6 +51,18 @@ option_parser = OptionParser.new do |parser|
       options.tables << table
     end
   end
+
+  parser.on("--exclude-table=TABLE",
+            "don't dump TABLE.",
+            "use this option multiple to not dump multiple tables.",
+            "use /.../ as TABLE to match table name with regexp.") do |table|
+    case table
+    when /\A\/(.*)\/(i)?\z/
+      options.exclude_tables << Regexp.new($1, $2 == "i")
+    when
+      options.exclude_tables << table
+    end
+  end
 end
 args = option_parser.parse!(ARGV)
 
@@ -66,6 +79,7 @@ dumper_options = {
   :dump_schema => options.dump_schema,
   :dump_tables => options.dump_tables,
   :tables => options.tables,
+  :exclude_tables => options.exclude_tables,
 }
 database_dumper = Groonga::DatabaseDumper.new(dumper_options)
 database_dumper.dump

data/ext/groonga/Makefile

@@ -57,12 +57,12 @@ cflags   =  $(optflags) $(debugflags) $(warnflags)
 optflags = -O3
 debugflags = -ggdb
 warnflags = -Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-missing-field-initializers -Wno-long-long
-CFLAGS   = -fPIC -fno-strict-aliasing -g -g -O2 -fPIC -Wall -I/home/kou/work/ruby/rroonga/vendor/local/include/groonga 
+CFLAGS   = -fPIC -fno-strict-aliasing -g -g -O2 -fPIC -Wall -I/tmp/local/include/groonga 
 INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
 DEFS     = 
-CPPFLAGS = -DRB_GRN_COMPILATION -DGRN_MAJOR_VERSION=1 -DGRN_MINOR_VERSION=2 -DGRN_MICRO_VERSION=3 -DHAVE_RB_ERRINFO -DHAVE_TYPE_ENUM_RUBY_VALUE_TYPE  $(DEFS) $(cppflags)
+CPPFLAGS = -DRB_GRN_COMPILATION -DGRN_MAJOR_VERSION=1 -DGRN_MINOR_VERSION=2 -DGRN_MICRO_VERSION=1 -DHAVE_RB_ERRINFO -DHAVE_TYPE_ENUM_RUBY_VALUE_TYPE  $(DEFS) $(cppflags)
 CXXFLAGS = $(CFLAGS) -fno-strict-aliasing -g
-ldflags  = -L.  -rdynamic -Wl,-export-dynamic -L/home/kou/work/ruby/rroonga/vendor/local/lib
+ldflags  = -L.  -rdynamic -Wl,-export-dynamic -L/tmp/local/lib
 dldflags = 
 ARCH_FLAG = 
 DLDFLAGS = $(ldflags) $(dldflags)
@@ -105,8 +105,8 @@ extout_prefix =
 target_prefix = 
 LOCAL_LIBS = 
 LIBS = $(LIBRUBYARG_SHARED)  -lgroonga -lpthread -lrt -ldl -lcrypt -lm   -lc
-SRCS = rb-grn-procedure.c rb-grn-column.c rb-grn-index-column.c rb-grn-encoding-support.c rb-grn-variable.c rb-grn-table.c rb-grn-hash-cursor.c rb-grn-table-cursor-key-support.c rb-grn-object.c rb-grn-view-accessor.c rb-grn-table-key-support.c rb-grn-array.c rb-grn-patricia-trie.c rb-grn-utils.c rb-grn-record.c rb-grn-query.c rb-groonga.c rb-grn-exception.c rb-grn-variable-size-column.c rb-grn-encoding.c rb-grn-expression-builder.c rb-grn-operator.c rb-grn-snippet.c rb-grn-array-cursor.c rb-grn-type.c rb-grn-table-cursor.c rb-grn-fix-size-column.c rb-grn-view-cursor.c rb-grn-logger.c rb-grn-plugin.c rb-grn-database.c rb-grn-view-record.c rb-grn-patricia-trie-cursor.c rb-grn-index-cursor.c rb-grn-view.c rb-grn-accessor.c rb-grn-context.c rb-grn-posting.c rb-grn-expression.c rb-grn-hash.c
-OBJS = rb-grn-procedure.o rb-grn-column.o rb-grn-index-column.o rb-grn-encoding-support.o rb-grn-variable.o rb-grn-table.o rb-grn-hash-cursor.o rb-grn-table-cursor-key-support.o rb-grn-object.o rb-grn-view-accessor.o rb-grn-table-key-support.o rb-grn-array.o rb-grn-patricia-trie.o rb-grn-utils.o rb-grn-record.o rb-grn-query.o rb-groonga.o rb-grn-exception.o rb-grn-variable-size-column.o rb-grn-encoding.o rb-grn-expression-builder.o rb-grn-operator.o rb-grn-snippet.o rb-grn-array-cursor.o rb-grn-type.o rb-grn-table-cursor.o rb-grn-fix-size-column.o rb-grn-view-cursor.o rb-grn-logger.o rb-grn-plugin.o rb-grn-database.o rb-grn-view-record.o rb-grn-patricia-trie-cursor.o rb-grn-index-cursor.o rb-grn-view.o rb-grn-accessor.o rb-grn-context.o rb-grn-posting.o rb-grn-expression.o rb-grn-hash.o
+SRCS = rb-grn-exception.c rb-grn-view-accessor.c rb-grn-hash-cursor.c rb-grn-query.c rb-grn-record.c rb-grn-variable.c rb-grn-view.c rb-grn-table-cursor-key-support.c rb-grn-fix-size-column.c rb-grn-context.c rb-grn-plugin.c rb-grn-hash.c rb-grn-variable-size-column.c rb-grn-index-column.c rb-grn-operator.c rb-grn-table-key-support.c rb-grn-patricia-trie.c rb-grn-table-cursor.c rb-grn-object.c rb-grn-table.c rb-grn-procedure.c rb-grn-snippet.c rb-grn-encoding-support.c rb-grn-view-record.c rb-grn-patricia-trie-cursor.c rb-grn-array.c rb-grn-database.c rb-grn-view-cursor.c rb-grn-column.c rb-grn-index-cursor.c rb-grn-type.c rb-grn-accessor.c rb-grn-posting.c rb-groonga.c rb-grn-array-cursor.c rb-grn-utils.c rb-grn-logger.c rb-grn-expression.c rb-grn-encoding.c rb-grn-expression-builder.c
+OBJS = rb-grn-exception.o rb-grn-view-accessor.o rb-grn-hash-cursor.o rb-grn-query.o rb-grn-record.o rb-grn-variable.o rb-grn-view.o rb-grn-table-cursor-key-support.o rb-grn-fix-size-column.o rb-grn-context.o rb-grn-plugin.o rb-grn-hash.o rb-grn-variable-size-column.o rb-grn-index-column.o rb-grn-operator.o rb-grn-table-key-support.o rb-grn-patricia-trie.o rb-grn-table-cursor.o rb-grn-object.o rb-grn-table.o rb-grn-procedure.o rb-grn-snippet.o rb-grn-encoding-support.o rb-grn-view-record.o rb-grn-patricia-trie-cursor.o rb-grn-array.o rb-grn-database.o rb-grn-view-cursor.o rb-grn-column.o rb-grn-index-cursor.o rb-grn-type.o rb-grn-accessor.o rb-grn-posting.o rb-groonga.o rb-grn-array-cursor.o rb-grn-utils.o rb-grn-logger.o rb-grn-expression.o rb-grn-encoding.o rb-grn-expression-builder.o
 TARGET = groonga
 DLLIB = $(TARGET).so
 EXTSTATIC = 
@@ -154,54 +154,54 @@ install-rb: pre-install-rb install-rb-default
 install-rb-default: pre-install-rb-default
 pre-install-rb: Makefile
 pre-install-rb-default: Makefile
-pre-install-rb: $(RUBYLIBDIR)/groonga
-install-rb: $(RUBYLIBDIR)/groonga/schema.rb
-$(RUBYLIBDIR)/groonga/schema.rb: $(srcdir)/../../lib/groonga/schema.rb
+pre-install-rb: $(RUBYLIBDIR)
+install-rb: $(RUBYLIBDIR)/groonga.rb
+$(RUBYLIBDIR)/groonga.rb: $(srcdir)/../../lib/groonga.rb
 	@-$(MAKEDIRS) $(@D)
-	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/schema.rb $(@D)
-install-rb: $(RUBYLIBDIR)/groonga/pagination.rb
-$(RUBYLIBDIR)/groonga/pagination.rb: $(srcdir)/../../lib/groonga/pagination.rb
+	$(INSTALL_DATA) $(srcdir)/../../lib/groonga.rb $(@D)
+pre-install-rb: $(RUBYLIBDIR)/groonga
+install-rb: $(RUBYLIBDIR)/groonga/record.rb
+$(RUBYLIBDIR)/groonga/record.rb: $(srcdir)/../../lib/groonga/record.rb
 	@-$(MAKEDIRS) $(@D)
-	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/pagination.rb $(@D)
+	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/record.rb $(@D)
 install-rb: $(RUBYLIBDIR)/groonga/view-record.rb
 $(RUBYLIBDIR)/groonga/view-record.rb: $(srcdir)/../../lib/groonga/view-record.rb
 	@-$(MAKEDIRS) $(@D)
 	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/view-record.rb $(@D)
-install-rb: $(RUBYLIBDIR)/groonga/patricia-trie.rb
-$(RUBYLIBDIR)/groonga/patricia-trie.rb: $(srcdir)/../../lib/groonga/patricia-trie.rb
+install-rb: $(RUBYLIBDIR)/groonga/context.rb
+$(RUBYLIBDIR)/groonga/context.rb: $(srcdir)/../../lib/groonga/context.rb
 	@-$(MAKEDIRS) $(@D)
-	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/patricia-trie.rb $(@D)
-install-rb: $(RUBYLIBDIR)/groonga/dumper.rb
-$(RUBYLIBDIR)/groonga/dumper.rb: $(srcdir)/../../lib/groonga/dumper.rb
+	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/context.rb $(@D)
+install-rb: $(RUBYLIBDIR)/groonga/pagination.rb
+$(RUBYLIBDIR)/groonga/pagination.rb: $(srcdir)/../../lib/groonga/pagination.rb
 	@-$(MAKEDIRS) $(@D)
-	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/dumper.rb $(@D)
+	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/pagination.rb $(@D)
+install-rb: $(RUBYLIBDIR)/groonga/schema.rb
+$(RUBYLIBDIR)/groonga/schema.rb: $(srcdir)/../../lib/groonga/schema.rb
+	@-$(MAKEDIRS) $(@D)
+	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/schema.rb $(@D)
 install-rb: $(RUBYLIBDIR)/groonga/posting.rb
 $(RUBYLIBDIR)/groonga/posting.rb: $(srcdir)/../../lib/groonga/posting.rb
 	@-$(MAKEDIRS) $(@D)
 	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/posting.rb $(@D)
-install-rb: $(RUBYLIBDIR)/groonga/context.rb
-$(RUBYLIBDIR)/groonga/context.rb: $(srcdir)/../../lib/groonga/context.rb
-	@-$(MAKEDIRS) $(@D)
-	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/context.rb $(@D)
-install-rb: $(RUBYLIBDIR)/groonga/record.rb
-$(RUBYLIBDIR)/groonga/record.rb: $(srcdir)/../../lib/groonga/record.rb
+install-rb: $(RUBYLIBDIR)/groonga/patricia-trie.rb
+$(RUBYLIBDIR)/groonga/patricia-trie.rb: $(srcdir)/../../lib/groonga/patricia-trie.rb
 	@-$(MAKEDIRS) $(@D)
-	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/record.rb $(@D)
+	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/patricia-trie.rb $(@D)
 install-rb: $(RUBYLIBDIR)/groonga/expression-builder.rb
 $(RUBYLIBDIR)/groonga/expression-builder.rb: $(srcdir)/../../lib/groonga/expression-builder.rb
 	@-$(MAKEDIRS) $(@D)
 	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/expression-builder.rb $(@D)
-pre-install-rb: $(RUBYLIBDIR)
-install-rb: $(RUBYLIBDIR)/groonga.rb
-$(RUBYLIBDIR)/groonga.rb: $(srcdir)/../../lib/groonga.rb
+install-rb: $(RUBYLIBDIR)/groonga/dumper.rb
+$(RUBYLIBDIR)/groonga/dumper.rb: $(srcdir)/../../lib/groonga/dumper.rb
 	@-$(MAKEDIRS) $(@D)
-	$(INSTALL_DATA) $(srcdir)/../../lib/groonga.rb $(@D)
+	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/dumper.rb $(@D)
 $(RUBYARCHDIR):
 	$(MAKEDIRS) $@
-$(RUBYLIBDIR)/groonga:
-	$(MAKEDIRS) $@
 $(RUBYLIBDIR):
 	$(MAKEDIRS) $@
+$(RUBYLIBDIR)/groonga:
+	$(MAKEDIRS) $@
 
 site-install: site-install-so site-install-rb
 site-install-so: install-so

data/ext/groonga/extconf.rb

@@ -130,10 +130,9 @@ unless PKGConfig.have_package(package_name, major, minor, micro)
   unless have_local_groonga?(package_name, major, minor, micro)
     install_groonga_locally(major, minor, micro)
   end
-end
-
-unless PKGConfig.have_package(package_name, major, minor, micro)
-  have_local_groonga?(package_name, major, minor, micro) or exit 1
+  unless PKGConfig.have_package(package_name, major, minor, micro)
+    exit(false)
+  end
   add_rpath_for_local_groonga
 end
 

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

@@ -53,6 +53,9 @@ rb_grn_context_from_ruby_object (VALUE object)
     Data_Get_Struct(object, RbGrnContext, rb_grn_context);
     if (!rb_grn_context)
 	rb_raise(rb_eGrnError, "groonga context is NULL");
+    if (!rb_grn_context->context)
+	rb_raise(rb_eGrnClosed,
+		 "can't access already closed groonga context");
     return rb_grn_context->context;
 }
 
@@ -88,7 +91,7 @@ rb_grn_context_free (void *pointer)
 
     context = rb_grn_context->context;
     debug("context-free: %p\n", context);
-    if (!rb_grn_exited)
+    if (context && !rb_grn_exited)
 	rb_grn_context_fin(context);
     debug("context-free: %p: done\n", context);
     xfree(rb_grn_context);
@@ -332,7 +335,8 @@ rb_grn_context_initialize (int argc, VALUE *argv, VALUE self)
     rb_grn_context = ALLOC(RbGrnContext);
     DATA_PTR(self) = rb_grn_context;
     rb_grn_context->self = self;
-    context = rb_grn_context->context = grn_ctx_open(flags);
+    grn_ctx_init(&(rb_grn_context->context_entity), flags);
+    context = rb_grn_context->context = &(rb_grn_context->context_entity);
     rb_grn_context_check(context, self);
 
     GRN_CTX_USER_DATA(context)->ptr = rb_grn_context;
@@ -350,6 +354,45 @@ rb_grn_context_initialize (int argc, VALUE *argv, VALUE self)
     return Qnil;
 }
 
+/*
+ * call-seq:
+ *   context.close
+ *
+ * Closes the _context_. Closed _context_ can't be used
+ * anymore.
+ */
+static VALUE
+rb_grn_context_close (VALUE self)
+{
+    int rc;
+    grn_ctx *context;
+    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);
+
+    return Qnil;
+}
+
+/*
+ * call-seq:
+ *   context.closed?
+ *
+ * Returns whether the _context_ is closed by #close or not.
+ */
+static VALUE
+rb_grn_context_closed_p (VALUE self)
+{
+    RbGrnContext *rb_grn_context;
+
+    Data_Get_Struct(self, RbGrnContext, rb_grn_context);
+
+    return CBOOL2RVAL(rb_grn_context->context == NULL);
+}
+
 /*
  * call-seq:
  *   context.inspect -> String
@@ -763,6 +806,9 @@ rb_grn_init_context (VALUE mGrn)
 
     rb_define_method(cGrnContext, "initialize", rb_grn_context_initialize, -1);
 
+    rb_define_method(cGrnContext, "close", rb_grn_context_close, 0);
+    rb_define_method(cGrnContext, "closed?", rb_grn_context_closed_p, 0);
+
     rb_define_method(cGrnContext, "inspect", rb_grn_context_inspect, 0);
 
     rb_define_method(cGrnContext, "encoding", rb_grn_context_get_encoding, 0);

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

@@ -19,7 +19,7 @@
 #include "rb-grn.h"
 
 VALUE rb_eGrnError;
-VALUE rb_eGrnObjectClosed;
+VALUE rb_eGrnClosed;
 VALUE rb_eGrnNoSuchColumn;
 
 static VALUE eGrnEndOfData;
@@ -589,14 +589,25 @@ rb_grn_init_exception (VALUE mGrn)
     rb_eGrnError =
         rb_define_class_under(mGrn, "Error", rb_eStandardError);
 
+    /*
+     * Document-class: Groonga::Closed
+     *
+     * groongaレベルでは破棄されているが、Rubyレベルでは生き
+     * ているオブジェクトにアクセスすると発生する。
+     *
+     * @since 1.2.3
+     */
+    rb_eGrnClosed = rb_define_class_under(mGrn, "Closed", rb_eGrnError);
+
     /*
      * Document-class: Groonga::ObjectClosed
      *
      * groongaレベルでは破棄されているが、Rubyレベルでは生き
      * ているオブジェクトにアクセスすると発生する。
+     *
+     * @deprecated since 1.2.3. Use Groonga::Closed instead.
      */
-    rb_eGrnObjectClosed =
-        rb_define_class_under(mGrn, "ObjectClosed", rb_eGrnError);
+    rb_define_const(mGrn, "ObjectClosed", rb_eGrnClosed);
 
     /*
      * Document-class: Groonga::NoSuchColumn

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

@@ -464,7 +464,7 @@ rb_grn_object_deconstruct (RbGrnObject *rb_grn_object,
 	return;
 
     if (!rb_grn_object->object) {
-	rb_raise(rb_eGrnObjectClosed,
+	rb_raise(rb_eGrnClosed,
 		 "can't access already closed groonga object: %s",
 		 rb_grn_inspect(CLASS_OF(rb_grn_object->self)));
     }

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 4
+#define RB_GRN_MICRO_VERSION 5
 
 #define RB_GRN_QUERY_DEFAULT_MAX_EXPRESSIONS 32
 
@@ -93,6 +93,7 @@ typedef struct _RbGrnContext RbGrnContext;
 struct _RbGrnContext
 {
     grn_ctx *context;
+    grn_ctx context_entity;
     VALUE self;
 };
 
@@ -192,7 +193,7 @@ struct _RbGrnPlugin
 RB_GRN_VAR grn_bool rb_grn_exited;
 
 RB_GRN_VAR VALUE rb_eGrnError;
-RB_GRN_VAR VALUE rb_eGrnObjectClosed;
+RB_GRN_VAR VALUE rb_eGrnClosed;
 RB_GRN_VAR VALUE rb_eGrnNoSuchColumn;
 RB_GRN_VAR VALUE rb_eGrnInvalidArgument;
 RB_GRN_VAR VALUE rb_cGrnObject;

data/lib/groonga/dumper.rb

@@ -72,7 +72,8 @@ module Groonga
       options[:database].each(:order_by => :key) do |object|
         next unless object.is_a?(Groonga::Table)
         next if object.size.zero?
-        next unless target_table?(options[:tables], object)
+        next if target_table?(options[:exclude_tables], object, false)
+        next unless target_table?(options[:tables], object, true)
         options[:output].write("\n") if !first_table or options[:dump_schema]
         first_table = false
         dump_records(object, options)
@@ -93,8 +94,8 @@ module Groonga
       output.write("register #{plugin_name}\n")
     end
 
-    def target_table?(target_tables, table)
-      return true if target_tables.nil? or target_tables.empty?
+    def target_table?(target_tables, table, default_value)
+      return default_value if target_tables.nil? or target_tables.empty?
       target_tables.any? do |name|
         name === table.name
       end
@@ -278,7 +279,7 @@ module Groonga
         target_table_name = column.range.name
         sources = column.sources
         source_names = sources.collect do |source|
-          if source.is_a?(table.class)
+          if source.is_a?(Groonga::Table)
             "_key".dump
           else
             source.local_name.dump
@@ -393,7 +394,7 @@ module Groonga
         parameters << "#{flags.join('|')}"
         parameters << "#{column.range.name}"
         source_names = column.sources.collect do |source|
-          if source.is_a?(table.class)
+          if source.is_a?(Groonga::Table)
             "_key"
           else
             source.local_name

data/lib/groonga/schema.rb

@@ -1217,10 +1217,6 @@ module Groonga
         sub_records = options[:sub_records]
         sub_records = false if sub_records.nil?
         return false unless table.support_sub_records? == sub_records
-        path = options[:path]
-        if path and File.expand_path(table.path) != File.expand_path(path)
-          return false
-        end
 
         case table
         when Groonga::Array

data/test/test-context.rb

@@ -120,4 +120,11 @@ class ContextTest < Test::Unit::TestCase
     context.match_escalation_threshold = -1
     assert_equal(-1, context.match_escalation_threshold)
   end
+
+  def test_close
+    context = Groonga::Context.new
+    assert_false(context.closed?)
+    context.close
+    assert_true(context.closed?)
+  end
 end

data/test/test-database-dumper.rb

@@ -157,6 +157,66 @@ load --table Posts
 EOS
     end
 
+    def test_exclude_tables
+      dump_options = {
+        :exclude_tables => ["Posts"],
+      }
+      assert_equal(<<-EOS, dump(dump_options))
+#{dumped_schema.chomp}
+
+load --table Tags
+[
+["_key","name"],
+["search",""],
+["mori",""]
+]
+
+load --table Users
+[
+["_key","name"],
+["mori",""]
+]
+EOS
+    end
+
+    def test_exclude_tables_with_regexp
+      dump_options = {
+        :exclude_tables => [/Posts?/],
+      }
+      assert_equal(<<-EOS, dump(dump_options))
+#{dumped_schema.chomp}
+
+load --table Tags
+[
+["_key","name"],
+["search",""],
+["mori",""]
+]
+
+load --table Users
+[
+["_key","name"],
+["mori",""]
+]
+EOS
+    end
+
+    def test_tables_combination
+      dump_options = {
+        :exclude_tables => ["Posts"],
+        :tables => ["Posts", "Users"],
+      }
+      assert_equal(<<-EOS, dump(dump_options))
+#{dumped_schema.chomp}
+
+load --table Users
+[
+["_key","name"],
+["mori",""]
+]
+EOS
+    end
+
     def test_no_schema
       assert_equal(<<-EOS, dump(:dump_schema => false))
 load --table Posts

data/test/test-schema-create-table.rb

@@ -1,4 +1,4 @@
-# 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
@@ -99,28 +99,6 @@ module SchemaCreateTableTests
     end
   end
 
-  def test_same_path
-    path = (@tmp_dir + "posts.groonga").to_s
-    Groonga::Schema.create_table("Posts", options(:path => path)) do |table|
-    end
-
-    Groonga::Schema.create_table("Posts", options(:path => path)) do |table|
-    end
-    assert_equal(path, context["Posts"].path)
-  end
-
-  def test_different_path
-    path = (@tmp_dir + "posts.groonga").to_s
-    Groonga::Schema.create_table("Posts", options(:path => path)) do |table|
-    end
-
-    assert_raise(Groonga::Schema::TableCreationWithDifferentOptions) do
-      path = (@tmp_dir + "posts.grn").to_s
-      Groonga::Schema.create_table("Posts", options(:path => path)) do |table|
-      end
-    end
-  end
-
   def test_default_path
     Groonga::Schema.create_table("Posts", options) do |table|
     end

data/test/test-schema-dumper.rb

@@ -49,7 +49,7 @@ class SchemaDumperTest < Test::Unit::TestCase
   def define_index_schema
     Groonga::Schema.define do |schema|
       schema.create_table("Items",
-                          :type => :patricia_trie,
+                          :type => :hash,
                           :key_type => "ShortText") do |table|
         table.short_text("title")
       end
@@ -106,7 +106,7 @@ EOS
       define_index_schema
       assert_equal(<<-EOS, dump)
 create_table("Items",
-             :type => :patricia_trie,
+             :type => :hash,
              :key_type => "ShortText",
              :force => true) do |table|
   table.short_text("title")
@@ -163,7 +163,7 @@ EOS
     def test_index
       define_index_schema
       assert_equal(<<-EOS, dump)
-table_create Items TABLE_PAT_KEY --key_type ShortText
+table_create Items TABLE_HASH_KEY --key_type ShortText
 column_create Items title COLUMN_SCALAR ShortText
 
 table_create Terms TABLE_PAT_KEY|KEY_NORMALIZE --key_type ShortText --default_tokenizer TokenBigram

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rroonga
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 2
-  - 4
-  version: 1.2.4
+  - 5
+  version: 1.2.5
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-29 00:00:00 Z
+date: 2011-08-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -143,8 +143,6 @@ files:
 - benchmark/select.rb
 - benchmark/write-many-small-items.rb
 - bin/grndump
-- bug.rb
-- crash.rb
 - example/bookmark.rb
 - example/index-html.rb
 - ext/groonga/Makefile
@@ -206,52 +204,52 @@ files:
 - rroonga-build.rb
 - README.textile
 - TODO
-- test/groonga-test-utils.rb
-- test/run-test.rb
+- test/test-remote.rb
+- test/test-table-cursor.rb
 - test/test-accessor.rb
-- test/test-array.rb
-- test/test-column.rb
-- test/test-context-select.rb
-- test/test-context.rb
 - test/test-database-dumper.rb
-- test/test-database.rb
-- test/test-encoding.rb
-- test/test-exception.rb
-- test/test-expression-builder.rb
-- test/test-expression.rb
-- test/test-fix-size-column.rb
-- test/test-gqtp.rb
-- test/test-hash.rb
 - test/test-index-column.rb
-- test/test-index-cursor.rb
-- test/test-logger.rb
+- test/test-context-select.rb
+- test/groonga-test-utils.rb
 - test/test-pagination.rb
-- test/test-patricia-trie.rb
+- test/test-table.rb
+- test/test-variable-size-column.rb
 - test/test-plugin.rb
-- test/test-procedure.rb
-- test/test-query.rb
-- test/test-record.rb
-- test/test-remote.rb
+- test/test-hash.rb
+- test/test-encoding.rb
 - test/test-schema-create-table.rb
-- test/test-schema-dumper.rb
-- test/test-schema-type.rb
-- test/test-schema-view.rb
-- test/test-schema.rb
-- test/test-snippet.rb
-- test/test-table-cursor.rb
+- test/test-type.rb
+- test/test-database.rb
+- test/test-variable.rb
+- test/test-table-select.rb
+- test/test-patricia-trie.rb
+- test/test-expression-builder.rb
+- test/test-logger.rb
+- test/test-array.rb
+- test/test-record.rb
+- test/test-column.rb
+- test/test-fix-size-column.rb
+- test/run-test.rb
+- test/test-procedure.rb
 - test/test-table-dumper.rb
-- test/test-table-offset-and-limit.rb
+- test/test-schema.rb
+- test/test-view.rb
 - test/test-table-select-mecab.rb
 - test/test-table-select-normalize.rb
-- test/test-table-select-weight.rb
-- test/test-table-select.rb
-- test/test-table.rb
-- test/test-type.rb
-- test/test-variable-size-column.rb
-- test/test-variable.rb
+- test/test-expression.rb
 - test/test-vector-column.rb
 - test/test-version.rb
-- test/test-view.rb
+- test/test-schema-view.rb
+- test/test-index-cursor.rb
+- test/test-exception.rb
+- test/test-schema-dumper.rb
+- test/test-query.rb
+- test/test-schema-type.rb
+- test/test-table-select-weight.rb
+- test/test-gqtp.rb
+- test/test-context.rb
+- test/test-snippet.rb
+- test/test-table-offset-and-limit.rb
 homepage: http://groonga.rubyforge.org/
 licenses: 
 - LGPLv2
@@ -286,49 +284,49 @@ signing_key:
 specification_version: 3
 summary: Ruby bindings for groonga that provide full text search and column store features.
 test_files: 
-- test/groonga-test-utils.rb
-- test/run-test.rb
+- test/test-remote.rb
+- test/test-table-cursor.rb
 - test/test-accessor.rb
-- test/test-array.rb
-- test/test-column.rb
-- test/test-context-select.rb
-- test/test-context.rb
 - test/test-database-dumper.rb
-- test/test-database.rb
-- test/test-encoding.rb
-- test/test-exception.rb
-- test/test-expression-builder.rb
-- test/test-expression.rb
-- test/test-fix-size-column.rb
-- test/test-gqtp.rb
-- test/test-hash.rb
 - test/test-index-column.rb
-- test/test-index-cursor.rb
-- test/test-logger.rb
+- test/test-context-select.rb
+- test/groonga-test-utils.rb
 - test/test-pagination.rb
-- test/test-patricia-trie.rb
+- test/test-table.rb
+- test/test-variable-size-column.rb
 - test/test-plugin.rb
-- test/test-procedure.rb
-- test/test-query.rb
-- test/test-record.rb
-- test/test-remote.rb
+- test/test-hash.rb
+- test/test-encoding.rb
 - test/test-schema-create-table.rb
-- test/test-schema-dumper.rb
-- test/test-schema-type.rb
-- test/test-schema-view.rb
-- test/test-schema.rb
-- test/test-snippet.rb
-- test/test-table-cursor.rb
+- test/test-type.rb
+- test/test-database.rb
+- test/test-variable.rb
+- test/test-table-select.rb
+- test/test-patricia-trie.rb
+- test/test-expression-builder.rb
+- test/test-logger.rb
+- test/test-array.rb
+- test/test-record.rb
+- test/test-column.rb
+- test/test-fix-size-column.rb
+- test/run-test.rb
+- test/test-procedure.rb
 - test/test-table-dumper.rb
-- test/test-table-offset-and-limit.rb
+- test/test-schema.rb
+- test/test-view.rb
 - test/test-table-select-mecab.rb
 - test/test-table-select-normalize.rb
-- test/test-table-select-weight.rb
-- test/test-table-select.rb
-- test/test-table.rb
-- test/test-type.rb
-- test/test-variable-size-column.rb
-- test/test-variable.rb
+- test/test-expression.rb
 - test/test-vector-column.rb
 - test/test-version.rb
-- test/test-view.rb
+- test/test-schema-view.rb
+- test/test-index-cursor.rb
+- test/test-exception.rb
+- test/test-schema-dumper.rb
+- test/test-query.rb
+- test/test-schema-type.rb
+- test/test-table-select-weight.rb
+- test/test-gqtp.rb
+- test/test-context.rb
+- test/test-snippet.rb
+- test/test-table-offset-and-limit.rb

data/bug.rb

@@ -1,36 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'fileutils'
-require 'groonga'
-
-Groonga::Logger.log_path = "/tmp/groonga.log" 
-Groonga::Logger.query_log_path = "/tmp/groonga-query.log" 
-
-i = 0
-loop do
-  path = "/tmp/db/db" 
-  FileUtils.rm_rf(File.dirname(path))
-  FileUtils.mkdir_p(File.dirname(path))
-  Groonga::Context.default = nil
-  database = Groonga::Database.create(:path => path)
-  Groonga::Schema.define do |schema|
-    schema.create_table("Users",
-                        :type => :hash,
-                        :key_type => "ShortText") do |table|
-      table.uint32("name_length")
-    end
-  end
-
-  users = Groonga["Users"]
-  10.times do
-    i += 1
-    exit if i > 100
-    name = i.to_s
-    users.add(name, :name_length => name.length)
-  end
-  builder = Groonga::RecordExpressionBuilder.new(users, nil)
-  builder.query = "name_length:3" 
-  builder.build
-  database.close
-  GC.start
-end

data/crash.rb

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'groonga'
-
-context = Groonga::Context.default
-context.connect(:port => 10042)
-
-10000.times do |i|
-  p i
-  GC.stress = true
-  result = context.select("Program")
-  result.records.each do |record|
-    record["_key"]
-    record["unknown"]
-  end
-  GC.stress = false
-end