groonga-command-parser 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 653da7d4f65f66a98a4fdc5300f1c40b768d99bf
-  data.tar.gz: 3be534841fc2a4e8ee175262107ce0336d81c287
+  metadata.gz: d57a072e7f7777830941dca1314a03d42a4b656e
+  data.tar.gz: 5260af5b490df1a910e03e0d002037cb1b6bd2d8
 SHA512:
-  metadata.gz: 4c12a30d319639ac368a1610080cfef25c47198565245453e56265db91508b58664fe6886e1cb80bc6436beef2252ec61734337274740ed26c2ebe1e87201c14
-  data.tar.gz: 0a541136772e374816b60ceb5052b1848c9d7a0e1f05c5526a575f17e8d16ce570084a70fcc30ad6909311c9f70b6fad517605add4423c48468f1d409228ca47
+  metadata.gz: 78894a5a7e7913d26b12f6487760bc0c212913170526bf3c436abbfe40c86217b3a015fe8c7ad171fb96c180e0a9c174943d1c6c53094ce0e1817151def8da15
+  data.tar.gz: 2ac829c0a6fd339c6b10dbb8d113c646750705aca2f27aead80772b46aa0484e09a3514ddf39b631fa27f91d83d9362fe365da28985234d1a860e0dd3cdc7b71

data/bin/groonga-command-logicalify

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+#
+# Copyright (C) 2015  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 "groonga/command/parser/command/groonga-command-logicalify"
+
+command = Groonga::Command::Parser::Command::GroongaCommandLogicalify.new
+exit(command.run(ARGV))

data/doc/text/news.md

@@ -1,5 +1,21 @@
 # News
 
+## 1.0.5: 2015-08-08
+
+### Improvements
+
+  * `groonga-command-logicalify`: Added.
+  * Supported URI style `load` command that doesn't have `values`
+    parameter in path.
+
+### Fixes
+
+  * Fixed a bug that parameter name in URL isn't unescaped.
+
+### Thanks
+
+  * Hiroyuki Sato
+
 ## 1.0.4: 2015-05-23
 
 ### Improvements

data/lib/groonga/command/parser.rb

@@ -96,7 +96,12 @@ module Groonga
 
           consume_data(parser, data)
           if parsed_command.nil?
-            raise Error.new("not completed", data.lines.to_a.last, "")
+            if data.respond_to?(:each)
+              last_chunk = data.last
+            else
+              last_chunk = data
+            end
+            raise Error.new("not completed", last_chunk, "")
           end
 
           parsed_command
@@ -258,8 +263,13 @@ module Groonga
             @load_values_parser << @command[:values]
             reset
           else
-            @command.original_source << "\n"
-            @loading = true
+            if @command.original_format == :uri
+              on_load_complete(@command)
+              reset
+            else
+              @command.original_source << "\n"
+              @loading = true
+            end
           end
         else
           on_command(@command)
@@ -282,7 +292,7 @@ module Groonga
           arguments_string.split(/&/).each do |argument_string|
             key, value = argument_string.split(/\=/, 2)
             next if value.nil?
-            arguments[key] = CGI.unescape(value)
+            arguments[CGI.unescape(key)] = CGI.unescape(value)
           end
         end
         if /\/([^\/]*)\z/=~ path

data/lib/groonga/command/parser/command/groonga-command-logicalify.rb

@@ -0,0 +1,146 @@
+# Copyright (C) 2015  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 "optparse"
+
+require "groonga/command/parser"
+
+module Groonga
+  module Command
+    class Parser
+      module Command
+        class GroongaCommandLogicalify
+          def initialize
+            @logical_table = nil
+            @shard_key = nil
+          end
+
+          def run(argv=ARGV)
+            begin
+              parse_options!(argv)
+            rescue OptionParser::ParseError
+              puts($!.message)
+              return false
+            end
+
+            input_paths = argv
+            if input_paths.empty?
+              logicalify($stdin)
+            else
+              input_paths.each do |input_path|
+                File.open(input_path) do |input|
+                  logicalify(input)
+                end
+              end
+            end
+
+            true
+          end
+
+          private
+          def parse_options!(argv)
+            option_parser = OptionParser.new
+            option_parser.banner += " INPUT_PATH1 INPUT_PATH2 ..."
+            option_parser.version = VERSION
+
+            option_parser.on("--logical-table=TABLE",
+                             "Use TABLE as logical table name",
+                             "[#{@logical_table}]") do |logical_table|
+              @logical_table = logical_table
+            end
+
+            option_parser.on("--shard-key=COLUMN",
+                             "Use COLUMN as shard key",
+                             "[#{@shard_key}]") do |shard_key|
+              @shard_key = shard_key
+            end
+
+            option_parser.parse!(argv)
+
+            if @logical_table.nil?
+              raise OptionParser::ParseError, "--logical-table is missing"
+            end
+
+            if @shard_key.nil?
+              raise OptionParser::ParseError, "--shard-key is missing"
+            end
+          end
+
+          def logicalify(input)
+            parser = Parser.new
+            parser.on_command do |command|
+              logicalify_command(command)
+            end
+            input.each_line do |line|
+              parser << line
+            end
+          end
+
+          def logicalify_command(command)
+            case command.name
+            when "select"
+              logicalify_command_select(command)
+            end
+          end
+
+          def logicalify_command_select(command)
+            min = nil
+            max = nil
+            case command[:table]
+            when /\A#{Regexp.escape(@logical_table)}_(\d{4})(\d{2})(\d{2})\z/
+              year = $1.to_i
+              month = $2.to_i
+              day = $3.to_i
+              min = Time.local(year, month, day)
+              max = min + (60 * 60 * 24)
+            else
+              return
+            end
+
+            arguments = logicalify_arguments(command.arguments)
+            arguments[:min] = format_time(min)
+            arguments[:min_border] = "include"
+            arguments[:max] = format_time(max)
+            arguments[:max_border] = "exclude"
+            logical_select = create_logical_select_command(arguments)
+            if command.uri_format?
+              puts(logical_select.to_uri_format)
+            else
+              puts(logical_select.to_command_format)
+            end
+          end
+
+          def create_logical_select_command(arguments)
+            name = "logical_select"
+            command_class = ::Groonga::Command.find(name)
+            command_class.new(name, arguments)
+          end
+
+          def logicalify_arguments(arguments)
+            arguments = arguments.merge(:logical_table => @logical_table,
+                                        :shard_key     => @shard_key)
+            arguments.delete(:table)
+            arguments
+          end
+
+          def format_time(time)
+            time.strftime("%Y/%m/%d %H:%M:%S")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -43,7 +43,6 @@ module Groonga
             location << after
           else
             before_lines = before.lines.to_a
-            after_lines = after.lines.to_a
             last_before_line = before_lines.last
             if last_before_line
               error_offset = last_before_line.bytesize
@@ -53,10 +52,14 @@ module Groonga
             before_lines.each do |before_line|
               location << before_line
             end
-            location << after_lines.first
-            location << " " * error_offset + "^\n"
-            after_lines[1..-1].each do |after_line|
-              location << after_line
+
+            unless after.empty?
+              after_lines = after.lines.to_a
+              location << after_lines.first
+              location << " " * error_offset + "^\n"
+              after_lines[1..-1].each do |after_line|
+                location << after_line
+              end
             end
           end
           location

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

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2013-2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2015  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
@@ -19,7 +19,7 @@
 module Groonga
   module Command
     class Parser
-      VERSION = "1.0.4"
+      VERSION = "1.0.5"
     end
   end
 end

data/test/test-parser.rb

@@ -49,6 +49,26 @@ class ParserTest < Test::Unit::TestCase
       assert_equal({:table => "Users"}, command.arguments)
     end
 
+    def test_bracket
+      path = "/d/select?table=Users&drilldown[name].keys=name"
+      command = Groonga::Command::Parser.parse(path)
+      assert_equal({
+                     :table => "Users",
+                     :"drilldown[name].keys" => "name",
+                   },
+                   command.arguments)
+    end
+
+    def test_escaped_bracket
+      path = "/d/select?table=Users&drilldown%5Bname%5D.keys=name"
+      command = Groonga::Command::Parser.parse(path)
+      assert_equal({
+                     :table => "Users",
+                     :"drilldown[name].keys" => "name",
+                   },
+                   command.arguments)
+    end
+
     def test_custom_prefix
       path = "/db1/select?table=Users"
       command = Groonga::Command::Parser.parse(path)
@@ -163,6 +183,19 @@ status
           end
         end
 
+        class URITest < self
+          def test_no_values
+            uri = "/d/load?table=Users"
+            @parser << uri
+            @parser << "\n"
+            assert_equal([
+                           [:load_start, uri],
+                           [:load_complete, uri],
+                         ],
+                         @events)
+          end
+        end
+
         class InlineTest < self
           class BracketTest < self
             def test_have_columns

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groonga-command-parser
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-23 00:00:00.000000000 Z
+date: 2015-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: groonga-command
@@ -155,6 +155,7 @@ email:
 - kou@clear-code.com
 executables:
 - groonga-command-convert-format
+- groonga-command-logicalify
 extensions: []
 extra_rdoc_files: []
 files:
@@ -163,12 +164,14 @@ files:
 - README.md
 - Rakefile
 - bin/groonga-command-convert-format
+- bin/groonga-command-logicalify
 - doc/text/lgpl-2.1.txt
 - doc/text/news.md
 - groonga-command-parser.gemspec
 - lib/groonga/command/parser.rb
 - lib/groonga/command/parser/command-line-splitter.rb
 - lib/groonga/command/parser/command/groonga-command-convert-format.rb
+- lib/groonga/command/parser/command/groonga-command-logicalify.rb
 - lib/groonga/command/parser/error.rb
 - lib/groonga/command/parser/load-values-parser.rb
 - lib/groonga/command/parser/version.rb