groonga-client 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d48aabe77a551429a057a3b1ab6146ae0922806
-  data.tar.gz: e59ee42028c1c5fa8c41297b6bd12c6ce09ac190
+  metadata.gz: f9c339f846c4dd77c1d102b3fa5b6a3cf4089d66
+  data.tar.gz: 7cc21590afb0f4999f4098180574d8624610f056
 SHA512:
-  metadata.gz: f037cb0748f6d184a0146767b6560ab46bf1c12d7eb1d9d38fadf04be51490cd4d5ae1056bea4f0f4e55df662b532bbe6e560b93407bd94380df92a89367e1a7
-  data.tar.gz: 39c6fbec14c2d83993078458221a73c23dd43a5536ea0a3323fb3854982b5921b21567c365c5c50bb42d1e09edf5a6798868bbbc213893d52aa14c72c24a2253
+  metadata.gz: 4041083e2efa90d027c789869234e17c65b68b51933c2d76012fb4b5f0c0ff72c2efa896978c5174528ae42ff2283fc23914935cca488296ef7913362f2bf994
+  data.tar.gz: 9a4ae8ae3f50124137312a7debcb079ef0687574e05808599c72199c69de9e195b9c634d93421d5dfe2017dec7d1c89f9d252fd741659a400bbf2916a344c0b5

data/doc/text/news.md

@@ -1,5 +1,13 @@
 # NEWS
 
+## 0.3.2 - 2016-12-06
+
+### Improvements
+
+  * `Groonga::Load#n_loaded_records`: Added. It's a convenience method to get the number of loaded records.
+
+  * `Groonga::Load#ids`: Added. It's for `load --output_ids yes --command_version 3` that can be used with Groonga 6.1.2 or later.
+
 ## 0.3.1 - 2016-10-11
 
 ### Improvements

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

@@ -1,6 +1,5 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright (C) 2013  Haruka Yoshihara <yoshihara@clear-code.com>
+# 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
@@ -23,8 +22,33 @@ module Groonga
     module Response
       class Load < Base
         Response.register("load", self)
+
+        # @return [Integer] The number of loaded records.
+        attr_accessor :n_loaded_records
+
+        # @return [::Array<Integer>] The IDs of loaded records. ID is
+        #   `0` if the corresponding record is failed to add.
+        #
+        #   If you don't specify `yes` to `output_ids` `load`
+        #   parameter, this is always an empty array.
+        attr_accessor :ids
+
+        def body=(body)
+          super(body)
+          parse_body(body)
+        end
+
+        private
+        def parse_body(body)
+          if body.is_a?(::Hash)
+            @n_loaded_records = body["n_loaded_records"]
+            @ids = body["ids"] || []
+          else
+            @n_loaded_records = body
+            @ids = []
+          end
+        end
       end
     end
   end
 end
-

data/lib/groonga/client/version.rb

@@ -16,6 +16,6 @@
 
 module Groonga
   class Client
-    VERSION = "0.3.1"
+    VERSION = "0.3.2"
   end
 end

data/test/response/test-load.rb

@@ -0,0 +1,78 @@
+# 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
+
+require "response/helper"
+
+class TestResponseLoad < Test::Unit::TestCase
+  private
+  def create_response(command, body)
+    header = {
+      "return_code"  => 0,
+      "start_time"   => 1372430096.70991,
+      "elapsed_time" => 0.000522851943969727,
+    }
+    Groonga::Client::Response::Load.new(command, header, body)
+  end
+
+  sub_test_case("#n_loaded_records") do
+    test("command_version=1") do
+      command = Groonga::Command::Load.new("load",
+                                           {"command_version" => "1"})
+      response = create_response(command, 29)
+      assert_equal(29, response.n_loaded_records)
+    end
+
+    test("command_version=3") do
+      command = Groonga::Command::Load.new("load",
+                                           {"command_version" => "3"})
+      response = create_response(command, {"n_loaded_records" => 29})
+      assert_equal(29, response.n_loaded_records)
+    end
+  end
+
+  sub_test_case("#ids") do
+    test("command_version=1") do
+      command = Groonga::Command::Load.new("load",
+                                           {"command_version" => "1"})
+      response = create_response(command, 29)
+      assert_equal([], response.ids)
+    end
+
+    sub_test_case("command_version=3") do
+      test("no output_ids") do
+        command = Groonga::Command::Load.new("load",
+                                             {"command_version" => "3"})
+        response = create_response(command, {"n_loaded_records" => 29})
+        assert_equal(29, response.n_loaded_records)
+      end
+
+      test("output_ids=yes") do
+        command = Groonga::Command::Load.new("load",
+                                             {
+                                               "command_version" => "3",
+                                               "output_ids" => "yes",
+                                             })
+        ids = [1, 2, 0, 4, 3]
+        response = create_response(command,
+                                   {
+                                     "n_loaded_records" => 4,
+                                     "ids" => ids,
+                                   })
+        assert_equal(ids, response.ids)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groonga-client
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Haruka Yoshihara
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2016-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gqtp
@@ -216,6 +216,7 @@ files:
 - test/response/test-base.rb
 - test/response/test-column-list.rb
 - test/response/test-error.rb
+- test/response/test-load.rb
 - test/response/test-schema.rb
 - test/response/test-select-command-version1.rb
 - test/response/test-select-command-version3.rb
@@ -249,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Groonga-client is a client for Groonga (http://groonga.org/) implemented
@@ -262,6 +263,7 @@ test_files:
 - test/protocol/test-http.rb
 - test/run-test.rb
 - test/response/test-base.rb
+- test/response/test-load.rb
 - test/response/test-column-list.rb
 - test/response/helper.rb
 - test/response/test-error.rb