rroonga 5.1.1 → 6.0.0

data/test/test-expression-builder.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2014-2015  Masafumi Yokoyama <yokoyama@clear-code.com>
-# Copyright (C) 2009-2015  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
@@ -79,8 +79,6 @@ class ExpressionBuilderTest < Test::Unit::TestCase
     end
 
     class NotEqualTest < self
-      setup :only_ruby19
-
       def test_without_index
         result = @users.select do |record|
           record["name"] != "mori daijiro"
@@ -195,6 +193,14 @@ class ExpressionBuilderTest < Test::Unit::TestCase
       assert_equal(["gunyara-kun", "yu"],
                    result.collect {|record| record.key.key})
     end
+
+    def test_and_not
+      result = @users.select do |record|
+        (record["hp"] > 100) - (record["hp"] == 150)
+      end
+      assert_equal(["yu"],
+                   result.collect {|record| record.key.key})
+    end
   end
 
   class FullTextSearchTest < self
@@ -524,39 +530,162 @@ EOC
   end
 
   class CallTest < self
-    def setup_tables
-      Groonga::Schema.define do |schema|
-        schema.create_table("Shops",
-                            :type => :hash,
-                            :key_type => "ShortText") do |table|
-          table.wgs84_geo_point("location")
+    class StringTest < self
+      def setup_tables
+        Groonga::Schema.define do |schema|
+          schema.create_table("Shops",
+                              :type => :hash,
+                              :key_type => "ShortText") do |table|
+            table.wgs84_geo_point("location")
+          end
+
+          schema.create_table("Locations",
+                              :type => :patricia_trie,
+                              :key_type => :wgs84_geo_point) do |table|
+            table.index("Shops.location")
+          end
         end
 
-        schema.create_table("Locations",
-                            :type => :patricia_trie,
-                            :key_type => :wgs84_geo_point) do |table|
-          table.index("Shops.location")
+        @shops = Groonga["Shops"]
+      end
+
+      def setup_data
+        @shops.add("Nezu no taiyaki", :location => "35.720253,139.762573")
+        @shops.add("Taiyaki Kataoka", :location => "35.712521,139.715591")
+        @shops.add("Taiyaki Sharaku", :location => "35.716969,139.794846")
+      end
+
+      def test_call_style
+        result = @shops.select do |record|
+          record.call("geo_in_rectangle",
+                      record.location,
+                      "35.7185,139.7912",
+                      "35.7065,139.8069")
         end
+        assert_equal(["Taiyaki Sharaku"],
+                     result.collect(&:_key))
       end
 
-      @shops = Groonga["Shops"]
+      def test_method_style
+        result = @shops.select do |record|
+          record.location.geo_in_rectangle("35.7185,139.7912",
+                                           "35.7065,139.8069")
+        end
+        assert_equal(["Taiyaki Sharaku"],
+                     result.collect(&:_key))
+      end
     end
 
-    def setup_data
-      @shops.add("Nezu no taiyaki", :location => "35.720253,139.762573")
-      @shops.add("Taiyaki Kataoka", :location => "35.712521,139.715591")
-      @shops.add("Taiyaki Sharaku", :location => "35.716969,139.794846")
+    class IntegerTest < self
+      def setup_tables
+        Groonga::Schema.define do |schema|
+          schema.create_table("Users",
+                              :type => :hash,
+                              :key_type => "ShortText") do |table|
+            table.int32("age")
+          end
+
+          schema.create_table("Ages",
+                              :type => :patricia_trie,
+                              :key_type => :int32) do |table|
+            table.index("Users.age")
+          end
+        end
+
+        @users = Groonga["Users"]
+      end
+
+      def setup_data
+        @users.add("Alice",  :age => 18)
+        @users.add("Bob",    :age => 29)
+        @users.add("Carlos", :age => 14)
+      end
+
+      def test_search
+        result = @users.select do |record|
+          record.call("between",
+                      record.age,
+                      18,
+                      "include",
+                      29,
+                      "exclude")
+        end
+        assert_equal(["Alice"],
+                     result.collect(&:_key))
+      end
     end
 
-    def test_search
-      result = @shops.select do |record|
-        record.call("geo_in_rectangle",
-                    record.location,
-                    "35.7185,139.7912",
-                    "35.7065,139.8069")
+    class TimeTest < self
+      def setup_tables
+        Groonga::Schema.define do |schema|
+          schema.create_table("Logs",
+                              :type => :array) do |table|
+            table.time("timestamp")
+          end
+
+          schema.create_table("Times",
+                              :type => :patricia_trie,
+                              :key_type => :time) do |table|
+            table.index("Logs.timestamp")
+          end
+        end
+
+        @logs = Groonga["Logs"]
+      end
+
+      def setup_data
+        @logs.add(:timestamp => Time.iso8601("2016-02-21T19:00:01Z"))
+        @logs.add(:timestamp => Time.iso8601("2016-02-21T19:00:02Z"))
+        @logs.add(:timestamp => Time.iso8601("2016-02-21T19:00:03Z"))
+      end
+
+      def test_search
+        result = @logs.select do |record|
+          record.call("between",
+                      record.timestamp,
+                      Time.iso8601("2016-02-21T19:00:01Z"),
+                      "include",
+                      Time.iso8601("2016-02-21T19:00:03Z"),
+                      "exclude")
+        end
+        assert_equal([
+                       Time.iso8601("2016-02-21T19:00:01Z"),
+                       Time.iso8601("2016-02-21T19:00:02Z"),
+                     ],
+                     result.collect(&:timestamp))
+      end
+    end
+
+    class HashTest < self
+      def setup_tables
+        Groonga::Schema.define do |schema|
+          schema.create_table("Tags",
+                              :type => :patricia_trie,
+                              :key_type => :short_text) do |table|
+          end
+        end
+
+        @tags = Groonga["Tags"]
+      end
+
+      def setup_data
+        @tags.add("Tom")
+        @tags.add("Tomy")
+        @tags.add("Ken")
+      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
+        sorted_result = result.sort(["_score", "_key"])
+        assert_equal([
+                       ["Tom", 1.0],
+                       ["Tomy", 1.0],
+                     ],
+                     sorted_result.collect {|r| [r._key, r.score]})
       end
-      assert_equal(["Taiyaki Sharaku"],
-                   result.collect(&:_key))
     end
   end
 
@@ -596,9 +725,9 @@ EOC
                    result.collect {|record| record.key["uri"]})
     end
 
-    def test_id
+    def test_key
       result = @bookmarks.select do |record|
-        record["user"] == @morita.id
+        record["user"] == @morita.key
       end
       assert_equal(["http://groonga.org/", "http://ruby-lang.org/"],
                    result.collect {|record| record.key["uri"]})
@@ -607,8 +736,22 @@ EOC
     def test_record_like_object
       morita = Object.new
       morita_singleton_class = (class << morita; self; end)
-      morita_id = @morita.id
+      morita_key = @morita.key
       morita_singleton_class.send(:define_method, :record_id) do
+        morita_key
+      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_record_like_object_raw
+      morita = Object.new
+      morita_singleton_class = (class << morita; self; end)
+      morita_id = @morita.id
+      morita_singleton_class.send(:define_method, :record_raw_id) do
         morita_id
       end
       result = @bookmarks.select do |record|

data/test/test-plugin.rb

@@ -1,4 +1,5 @@
 # Copyright (C) 2011-2015  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2016  Masafumi Yokoyama <yokoyama@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
@@ -21,7 +22,6 @@ class PluginTest < Test::Unit::TestCase
   teardown :teardown_sandbox
 
   def test_register
-    context = Groonga::Context.default
     assert_nil(context["TokenFilterStopWord"])
     context.register_plugin("token_filters/stop_word")
     assert_not_nil(context["TokenFilterStopWord"])
@@ -56,4 +56,28 @@ class PluginTest < Test::Unit::TestCase
       assert_nil(context["TokenFilterStopWord"])
     end
   end
+
+  class NamesTest < self
+    def test_nothing
+      assert_equal([], Groonga::Plugin.names)
+    end
+
+    def test_one_plugin
+      context.register_plugin("token_filters/stop_word")
+      assert_equal(["token_filters/stop_word"],
+                   Groonga::Plugin.names)
+    end
+
+    def test_multiple_plugins
+      context.register_plugin("token_filters/stop_word")
+      context.register_plugin("query_expanders/tsv")
+      assert_equal(["token_filters/stop_word", "query_expanders/tsv"],
+                   Groonga::Plugin.names)
+    end
+
+    def test_context_option
+      context.register_plugin("token_filters/stop_word")
+      assert_equal([], Groonga::Plugin.names(context: Groonga::Context.new))
+    end
+  end
 end

data/test/test-table-dumper.rb

@@ -512,9 +512,9 @@ EOS
       assert_equal(<<-EOS, dump("Users"))
 load --table Users
 [
-[\"_key\",\"name\"],
-[\"mori\",\"mori daijiro\"],
-[\"s-yata\",\"Susumu Yata\"]
+["_key","name"],
+["mori","mori daijiro"],
+["s-yata","Susumu Yata"]
 ]
 EOS
     end
@@ -557,9 +557,38 @@ EOS
       assert_equal(<<-COMMAND, dump("Products"))
 load --table Products
 [
-[\"_key\",\"tags\"],
-[\"Groonga\",{\"groonga\":100}],
-[\"Mroonga\",{\"groonga\":10,\"mroonga\":100}]
+["_key","tags"],
+["Groonga",{"groonga":100}],
+["Mroonga",{"groonga":10,"mroonga":100}]
+]
+      COMMAND
+    end
+  end
+
+  class MaxRecordsTest < self
+    def setup
+      Groonga::Schema.define do |schema|
+        schema.create_table("Products",
+                            :type => :hash,
+                            :key_type => "ShortText") do |table|
+        end
+      end
+    end
+
+    def products
+      Groonga["Products"]
+    end
+
+    def test_small
+      products.add("Groonga")
+      products.add("Mroonga")
+      products.add("Rroonga")
+      assert_equal(<<-COMMAND, dump("Products", :max_records => 2))
+load --table Products
+[
+["_key"],
+["Groonga"],
+["Mroonga"]
 ]
       COMMAND
     end

data/test/test-table-select.rb

@@ -153,7 +153,6 @@ class TableSelectTest < Test::Unit::TestCase
   end
 
   def test_not_equal_block
-    only_ruby19
     @result = @comments.select do |record|
       record.user != "darashi"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rroonga
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 6.0.0
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-18 00:00:00.000000000 Z
+date: 2016-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
@@ -208,9 +208,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
@@ -233,6 +233,11 @@ files:
 - bin/groonga-database-inspect
 - bin/groonga-index-dump
 - doc/images/sample-schema.png
+- doc/text/cross-compile.md
+- doc/text/install.md
+- doc/text/news.md
+- doc/text/release.md
+- doc/text/tutorial.md
 - example/bookmark.rb
 - example/index-html.rb
 - example/measure-data-column-disk-usage.rb
@@ -264,6 +269,7 @@ files:
 - ext/groonga/rb-grn-hash.c
 - ext/groonga/rb-grn-index-column.c
 - ext/groonga/rb-grn-index-cursor.c
+- ext/groonga/rb-grn-index.c
 - ext/groonga/rb-grn-less-equal-operator.c
 - ext/groonga/rb-grn-less-operator.c
 - ext/groonga/rb-grn-logger.c
@@ -303,11 +309,11 @@ files:
 - lib/groonga/database-inspector.rb
 - lib/groonga/database.rb
 - lib/groonga/dumper.rb
-- lib/groonga/expression-builder-19.rb
 - lib/groonga/expression-builder.rb
 - lib/groonga/geo-point.rb
 - lib/groonga/grntest-log.rb
 - lib/groonga/index-column.rb
+- lib/groonga/index.rb
 - lib/groonga/logger.rb
 - lib/groonga/memory-pool.rb
 - lib/groonga/pagination.rb
@@ -319,6 +325,7 @@ files:
 - lib/groonga/statistic-measurer.rb
 - lib/groonga/sub-records.rb
 - lib/groonga/table.rb
+- lib/rroonga.rb
 - misc/grnop2ruby.rb
 - rroonga-build.rb
 - rroonga.gemspec
@@ -336,6 +343,7 @@ files:
 - test/test-database.rb
 - test/test-double-array-trie.rb
 - test/test-encoding.rb
+- test/test-error-message.rb
 - test/test-exception.rb
 - test/test-expression-builder.rb
 - test/test-expression.rb
@@ -405,72 +413,73 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for Groonga that provide full text search and column store
   features.
 test_files:
-- test/test-context.rb
+- test/run-test.rb
+- test/test-error-message.rb
 - test/test-normalizer.rb
-- test/test-double-array-trie.rb
-- test/test-token-regexp.rb
-- test/test-remote.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-expression.rb
-- test/test-schema-dumper.rb
 - test/test-patricia-trie.rb
-- test/test-table-group.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-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-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-exception.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-operator.rb
+- test/test-table-select-mecab.rb
+- test/test-procedure.rb
 - test/test-database-dumper.rb
-- test/run-test.rb
-- test/test-index-cursor.rb
-- test/test-schema-type.rb
-- test/test-database.rb
-- test/test-logger.rb
-- test/test-table.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-version.rb
-- test/test-table-select-mecab.rb
-- test/test-lock-timeout.rb
+- test/test-hash.rb
+- test/test-logger.rb
 - test/test-table-select-weight.rb
-- test/test-geo-point.rb
-- test/test-array.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-table-offset-and-limit.rb
-- test/test-exception.rb
-- test/test-variable-size-column.rb
+- test/test-version.rb
+- test/test-table-select-normalize.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-flushable.rb
+- test/test-encoding.rb
+- test/test-thread.rb
 - test/test-snippet.rb
-- test/test-accessor.rb
+- test/test-type.rb
+- test/test-table.rb
+- test/test-table-dumper.rb
+- test/test-statistic-measurer.rb
+- test/test-token-regexp.rb
 has_rdoc: