groonga-client 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79021775f495765006f1149ea3a2f0f868ab9bc7
-  data.tar.gz: 4a10ab8fe0a43a2809c8d58896ed00111ff35ddc
+  metadata.gz: d4c4dbd708fca63ebcf3ca296f548dae1c8cf64b
+  data.tar.gz: a604c62095eacbba073e65812b99b2c922ff2951
 SHA512:
-  metadata.gz: 6679d3cf6ae43dfc72efb6cb90661707868c8aec1802605247e66879187335c88fe4961e89fdd4bd114f0f8000e177e9ff0139fc008482c880225a1fa0f03345
-  data.tar.gz: 3eae9baa5d090619b8fdb69eef2ec3a1eefaf162e7719d26cb7369e13c5a32290644b27cec975db4654c3e0cd9500c328504541852f7f151f451be94edc77287
+  metadata.gz: 78e4d42b4fa59e6517052ca7413562d4392abacf86cea0328121047728d3d1ed41cd08405a07db21616e986cb78a772bce6bd844c1c9ae2ceccac0cd30d7af04
+  data.tar.gz: df04f9b4ba7dd62a8e1c1cac658a4b60c10745e81169a5dbed56d89afd5679ad16a6ed1e7a53c13146e23f8e08fe126d2a00e1825f473a0ea3f34db41b911aad

data/Rakefile

@@ -32,7 +32,9 @@ end
 helper.install
 spec = helper.gemspec
 
-Packnga::DocumentTask.new(spec) do
+Packnga::DocumentTask.new(spec) do |task|
+  task.original_language = "en"
+  task.translate_language = "ja"
 end
 
 Packnga::ReleaseTask.new(spec) do

data/doc/text/news.md

@@ -1,5 +1,12 @@
 # NEWS
 
+## 0.0.9 - 2014-09-30
+
+### Improvements
+
+  * HTTP: Supported "load" by POST.
+  * HTTP: Added synchronous backend.
+
 ## 0.0.8 - 2014-05-12
 
 ### Improvements

data/groonga-client.gemspec

@@ -1,6 +1,7 @@
 # -*- mode: ruby; coding: utf-8 -*-
 #
 # Copyright (C) 2013  Haruka Yoshihara <yoshihara@clear-code.com>
+# 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
@@ -47,7 +48,7 @@ Gem::Specification.new do |spec|
   # end
 
   spec.add_runtime_dependency("gqtp", ">= 1.0.4")
-  spec.add_runtime_dependency("groonga-command", ">= 1.0.4")
+  spec.add_runtime_dependency("groonga-command", ">= 1.0.8")
 
   spec.add_development_dependency("bundler")
   spec.add_development_dependency("rake")

data/lib/groonga/client.rb

@@ -107,7 +107,7 @@ module Groonga
         if sync
           false
         else
-          EmptryReqest.new
+          EmptyRequest.new
         end
       end
     end

data/lib/groonga/client/protocol/http.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 "groonga/client/version"
 require "groonga/client/protocol/error"
 
 module Groonga
@@ -34,7 +35,7 @@ module Groonga
         def initialize(options)
           @host = options[:host] || "127.0.0.1"
           @port = options[:port] || 10041
-          @options = options
+          @options = default_options.merge(options)
           @backend = create_backend
         end
 
@@ -51,6 +52,12 @@ module Groonga
         end
 
         private
+        def default_options
+          {
+            :user_agent => "groonga-client/#{VERSION}",
+          }
+        end
+
         def create_backend
           backend = @options[:backend] || :thread
 

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

@@ -73,7 +73,22 @@ module Groonga
           def send(command, &block)
             client = GroongaHTTPClient.connect(@host, @port, block)
             client.attach(@loop)
-            client.request("GET", command.to_uri_format)
+            if command.name == "load"
+              raw_values = command[:values]
+              command[:values] = nil
+              path = command.to_uri_format
+              command[:values] = raw_values
+              options = {
+                :head => {
+                  "content-type" => "application/json",
+                  "user-agent"   => @options[:user_agent],
+                },
+                :body => raw_values,
+              }
+              client.request("POST", path, options)
+            else
+              client.request("GET", command.to_uri_format)
+            end
             Request.new(client, @loop)
           end
 

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

@@ -0,0 +1,116 @@
+# 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 "net/http"
+
+require "groonga/client/version"
+require "groonga/client/empty-request"
+require "groonga/client/protocol/error"
+
+module Groonga
+  class Client
+    module Protocol
+      class HTTP
+        class Synchronous
+          def initialize(host, port, options)
+            @host = host
+            @port = port
+            @options = options
+          end
+
+          def send(command)
+            begin
+              Net::HTTP.start(@host, @port) do |http|
+                response = send_request(http, command)
+                case response
+                when Net::HTTPSuccess, Net::HTTPBadRequest
+                  yield(response.body)
+                else
+                  if response.body.start_with?("[[")
+                    yield(response.body)
+                  else
+                    message =
+                      "#{response.code} #{response.message}: #{response.body}"
+                    raise Error.new(message)
+                  end
+                end
+              end
+            rescue SystemCallError, Timeout::Error
+              raise WrappedError.new($!)
+            end
+            EmptyRequest.new
+          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
+
+          private
+          def send_request(http, command)
+            if command.name == "load"
+              raw_values = command[:values]
+              command[:values] = nil
+              path = command.to_uri_format
+              command[:values] = raw_values
+              request = Net::HTTP::Post.new(path, headers)
+              request.content_type = "application/json"
+              request.body = raw_values
+              http.request(request)
+            else
+              http.get(command.to_uri_format, headers)
+            end
+          end
+
+          def headers
+            {
+              "user-agent" => @options[:user_agent],
+            }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -15,16 +15,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 "net/http"
+require "thread"
 
-require "groonga/client/empty-request"
-require "groonga/client/protocol/error"
+require "groonga/client/protocol/http/synchronous"
 
 module Groonga
   class Client
     module Protocol
       class HTTP
-        class Thread
+        class Thread < Synchronous
           class Request
             def initialize(thread)
               @thread = thread
@@ -35,70 +34,12 @@ module Groonga
             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
-                Net::HTTP.start(@host, @port) do |http|
-                  response = http.get(command.to_uri_format)
-                  case response
-                  when Net::HTTPSuccess, Net::HTTPBadRequest
-                    yield(response.body)
-                  else
-                    if response.body.start_with?("[[")
-                      yield(response.body)
-                    else
-                      message =
-                        "#{response.code} #{response.message}: #{response.body}"
-                      raise Error.new(message)
-                    end
-                  end
-                end
-              rescue SystemCallError, Timeout::Error
-                raise WrappedError.new($!)
-              end
+              super
             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

data/lib/groonga/client/version.rb

@@ -18,6 +18,6 @@
 
 module Groonga
   class Client
-    VERSION = "0.0.8"
+    VERSION = "0.0.9"
   end
 end

data/test/test-client.rb

@@ -223,6 +223,20 @@ JSON
     end
   end
 
+  module LoadTests
+    def test_load
+      values = [
+        {"content" => "1st content"},
+        {"content" => "2nd content"},
+        {"content" => "3rd content"},
+      ]
+      stub_response("[#{values.size}]")
+      response = client.load(:table => "Memos",
+                             :values => JSON.generate(values))
+      assert_equal([values.size], response.body)
+    end
+  end
+
   module Tests
     include Utils
     include Assertions
@@ -231,6 +245,7 @@ JSON
     include ColumnsTests
     include ParametersTests
     include OpenTests
+    include LoadTests
   end
 
   class TestGQTP < self
@@ -281,9 +296,17 @@ JSON
       @port = @server.addr[1]
       @protocol = :http
 
+      @actual_method = nil
+      @actual_path = nil
+
       @response_body = nil
       @thread = Thread.new do
         client = @server.accept
+        first_line = client.gets
+        if /\A([\w]+) ([^ ]+) HTTP/ =~ first_line
+          @actual_method = $1
+          @actual_path = $2
+        end
         @server.close
         status = 0
         start = Time.now.to_f

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groonga-client
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Haruka Yoshihara
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2014-09-30 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.4
+        version: 1.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.0.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -165,6 +165,7 @@ files:
 - lib/groonga/client/protocol/gqtp.rb
 - lib/groonga/client/protocol/http.rb
 - lib/groonga/client/protocol/http/coolio.rb
+- lib/groonga/client/protocol/http/synchronous.rb
 - lib/groonga/client/protocol/http/thread.rb
 - lib/groonga/client/response.rb
 - lib/groonga/client/response/base.rb
@@ -229,17 +230,17 @@ specification_version: 4
 summary: Groonga-client is a client for groonga (http://groonga.org/) implemented
   with pure ruby.
 test_files:
-- test/run-test.rb
-- test/test-client.rb
-- test/response/helper.rb
+- test/protocol/test-http.rb
+- test/protocol/test-gqtp.rb
 - test/response/test-error.rb
-- test/response/test-status.rb
 - test/response/test-select.rb
 - test/response/test-table-list.rb
 - test/response/test-column-list.rb
-- test/test-command.rb
+- test/response/helper.rb
+- test/response/test-status.rb
 - test/results/test-table-list.rb
 - test/results/test-column-list.rb
-- test/protocol/test-gqtp.rb
-- test/protocol/test-http.rb
+- test/test-command.rb
+- test/run-test.rb
+- test/test-client.rb
 has_rdoc: