groonga-client 0.6.2 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e58e455931babab20e77e8944bce91b4fcd7dc6aee073afb016fbb127d341a2d
-  data.tar.gz: 3a5ba751046673d6d32ed7d27b15f2b036740c43dd424741b4e56a176efeab9c
+  metadata.gz: ad8ac6fe851f63509ad13e5c8abb1541ff2f47631764b86bc23ffc85719ae56a
+  data.tar.gz: 558bc6f1e08568791ca791a3be107b9f075864096bf003ca9cb37dc273a7479b
 SHA512:
-  metadata.gz: 1e41055f62099dc806883965e9636e7d0be252f40600665e0cc4d53476409f34aaf4bc25fd06e41cfbb79b37bf3a3b562db275b7e4394ca45c3db022ecd9e900
-  data.tar.gz: '0284a3e869fb7fc1efd8d7048694f043f4d78794c7a8b279a22a5303f7597fa417be7cef9d2bc7391a475aec3b57de8bed7437d20f9663bb29c4d4ea3793cd60'
+  metadata.gz: 9bde0f05e3d9a17f545bacad7cd6c91099ea65e1371d015860b5f18d714b31d875ba615b21ac6c8bba15333ce7f760b673c6ecf31e8daa8ebc726b79f53618a8
+  data.tar.gz: e992b6e14dac0073485a909886c128acca19af991a9d45dc89a57ed1557754a9ab5fe38edd687bcbd86a571dc0155264752b671cf1861e2353c9a12f40309507

data/doc/text/news.md

@@ -1,5 +1,40 @@
 # NEWS
 
+## 0.6.6 - 2021-12-10
+
+### Improvements
+
+  * `Groonga::Client::CommandProcessor`: Extracted Groonga command processor
+    from `groonga-client` command implementation.
+
+## 0.6.5 - 2021-03-15
+
+### Fixes
+
+  * `Groonga::Client::Request::Select::LabeledDrilldown#keys`: Fixed a
+    bug that this uses wrong parameter name.
+
+## 0.6.4 - 2021-02-24
+
+### Improvements
+
+  * Added support for Ruby 3.0.
+
+## 0.6.3 - 2020-06-08
+
+### Improvements
+
+  * `groonga-client`:
+
+    * Added support for `-load-input-type=apache-arrow`.
+
+    * Added `--load-lock-table`.
+
+  * `http`: Added support for debugging by
+    `GROONGA_CLIENT_HTTP_DEBUG=yes` environment variable.
+
+  * Added support for response in Apache Arrow.
+
 ## 0.6.2 - 2019-09-02
 
 ### Improvements

data/groonga-client.gemspec

@@ -1,7 +1,7 @@
 # -*- mode: ruby -*-
 #
 # Copyright (C) 2013  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2014-2019  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2014-2021  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
@@ -48,9 +48,10 @@ Gem::Specification.new do |spec|
   end
 
   spec.add_runtime_dependency("gqtp", ">= 1.0.4")
-  spec.add_runtime_dependency("groonga-command", ">= 1.4.5")
+  spec.add_runtime_dependency("groonga-command", ">= 1.4.7")
   spec.add_runtime_dependency("groonga-command-parser", ">= 1.1.0")
   spec.add_runtime_dependency("hashie")
+  spec.add_runtime_dependency("rexml")
 
   spec.add_development_dependency("bundler")
   spec.add_development_dependency("rake")

data/lib/groonga/client/command-line/groonga-client.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2018  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2015-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
@@ -19,6 +19,11 @@ require "json"
 require "pathname"
 require "securerandom"
 
+begin
+  require "arrow"
+rescue LoadError
+end
+
 require "groonga/command/parser"
 
 require "groonga/client"
@@ -30,6 +35,12 @@ module Groonga
       class GroongaClient
         def initialize
           @chunk = false
+          @load_input_type = "json"
+          @available_load_input_types = ["json"]
+          if Object.const_defined?(:Arrow)
+            @available_load_input_types << "apache-arrow"
+          end
+          @load_lock_table = false
 
           @runner_options = {
             :split_load_chunk_size => 10000,
@@ -46,7 +57,9 @@ module Groonga
             parse_command_line(option_parser)
           end
 
-          parser.open_client(:chunk => @chunk) do |client|
+          parser.open_client(:chunk => @chunk,
+                             :load_input_type => @load_input_type,
+                             :load_lock_table => @load_lock_table) do |client|
             runner = Runner.new(client, @runner_options)
 
             if command_file_paths.empty?
@@ -60,22 +73,11 @@ module Groonga
                 end
                 repl.run
               else
-                $stdin.each_line do |line|
-                  runner << line
-                end
+                runner.consume($stdin)
               end
             else
               command_file_paths.each do |command_file_path|
-                File.open(command_file_path) do |command_file|
-                  last_line = nil
-                  command_file.each_line do |line|
-                    last_line = line
-                    runner << line
-                end
-                  if last_line and !last_line.end_with?("\n")
-                    runner << "\n"
-                  end
-                end
+                runner.load(command_file_path)
               end
             end
             runner.finish
@@ -99,6 +101,20 @@ module Groonga
             @runner_options[:split_load_chunk_size] = size
           end
 
+          parser.on("--load-input-type=TYPE",
+                    @available_load_input_types,
+                    "Use TYPE as input type for load.",
+                    "[#{@available_load_input_types.join(", ")}]",
+                    "(#{@load_input_types})") do |type|
+            @load_input_type = type
+          end
+
+          parser.on("--[no-]load-lock-table",
+                    "Use lock_table=yes for load.",
+                    "(#{@load_lock_table})") do |boolean|
+            @load_lock_table = boolean
+          end
+
           parser.on("--[no-]generate-request-id",
                     "Add auto generated request ID to all commands.",
                     "(#{@runner_options[:generate_request_id]})") do |boolean|
@@ -146,95 +162,9 @@ module Groonga
           end
         end
 
-        class Runner
-          def initialize(client, options={})
-            @client = client
-            @split_load_chunk_size = options[:split_load_chunk_size] || 10000
-            @generate_request_id   = options[:generate_request_id]
-            @target_commands       = options[:target_commands]
-            @target_tables         = options[:target_tables]
-            @target_columns        = options[:target_columns]
-            @load_values = []
-            @parser = create_command_parser
-          end
-
-          def <<(line)
-            @parser << line
-          end
-
-          def finish
-            @parser.finish
-          end
-
-          def repl
-            begin
-              require "readline"
-            rescue LoadError
-              repl = BareREPL.new(self)
-            else
-              repl = ReadlineREPL.new(self)
-              repl_readline
-            end
-          end
-
+        class Runner < CommandProcessor
           private
-          def create_command_parser
-            parser = Groonga::Command::Parser.new
-
-            parser.on_command do |command|
-              run_command(command)
-            end
-
-            parser.on_load_columns do |command, columns|
-              command[:columns] ||= columns.join(",")
-            end
-
-            parser.on_load_value do |command, value|
-              unless command[:values]
-                @load_values << value
-                if @load_values.size == @split_load_chunk_size
-                  consume_load_values(command)
-                end
-              end
-              command.original_source.clear
-            end
-
-            parser.on_load_complete do |command|
-              if command[:values]
-                run_command(command)
-              else
-                consume_load_values(command)
-              end
-            end
-
-            parser
-          end
-
-          def consume_load_values(load_command)
-            return if @load_values.empty?
-
-            values_json = "["
-            @load_values.each_with_index do |value, i|
-              values_json << "," unless i.zero?
-              values_json << "\n"
-              values_json << JSON.generate(value)
-            end
-            values_json << "\n]\n"
-            load_command[:values] = values_json
-            run_command(load_command)
-            @load_values.clear
-            load_command[:values] = nil
-          end
-
-          def run_command(command)
-            return unless target_command?(command)
-            return unless target_table?(command)
-            return unless target_column?(command)
-
-            command = Marshal.load(Marshal.dump(command))
-            apply_target_columns(command)
-            command[:request_id] ||= SecureRandom.uuid if @generate_request_id
-            response = @client.execute(command)
+          def process_response(response, command)
             case command.output_type
             when :json
               puts(JSON.pretty_generate([response.header, response.body]))
@@ -244,92 +174,6 @@ module Groonga
               puts(response.body)
             end
           end
-
-          def target_command?(command)
-            return true if @target_commands.empty?
-
-            @target_commands.any? do |name|
-              name === command.command_name
-            end
-          end
-
-          def target_table?(command)
-            return true if @target_tables.empty?
-
-            target = nil
-            case command.command_name
-            when "load", "column_create", "select"
-              target = command.table
-            when "table_create", "table_remove"
-              target = command.name
-            end
-            return true if target.nil?
-
-            @target_tables.any? do |name|
-              name === target
-            end
-          end
-
-          def target_column?(command)
-            return true if @target_columns.empty?
-
-            target = nil
-            case command.command_name
-            when "column_create"
-              target = command.name
-            end
-            return true if target.nil?
-
-            @target_columns.any? do |name|
-              name === target
-            end
-          end
-
-          def apply_target_columns(command)
-            return if @target_columns.empty?
-
-            values = command[:values]
-            return if values.nil?
-
-            command = command.dup
-
-            values = JSON.parse(values)
-            columns = command[:columns]
-            if columns
-              columns = columns.split(/\s*,\s*/)
-              target_indexes = []
-              new_columns = []
-              columns.each_with_index do |column, i|
-                if load_target_column?(column)
-                  target_indexes << i
-                  new_columns << column
-                end
-              end
-              command[:columns] = new_columns.join(",")
-              new_values = values.collect do |value|
-                target_indexes.collect do |i|
-                  value[i]
-                end
-              end
-              command[:values] = JSON.generate(new_values)
-            else
-              new_values = values.collect do |value|
-                new_value = {}
-                value.each do |key, value|
-                  if load_target_column?(key)
-                    new_value[key] = value
-                  end
-                end
-                new_value
-              end
-              command[:values] = JSON.generate(new_values)
-            end
-          end
-
-          def load_target_column?(column)
-            column == "_key" or
-              @target_columns.any? {|name| name === column}
-          end
         end
 
         class BareREPL

data/lib/groonga/client/command-processor.rb

@@ -0,0 +1,211 @@
+# Copyright (C) 2015-2021  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
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+require "json"
+
+require "groonga/command/parser"
+
+module Groonga
+  class Client
+    class CommandProcessor
+      def initialize(client, options={})
+        @client = client
+        @split_load_chunk_size = options[:split_load_chunk_size] || 10000
+        @generate_request_id   = options[:generate_request_id]
+        @target_commands       = options[:target_commands]
+        @target_tables         = options[:target_tables]
+        @target_columns        = options[:target_columns]
+        @load_values = []
+        @parser = create_command_parser
+      end
+
+      def <<(line)
+        @parser << line
+      end
+
+      def finish
+        @parser.finish
+      end
+
+      def consume(input)
+        last_line = nil
+        input.each_line do |line|
+          last_line = line
+          @parser << line
+        end
+        if last_line and last_line.end_with?("\n")
+          @parser << "\n"
+        end
+      end
+
+      def load(path)
+        File.open(path) do |input|
+          consume(input)
+        end
+      end
+
+      private
+      def create_command_parser
+        parser = Groonga::Command::Parser.new
+
+        parser.on_command do |command|
+          run_command(command)
+        end
+
+        parser.on_load_columns do |command, columns|
+          command[:columns] ||= columns.join(",")
+        end
+
+        parser.on_load_value do |command, value|
+          unless command[:values]
+            @load_values << value
+            if @load_values.size == @split_load_chunk_size
+              consume_load_values(command)
+            end
+          end
+          command.original_source.clear
+        end
+
+        parser.on_load_complete do |command|
+          if command[:values]
+            run_command(command)
+          else
+            consume_load_values(command)
+          end
+        end
+
+        parser
+      end
+
+      def consume_load_values(load_command)
+        return if @load_values.empty?
+
+        values_json = "["
+        @load_values.each_with_index do |value, i|
+          values_json << "," unless i.zero?
+          values_json << "\n"
+          values_json << JSON.generate(value)
+        end
+        values_json << "\n]\n"
+        load_command[:values] = values_json
+        run_command(load_command)
+        @load_values.clear
+        load_command[:values] = nil
+      end
+
+      def run_command(command)
+        return unless target_command?(command)
+        return unless target_table?(command)
+        return unless target_column?(command)
+
+        command = Marshal.load(Marshal.dump(command))
+        apply_target_columns(command)
+        command[:request_id] ||= SecureRandom.uuid if @generate_request_id
+        response = @client.execute(command)
+        process_response(response, command)
+      end
+
+      def process_response(response, command)
+      end
+
+      def target_command?(command)
+        return true if @target_commands.empty?
+
+        @target_commands.any? do |name|
+          name === command.command_name
+        end
+      end
+
+      def target_table?(command)
+        return true if @target_tables.empty?
+
+        target = nil
+        case command.command_name
+        when "load", "column_create", "select"
+          target = command.table
+        when "table_create", "table_remove"
+          target = command.name
+        end
+        return true if target.nil?
+
+        @target_tables.any? do |name|
+          name === target
+        end
+      end
+
+      def target_column?(command)
+        return true if @target_columns.empty?
+
+        target = nil
+        case command.command_name
+        when "column_create"
+          target = command.name
+        end
+        return true if target.nil?
+
+        @target_columns.any? do |name|
+          name === target
+        end
+      end
+
+      def apply_target_columns(command)
+        return if @target_columns.empty?
+
+        values = command[:values]
+        return if values.nil?
+
+        command = command.dup
+
+        values = JSON.parse(values)
+        columns = command[:columns]
+        if columns
+          columns = columns.split(/\s*,\s*/)
+          target_indexes = []
+          new_columns = []
+          columns.each_with_index do |column, i|
+            if load_target_column?(column)
+              target_indexes << i
+              new_columns << column
+            end
+          end
+          command[:columns] = new_columns.join(",")
+          new_values = values.collect do |value|
+            target_indexes.collect do |i|
+              value[i]
+            end
+          end
+          command[:values] = JSON.generate(new_values)
+        else
+          new_values = values.collect do |value|
+            new_value = {}
+            value.each do |key, value|
+              if load_target_column?(key)
+                new_value[key] = value
+              end
+            end
+            new_value
+          end
+          command[:values] = JSON.generate(new_values)
+        end
+      end
+
+      def load_target_column?(column)
+        column == "_key" or
+          @target_columns.any? {|name| name === column}
+      end
+    end
+  end
+end

data/lib/groonga/client/protocol/http/synchronous.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2013  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2013-2016  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
@@ -55,9 +55,15 @@ module Groonga
             @options = options
           end
 
+          DEBUG = (ENV["GROONGA_CLIENT_HTTP_DEBUG"] == "yes")
           def send(command)
             begin
-              HTTPClient.start(@url.host, @url.port, start_options) do |http|
+              http = HTTPClient.new(@url.host, @url.port)
+              http.set_debug_output($stderr) if DEBUG
+              start_options.each do |key, value|
+                http.__send__("#{key}=", value)
+              end
+              http.start do
                 http.read_timeout = read_timeout
                 response = send_request(http, command)
                 case response
@@ -141,18 +147,7 @@ module Groonga
 
           def send_request(http, command)
             if command.is_a?(Groonga::Command::Load)
-              raw_values = command[:values]
-              command[:values] = nil
-              path = resolve_path(@url, command.to_uri_format)
-              command[:values] = raw_values
-              request = Net::HTTP::Post.new(path, headers)
-              request.content_type = "application/json"
-              if @options[:chunk]
-                request["Transfer-Encoding"] = "chunked"
-              else
-                request.content_length = raw_values.bytesize
-              end
-              request.body_stream = StringIO.new(raw_values)
+              request = prepare_load_request(command)
             else
               path = resolve_path(@url, command.to_uri_format)
               request = Net::HTTP::Get.new(path, headers)
@@ -167,6 +162,42 @@ module Groonga
             }
           end
 
+          def prepare_load_request(command)
+            path_prefix = command.path_prefix
+            command = command.class.new(command.command_name,
+                                        command.arguments,
+                                        [])
+            command.path_prefix = path_prefix
+            case @options[:load_input_type]
+            when "apache-arrow"
+              command[:input_type] = "apache-arrow"
+              content_type = "application/x-apache-arrow-streaming"
+              arrow_table = command.build_arrow_table
+              if arrow_table
+                buffer = Arrow::ResizableBuffer.new(1024)
+                arrow_table.save(buffer, format: :stream)
+                body = buffer.data.to_s
+              else
+                body = ""
+              end
+              command.arguments.delete(:values)
+            else
+              content_type = "application/json"
+              body = command.arguments.delete(:values)
+            end
+            command[:lock_table] = "yes" if @options[:load_lock_table]
+            path = resolve_path(@url, command.to_uri_format)
+            request = Net::HTTP::Post.new(path, headers)
+            if @options[:chunk]
+              request["Transfer-Encoding"] = "chunked"
+            else
+              request.content_length = body.bytesize
+            end
+            request.content_type = content_type
+            request.body_stream = StringIO.new(body)
+            request
+          end
+
           def setup_authentication(request)
             userinfo = @url.userinfo
             return if userinfo.nil?

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

@@ -595,7 +595,7 @@ module Groonga
           end
 
           def keys(values)
-            @request.values_parameter([:"#{prefix}keys"], values)
+            @request.values_parameter(:"#{prefix}keys", values)
           end
 
           def sort_keys(value)

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

@@ -19,6 +19,10 @@ require "csv"
 require "rexml/document"
 require "json"
 
+begin
+  require "arrow"
+rescue LoadError
+end
 require "hashie"
 
 module Groonga
@@ -86,6 +90,9 @@ module Groonga
             when :tsv
               header, body = parse_tsv(raw_response)
               return_code = header["return_code"] if header
+            when :arrow, :"apache-arrow"
+              header, body = parse_apache_arrow(raw_response)
+              return_code = header["return_code"] if header
             else
               header = nil
               body = raw_response
@@ -177,6 +184,40 @@ module Groonga
             end
             body
           end
+
+          def parse_apache_arrow(response)
+            header = nil
+            body = nil
+            buffer = Arrow::Buffer.new(response)
+            Arrow::BufferInputStream.open(buffer) do |input|
+              while input.tell < response.bytesize
+                reader = Arrow::RecordBatchStreamReader.new(input)
+                schema = reader.schema
+                record_batches = reader.to_a
+                if apache_arrow_metadata?(schema)
+                  table = Arrow::Table.new(schema, record_batches)
+                  header = table.each_record.first.to_h
+                else
+                  body = {}
+                  body["columns"] = schema.fields.collect do |field|
+                    [field.name, field.data_type.to_s]
+                  end
+                  if record_batches.empty?
+                    records = []
+                  else
+                    table = Arrow::Table.new(schema, record_batches)
+                    records = table.raw_records
+                  end
+                  body["records"] = records
+                end
+              end
+            end
+            return header, body
+          end
+
+          def apache_arrow_metadata?(schema)
+            (schema.metadata || {})["GROONGA:data_type"] == "metadata"
+          end
         end
 
         # @return [Groonga::Command] The command for the request.

data/lib/groonga/client/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2019  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2013-2021  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.6.2"
+    VERSION = "0.6.6"
   end
 end

data/lib/groonga/client.rb

@@ -18,12 +18,13 @@
 require "uri"
 require "json"
 
-require "groonga/client/default"
 require "groonga/client/command"
+require "groonga/client/command-processor"
+require "groonga/client/default"
 require "groonga/client/empty-request"
+require "groonga/client/protocol/file"
 require "groonga/client/protocol/gqtp"
 require "groonga/client/protocol/http"
-require "groonga/client/protocol/file"
 require "groonga/client/request"
 
 module Groonga
@@ -202,7 +203,7 @@ module Groonga
     end
 
     def method_missing(name, *args, &block)
-      if groonga_command_name?(name)
+      if groonga_command_name?(name) and args.size <= 1
         execute(name, *args, &block)
       else
         super

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-select-command-version1.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2019  Sutou Kouhei <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>
 #
@@ -418,8 +418,8 @@ class TestResponseSelectCommandVersion1 < Test::Unit::TestCase
         values = {}
         slices(body).each do |label, slice|
           drilldowns = {}
-          slice.drilldowns.each do |label, drilldown|
-            drilldowns[label] = drilldown.records
+          slice.drilldowns.each do |drilldown_label, drilldown|
+            drilldowns[drilldown_label] = drilldown.records
           end
           values[label] = {
             records: slice.records,

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2019  Sutou Kouhei <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>
 #
@@ -383,8 +383,8 @@ class TestResponseSelectCommandVersion3 < Test::Unit::TestCase
         values = {}
         slices(body).each do |label, slice|
           drilldowns = {}
-          slice.drilldowns.each do |label, drilldown|
-            drilldowns[label] = drilldown.records
+          slice.drilldowns.each do |drilldown_label, drilldown|
+            drilldowns[drilldown_label] = drilldown.records
           end
           values[label] = {
             records: slice.records,

data/test/test-command.rb

@@ -5,7 +5,8 @@ class TestCommand < Test::Unit::TestCase
 
   def test_column_create
     response = Object.new
-    mock(@client).execute(:column_create, :table => :Test, :name => :Body, :type => :ShortText) do
+    mock(@client).execute(:column_create,
+                          {table: :Test, name: :Body, type: :ShortText}) do
       response
     end
     @client.column_create(:table => :Test, :name => :Body, :type => :ShortText)
@@ -13,7 +14,7 @@ class TestCommand < Test::Unit::TestCase
 
   def test_column_list
     response = Object.new
-    mock(@client).execute(:column_list, :table => :Test) do
+    mock(@client).execute(:column_list, {table: :Test}) do
       response
     end
     @client.column_list(:table => :Test)
@@ -27,7 +28,7 @@ class TestCommand < Test::Unit::TestCase
       }
     ]
     response = Object.new
-    mock(@client).execute(:load, :table => :Test, :values => values.to_json) do
+    mock(@client).execute(:load, {table: :Test, values: values.to_json}) do
       response
     end
     @client.load(:table => :Test, :values => values.to_json)
@@ -35,7 +36,7 @@ class TestCommand < Test::Unit::TestCase
 
   def test_select
     response = Object.new
-    mock(@client).execute(:select, :table => :Test) do
+    mock(@client).execute(:select, {table: :Test}) do
       response
     end
     @client.select(:table => :Test)
@@ -43,7 +44,7 @@ class TestCommand < Test::Unit::TestCase
 
   def test_table_create
     response = Object.new
-    mock(@client).execute(:table_create, :name => :Test) do
+    mock(@client).execute(:table_create, {name: :Test}) do
       response
     end
     @client.table_create(:name => :Test)
@@ -58,7 +59,7 @@ class TestCommand < Test::Unit::TestCase
   end
 
   def test_table_remove
-    mock(@client).execute(:table_remove, :name => "Test")
+    mock(@client).execute(:table_remove, {name: "Test"})
     @client.table_remove(:name => "Test")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groonga-client
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.6
 platform: ruby
 authors:
 - Haruka Yoshihara
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-02 00:00:00.000000000 Z
+date: 2021-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gqtp
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.5
+        version: 1.4.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.5
+        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-index-recreate
-- groonga-client-index-check
 - groonga-client
+- groonga-client-index-check
+- groonga-client-index-recreate
 extensions: []
 extra_rdoc_files: []
 files:
@@ -183,6 +197,7 @@ files:
 - lib/groonga/client/command-line/groonga-client.rb
 - lib/groonga/client/command-line/parser.rb
 - lib/groonga/client/command-line/runner.rb
+- lib/groonga/client/command-processor.rb
 - lib/groonga/client/command.rb
 - lib/groonga/client/default.rb
 - lib/groonga/client/empty-request.rb
@@ -286,43 +301,42 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+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/results/test-table-list.rb
-- test/test-script-syntax.rb
-- test/response/test-table-create.rb
-- test/response/helper.rb
-- test/response/test-select-command-version3.rb
-- test/response/test-column-list.rb
-- test/response/test-select-xml.rb
-- test/response/test-load.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-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/test-command.rb
+- test/command-line/test-index-recreate.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-values-parameter.rb
-- test/request/select/test-scorer.rb
 - test/request/select/test-filter.rb
 - test/request/select/test-output-columns-parameter.rb
+- test/request/select/test-scorer.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/response/helper.rb
+- test/response/test-base.rb
+- test/response/test-column-list.rb
+- test/response/test-error.rb
+- test/response/test-load.rb
+- test/response/test-schema.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/protocol/test-gqtp.rb
-- test/protocol/test-http.rb
+- test/test-command.rb
+- test/test-script-syntax.rb