groonga-client 0.0.4 → 0.0.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 421c54a9bc6c48ecfa2324010d0fd8e51d1bfb5d
+  data.tar.gz: 2588991abfffd393e18b43e5ebe8db807af463a5
+SHA512:
+  metadata.gz: f7a4b01cee40b67dd1c8225c90ae22c2fc4e0b9403df4345c68f8fb641cdb4c5282fbcb4668b2c4646092a36fc275cb408ff7fb0a84b1a719d903cd97e0ef6cd
+  data.tar.gz: a846c1f591bb17d996a521b6c4d5b7e28f5f8d2c0b06d9ec09a4b8feda6967e3057073464fa3f5413058bb1e09f401c7db9415b181b9936a3d7f6cbe1a74c3b7

data/doc/text/news.md

@@ -1,5 +1,24 @@
 # NEWS
 
+## 0.0.5 - 2014-03-25
+
+### Improvements
+
+  * Wrapped internal connection errors by
+    `Groonga::Client::Connection::Error`.
+  * Supported asynchronous request by calling with block.
+  * Added Cool.io HTTP backend.
+
+### Changes
+
+  * Changed protocol implementation module/directory name to
+    `protocol` from `connection`.
+
+### Fixes
+
+  * Fixed a bug that options passed to `Groonga::Client.new` is
+    changed destructively.
+
 ## 0.0.4 - 2013-10-29
 
 ### Improvements

data/lib/groonga/client.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2013  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2014  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
@@ -18,8 +18,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "groonga/client/command"
-require "groonga/client/connection/gqtp"
-require "groonga/client/connection/http"
+require "groonga/client/empty-request"
+require "groonga/client/protocol/gqtp"
+require "groonga/client/protocol/http"
 
 module Groonga
   class Client
@@ -59,18 +60,16 @@ module Groonga
       end
     end
 
-    attr_reader :protocol
-    attr_reader :connection
-
     # @macro initialize_options
-    def initialize(options)
-      @protocol = options.delete(:protocol) || :gqtp
+    def initialize(options={})
+      options = options.dup
+      protocol = options.delete(:protocol) || :gqtp
 
       @connection = nil
-      if @protocol == :gqtp
-        @connection = Groonga::Client::Connection::GQTP.new(options)
+      if protocol == :gqtp
+        @connection = Groonga::Client::Protocol::GQTP.new(options)
       else
-        @connection = Groonga::Client::Connection::HTTP.new(options)
+        @connection = Groonga::Client::Protocol::HTTP.new(options)
       end
     end
 
@@ -108,101 +107,101 @@ module Groonga
         if sync
           false
         else
-          Connection::EmptryReqest.new
+          EmptryReqest.new
         end
       end
     end
 
-    def cache_limit(parameters)
-      execute_command("cache_limit", parameters)
+    def cache_limit(parameters, &block)
+      execute_command("cache_limit", parameters, &block)
     end
 
-    def check(parameters)
-      execute_command("check", parameters)
+    def check(parameters, &block)
+      execute_command("check", parameters, &block)
     end
 
-    def clearlock(parameters={})
-      execute_command("clearlock", parameters)
+    def clearlock(parameters={}, &block)
+      execute_command("clearlock", parameters, &block)
     end
 
-    def column_create(parameters)
-      execute_command("column_create", parameters)
+    def column_create(parameters, &block)
+      execute_command("column_create", parameters, &block)
     end
 
-    def column_list(parameters)
-      execute_command("column_list", parameters)
+    def column_list(parameters, &block)
+      execute_command("column_list", parameters, &block)
     end
 
-    def column_remove(parameters)
-      execute_command("column_remove", parameters)
+    def column_remove(parameters, &block)
+      execute_command("column_remove", parameters, &block)
     end
 
-    def column_rename(parameters)
-      execute_command("column_rename", parameters)
+    def column_rename(parameters, &block)
+      execute_command("column_rename", parameters, &block)
     end
 
-    def defrag(parameters={})
-      execute_command("defrag", parameters)
+    def defrag(parameters={}, &block)
+      execute_command("defrag", parameters, &block)
     end
 
-    def delete(parameters)
-      execute_command("delete", parameters)
+    def delete(parameters, &block)
+      execute_command("delete", parameters, &block)
     end
 
-    def dump(parameters={})
-      execute_command("dump", parameters)
+    def dump(parameters={}, &block)
+      execute_command("dump", parameters, &block)
     end
 
-    def load(parameters)
-      execute_command("load", parameters)
+    def load(parameters, &block)
+      execute_command("load", parameters, &block)
     end
 
-    def log_level(parameters)
-      execute_command("log_level", parameters)
+    def log_level(parameters, &block)
+      execute_command("log_level", parameters, &block)
     end
 
-    def log_put(parameters)
-      execute_command("log_put", parameters)
+    def log_put(parameters, &block)
+      execute_command("log_put", parameters, &block)
     end
 
-    def log_reopen(parameters={})
-      execute_command("log_reopen", parameters)
+    def log_reopen(parameters={}, &block)
+      execute_command("log_reopen", parameters, &block)
     end
 
-    def quit(parameters={})
-      execute_command("quit", parameters)
+    def quit(parameters={}, &block)
+      execute_command("quit", parameters, &block)
     end
 
-    def register(parameters)
-      execute_command("register", parameters)
+    def register(parameters, &block)
+      execute_command("register", parameters, &block)
     end
 
-    def select(parameters)
-      execute_command("select", parameters)
+    def select(parameters, &block)
+      execute_command("select", parameters, &block)
     end
 
-    def shutdown(parameters={})
+    def shutdown(parameters={}, &block)
     end
 
-    def status(parameters={})
-      execute_command("status", parameters)
+    def status(parameters={}, &block)
+      execute_command("status", parameters, &block)
     end
 
-    def table_create(parameters)
-      execute_command("table_create", parameters)
+    def table_create(parameters, &block)
+      execute_command("table_create", parameters, &block)
     end
 
-    def table_list(parameters={})
-      execute_command("table_list", parameters)
+    def table_list(parameters={}, &block)
+      execute_command("table_list", parameters, &block)
     end
 
-    def table_remove(parameters)
+    def table_remove(parameters, &block)
     end
 
-    def table_rename(parameters)
+    def table_rename(parameters, &block)
     end
 
-    def truncate(parameters)
+    def truncate(parameters, &block)
     end
 
     def execute(command, &block)
@@ -210,11 +209,11 @@ module Groonga
     end
 
     private
-    def execute_command(command_name, parameters={})
+    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)
+      execute(command, &block)
     end
 
     def normalize_parameters(parameters)

data/lib/groonga/client/{connection/request.rb → empty-request.rb}

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2014  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
@@ -18,23 +18,11 @@
 
 module Groonga
   class Client
-    module Connection
-      class ThreadRequest
-        def initialize(thread)
-          @thread = thread
-        end
-
-        def wait
-          @thread.join
-        end
+    class EmptyRequest
+      def initialize
       end
 
-      class EmptyRequest
-        def initialize
-        end
-
-        def wait
-        end
+      def wait
       end
     end
   end

data/lib/groonga/client/error.rb

@@ -0,0 +1,22 @@
+# Copyright (C) 2014  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
+
+module Groonga
+  class Client
+    class Error < StandardError
+    end
+  end
+end

data/lib/groonga/client/{connection → protocol}/error.rb

@@ -16,10 +16,15 @@
 # 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/error"
+
 module Groonga
   class Client
-    module Connection
-      class Error < StandardError
+    module Protocol
+      class Error < Client::Error
+      end
+
+      class WrappedError < Error
         attr_reader :raw_error
         def initialize(raw_error)
           @raw_error = raw_error

data/lib/groonga/client/{connection → protocol}/gqtp.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2013  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2014  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
@@ -22,14 +22,19 @@ require "erb"
 require "gqtp"
 require "json"
 
-require "groonga/client/connection/request"
+require "groonga/client/empty-request"
+require "groonga/client/protocol/error"
 
 module Groonga
   class Client
-    module Connection
+    module Protocol
       class GQTP
         def initialize(options)
-          @client = ::GQTP::Client.new(options)
+          begin
+            @client = ::GQTP::Client.new(options)
+          rescue ::GQTP::ConnectionError
+            raise WrappedError.new($!)
+          end
         end
 
         def send(command)

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

@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2013  Haruka Yoshihara <yoshihara@clear-code.com>
+# Copyright (C) 2013  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
+
+require "groonga/client/protocol/error"
+
+module Groonga
+  class Client
+    module Protocol
+      class HTTP
+        class UnknownBackendError < Error
+          attr_reader :backend
+          def initialize(backend, detail)
+            @backend = backend
+            super("Unknown HTTP backend: <#{backend}>: #{detail}")
+          end
+        end
+
+        def initialize(options)
+          @host = options[:host] || "127.0.0.1"
+          @port = options[:port] || 10041
+          @options = options
+          @backend = create_backend
+        end
+
+        def send(command, &block)
+          @backend.send(command, &block)
+        end
+
+        def connected?
+          @backend.connected?
+        end
+
+        def close(&block)
+          @backend.close(&block)
+        end
+
+        private
+        def create_backend
+          backend = @options[:backend] || :thread
+
+          begin
+            require "groonga/client/protocol/http/#{backend}"
+          rescue LoadError
+            raise UnknownBackendError.new(backend, $!.message)
+          end
+
+          backend_name = backend.to_s.capitalize
+          backend_class = self.class.const_get(backend_name)
+          backend_class.new(@host, @port, @options)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,92 @@
+# Copyright (C) 2014  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
+
+require "coolio"
+
+require "groonga/client/empty-request"
+require "groonga/client/protocol/error"
+
+module Groonga
+  class Client
+    module Protocol
+      class HTTP
+        class Coolio
+          class Request
+            def initialize(client, loop)
+              @client = client
+              @loop = loop
+            end
+
+            def wait
+              until @client.finished?
+                @loop.run_once
+              end
+            end
+          end
+
+          class GroongaHTTPClient < ::Coolio::HttpClient
+            def initialize(socket, callback)
+              super(socket)
+              @callback = callback
+              @finished = false
+            end
+
+            def finished?
+              @finished
+            end
+
+            def on_body_data(data)
+              @callback.call(data)
+            end
+
+            def on_close
+              super
+              @finished = true
+            end
+          end
+
+          def initialize(host, port, options)
+            @host = host
+            @port = port
+            @options = options
+            @loop = @options[:loop] || ::Coolio::Loop.default
+          end
+
+          def send(command, &block)
+            client = GroongaHTTPClient.connect(@host, @port, block)
+            client.attach(@loop)
+            client.request("GET", command.to_uri_format)
+            Request.new(client, @loop)
+          end
+
+          def connected?
+            false
+          end
+
+          def close(&block)
+            sync = !block_given?
+            if sync
+              false
+            else
+              yield
+              EmptyRequest.new
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,95 @@
+# Copyright (C) 2013  Haruka Yoshihara <yoshihara@clear-code.com>
+# Copyright (C) 2013-2014  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
+
+require "open-uri"
+
+require "groonga/client/empty-request"
+require "groonga/client/protocol/error"
+
+module Groonga
+  class Client
+    module Protocol
+      class HTTP
+        class Thread
+          class Request
+            def initialize(thread)
+              @thread = thread
+            end
+
+            def wait
+              @thread.join
+            end
+          end
+
+          def initialize(host, port, options)
+            @host = host
+            @port = port
+            @options = options
+          end
+
+          def send(command)
+            url = "http://#{@host}:#{@port}#{command.to_uri_format}"
+            thread = ::Thread.new do
+              begin
+                open(url) do |response|
+                  body = response.read
+                  yield(body)
+                end
+              rescue OpenURI::HTTPError, Timeout::Error
+                raise WrappedError.new($!)
+              end
+            end
+            Request.new(thread)
+          end
+
+          # @return [false] Always returns false because the current
+          #   implementation doesn't support keep-alive.
+          def connected?
+            false
+          end
+
+          # Does nothing because the current implementation doesn't
+          # support keep-alive. If the implementation supports
+          # keep-alive, it close the opend connection.
+          #
+          # @overload close
+          #   Closes synchronously.
+          #
+          #   @return [false] It always returns false because there is always
+          #      no connection.
+          #
+          # @overload close {}
+          #   Closes asynchronously.
+          #
+          #   @yield [] Calls the block when the opened connection is closed.
+          #   @return [#wait] The request object. If you want to wait until
+          #      the request is processed. You can send #wait message to the
+          #      request.
+          def close(&block)
+            sync = !block_given?
+            if sync
+              false
+            else
+              yield
+              EmptyRequest.new
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/groonga/client/version.rb

@@ -18,6 +18,6 @@
 
 module Groonga
   class Client
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/test/{connection → protocol}/test-gqtp.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2014  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
@@ -18,16 +18,16 @@
 
 require "socket"
 
-require "groonga/client/connection/gqtp"
+require "groonga/client/protocol/gqtp"
 
-class TestConnectionGQTP < Test::Unit::TestCase
+class TestProtocolGQTP < Test::Unit::TestCase
   def setup
     setup_server
-    setup_connection
+    setup_client
   end
 
   def teardown
-    teardown_connection
+    teardown_client
     teardown_server
   end
 
@@ -35,7 +35,6 @@ class TestConnectionGQTP < Test::Unit::TestCase
     @address = "127.0.0.1"
     @server = TCPServer.new(@address, 0)
     @port = @server.addr[1]
-    @protocol = :gqtp
 
     @thread = Thread.new do
       client = @server.accept
@@ -51,12 +50,12 @@ class TestConnectionGQTP < Test::Unit::TestCase
     @thread.kill
   end
 
-  def setup_connection
-    @connection = nil
+  def setup_client
+    @client = nil
   end
 
-  def teardown_connection
-    @connection.close {} if @connection
+  def teardown_client
+    @client.close {} if @client
   end
 
   private
@@ -65,41 +64,51 @@ class TestConnectionGQTP < Test::Unit::TestCase
       :host => @address,
       :port => @port,
     }
-    Groonga::Client::Connection::GQTP.new(default_options.merge(options))
+    Groonga::Client::Protocol::GQTP.new(default_options.merge(options))
   end
 
   def process_client_close(client)
     response_body = [].to_json
-    2.times do
-      header = GQTP::Header.parse(client.read(GQTP::Header.size))
-      client.read(header.size)
+    header = GQTP::Header.parse(client.read(GQTP::Header.size))
+    client.read(header.size)
 
-      response_header = GQTP::Header.new
-      response_header.size = response_body.bytesize
+    response_header = GQTP::Header.new
+    response_header.size = response_body.bytesize
 
-      client.write(response_header.pack)
-      client.write(response_body)
+    client.write(response_header.pack)
+    client.write(response_body)
+  end
+
+  class TestConnect < self
+    def test_no_server
+      server = TCPServer.new("127.0.0.1", 0)
+      free_port = server.addr[1]
+      server.close
+      assert_raise(Groonga::Client::Protocol::WrappedError) do
+        Groonga::Client::Protocol::GQTP.new(:host => "127.0.0.1",
+                                            :port => free_port)
+      end
     end
   end
 
   class TestConnected < self
     def test_opened
-      @connection = connect
-      assert_true(@connection.connected?)
+      @client = connect
+      assert_true(@client.connected?)
     end
 
     def test_closed
-      @connection = connect
-      @connection.close
-      assert_false(@connection.connected?)
+      @client = connect
+      @client.close
+      assert_false(@client.connected?)
     end
   end
 
   class TestClose < self
     def test_twice
-      @connection = connect
-      @connection.close
-      assert_false(@connection.close)
+      @client = connect
+      @client.close
+      assert_false(@client.close)
     end
   end
 end

data/test/{connection → protocol}/test-http.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2014  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
@@ -18,16 +18,16 @@
 
 require "socket"
 
-require "groonga/client/connection/http"
+require "groonga/client/protocol/http"
 
-class TestConnectionHTTP < Test::Unit::TestCase
+class TestProtocolHTTP < Test::Unit::TestCase
   def setup
     setup_server
-    setup_connection
+    setup_client
   end
 
   def teardown
-    teardown_connection
+    teardown_client
     teardown_server
   end
 
@@ -35,7 +35,6 @@ class TestConnectionHTTP < Test::Unit::TestCase
     @address = "127.0.0.1"
     @server = TCPServer.new(@address, 0)
     @port = @server.addr[1]
-    @protocol = :http
 
     @response_body = nil
     @thread = Thread.new do
@@ -66,12 +65,12 @@ EOH
     @thread.kill
   end
 
-  def setup_connection
-    @connection = nil
+  def setup_client
+    @client = nil
   end
 
-  def teardown_connection
-    @connection.close if @connection
+  def teardown_client
+    @client.close if @client
   end
 
   def connect(options={})
@@ -79,19 +78,19 @@ EOH
       :host => @address,
       :port => @port,
     }
-    Groonga::Client::Connection::HTTP.new(default_options.merge(options))
+    Groonga::Client::Protocol::HTTP.new(default_options.merge(options))
   end
 
   def test_connected?
-    @connection = connect
-    assert_false(@connection.connected?)
+    @client = connect
+    assert_false(@client.connected?)
   end
 
   class TestClose < self
     def test_twice
-      @connection = connect
-      assert_false(@connection.close)
-      assert_false(@connection.close)
+      @client = connect
+      assert_false(@client.close)
+      assert_false(@client.close)
     end
   end
 end

data/test/test-client.rb

@@ -17,6 +17,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 "time"
 require "socket"
 require "groonga/client"
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groonga-client
 version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors:
 - Haruka Yoshihara
@@ -11,161 +10,139 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gqtp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: groonga-command
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit-notify
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit-rr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: packnga
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'Groonga-client gem supports HTTP or
-
+description: |
+  Groonga-client gem supports HTTP or
   [GQTP (Groonga Query Transfer Protocol)](http://groonga.org/docs/spec/gqtp.html)
-
   as the protocol using a client. You can use it without groonga
-
   package.
-
-'
 email:
 - yshr04hrk@gmail.com
 - kou@clear-code.com
@@ -180,6 +157,7 @@ files:
 - groonga-client.gemspec
 - .yardopts
 - lib/groonga/client/response.rb
+- lib/groonga/client/error.rb
 - lib/groonga/client/response/clearlock.rb
 - lib/groonga/client/response/column_remove.rb
 - lib/groonga/client/response/quit.rb
@@ -203,10 +181,12 @@ files:
 - lib/groonga/client/response/column_list.rb
 - lib/groonga/client/version.rb
 - lib/groonga/client/command.rb
-- lib/groonga/client/connection/request.rb
-- lib/groonga/client/connection/error.rb
-- lib/groonga/client/connection/gqtp.rb
-- lib/groonga/client/connection/http.rb
+- lib/groonga/client/protocol/error.rb
+- lib/groonga/client/protocol/http/coolio.rb
+- lib/groonga/client/protocol/http/thread.rb
+- lib/groonga/client/protocol/gqtp.rb
+- lib/groonga/client/protocol/http.rb
+- lib/groonga/client/empty-request.rb
 - lib/groonga/client.rb
 - doc/text/news.md
 - test/run-test.rb
@@ -219,32 +199,31 @@ files:
 - test/test-command.rb
 - test/results/test-table-list.rb
 - test/results/test-column-list.rb
-- test/connection/test-gqtp.rb
-- test/connection/test-http.rb
+- test/protocol/test-gqtp.rb
+- test/protocol/test-http.rb
 homepage: https://github.com/ranguba/groonga-client
 licenses:
 - LGPLv2.1 or later
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Groonga-client is a client for groonga (http://groonga.org/) implemented
   with pure ruby.
 test_files:
@@ -258,6 +237,6 @@ test_files:
 - test/test-command.rb
 - test/results/test-table-list.rb
 - test/results/test-column-list.rb
-- test/connection/test-gqtp.rb
-- test/connection/test-http.rb
+- test/protocol/test-gqtp.rb
+- test/protocol/test-http.rb
 has_rdoc: 

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

@@ -1,83 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2013  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2013  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
-
-require "open-uri"
-
-require "groonga/client/connection/request"
-require "groonga/client/connection/error"
-
-module Groonga
-  class Client
-    module Connection
-      class HTTP
-        def initialize(options)
-          @host = options[:host] || "127.0.0.1"
-          @port = options[:port] || 10041
-        end
-
-        def send(command)
-          url = "http://#{@host}:#{@port}#{command.to_uri_format}"
-          thread = Thread.new do
-            begin
-              open(url) do |response|
-                body = response.read
-                yield(body)
-              end
-            rescue OpenURI::HTTPError, Timeout::Error
-              raise Error.new($!)
-            end
-          end
-          ThreadRequest.new(thread)
-        end
-
-        # @return [false] Always returns false because the current
-        #   implementation doesn't support keep-alive.
-        def connected?
-          false
-        end
-
-        # Does nothing because the current implementation doesn't
-        # support keep-alive. If the implementation supports
-        # keep-alive, it close the opend connection.
-        #
-        # @overload close
-        #   Closes synchronously.
-        #
-        #   @return [false] It always returns false because there is always
-        #      no connectin.
-        #
-        # @overload close {}
-        #   Closes asynchronously.
-        #
-        #   @yield [] Calls the block when the opened connection is closed.
-        #   @return [#wait] The request object. If you want to wait until
-        #      the request is processed. You can send #wait message to the
-        #      request.
-        def close(&block)
-          sync = !block_given?
-          if sync
-            false
-          else
-            EmptyRequest.new
-          end
-        end
-      end
-    end
-  end
-end