rroonga 6.0.0 → 6.0.2

data/test/test-expression-builder.rb

@@ -186,6 +186,19 @@ class ExpressionBuilderTest < Test::Unit::TestCase
                    result.collect {|record| record.key.key})
     end
 
+    def test_and_array_nested
+      result = @users.select do |record|
+        conditions = []
+        conditions << [(record.hp > 100)]
+        conditions << []
+        conditions << [[[(record.hp < 200)]]]
+        conditions << [[]]
+        conditions
+      end
+      assert_equal(["gunyara-kun"],
+                   result.collect {|record| record.key.key})
+    end
+
     def test_or
       result = @users.select do |record|
         (record["hp"] == 150) | (record["hp"] > 150)
@@ -675,7 +688,6 @@ EOC
       end
 
       def test_search
-        omit("TODO: Enable me when Groonga 6.0.1 is released.")
         result = @tags.select do |record|
           record.key.fuzzy_search("Toym", :with_transposition => true)
         end

data/test/test-hash.rb

@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright (C) 2014  Masafumi Yokoyama <myokoym@gmail.com>
-# Copyright (C) 2009-2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2016  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
@@ -443,4 +441,25 @@ class HashTest < Test::Unit::TestCase
     user_names = users.each.collect(&:key)
     assert_equal(["Alice", "Bob", "Carl"], user_names)
   end
+
+  class KeyLargeTest < self
+    def test_default
+      paths = Groonga::Hash.create(:name => "Paths",
+                                   :key_type => "ShortText")
+      inspected = context.execute_command("object_inspect",
+                                          :name => paths.name)
+      assert_equal((4 * 1024 * 1024 * 1024) - 1,
+                   inspected.body["key"]["max_total_size"])
+    end
+
+    def test_enable
+      paths = Groonga::Hash.create(:name => "Paths",
+                                   :key_type => "ShortText",
+                                   :key_large => true)
+      inspected = context.execute_command("object_inspect",
+                                          :name => paths.name)
+      assert_equal((1 * 1024 * 1024 * 1024 * 1024) - 1,
+                   inspected.body["key"]["max_total_size"])
+    end
+  end
 end

data/test/test-request-canceler.rb

@@ -0,0 +1,46 @@
+# Copyright (C) 2016  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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+class RequestCancelerTest < Test::Unit::TestCase
+  include GroongaTestUtils
+
+  def setup
+    @request_id = "request-29"
+  end
+
+  def teardown
+    Groonga::RequestCanceler.unregister(@request_id)
+  end
+
+  def test_cancel
+    assert do
+      not Groonga::RequestCanceler.cancel(@request_id)
+    end
+    Groonga::RequestCanceler.register(@request_id)
+    assert do
+      Groonga::RequestCanceler.cancel(@request_id)
+    end
+  end
+
+  def test_cancel_all
+    assert do
+      not Groonga::RequestCanceler.cancel_all
+    end
+    Groonga::RequestCanceler.register(@request_id)
+    assert do
+      Groonga::RequestCanceler.cancel_all
+    end
+  end
+end

data/test/test-request-timer.rb

@@ -0,0 +1,40 @@
+# Copyright (C) 2016  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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+class RequestTimerTest < Test::Unit::TestCase
+  include GroongaTestUtils
+
+  def setup
+    @request_id = "request-29"
+    @timeout = 2.9
+  end
+
+  def teardown
+  end
+
+  def test_register
+    timer_id = Groonga::RequestTimer.register(@request_id, @timeout)
+    assert do
+      timer_id.is_a?(Groonga::RequestTimerID)
+    end
+    Groonga::RequestTimer.unregister(timer_id)
+  end
+
+  def test_deafult_timeout
+    assert_in_delta(0.0, Groonga::RequestTimer.default_timeout, 0.01)
+    Groonga::RequestTimer.default_timeout = @timeout
+    assert_in_delta(@timeout, Groonga::RequestTimer.default_timeout, 0.01)
+  end
+end

data/test/test-table.rb

@@ -302,13 +302,49 @@ class TableTest < Test::Unit::TestCase
     end
   end
 
-  def test_remove
-    bookmarks_path = @tables_dir + "bookmarks"
-    bookmarks = Groonga::Array.create(:name => "Bookmarks",
-                                      :path => bookmarks_path.to_s)
-    assert_predicate(bookmarks_path, :exist?)
-    bookmarks.remove
-    assert_not_predicate(bookmarks_path, :exist?)
+  class RemoveTest < self
+    def test_default
+      bookmarks_path = @tables_dir + "bookmarks"
+      bookmarks = Groonga::Array.create(:name => "Bookmarks",
+                                        :path => bookmarks_path.to_s)
+      assert_predicate(bookmarks_path, :exist?)
+      bookmarks.remove
+      assert_not_predicate(bookmarks_path, :exist?)
+    end
+
+    def test_dependent
+      names_path = @tables_dir + "names"
+      names = Groonga::Hash.create(:name => "Names",
+                                   :path => names_path.to_s,
+                                   :key_type => "ShortText")
+      users_path = @tables_dir + "users"
+      Groonga::Hash.create(:name => "Users",
+                           :path => users_path.to_s,
+                           :key_type => "Names")
+      administrators_path = @tables_dir + "administrators"
+      Groonga::Hash.create(:name => "Administrator",
+                           :path => administrators_path.to_s,
+                           :key_type => "Names")
+      members_path = @tables_dir + "members"
+      members = Groonga::Hash.create(:name => "Members",
+                                     :path => members_path.to_s,
+                                     :key_type => "ShortText")
+      members_name_path = @columns_dir + "name"
+      members.define_column("name", "Names",
+                            :path => members_name_path.to_s)
+
+      assert {names_path.exist?}
+      assert {users_path.exist?}
+      assert {administrators_path.exist?}
+      assert {members_path.exist?}
+      assert {members_name_path.exist?}
+      names.remove(:dependent => true)
+      assert {not names_path.exist?}
+      assert {not users_path.exist?}
+      assert {not administrators_path.exist?}
+      assert {members_path.exist?}
+      assert {not members_name_path.exist?}
+    end
   end
 
   def test_temporary_add

data/test/test-type.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2016  Kouhei Sutou <kou@clear-code.com>
 # Copyright (C) 2015  Masafumi Yokoyama <yokoyama@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -91,6 +91,106 @@ class TypeTest < Test::Unit::TestCase
     assert_false(Groonga["UInt32"].geo_point?)
   end
 
+  class TextFamilyTest < self
+    def test_short_text
+      assert do
+        Groonga["ShortText"].text_family?
+      end
+    end
+
+    def test_text
+      assert do
+        Groonga["Text"].text_family?
+      end
+    end
+
+    def test_long_text
+      assert do
+        Groonga["LongText"].text_family?
+      end
+    end
+
+    def test_under_short_text
+      assert do
+        not Groonga["Time"].text_family?
+      end
+    end
+
+    def test_over_long_text
+      assert do
+        not Groonga["TokyoGeoPoint"].text_family?
+      end
+    end
+  end
+
+  class NumberFamilyTest < self
+    def test_int8
+      assert do
+        Groonga["Int8"].number_family?
+      end
+    end
+
+    def test_uint8
+      assert do
+        Groonga["UInt8"].number_family?
+      end
+    end
+
+    def test_int16
+      assert do
+        Groonga["Int16"].number_family?
+      end
+    end
+
+    def test_uint16
+      assert do
+        Groonga["UInt16"].number_family?
+      end
+    end
+
+    def test_int32
+      assert do
+        Groonga["Int32"].number_family?
+      end
+    end
+
+    def test_uint32
+      assert do
+        Groonga["UInt32"].number_family?
+      end
+    end
+
+    def test_int64
+      assert do
+        Groonga["Int64"].number_family?
+      end
+    end
+
+    def test_uint64
+      assert do
+        Groonga["UInt64"].number_family?
+      end
+    end
+
+    def test_float
+      assert do
+        Groonga["Float"].number_family?
+      end
+    end
+
+    def test_under_int8
+      assert do
+        not Groonga["Bool"].number_family?
+      end
+    end
+
+    def test_over_float
+      assert do
+        not Groonga["Time"].number_family?
+      end
+    end
+  end
+
   def test_builtins
     assert_equal_type("Object", Groonga::Type::OBJECT) # FIXME!!!
     assert_equal_type("Bool", Groonga::Type::BOOLEAN)
@@ -125,7 +225,9 @@ class TypeTest < Test::Unit::TestCase
        "builtin - Time" => "Time")
   def test_builtin?(name)
     type = Groonga[name]
-    assert_predicate(type, :builtin?)
+    assert do
+      type.builtin?
+    end
   end
 
   private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rroonga
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.2
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-06 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
@@ -84,20 +84,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: test-unit-notify
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -208,9 +194,9 @@ email:
 - y.hayamizu@gmail.com
 - dara@shidara.net
 executables:
+- grntest-log-analyze
 - groonga-database-inspect
 - grndump
-- grntest-log-analyze
 - groonga-index-dump
 extensions:
 - ext/groonga/extconf.rb
@@ -288,6 +274,9 @@ files:
 - ext/groonga/rb-grn-query-logger.c
 - ext/groonga/rb-grn-record.c
 - ext/groonga/rb-grn-regexp-operator.c
+- ext/groonga/rb-grn-request-canceler.c
+- ext/groonga/rb-grn-request-timer-id.c
+- ext/groonga/rb-grn-request-timer.c
 - ext/groonga/rb-grn-snippet.c
 - ext/groonga/rb-grn-table-cursor-key-support.c
 - ext/groonga/rb-grn-table-cursor.c
@@ -367,6 +356,8 @@ files:
 - test/test-query-logger.rb
 - test/test-record.rb
 - test/test-remote.rb
+- test/test-request-canceler.rb
+- test/test-request-timer.rb
 - test/test-schema-create-table.rb
 - test/test-schema-dumper.rb
 - test/test-schema-type.rb
@@ -419,67 +410,69 @@ specification_version: 4
 summary: Ruby bindings for Groonga that provide full text search and column store
   features.
 test_files:
-- test/run-test.rb
-- test/test-error-message.rb
+- test/test-context.rb
 - test/test-normalizer.rb
-- test/test-database.rb
-- test/test-schema-type.rb
-- test/test-convert.rb
-- test/test-memory-pool.rb
-- test/test-gqtp.rb
-- test/test-schema-create-table.rb
-- test/test-query-logger.rb
-- test/test-pagination.rb
-- test/test-expression-builder.rb
-- test/test-table-group.rb
-- test/test-schema.rb
-- test/test-operator.rb
+- test/test-double-array-trie.rb
+- test/test-token-regexp.rb
+- test/test-remote.rb
 - test/test-expression.rb
+- test/test-schema-dumper.rb
 - test/test-patricia-trie.rb
-- test/test-command-select.rb
-- test/test-context.rb
-- test/test-variable-size-column.rb
-- test/test-variable.rb
-- test/test-sub-records.rb
-- test/test-index-cursor.rb
-- test/test-double-array-trie.rb
+- test/test-table-group.rb
 - test/test-table-select.rb
+- test/test-encoding.rb
 - test/test-windows-event-logger.rb
+- test/test-plugin.rb
+- test/test-table-select-normalize.rb
+- test/test-hash.rb
+- test/test-gqtp.rb
+- test/test-table-dumper.rb
+- test/test-pagination.rb
+- test/test-column.rb
 - test/test-table-traverse.rb
-- test/test-exception.rb
+- test/test-type.rb
+- test/test-package-label.rb
+- test/groonga-test-utils.rb
+- test/test-thread.rb
+- test/test-procedure.rb
+- test/test-query-logger.rb
 - test/test-index-column.rb
-- test/test-geo-point.rb
 - test/test-vector-column.rb
-- test/test-lock-timeout.rb
-- test/test-array.rb
-- test/test-schema-dumper.rb
 - test/test-fix-size-column.rb
-- test/test-table-select-mecab.rb
-- test/test-procedure.rb
+- test/test-error-message.rb
+- test/test-operator.rb
 - test/test-database-dumper.rb
-- test/test-database-inspector.rb
-- test/test-package-label.rb
-- test/test-table-key-support.rb
-- test/test-table-offset-and-limit.rb
-- test/test-accessor.rb
-- test/test-remote.rb
-- test/test-plugin.rb
-- test/groonga-test-utils.rb
-- test/test-column.rb
-- test/test-record.rb
-- test/test-hash.rb
+- test/run-test.rb
+- test/test-index-cursor.rb
+- test/test-schema-type.rb
+- test/test-database.rb
+- test/test-request-canceler.rb
 - test/test-logger.rb
-- test/test-table-select-weight.rb
+- test/test-table.rb
+- test/test-record.rb
 - test/test-version.rb
-- test/test-table-select-normalize.rb
-- test/test-config.rb
+- test/test-table-select-mecab.rb
+- test/test-lock-timeout.rb
+- test/test-table-select-weight.rb
+- test/test-geo-point.rb
+- test/test-array.rb
+- test/test-request-timer.rb
+- test/test-sub-records.rb
+- test/test-schema-create-table.rb
+- test/test-schema.rb
+- test/test-command-select.rb
+- test/test-expression-builder.rb
+- test/test-convert.rb
+- test/test-memory-pool.rb
 - test/test-flushable.rb
-- test/test-encoding.rb
-- test/test-thread.rb
-- test/test-snippet.rb
-- test/test-type.rb
-- test/test-table.rb
-- test/test-table-dumper.rb
+- test/test-table-offset-and-limit.rb
+- test/test-exception.rb
+- test/test-variable-size-column.rb
+- test/test-config.rb
+- test/test-table-key-support.rb
+- test/test-database-inspector.rb
+- test/test-variable.rb
 - test/test-statistic-measurer.rb
-- test/test-token-regexp.rb
+- test/test-snippet.rb
+- test/test-accessor.rb
 has_rdoc: