groonga-client 0.6.8 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5eff655174ca6884d2bfb486f8bbdf482f1eb01f9cccc0340670cce03a6233ea
-  data.tar.gz: 3b98a877d32035990fa3f955fbd540b9e20ad9b5757c86dcdc855114c82713eb
+  metadata.gz: 55cca8c755088db978d5f1064f0fa737289074b7ad06cfe248b42cf44032ad49
+  data.tar.gz: c6d8c400c8c14ab86955480743bdc9c14cf7a4c34f2b05b3dbbcda62a4a37baf
 SHA512:
-  metadata.gz: 0ab452bca052b4258c0271960c7ff9689cea77cbb2b642f224195809361bdf6d7e18ec1347d01bb558aed0496f0e970f97d1df9ef0b5743a8d861a9e4dcd1639
-  data.tar.gz: 186fa2f3260fe48bc56295fed075fc9617f9b9f559390f63a2a3ca7f37cd75e9db07ab0aae63959ed605c44656cdb878896381068fad6d81c96d15715caf3aab
+  metadata.gz: 2311b2192456fdec99cd357e1f281e3d4242aa4ab0cdc2f4fb274bc88434a5fd158cf36201badc90ddacd7e9e00d20ee5d32f0e23244a8560d39193c3b33947e
+  data.tar.gz: aead1e7ea6c6225ff0b4a1c802857527a154556fbfaa055f3b300fc34eeed482ad3f845393eef85e3960ec1fea588129fcec6d314625efb945d16b8b64e7d2db

data/doc/text/news.md

@@ -1,5 +1,23 @@
 # NEWS
 
+## 0.7.0 - 2024-10-16
+
+### Improvements
+
+  * Improved error message on JSON parse error.
+    * GH-32
+    * Patch by Abe Tomoaki
+
+### Thanks
+
+  * Abe Tomoaki
+
+## 0.6.9 - 2024-04-10
+
+### Improvements
+
+  * HTTP: Added support for request cancel.
+
 ## 0.6.8 - 2023-11-07
 
 ### Improvements

data/lib/groonga/client/error.rb

@@ -18,5 +18,35 @@ module Groonga
   class Client
     class Error < StandardError
     end
+
+    class ErrorResponse < Error
+      attr_reader :response
+      def initialize(response)
+        @response = response
+        command = @response.command
+        status_code = @response.status_code
+        error_message = @response.error_message
+        message = "failed to execute: "
+        message << "#{command.command_name}: #{status_code}: "
+        message << "<#{error_message}>: "
+        message << command.to_command_format
+        super(message)
+      end
+    end
+
+    class InvalidResponse < Error
+      attr_reader :command
+      attr_reader :raw_response
+      def initialize(command, raw_response, error_message)
+        @command = command
+        @raw_response = raw_response
+        message = +"invalid response: "
+        message << "#{command.command_name}: "
+        message << "#{error_message}: "
+        message << "<#{command.to_command_format}>: "
+        message << "<#{raw_response}>"
+        super(message)
+      end
+    end
   end
 end

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

@@ -66,15 +66,19 @@ module Groonga
               http.start do
                 http.read_timeout = read_timeout
                 response = send_request(http, command)
+                body = response.body
                 case response
-                when Net::HTTPSuccess, Net::HTTPBadRequest
-                  yield(response.body)
+                when Net::HTTPSuccess,
+                     Net::HTTPBadRequest, # for invalid request
+                     Net::HTTPRequestTimeOut # for canceled request
+                  yield(body)
                 else
-                  if response.body.start_with?("[[")
-                    yield(response.body)
+                  # "[[" is for command_version=1
+                  # "{" is for command_version=3
+                  if body.start_with?("[[") or body.start_with?("{")
+                    yield(body)
                   else
-                    message =
-                      "#{response.code} #{response.message}: #{response.body}"
+                    message = "#{response.code} #{response.message}: #{body}"
                     raise Error.new(message)
                   end
                 end

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

@@ -19,23 +19,9 @@ require "groonga/client/error"
 module Groonga
   class Client
     module Request
-      class Error < Client::Error
-      end
-
-      class ErrorResponse < Error
-        attr_reader :response
-        def initialize(response)
-          @response = response
-          command = @response.command
-          status_code = @response.status_code
-          error_message = @response.error_message
-          message = "failed to execute: "
-          message << "#{command.command_name}: #{status_code}: "
-          message << "<#{error_message}>: "
-          message << command.to_command_format
-          super(message)
-        end
-      end
+      # For backward compatibility
+      Error = Client::Error
+      ErrorResponse = Client::ErrorResponse
     end
   end
 end

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

@@ -73,9 +73,16 @@ module Groonga
               callback = command["callback"]
               if callback and
                   /\A#{Regexp.escape(callback)}\((.+)\);\z/ =~ raw_response
-                response = JSON.parse($1)
+                json = $1
               else
-                response = JSON.parse(raw_response)
+                json = raw_response
+              end
+              begin
+                response = JSON.parse(json)
+              rescue JSON::ParserError => error
+                raise InvalidResponse.new(command,
+                                          raw_response,
+                                          "invalid JSON: #{error}")
               end
               if response.is_a?(::Array)
                 header, body = response

data/lib/groonga/client/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2022  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2013-2024  Sutou Kouhei <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.6.8"
+    VERSION = "0.7.0"
   end
 end

data/test/response/test-base.rb

@@ -222,5 +222,20 @@ class TestResponseBase < Test::Unit::TestCase
       response = Groonga::Client::Response::Base.parse(command, raw_response)
       assert_equal(1396012478, response.body["start_time"])
     end
+
+    def test_invalid_json
+      command = Groonga::Command::Base.new("cancel")
+      raw_response = '["header", :{"return_code":-77}}'
+      begin
+        JSON.parse(raw_response)
+      rescue JSON::ParserError => error
+        parse_error_message = "invalid JSON: #{error}"
+      end
+      error = Groonga::Client::InvalidResponse.new(command, raw_response, parse_error_message)
+
+      assert_raise(error) do
+        Groonga::Client::Response::Base.parse(command, raw_response)
+      end
+    end
   end
 end

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: groonga-client
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.7.0
 platform: ruby
 authors:
 - Haruka Yoshihara
 - Kouhei Sutou
 - Kosuke Asami
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-07 00:00:00.000000000 Z
+date: 2024-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gqtp
@@ -286,7 +285,6 @@ homepage: https://github.com/ranguba/groonga-client
 licenses:
 - LGPLv2.1+
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -301,8 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.0.dev
-signing_key:
+rubygems_version: 3.6.0.dev
 specification_version: 4
 summary: Groonga-client is a client for Groonga (http://groonga.org/) implemented
   with pure Ruby. You can use it without Groonga.