gqtp 1.0.4 → 1.0.5

data/Gemfile

@@ -16,6 +16,6 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-source :rubygems
+source "https://rubygems.org/"
 
 gemspec

data/doc/text/news.md

@@ -1,32 +1,38 @@
 # News
 
+## 1.0.5: 2013-09-18
+
+### Improvements
+
+  * Supported async close.
+
 ## 1.0.4: 2013-07-08
 
 ### Fixes
 
-* Fixed missing synchronization bug
-* Suppressed warnings
+  * Fixed missing synchronization bug
+  * Suppressed warnings
 
 ## 1.0.3: 2013-01-07
 
 ### Fixes
 
-* Fixed the bug anyone can't see README document in rubydoc.info.
-  README URL: http://rubydoc.info/gems/gqtp/
+  * Fixed the bug anyone can't see README document in rubydoc.info.
+    README URL: http://rubydoc.info/gems/gqtp/
 
 ## 1.0.2: 2012-12-29
 
 ### Fixes
 
-* Added missing file for documentaion.
+  * Added missing file for documentaion.
 
 ## 1.0.1: 2012-12-29
 
 ### Improvements
 
-* [client] Sent
-  [quit command](http://groonga.org/docs/reference/commands/quit.html)
-  on close.
+  * [client] Sent
+    [quit command](http://groonga.org/docs/reference/commands/quit.html)
+    on close.
 
 ## 1.0.0: 2012-11-29
 

data/lib/gqtp/client.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-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
@@ -69,18 +69,38 @@ module GQTP
       end
     end
 
+    # Closes the opened connection. You can't send a new request after
+    # this method is called.
+    #
+    # @overload close
+    #   Closes synchronously.
+    #
+    #   @return [true]
+    #
+    # @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
       sync = !block_given?
-      ack_request = nil
+      sequential_request = SequentialRequest.new
       quit_request = send("quit", :header => header_for_close) do
         ack_request = send("ACK", :header => header_for_close) do
           @connection.close
           yield if block_given?
         end
+        sequential_request << ack_request
       end
+      sequential_request << quit_request
+
       if sync
-        quit_request.wait
-        ack_request.wait
+        sequential_request.wait
+        true
+      else
+        sequential_request
       end
     end
 

data/lib/gqtp/version.rb

@@ -17,5 +17,5 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module GQTP
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/test/test-client.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-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
@@ -32,13 +32,8 @@ class ClientTest < Test::Unit::TestCase
       client = @server.accept
       @server.close
 
-      header = GQTP::Header.parse(client.read(GQTP::Header.size))
-      @request_body = client.read(header.size)
+      process_client(client)
 
-      response_header = GQTP::Header.new
-      response_header.size = @response_body.bytesize
-      client.write(response_header.pack)
-      client.write(@response_body)
       client.close
     end
   end
@@ -65,4 +60,41 @@ class ClientTest < Test::Unit::TestCase
     end
     request.wait
   end
+
+  private
+  def process_client(client)
+    header = GQTP::Header.parse(client.read(GQTP::Header.size))
+    @request_body = client.read(header.size)
+
+    response_header = GQTP::Header.new
+    response_header.size = @response_body.bytesize
+    client.write(response_header.pack)
+    client.write(@response_body)
+  end
+
+  class CloseTest < self
+    def test_sync
+      @response_body = "[]"
+      client = GQTP::Client.new(:address => @address, :port => @port)
+      assert_true(client.close)
+    end
+
+    def test_async
+      @response_body = "[]"
+      client = GQTP::Client.new(:address => @address, :port => @port)
+      closed = false
+      close_request = client.close do
+        closed = true
+      end
+      assert_false(closed)
+      close_request.wait
+      assert_true(closed)
+    end
+
+    private
+    def process_client(client)
+      super(client)
+      super(client)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gqtp
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2013-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -126,25 +126,25 @@ files:
 - Gemfile
 - gqtp.gemspec
 - .yardopts
-- lib/gqtp.rb
-- lib/gqtp/version.rb
-- lib/gqtp/connection/synchronous.rb
-- lib/gqtp/connection/coolio.rb
-- lib/gqtp/connection/thread.rb
+- lib/gqtp/parser.rb
 - lib/gqtp/header.rb
 - lib/gqtp/error.rb
+- lib/gqtp/version.rb
+- lib/gqtp/proxy.rb
 - lib/gqtp/sequential-request.rb
-- lib/gqtp/parser.rb
 - lib/gqtp/server.rb
-- lib/gqtp/proxy.rb
+- lib/gqtp/connection/coolio.rb
+- lib/gqtp/connection/thread.rb
+- lib/gqtp/connection/synchronous.rb
 - lib/gqtp/client.rb
-- doc/text/lgpl-2.1.txt
+- lib/gqtp.rb
 - doc/text/news.md
-- test/test-header.rb
-- test/test-parser.rb
-- test/test-proxy.rb
+- doc/text/lgpl-2.1.txt
 - test/run-test.rb
 - test/test-client.rb
+- test/test-parser.rb
+- test/test-proxy.rb
+- test/test-header.rb
 - bin/gqtp-proxy
 homepage: https://github.com/ranguba/gqtp
 licenses:
@@ -173,9 +173,9 @@ specification_version: 3
 summary: Gqtp gem is a [GQTP (Groonga Query Transfer Protocol)](http://groonga.org/docs/spec/gqtp.html)
   Ruby implementation.
 test_files:
-- test/test-header.rb
-- test/test-parser.rb
-- test/test-proxy.rb
 - test/run-test.rb
 - test/test-client.rb
+- test/test-parser.rb
+- test/test-proxy.rb
+- test/test-header.rb
 has_rdoc: