groonga-command 1.2.9 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1845fa485926c638e58f55c29020a4227cbafa3d
-  data.tar.gz: f410651029985778155761b14d21489e54773aa2
+  metadata.gz: afa89d09d8efc12ca74d48129881d5a327995e1b
+  data.tar.gz: 2ef702ff862788373a4208fd34342797fe6e6256
 SHA512:
-  metadata.gz: f45829ed15208c836bc08af5f92c9f14eb95c558962b0cf1c7f3b50be90dcbb635a601a9e7aa0361f3c473a761e8f2f1a664ed3a80f498c1d06fbea82e2433de
-  data.tar.gz: 7e0aa2da9e04ff65ddd853fc22ec0d7252b854229c810ff57544cbbbdff3d804ae253412f1742bf0e4493c1fabb006afdd3a360141f6bcd450fa7994cedd137a
+  metadata.gz: a8a28ba413387eaaeae03810c0d4229b7e4412c76a855bb4563abe1bc1a89a4c4851d88ad8fe6f1690a97110aaaffdefaac581379e6b01452936f89bf4eb2654
+  data.tar.gz: 9f4ad75123c52bdd7a9e73e2dcc44d34705cca63de756b84aea774889393a982f868d9ccec5036a9e85960bf3c9130c9adebee83c318a380436a5a62c91b4f8f

data/doc/text/news.md

@@ -1,5 +1,13 @@
 # News
 
+## 1.3.0: 2016-12-08
+
+### Improvements
+
+  * {Groonga::Command::Load}: Supported `output_ids` parameter.
+
+  * {Groonga::Command::Select}: Supported slices.
+
 ## 1.2.8: 2016-10-11
 
 ### Improvements

data/lib/groonga/command/load.rb

@@ -36,6 +36,7 @@ module Groonga
             :ifexists,
             :input_type,
             :each,
+            :output_ids,
           ]
         end
       end
@@ -58,6 +59,13 @@ module Groonga
         @columns ||= parse_columns(self[:columns])
       end
 
+      # @return [Boolean] `true` if `output_ids` value is `"yes"`.
+      #
+      # @since 1.3.0
+      def output_ids?
+        self[:output_ids] == "yes"
+      end
+
       private
       def parse_values(values)
         return values if values.nil?

data/lib/groonga/command/select.rb

@@ -1,4 +1,5 @@
 # Copyright (C) 2012-2016  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
@@ -106,6 +107,13 @@ module Groonga
         @labeled_drilldowns ||= parse_labeled_drilldowns
       end
 
+      # @return [::Hash<String, Select>] The slices.
+      #
+      # @since 1.3.0
+      def slices
+        @slices ||= parse_slices
+      end
+
       def output_columns
         self[:output_columns]
       end
@@ -157,6 +165,28 @@ module Groonga
         labeled_drilldowns
       end
 
+      def parse_slices
+        raw_slices = {}
+        @arguments.each do |name, value|
+          case name.to_s
+          when /\Aslices?\[(.+?)\]\.(.+?)\z/
+            label = $1
+            parameter_name = $2
+            raw_slices[label] ||= {}
+            raw_slices[label][parameter_name] = value
+          end
+        end
+        build_slices(raw_slices)
+      end
+
+      def build_slices(raw_slices)
+        slices = {}
+        raw_slices.each do |label, raw_slice|
+          slices[label] = Select.new(raw_slice)
+        end
+        slices
+      end
+
       class Drilldown < Struct.new(:keys,
                                    :sort_keys,
                                    :output_columns,

data/lib/groonga/command/version.rb

@@ -16,6 +16,6 @@
 
 module Groonga
   module Command
-    VERSION = "1.2.9"
+    VERSION = "1.3.0"
   end
 end

data/test/command/test-load.rb

@@ -31,6 +31,7 @@ class LoadCommandTest < Test::Unit::TestCase
       ifexists   = "_key == \"Alice\""
       input_type = "json"
       each       = "strlen(_key)"
+      output_ids = "no"
 
       ordered_arguments = [
         values,
@@ -39,6 +40,7 @@ class LoadCommandTest < Test::Unit::TestCase
         ifexists,
         input_type,
         each,
+        output_ids,
       ]
       command = load_command({}, ordered_arguments)
       assert_equal({
@@ -48,6 +50,7 @@ class LoadCommandTest < Test::Unit::TestCase
                      :ifexists   => ifexists,
                      :input_type => input_type,
                      :each       => each,
+                     :output_ids => output_ids,
                    },
                    command.arguments)
     end
@@ -87,4 +90,20 @@ class LoadCommandTest < Test::Unit::TestCase
                    })
     end
   end
+
+  class OutputIDsTest < self
+    def test_specified
+      command = load_command({"output_ids" => "yes"})
+      assert do
+        command.output_ids?
+      end
+    end
+
+    def test_omitted
+      command = load_command
+      assert do
+        not command.output_ids?
+      end
+    end
+  end
 end

data/test/command/test-select.rb

@@ -1,4 +1,5 @@
 # Copyright (C) 2011-2016  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
@@ -216,4 +217,24 @@ class SelectCommandTest < Test::Unit::TestCase
       drilldown
     end
   end
+
+  class SlicesTest < self
+    def test_multiple
+      parameters = {
+        "slices[groonga].query" => "tag:Groonga",
+        "slices[rroonga].filter" => "tag == Rroonga",
+        "slices[rroonga].sort_keys" => "date",
+        "slices[rroonga].output_columns" => "_key, date",
+      }
+      command = select_command(parameters)
+
+      slices = {
+        "groonga" => select_command(:query => "tag:Groonga"),
+        "rroonga" => select_command(:filter => "tag == Rroonga",
+                                    :sort_keys => "date",
+                                    :output_columns => "_key, date"),
+      }
+      assert_equal(slices, command.slices)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groonga-command
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.3.0
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2016-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -266,54 +266,54 @@ specification_version: 4
 summary: Groonga-command is a library that represents [Groonga](http://groonga.org/)'s
   command. You can write a program that handle Groonga's command by using groonga-command.
 test_files:
-- test/groonga-command-test-utils.rb
-- test/command/test-config-delete.rb
-- test/command/test-object-remove.rb
-- test/command/test-table-tokenize.rb
+- test/run-test.rb
+- test/command/test-column-rename.rb
+- test/command/test-table-remove.rb
+- test/command/test-object-inspect.rb
+- test/command/test-truncate.rb
 - test/command/test-reindex.rb
-- test/command/test-plugin-unregister.rb
-- test/command/test-io-flush.rb
-- test/command/test-base.rb
-- test/command/test-logical-count.rb
+- test/command/test-normalize.rb
+- test/command/test-tokenize.rb
 - test/command/test-table-rename.rb
-- test/command/test-column-rename.rb
+- test/command/test-logical-range-filter.rb
 - test/command/test-dump.rb
-- test/command/test-normalize.rb
+- test/command/test-suggest.rb
+- test/command/test-request-cancel.rb
+- test/command/test-config-set.rb
+- test/command/test-get.rb
+- test/command/test-query-expand.rb
+- test/command/test-logical-select.rb
+- test/command/test-column-create.rb
+- test/command/test-log-put.rb
 - test/command/test-config-get.rb
+- test/command/test-log-level.rb
+- test/command/test-column-list.rb
 - test/command/test-register.rb
+- test/command/test-ruby-eval.rb
+- test/command/test-plugin-register.rb
+- test/command/test-table-list.rb
+- test/command/test-logical-table-remove.rb
+- test/command/test-config-delete.rb
 - test/command/test-shutdown.rb
-- test/command/test-delete.rb
-- test/command/test-column-copy.rb
-- test/command/test-tokenize.rb
-- test/command/test-log-put.rb
+- test/command/test-io-flush.rb
+- test/command/test-table-create.rb
+- test/command/test-ruby-load.rb
 - test/command/test-load.rb
-- test/command/test-column-list.rb
-- test/command/test-plugin-register.rb
-- test/command/test-request-cancel.rb
-- test/command/test-column-create.rb
-- test/command/test-config-set.rb
-- test/command/test-logical-range-filter.rb
-- test/command/test-object-inspect.rb
+- test/command/test-delete.rb
+- test/command/test-select.rb
+- test/command/test-plugin-unregister.rb
+- test/command/test-column-remove.rb
+- test/command/test-range-filter.rb
 - test/command/format/test-command.rb
-- test/command/test-logical-select.rb
-- test/command/test-get.rb
-- test/command/test-thread-limit.rb
-- test/command/test-table-list.rb
+- test/command/test-column-copy.rb
+- test/command/test-base.rb
 - test/command/test-object-exist.rb
-- test/command/test-log-level.rb
-- test/command/test-range-filter.rb
 - test/command/test-status.rb
-- test/command/test-logical-shard-list.rb
+- test/command/test-thread-limit.rb
 - test/command/test-schema.rb
-- test/command/test-suggest.rb
-- test/command/test-select.rb
-- test/command/test-column-remove.rb
-- test/command/test-ruby-eval.rb
-- test/command/test-table-create.rb
-- test/command/test-table-remove.rb
-- test/command/test-ruby-load.rb
+- test/command/test-table-tokenize.rb
+- test/command/test-logical-shard-list.rb
 - test/command/test-table-copy.rb
-- test/command/test-query-expand.rb
-- test/command/test-truncate.rb
-- test/command/test-logical-table-remove.rb
-- test/run-test.rb
+- test/command/test-object-remove.rb
+- test/command/test-logical-count.rb
+- test/groonga-command-test-utils.rb