rroonga 1.0.1 → 1.0.2

data/rroonga-build.rb

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

data/test/run-test.rb

@@ -67,7 +67,7 @@ $LOAD_PATH.unshift(test_dir)
 require 'groonga-test-utils'
 
 pkg_config = File.join(base_dir, "vendor", "local", "lib", "pkgconfig")
-PackageConfig.prepend_default_path(pkg_config)
+PKGConfig.add_path(pkg_config)
 
 Dir.glob("#{base_dir}/test/**/test{_,-}*.rb") do |file|
   require file.sub(/\.rb$/, '')

data/test/test-array.rb

@@ -18,6 +18,10 @@ class ArrayTest < Test::Unit::TestCase
 
   setup :setup_database
 
+  def test_support_key?
+    assert_not_predicate(Groonga::Array.create(:name => "Users"), :support_key?)
+  end
+
   def test_inspect_size
     path = @tables_dir + "named.groonga"
     contain_table = Groonga::Array.create(:name => "name", :path => path.to_s)

data/test/test-context.rb

@@ -70,4 +70,12 @@ class ContextTest < Test::Unit::TestCase
     Groonga::Database.create
     assert_equal("ShortText", Groonga["ShortText"].name)
   end
+
+  def test_support_zlib?
+    assert_boolean(Groonga::Context.default.support_zlib?)
+  end
+
+  def test_support_lzo?
+    assert_boolean(Groonga::Context.default.support_lzo?)
+  end
 end

data/test/test-database.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009  Kouhei Sutou <kou@clear-code.com>
+# 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
@@ -110,4 +110,11 @@ class DatabaseTest < Test::Unit::TestCase
     database.clear_lock
     assert_not_predicate(database, :locked?)
   end
+
+  def test_touch
+    database = Groonga::Database.create
+    assert_nothing_raised do
+      database.touch
+    end
+  end
 end

data/test/test-expression-builder.rb

@@ -140,6 +140,20 @@ class ExpressionBuilderTest < Test::Unit::TestCase
                  result.collect {|record| record.key["uri"]})
   end
 
+  def test_record_id_object
+    morita = Object.new
+    morita_singleton_class = (class << morita; self; end)
+    morita_id = @morita.id
+    morita_singleton_class.send(:define_method, :record_id) do
+      morita_id
+    end
+    result = @bookmarks.select do |record|
+      record["user"] == morita
+    end
+    assert_equal(["http://groonga.org/", "http://ruby-lang.org/"],
+                 result.collect {|record| record.key["uri"]})
+  end
+
   def test_nested_column
     result = @bookmarks.select do |record|
       record[".user.name"] == @morita["name"]

data/test/test-fix-size-column.rb

@@ -32,6 +32,10 @@ class FixSizeColumnTest < Test::Unit::TestCase
                                        :path => @viewed_column_path.to_s)
   end
 
+  def test_index_column?
+    assert_not_predicate(@viewed, :index_column?)
+  end
+
   def test_inspect
     assert_equal("#<Groonga::FixSizeColumn " +
                  "id: <#{@viewed.id}>, " +

data/test/test-hash.rb

@@ -19,6 +19,12 @@ class HashTest < Test::Unit::TestCase
 
   setup :setup_database
 
+  def test_support_key?
+    assert_predicate(Groonga::Hash.create(:name => "Users",
+                                          :key_type => "ShortText"),
+                     :support_key?)
+  end
+
   def test_delete
     bookmarks_path = @tables_dir + "bookmarks"
     bookmarks = Groonga::Hash.create(:name => "Bookmarks",
@@ -77,7 +83,7 @@ class HashTest < Test::Unit::TestCase
                  "id: <#{anonymous_table.id}>, " +
                  "name: (anonymous), " +
                  "path: <#{path}>, " +
-                 "domain: (nil), " +
+                 "domain: <ShortText>, " +
                  "range: (nil), " +
                  "flags: <>, " +
                  "encoding: <#{encoding.inspect}>, " +
@@ -91,7 +97,7 @@ class HashTest < Test::Unit::TestCase
                  "id: <#{anonymous_table.id}>, " +
                  "name: (anonymous), " +
                  "path: (temporary), " +
-                 "domain: (nil), " +
+                 "domain: <ShortText>, " +
                  "range: (nil), " +
                  "flags: <>, " +
                  "encoding: <#{encoding.inspect}>, " +
@@ -106,7 +112,7 @@ class HashTest < Test::Unit::TestCase
                  "id: <#{named_table.id}>, " +
                  "name: <Users>, " +
                  "path: <#{path}>, " +
-                 "domain: (nil), " +
+                 "domain: <ShortText>, " +
                  "range: (nil), " +
                  "flags: <>, " +
                  "encoding: <#{encoding.inspect}>, " +
@@ -120,7 +126,7 @@ class HashTest < Test::Unit::TestCase
                  "id: <#{named_table.id}>, " +
                  "name: (anonymous), " +
                  "path: (temporary), " +
-                 "domain: (nil), " +
+                 "domain: <ShortText>, " +
                  "range: (nil), " +
                  "flags: <>, " +
                  "encoding: <#{encoding.inspect}>, " +

data/test/test-index-column.rb

@@ -22,6 +22,17 @@ class IndexColumnTest < Test::Unit::TestCase
     setup_database
   end
 
+  def test_index_column?
+    articles = Groonga::Array.create(:name => "Articles")
+    articles.define_column("content", "Text")
+
+    terms = Groonga::Hash.create(:name => "Terms",
+                                 :default_tokenizer => "TokenBigram")
+    content_index = terms.define_index_column("content", articles,
+                                              :with_section => true)
+    assert_predicate(content_index, :index_column?)
+  end
+
   def test_array_set_with_record
     articles = Groonga::Array.create(:name => "Articles")
     articles.define_column("content", "Text")

data/test/test-patricia-trie.rb

@@ -21,6 +21,12 @@ class PatriciaTrieTest < Test::Unit::TestCase
 
   setup :setup_database
 
+  def test_support_key?
+    assert_predicate(Groonga::PatriciaTrie.create(:name => "Users",
+                                                  :key_type => "ShortText"),
+                     :support_key?)
+  end
+
   def test_encoding
     assert_equal(Groonga::Encoding.default,
                  Groonga::PatriciaTrie.create.encoding)
@@ -57,7 +63,7 @@ class PatriciaTrieTest < Test::Unit::TestCase
 
   def test_add
     users = Groonga::PatriciaTrie.create(:name => "Users")
-    users.define_column("address", "<text>")
+    users.define_column("address", "Text")
     me = users.add("me", :address => "me@example.com")
     assert_equal("me@example.com", me[:address])
   end

data/test/test-record.rb

@@ -164,6 +164,13 @@ class RecordTest < Test::Unit::TestCase
     assert_true(bookmark.reference_column?("user"))
   end
 
+  def test_index_column?
+    bookmark = @bookmarks.add
+    assert_false(bookmark.index_column?("uri"))
+    index = @bookmarks_index.add("token")
+    assert_true(index.index_column?("content"))
+  end
+
   def test_score
     groonga = @bookmarks.add
     groonga["content"] = "full text search search search engine."
@@ -268,4 +275,11 @@ class RecordTest < Test::Unit::TestCase
     groonga = @bookmarks.add(:user => morita, :uri => "http://groonga.org")
     assert_equal("morita", groonga.user.key)
   end
+
+  def test_support_sub_records
+    morita = @users.add("morita")
+    assert_not_predicate(morita, :support_sub_records?)
+    users = @users.select {|record| record.key == "morita"}
+    assert_predicate(users.to_a[0], :support_sub_records?)
+  end
 end

data/test/test-remote.rb

@@ -47,8 +47,9 @@ class RemoteTest < Test::Unit::TestCase
     id, result = _context.receive
     assert_equal(0, id)
     values = JSON.load(result)
-    assert_equal(["alloc_count", "cache_hit_rate", "n_queries",
-                  "starttime", "uptime", "version"],
+    assert_equal(["alloc_count", "cache_hit_rate", "command_version",
+                  "default_command_version", "max_command_version",
+                  "n_queries", "starttime", "uptime", "version"],
                  values.keys.sort)
   end
 

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

@@ -87,7 +87,7 @@ module SchemaCreateTableTests
     assert_true(context["Posts"].support_sub_records?)
   end
 
-  def test_differnt_sub_records
+  def test_different_sub_records
     Groonga::Schema.create_table("Posts",
                                  options(:sub_records => true)) do |table|
     end
@@ -99,6 +99,35 @@ 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
+    assert_equal("#{@database_path}.tables/Posts",
+                 context["Posts"].path)
+  end
+
   private
   def options(addional_options={})
     default_options.merge(addional_options)
@@ -118,7 +147,8 @@ module SchemaCreateTableWithKeyTests
   end
 
   def test_differnt_key_type
-    Groonga::Schema.create_table("Posts", options) do |table|
+    Groonga::Schema.create_table("Posts",
+                                 options(:key_type => "Int32")) do |table|
     end
 
     assert_raise(Groonga::Schema::TableCreationWithDifferentOptions) do

data/test/test-schema.rb

@@ -28,7 +28,9 @@ class SchemaTest < Test::Unit::TestCase
   def test_define_hash
     Groonga::Schema.create_table("Posts", :type => :hash) do |table|
     end
-    assert_kind_of(Groonga::Hash, context["Posts"])
+    posts = context["Posts"]
+    assert_kind_of(Groonga::Hash, posts)
+    assert_equal("#{@database_path}.tables/Posts", posts.path)
   end
 
   def test_define_hash_with_full_option
@@ -58,7 +60,9 @@ class SchemaTest < Test::Unit::TestCase
   def test_define_patricia_trie
     Groonga::Schema.create_table("Posts", :type => :patricia_trie) do |table|
     end
-    assert_kind_of(Groonga::PatriciaTrie, context["Posts"])
+    posts = context["Posts"]
+    assert_kind_of(Groonga::PatriciaTrie, posts)
+    assert_equal("#{@database_path}.tables/Posts", posts.path)
   end
 
   def test_define_patricia_trie_with_full_option
@@ -89,7 +93,9 @@ class SchemaTest < Test::Unit::TestCase
   def test_define_array
     Groonga::Schema.create_table("Posts", :type => :array) do |table|
     end
-    assert_kind_of(Groonga::Array, context["Posts"])
+    posts = context["Posts"]
+    assert_kind_of(Groonga::Array, posts)
+    assert_equal("#{@database_path}.tables/Posts", posts.path)
   end
 
   def test_define_array_with_full_option
@@ -183,6 +189,16 @@ class SchemaTest < Test::Unit::TestCase
     assert_equal(context["Time"], context["Posts.last_modified"].range)
   end
 
+  def test_timestamps
+    assert_nil(context["Posts.created_at"])
+    assert_nil(context["Posts.updated_at"])
+    Groonga::Schema.create_table("Posts") do |table|
+      table.timestamps
+    end
+    assert_equal(context["Time"], context["Posts.created_at"].range)
+    assert_equal(context["Time"], context["Posts.updated_at"].range)
+  end
+
   def test_short_text_column
     assert_nil(context["Posts.title"])
     Groonga::Schema.create_table("Posts") do |table|
@@ -221,9 +237,7 @@ class SchemaTest < Test::Unit::TestCase
     end
     assert_not_nil(context["Posts.content"])
 
-    Groonga::Schema.change_table("Posts") do |table|
-      table.remove_column("content")
-    end
+    Groonga::Schema.remove_column("Posts", "content")
     assert_nil(context["Posts.content"])
   end
 
@@ -363,6 +377,48 @@ class SchemaTest < Test::Unit::TestCase
     end
   end
 
+  def test_remove_index
+    Groonga::Schema.create_table("Posts") do |table|
+      table.long_text :content
+    end
+    Groonga::Schema.create_table("Terms") do |table|
+      table.index "Posts.content"
+    end
+    assert_equal([context["Posts.content"]],
+                 context["Terms.Posts_content"].sources)
+    Groonga::Schema.change_table("Terms") do |table|
+      table.remove_index("Posts.content")
+    end
+    assert_nil(context["Terms.Posts_content"])
+  end
+
+  def test_reference_guess
+    Groonga::Schema.define do |schema|
+      schema.create_table("Items", :type => :hash) do |table|
+        table.short_text("title")
+      end
+
+      schema.create_table("Users", :type => :hash) do |table|
+        table.reference("item")
+      end
+    end
+
+    assert_equal(context["Items"], context["Users.item"].range)
+  end
+
+  def test_reference_ungeussable
+    candidates = ["item", "items", "Items"]
+    exception =
+      Groonga::Schema::UnguessableReferenceTable.new("item", candidates)
+    assert_raise(exception) do
+      Groonga::Schema.define do |schema|
+        schema.create_table("Users", :type => :hash) do |table|
+          table.reference("item")
+        end
+      end
+    end
+  end
+
   def test_dump
     Groonga::Schema.define do |schema|
       schema.create_table("Posts") do |table|
@@ -370,13 +426,14 @@ class SchemaTest < Test::Unit::TestCase
       end
     end
     assert_equal(<<-EOS, Groonga::Schema.dump)
-create_table("Posts") do |table|
+create_table("Posts",
+             :force => true) do |table|
   table.short_text("title")
 end
 EOS
   end
 
-  def test_reference_dump
+  def test_dump_reference
     Groonga::Schema.define do |schema|
       schema.create_table("Items") do |table|
         table.short_text("title")
@@ -395,16 +452,19 @@ EOS
     end
 
     assert_equal(<<-EOS, Groonga::Schema.dump)
-create_table("Comments") do |table|
+create_table("Comments",
+             :force => true) do |table|
   table.text("content")
   table.time("issued")
 end
 
-create_table("Items") do |table|
+create_table("Items",
+             :force => true) do |table|
   table.short_text("title")
 end
 
-create_table("Users") do |table|
+create_table("Users",
+             :force => true) do |table|
   table.short_text("name")
 end
 
@@ -415,6 +475,43 @@ end
 EOS
   end
 
+  def test_dump_index
+    Groonga::Schema.define do |schema|
+      schema.create_table("Items",
+                          :type => :patricia_trie,
+                          :key_type => "ShortText") do |table|
+        table.short_text("title")
+      end
+
+      schema.create_table("Terms",
+                          :type => :patricia_trie,
+                          :key_type => "ShortText") do |table|
+        table.index("Items", "_key")
+        table.index("Items", "title")
+      end
+    end
+
+    assert_equal(<<-EOS, Groonga::Schema.dump)
+create_table("Items",
+             :type => :patricia_trie,
+             :key_type => "ShortText",
+             :force => true) do |table|
+  table.short_text("title")
+end
+
+create_table("Terms",
+             :type => :patricia_trie,
+             :key_type => "ShortText",
+             :force => true) do |table|
+end
+
+change_table("Terms") do |table|
+  table.index("Items", "_key", :name => "Items__key")
+  table.index("Items", "title", :name => "Items_title")
+end
+EOS
+  end
+
   def test_explicit_context_create_table
     context = Groonga::Context.default
     Groonga::Context.default = nil

data/test/test-table-select-normalize.rb

@@ -25,11 +25,15 @@ class TableSelectNormalizeTest < Test::Unit::TestCase
     @comments = Groonga::Array.create(:name => "Comments")
     @comments.define_column("content", "Text")
     @comments.define_column("created_at", "Time")
-    terms = Groonga::PatriciaTrie.create(:name => "Terms",
-                                         :default_tokenizer => "TokenBigram",
-                                         :key_normalize => true)
+    options = {
+      :name => "Terms",
+      :default_tokenizer => "TokenBigramSplitSymbol",
+      :key_normalize => true,
+    }
+    terms = Groonga::PatriciaTrie.create(options)
     terms.define_index_column("comment_content", @comments,
                               :with_section => true,
+                              :with_position => true,
                               :source => "Comments.content")
     @japanese_comment =
       @comments.add(:content => "うちのボロTV（アナログ...）はまだ現役です",

data/test/test-table-select.rb

@@ -33,7 +33,12 @@ class TableSelectTest < Test::Unit::TestCase
                                          :default_tokenizer => "TokenBigram")
     terms.define_index_column("comment_content", @comments,
                               :with_section => true,
+                              :with_position => true,
                               :source => "content")
+    terms.define_index_column("users_key", @users,
+                              :with_section => true,
+                              :with_position => true,
+                              :source => "_key")
     @comment1 = @comments.add(:content => "Hello Good-bye!",
                               :created_at => Time.parse("2009-08-09"),
                               :user => "morita")
@@ -147,4 +152,11 @@ class TableSelectTest < Test::Unit::TestCase
     end
     assert_equal_select_result([], result)
   end
+
+  def test_select_query_key
+    result = @users.select do |record|
+      record["_key"] =~ "mori"
+    end
+    assert_equal_select_result([@users["morita"]], result)
+  end
 end

data/test/test-table.rb

@@ -594,6 +594,13 @@ class TableTest < Test::Unit::TestCase
     assert_false(users.have_column?("description"), "description")
   end
 
+  def test_exist?
+    users = Groonga::Hash.create(:name => "Users")
+    morita = users.add("morita")
+    assert_true(users.exist?(morita.id))
+    assert_false(users.exist?(morita.id + 1))
+  end
+
   private
   def create_bookmarks
     bookmarks = Groonga::Array.create(:name => "Bookmarks")

data/test/test-variable-size-column.rb

@@ -50,6 +50,10 @@ class VariableSizeColumnTest < Test::Unit::TestCase
     @yu = @users.add(:name => "Yutaro Shimamura")
   end
 
+  def test_index_column?
+    assert_not_predicate(@nick_names, :index_column?)
+  end
+
   def test_inspect
     assert_equal("#<Groonga::VariableSizeColumn " +
                  "id: <#{@name.id}>, " +

data/test-unit/Rakefile

@@ -0,0 +1,40 @@
+# -*- ruby -*-
+
+require 'rubygems'
+gem 'rdoc'
+require 'hoe'
+require './lib/test/unit/version.rb'
+
+ENV["NODOT"] = "yes"
+
+version = Test::Unit::VERSION
+ENV["VERSION"] = version
+Hoe.spec('test-unit') do |p|
+  Hoe::Test::SUPPORTED_TEST_FRAMEWORKS[:testunit2] = "test/run-test.rb"
+  p.version = version
+  p.developer('Kouhei Sutou', 'kou@cozmixng.org')
+  p.developer('Ryan Davis', 'ryand-ruby@zenspider.com')
+
+  # Ex-Parrot:
+  # p.developer('Nathaniel Talbott', 'nathaniel@talbott.ws')
+end
+
+task :check_manifest => :clean_test_result
+task :check_manifest => :clean_coverage
+
+task :clean_test_result do
+  test_results = Dir.glob("**/.test-result")
+  sh("rm", "-rf", *test_results) unless test_results.empty?
+end
+
+task :clean_coverage do
+  sh("rm", "-rf", "coverage")
+end
+
+task :tag do
+  message = "Released Test::Unit #{version}!"
+  base = "svn+ssh://#{ENV['USER']}@rubyforge.org/var/svn/test-unit/"
+  sh 'svn', 'copy', '-m', message, "#{base}trunk", "#{base}tags/#{version}"
+end
+
+# vim: syntax=Ruby

data/test-unit/TODO

@@ -0,0 +1,5 @@
+* mock.
+* data-driven test.
+* port ruby trunk's assert_equal's intelligent inspection
+  when inspected expected and actual are same content
+  string.

data/test-unit/bin/testrb

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+require 'test/unit'
+(r = Test::Unit::AutoRunner.new(true)).process_args(ARGV) or
+  abort r.options.banner + " tests..."
+exit r.run

data/test-unit/html/classic.html

@@ -0,0 +1,15 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<title>Test::Unit (Classic)</title>
+</head>
+<body bgcolor="red">
+<p style="text-align: center">
+  <img height="161" width="308" src="test-unit-classic.png">
+  <br>
+  <br>
+  <br>
+  Read the <a href="classic/test-unit/">rdoc</a>
+</p>
+</body>
+</html>

data/test-unit/html/index.html

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE html
+  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+    <title>Test::Unit - a Unit Testing Framework for Ruby</title>
+  </head>
+  <body>
+    <h1>Test::Unit - a Unit Testing Framework for Ruby</h1>
+    <p>[<a href="index.html.ja">Japanese</a>]</p>
+    <ul>
+      <li><a href="http://rubyforge.org/projects/test-unit/">Project Page</a></li>
+      <li>
+        <a href="test-unit/">RDoc</a>
+        <!--(<a href="ja/test-unit/">ja</a>)-->
+      </li>
+      <li>
+        <a href="classic.html">Classic</a>
+        <!--(<a href="ja/classic.html">ja</a>)-->
+      </li>
+    </ul>
+  </body>
+</html>

data/test-unit/html/index.html.ja

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE html
+  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja">
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+    <title>Test::Unit - Ruby用単体テストフレームワーク</title>
+  </head>
+  <body>
+    <h1>Test::Unit - Ruby用単体テストフレームワーク</h1>
+    <p>[<a href="./">English</a>]</p>
+    <ul>
+      <li>
+        <a href="http://rubyforge.org/projects/test-unit/">プロジェクトページ</a>
+      </li>
+      <li>
+        <!--<a href="ja/test-unit/">RDoc</a>-->
+        RDoc(<a href="test-unit/">en</a>)
+      </li>
+      <li>
+        <!--<a href="classic.html.html">Classic</a>-->
+        Classic(<a href="classic.html">en</a>)
+      </li>
+    </ul>
+  </body>
+</html>