groonga-client 0.5.9 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16493f7abb6c08faa1f10060a64bedca44071acc4772ed06ac400a91a4b96282
-  data.tar.gz: 0c94271fb51d35d2758e423a7d52cacc46488ae1c6afbc9ab947b3093dedcfee
+  metadata.gz: eaec3aab0752df6b5832fe16cb3c79d107103636b06a603ecb2e453bd6e29bec
+  data.tar.gz: cc03ea25d9b87599a6fc10cc553716c3bd7e0b885b2887f7a414b0377490e37d
 SHA512:
-  metadata.gz: 8df38010cd75c8e29bd0461243ed0ce07a6cb7efe84450e2eae1e5a8612cd3237be4f00c37bda7a10bbd7016bf5be88507961016337664c988a27ee5c66487b5
-  data.tar.gz: 3a23a2605d9711c4e46582b5a06021a434763d7021a4bd1263be077e605ec1bdcfdfb7fd8d858e2166bd0213ec2feb24961317699a486d33c817182214c3106b
+  metadata.gz: 16a4c67ddfa8bb7f401ff0cd5f49d852f3f279966c3839379ae0ed0f29629b8402ae7b14a87087f263440b8ee0365eb646688a8a3ad7b1cc9979d9ddd3bc61d1
+  data.tar.gz: 86c7edc062f853a4d56e18b0b43477f6317630471de314d4952ab8dd7b9a85146180ce8d5e93ce7f687e0345ec6a26f938846409b3ad3bdcd45677ec4e0029f2

data/doc/text/news.md

@@ -1,5 +1,19 @@
 # NEWS
 
+## 0.6.0 - 2018-08-30
+
+### Improvements
+
+  * `groonga-client`:
+
+    * Added `--target-command` option.
+
+    * Added `--target-table` option.
+
+    * Added `--target-column` option.
+
+  * Added support for JSONP.
+
 ## 0.5.9 - 2018-07-13
 
 ### Improvements

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

@@ -34,6 +34,9 @@ module Groonga
           @runner_options = {
             :split_load_chunk_size => 10000,
             :generate_request_id   => false,
+            :target_commands       => [],
+            :target_tables         => [],
+            :target_columns        => [],
           }
         end
 
@@ -108,6 +111,39 @@ module Groonga
                     "(#{@chunk})") do |boolean|
             @chunk = boolean
           end
+
+          parser.on("--target-command=COMMAND",
+                    "Add COMMAND as target commands",
+                    "You can specify multiple times",
+                    "If COMMAND is /.../,",
+                    "it's treated as a regular expression") do |command|
+            add_target(@runner_options[:target_commands], command)
+          end
+
+          parser.on("--target-table=TABLE",
+                    "Add TABLE as target tables",
+                    "You can specify multiple times",
+                    "If TABLE is /.../,",
+                    "it's treated as a regular expression") do |table|
+            add_target(@runner_options[:target_tables], table)
+          end
+
+          parser.on("--target-column=COLUMN",
+                    "Add COLUMN as target columns",
+                    "You can specify multiple times",
+                    "If COLUMN is /.../,",
+                    "it's treated as a regular expression") do |column|
+            add_target(@runner_options[:target_columns], column)
+          end
+        end
+
+        def add_target(targets, target)
+          if /\A\\(.+?)\\(i)?\z/ =~ target
+            pattern = Regexp.new($1, $2 == "i")
+            targets << pattern
+          else
+            targets << target
+          end
         end
 
         class Runner
@@ -115,6 +151,9 @@ module Groonga
             @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
@@ -188,6 +227,12 @@ module Groonga
           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)
             case command.output_type
@@ -199,6 +244,92 @@ 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/response/base.rb

@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright (C) 2013  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2013-2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2018  Kouhei Sutou <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
@@ -67,7 +65,13 @@ module Groonga
             return_code = nil
             case command.output_type
             when :json
-              response = JSON.parse(raw_response)
+              callback = command["callback"]
+              if callback and
+                  /\A#{Regexp.escape(callback)}\((.+)\);\z/ =~ raw_response
+                response = JSON.parse($1)
+              else
+                response = JSON.parse(raw_response)
+              end
               if response.is_a?(::Array)
                 header, body = response
                 return_code = header[0] if header

data/lib/groonga/client/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2017  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2018  Kouhei Sutou <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.5.9"
+    VERSION = "0.6.0"
   end
 end

data/test/response/test-base.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2014-2018  Kouhei Sutou <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
@@ -210,4 +210,17 @@ class TestResponseBase < Test::Unit::TestCase
       end
     end
   end
+
+  class TestParse < self
+    def test_jsonp
+      command = Groonga::Command::Base.new("status", {"callback" => "a"})
+      response = [
+        [0, 1396012478, 0.00050806999206543],
+        {"start_time" => 1396012478},
+      ]
+      raw_response = "a(#{response.to_json});"
+      response = Groonga::Client::Response::Base.parse(command, raw_response)
+      assert_equal(1396012478, response.body["start_time"])
+    end
+  end
 end

metadata

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