groonga-client 0.5.9 → 0.6.4

data/lib/groonga/client/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2017  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2020  Sutou Kouhei <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
@@ -16,6 +16,6 @@
 
 module Groonga
   class Client
-    VERSION = "0.5.9"
+    VERSION = "0.6.4"
   end
 end

data/test/request/test-select.rb

@@ -186,8 +186,8 @@ class TestRequestSelect < Test::Unit::TestCase
   end
 
   sub_test_case("#paginate") do
-    def paginate(*args)
-      @request.paginate(*args).to_parameters
+    def paginate(*args, **kwargs)
+      @request.paginate(*args, **kwargs).to_parameters
     end
 
     sub_test_case("page") do

data/test/response/test-base.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2014-2018  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
@@ -210,4 +210,17 @@ class TestResponseBase < Test::Unit::TestCase
       end
     end
   end
+
+  class TestParse < self
+    def test_jsonp
+      command = Groonga::Command::Base.new("status", {"callback" => "a"})
+      response = [
+        [0, 1396012478, 0.00050806999206543],
+        {"start_time" => 1396012478},
+      ]
+      raw_response = "a(#{response.to_json});"
+      response = Groonga::Client::Response::Base.parse(command, raw_response)
+      assert_equal(1396012478, response.body["start_time"])
+    end
+  end
 end

data/test/response/test-select-command-version1.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2020  Sutou Kouhei <kou@clear-code.com>
 # Copyright (C) 2013  Kosuke Asami
 # Copyright (C) 2016  Masafumi Yokoyama <yokoyama@clear-code.com>
 #
@@ -320,12 +320,14 @@ class TestResponseSelectCommandVersion1 < Test::Unit::TestCase
     class TestSlices < self
       def setup
         pair_arguments = {
-          "slices[groonga].filter" => 'tag @ "groonga"',
+          "slices[groonga].filter" => "tag @ 'groonga'",
+          "slices[groonga].limit" => "2",
+          "slices[groonga].drilldowns[author].keys" => "author",
         }
         @command = Groonga::Command::Select.new("select", pair_arguments)
         @body = [
           [
-            [3],
+            [4],
             [
               [
                 "_id",
@@ -339,10 +341,11 @@ class TestResponseSelectCommandVersion1 < Test::Unit::TestCase
             [1, "groonga"],
             [2, "rroonga"],
             [3, "groonga"],
+            [4, "groonga"],
           ],
           {
             "groonga" => [
-              [2],
+              [3],
               [
                 [
                   "_id",
@@ -355,19 +358,55 @@ class TestResponseSelectCommandVersion1 < Test::Unit::TestCase
               ],
               [1, "groonga"],
               [3, "groonga"],
-            ]
-          }
+              {
+                "author" => [
+                  [3],
+                  [
+                    [
+                      "_key",
+                      "ShortText",
+                    ],
+                    [
+                      "_nsubrecs",
+                      "Int32",
+                    ],
+                  ],
+                  [
+                    "Alice",
+                    1,
+                  ],
+                  [
+                    "Bob",
+                    1,
+                  ],
+                  [
+                    "Chris",
+                    1,
+                  ],
+                ],
+              },
+            ],
+          },
         ]
       end
 
       def test_slices
         assert_equal({
-                       "groonga" => [
-                         {"_id" => 1, "tag" => "groonga"},
-                         {"_id" => 3, "tag" => "groonga"},
-                       ]
+                       "groonga" => {
+                         records: [
+                           {"_id" => 1, "tag" => "groonga"},
+                           {"_id" => 3, "tag" => "groonga"},
+                         ],
+                         drilldowns: {
+                           "author" => [
+                             {"_key" => "Alice", "_nsubrecs" => 1},
+                             {"_key" => "Bob",   "_nsubrecs" => 1},
+                             {"_key" => "Chris", "_nsubrecs" => 1},
+                           ],
+                         },
+                       },
                      },
-                     collect_values(@body, &:records))
+                     collect_values(@body))
       end
 
       private
@@ -378,7 +417,14 @@ class TestResponseSelectCommandVersion1 < Test::Unit::TestCase
       def collect_values(body)
         values = {}
         slices(body).each do |label, slice|
-          values[label] = yield(slice)
+          drilldowns = {}
+          slice.drilldowns.each do |drilldown_label, drilldown|
+            drilldowns[drilldown_label] = drilldown.records
+          end
+          values[label] = {
+            records: slice.records,
+            drilldowns: drilldowns,
+          }
         end
         values
       end

data/test/response/test-select-command-version3.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2020  Sutou Kouhei <kou@clear-code.com>
 # Copyright (C) 2013  Kosuke Asami
 # Copyright (C) 2016  Masafumi Yokoyama <yokoyama@clear-code.com>
 #
@@ -284,6 +284,7 @@ class TestResponseSelectCommandVersion3 < Test::Unit::TestCase
       def setup
         pair_arguments = {
           "slices[groonga].filter" => 'tag @ "groonga"',
+          "slices[groonga].drilldowns[author].keys" => "author",
         }
         @command = Groonga::Command::Select.new("select", pair_arguments)
         @body = {
@@ -319,7 +320,36 @@ class TestResponseSelectCommandVersion3 < Test::Unit::TestCase
               "records" => [
                 [1, "groonga"],
                 [3, "groonga"],
-              ]
+              ],
+              "drilldowns" => {
+                "author" => {
+                  "n_hits" => 3,
+                  "columns" => [
+                    {
+                      "name" => "_key",
+                      "type" => "ShortText",
+                    },
+                    {
+                      "name" => "_nsubrecs",
+                      "type" => "Int32",
+                    },
+                  ],
+                  "records" => [
+                    [
+                      "Alice",
+                      1,
+                    ],
+                    [
+                      "Bob",
+                      1,
+                    ],
+                    [
+                      "Chris",
+                      1,
+                    ],
+                  ],
+                },
+              },
             }
           }
         }
@@ -327,12 +357,21 @@ class TestResponseSelectCommandVersion3 < Test::Unit::TestCase
 
       def test_slices
         assert_equal({
-                       "groonga" => [
-                         {"_id" => 1, "tag" => "groonga"},
-                         {"_id" => 3, "tag" => "groonga"},
-                       ]
+                       "groonga" => {
+                         records: [
+                           {"_id" => 1, "tag" => "groonga"},
+                           {"_id" => 3, "tag" => "groonga"},
+                         ],
+                         drilldowns: {
+                           "author" => [
+                             {"_key" => "Alice", "_nsubrecs" => 1},
+                             {"_key" => "Bob",   "_nsubrecs" => 1},
+                             {"_key" => "Chris", "_nsubrecs" => 1},
+                           ],
+                         },
+                       },
                      },
-                     collect_values(@body, &:records))
+                     collect_values(@body))
       end
 
       private
@@ -343,7 +382,14 @@ class TestResponseSelectCommandVersion3 < Test::Unit::TestCase
       def collect_values(body)
         values = {}
         slices(body).each do |label, slice|
-          values[label] = yield(slice)
+          drilldowns = {}
+          slice.drilldowns.each do |drilldown_label, drilldown|
+            drilldowns[drilldown_label] = drilldown.records
+          end
+          values[label] = {
+            records: slice.records,
+            drilldowns: drilldowns,
+          }
         end
         values
       end

data/test/response/test-select-tsv.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2018  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2018-2019  Sutou Kouhei <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
@@ -19,8 +19,18 @@ require "response/helper"
 class TestResponseSelectTSV < Test::Unit::TestCase
   include TestResponseHelper
 
-  def drilldown(key, n_hits, records)
-    Groonga::Client::Response::Select::Drilldown.new(key, n_hits, records)
+  def drilldown(label,
+                keys,
+                n_hits,
+                records,
+                raw_columns,
+                raw_records)
+    Groonga::Client::Response::Select::Drilldown.new(label,
+                                                     keys,
+                                                     n_hits,
+                                                     records,
+                                                     raw_columns,
+                                                     raw_records)
   end
 
   def test_error
@@ -113,7 +123,19 @@ END
                    :elapsed_time => 0.0,
                    :records => [],
                    :drilldowns => [
-                     drilldown("version", 7, drilldown_records),
+                     drilldown("version",
+                               ["version"],
+                               7,
+                               drilldown_records,
+                               [
+                                 ["_key", "ShortText"],
+                                 ["_nsubrecs", "UInt32"],
+                               ],
+                               [
+                                 ["2.2.0", "18044"],
+                                 ["2.3.0", "18115"],
+                                 ["2.4.0", "14594"],
+                               ]),
                    ],
                  },
                  {

data/test/response/test-select-xml.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2017  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2017-2019  Sutou Kouhei <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
@@ -19,8 +19,18 @@ require "response/helper"
 class TestResponseSelectXML < Test::Unit::TestCase
   include TestResponseHelper
 
-  def drilldown(key, n_hits, records)
-    Groonga::Client::Response::Select::Drilldown.new(key, n_hits, records)
+  def drilldown(label,
+                keys,
+                n_hits,
+                records,
+                raw_columns,
+                raw_records)
+    Groonga::Client::Response::Select::Drilldown.new(label,
+                                                     keys,
+                                                     n_hits,
+                                                     records,
+                                                     raw_columns,
+                                                     raw_records)
   end
 
   def test_basic
@@ -91,7 +101,19 @@ class TestResponseSelectXML < Test::Unit::TestCase
                    :elapsed_time => 0.0,
                    :records => [],
                    :drilldowns => [
-                     drilldown("version", 7, drilldown_records),
+                     drilldown("version",
+                               ["version"],
+                               7,
+                               drilldown_records,
+                               [
+                                 ["_key", "ShortText"],
+                                 ["_nsubrecs", "ShortText"],
+                               ],
+                               [
+                                 ["2.2.0", "18044"],
+                                 ["2.3.0", "18115"],
+                                 ["2.4.0", "14594"],
+                               ]),
                    ],
                  },
                  {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groonga-client
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.6.4
 platform: ruby
 authors:
 - Haruka Yoshihara
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-13 00:00:00.000000000 Z
+date: 2021-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gqtp
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.8
+        version: 1.4.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.8
+        version: 1.4.7
 - !ruby/object:Gem::Dependency
   name: groonga-command-parser
   requirement: !ruby/object:Gem::Requirement
@@ -68,6 +68,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -161,9 +175,9 @@ email:
 - kou@clear-code.com
 - tfortress58@gmail.com
 executables:
+- groonga-client
 - groonga-client-index-check
 - groonga-client-index-recreate
-- groonga-client
 extensions: []
 extra_rdoc_files: []
 files:
@@ -209,6 +223,7 @@ files:
 - lib/groonga/client/response/column-rename.rb
 - lib/groonga/client/response/defrag.rb
 - lib/groonga/client/response/delete.rb
+- lib/groonga/client/response/drilldownable.rb
 - lib/groonga/client/response/dump.rb
 - lib/groonga/client/response/error.rb
 - lib/groonga/client/response/load.rb
@@ -216,9 +231,12 @@ files:
 - lib/groonga/client/response/log-level.rb
 - lib/groonga/client/response/log-put.rb
 - lib/groonga/client/response/log-reopen.rb
+- lib/groonga/client/response/logical-range-filter.rb
+- lib/groonga/client/response/logical-select.rb
 - lib/groonga/client/response/quit.rb
 - lib/groonga/client/response/register.rb
 - lib/groonga/client/response/schema.rb
+- lib/groonga/client/response/searchable.rb
 - lib/groonga/client/response/select.rb
 - lib/groonga/client/response/status.rb
 - lib/groonga/client/response/table-create.rb
@@ -282,43 +300,42 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.3.0.dev
 signing_key: 
 specification_version: 4
 summary: Groonga-client is a client for Groonga (http://groonga.org/) implemented
   with pure Ruby. You can use it without Groonga.
 test_files:
-- test/test-client.rb
-- test/command-line/test-index-check.rb
 - test/command-line/helper.rb
+- test/command-line/test-index-check.rb
 - test/command-line/test-index-recreate.rb
-- test/test-script-syntax.rb
+- test/protocol/test-gqtp.rb
+- test/protocol/test-http.rb
 - test/request/select/test-backward-compatible-sort-keys-parameter.rb
 - test/request/select/test-filter.rb
-- test/request/select/test-sort-keys-parameter.rb
 - test/request/select/test-output-columns-parameter.rb
-- test/request/select/test-values-parameter.rb
 - test/request/select/test-scorer.rb
-- test/request/test-merger.rb
+- test/request/select/test-sort-keys-parameter.rb
+- test/request/select/test-values-parameter.rb
 - test/request/test-generic.rb
+- test/request/test-merger.rb
 - test/request/test-select.rb
-- test/test-command.rb
-- test/protocol/test-gqtp.rb
-- test/protocol/test-http.rb
-- test/run-test.rb
+- test/response/helper.rb
 - test/response/test-base.rb
-- test/response/test-select-tsv.rb
-- test/response/test-load.rb
 - test/response/test-column-list.rb
-- test/response/helper.rb
 - test/response/test-error.rb
-- test/response/test-table-list.rb
-- test/response/test-status.rb
-- test/response/test-select-xml.rb
+- test/response/test-load.rb
 - test/response/test-schema.rb
-- test/response/test-select-command-version3.rb
 - test/response/test-select-command-version1.rb
+- test/response/test-select-command-version3.rb
+- test/response/test-select-tsv.rb
+- test/response/test-select-xml.rb
+- test/response/test-status.rb
 - test/response/test-table-create.rb
+- test/response/test-table-list.rb
 - test/response/test-table-remove.rb
 - test/results/test-table-list.rb
+- test/run-test.rb
+- test/test-client.rb
+- test/test-command.rb
+- test/test-script-syntax.rb