groonga-client 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ead7ebcefb79d2fa14ab98a8481e95a08d1214d7
-  data.tar.gz: afa29f5195d878858292ca79bed04f0906bb9d13
+  metadata.gz: 1d48aabe77a551429a057a3b1ab6146ae0922806
+  data.tar.gz: e59ee42028c1c5fa8c41297b6bd12c6ce09ac190
 SHA512:
-  metadata.gz: 4028a80ed0ecfc077431759597448916ebcb466ee33459b65715c12b16232af2d433ca3eb6cd9b4cb2c3ed61f3b389c87d9f09257608e53d2d1f40c8aa7732ba
-  data.tar.gz: 7727a9f72615a2e7c92df84755dc79ba05ecf0014b7ca2b20fda40b699cc2c912f4f9954edee9cca7d47f1bc84d318979eb8427a365ffcdb994b40b98d65ae0a
+  metadata.gz: f037cb0748f6d184a0146767b6560ab46bf1c12d7eb1d9d38fadf04be51490cd4d5ae1056bea4f0f4e55df662b532bbe6e560b93407bd94380df92a89367e1a7
+  data.tar.gz: 39c6fbec14c2d83993078458221a73c23dd43a5536ea0a3323fb3854982b5921b21567c365c5c50bb42d1e09edf5a6798868bbbc213893d52aa14c72c24a2253

data/doc/text/news.md

@@ -1,5 +1,23 @@
 # NEWS
 
+## 0.3.1 - 2016-10-11
+
+### Improvements
+
+  * `Groonga::Client#select`: Supported labeled drilldowns.
+
+  * `Groonga::Client::Response::Select#drilldowns`: Changed return
+    type for the following cases:
+
+      * Labeled drilldowns are used.
+
+      * Command version 3 or later is used.
+
+    It returns `{"label1" => drilldown1, "label2" => drilldown2}`
+    instead of `[drilldown1, drilldown2]`. It's a backward
+    incompatibility change for command version 3 or later case. But we
+    did it because command version 3 is still experimental version.
+
 ## 0.3.0 - 2016-10-05
 
 ### Fixes

data/groonga-client.gemspec

@@ -45,7 +45,7 @@ Gem::Specification.new do |spec|
   spec.test_files += Dir.glob("test/**/*")
 
   spec.add_runtime_dependency("gqtp", ">= 1.0.4")
-  spec.add_runtime_dependency("groonga-command", ">= 1.2.0")
+  spec.add_runtime_dependency("groonga-command", ">= 1.2.8")
   spec.add_runtime_dependency("hashie")
 
   spec.add_development_dependency("bundler")

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2015  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2016  Kouhei Sutou <kou@clear-code.com>
 # Copyright (C) 2013  Kosuke Asami
 #
 # This library is free software; you can redistribute it and/or
@@ -27,6 +27,14 @@ module Groonga
         #   a search condition.
         attr_accessor :n_hits
         attr_accessor :records
+
+        # @return [::Array<Groonga::Client::Response::Select::Drilldown>,
+        #          ::Hash<String, Groonga::Client::Response::Select::Drilldown>]
+        #   If labeled drilldowns are used or command version 3 or
+        #   later is used, `{"label1" => drilldown1, "label2" => drilldown2}`
+        #   is returned since 0.3.1.
+        #
+        #   Otherwise, `[drilldown1, drilldown2]` is returned.
         attr_accessor :drilldowns
 
         def body=(body)
@@ -105,18 +113,30 @@ module Groonga
         end
 
         def parse_drilldowns_v1(raw_drilldowns)
-          (raw_drilldowns || []).collect.with_index do |raw_drilldown, i|
-            key = @command.drilldowns[i]
-            n_hits, records = parse_match_records_v1(raw_drilldown)
-            Drilldown.new(key, n_hits, records)
+          request_drilldowns = @command.drilldowns
+          if request_drilldowns.empty? and !@command.labeled_drilldowns.empty?
+            drilldowns = {}
+            (raw_drilldowns[0] || {}).each do |label, raw_drilldown|
+              n_hits, records = parse_match_records_v1(raw_drilldown)
+              drilldowns[label] = Drilldown.new(label, n_hits, records)
+            end
+            drilldowns
+          else
+            (raw_drilldowns || []).collect.with_index do |raw_drilldown, i|
+              key = request_drilldowns[i]
+              n_hits, records = parse_match_records_v1(raw_drilldown)
+              Drilldown.new(key, n_hits, records)
+            end
           end
         end
 
         def parse_drilldowns_v3(raw_drilldowns)
-          (raw_drilldowns || {}).collect do |(key, raw_drilldown)|
+          drilldowns = {}
+          (raw_drilldowns || {}).each do |key, raw_drilldown|
             n_hits, records = parse_match_records_v3(raw_drilldown)
-            Drilldown.new(key, n_hits, records)
+            drilldowns[key] = Drilldown.new(key, n_hits, records)
           end
+          drilldowns
         end
 
         class Drilldown < Struct.new(:key, :n_hits, :records)

data/lib/groonga/client/version.rb

@@ -16,6 +16,6 @@
 
 module Groonga
   class Client
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

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

@@ -183,5 +183,137 @@ class TestResponseSelectCommandVersion1 < Test::Unit::TestCase
         create_response(body).drilldowns
       end
     end
+
+    class TestLabeledDrilldowns < self
+      def setup
+        pair_arguments = {
+          "drilldowns[tag].keys" => "tag",
+          "drilldowns[tag].output_columns" => "_key,_nsubrecs",
+          "drilldowns[author].keys" => "author",
+          "drilldowns[author].output_columns" => "_key,_nsubrecs",
+        }
+        @command = Groonga::Command::Select.new("select", pair_arguments)
+      end
+
+      def test_key
+        body = [
+          [[0], []],
+          {
+            "tag" => [
+              [29],
+              [
+                ["_key",      "ShortText"],
+                ["_nsubrecs", "Int32"],
+              ],
+              ["Groonga", 2],
+              ["Ruby",    9],
+              ["Rroonga", 1],
+            ],
+            "author" => [
+              [4],
+              [
+                ["_key",      "ShortText"],
+                ["_nsubrecs", "Int32"],
+              ],
+              ["Alice", 2],
+              ["Bob",   1],
+              ["Chris", 4],
+            ],
+          },
+        ]
+        assert_equal({
+                       "tag" => "tag",
+                       "author" => "author",
+                     },
+                     collect_values(body, &:key))
+      end
+
+      def test_n_hits
+        body = [
+          [[0], []],
+          {
+            "tag" => [
+              [29],
+              [
+                ["_key",      "ShortText"],
+                ["_nsubrecs", "Int32"],
+              ],
+              ["Groonga", 2],
+              ["Ruby",    9],
+              ["Rroonga", 1],
+            ],
+            "author" => [
+              [4],
+              [
+                ["_key",      "ShortText"],
+                ["_nsubrecs", "Int32"],
+              ],
+              ["Alice", 2],
+              ["Bob",   1],
+              ["Chris", 4],
+            ],
+          },
+        ]
+        assert_equal({
+                       "tag" => 29,
+                       "author" => 4,
+                     },
+                     collect_values(body, &:n_hits))
+      end
+
+      def test_items
+        body = [
+          [[0], []],
+          {
+            "tag" => [
+              [29],
+              [
+                ["_key",      "ShortText"],
+                ["_nsubrecs", "Int32"],
+              ],
+              ["Groonga", 2],
+              ["Ruby",    9],
+              ["Rroonga", 1],
+            ],
+            "author" => [
+              [4],
+              [
+                ["_key",      "ShortText"],
+                ["_nsubrecs", "Int32"],
+              ],
+              ["Alice", 2],
+              ["Bob",   1],
+              ["Chris", 4],
+            ],
+          },
+        ]
+        assert_equal({
+                       "tag" => [
+                         {"_key" => "Groonga", "_nsubrecs" => 2},
+                         {"_key" => "Ruby",    "_nsubrecs" => 9},
+                         {"_key" => "Rroonga", "_nsubrecs" => 1},
+                       ],
+                       "author" => [
+                         {"_key" => "Alice", "_nsubrecs" => 2},
+                         {"_key" => "Bob",   "_nsubrecs" => 1},
+                         {"_key" => "Chris", "_nsubrecs" => 4},
+                       ],
+                     },
+                     collect_values(body, &:items))
+      end
+
+      private
+      def drilldowns(body)
+        create_response(body).drilldowns
+      end
+
+      def collect_values(body)
+        values = {}
+        drilldowns(body).each do |label, drilldown|
+          values[label] = yield(drilldown)
+        end
+        values
+      end
+    end
   end
 end

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

@@ -195,8 +195,8 @@ class TestResponseSelectCommandVersion3 < Test::Unit::TestCase
             },
           },
         }
-        assert_equal(["tag"],
-                     drilldowns(body).collect(&:key))
+        assert_equal({"tag" => "tag"},
+                     collect_values(body, &:key))
       end
 
       def test_n_hits
@@ -225,8 +225,8 @@ class TestResponseSelectCommandVersion3 < Test::Unit::TestCase
             },
           },
         }
-        assert_equal([29],
-                     drilldowns(body).collect(&:n_hits))
+        assert_equal({"tag" => 29},
+                     collect_values(body, &:n_hits))
       end
 
       def test_items
@@ -255,20 +255,28 @@ class TestResponseSelectCommandVersion3 < Test::Unit::TestCase
             },
           },
         }
-        assert_equal([
-                       [
+        assert_equal({
+                       "tag" => [
                          {"_key" => "groonga", "_nsubrecs" => 29},
                          {"_key" => "Ruby",    "_nsubrecs" => 19},
                          {"_key" => "rroonga", "_nsubrecs" =>  9},
                        ],
-                     ],
-                     drilldowns(body).collect(&:items))
+                     },
+                     collect_values(body, &:items))
       end
 
       private
       def drilldowns(body)
         create_response(body).drilldowns
       end
+
+      def collect_values(body)
+        values = {}
+        drilldowns(body).each do |label, drilldown|
+          values[label] = yield(drilldown)
+        end
+        values
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groonga-client
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Haruka Yoshihara
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-05 00:00:00.000000000 Z
+date: 2016-10-11 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.0
+        version: 1.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.8
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -255,23 +255,22 @@ 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/test-script-syntax.rb
-- test/protocol/test-http.rb
+- test/test-command.rb
 - test/protocol/test-gqtp.rb
-- test/response/test-schema.rb
-- test/response/test-error.rb
-- test/response/test-table-remove.rb
-- test/response/test-select-command-version3.rb
-- test/response/test-table-list.rb
+- test/protocol/test-http.rb
+- test/run-test.rb
+- test/response/test-base.rb
 - test/response/test-column-list.rb
 - test/response/helper.rb
-- test/response/test-base.rb
-- test/response/test-select-command-version1.rb
+- test/response/test-error.rb
+- test/response/test-table-list.rb
 - test/response/test-status.rb
+- test/response/test-schema.rb
+- test/response/test-select-command-version3.rb
+- test/response/test-select-command-version1.rb
 - test/response/test-table-create.rb
-- test/results/test-table-list.rb
+- test/response/test-table-remove.rb
 - test/results/test-column-list.rb
-- test/test-command.rb
-- test/run-test.rb
-- test/test-client.rb
-has_rdoc: 
+- test/results/test-table-list.rb