groonga-client 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c6eb335d9ea4011c1e5b3681dfd8e9252796b95d24c802df1a769757821b8bf
-  data.tar.gz: 19824fe10455c126d229c1af171a8483ee67b15df08df78a9b8ec43dc0e661cd
+  metadata.gz: ad8ac6fe851f63509ad13e5c8abb1541ff2f47631764b86bc23ffc85719ae56a
+  data.tar.gz: 558bc6f1e08568791ca791a3be107b9f075864096bf003ca9cb37dc273a7479b
 SHA512:
-  metadata.gz: b48b94c52345192fbb20ffbde0d450cd819ca97097b4b0a549ed285645f7a85278392ce51abefb29b055c8505aca5574789e0312fc81b6a7615eeed261e57933
-  data.tar.gz: 2d58742abe16488dbcfcde075d9102b3988f27b58e8c398a60ba75406d0b17e11ac2ebf8d708c7ebe1b9e7b1a13adad0a59fdabaf646cd376c3463925f7f9f5c
+  metadata.gz: 9bde0f05e3d9a17f545bacad7cd6c91099ea65e1371d015860b5f18d714b31d875ba615b21ac6c8bba15333ce7f760b673c6ecf31e8daa8ebc726b79f53618a8
+  data.tar.gz: e992b6e14dac0073485a909886c128acca19af991a9d45dc89a57ed1557754a9ab5fe38edd687bcbd86a571dc0155264752b671cf1861e2353c9a12f40309507

data/doc/text/news.md

@@ -1,5 +1,12 @@
 # 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

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

@@ -73,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
@@ -173,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]))
@@ -271,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/version.rb

@@ -16,6 +16,6 @@
 
 module Groonga
   class Client
-    VERSION = "0.6.5"
+    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/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.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Haruka Yoshihara
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-15 00:00:00.000000000 Z
+date: 2021-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gqtp
@@ -197,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