groonga-client 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e8cad3043939d233594ca90f8b84ea33725d5b5
-  data.tar.gz: d8ae56764fe0a86509ef2b6cbe5762242cdb0dcf
+  metadata.gz: 6acb75bd146da352188103e7a1970a8a219200c5
+  data.tar.gz: f91de40970d46772c874b18558fa9ce8f5383c0c
 SHA512:
-  metadata.gz: 3d1f57297335e1d324fea8e867b6703ad44222effb6c6b23aa49163747bc98fbc70013227180b4a0c00e1b632d3f8df70d639157fbfaba169876128fa6796dc8
-  data.tar.gz: 66bd55f2b48c53208fb0596101b80277e04ab1151321c74e5ff27169998a6b09197039c9793a96f9d3bf68f54534058fddb9c802b5ca820700566d01f2bebbe3
+  metadata.gz: e153df284b448608874783c83582fdfada42e13c58d265eda16957cc853999c49128dd2f3e44325eb43befbbf78cb3df32d63613421da90899475429bf47074c
+  data.tar.gz: 06c18591b44b11e1ddcaaf0789dd0b23631797d8e7c4175a4022360954e4ca74cd332bc4bb6d73dde4762fd06fea5bf9e616d36dff81dd72c9f57898a9aef8ba

data/doc/text/news.md

@@ -1,5 +1,13 @@
 # NEWS
 
+## 0.2.1 - 2016-03-21
+
+### Improvements
+
+  * HTTP: Supported path.
+
+  * HTTP: Accepted `nil` as `:read_timeout` value.
+
 ## 0.2.0 - 2016-03-21
 
 ### Improvements

data/lib/groonga/client.rb

@@ -197,6 +197,7 @@ module Groonga
       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)
+      path = options.delete(:path)
       user = options.delete(:user)
       password = options.delete(:password)
       if user and password
@@ -211,7 +212,7 @@ module Groonga
         host,
         port,
         nil,
-        nil,
+        path,
         nil,
         nil,
         nil,

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2014  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
@@ -18,6 +18,7 @@ require "coolio"
 
 require "groonga/client/empty-request"
 require "groonga/client/protocol/error"
+require "groonga/client/protocol/http/path-resolvable"
 
 module Groonga
   class Client
@@ -38,6 +39,8 @@ module Groonga
           end
 
           class GroongaHTTPClient < ::Coolio::HttpClient
+            include PathResolvable
+
             def initialize(socket, callback)
               super(socket)
               @body = ""
@@ -73,10 +76,11 @@ module Groonga
           def send(command, &block)
             client = GroongaHTTPClient.connect(@host, @port, block)
             client.attach(@loop)
+            url = URI("http://#{@host}:#{@port}")
             if command.is_a?(Groonga::Command::Load)
               raw_values = command[:values]
               command[:values] = nil
-              path = command.to_uri_format
+              path = resolve_path(url, command.to_uri_format)
               command[:values] = raw_values
               options = {
                 :head => {
@@ -87,7 +91,8 @@ module Groonga
               }
               client.request("POST", path, options)
             else
-              client.request("GET", command.to_uri_format)
+              path = resolve_path(url, command.to_uri_format)
+              client.request("GET", path)
             end
             Request.new(client, @loop)
           end

data/lib/groonga/client/protocol/http/path-resolvable.rb

@@ -0,0 +1,30 @@
+# Copyright (C) 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
+# 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
+    module Protocol
+      class HTTP
+        module PathResolvable
+          private
+          def resolve_path(uri, path)
+            uri.path.chomp("/") + path
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -20,12 +20,15 @@ require "net/http"
 require "groonga/client/version"
 require "groonga/client/empty-request"
 require "groonga/client/protocol/error"
+require "groonga/client/protocol/http/path-resolvable"
 
 module Groonga
   class Client
     module Protocol
       class HTTP
         class Synchronous
+          include PathResolvable
+
           def initialize(url, options={})
             @url = url
             @options = options
@@ -108,7 +111,7 @@ module Groonga
 
           def read_timeout
             timeout = @options[:read_timeout]
-            if timeout < 0
+            if timeout.nil? or timeout < 0
               nil
             else
               timeout
@@ -119,14 +122,15 @@ module Groonga
             if command.is_a?(Groonga::Command::Load)
               raw_values = command[:values]
               command[:values] = nil
-              path = command.to_uri_format
+              path = resolve_path(@url, command.to_uri_format)
               command[:values] = raw_values
               request = Net::HTTP::Post.new(path, headers)
               request.content_type = "application/json"
               request.content_length = raw_values.bytesize
               request.body_stream = StringIO.new(raw_values)
             else
-              request = Net::HTTP::Get.new(command.to_uri_format, headers)
+              path = resolve_path(@url, command.to_uri_format)
+              request = Net::HTTP::Get.new(path, headers)
             end
             setup_authentication(request)
             http.request(request)

data/lib/groonga/client/version.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# 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
@@ -18,6 +16,6 @@
 
 module Groonga
   class Client
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/test/test-client.rb

@@ -469,5 +469,33 @@ EOH
                      @request_headers["authorization"])
       end
     end
+
+    class TestPath < self
+      def component_based_open_options
+        {
+          :protocol => @protocol,
+          :host => @address,
+          :port => @port,
+        }
+      end
+
+      def test_with_trailing_slash
+        stub_response("[]")
+        options = component_based_open_options.merge(:path => "/sub_path/")
+        Groonga::Client.open(options) do |client|
+          client.status
+        end
+        assert_equal("/sub_path/d/status", @request_path)
+      end
+
+      def test_without_trailing_slash
+        stub_response("[]")
+        options = component_based_open_options.merge(:path => "/sub_path")
+        Groonga::Client.open(options) do |client|
+          client.status
+        end
+        assert_equal("/sub_path/d/status", @request_path)
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groonga-client
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Haruka Yoshihara
@@ -181,6 +181,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/path-resolvable.rb
 - lib/groonga/client/protocol/http/synchronous.rb
 - lib/groonga/client/protocol/http/thread.rb
 - lib/groonga/client/response.rb