groonga-command-parser 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f7e2b01c72582f1718fdf43f61bb224754697b48fb283523fe30ef7273bb6d0
-  data.tar.gz: 0feaf747b1f1e28d4300ffe35044f94887b44571f1958d592b6c9c9f6b4ee739
+  metadata.gz: 9d2732d80ac847ecb242974d4c41f668b16127259aa9a00b6b08cc9df1c98dc1
+  data.tar.gz: 4a343d65d98ab9921ddb8772ec567c6dfafd43e4010df282a0da7c5e18a7ab03
 SHA512:
-  metadata.gz: 8d6e9e681c69244925c5366d7a9098a265194ac2c2ec64952ddfbd72ab584209ff14c763d3f3aebd1dc8454409b0abe3a928bba78cb32aa17d1bb883bc35c7b2
-  data.tar.gz: e096edc06404d287db93fb984e531c489290465dbb1b13c5ad719eac9a8f7e4f472fbb4acf059b66b621c875b8678fb486de225489acf8fd689bcbddfc140e38
+  metadata.gz: d8e207e4f3b9840ecd63cf2e8ef85c863d20d1a0e2ba0e7962ac7c9080fe203beb2c55e982dc210d7c602d5af7a69f2017e9fa6d24ff56e7d3f822255bf66c4d
+  data.tar.gz: 53d721be38d3c803d01659d06f72b3226bd2c47a6e28be0da165888b1ccefb67ca027b8c08997b9e8c99b8d447e7645d87595c82ce9b929f08f3207975555f39

data/Gemfile

@@ -1,6 +1,6 @@
-# -*- mode: ruby; coding: utf-8 -*-
+# -*- ruby -*-
 #
-# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2026  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
@@ -19,3 +19,16 @@
 source "https://rubygems.org/"
 
 gemspec
+
+gem "json", git: "https://github.com/ruby/json.git"
+
+group :development do
+  gem "kramdown"
+  gem "packnga"
+  gem "rake"
+  gem "yard"
+end
+
+group :test do
+  gem "test-unit"
+end

data/doc/text/news.md

@@ -1,5 +1,13 @@
 # News
 
+## 1.1.6: 2026-06-25
+
+### Improvements
+
+  * Migrated to json gem from json-stream gem.
+
+  * Dropped support for Ruby 2.6.
+
 ## 1.1.5: 2024-12-24
 
 ### Improvements

data/groonga-command-parser.gemspec

@@ -1,6 +1,6 @@
 # -*- mode: ruby -*-
 #
-# Copyright (C) 2012-2024  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2012-2026  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
@@ -53,13 +53,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency("groonga-command", ">= 1.4.0")
-  spec.add_runtime_dependency("json-stream")
-
-  spec.add_development_dependency("test-unit")
-  spec.add_development_dependency("rake")
-  spec.add_development_dependency("bundler")
-  spec.add_development_dependency("packnga")
-  spec.add_development_dependency("yard")
-  spec.add_development_dependency("kramdown")
+  spec.add_runtime_dependency("json", ">= 2.20.0")
 end
 

data/lib/groonga/command/parser/load-values-parser.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2015-2026  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
@@ -14,7 +14,7 @@
 # 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/stream"
+require "json"
 
 module Groonga
   module Command
@@ -24,35 +24,44 @@ module Groonga
         attr_writer :on_consumed
         attr_writer :on_end
         def initialize
-          initialize_parser
+          @parser = JSON::ResumableParser.new
           @on_value = nil
           @on_consumed = nil
           @on_end = nil
-          @containers = []
-          @keys = []
+          @n_processed_values = 0
         end
 
         def <<(data)
           data_size = data.bytesize
           return self if data_size.zero?
 
-          before_pos = @parser.pos
-          status = catch do |tag|
-            @tag = tag
-            begin
-              @parser << data
-            rescue JSON::Stream::ParserError => error
-              pos = @parser.pos
-              consumed = pos - before_pos - 1
-              raise Error.new(error.message,
-                              data[0, consumed],
-                              data[consumed..-1])
+          @parser << data
+          begin
+            done = @parser.parse
+          rescue JSON::ParserError => error
+            consumed = data_size - @parser.rest.bytesize
+            raise Error.new(error.message,
+                            data[0, consumed],
+                            data[consumed..-1])
+          end
+
+          if done
+            @parser.value[@n_processed_values..-1].each do |value|
+              @on_value.call(value)
+            end
+            @n_processed_values = 0
+          else
+            partial_value = @parser.partial_value
+            if partial_value
+              partial_value[@n_processed_values..-2].each do |value|
+                @on_value.call(value)
+              end
+              @n_processed_values = partial_value.size - 1
             end
-            :continue
           end
 
-          pos = @parser.pos
-          consumed = pos - before_pos
+          consumed = data.bytesize
+          consumed -= @parser.rest.bytesize if done
           if consumed > 0
             if consumed < data_size
               @on_consumed.call(data[0, consumed])
@@ -60,7 +69,8 @@ module Groonga
               @on_consumed.call(data)
             end
           end
-          if status == :done
+
+          if done
             if consumed < data_size
               @on_end.call(data[consumed..-1])
             else
@@ -70,60 +80,6 @@ module Groonga
 
           self
         end
-
-        private
-        def initialize_parser
-          @parser = JSON::Stream::Parser.new
-          @parser.singleton_class.__send__(:attr_reader, :pos)
-          @parser.end_document do
-            throw(@tag, :done)
-          end
-          @parser.start_object do
-            push_container({})
-          end
-          @parser.end_object do
-            pop_container
-          end
-          @parser.start_array do
-            push_container([])
-          end
-          @parser.end_array do
-            pop_container
-          end
-          @parser.key do |key|
-            push_key(key)
-          end
-          @parser.value do |value|
-            push_value(value)
-          end
-        end
-
-        def push_container(container)
-          @containers.push(container)
-        end
-
-        def pop_container
-          container = @containers.pop
-          if @containers.size == 1
-            @on_value.call(container)
-          else
-            push_value(container)
-          end
-        end
-
-        def push_key(key)
-          @keys.push(key)
-        end
-
-        def push_value(value)
-          container = @containers.last
-          case container
-          when ::Hash
-            container[@keys.pop] = value
-          when ::Array
-            container.push(value)
-          end
-        end
       end
     end
   end

data/lib/groonga/command/parser/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2017  Kouhei Sutou <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
@@ -17,7 +17,7 @@
 module Groonga
   module Command
     class Parser
-      VERSION = "1.1.5"
+      VERSION = "1.1.6"
     end
   end
 end

data/lib/groonga/command/parser.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2024  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2011-2026  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
@@ -15,7 +15,13 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "English"
-require "cgi"
+require "cgi/escape"
+begin
+  CGI.unescape("")
+rescue NameError
+  # Ruby < 4.0 need cgi for CGI.unescape.
+  require "cgi"
+end
 require "json"
 
 require "groonga/command"

data/test/groonga-command-parser-test-utils.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2011-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2011-2026  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,7 +14,7 @@
 # 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 "cgi"
+require "cgi/escape"
 require "stringio"
 
 require "groonga/command/parser"

data/test/test-load-value-parser.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2015-2026  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
@@ -155,6 +155,7 @@ class LoadValuesParserTest < Test::Unit::TestCase
 
   sub_test_case "error" do
     test "unfinished" do
+      omit("We can't implement this with JSON::ResumableParser")
       assert_equal([
                      {
                        "object" => {

data/test/test-parser.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2016  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2011-2026  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
@@ -270,7 +270,7 @@ load --table Users --columns "_key, name"
               expected_events << [:load_value, <<-COMMAND, ["alice", "Alice"]]
 load --table Users --columns "_key, name"
 COMMAND
-              expected_events << [:load_complete, <<-COMMAND.chomp]
+              expected_events << [:load_complete, <<-COMMAND]
 load --table Users --columns "_key, name"
 [
 ["alice", "Alice"]
@@ -298,7 +298,7 @@ load --table Users
               expected_events << [:load_value, <<-COMMAND, ["alice", "Alice"]]
 load --table Users
               COMMAND
-              expected_events << [:load_complete, <<-COMMAND.chomp]
+              expected_events << [:load_complete, <<-COMMAND]
 load --table Users
 [
 ["_key", "name"],
@@ -330,7 +330,7 @@ load --table Users
             expected_events << [:load_value, <<-COMMAND, value]
 load --table Users
             COMMAND
-            expected_events << [:load_complete, <<-COMMAND.chomp]
+            expected_events << [:load_complete, <<-COMMAND]
 load --table Users
 [
 {"_key": "alice", "name": "Alice"},
@@ -363,11 +363,12 @@ load --table Users
           expected_events << [:load_value, <<-SOURCE, value]
 load --table Users
           SOURCE
-          expected_events << [:load_complete, <<-SOURCE.chomp]
+          expected_events << [:load_complete, <<-SOURCE]
 load --table Users
 [
 {"_key": "alice", "name": "Alice"}
 ]
+
           SOURCE
 
           expected_events << [:load_start, <<-SOURCE.chomp]
@@ -377,7 +378,7 @@ load --table Users
           expected_events << [:load_value, <<-SOURCE, value]
 load --table Users
           SOURCE
-          expected_events << [:load_complete, <<-SOURCE.chomp]
+          expected_events << [:load_complete, <<-SOURCE]
 load --table Users
 [
 {"_key": "bob",   "name": "Bob"}
@@ -412,8 +413,9 @@ load --table Users
           expected_events << [:load_value, <<-SOURCE, value]
 load --table Users
 [
+{"_key": "alice", "name": "Alice"}
           SOURCE
-          expected_events << [:load_complete, <<-SOURCE.chomp]
+          expected_events << [:load_complete, <<-SOURCE]
 load --table Users
 [
 {"_key": "alice", "name": "Alice"}
@@ -427,8 +429,9 @@ load --table Users
           expected_events << [:load_value, <<-SOURCE, value]
 load --table Users
 [
+{"_key": "bob",   "name": "Bob"}
           SOURCE
-          expected_events << [:load_complete, <<-SOURCE.chomp]
+          expected_events << [:load_complete, <<-SOURCE]
 load --table Users
 [
 {"_key": "bob",   "name": "Bob"}
@@ -453,7 +456,7 @@ EOS
           end
 
           def test_no_record_separate_comma
-            message = "Expected comma or object or array close: char 37"
+            message = "expected ',' or ']' after array value"
             before = <<-BEFORE
 [
 {"_key": "alice", "name": "Alice"}
@@ -473,7 +476,7 @@ EOC
           end
 
           def test_garbage_before_json
-            message = "Expected value: char 0"
+            message = "unexpected character: 'XXX'"
             before = ""
             after = <<-AFTER
 XXX

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: groonga-command-parser
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Kouhei Sutou
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-12-24 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: groonga-command
@@ -25,103 +24,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.4.0
 - !ruby/object:Gem::Dependency
-  name: json-stream
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  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'
-- !ruby/object:Gem::Dependency
-  name: rake
-  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'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  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'
-- !ruby/object:Gem::Dependency
-  name: packnga
-  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'
-- !ruby/object:Gem::Dependency
-  name: yard
-  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'
-- !ruby/object:Gem::Dependency
-  name: kramdown
-  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'
+        version: 2.20.0
 description: ''
 email:
 - kou@clear-code.com
@@ -159,7 +74,6 @@ homepage: https://github.com/groonga/groonga-command-parser
 licenses:
 - LGPLv2.1+
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -174,8 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key: 
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Groonga-command-parser is a Ruby library to parses [groonga](http://groonga.org/)'s
   command syntax. You can write a program to process groonga's command by using groonga-command-parser.