groonga-client 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b10f2746556ebf27bbe22c67f37fe6758aab8400
-  data.tar.gz: 5f96d9789517af65942d155c12053d88283b2d3e
+  metadata.gz: 227bf7a979643ac2f17b20d32b4b3ed0129f8321
+  data.tar.gz: 6e7b2e2451b0d0bf59313a639f2c7c819b4aba7b
 SHA512:
-  metadata.gz: 6dddafd8f52e38d9d9a6a53cf24a5ab475de32a106d955743c289a64c87d1907cfc13777a4a1c1cfc3be711ec9d6d4287d832e10861f308b1710c240b8b05117
-  data.tar.gz: 69fb56a8c4322708287bf815f883d1c04748476bba5b54048ae35070314d45b96374ada729ade886c4562047001a8f9752367cab04a1fb19c35ccc8221a52d8f
+  metadata.gz: 842ff5602d19852b2ebceb64c470efe15eb48a85ef24c539dfd3e7e09458139a9cba3c899cffce26a29cb25cd2c771f815550aaf283c69f62d740161122e0504
+  data.tar.gz: 66bd127398051d6314c7df147688297244dd609c89b7a06eca59351634d4f7c2e06676eb0bb695af55a34553b7a24162e48c28c2eb67a98b77401a75cd741592

data/doc/text/news.md

@@ -1,5 +1,19 @@
 # NEWS
 
+## 0.4.1 - 2016-02-07
+
+### Improvements
+
+  * `Groonga::Client::Request::Base`: Supported number as parameter
+    value.
+
+  * `Groonga::Client::Response::Load#errors`: Added for `load
+    --output_errors yes --command_version 3`.
+
+  * `Groonga::Client::Request::Select::DynamicColumnWindow#group_keys`:
+    Added for `select --columns[LABEL].window.group_keys`. You can use
+    this method by `request.columns(LABEL).window.group_keys(KEYS)`.
+
 ## 0.4.0 - 2016-01-12
 
 ### Improvements

data/lib/groonga/client/request/base.rb

@@ -88,6 +88,8 @@ module Groonga
           when String
             return {} if @value.empty?
             value = @value
+          when Numeric
+            value = @value.to_s
           when NilClass
             return {}
           else

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

@@ -114,6 +114,9 @@ module Groonga
         def paginate(page, per_page: 10)
           page ||= 1
           page = page.to_i
+          per_page = per_page.to_i
+          per_page = 10 if per_page <= 0
+
           if page <= 0
             offset = 0
           else
@@ -254,6 +257,17 @@ module Groonga
           alias_method :sortby, :sort_keys
           alias_method :sort, :sort_keys
 
+          # Sets `columns[LABEL].window.group_keys` parameter.
+          #
+          # @return [Groonga::Client::Request::Select] The current
+          #   request object.
+          #
+          # @since 0.4.1
+          def group_keys(value)
+            add_parameter(OverwriteMerger,
+                          ValuesParameter.new([:"#{prefix}group_keys"], value))
+          end
+
           private
           def prefix
             "columns[#{@label}].window."

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

@@ -37,6 +37,16 @@ module Groonga
         # @since 0.3.3
         attr_accessor :loaded_ids
 
+        # @return [::Array<Groonga::Client::Response::Load::Error>]
+        #   The errors of loaded records. `error.return_code` isn't
+        #   `0` if the corresponding record is failed to load.
+        #
+        #   If you don't specify `yes` to `output_errors` `load`
+        #   parameter, this is always an empty array.
+        #
+        # @since 0.4.1
+        attr_accessor :errors
+
         def body=(body)
           super(body)
           parse_body(body)
@@ -47,11 +57,19 @@ module Groonga
           if body.is_a?(::Hash)
             @n_loaded_records = body["n_loaded_records"]
             @loaded_ids = body["loaded_ids"] || []
+            @errors = (body["errors"] || []).collect do |error|
+              Error.new(error["return_code"] || 0,
+                        error["message"])
+            end
           else
             @n_loaded_records = body
             @loaded_ids = []
+            @errors = []
           end
         end
+
+        class Error < Struct.new(:return_code, :message)
+        end
       end
     end
   end

data/lib/groonga/client/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2017  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
@@ -16,6 +16,6 @@
 
 module Groonga
   class Client
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
   end
 end

data/test/request/test-select.rb

@@ -158,7 +158,7 @@ class TestRequestSelect < Test::Unit::TestCase
       test "Integer" do
         assert_equal({
                        :table => "posts",
-                       :"drilldowns[label].offset" => 29,
+                       :"drilldowns[label].offset" => "29",
                      },
                      drilldown.offset(29).to_parameters)
       end
@@ -168,7 +168,7 @@ class TestRequestSelect < Test::Unit::TestCase
       test "Integer" do
         assert_equal({
                        :table => "posts",
-                       :"drilldowns[label].limit" => 29,
+                       :"drilldowns[label].limit" => "29",
                      },
                      drilldown.limit(29).to_parameters)
       end
@@ -248,6 +248,141 @@ class TestRequestSelect < Test::Unit::TestCase
                      },
                      column.window.sort_keys("_id").to_parameters)
       end
+
+      test "#group_keys" do
+        assert_equal({
+                       :table => "posts",
+                       :"columns[label].window.group_keys" => "day, tag",
+                     },
+                     column.window.group_keys(["day", "tag"]).to_parameters)
+      end
+    end
+  end
+
+  sub_test_case("#paginate") do
+    def paginate(*args)
+      @request.paginate(*args).to_parameters
+    end
+
+    sub_test_case("page") do
+      test("nil") do
+        assert_equal({
+                       :table  => "posts",
+                       :offset => "0",
+                       :limit  => "10",
+                     },
+                     paginate(nil))
+      end
+
+      test("0") do
+        assert_equal({
+                       :table  => "posts",
+                       :offset => "0",
+                       :limit  => "10",
+                     },
+                     paginate(0))
+      end
+
+      test("1") do
+        assert_equal({
+                       :table  => "posts",
+                       :offset => "0",
+                       :limit  => "10",
+                     },
+                     paginate(1))
+      end
+
+      test("positive") do
+        assert_equal({
+                       :table  => "posts",
+                       :offset => "80",
+                       :limit  => "10",
+                     },
+                     paginate(9))
+      end
+
+      test("negative") do
+        assert_equal({
+                       :table  => "posts",
+                       :offset => "0",
+                       :limit  => "10",
+                     },
+                     paginate(-1))
+      end
+
+      test("string") do
+        assert_equal({
+                       :table  => "posts",
+                       :offset => "80",
+                       :limit  => "10",
+                     },
+                     paginate("9"))
+      end
+    end
+
+    sub_test_case("paginate") do
+      test("default") do
+        assert_equal({
+                       :table  => "posts",
+                       :offset => "20",
+                       :limit  => "10",
+                     },
+                     paginate(3))
+      end
+
+      test("nil") do
+        assert_equal({
+                       :table  => "posts",
+                       :offset => "20",
+                       :limit  => "10",
+                     },
+                     paginate(3, per_page: nil))
+      end
+
+      test("0") do
+        assert_equal({
+                       :table  => "posts",
+                       :offset => "20",
+                       :limit  => "10",
+                     },
+                     paginate(3, per_page: 0))
+      end
+
+      test("1") do
+        assert_equal({
+                       :table  => "posts",
+                       :offset => "2",
+                       :limit  => "1",
+                     },
+                     paginate(3, per_page: 1))
+      end
+
+      test("positive") do
+        assert_equal({
+                       :table  => "posts",
+                       :offset => "58",
+                       :limit  => "29",
+                     },
+                     paginate(3, per_page: 29))
+      end
+
+      test("negative") do
+        assert_equal({
+                       :table  => "posts",
+                       :offset => "20",
+                       :limit  => "10",
+                     },
+                     paginate(3, per_page: -1))
+      end
+
+      test("string") do
+        assert_equal({
+                       :table  => "posts",
+                       :offset => "58",
+                       :limit  => "29",
+                     },
+                     paginate(3, per_page: "29"))
+      end
     end
   end
 end

data/test/response/test-load.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2016  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2016-2017  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
@@ -52,7 +52,7 @@ class TestResponseLoad < Test::Unit::TestCase
     end
 
     sub_test_case("command_version=3") do
-      test("no output_ids") do
+      test("no output_*") do
         command = Groonga::Command::Load.new("load",
                                              {"command_version" => "3"})
         response = create_response(command, {"n_loaded_records" => 29})
@@ -73,6 +73,39 @@ class TestResponseLoad < Test::Unit::TestCase
                                    })
         assert_equal(loaded_ids, response.loaded_ids)
       end
+
+      test("output_errors=yes") do
+        command = Groonga::Command::Load.new("load",
+                                             {
+                                               "command_version" => "3",
+                                               "output_errors" => "yes",
+                                             })
+        raw_errors = [
+          {
+            "return_code" => 0,
+            "message" => nil,
+          },
+          {
+            "return_code" => -22,
+            "message" => "invalid argument",
+          },
+          {
+            "return_code" => 0,
+            "message" => nil,
+          },
+        ]
+        errors = [
+          Groonga::Client::Response::Load::Error.new(0, nil),
+          Groonga::Client::Response::Load::Error.new(-22, "invalid argument"),
+          Groonga::Client::Response::Load::Error.new(0, nil),
+        ]
+        response = create_response(command,
+                                   {
+                                     "n_loaded_records" => 3,
+                                     "errors" => raw_errors,
+                                   })
+        assert_equal(errors, response.errors)
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groonga-client
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Haruka Yoshihara
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-12 00:00:00.000000000 Z
+date: 2017-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gqtp