rroonga 2.0.4 → 2.0.5

data/lib/groonga/schema.rb

@@ -533,6 +533,7 @@ module Groonga
 	end
       end
 
+      # @private
       NORMALIZE_TYPE_TABLE = {
         "short_text" => "ShortText",
         "string" => "ShortText",
@@ -1118,37 +1119,32 @@ module Groonga
       #
       #   table.index("Users.name")
       #
-      # @param options [::Hash] The name and value
-      #   pairs. Omitted names are initialized as the default value.
-      # @option options :name The name
-      #
-      #   インデックスカラムのカラム名を任意に指定する。
-      # @option options :force The force
-      #
-      #   +true+ を指定すると既存の同名のカラムが
-      #   存在していても、強制的に新しいカラムを作成する。
-      # @option options :path The path
-      #
-      #   カラムを保存するパス。
-      # @option options :persistent The persistent
-      #
-      #   +true+ を指定すると永続カラムとなる。
-      #   +:path+ を省略した場合は自動的にパスが付加される。
-      # @option options :with_section The with_section
-      #
-      #   +true+ を指定すると転置索引にsection(段落情報)を
-      #   合わせて格納する。未指定または +nil+ を指定した場合、
-      #   複数のカラムを指定すると自動的に有効になる。
-      # @option options :with_weight The with_weight
-      #
-      #   +true+ を指定すると転置索引にweight情報を合わせて
-      #   格納する。
-      # @option options :with_position
-      #
-      #   +true+ を指定すると転置索引に出現位置情報を合わせて
-      #   格納する。未指定または +nil+ を指定した場合、テーブル
-      #   がN-gram系のトークナイザーを利用している場合は
-      #   自動的に有効になる。
+      # @param [Array] args
+      #   インデックスカラム作成時に指定できるオプション。
+      #   ハッシュを使って次の要素を指定することができる。
+      #
+      #   - :name :=
+      #     インデックスカラムのカラム名を任意に指定する。 =:
+      #   - :force :=
+      #     +true+ を指定すると既存の同名のカラムが
+      #     存在していても、強制的に新しいカラムを作成する。 =:
+      #   - :path :=
+      #     カラムを保存するパス。 =:
+      #   - :persistent :=
+      #     +true+ を指定すると永続カラムとなる。
+      #     +:path+ を省略した場合は自動的にパスが付加される。 =:
+      #   - :with_section :=
+      #     +true+ を指定すると転置索引にsection(段落情報)を
+      #     合わせて格納する。未指定または +nil+ を指定した場合、
+      #     複数のカラムを指定すると自動的に有効になる。 =:
+      #   - :with_weight :=
+      #     +true+ を指定すると転置索引にweight情報を合わせて
+      #     格納する。 =:
+      #   - :with_position :=
+      #     +true+ を指定すると転置索引に出現位置情報を合わせて
+      #     格納する。未指定または +nil+ を指定した場合、テーブル
+      #     がN-gram系のトークナイザーを利用している場合は
+      #     自動的に有効になる。 =:
       def index(target_table_or_target_column_full_name, *args)
         key, target_table, target_columns, options =
           parse_index_argument(target_table_or_target_column_full_name, *args)
@@ -1175,10 +1171,8 @@ module Groonga
       #
       #   table.remove_index("Users.name")
       #
-      # @param options [::Hash] The name and value
-      #   pairs. Omitted names are initialized as the default value.
-      # @option options :name The name
-      #   インデックスカラムのカラム名を任意に指定する。
+      # @param [::Hash] args { :name => target_column }と指定す
+      #   ることでインデックスカラムの任意のカラム名を指定することができる。
       def remove_index(target_table_or_target_column_full_name, *args)
         key, target_table, target_columns, options =
           parse_index_argument(target_table_or_target_column_full_name, *args)
@@ -1356,17 +1350,6 @@ module Groonga
       end
       alias_method :bool, :boolean
 
-      # Defines a 8 bit signed integer column named @name@.
-      #
-      # @param [String or Symbol] name the column name
-      # @param [Hash] options ({}) the options
-      # @see Groonga::Schema::TableDefinition#column for
-      #    available @options@.
-      def integer8(name, options={})
-        column(name, "Int8", options)
-      end
-      alias_method :int8, :integer8
-
       # Defines a geo point in Tokyo geodetic system column
       # named @name@.
       #

data/rroonga-build.rb

@@ -19,7 +19,7 @@ module RroongaBuild
   module RequiredGroongaVersion
     MAJOR = 2
     MINOR = 0
-    MICRO = 2
+    MICRO = 7
     VERSION = [MAJOR, MINOR, MICRO]
   end
 

data/rroonga.gemspec

@@ -0,0 +1,90 @@
+# -*- mode: ruby; coding: utf-8 -*-
+#
+# Copyright (C) 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
+
+base_dir = File.dirname(__FILE__)
+ext_dir = File.join(base_dir, "ext", "groonga")
+
+guess_version = lambda do |ext_dir|
+  version = {}
+  File.open(File.join(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
+
+clean_white_space = lambda do |entry|
+  entry.gsub(/(\A\n+|\n+\z)/, '') + "\n"
+end
+
+Gem::Specification.new do |s|
+  s.name = "rroonga"
+  s.version = guess_version.call(ext_dir)
+
+  authors_path = File.join(base_dir, "AUTHORS")
+  authors, emails = File.readlines(authors_path).collect do |line|
+    if /\s*<([^<>]*)>$/ =~ line
+      [$PREMATCH, $1]
+    else
+      nil
+    end
+  end.compact
+  s.authors = authors
+  s.email = emails
+
+  readme_path = File.join(base_dir, "README.textile")
+  entries = File.read(readme_path).split(/^h2\.\s(.*)$/)
+  description = clean_white_space.call(entries[entries.index("Description") + 1])
+  s.summary, s.description, = description.split(/\n\n+/, 3)
+
+  s.files = ["README.textile", "AUTHORS", "Rakefile", "Gemfile"]
+  s.files += ["#{s.name}.gemspec"]
+  s.files += ["rroonga-build.rb", "extconf.rb"]
+  Dir.chdir(base_dir) do
+    s.files += Dir.glob("{lib,benchmark,misc,example}/**/*.rb")
+    s.files += Dir.glob("ext/**/*.{c,h,rb,def}")
+    s.extensions = ["ext/groonga/extconf.rb"]
+    s.extra_rdoc_files = ["README.textile"]
+    s.test_files = Dir.glob("test/**/*.rb")
+    Dir.chdir("bin") do
+      s.executables = Dir.glob("*")
+    end
+  end
+
+  s.homepage = "http://groonga.rubyforge.org/#about-rroonga"
+  s.licenses = ["LGPLv2"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = "groonga"
+
+  s.add_runtime_dependency("pkg-config")
+  s.add_runtime_dependency("json")
+  s.add_runtime_dependency("archive-zip")
+  s.add_development_dependency("test-unit", [">= 2.4.6"])
+  s.add_development_dependency("test-unit-notify")
+  s.add_development_dependency("rake")
+  s.add_development_dependency("rake-compiler")
+  s.add_development_dependency("bundler")
+  s.add_development_dependency("yard")
+  # Use packnga 0.9.4 to release 2.0.5 only.
+  s.add_development_dependency("packnga", ["= 0.9.4"])
+  s.add_development_dependency("RedCloth")
+end
+

data/test/groonga-test-utils.rb

@@ -0,0 +1,168 @@
+# Copyright (C) 2009  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 'fileutils'
+require 'pathname'
+require 'time'
+require 'erb'
+require 'stringio'
+require 'json'
+require 'pkg-config'
+
+require 'groonga'
+
+module GroongaTestUtils
+  class << self
+    def included(base)
+      base.setup :setup_sandbox, :before => :prepend
+      base.teardown :teardown_sandbox, :after => :append
+    end
+  end
+
+  def setup_sandbox
+    setup_tmp_directory
+    setup_log_path
+
+    setup_tables_directory
+    setup_columns_directory
+
+    setup_encoding
+    setup_context
+  end
+
+  def setup_tmp_directory
+    @base_tmp_dir = Pathname(File.dirname(__FILE__)) + "tmp"
+    memory_file_system = "/dev/shm"
+    if File.exist?(memory_file_system)
+      FileUtils.mkdir_p(@base_tmp_dir.parent.to_s)
+      FileUtils.rm_f(@base_tmp_dir.to_s)
+      FileUtils.ln_s(memory_file_system, @base_tmp_dir.to_s)
+    else
+      FileUtils.mkdir_p(@base_tmp_dir.to_s)
+    end
+
+    @tmp_dir = @base_tmp_dir + "rroonga"
+    FileUtils.rm_rf(@tmp_dir.to_s)
+    FileUtils.mkdir_p(@tmp_dir.to_s)
+  end
+
+  def setup_log_path
+    @dump_log = false
+    Groonga::Logger.log_path = (@tmp_dir + "groonga.log").to_s
+    Groonga::Logger.query_log_path = (@tmp_dir + "groonga-query.log").to_s
+  end
+
+  def setup_tables_directory
+    @tables_dir = @tmp_dir + "tables"
+    FileUtils.mkdir_p(@tables_dir.to_s)
+  end
+
+  def setup_columns_directory
+    @columns_dir = @tmp_dir + "columns"
+    FileUtils.mkdir_p(@columns_dir.to_s)
+  end
+
+  def setup_encoding
+    Groonga::Encoding.default = nil
+  end
+
+  def setup_context
+    Groonga::Context.default = nil
+    Groonga::Context.default_options = nil
+  end
+
+  def context
+    Groonga::Context.default
+  end
+
+  def encoding
+    Groonga::Encoding.default
+  end
+
+  def setup_logger
+    Groonga::Logger.register(:level => :dump) do |level, time, title, message, location|
+      p [level, time, title, message, location]
+    end
+  end
+
+  def setup_database
+    @database_path = @tmp_dir + "database"
+    @database = Groonga::Database.create(:path => @database_path.to_s)
+  end
+
+  def teardown_sandbox
+    @database = nil
+    Groonga::Context.default.close
+    Groonga::Context.default = nil
+    GC.start
+    teardown_log_path
+    teardown_tmp_directory
+  end
+
+  def teardown_log_path
+    return unless @dump_log
+    log_path = Groonga::Logger.log_path
+    query_log_path = Groonga::Logger.query_log_path
+    if File.exist?(log_path)
+      header = "--- log: #{log_path} ---"
+      puts(header)
+      puts(File.read(log_path))
+      puts("-" * header.length)
+    end
+    if File.exist?(query_log_path)
+      header = "--- query log: #{query_log_path} ---"
+      puts(header)
+      puts(File.read(query_log_path))
+      puts("-" * header.length)
+    end
+  end
+
+  def teardown_tmp_directory
+    FileUtils.rm_rf(@tmp_dir.to_s)
+    FileUtils.rm_rf(@base_tmp_dir.to_s)
+  end
+
+  private
+  def assert_equal_select_result(expected, actual, &normalizer)
+    normalizer ||= Proc.new {|record| record.key}
+    assert_equal(expected,
+                 actual.collect(&normalizer),
+                 actual.expression.inspect)
+  end
+
+  def ruby19?
+    RUBY_VERSION >= "1.9"
+  end
+
+  def only_ruby19
+    omit("Ruby 1.9 is needed.") unless ruby19?
+  end
+
+  def support_self_recursive_equal?
+    self_recursive_hash1 = {}
+    self_recursive_hash1["next"] = self_recursive_hash1
+    self_recursive_hash2 = {}
+    self_recursive_hash2["next"] = self_recursive_hash2
+    self_recursive_hash1 == self_recursive_hash2
+  end
+
+  def need_self_recursive_equal
+    omit("self recursive equal is needed.") unless support_self_recursive_equal?
+  end
+
+  def need_encoding
+    omit("Encoding is needed.") unless defined?(::Encoding)
+  end
+end

data/test/run-test.rb

@@ -0,0 +1,60 @@
+#!/usr/bin/env ruby
+#
+# Copyright (C) 2009-2010  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
+
+$VERBOSE = true
+
+$KCODE = "u" if RUBY_VERSION < "1.9"
+
+base_dir = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+ext_dir = File.join(base_dir, "ext", "groonga")
+lib_dir = File.join(base_dir, "lib")
+test_dir = File.join(base_dir, "test")
+
+make = nil
+if ENV["NO_MAKE"] != "yes"
+  if system("which gmake > /dev/null")
+    make = "gmake"
+  elsif system("which make > /dev/null")
+    make = "make"
+  end
+end
+if make
+  system("cd #{base_dir.dump} && #{make} > /dev/null") or exit(false)
+end
+
+require "test-unit"
+require "test/unit/notify"
+
+Test::Unit::Priority.enable
+
+$LOAD_PATH.unshift(ext_dir)
+$LOAD_PATH.unshift(lib_dir)
+$LOAD_PATH.unshift(base_dir)
+
+$LOAD_PATH.unshift(test_dir)
+require 'groonga-test-utils'
+
+pkg_config = File.join(base_dir, "vendor", "local", "lib", "pkgconfig")
+PKGConfig.add_path(pkg_config)
+
+Dir.glob("#{base_dir}/test/**/test{_,-}*.rb") do |file|
+  require file.sub(/\.rb$/, '')
+end
+
+ENV["TEST_UNIT_MAX_DIFF_TARGET_STRING_SIZE"] ||= "5000"
+
+exit Test::Unit::AutoRunner.run

data/test/test-accessor.rb

@@ -0,0 +1,36 @@
+# 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
+
+class AccessorTest < Test::Unit::TestCase
+  include GroongaTestUtils
+
+  def setup
+    setup_database
+    @posts = Groonga::Hash.create(:name => "Posts", :key_type => "ShortText")
+    @id = @posts.column("_id")
+  end
+
+  def teardown
+    @id = nil
+  end
+
+  def test_name
+    assert_nil(@id.name)
+  end
+
+  def test_local_name
+    assert_equal("_id", @id.local_name)
+  end
+end