groonga-client 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 227bf7a979643ac2f17b20d32b4b3ed0129f8321
-  data.tar.gz: 6e7b2e2451b0d0bf59313a639f2c7c819b4aba7b
+  metadata.gz: f56e626e8d1f3ee3b00e41b67707cb96f92e7c88
+  data.tar.gz: ad74c24105a448472102e6c13a47c9fe9e2b0678
 SHA512:
-  metadata.gz: 842ff5602d19852b2ebceb64c470efe15eb48a85ef24c539dfd3e7e09458139a9cba3c899cffce26a29cb25cd2c771f815550aaf283c69f62d740161122e0504
-  data.tar.gz: 66bd127398051d6314c7df147688297244dd609c89b7a06eca59351634d4f7c2e06676eb0bb695af55a34553b7a24162e48c28c2eb67a98b77401a75cd741592
+  metadata.gz: 424579d18aa485f0615c7b0d2eb113f1acd35d5889a8665abe5200eadd05ac6a0273567105d79807d8957b9ad9e8409c1a4668c94a43c5e8e6e292bf317a47f6
+  data.tar.gz: fef4befdfa5f7ab2f61c39d1e23dae58b9f0e2d095ae24388d5a214e051b027a6dae5e8c07074217748de3ff258484ced5eb9750bada21a83565c588fec10aac

data/doc/text/news.md

@@ -1,5 +1,19 @@
 # NEWS
 
+## 0.4.2 - 2016-03-09
+
+### Improvements
+
+  * `Groonga::Client#request`: Added a new generic request method.
+
+  * `Groonga::Client::Request::Generic#flags_parameter`: Added a
+    convenience method to add a flags parameter such as
+    `table_create`'s `flags` parameter.
+
+  * `Groonga::Client::Request::Generic#values_parameter`: Added a
+    convenience method to add a parameter that takes multiple values
+    such as `select`'s `output_columns` parameter.
+
 ## 0.4.1 - 2016-02-07
 
 ### Improvements

data/lib/groonga/client.rb

@@ -176,6 +176,28 @@ module Groonga
       execute_command(command, &block)
     end
 
+    def request(name)
+      command_name_module = Module.new do
+        define_method :command_name do
+          name
+        end
+      end
+
+      client = self
+      open_client_module = Module.new do
+        define_method :open_client do |&block|
+          block.call(client)
+        end
+      end
+
+      extensions = [
+        command_name_module,
+        open_client_module,
+      ]
+      request_class = Request.find(name)
+      request_class.new(nil, extensions)
+    end
+
     def method_missing(name, *args, &block)
       if groonga_command_name?(name)
         execute(name, *args, &block)

data/lib/groonga/client/request.rb

@@ -14,9 +14,26 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
+module Groonga
+  class Client
+    module Request
+      @@requests = {}
+      class << self
+        def register(request_class)
+          @@requests[request_class.command_name] = request_class
+        end
+
+        def find(name)
+          @@requests[name.to_s] || Generic
+        end
+      end
+    end
+  end
+end
+
 require "groonga/client/script-syntax"
 
-require "groonga/client/request/base"
 require "groonga/client/request/error"
+require "groonga/client/request/generic"
 
 require "groonga/client/request/select"

data/lib/groonga/client/request/{base.rb → generic.rb}

@@ -17,13 +17,17 @@
 module Groonga
   class Client
     module Request
-      class Base
+      class Generic
         def initialize(parameters=nil, extensions=[])
           @parameters = parameters
           @extensions = extensions
           extend(*@extensions) unless @extensions.empty?
         end
 
+        def command_name
+          self.class.command_name
+        end
+
         def response
           @reponse ||= create_response
         end
@@ -33,6 +37,26 @@ module Groonga
                         RequestParameter.new(name, value))
         end
 
+        def flags_parameter(name_or_names, value)
+          if name_or_names.is_a?(Array)
+            names = name_or_names
+          else
+            names = [name_or_names]
+          end
+          add_parameter(OverwriteMerger,
+                        FlagsParameter.new(names, value))
+        end
+
+        def values_parameter(name_or_names, values)
+          if name_or_names.is_a?(Array)
+            names = name_or_names
+          else
+            names = [name_or_names]
+          end
+          add_parameter(OverwriteMerger,
+                        ValuesParameter.new(names, values))
+        end
+
         def to_parameters
           if @parameters.nil?
             {}
@@ -62,7 +86,7 @@ module Groonga
 
         def create_response
           open_client do |client|
-            response = client.execute(self.class.command_name, to_parameters)
+            response = client.execute(command_name, to_parameters)
             raise ErrorResponse.new(response) unless response.success?
             response
           end
@@ -168,7 +192,19 @@ module Groonga
 
       class OverwriteMerger < ParameterMerger
         def to_parameters
-          @parameters1.to_parameters.merge(@parameters2.to_parameters)
+          if @parameters1.nil?
+            if @parameters2.nil?
+              {}
+            else
+              @parameters2.to_parameters
+            end
+          else
+            if @parameters2.nil?
+              @parameters1.to_parameters
+            else
+              @parameters1.to_parameters.merge(@parameters2.to_parameters)
+            end
+          end
         end
       end
     end

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

@@ -17,7 +17,7 @@
 module Groonga
   class Client
     module Request
-      class Select < Base
+      class Select < Generic
         include Enumerable
 
         class << self
@@ -26,6 +26,8 @@ module Groonga
           end
         end
 
+        Request.register(self)
+
         def initialize(table_or_parameters, extensions=[])
           if table_or_parameters.respond_to?(:to_parameters)
             parameters = table_or_parameters
@@ -36,9 +38,8 @@ module Groonga
           super(parameters, extensions)
         end
 
-        def match_columns(value)
-          add_parameter(OverwriteMerger,
-                        ValuesParameter.new([:match_columns], value))
+        def match_columns(values)
+          values_parameter([:match_columns], values)
         end
 
         def query(value)
@@ -158,9 +159,8 @@ module Groonga
             @label = label
           end
 
-          def keys(value)
-            add_parameter(OverwriteMerger,
-                          ValuesParameter.new([:"#{prefix}keys"], value))
+          def keys(values)
+            @request.values_parameter([:"#{prefix}keys"], values)
           end
 
           def sort_keys(value)
@@ -184,8 +184,7 @@ module Groonga
           end
 
           def calc_types(value)
-            add_parameter(OverwriteMerger,
-                          FlagsParameter.new([:"#{prefix}calc_types"], value))
+            @request.flags_parameter(:"#{prefix}calc_types", value)
           end
 
           def calc_target(value)
@@ -219,8 +218,7 @@ module Groonga
           end
 
           def flags(value)
-            add_parameter(OverwriteMerger,
-                          FlagsParameter.new([:"#{prefix}flags"], value))
+            @request.flags_parameter(:"#{prefix}flags", value)
           end
 
           def value(expression, values=nil)
@@ -263,9 +261,8 @@ module Groonga
           #   request object.
           #
           # @since 0.4.1
-          def group_keys(value)
-            add_parameter(OverwriteMerger,
-                          ValuesParameter.new([:"#{prefix}group_keys"], value))
+          def group_keys(values)
+            @request.values_parameter([:"#{prefix}group_keys"], values)
           end
 
           private

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

@@ -202,7 +202,8 @@ module Groonga
             when :indexes
               super(key, coerce_indexes(value))
             when :value_type
-              super(key, ValueType.new(value))
+              value = ValueType.new(value) unless value.nil?
+              super(key, value)
             else
               super
             end

data/lib/groonga/client/test/groonga-server-runner.rb

@@ -140,7 +140,7 @@ module Groonga
               break
             else
               begin
-                pid = Process.waitpid(@pid, Process::WNOHANG)
+                Process.waitpid(@pid, Process::WNOHANG)
               rescue SystemCallError
                 @pid = nil
                 break
@@ -150,10 +150,6 @@ module Groonga
         end
 
         def wait_groonga_shutdown
-          # TODO: Remove me when Groonga 6.0.1 has been released.
-          # Workaround to shutdown as soon as possible.
-          groonga_server_running?
-
           n_retried = 0
           while n_retried <= 20
             n_retried += 1

data/lib/groonga/client/version.rb

@@ -16,6 +16,6 @@
 
 module Groonga
   class Client
-    VERSION = "0.4.1"
+    VERSION = "0.4.2"
   end
 end

data/test/request/{test-base.rb → test-generic.rb}

@@ -1,4 +1,4 @@
-# Copyright (C) 2016  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2016-2017  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
@@ -14,10 +14,10 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-class TestRequestBase < Test::Unit::TestCase
+class TestRequestGeneric < Test::Unit::TestCase
   sub_test_case "#extensions" do
     setup do
-      @request = Groonga::Client::Request::Base.new("status")
+      @request = Groonga::Client::Request::Generic.new("status")
     end
 
     test "Module" do

data/test/request/test-merger.rb

@@ -0,0 +1,48 @@
+# Copyright (C) 2017  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
+# 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
+
+class TestRequestMerger < Test::Unit::TestCase
+  sub_test_case "OverwriteMerger" do
+    def merge(parameters1, parameters2)
+      klass = Groonga::Client::Request::OverwriteMerger
+      klass.new(parameters1, parameters2).to_parameters
+    end
+
+    def param(name, value)
+      Groonga::Client::Request::RequestParameter.new(name, value)
+    end
+
+    test "(nil, nil)" do
+      assert_equal({}, merge(nil, nil))
+    end
+
+    test "(nil, parameter)" do
+      assert_equal({"name" => "value"},
+                   merge(nil, param("name", "value")))
+    end
+
+    test "(parameter, nil)" do
+      assert_equal({"name" => "value"},
+                   merge(param("name", "value"), nil))
+    end
+
+    test "(parameter, parameter)" do
+      assert_equal({"name" => "value2"},
+                   merge(param("name", "value1"),
+                         param("name", "value2")))
+    end
+  end
+end

data/test/test-client.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-2017  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
@@ -300,6 +300,15 @@ JSON
     end
   end
 
+  module RequestTests
+    def test_generic
+      expected_response = {"key" => "value"}
+      stub_response(expected_response.to_json)
+      response = client.request(:status).response
+      assert_equal(expected_response, response.body)
+    end
+  end
+
   module Tests
     include Utils
     include Assertions
@@ -310,6 +319,7 @@ JSON
     include OpenTests
     include LoadTests
     include DefaultOptionsTests
+    include RequestTests
   end
 
   class TestGQTP < self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groonga-client
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Haruka Yoshihara
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gqtp
@@ -187,8 +187,8 @@ files:
 - lib/groonga/client/protocol/http/synchronous.rb
 - lib/groonga/client/protocol/http/thread.rb
 - lib/groonga/client/request.rb
-- lib/groonga/client/request/base.rb
 - lib/groonga/client/request/error.rb
+- lib/groonga/client/request/generic.rb
 - lib/groonga/client/request/select.rb
 - lib/groonga/client/response.rb
 - lib/groonga/client/response/base.rb
@@ -229,7 +229,8 @@ files:
 - test/request/select/test-output-columns-parameter.rb
 - test/request/select/test-sort-keys-parameter.rb
 - test/request/select/test-values-parameter.rb
-- test/request/test-base.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
@@ -283,7 +284,8 @@ test_files:
 - test/request/select/test-output-columns-parameter.rb
 - test/request/select/test-values-parameter.rb
 - test/request/select/test-filter-equal-parameter.rb
-- test/request/test-base.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