rroonga 2.0.8 → 2.1.0

data/rroonga-build.rb

@@ -18,8 +18,8 @@
 module RroongaBuild
   module RequiredGroongaVersion
     MAJOR = 2
-    MINOR = 0
-    MICRO = 9
+    MINOR = 1
+    MICRO = 0
     VERSION = [MAJOR, MINOR, MICRO]
   end
 

data/rroonga.gemspec

@@ -15,6 +15,8 @@
 # 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"
+
 base_dir = File.dirname(__FILE__)
 ext_dir = File.join(base_dir, "ext", "groonga")
 
@@ -40,13 +42,15 @@ Gem::Specification.new do |s|
   s.version = guess_version.call(ext_dir)
 
   authors_path = File.join(base_dir, "AUTHORS")
-  authors, emails = File.readlines(authors_path).collect do |line|
+  authors = []
+  emails = []
+  File.readlines(authors_path).each do |line|
     if /\s*<([^<>]*)>$/ =~ line
-      [$PREMATCH, $1]
-    else
-      nil
+      authors << $PREMATCH
+      emails << $1
     end
-  end.compact
+  end
+
   s.authors = authors
   s.email = emails
 
@@ -56,6 +60,7 @@ Gem::Specification.new do |s|
   s.summary, s.description, = description.split(/\n\n+/, 3)
 
   s.files = ["README.textile", "AUTHORS", "Rakefile", "Gemfile"]
+  s.files = Dir.glob("doc/text/*.textile")
   s.files += ["#{s.name}.gemspec"]
   s.files += ["rroonga-build.rb", "extconf.rb"]
   Dir.chdir(base_dir) do
@@ -83,8 +88,7 @@ Gem::Specification.new do |s|
   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("packnga")
   s.add_development_dependency("RedCloth")
 end
 

data/test/groonga-test-utils.rb

@@ -40,6 +40,8 @@ module GroongaTestUtils
 
     setup_encoding
     setup_context
+
+    @database = nil
   end
 
   def setup_tmp_directory
@@ -60,8 +62,12 @@ module GroongaTestUtils
 
   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
+
+    @query_log_path = @tmp_dir + "groonga-query.log"
+    query_logger = Groonga::FileQueryLogger.new(@query_log_path.to_s)
+    Groonga::QueryLogger.register(query_logger, :all => true)
   end
 
   def setup_tables_directory
@@ -102,8 +108,15 @@ module GroongaTestUtils
     @database = Groonga::Database.create(:path => @database_path.to_s)
   end
 
-  def teardown_sandbox
+  def teardown_database
+    return if @database.nil?
+
+    @database.close
     @database = nil
+  end
+
+  def teardown_sandbox
+    teardown_database
     Groonga::Context.default.close
     Groonga::Context.default = nil
     GC.start
@@ -114,17 +127,16 @@ module GroongaTestUtils
   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} ---"
+    if @query_log_path.exist?
+      header = "--- query log: #{@query_log_path} ---"
       puts(header)
-      puts(File.read(query_log_path))
+      puts(@query_log_path.read)
       puts("-" * header.length)
     end
   end

data/test/test-hash.rb

@@ -26,25 +26,38 @@ class HashTest < Test::Unit::TestCase
                      :support_key?)
   end
 
-  def test_delete
-    bookmarks_path = @tables_dir + "bookmarks"
-    bookmarks = Groonga::Hash.create(:name => "Bookmarks",
-                                     :path => bookmarks_path.to_s)
-
-    bookmarks.add("groonga")
-    google = bookmarks.add("Google")
-    cutter = bookmarks.add("Cutter")
+  class DeleteTest < self
+    setup
+    def setup_data
+      bookmarks_path = @tables_dir + "bookmarks"
+      @bookmarks = Groonga::Hash.create(:name => "Bookmarks",
+                                        :key_type => "ShortText",
+                                        :path => bookmarks_path.to_s)
+
+      @groonga = @bookmarks.add("groonga")
+      @google  = @bookmarks.add("Google")
+      @cutter  = @bookmarks.add("Cutter")
+    end
 
-    assert_equal(["groonga", "Google", "Cutter"],
-                 bookmarks.collect {|bookmark| bookmark.key})
+    def test_id
+      @bookmarks.delete(@google.id)
+      assert_equal(["groonga", "Cutter"],
+                   @bookmarks.collect {|bookmark| bookmark.key})
+    end
 
-    bookmarks.delete(google.id)
-    assert_equal(["groonga", "Cutter"],
-                 bookmarks.collect {|bookmark| bookmark.key})
+    def test_key
+      @bookmarks.delete(@cutter.key)
+      assert_equal(["groonga", "Google"],
+                   @bookmarks.collect {|bookmark| bookmark.key})
+    end
 
-    bookmarks.delete(cutter.key)
-    assert_equal(["groonga"],
-                 bookmarks.collect {|bookmark| bookmark.key})
+    def test_expression
+      @bookmarks.delete do |record|
+        record.key == @groonga.key
+      end
+      assert_equal(["Google", "Cutter"],
+                   @bookmarks.collect {|bookmark| bookmark.key})
+    end
   end
 
   def test_value
@@ -86,8 +99,10 @@ class HashTest < Test::Unit::TestCase
                  "domain: <ShortText>, " +
                  "range: (nil), " +
                  "flags: <>, " +
+                 "size: <0>, " +
                  "encoding: <#{encoding.inspect}>, " +
-                 "size: <0>>",
+                 "default_tokenizer: (nil), " +
+                 "normalizer: (nil)>",
                  anonymous_table.inspect)
   end
 
@@ -100,8 +115,10 @@ class HashTest < Test::Unit::TestCase
                  "domain: <ShortText>, " +
                  "range: (nil), " +
                  "flags: <>, " +
+                 "size: <0>, " +
                  "encoding: <#{encoding.inspect}>, " +
-                 "size: <0>>",
+                 "default_tokenizer: (nil), " +
+                 "normalizer: (nil)>",
                  anonymous_table.inspect)
   end
 
@@ -115,8 +132,10 @@ class HashTest < Test::Unit::TestCase
                  "domain: <ShortText>, " +
                  "range: (nil), " +
                  "flags: <>, " +
+                 "size: <0>, " +
                  "encoding: <#{encoding.inspect}>, " +
-                 "size: <0>>",
+                 "default_tokenizer: (nil), " +
+                 "normalizer: (nil)>",
                  named_table.inspect)
   end
 
@@ -129,8 +148,10 @@ class HashTest < Test::Unit::TestCase
                  "domain: <ShortText>, " +
                  "range: (nil), " +
                  "flags: <>, " +
+                 "size: <0>, " +
                  "encoding: <#{encoding.inspect}>, " +
-                 "size: <0>>",
+                 "default_tokenizer: (nil), " +
+                 "normalizer: (nil)>",
                  named_table.inspect)
   end
 
@@ -147,6 +168,14 @@ class HashTest < Test::Unit::TestCase
                  hash.default_tokenizer)
   end
 
+  def test_normalizer
+    hash = Groonga::Hash.create
+    assert_nil(hash.normalizer)
+    hash.normalizer = "NormalizerAuto"
+    assert_equal(Groonga["NormalizerAuto"],
+                 hash.normalizer)
+  end
+
   def test_search
     users = Groonga::Array.create(:name => "Users")
     users.define_column("name", "ShortText")

data/test/test-index-cursor.rb

@@ -134,10 +134,10 @@ class IndexCursorTest < Test::Unit::TestCase
                   :term_frequency, :weight, :n_rest_postings]
 
     expected = [
-                [1, 1, 1, 0, 1, 0, 1],
-                [2, 1, 1, 0, 1, 0, 1],
-                [2, 1, 2, 0, 1, 0, 1],
-                [3, 1, 2, 0, 1, 0, 1],
+                [1, 1, 1, 0, 1, 0, 0],
+                [2, 1, 1, 1, 1, 0, 0],
+                [2, 1, 2, 0, 1, 0, 0],
+                [3, 1, 2, 2, 1, 0, 0],
                 [3, 1, 3, 0, 1, 0, 0],
                 [3, 1, 4, 1, 1, 0, 0],
                 [3, 1, 5, 3, 1, 0, 0],

data/{Gemfile → test/test-normalizer.rb}

@@ -1,6 +1,4 @@
-# -*- mode: ruby; coding: utf-8 -*-
-#
-# Copyright (C) 2011  Kouhei Sutou <kou@clear-code.com>
+# 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
@@ -15,6 +13,12 @@
 # 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/"
+class NormalizerTest < Test::Unit::TestCase
+  include GroongaTestUtils
+
+  setup :setup_database
 
-gemspec
+  def test_normalize
+    assert_equal("abc", Groonga::Normalizer.normalize("AbC"))
+  end
+end

data/test/test-pagination.rb

@@ -244,6 +244,6 @@ class PaginationTest < Test::Unit::TestCase
                  :first_page? => users.first_page?,
                  :last_page? => users.last_page?,
                  :have_pages? => users.have_pages?,
-                 :keys => users.collect(&:key))
+                 :keys => users.collect {|record| record.value.key})
   end
 end

data/test/test-patricia-trie.rb

@@ -40,6 +40,14 @@ class PatriciaTrieTest < Test::Unit::TestCase
                  trie.default_tokenizer)
   end
 
+  def test_normalizer
+    trie = Groonga::PatriciaTrie.create
+    assert_nil(trie.normalizer)
+    trie.normalizer = "NormalizerAuto"
+    assert_equal(Groonga["NormalizerAuto"],
+                 trie.normalizer)
+  end
+
   def test_search
     users = Groonga::Array.create(:name => "Users")
     users.define_column("name", "ShortText")

data/test/test-schema.rb

@@ -108,10 +108,11 @@ class SchemaTest < Test::Unit::TestCase
                    "domain: <Int32>, " +
                    "range: <UInt32>, " +
                    "flags: <>, " +
+                   "size: <0>, " +
                    "encoding: <#{Groonga::Encoding.default.inspect}>, " +
-                   "size: <0>>",
+                   "default_tokenizer: <#{tokenizer.name}>, " +
+                   "normalizer: (nil)>",
                    table.inspect)
-      assert_equal(tokenizer, table.default_tokenizer)
     end
 
     def test_rename
@@ -154,9 +155,9 @@ class SchemaTest < Test::Unit::TestCase
                                    :path => path.to_s,
                                    :value_type => "Float",
                                    :default_tokenizer => "TokenBigram",
-                                   :key_normalize => true,
                                    :key_with_sis => true,
-                                   :named_path => true) do |table|
+                                   :named_path => true,
+                                   :normalizer => "NormalizerAuto") do |table|
       end
       table = context["Posts"]
       assert_equal("#<Groonga::PatriciaTrie " +
@@ -165,11 +166,12 @@ class SchemaTest < Test::Unit::TestCase
                    "path: <#{path}>, " +
                    "domain: <Int32>, " +
                    "range: <Float>, " +
-                   "flags: <KEY_WITH_SIS|KEY_NORMALIZE|WITH_SECTION>, " +
+                   "flags: <KEY_WITH_SIS>, " +
+                   "size: <0>, " +
                    "encoding: <#{Groonga::Encoding.default.inspect}>, " +
-                   "size: <0>>",
+                   "default_tokenizer: <TokenBigram>, " +
+                   "normalizer: <NormalizerAuto>>",
                    table.inspect)
-      assert_equal(context["TokenBigram"], table.default_tokenizer)
     end
 
     def test_rename
@@ -206,15 +208,15 @@ class SchemaTest < Test::Unit::TestCase
     end
 
     def test_full_option
-      path = @tmp_dir + "patricia-trie.groonga"
+      path = @tmp_dir + "double-array-trie.groonga"
       Groonga::Schema.create_table("Posts",
                                    :type => :double_array_trie,
                                    :key_type => "integer",
                                    :path => path.to_s,
                                    :value_type => "Float",
                                    :default_tokenizer => "TokenBigram",
-                                   :key_normalize => true,
-                                   :named_path => true) do |table|
+                                   :named_path => true,
+                                   :normalizer => "NormalizerAuto") do |table|
       end
       table = context["Posts"]
       assert_equal("#<Groonga::DoubleArrayTrie " +
@@ -223,11 +225,12 @@ class SchemaTest < Test::Unit::TestCase
                    "path: <#{path}>, " +
                    "domain: <Int32>, " +
                    "range: <Float>, " +
-                   "flags: <KEY_NORMALIZE|WITH_SECTION>, " +
+                   "flags: <>, " +
+                   "size: <0>, " +
                    "encoding: <#{Groonga::Encoding.default.inspect}>, " +
-                   "size: <0>>",
+                   "default_tokenizer: <TokenBigram>, " +
+                   "normalizer: <NormalizerAuto>>",
                    table.inspect)
-      assert_equal(context["TokenBigram"], table.default_tokenizer)
     end
 
     def test_rename

data/test/test-snippet.rb

@@ -18,6 +18,11 @@
 class SnippetTest < Test::Unit::TestCase
   include GroongaTestUtils
 
+  setup
+  def setup_database
+    @database = Groonga::Database.create
+  end
+
   def setup_encoding
     Groonga::Encoding.default = :utf8
   end

data/test/test-table.rb

@@ -277,19 +277,30 @@ class TableTest < Test::Unit::TestCase
                  bookmark["created_at"].to_a)
   end
 
-  def test_delete
-    bookmarks_path = @tables_dir + "bookmarks"
-    bookmarks = Groonga::Array.create(:name => "Bookmarks",
-                                      :path => bookmarks_path.to_s)
+  class DeleteTest < self
+    setup
+    def setup_data
+      bookmarks_path = @tables_dir + "bookmarks"
+      @bookmarks = Groonga::Array.create(:name => "Bookmarks",
+                                         :path => bookmarks_path.to_s)
+
+      @bookmark_records = []
+      @bookmark_records << @bookmarks.add
+      @bookmark_records << @bookmarks.add
+      @bookmark_records << @bookmarks.add
+    end
 
-    bookmark_records = []
-    bookmark_records << bookmarks.add
-    bookmark_records << bookmarks.add
-    bookmark_records << bookmarks.add
+    def test_id
+      @bookmarks.delete(@bookmark_records.last.id)
+      assert_equal([1, 2], @bookmarks.collect(&:id))
+    end
 
-    assert_equal(3, bookmarks.size)
-    bookmarks.delete(bookmark_records[1].id)
-    assert_equal(2, bookmarks.size)
+    def test_expression
+      @bookmarks.delete do |record|
+        record.id < 3
+      end
+      assert_equal([3], @bookmarks.collect(&:id))
+    end
   end
 
   def test_remove
@@ -407,8 +418,9 @@ class TableTest < Test::Unit::TestCase
     empty1 = bookmarks.add
     groonga = bookmarks.add(:uri => "http://groonga.org/")
     empty2 = bookmarks.add
+    sorted_bookmarks = bookmarks.sort([{:key => "uri", :order => :descending}])
     assert_equal([groonga, empty1, empty2],
-                 bookmarks.sort([{:key => "uri", :order => :descending}]))
+                 sorted_bookmarks.collect(&:value))
   end
 
   def test_group

data/test/test-view.rb

@@ -28,7 +28,6 @@ class ViewTest < Test::Unit::TestCase
                  "domain: (nil), " +
                  "range: (nil), " +
                  "flags: <>, " +
-                 "encoding: <:default>, " +
                  "size: <0>>",
                  view.inspect)
   end