groonga-client 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eaec3aab0752df6b5832fe16cb3c79d107103636b06a603ecb2e453bd6e29bec
-  data.tar.gz: cc03ea25d9b87599a6fc10cc553716c3bd7e0b885b2887f7a414b0377490e37d
+  metadata.gz: 03b68a1a7f59bc34045692dd2e552ce9f794bba69e7093bc6190e51fb0193be7
+  data.tar.gz: 14694be087dafa31671b4965b0c8ff04a8dde8c96050c2284215e3d93c5e1c3e
 SHA512:
-  metadata.gz: 16a4c67ddfa8bb7f401ff0cd5f49d852f3f279966c3839379ae0ed0f29629b8402ae7b14a87087f263440b8ee0365eb646688a8a3ad7b1cc9979d9ddd3bc61d1
-  data.tar.gz: 86c7edc062f853a4d56e18b0b43477f6317630471de314d4952ab8dd7b9a85146180ce8d5e93ce7f687e0345ec6a26f938846409b3ad3bdcd45677ec4e0029f2
+  metadata.gz: c32a87151621709018d2d2e13e71443558852ff2e2834f3241caacb389534179872d47f7dad739c63b131aadd328a738cd6d571b7859bcaf02393cb42779ef94
+  data.tar.gz: b87752ad00e9c4a7bed662ec5c14f0ad7a3f2a0ec4b5394ad7e02c20bb45329800500f555567a7798c424a186240bb44d8340cb749fa6638fbdfa4f9f2444692

data/doc/text/news.md

@@ -1,5 +1,12 @@
 # NEWS
 
+## 0.6.1 - 2019-07-27
+
+### Improvements
+
+  * `Groonga::Client::Request::Select`: Added support for drilldowns
+    in slice.
+
 ## 0.6.0 - 2018-08-30
 
 ### Improvements

data/lib/groonga/client/response/select.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2019  Sutou Kouhei <kou@clear-code.com>
 # Copyright (C) 2013  Kosuke Asami
 # Copyright (C) 2016  Masafumi Yokoyama <yokoyama@clear-code.com>
 #
@@ -329,8 +329,19 @@ module Groonga
         def parse_slices_v1(raw_slices)
           slices = {}
           (raw_slices || {}).each do |key, raw_slice|
+            if raw_slice.last.is_a?(::Hash)
+              raw_drilldowns = raw_slice.last
+              raw_slice = raw_slice[0..-2]
+              drilldowns = {}
+              raw_drilldowns.each do |label, raw_drilldown|
+                n_hits, records = parse_match_records_v1(raw_drilldown)
+                drilldowns[label] = Drilldown.new(label, n_hits, records)
+              end
+            else
+              drilldowns = {}
+            end
             n_hits, records = parse_match_records_v1(raw_slice)
-            slices[key] = Slice.new(key, n_hits, records)
+            slices[key] = Slice.new(key, n_hits, records, drilldowns)
           end
           slices
         end
@@ -339,7 +350,8 @@ module Groonga
           slices = {}
           (raw_slices || {}).each do |key, raw_slice|
             n_hits, records = parse_match_records_v3(raw_slice)
-            slices[key] = Slice.new(key, n_hits, records)
+            drilldowns = parse_drilldowns_v3(raw_slice["drilldowns"])
+            slices[key] = Slice.new(key, n_hits, records, drilldowns)
           end
           slices
         end
@@ -353,7 +365,7 @@ module Groonga
           alias_method :items, :records
         end
 
-        class Slice < Struct.new(:key, :n_hits, :records)
+        class Slice < Struct.new(:key, :n_hits, :records, :drilldowns)
         end
       end
     end

data/lib/groonga/client/version.rb

@@ -16,6 +16,6 @@
 
 module Groonga
   class Client
-    VERSION = "0.6.0"
+    VERSION = "0.6.1"
   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-2019  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
@@ -375,10 +414,23 @@ class TestResponseSelectCommandVersion1 < Test::Unit::TestCase
         create_response(body).slices
       end
 
+      def build_drilldown(label, n_hits, records)
+        Groonga::Client::Response::Select::Drilldown.new(label,
+                                                         n_hits,
+                                                         records)
+      end
+
       def collect_values(body)
         values = {}
         slices(body).each do |label, slice|
-          values[label] = yield(slice)
+          drilldowns = {}
+          slice.drilldowns.each do |label, drilldown|
+            drilldowns[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-2019  Sutou Kouhei <kou@clear-code.com>
 # Copyright (C) 2013  Kosuke Asami
 # Copyright (C) 2016  Masafumi Yokoyama <yokoyama@clear-code.com>
 #
@@ -319,7 +319,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 +356,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 +381,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 |label, drilldown|
+            drilldowns[label] = drilldown.records
+          end
+          values[label] = {
+            records: slice.records,
+            drilldowns: drilldowns,
+          }
         end
         values
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groonga-client
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Haruka Yoshihara
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-30 00:00:00.000000000 Z
+date: 2019-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gqtp
@@ -161,9 +161,9 @@ email:
 - kou@clear-code.com
 - tfortress58@gmail.com
 executables:
-- groonga-client
-- groonga-client-index-check
 - groonga-client-index-recreate
+- groonga-client-index-check
+- groonga-client
 extensions: []
 extra_rdoc_files: []
 files:
@@ -283,42 +283,42 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 3.0.0.beta1
+rubygems_version: 2.7.6.2
 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/results/test-table-list.rb
 - test/test-script-syntax.rb
-- test/protocol/test-http.rb
-- test/protocol/test-gqtp.rb
-- test/response/test-schema.rb
-- test/response/test-select-tsv.rb
-- test/response/test-error.rb
-- test/response/test-table-remove.rb
-- test/response/test-select-xml.rb
+- test/response/test-table-create.rb
+- test/response/helper.rb
 - test/response/test-select-command-version3.rb
-- test/response/test-table-list.rb
 - test/response/test-column-list.rb
+- test/response/test-select-xml.rb
 - test/response/test-load.rb
-- test/response/helper.rb
-- test/response/test-base.rb
 - test/response/test-select-command-version1.rb
+- test/response/test-select-tsv.rb
+- test/response/test-table-list.rb
 - test/response/test-status.rb
-- test/response/test-table-create.rb
-- test/results/test-table-list.rb
-- test/test-command.rb
+- test/response/test-schema.rb
+- test/response/test-base.rb
+- test/response/test-error.rb
+- test/response/test-table-remove.rb
+- test/command-line/helper.rb
+- test/command-line/test-index-recreate.rb
+- test/command-line/test-index-check.rb
 - test/run-test.rb
-- test/request/test-generic.rb
+- test/test-command.rb
+- test/request/select/test-backward-compatible-sort-keys-parameter.rb
 - test/request/select/test-values-parameter.rb
-- test/request/select/test-output-columns-parameter.rb
 - test/request/select/test-scorer.rb
-- test/request/select/test-backward-compatible-sort-keys-parameter.rb
 - test/request/select/test-filter.rb
+- test/request/select/test-output-columns-parameter.rb
 - test/request/select/test-sort-keys-parameter.rb
-- test/request/test-select.rb
+- test/request/test-generic.rb
 - test/request/test-merger.rb
+- test/request/test-select.rb
 - test/test-client.rb
-- test/command-line/test-index-recreate.rb
-- test/command-line/helper.rb
-- test/command-line/test-index-check.rb
+- test/protocol/test-gqtp.rb
+- test/protocol/test-http.rb