groonga-client 0.0.2 → 0.0.3

data/lib/groonga/client/response/column_list.rb

@@ -27,8 +27,9 @@ module Groonga
 
         Response.register("column_list", self)
 
-        def initialize(header, body)
-          super(header, parse_body(body))
+        def body=(body)
+          super(body)
+          parse_body(body)
         end
 
         def each

data/lib/groonga/client/response/select.rb

@@ -1,3 +1,20 @@
+# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013  Kosuke Asami
+#
+# 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/response/base"
 
 module Groonga
@@ -6,32 +23,45 @@ module Groonga
       class Select < Base
         Response.register("select", self)
 
-        attr_accessor :records, :n_records
+        # @return [Integer] The number of records that match againt
+        #   a search condition.
+        attr_accessor :n_hits
+        attr_accessor :records
         attr_accessor :drilldowns
 
-        def initialize(header, body)
-          super(header, parse_body(body))
+        def body=(body)
+          super(body)
+          parse_body(body)
         end
 
         private
         def parse_body(body)
-          @n_records, @records = parse_match_records(body.first)
+          @n_hits, @records = parse_match_records(body.first)
           @drilldowns = parse_drilldowns(body[1..-1])
           body
         end
 
         def parse_result(raw_result)
-          n_items = raw_result.first.first
+          n_hits = raw_result.first.first
           properties = raw_result[1]
-          infos = raw_result[2..-1]
+          infos = raw_result[2..-1] || []
           items = infos.collect do |info|
             item = {}
-            properties.each_with_index do |(name, _), i|
-              item[name] = info[i]
+            properties.each_with_index do |(name, type), i|
+              item[name] = convert_value(info[i], type)
             end
             item
-          end if infos
-          [n_items, items]
+          end
+          [n_hits, items]
+        end
+
+        def convert_value(value, type)
+          case type
+          when "Time"
+            Time.at(value)
+          else
+            value
+          end
         end
 
         def parse_match_records(raw_records)
@@ -39,13 +69,15 @@ module Groonga
         end
 
         def parse_drilldowns(raw_drilldowns)
-          raw_drilldowns.collect do |raw_drilldown|
+          (raw_drilldowns || []).collect.with_index do |raw_drilldown, i|
+            key = @command.drilldowns[i]
             n_hits, items = parse_result(raw_drilldown)
-            Drilldown.new(n_hits, items)
-          end if raw_drilldowns
+            Drilldown.new(key, n_hits, items)
+          end
         end
 
-        Drilldown = Struct.new(:n_hits, :items)
+        class Drilldown < Struct.new(:key, :n_hits, :items)
+        end
       end
     end
   end

data/lib/groonga/client/response/table_create.rb

@@ -0,0 +1,12 @@
+require "groonga/client/response/base"
+
+module Groonga
+  class Client
+    module Response
+      class TableCreate < Base
+        Response.register("table_create", self)
+      end
+    end
+  end
+end
+

data/lib/groonga/client/response/table_list.rb

@@ -27,8 +27,9 @@ module Groonga
 
         Response.register("table_list", self)
 
-        def initialize(header, body)
-          super(header, parse_body(body))
+        def body=(body)
+          super(body)
+          parse_body(body)
         end
 
         def each

data/lib/groonga/client/version.rb

@@ -1,5 +1,5 @@
 module Groonga
   class Client
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/test/connection/test-gqtp.rb

@@ -0,0 +1,105 @@
+# -*- 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 "socket"
+
+require "groonga/client/connection/gqtp"
+
+class TestConnectionGQTP < Test::Unit::TestCase
+  def setup
+    setup_server
+    setup_connection
+  end
+
+  def teardown
+    teardown_connection
+    teardown_server
+  end
+
+  def setup_server
+    @address = "127.0.0.1"
+    @server = TCPServer.new(@address, 0)
+    @port = @server.addr[1]
+    @protocol = :gqtp
+
+    @thread = Thread.new do
+      client = @server.accept
+      @server.close
+
+      process_client_close(client)
+
+      client.close
+    end
+  end
+
+  def teardown_server
+    @thread.kill
+  end
+
+  def setup_connection
+    @connection = nil
+  end
+
+  def teardown_connection
+    @connection.close {} if @connection
+  end
+
+  private
+  def connect(options={})
+    default_options = {
+      :host => @address,
+      :port => @port,
+    }
+    Groonga::Client::Connection::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)
+
+      response_header = GQTP::Header.new
+      response_header.size = response_body.bytesize
+
+      client.write(response_header.pack)
+      client.write(response_body)
+    end
+  end
+
+  class TestConnected < self
+    def test_opened
+      @connection = connect
+      assert_true(@connection.connected?)
+    end
+
+    def test_closed
+      @connection = connect
+      @connection.close
+      assert_false(@connection.connected?)
+    end
+  end
+
+  class TestClose < self
+    def test_twice
+      @connection = connect
+      @connection.close
+      assert_false(@connection.close)
+    end
+  end
+end

data/test/connection/test-http.rb

@@ -0,0 +1,97 @@
+# -*- 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 "socket"
+
+require "groonga/client/connection/http"
+
+class TestConnectionHTTP < Test::Unit::TestCase
+  def setup
+    setup_server
+    setup_connection
+  end
+
+  def teardown
+    teardown_connection
+    teardown_server
+  end
+
+  def setup_server
+    @address = "127.0.0.1"
+    @server = TCPServer.new(@address, 0)
+    @port = @server.addr[1]
+    @protocol = :http
+
+    @response_body = nil
+    @thread = Thread.new do
+      client = @server.accept
+      @server.close
+
+      status = 0
+      start = Time.now.to_f
+      elapsed = rand
+      header = "[#{status},#{start},#{elapsed}]"
+      body = "[#{header},#{@response_body}]"
+
+      http_header = <<-EOH
+HTTP/1.1 200 OK
+Connection: close
+Content-Type: application/json
+Content-Length: #{body.bytesize}
+
+EOH
+
+      client.write(http_header)
+      client.write(body)
+      client.close
+    end
+  end
+
+  def teardown_server
+    @thread.kill
+  end
+
+  def setup_connection
+    @connection = nil
+  end
+
+  def teardown_connection
+    @connection.close if @connection
+  end
+
+  def connect(options={})
+    default_options = {
+      :host => @address,
+      :port => @port,
+    }
+    Groonga::Client::Connection::HTTP.new(default_options.merge(options))
+  end
+
+  def test_connected?
+    @connection = connect
+    assert_false(@connection.connected?)
+  end
+
+  class TestClose < self
+    def test_twice
+      @connection = connect
+      assert_false(@connection.close)
+      assert_false(@connection.close)
+    end
+  end
+end

data/test/response/helper.rb

@@ -1,4 +1,8 @@
 module TestResponseHelper
+  def parse_raw_response(command_name, raw_response)
+    make_command(command_name).send(:parse_raw_response, raw_response)
+  end
+
   def make_command(command_name, parameters = {})
     command_class = Groonga::Command.find(command_name)
     command = command_class.new(command_name, parameters)

data/test/response/test-column-list.rb

@@ -1,5 +1,3 @@
-require "test/unit/rr"
-
 require "response/helper"
 
 class TestResponseColumnList < Test::Unit::TestCase
@@ -9,16 +7,9 @@ class TestResponseColumnList < Test::Unit::TestCase
     header = [0,1372430096.70991,0.000522851943969727]
     body = [[["id","UInt32"],["name","ShortText"],["path","ShortText"],["type","ShortText"],["flags","ShortText"],["domain","ShortText"],["range","ShortText"],["source","ShortText"]],
       [256,"Text","/tmp/test.db.0000100","var","COLUMN_SCALAR|PERSISTENT","TestTable","ShortText",[]]]
+    raw_response = [header, body].to_json
 
-    connection = Object.new
-    stub(connection).send.with_any_args.yields([header, body].to_json) do
-      request = Object.new
-      stub(request).wait do
-        true
-      end
-    end
-
-    response = make_command("column_list").execute(connection)
+    response = parse_raw_response("column_list", raw_response)
     assert_equal(Groonga::Client::Response::ColumnList, response.class)
   end
 end

data/test/response/test-select.rb

@@ -1,23 +1,138 @@
-require "test/unit/rr"
+# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013  Kosuke Asami
+#
+# 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 "response/helper"
 
 class TestResponseSelect < Test::Unit::TestCase
-  include TestResponseHelper
+  class TestParseRawResponse < self
+    include TestResponseHelper
 
-  def test_select
-    header = [0,1372430096.70991,0.000522851943969727]
-    body = [[[1], [["_id", "UInt32"]], [1]]]
+    def test_select
+      header = [0,1372430096.70991,0.000522851943969727]
+      body = [[[1], [["_id", "UInt32"]], [1]]]
+      raw_response = [header, body].to_json
 
-    connection = Object.new
-    stub(connection).send.with_any_args.yields([header, body].to_json) do
-      request = Object.new
-      stub(request).wait do
-        true
+      response = parse_raw_response("select", raw_response)
+      assert_equal(Groonga::Client::Response::Select, response.class)
+    end
+  end
+
+  class TestBody < self
+    def setup
+      @command = Groonga::Command::Select.new("select", {})
+    end
+
+    def test_n_hits
+      response = create_response([[[29], [["_id", "UInt32"]]]])
+      assert_equal(29, response.n_hits)
+    end
+
+    private
+    def create_response(body)
+      header = [0, 1372430096.70991, 0.000522851943969727]
+      Groonga::Client::Response::Select.new(@command, header, body)
+    end
+
+    class TestRecords < self
+      def test_time
+        updated_at = 1379040474
+        assert_equal([{"updated_at" => Time.at(updated_at)}],
+                     records([[[1], [["updated_at", "Time"]], [updated_at]]]))
+      end
+
+      private
+      def records(body)
+        create_response(body).records
       end
     end
 
-    response = make_command("select").execute(connection)
-    assert_equal(Groonga::Client::Response::Select, response.class)
+    class TestDrilldowns < self
+      def setup
+        pair_arguments = {
+          "drilldown" => "_key",
+          "drilldown_output_columns" => "_key,_nsubrecs",
+        }
+        @command = Groonga::Command::Select.new("select", pair_arguments)
+      end
+
+      def test_key
+        body = [
+          [[0], []],
+          [
+            [29],
+            [
+              ["_key",      "ShortText"],
+              ["_nsubrecs", "Int32"],
+            ],
+            ["groonga", 29],
+            ["Ruby",    19],
+            ["rroonga",  9],
+          ],
+        ]
+        assert_equal(["_key"],
+                     drilldowns(body).collect(&:key))
+      end
+
+      def test_n_hits
+        body = [
+          [[0], []],
+          [
+            [29],
+            [
+              ["_key",      "ShortText"],
+              ["_nsubrecs", "Int32"],
+            ],
+            ["groonga", 29],
+            ["Ruby",    19],
+            ["rroonga",  9],
+          ],
+        ]
+        assert_equal([29],
+                     drilldowns(body).collect(&:n_hits))
+      end
+
+      def test_items
+        body = [
+          [[0], []],
+          [
+            [29],
+            [
+              ["_key",      "ShortText"],
+              ["_nsubrecs", "Int32"],
+            ],
+            ["groonga", 29],
+            ["Ruby",    19],
+            ["rroonga",  9],
+          ],
+        ]
+        assert_equal([
+                       [
+                         {"_key" => "groonga", "_nsubrecs" => 29},
+                         {"_key" => "Ruby",    "_nsubrecs" => 19},
+                         {"_key" => "rroonga", "_nsubrecs" =>  9},
+                       ],
+                     ],
+                     drilldowns(body).collect(&:items))
+      end
+
+      private
+      def drilldowns(body)
+        create_response(body).drilldowns
+      end
+    end
   end
 end