groonga-command-parser 1.0.9 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 190336c6a64a7054fbb00bbf82d4045a9c58c542
-  data.tar.gz: a442b60917501ed808c47995a76c309f7865550a
+  metadata.gz: b2f5dd8bb9f225dd59a1441b1ee4ba18fc7b1d74
+  data.tar.gz: f202a12f7824fbdfd1bdf7dd31fc1542464d5868
 SHA512:
-  metadata.gz: bf253d6c39b154349389257e7974eb76662467d6546017baa8d0e80d21c26776efb5d4cd697def2675488d23850c43714b1a319f5f03a42b82d906f717fc1a89
-  data.tar.gz: d2ea221931922fd68c8c20d442161a4197ca67329a48f6c43407197ee6eea7803a78bfec8b712751c3d6fabbed92656319a1d21bf60d1a03eedd9ba5d1dae2a7
+  metadata.gz: b056beeb0f6dd1971ba3e2688d0a623e57f88c7d9389df817b81e09583626adf3d596c98434f21e88b6d28c1aded38125dd8e08ba1550eb41a0e818d6ec80050
+  data.tar.gz: 66c6b6d7739e3889f1e205054ed600f830dcd9ecb1816f33a72af916fadd46d5a8037200e31b8536c4405d94d48804aa3ac56df0a3130fae5e014184dcecc01d

data/doc/text/news.md

@@ -1,5 +1,17 @@
 # News
 
+## 1.1.0: 2017-10-30
+
+### Improvements
+
+  * `groonga-command-convert-format`: Stopped to require the last
+    newline.
+
+### Fixes
+
+  * Fixed a bug that commands after `load` are ignored on `String`
+    parse mode.
+
 ## 1.0.9: 2017-01-18
 
 ### Improvements

data/lib/groonga/command/parser.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2011-2015  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2011-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
@@ -59,8 +57,8 @@ module Groonga
           parser.on_load_start do |command|
             yield(:on_load_start, command)
           end
-          parser.on_load_columns do |command, header|
-            yield(:on_load_columns, command, header)
+          parser.on_load_columns do |command, columns|
+            yield(:on_load_columns, command, columns)
           end
           parser.on_load_value do |command, value|
             yield(:on_load_value, command, value)
@@ -221,9 +219,7 @@ module Groonga
 
       def consume_load_values(tag)
         throw(tag) if @buffer.empty?
-        @command.original_source << @buffer
         @load_values_parser << @buffer
-        @buffer.clear
       end
 
       def consume_line(tag)
@@ -361,14 +357,14 @@ module Groonga
             on_load_value(@command, value)
           end
         end
+        @load_values_parser.on_consumed = lambda do |consumed|
+          @command.original_source << consumed if @loading
+        end
         @load_values_parser.on_end = lambda do |rest|
-          if rest
-            original_source_size = @command.original_source.size
-            @command.original_source.slice!(original_source_size - rest.size,
-                                            rest.size)
-          end
+          loading = @loading
           on_load_complete(@command)
           reset
+          @buffer << rest if loading and rest
         end
       end
     end

data/lib/groonga/command/parser/command/groonga-command-convert-format.rb

@@ -89,6 +89,7 @@ module Groonga
             input.each_line do |line|
               parser << line
             end
+            parser.finish
           end
 
           def convert_format(command)

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

@@ -21,10 +21,12 @@ module Groonga
     class Parser
       class LoadValuesParser
         attr_writer :on_value
+        attr_writer :on_consumed
         attr_writer :on_end
         def initialize
           initialize_parser
           @on_value = nil
+          @on_consumed = nil
           @on_end = nil
           @containers = []
           @keys = []
@@ -49,9 +51,16 @@ module Groonga
             :continue
           end
 
+          pos = @parser.pos
+          consumed = pos - before_pos
+          if consumed > 0
+            if consumed < data_size
+              @on_consumed.call(data[0, consumed])
+            else
+              @on_consumed.call(data)
+            end
+          end
           if status == :done
-            pos = @parser.pos
-            consumed = pos - before_pos
             if consumed < data_size
               @on_end.call(data[consumed..-1])
             else

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

@@ -17,7 +17,7 @@
 module Groonga
   module Command
     class Parser
-      VERSION = "1.0.9"
+      VERSION = "1.1.0"
     end
   end
 end

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

@@ -21,7 +21,12 @@ class LoadValuesParserTest < Test::Unit::TestCase
     @parser.on_value = lambda do |value|
       @values << value
     end
+    @parse_consumed = []
+    @parser.on_consumed = lambda do |consumed|
+      @parse_consumed << consumed
+    end
     @parse_done = false
+    @parse_rest = nil
     @parser.on_end = lambda do |rest|
       @parse_done = true
       @parse_rest = rest
@@ -186,8 +191,17 @@ class LoadValuesParserTest < Test::Unit::TestCase
   }
 ]garbage
       JSON
-      assert_equal([true, "garbage\n"],
-                   [@parse_done, @parse_rest])
+      consumed = [
+        "[\n",
+        "  {\n",
+        "    \"object\": {\n",
+        "      \"string\": \"abc\"\n",
+        "    }\n",
+        "  }\n",
+        "]",
+      ]
+      assert_equal([true, consumed, "garbage\n"],
+                   [@parse_done, @parse_consumed, @parse_rest])
     end
   end
 end

data/test/test-parser.rb

@@ -253,108 +253,138 @@ status
         class MultiLineTest < self
           class BracketTest < self
             def test_have_columns
-              @parser << <<-EOC
+              @parser << <<-COMMAND
 load --table Users --columns "_key, name"
 [
 ["alice", "Alice"]
 ]
-EOC
+              COMMAND
+
               expected_events = []
-              expected_events << [:load_start, <<-EOC.chomp]
+              expected_events << [:load_start, <<-COMMAND.chomp]
 load --table Users --columns "_key, name"
-EOC
-              expected_events << [:load_columns, <<-EOC.chomp, ["_key", "name"]]
+              COMMAND
+              expected_events << [:load_columns, <<-COMMAND.chomp, ["_key", "name"]]
 load --table Users --columns "_key, name"
-EOC
-              expected_events << [:load_value, <<-EOC, ["alice", "Alice"]]
+              COMMAND
+              expected_events << [:load_value, <<-COMMAND, ["alice", "Alice"]]
 load --table Users --columns "_key, name"
-[
-["alice", "Alice"]
-]
-EOC
-              expected_events << [:load_complete, <<-EOC.chomp]
+COMMAND
+              expected_events << [:load_complete, <<-COMMAND.chomp]
 load --table Users --columns "_key, name"
 [
 ["alice", "Alice"]
 ]
-EOC
+              COMMAND
               assert_equal(expected_events, @events)
             end
 
             def test_no_columns
-              @parser << <<-EOC
+              @parser << <<-COMMAND
 load --table Users
 [
 ["_key", "name"],
 ["alice", "Alice"]
 ]
-EOC
+              COMMAND
+
               expected_events = []
-              expected_events << [:load_start, <<-EOC.chomp]
+              expected_events << [:load_start, <<-COMMAND.chomp]
 load --table Users
-EOC
-              expected_events << [:load_columns, <<-EOC, ["_key", "name"]]
+              COMMAND
+              expected_events << [:load_columns, <<-COMMAND, ["_key", "name"]]
 load --table Users
-[
-["_key", "name"],
-["alice", "Alice"]
-]
-EOC
-              expected_events << [:load_value, <<-EOC, ["alice", "Alice"]]
+              COMMAND
+              expected_events << [:load_value, <<-COMMAND, ["alice", "Alice"]]
 load --table Users
-[
-["_key", "name"],
-["alice", "Alice"]
-]
-EOC
-              expected_events << [:load_complete, <<-EOC.chomp]
+              COMMAND
+              expected_events << [:load_complete, <<-COMMAND.chomp]
 load --table Users
 [
 ["_key", "name"],
 ["alice", "Alice"]
 ]
-EOC
+              COMMAND
               assert_equal(expected_events, @events)
             end
           end
 
           def test_brace
-            @parser << <<-EOC
+            @parser << <<-COMMAND
 load --table Users
 [
 {"_key": "alice", "name": "Alice"},
 {"_key": "bob",   "name": "Bob"}
 ]
-EOC
+            COMMAND
+
             expected_events = []
-            expected_events << [:load_start, <<-EOC.chomp]
+            expected_events << [:load_start, <<-COMMAND.chomp]
 load --table Users
-EOC
+            COMMAND
             value = {"_key" => "alice", "name" => "Alice"}
-            expected_events << [:load_value, <<-EOC, value]
+            expected_events << [:load_value, <<-COMMAND, value]
+load --table Users
+            COMMAND
+            value = {"_key" => "bob", "name" => "Bob"}
+            expected_events << [:load_value, <<-COMMAND, value]
+load --table Users
+            COMMAND
+            expected_events << [:load_complete, <<-COMMAND.chomp]
 load --table Users
 [
 {"_key": "alice", "name": "Alice"},
 {"_key": "bob",   "name": "Bob"}
 ]
-EOC
-            value = {"_key" => "bob", "name" => "Bob"}
-            expected_events << [:load_value, <<-EOC, value]
+            COMMAND
+            assert_equal(expected_events, @events)
+          end
+        end
+
+        def test_multiple
+          @parser << <<-COMMANDS
+load --table Users
+[
+{"_key": "alice", "name": "Alice"}
+]
+
 load --table Users
 [
-{"_key": "alice", "name": "Alice"},
 {"_key": "bob",   "name": "Bob"}
 ]
-EOC
-            expected_events << [:load_complete, <<-EOC.chomp]
+          COMMANDS
+
+          expected_events = []
+
+          expected_events << [:load_start, <<-SOURCE.chomp]
+load --table Users
+          SOURCE
+          value = {"_key" => "alice", "name" => "Alice"}
+          expected_events << [:load_value, <<-SOURCE, value]
+load --table Users
+          SOURCE
+          expected_events << [:load_complete, <<-SOURCE.chomp]
+load --table Users
+[
+{"_key": "alice", "name": "Alice"}
+]
+          SOURCE
+
+          expected_events << [:load_start, <<-SOURCE.chomp]
+load --table Users
+          SOURCE
+          value = {"_key" => "bob", "name" => "Bob"}
+          expected_events << [:load_value, <<-SOURCE, value]
+load --table Users
+          SOURCE
+          expected_events << [:load_complete, <<-SOURCE.chomp]
 load --table Users
 [
-{"_key": "alice", "name": "Alice"},
 {"_key": "bob",   "name": "Bob"}
 ]
-EOC
-            assert_equal(expected_events, @events)
-          end
+          SOURCE
+
+          assert_equal(expected_events, @events)
         end
 
         class ErrorTest < self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groonga-command-parser
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.0
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-18 00:00:00.000000000 Z
+date: 2017-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: groonga-command
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Groonga-command-parser is a Ruby library to parses [groonga](http://groonga.org/)'s