gqtp 1.0.3 → 1.0.4

data/doc/text/news.md

@@ -1,5 +1,12 @@
 # News
 
+## 1.0.4: 2013-07-08
+
+### Fixes
+
+* Fixed missing synchronization bug
+* Suppressed warnings
+
 ## 1.0.3: 2013-01-07
 
 ### Fixes

data/lib/gqtp/client.rb

@@ -17,6 +17,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "gqtp/parser"
+require "gqtp/sequential-request"
 
 module GQTP
   class Client
@@ -32,16 +33,15 @@ module GQTP
       header = options[:header] || Header.new
       header.size = body.bytesize
 
-      write_request = @connection.write(header.pack, body) do
-        if block_given?
-          read(&block)
-        end
-      end
-
       if block_given?
-        write_request
+        sequential_request = SequentialRequest.new
+        write_request = @connection.write(header.pack, body) do
+          sequential_request << read(&block)
+        end
+        sequential_request << write_request
+        sequential_request
       else
-        write_request.wait
+        @connection.write(header.pack, body)
       end
     end
 
@@ -49,18 +49,23 @@ module GQTP
       sync = !block_given?
       parser = Parser.new
       response_body = nil
-      read_body_request = nil
+
+      sequential_request = SequentialRequest.new
       read_header_request = @connection.read(Header.size) do |header|
         parser << header
         read_body_request = @connection.read(parser.header.size) do |body|
           response_body = body
           yield(parser.header, response_body) if block_given?
         end
+        sequential_request << read_body_request
       end
+      sequential_request << read_header_request
+
       if sync
-        read_header_request.wait
-        read_body_request.wait
+        sequential_request.wait
         [parser.header, response_body]
+      else
+        sequential_request
       end
     end
 

data/lib/gqtp/proxy.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
@@ -40,9 +40,9 @@ module GQTP
       end
       @server.on_request do |request, client, connection|
         connection.write(request.header.pack, request.body) do
-          read_header_request = connection.read(Header.size) do |header|
+          connection.read(Header.size) do |header|
             response_header = Header.parse(header)
-            read_body_request = connection.read(response_header.size) do |body|
+            connection.read(response_header.size) do |body|
               client.write(header, body) do
               end
             end

data/lib/gqtp/sequential-request.rb

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+#
+# 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
+
+module GQTP
+  class SequentialRequest
+    def initialize
+      @requests = []
+    end
+
+    def wait
+      while (request = @requests.pop)
+        request.wait
+      end
+    end
+
+    def <<(request)
+      @requests << request
+    end
+  end
+end

data/lib/gqtp/server.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
@@ -78,9 +78,9 @@ module GQTP
     end
 
     def process_request(client, connect_info)
-      read_header_request = client.read(Header.size) do |header|
+      client.read(Header.size) do |header|
         request_header = Header.parse(header)
-        read_body_request = client.read(request_header.size) do |body|
+        client.read(request_header.size) do |body|
           request = Request.new(request_header, body)
           on_request(request, client, connect_info)
           process_request(client, connect_info)

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.3"
+  VERSION = "1.0.4"
 end

data/test/run-test.rb

@@ -1,6 +1,7 @@
+#!/usr/bin/env ruby
 # -*- 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

data/test/test-proxy.rb

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+#
+# 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 "gqtp/proxy"
+
+class ProxyTest < Test::Unit::TestCase
+  def setup
+    @proxy = GQTP::Proxy.new
+  end
+
+  def teardown
+    @proxy.shutdown
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gqtp
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-07 00:00:00.000000000 Z
+date: 2013-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -126,22 +126,24 @@ files:
 - Gemfile
 - gqtp.gemspec
 - .yardopts
-- lib/gqtp/parser.rb
-- lib/gqtp/server.rb
-- lib/gqtp/connection/thread.rb
-- lib/gqtp/connection/coolio.rb
-- lib/gqtp/connection/synchronous.rb
+- lib/gqtp.rb
 - lib/gqtp/version.rb
+- lib/gqtp/connection/synchronous.rb
+- lib/gqtp/connection/coolio.rb
+- lib/gqtp/connection/thread.rb
 - lib/gqtp/header.rb
-- lib/gqtp/client.rb
-- lib/gqtp/proxy.rb
 - lib/gqtp/error.rb
-- lib/gqtp.rb
-- doc/text/news.md
+- lib/gqtp/sequential-request.rb
+- lib/gqtp/parser.rb
+- lib/gqtp/server.rb
+- lib/gqtp/proxy.rb
+- lib/gqtp/client.rb
 - doc/text/lgpl-2.1.txt
-- test/run-test.rb
+- doc/text/news.md
 - test/test-header.rb
 - test/test-parser.rb
+- test/test-proxy.rb
+- test/run-test.rb
 - test/test-client.rb
 - bin/gqtp-proxy
 homepage: https://github.com/ranguba/gqtp
@@ -157,18 +159,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2123818797887154120
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2123818797887154120
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -177,8 +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/run-test.rb
 - test/test-header.rb
 - test/test-parser.rb
+- test/test-proxy.rb
+- test/run-test.rb
 - test/test-client.rb
 has_rdoc: