rroonga 1.0.8 → 1.0.9

data/test/test-record.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
@@ -77,6 +77,39 @@ class RecordTest < Test::Unit::TestCase
     assert_false(groonga.have_column?(:nonexistent))
   end
 
+  def test_have_column_id
+    groonga = @bookmarks.add
+    assert_true(groonga.have_column?(:_id))
+  end
+
+  def test_have_column_key_hash
+    mori = @users.add("mori")
+    assert_true(mori.have_column?(:_key))
+  end
+
+  def test_have_column_key_array_with_value_type
+    groonga = @bookmarks.add
+    assert_true(groonga.have_column?(:_key))
+  end
+
+  def test_have_column_key_array_without_value_type
+    groonga_ml = @addresses.add
+    assert_false(groonga_ml.have_column?(:_key))
+  end
+
+  def test_have_column_nsubrecs_existent
+    @users.add("mori")
+    bookmarks = @users.select do |record|
+      record.key == "mori"
+    end
+    assert_true(bookmarks.to_a.first.have_column?(:_nsubrecs))
+  end
+
+  def test_have_column_nsubrecs_nonexistent
+    groonga = @bookmarks.add
+    assert_false(groonga.have_column?(:_nsubrecs))
+  end
+
   def test_get_nonexistent_column
     groonga = @bookmarks.add
     assert_raise(Groonga::NoSuchColumn) do

data/test/test-schema.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
@@ -485,7 +485,9 @@ EOS
 
       schema.create_table("Terms",
                           :type => :patricia_trie,
-                          :key_type => "ShortText") do |table|
+                          :key_type => "ShortText",
+                          :key_normalize => true,
+                          :default_tokenizer => "TokenBigram") do |table|
         table.index("Items", "_key")
         table.index("Items", "title")
       end
@@ -502,6 +504,8 @@ end
 create_table("Terms",
              :type => :patricia_trie,
              :key_type => "ShortText",
+             :key_normalize => true,
+             :default_tokenizer => "TokenBigram",
              :force => true) do |table|
 end
 
@@ -533,4 +537,50 @@ EOS
     assert_nil(Groonga::Context.default["Items.text"])
     assert_nil(Groonga::Context.default["TermsText.Items_text"])
   end
+
+  def test_columns_directory_removed
+    table = "Posts"
+    dir = create_table_with_column(table)
+
+    Groonga::Schema.remove_table(table)
+
+    assert_table_removed(table)
+    assert_directory_removed(dir)
+  end
+
+  def test_columns_directory_not_removed
+    table = "Posts"
+    dir = create_table_with_column(table)
+
+    Groonga::Context.default[table].remove
+
+    assert_table_removed(table)
+    assert_directory_not_removed(dir)
+  end
+
+  private
+  def columns_directory_path(table)
+    "#{table.path}.columns"
+  end
+
+  def create_table_with_column(name)
+    Groonga::Schema.create_table(name) do |table|
+      table.integer64 :rate
+    end
+    context = Groonga::Context.default
+    columns_directory_path(context[name])
+  end
+
+  def assert_directory_removed(dir)
+    assert_false(File.exist?(dir))
+  end
+
+  def assert_directory_not_removed(dir)
+    assert_true(File.exist?(dir))
+  end
+
+  def assert_table_removed(name)
+    context = Groonga::Context.default
+    assert_nil(context[name])
+  end
 end

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

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2010  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2010-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
@@ -42,6 +42,11 @@ class TableSelectWeightTest < Test::Unit::TestCase
         table.index("Comments.content", :with_section => true)
       end
 
+      schema.create_table("Titles",
+                          :type => :hash) do |table|
+        table.index("Comments.title")
+      end
+
       schema.change_table("Users") do |table|
         table.index("Comments.user")
       end
@@ -101,4 +106,18 @@ class TableSelectWeightTest < Test::Unit::TestCase
       [record.title, record.score]
     end
   end
+
+  def test_index
+    result = @comments.select do |record|
+      record.match("Hello") do |match_record|
+        (match_record.index("Titles.Comments_title") * 1000) |
+          (match_record.index("Terms.Comments_title") * 100) |
+          match_record.content
+      end
+    end
+    assert_equal_select_result([["Hello", 1101], ["(no title)", 3]],
+                               result) do |record|
+      [record.title, record.score]
+    end
+  end
 end

data/test/test-table.rb

@@ -594,6 +594,64 @@ class TableTest < Test::Unit::TestCase
     assert_false(users.have_column?("description"), "description")
   end
 
+  def test_have_column_id
+    users = Groonga::Array.create(:name => "Users")
+    assert_true(users.have_column?(:_id))
+  end
+
+  def test_have_column_key_hash
+    users = Groonga::Hash.create(:name => "Users",
+                                 :key_type => "ShortText")
+    assert_true(users.have_column?(:_key))
+  end
+
+  def test_have_column_key_array
+    users = Groonga::Array.create(:name => "Users")
+    assert_false(users.have_column?(:_key))
+  end
+
+  def test_have_column_value_hash_with_value_type
+    users = Groonga::Hash.create(:name => "Users",
+                                 :key_type => "ShortText",
+                                 :value_type => "Int32")
+    assert_true(users.have_column?(:_value))
+  end
+
+  def test_have_column_value_hash_without_value_type
+    users = Groonga::Hash.create(:name => "Users",
+                                 :key_type => "ShortText")
+    assert_false(users.have_column?(:_value))
+  end
+
+  def test_have_column_value_array
+    users = Groonga::Array.create(:name => "Users")
+    assert_false(users.have_column?(:_value))
+  end
+
+  def test_have_column_nsubrecs_existent
+    users = Groonga::Hash.create(:name => "Users",
+                                 :key_type => "ShortText")
+    assert_true(users.select.have_column?(:_nsubrecs))
+  end
+
+  def test_have_column_nsubrecs_nonexistent
+    users = Groonga::Hash.create(:name => "Users",
+                                 :key_type => "ShortText")
+    assert_false(users.have_column?(:_nsubrecs))
+  end
+
+  def test_have_column_score_existent
+    users = Groonga::Hash.create(:name => "Users",
+                                 :key_type => "ShortText")
+    assert_true(users.select.have_column?(:_score))
+  end
+
+  def test_have_column_score_nonexistent
+    users = Groonga::Hash.create(:name => "Users",
+                                 :key_type => "ShortText")
+    assert_false(users.have_column?(:_score))
+  end
+
   def test_exist?
     users = Groonga::Hash.create(:name => "Users")
     morita = users.add("morita")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rroonga
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 1
   - 0
-  - 8
-  version: 1.0.8
+  - 9
+  version: 1.0.9
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-25 00:00:00 +09:00
+date: 2011-01-28 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,22 +38,6 @@ dependencies:
         version: 1.0.7
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rubyforge
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 0
-        - 4
-        version: 2.0.4
-  type: :development
-  version_requirements: *id002
 description: |-
   rroonga is a extension library to use groonga's DB-API
   layer. rroonga provides Rubyish readable and writable
@@ -67,12 +51,12 @@ executables: []
 extensions: 
 - extconf.rb
 extra_rdoc_files: 
+- README.ja.rdoc
+- NEWS.ja.rdoc
 - text/tutorial.ja.rdoc
 - text/expression.rdoc
-- NEWS.rdoc
 - README.rdoc
-- README.ja.rdoc
-- NEWS.ja.rdoc
+- NEWS.rdoc
 files: 
 - AUTHORS
 - NEWS.ja.rdoc
@@ -81,7 +65,10 @@ files:
 - README.rdoc
 - Rakefile
 - benchmark/common.rb
+- benchmark/create-wikipedia-database.rb
 - benchmark/read-write-many-small-items.rb
+- benchmark/repeat-load.rb
+- benchmark/select.rb
 - benchmark/write-many-small-items.rb
 - example/bookmark.rb
 - example/index-html.rb
@@ -90,6 +77,7 @@ files:
 - ext/.gitignore
 - ext/groonga/extconf.rb
 - ext/groonga/groonga.def
+- ext/groonga/mkmf.log
 - ext/groonga/rb-grn-accessor.c
 - ext/groonga/rb-grn-array-cursor.c
 - ext/groonga/rb-grn-array.c
@@ -107,7 +95,7 @@ files:
 - ext/groonga/rb-grn-index-column.c
 - ext/groonga/rb-grn-logger.c
 - ext/groonga/rb-grn-object.c
-- ext/groonga/rb-grn-operation.c
+- ext/groonga/rb-grn-operator.c
 - ext/groonga/rb-grn-patricia-trie-cursor.c
 - ext/groonga/rb-grn-patricia-trie.c
 - ext/groonga/rb-grn-procedure.c
@@ -156,25 +144,12 @@ files:
 - license/LGPL
 - misc/grnop2ruby.rb
 - rroonga-build.rb
-- test-unit-notify/Rakefile
-- test-unit-notify/lib/test/unit/notify.rb
-- test-unit/COPYING
-- test-unit/GPL
-- test-unit/PSFL
 - test-unit/Rakefile
 - test-unit/TODO
 - test-unit/bin/testrb
-- test-unit/html/bar.svg
-- test-unit/html/developer.svg
-- test-unit/html/favicon.ico
-- test-unit/html/favicon.svg
-- test-unit/html/heading-mark.svg
+- test-unit/html/classic.html
 - test-unit/html/index.html
 - test-unit/html/index.html.ja
-- test-unit/html/install.svg
-- test-unit/html/logo.svg
-- test-unit/html/test-unit.css
-- test-unit/html/tutorial.svg
 - test-unit/lib/test/unit.rb
 - test-unit/lib/test/unit/assertionfailederror.rb
 - test-unit/lib/test/unit/assertions.rb
@@ -212,7 +187,6 @@ files:
 - test-unit/lib/test/unit/util/backtracefilter.rb
 - test-unit/lib/test/unit/util/method-owner-finder.rb
 - test-unit/lib/test/unit/util/observable.rb
-- test-unit/lib/test/unit/util/output.rb
 - test-unit/lib/test/unit/util/procwrapper.rb
 - test-unit/lib/test/unit/version.rb
 - test-unit/sample/adder.rb
@@ -242,10 +216,8 @@ files:
 - test-unit/test/test_testresult.rb
 - test-unit/test/test_testsuite.rb
 - test-unit/test/testunit-test-util.rb
-- test-unit/test/ui/test_tap.rb
 - test-unit/test/ui/test_testrunmediator.rb
 - test-unit/test/util/test-method-owner-finder.rb
-- test-unit/test/util/test-output.rb
 - test-unit/test/util/test_backtracefilter.rb
 - test-unit/test/util/test_observable.rb
 - test-unit/test/util/test_procwrapper.rb

data/test-unit-notify/Rakefile

@@ -1,47 +0,0 @@
-# -*- ruby -*-
-
-require 'pathname'
-
-base_dir = Pathname(__FILE__).dirname.expand_path
-test_unit_dir = (base_dir.parent + "test-unit").expand_path
-test_unit_lib_dir = test_unit_dir + "lib"
-lib_dir = base_dir + "lib"
-
-$LOAD_PATH.unshift(test_unit_lib_dir.to_s)
-$LOAD_PATH.unshift(lib_dir.to_s)
-
-require 'test/unit/notify'
-
-require 'rubygems'
-require 'hoe'
-
-Test::Unit.run = true
-
-version = Test::Unit::Notify::VERSION
-ENV["VERSION"] = version
-Hoe.spec('test-unit-notify') do
-  self.version = version
-  self.rubyforge_name = "test-unit"
-
-  developer('Kouhei Sutou', 'kou@clear-code.com')
-
-  extra_deps << ["test-unit"]
-end
-
-task :docs do
-  doc_dir = base_dir + "doc"
-  doc_screenshot_dir = doc_dir + "screenshot"
-  mkdir_p(doc_screenshot_dir.to_s)
-  (base_dir + "screenshot").children.each do |file|
-    next if file.directory?
-    cp(file.to_s, doc_screenshot_dir.to_s)
-  end
-end
-
-task :tag do
-  message = "Released Test::Unit::Notify #{version}!"
-  base = "svn+ssh://#{ENV['USER']}@rubyforge.org/var/svn/test-unit/extensions/test-unit-notify/"
-  sh 'svn', 'copy', '-m', message, "#{base}trunk", "#{base}tags/#{version}"
-end
-
-# vim: syntax=Ruby

data/test-unit-notify/lib/test/unit/notify.rb

@@ -1,104 +0,0 @@
-#--
-#
-# Author:: Kouhei Sutou
-# Copyright::
-#   * Copyright (c) 2010 Kouhei Sutou <kou@clear-code.com>
-# License:: Ruby license.
-
-require 'pathname'
-require 'erb'
-require 'test/unit'
-
-module Test
-  module Unit
-    AutoRunner.setup_option do |auto_runner, options|
-      options.on("--[no-]notify",
-                 "Notify test result at the last.") do |use_notify|
-        auto_runner.listeners.reject! do |listener|
-          listener.is_a?(Notify::Notifier)
-        end
-        auto_runner.listeners << Notify::Notifier.new if use_notify
-      end
-    end
-
-    module Notify
-      VERSION = "0.0.2"
-
-      class Notifier
-        include ERB::Util
-
-        base_dir = Pathname(__FILE__).dirname.parent.parent.parent.expand_path
-        ICON_DIR = base_dir + "data" + "icons"
-        def initialize
-          @theme = "kinotan"
-        end
-
-        def attach_to_mediator(mediator)
-          mediator.add_listener(UI::TestRunnerMediator::STARTED,
-                                &method(:started))
-          mediator.add_listener(UI::TestRunnerMediator::FINISHED,
-                                &method(:finished))
-        end
-
-        def started(result)
-          @result = result
-        end
-
-        def finished(elapsed_time)
-          case RUBY_PLATFORM
-          when /mswin|mingw|cygwin/
-            # how?
-          when /darwin/
-            # growl?
-          else
-            notify_by_notify_send(elapsed_time)
-          end
-        end
-
-        def notify_by_notify_send(elapsed_time)
-          icon = guess_suitable_icon
-          args = ["notify-send",
-                  "--expire-time", "5000",
-                  "--urgency", urgency]
-          args.concat(["--icon", icon.to_s]) if icon
-          title = "%s [%g%%] (%gs)" % [@result.status,
-                                       @result.pass_percentage,
-                                       elapsed_time]
-          args << title
-          args << h(@result.summary)
-          system(*args)
-        end
-
-        def guess_suitable_icon
-          icon_dir = ICON_DIR + @theme
-          status = @result.status
-          icon_base_names = [status]
-          if @result.passed?
-            icon_base_names << "pass"
-          else
-            case status
-            when "failure"
-              icon_base_names << "error"
-            when "error"
-              icon_base_names << "failure"
-            end
-          end
-          icon_base_names << "default"
-          icon_base_names.each do |base_name|
-            icon = icon_dir + "#{base_name}.png"
-            return icon if icon.exist?
-          end
-          nil
-        end
-
-        def urgency
-          if @result.passed?
-            "normal"
-          else
-            "critical"
-          end
-        end
-      end
-    end
-  end
-end