groonga-client 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 730d0d465dfa172d63dc072c41da07393bac121c
-  data.tar.gz: 2feb754e982010f661b038ba7dbfc24c65391ce1
+  metadata.gz: 0c389ff7c62caafda9b4442772fbb3c156b88ae5
+  data.tar.gz: b58f127a618a43eb310451e03c8ea065f6cedf65
 SHA512:
-  metadata.gz: 82f16e4c99ff5d2df6bb359502ef877cbe7d8366d086303c8af17af1eec5742119812f06e75f23fcf01852bf1ada1ead65d572949bcf4467150b41fcfe3097f1
-  data.tar.gz: 44e907e66266757ca60262b32ebca650e361c40930aee2bd53881c54909faa7c0bc4354a4167627f6bcf721be49e2c36c95493da4171700d7fe5fde61a4468e8
+  metadata.gz: d75b1913b274ab25c157f7a7dce80cbacc48a6764863098e1967bf9adcff4db52ad1d479ee2c0381aa9eaabd5d6dff522e1689dd0f1baa2d6f92056243c4964e
+  data.tar.gz: 4dcd03da83116e1484d46ae22a21b6b07d987502fe00c5b19708a56e8fc72f94c0e5393b9829f04c8f7476af27bdca9c598e7c76bcda24f1e658fa94ffe185ab

data/doc/text/news.md

@@ -1,5 +1,11 @@
 # NEWS
 
+## 0.1.8 - 2015-08-08
+
+### Improvements
+
+  * `load`: Supported `Array` as `values` value.
+
 ## 0.1.7 - 2015-07-08
 
 ### Improvements

data/groonga-client.gemspec

@@ -54,4 +54,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency("test-unit-rr")
   spec.add_development_dependency("packnga")
   spec.add_development_dependency("redcarpet")
+  spec.add_development_dependency("groonga-command-parser")
 end

data/lib/groonga/client.rb

@@ -17,6 +17,8 @@
 # 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 "json"
+
 require "groonga/client/default"
 require "groonga/client/command"
 require "groonga/client/empty-request"
@@ -155,6 +157,20 @@ module Groonga
     end
 
     def load(parameters, &block)
+      values = parameters[:values]
+      if values.is_a?(Array)
+        json = "["
+        values.each_with_index do |value, i|
+          if i.zero?
+            json << "\n"
+          else
+            json << ",\n"
+          end
+          json << JSON.generate(value)
+        end
+        json << "\n]"
+        parameters[:values] = json
+      end
       execute_command("load", parameters, &block)
     end
 

data/lib/groonga/client/version.rb

@@ -18,6 +18,6 @@
 
 module Groonga
   class Client
-    VERSION = "0.1.7"
+    VERSION = "0.1.8"
   end
 end

data/test/run-test.rb

@@ -31,6 +31,10 @@ groonga_command_base_dir = base_dir.parent + "groonga-command"
 groonga_command_lib_dir = groonga_command_base_dir + "lib"
 $LOAD_PATH.unshift(groonga_command_lib_dir.to_s)
 
+groonga_command_parser_base_dir = base_dir.parent + "groonga-command-parser"
+groonga_command_parser_lib_dir = groonga_command_parser_base_dir + "lib"
+$LOAD_PATH.unshift(groonga_command_parser_lib_dir.to_s)
+
 lib_dir = base_dir + "lib"
 test_dir = base_dir + "test"
 

data/test/test-client.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2013  Haruka Yoshihara <yoshihara@clear-code.com>
-# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2015  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
@@ -19,6 +19,8 @@
 
 require "time"
 require "socket"
+require "groonga/command/parser"
+
 require "groonga/client"
 
 class TestClient < Test::Unit::TestCase
@@ -224,7 +226,7 @@ JSON
   end
 
   module LoadTests
-    def test_load
+    def test_load_json
       values = [
         {"content" => "1st content"},
         {"content" => "2nd content"},
@@ -234,6 +236,22 @@ JSON
       response = client.load(:table => "Memos",
                              :values => JSON.generate(values))
       assert_equal([values.size], response.body)
+      assert_equal([values],
+                   @actual_commands.collect(&:values))
+    end
+
+    def test_load_array
+      values = [
+        {"content" => "1st content"},
+        {"content" => "2nd content"},
+        {"content" => "3rd content"},
+      ]
+      stub_response("[#{values.size}]")
+      response = client.load(:table => "Memos",
+                             :values => values)
+      assert_equal([values.size], response.body)
+      assert_equal([values],
+                   @actual_commands.collect(&:values))
     end
   end
 
@@ -258,6 +276,7 @@ JSON
       @port = @server.addr[1]
       @protocol = :gqtp
 
+      @actual_commands = []
       @response_body = nil
       @thread = Thread.new do
         client = @server.accept
@@ -268,7 +287,8 @@ JSON
           break if raw_header.nil?
 
           header = GQTP::Header.parse(raw_header)
-          client.read(header.size)
+          body = client.read(header.size)
+          @actual_commands << Groonga::Command::Parser.parse(body)
 
           response_header = GQTP::Header.new
           response_header.size = @response_body.bytesize
@@ -296,18 +316,36 @@ JSON
       @port = @server.addr[1]
       @protocol = :http
 
-      @actual_method = nil
-      @actual_path = nil
-
+      @actual_commands = []
       @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
+          # http_method = $1
+          path = $2
+          headers = {}
+          client.each_line do |line|
+            case line
+            when "\r\n"
+              break
+            else
+              name, value = line.strip.split(/: */, 2)
+              headers[name.downcase] = value
+            end
+          end
+          content_length = headers["content-length"]
+          if content_length
+            body = client.read(Integer(content_length))
+          else
+            body = nil
+          end
+          command = Groonga::Command::Parser.parse(path)
+          command[:values] = body if body
+          @actual_commands << command
         end
         @server.close
+
         status = 0
         start = Time.now.to_f
         elapsed = rand

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groonga-client
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Haruka Yoshihara
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-08 00:00:00.000000000 Z
+date: 2015-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gqtp
@@ -138,6 +138,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: groonga-command-parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   Groonga-client gem supports HTTP or
   [GQTP (Groonga Query Transfer Protocol)](http://groonga.org/docs/spec/gqtp.html)