groonga-client 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c016fdb951f5e4022be440d654f89761dcab44ce
-  data.tar.gz: 41f64ca63d69c8540229ff4a40f1a5298b676ba5
+  metadata.gz: 7e8cad3043939d233594ca90f8b84ea33725d5b5
+  data.tar.gz: d8ae56764fe0a86509ef2b6cbe5762242cdb0dcf
 SHA512:
-  metadata.gz: d1bfa34ff628a40c8645689ab9a2536b0979d8faef135898f154d1ec454f870fd17f6e5688d6395b26645a8005b9a9c177f4dd2e554ac554608fd0a68a23c558
-  data.tar.gz: 996cccebedcefbce77dbf9546b470424afaa8215558961be0cc898cc732d723e60874dad6bcf95b15759b9f87afa6b42f90c94e943649aa43da238f719e42dac
+  metadata.gz: 3d1f57297335e1d324fea8e867b6703ad44222effb6c6b23aa49163747bc98fbc70013227180b4a0c00e1b632d3f8df70d639157fbfaba169876128fa6796dc8
+  data.tar.gz: 66bd55f2b48c53208fb0596101b80277e04ab1151321c74e5ff27169998a6b09197039c9793a96f9d3bf68f54534058fddb9c802b5ca820700566d01f2bebbe3

data/README.md

@@ -50,10 +50,6 @@ TODO: use commands with parameters for examples
 * English: [groonga-talk@lists.sourceforge.net](https://lists.sourceforge.net/lists/listinfo/groonga-talk)
 * Japanese: [groonga-dev@lists.sourceforge.jp](http://lists.sourceforge.jp/mailman/listinfo/groonga-dev)
 
-## Thanks
-
-* ...
-
 ## Authors
 
 * Haruka Yoshihara \<yoshihara@clear-code.com\>

data/doc/text/news.md

@@ -1,5 +1,38 @@
 # NEWS
 
+## 0.2.0 - 2016-03-21
+
+### Improvements
+
+  * HTTP: Supported basic authentication.
+    [GitHub#4][Patch by KITAITI Makoto]
+
+  * response: Supported `table_remove`.
+    [GitHub#7][Patch by Masafumi Yokoyama]
+
+  * HTTP: Supported HTTPS by passing `:use_tls => true` option to
+    {Groonga::Client.new}.
+    [GitHub#8][Patch by KITAITI Makoto]
+
+  * Supported URI as server information in {Groonga::Client.new}.
+
+  * Required groonga-command 1.2.0 or later.
+
+  * Accepted `Symbol` as registered command name.
+
+  * Supported dynamic command execution. Now, you can use commands
+    that aren't supported in groonga-client yet.
+
+  * Added {Groonga::Client.default_options}.
+
+  * Added {Groonga::Client.default_options=}.
+
+### Thanks
+
+  * KITAITI Makoto
+
+  * Masafumi Yokoyama
+
 ## 0.1.9 - 2015-09-04
 
 ### Improvements

data/groonga-client.gemspec

@@ -1,7 +1,7 @@
-# -*- mode: ruby; coding: utf-8 -*-
+# -*- mode: ruby -*-
 #
 # Copyright (C) 2013  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2014-2015  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2014-2016  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
@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   clean_white_space.call(entries[entries.index("Description") + 1])
   description = clean_white_space.call(entries[entries.index("Description") + 1])
   spec.summary, spec.description, = description.split(/\n\n+/, 3)
-  spec.license = "LGPLv2.1 or later"
+  spec.license = "LGPLv2.1+"
   spec.files = ["README.md", "Rakefile", "Gemfile", "#{spec.name}.gemspec"]
   spec.files += [".yardopts"]
   spec.files += Dir.glob("lib/**/*.rb")
@@ -45,7 +45,7 @@ Gem::Specification.new do |spec|
   spec.test_files += Dir.glob("test/**/*")
 
   spec.add_runtime_dependency("gqtp", ">= 1.0.4")
-  spec.add_runtime_dependency("groonga-command", ">= 1.0.8")
+  spec.add_runtime_dependency("groonga-command", ">= 1.2.0")
 
   spec.add_development_dependency("bundler")
   spec.add_development_dependency("rake")

data/lib/groonga/client.rb

@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright (C) 2013  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2013-2015  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2016  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
@@ -17,6 +15,7 @@
 # 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 "uri"
 require "json"
 
 require "groonga/client/default"
@@ -29,10 +28,33 @@ require "groonga/client/script-syntax"
 module Groonga
   class Client
     class << self
+      @@deafult_options = {}
+
+      # @return [Hash] The default options for {Groonga::Client.new}.
+      #
+      # @since 0.2.0
+      def default_options
+        @@deafult_options
+      end
+
+      # @param [Hash] options The new default options for
+      #   {Groonga::Client.new}.
+      #
+      # @since 0.2.0
+      def default_options=(options)
+        @@deafult_options = options
+      end
+
       # @!macro [new] initialize_options
       #   @param [Hash] options The options.
-      #   @option options [:gqtp or :http] :protocol The protocol that is
-      #     used by the client.
+      #   @option options [String, URI::Generic, URI::HTTP, URI::HTTPS]
+      #     :url The URL of Groonga server.
+      #   @option options [:gqtp, :http, :https] :protocol The
+      #     protocol that is used by the client.
+      #   @option options [String] :user User ID. Currently used for HTTP
+      #     Basic Authentication.
+      #   @option options [String] :password Password. Currently used for
+      #     HTTP Basic Authentication.
       #
       # @overload open(options={})
       #   Opens a new client connection.
@@ -66,15 +88,22 @@ module Groonga
 
     # @macro initialize_options
     def initialize(options={})
-      options = options.dup
-      protocol = options.delete(:protocol) || :gqtp
+      options = self.class.default_options.merge(options)
+      url = options[:url] || build_url(options)
+      url = URL.parse(url) unless url.is_a?(URI::Generic)
+      options[:url] = url
       options[:read_timeout] ||= Default::READ_TIMEOUT
 
       @connection = nil
-      if protocol == :gqtp
-        @connection = Groonga::Client::Protocol::GQTP.new(options)
+      case url.scheme
+      when "gqtp"
+        @connection = Groonga::Client::Protocol::GQTP.new(url, options)
+      when "http", "https"
+        @connection = Groonga::Client::Protocol::HTTP.new(url, options)
       else
-        @connection = Groonga::Client::Protocol::HTTP.new(options)
+        message = "unsupported scheme: <#{url.scheme}>: "
+        message << "supported: [gqtp, http, https]"
+        raise ArgumentError, message
       end
     end
 
@@ -117,46 +146,6 @@ module Groonga
       end
     end
 
-    def cache_limit(parameters, &block)
-      execute_command("cache_limit", parameters, &block)
-    end
-
-    def check(parameters, &block)
-      execute_command("check", parameters, &block)
-    end
-
-    def clearlock(parameters={}, &block)
-      execute_command("clearlock", parameters, &block)
-    end
-
-    def column_create(parameters, &block)
-      execute_command("column_create", parameters, &block)
-    end
-
-    def column_list(parameters, &block)
-      execute_command("column_list", parameters, &block)
-    end
-
-    def column_remove(parameters, &block)
-      execute_command("column_remove", parameters, &block)
-    end
-
-    def column_rename(parameters, &block)
-      execute_command("column_rename", parameters, &block)
-    end
-
-    def defrag(parameters={}, &block)
-      execute_command("defrag", parameters, &block)
-    end
-
-    def delete(parameters, &block)
-      execute_command("delete", parameters, &block)
-    end
-
-    def dump(parameters={}, &block)
-      execute_command("dump", parameters, &block)
-    end
-
     def load(parameters, &block)
       values = parameters[:values]
       if values.is_a?(Array)
@@ -172,67 +161,84 @@ module Groonga
         json << "\n]"
         parameters[:values] = json
       end
-      execute_command("load", parameters, &block)
-    end
-
-    def log_level(parameters, &block)
-      execute_command("log_level", parameters, &block)
-    end
-
-    def log_put(parameters, &block)
-      execute_command("log_put", parameters, &block)
+      execute(:load, parameters, &block)
     end
 
-    def log_reopen(parameters={}, &block)
-      execute_command("log_reopen", parameters, &block)
-    end
-
-    def quit(parameters={}, &block)
-      execute_command("quit", parameters, &block)
-    end
-
-    def register(parameters, &block)
-      execute_command("register", parameters, &block)
-    end
-
-    def select(parameters, &block)
-      execute_command("select", parameters, &block)
-    end
-
-    def shutdown(parameters={}, &block)
-    end
-
-    def status(parameters={}, &block)
-      execute_command("status", parameters, &block)
-    end
-
-    def table_create(parameters, &block)
-      execute_command("table_create", parameters, &block)
+    def execute(command_or_name, parameters={}, &block)
+      if command_or_name.is_a?(Command)
+        command = command_or_name
+      else
+        command_name = command_or_name
+        parameters = normalize_parameters(parameters)
+        command_class = Groonga::Command.find(command_name)
+        command = command_class.new(command_name, parameters)
+      end
+      execute_command(command, &block)
     end
 
-    def table_list(parameters={}, &block)
-      execute_command("table_list", parameters, &block)
+    def method_missing(name, *args, **kwargs, &block)
+      if groonga_command_name?(name)
+        execute(name, *args, **kwargs, &block)
+      else
+        super
+      end
     end
 
-    def table_remove(parameters, &block)
+    def respond_to_missing?(name, include_private)
+      if groonga_command_name?(name)
+        true
+      else
+        super
+      end
     end
 
-    def table_rename(parameters, &block)
-    end
+    private
+    def build_url(options)
+      scheme = (options.delete(:protocol) || "gqtp").to_s
+      host = options.delete(:host) || options.delete(:address) || "127.0.0.1"
+      port = options.delete(:port) || default_port(scheme)
+      user = options.delete(:user)
+      password = options.delete(:password)
+      if user and password
+        userinfo = "#{user}:#{password}"
+      else
+        userinfo = nil
+      end
 
-    def truncate(parameters, &block)
+      arguments = [
+        scheme,
+        userinfo,
+        host,
+        port,
+        nil,
+        nil,
+        nil,
+        nil,
+        nil,
+      ]
+      case scheme
+      when "http"
+        URI::HTTP.new(*arguments)
+      when "https"
+        URI::HTTPS.new(*arguments)
+      else
+        URI::Generic.new(*arguments)
+      end
     end
 
-    def execute(command, &block)
-      Client::Command.new(command).execute(@connection, &block)
+    def default_port(scheme)
+      case scheme
+      when "gqtp"
+        10043
+      when "http", "https"
+        10041
+      else
+        nil
+      end
     end
 
-    private
-    def execute_command(command_name, parameters={}, &block)
-      parameters = normalize_parameters(parameters)
-      command_class = Groonga::Command.find(command_name)
-      command = command_class.new(command_name, parameters)
-      execute(command, &block)
+    def groonga_command_name?(name)
+      /\A[a-zA-Z][a-zA-Z\d_]+\z/ === name.to_s
     end
 
     def normalize_parameters(parameters)
@@ -242,5 +248,9 @@ module Groonga
       end
       normalized_parameters
     end
+
+    def execute_command(command, &block)
+      Client::Command.new(command).execute(@connection, &block)
+    end
   end
 end

data/lib/groonga/client/protocol/gqtp.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-2016  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
@@ -29,9 +27,10 @@ module Groonga
   class Client
     module Protocol
       class GQTP
-        def initialize(options)
+        def initialize(url, options={})
           begin
-            @client = ::GQTP::Client.new(options)
+            @client = ::GQTP::Client.new(:host => url.host,
+                                         :port => url.port)
           rescue ::GQTP::ConnectionError
             raise WrappedError.new($!)
           end

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

@@ -32,9 +32,8 @@ module Groonga
           end
         end
 
-        def initialize(options)
-          @host = options[:host] || "127.0.0.1"
-          @port = options[:port] || 10041
+        def initialize(url, options)
+          @url = url
           @options = default_options.merge(options)
           @backend = create_backend
         end
@@ -69,7 +68,7 @@ module Groonga
 
           backend_name = backend.to_s.capitalize
           backend_class = self.class.const_get(backend_name)
-          backend_class.new(@host, @port, @options)
+          backend_class.new(@url, @options)
         end
       end
     end

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

@@ -73,7 +73,7 @@ module Groonga
           def send(command, &block)
             client = GroongaHTTPClient.connect(@host, @port, block)
             client.attach(@loop)
-            if command.name == "load"
+            if command.is_a?(Groonga::Command::Load)
               raw_values = command[:values]
               command[:values] = nil
               path = command.to_uri_format

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

@@ -1,5 +1,5 @@
 # Copyright (C) 2013  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2013-2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2016  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
@@ -26,15 +26,14 @@ module Groonga
     module Protocol
       class HTTP
         class Synchronous
-          def initialize(host, port, options)
-            @host = host
-            @port = port
+          def initialize(url, options={})
+            @url = url
             @options = options
           end
 
           def send(command)
             begin
-              Net::HTTP.start(@host, @port) do |http|
+              Net::HTTP.start(@url.host, @url.port, start_options) do |http|
                 http.read_timeout = read_timeout
                 response = send_request(http, command)
                 case response
@@ -90,6 +89,23 @@ module Groonga
           end
 
           private
+          def start_options
+            tls_options = @options[:tls] || {}
+            case tls_options[:verify_mode]
+            when :none
+              tls_options[:verify_mode] = OpenSSL::SSL::VERIFY_NONE
+            when :peer
+              tls_options[:verify_mode] = OpenSSL::SSL::VERIFY_PEER
+            end
+
+            {
+              :use_ssl => @url.scheme == "https",
+              :ca_file => tls_options[:ca_file],
+              :ca_path => tls_options[:ca_path],
+              :verify_mode => tls_options[:verify_mode],
+            }
+          end
+
           def read_timeout
             timeout = @options[:read_timeout]
             if timeout < 0
@@ -100,7 +116,7 @@ module Groonga
           end
 
           def send_request(http, command)
-            if command.name == "load"
+            if command.is_a?(Groonga::Command::Load)
               raw_values = command[:values]
               command[:values] = nil
               path = command.to_uri_format
@@ -109,10 +125,11 @@ module Groonga
               request.content_type = "application/json"
               request.content_length = raw_values.bytesize
               request.body_stream = StringIO.new(raw_values)
-              http.request(request)
             else
-              http.get(command.to_uri_format, headers)
+              request = Net::HTTP::Get.new(command.to_uri_format, headers)
             end
+            setup_authentication(request)
+            http.request(request)
           end
 
           def headers
@@ -120,6 +137,16 @@ module Groonga
               "user-agent" => @options[:user_agent],
             }
           end
+
+          def setup_authentication(request)
+            userinfo = @url.userinfo
+            return if userinfo.nil?
+
+            user, password = userinfo.split(/:/, 2).collect do |component|
+              URI.decode_www_form_component(component)
+            end
+            request.basic_auth(user, password)
+          end
         end
       end
     end

data/lib/groonga/client/response.rb

@@ -36,4 +36,6 @@ require "groonga/client/response/quit"
 require "groonga/client/response/register"
 require "groonga/client/response/select"
 require "groonga/client/response/status"
+require "groonga/client/response/table_create"
 require "groonga/client/response/table_list"
+require "groonga/client/response/table_remove"

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

@@ -27,11 +27,11 @@ module Groonga
       class << self
         @@registered_commands = {}
         def register(name, klass)
-          @@registered_commands[name] = klass
+          @@registered_commands[normalize_name(name)] = klass
         end
 
         def find(name)
-          @@registered_commands[name] || Base
+          @@registered_commands[normalize_name(name)] || Base
         end
 
         # Parses the response for the request of the command and returns
@@ -42,9 +42,19 @@ module Groonga
         #   server.
         # @return [Base]
         def parse(command, raw_response)
-          klass = find(command.name)
+          klass = find(command.command_name)
           klass.parse(command, raw_response)
         end
+
+        private
+        def normalize_name(name)
+          case name
+          when String
+            name.to_sym
+          else
+            name
+          end
+        end
       end
 
       class Base

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

@@ -0,0 +1,28 @@
+# 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
+# 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 "groonga/client/response/base"
+
+module Groonga
+  class Client
+    module Response
+      class TableRemove < Base
+        Response.register("table_remove", self)
+      end
+    end
+  end
+end
+

data/lib/groonga/client/version.rb

@@ -18,6 +18,6 @@
 
 module Groonga
   class Client
-    VERSION = "0.1.9"
+    VERSION = "0.2.0"
   end
 end

data/test/protocol/test-gqtp.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2013-2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2016  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
@@ -60,11 +58,10 @@ class TestProtocolGQTP < Test::Unit::TestCase
 
   private
   def connect(options={})
-    default_options = {
-      :host => @address,
-      :port => @port,
-    }
-    Groonga::Client::Protocol::GQTP.new(default_options.merge(options))
+    url = URI::Generic.build(:scheme => "gqtp",
+                             :host => @address,
+                             :port => @port)
+    Groonga::Client::Protocol::GQTP.new(url, options)
   end
 
   def process_client_close(client)
@@ -84,9 +81,11 @@ class TestProtocolGQTP < Test::Unit::TestCase
       server = TCPServer.new("127.0.0.1", 0)
       free_port = server.addr[1]
       server.close
+      url = URI::Generic.build(:scheme => "gqtp",
+                               :host => "127.0.0.1",
+                               :port => free_port)
       assert_raise(Groonga::Client::Protocol::WrappedError) do
-        Groonga::Client::Protocol::GQTP.new(:host => "127.0.0.1",
-                                            :port => free_port)
+        Groonga::Client::Protocol::GQTP.new(url, {})
       end
     end
   end

data/test/protocol/test-http.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2013-2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2016  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
@@ -74,11 +72,9 @@ EOH
   end
 
   def connect(options={})
-    default_options = {
-      :host => @address,
-      :port => @port,
-    }
-    Groonga::Client::Protocol::HTTP.new(default_options.merge(options))
+    url = URI::HTTP.build(:host => @address,
+                          :port => @port)
+    Groonga::Client::Protocol::HTTP.new(url, options)
   end
 
   def test_connected?

data/test/response/test-table-create.rb

@@ -0,0 +1,32 @@
+# 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
+# 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 "response/helper"
+
+class TestResponseTableCreate < Test::Unit::TestCase
+  class TestParseRawResponse < self
+    include TestResponseHelper
+
+    def test_table_create
+      header = [0,1372430096.70991,0.000522851943969727]
+      body = true
+      raw_response = [header, body].to_json
+
+      response = parse_raw_response("table_create", raw_response)
+      assert_equal(Groonga::Client::Response::TableCreate, response.class)
+    end
+  end
+end

data/test/response/test-table-remove.rb

@@ -0,0 +1,32 @@
+# 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
+# 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 "response/helper"
+
+class TestResponseTableRemove < Test::Unit::TestCase
+  class TestParseRawResponse < self
+    include TestResponseHelper
+
+    def test_table_remove
+      header = [0,1372430096.70991,0.000522851943969727]
+      body = true
+      raw_response = [header, body].to_json
+
+      response = parse_raw_response("table_remove", raw_response)
+      assert_equal(Groonga::Client::Response::TableRemove, response.class)
+    end
+  end
+end

data/test/test-client.rb

@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright (C) 2013  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2013-2015  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2016  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
@@ -49,9 +47,20 @@ class TestClient < Test::Unit::TestCase
       @client ||= open_client
     end
 
+    def open_options
+      url = "#{@protocol}://"
+      if @user and @password
+        url << URI.encode_www_form_component(@user)
+        url << ":"
+        url << URI.encode_www_form_component(@password)
+        url << "@"
+      end
+      url << "#{@address}:#{@port}"
+      {:url => URI.parse(url)}
+    end
+
     def open_client(&block)
-      options = {:host => @address, :port => @port, :protocol => @protocol}
-      Groonga::Client.open(options, &block)
+      Groonga::Client.open(open_options, &block)
     end
 
     def stub_response(body, output_type=:json)
@@ -223,6 +232,19 @@ JSON
       end
       assert_equal("response", response)
     end
+
+    def test_open_components
+      stub_response("[29]")
+      options = {
+        :host => @address,
+        :port => @port,
+        :protocol => @protocol,
+      }
+      response = Groonga::Client.open(options) do |client|
+        client.status
+      end
+      assert_equal([29], response.body)
+    end
   end
 
   module LoadTests
@@ -255,6 +277,29 @@ JSON
     end
   end
 
+  module DefaultOptionsTests
+    def test_default_options
+      change_default_options(open_options) do
+        expected_response = {"key" => "value"}
+        stub_response(expected_response.to_json)
+        response = Groonga::Client.open do |client|
+          client.status
+        end
+        assert_equal(expected_response, response.body)
+      end
+    end
+
+    def change_default_options(options)
+      default_options = Groonga::Client.default_options
+      begin
+        Groonga::Client.default_options = options
+        yield
+      ensure
+        Groonga::Client.default_options = default_options
+      end
+    end
+  end
+
   module Tests
     include Utils
     include Assertions
@@ -264,6 +309,7 @@ JSON
     include ParametersTests
     include OpenTests
     include LoadTests
+    include DefaultOptionsTests
   end
 
   class TestGQTP < self
@@ -276,6 +322,8 @@ JSON
       @port = @server.addr[1]
       @protocol = :gqtp
 
+      @user = nil
+      @password = nil
       @actual_commands = []
       @response_body = nil
       @thread = Thread.new do
@@ -316,6 +364,9 @@ JSON
       @port = @server.addr[1]
       @protocol = :http
 
+      setup_authentication
+      @request_headers = {}
+      @request_path = nil
       @actual_commands = []
       @response_body = nil
       @thread = Thread.new do
@@ -323,7 +374,7 @@ JSON
         first_line = client.gets
         if /\A([\w]+) ([^ ]+) HTTP/ =~ first_line
           # http_method = $1
-          path = $2
+          @request_path = $2
           headers = {}
           client.each_line do |line|
             case line
@@ -334,13 +385,14 @@ JSON
               headers[name.downcase] = value
             end
           end
+          @request_headers = headers
           content_length = headers["content-length"]
           if content_length
             body = client.read(Integer(content_length))
           else
             body = nil
           end
-          command = Groonga::Command::Parser.parse(path)
+          command = Groonga::Command::Parser.parse(@request_path)
           command[:values] = body if body
           @actual_commands << command
         end
@@ -374,5 +426,48 @@ EOH
         client.close
       end
     end
+
+    def setup_authentication
+      @user = nil
+      @password = nil
+    end
+
+    class TestLoad < self
+      def test_path
+        stub_response("[]")
+        client.load(:table => "Memos", :values => [])
+        assert_equal("/d/load?table=Memos", @request_path)
+      end
+    end
+
+    class TestBasicAuthentication < self
+      def setup_authentication
+        @user = "Aladdin"
+        @password = "open sesame"
+      end
+
+      def test_request_header
+        stub_response("[]")
+        client.status
+        assert_equal("Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==",
+                     @request_headers["authorization"])
+      end
+
+      def test_open_components
+        stub_response("[]")
+        options = {
+          :host => @address,
+          :port => @port,
+          :protocol => @protocol,
+          :user => @user,
+          :password => @password,
+        }
+        Groonga::Client.open(options) do |client|
+          client.status
+        end
+        assert_equal("Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==",
+                     @request_headers["authorization"])
+      end
+    end
   end
 end

data/test/test-command.rb

@@ -5,7 +5,7 @@ class TestCommand < Test::Unit::TestCase
 
   def test_column_create
     response = Object.new
-    mock(@client).execute_command("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 +13,7 @@ class TestCommand < Test::Unit::TestCase
 
   def test_column_list
     response = Object.new
-    mock(@client).execute_command("column_list", :table => :Test) do
+    mock(@client).execute(:column_list, :table => :Test) do
       response
     end
     @client.column_list(:table => :Test)
@@ -27,7 +27,7 @@ class TestCommand < Test::Unit::TestCase
       }
     ]
     response = Object.new
-    mock(@client).execute_command("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 +35,7 @@ class TestCommand < Test::Unit::TestCase
 
   def test_select
     response = Object.new
-    mock(@client).execute_command("select", :table => :Test) do
+    mock(@client).execute(:select, :table => :Test) do
       response
     end
     @client.select(:table => :Test)
@@ -43,7 +43,7 @@ class TestCommand < Test::Unit::TestCase
 
   def test_table_create
     response = Object.new
-    mock(@client).execute_command("table_create", :name => :Test) do
+    mock(@client).execute(:table_create, :name => :Test) do
       response
     end
     @client.table_create(:name => :Test)
@@ -51,9 +51,14 @@ class TestCommand < Test::Unit::TestCase
 
   def test_table_list
     response = Object.new
-    mock(@client).execute_command("table_list", {}) do
+    mock(@client).execute(:table_list, {}) do
       response
     end
     @client.table_list
   end
+
+  def test_table_remove
+    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.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Haruka Yoshihara
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2016-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gqtp
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -206,6 +206,7 @@ files:
 - lib/groonga/client/response/status.rb
 - lib/groonga/client/response/table_create.rb
 - lib/groonga/client/response/table_list.rb
+- lib/groonga/client/response/table_remove.rb
 - lib/groonga/client/script-syntax.rb
 - lib/groonga/client/version.rb
 - test/protocol/test-gqtp.rb
@@ -216,7 +217,9 @@ files:
 - test/response/test-error.rb
 - test/response/test-select.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-column-list.rb
 - test/results/test-table-list.rb
 - test/run-test.rb
@@ -225,7 +228,7 @@ files:
 - test/test-script-syntax.rb
 homepage: https://github.com/ranguba/groonga-client
 licenses:
-- LGPLv2.1 or later
+- LGPLv2.1+
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -243,25 +246,27 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Groonga-client is a client for groonga (http://groonga.org/) implemented
   with pure ruby.
 test_files:
+- test/test-client.rb
 - test/test-script-syntax.rb
-- test/protocol/test-http.rb
+- test/test-command.rb
 - test/protocol/test-gqtp.rb
-- test/response/test-error.rb
-- test/response/test-select.rb
-- test/response/test-table-list.rb
+- test/protocol/test-http.rb
+- test/run-test.rb
+- test/response/test-base.rb
 - test/response/test-column-list.rb
 - test/response/helper.rb
-- test/response/test-base.rb
+- test/response/test-error.rb
+- test/response/test-table-list.rb
 - test/response/test-status.rb
-- test/results/test-table-list.rb
+- test/response/test-select.rb
+- test/response/test-table-create.rb
+- test/response/test-table-remove.rb
 - test/results/test-column-list.rb
-- test/test-command.rb
-- test/run-test.rb
-- test/test-client.rb
+- test/results/test-table-list.rb
 has_rdoc: