groonga-command 1.0.3 → 1.0.4

data/Rakefile

@@ -32,7 +32,8 @@ end
 helper.install
 spec = helper.gemspec
 
-Packnga::DocumentTask.new(spec) do
+Packnga::DocumentTask.new(spec) do |task|
+  task.translate_languages = ["ja"]
 end
 
 Packnga::ReleaseTask.new(spec) do

data/doc/text/news.md

@@ -1,5 +1,16 @@
 # News
 
+## 1.0.4: 2013-09-18
+
+### Improvements
+
+  * {Groonga::Command::TableCreate}: Supported "--normalizer" parameter.
+  * {Groonga::Command::Select}: Supported all parameters.
+
+### Fixes
+
+  * Fixed a bug that is caused by using with rroonga.
+
 ## 1.0.3: 2013-07-23
 
 ### Improvements

data/lib/groonga/command/base.rb

@@ -16,8 +16,8 @@
 # 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 "English"
-require "cgi"
+require "groonga/command/format/uri"
+require "groonga/command/format/command"
 
 module Groonga
   module Command
@@ -79,42 +79,11 @@ module Groonga
       end
 
       def to_uri_format
-        path = "/d/#{@name}"
-        arguments = @arguments.dup
-        output_type = arguments.delete(:output_type)
-        path << ".#{output_type}" if output_type
-        unless arguments.empty?
-          sorted_arguments = arguments.sort_by do |name, _|
-            name.to_s
-          end
-          uri_arguments = sorted_arguments.collect do |name, value|
-            "#{CGI.escape(name.to_s)}=#{CGI.escape(value)}"
-          end
-          path << "?"
-          path << uri_arguments.join("&")
-        end
-        path
+        Format::URI.new(@name, @arguments).path
       end
 
       def to_command_format
-        command_line = [@name]
-        sorted_arguments = @arguments.sort_by do |name, _|
-          name.to_s
-        end
-        sorted_arguments.each do |name, value|
-          escaped_value = value.gsub(/[\n"\\]/) do
-            special_character = $MATCH
-            case special_character
-            when "\n"
-              "\\n"
-            else
-              "\\#{special_character}"
-            end
-          end
-          command_line << "--#{name}"
-          command_line << "\"#{escaped_value}\""
-        end
-        command_line.join(" ")
+        Format::Command.new(@name, @arguments).command_line
       end
 
       private

data/lib/groonga/command/format/command.rb

@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2012-2013  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 "English"
+
+module Groonga
+  module Command
+    module Format
+      class Command
+        class << self
+          def escape_value(value)
+            escaped_value = value.gsub(/[\n"\\]/) do
+              special_character = $MATCH
+              case special_character
+              when "\n"
+                "\\n"
+              else
+                "\\#{special_character}"
+              end
+            end
+            "\"#{escaped_value}\""
+          end
+        end
+
+        def initialize(name, arguments)
+          @name = name
+          @arguments = arguments
+        end
+
+        def command_line
+          components = [@name]
+          sorted_arguments = @arguments.sort_by do |name, _|
+            name.to_s
+          end
+          sorted_arguments.each do |name, value|
+            components << "--#{name}"
+            components << self.class.escape_value(value)
+          end
+          components.join(" ")
+        end
+      end
+    end
+  end
+end

data/lib/groonga/command/format/uri.rb

@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2012-2013  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 "cgi"
+
+module Groonga
+  module Command
+    module Format
+      class URI
+        def initialize(name, arguments)
+          @name = name
+          @arguments = arguments
+        end
+
+        def path
+          path = "/d/#{@name}"
+          arguments = @arguments.dup
+          output_type = arguments.delete(:output_type)
+          path << ".#{output_type}" if output_type
+          unless arguments.empty?
+            sorted_arguments = arguments.sort_by do |name, _|
+              name.to_s
+            end
+            uri_arguments = sorted_arguments.collect do |name, value|
+              "#{CGI.escape(name.to_s)}=#{CGI.escape(value)}"
+            end
+            path << "?"
+            path << uri_arguments.join("&")
+          end
+          path
+        end
+      end
+    end
+  end
+end

data/lib/groonga/command/parser.rb

@@ -305,7 +305,7 @@ module Groonga
             @buffer = rest
             @json_parser = Yajl::Parser.new
             @json_parser.on_parse_complete = lambda do |object|
-              if object.is_a?(Array) and @command.columns.nil?
+              if object.is_a?(::Array) and @command.columns.nil?
                 @command.columns = object
                 on_load_columns(@command, object)
               else
@@ -364,7 +364,7 @@ module Groonga
           end
           if @command[:values]
             values = Yajl::Parser.parse(@command[:values])
-            if @command.columns.nil? and values.first.is_a?(Array)
+            if @command.columns.nil? and values.first.is_a?(::Array)
               header = values.shift
               @command.columns = header
               on_load_columns(@command, header)
@@ -380,7 +380,7 @@ module Groonga
           end
         else
           on_command(@command)
-          reset
+          @command = nil
         end
       end
 

data/lib/groonga/command/select.rb

@@ -25,9 +25,26 @@ module Groonga
 
       class << self
         def parameter_names
-          # TODO: Fill me
           [
-            :table
+            :table,
+            :match_columns,
+            :query,
+            :filter,
+            :scorer,
+            :sortby,
+            :output_columns,
+            :offset,
+            :limit,
+            :drilldown,
+            :drilldown_sortby,
+            :drilldown_output_columns,
+            :drilldown_offset,
+            :drilldown_limit,
+            :cache,
+            :match_escalation_threshold,
+            :query_expansion,
+            :query_flags,
+            :query_expander,
           ]
         end
       end

data/lib/groonga/command/table-create.rb

@@ -31,6 +31,7 @@ module Groonga
             :key_type,
             :value_type,
             :default_tokenizer,
+            :normalizer,
           ]
         end
       end

data/lib/groonga/command/version.rb

@@ -18,6 +18,6 @@
 
 module Groonga
   module Command
-    VERSION = "1.0.3"
+    VERSION = "1.0.4"
   end
 end

data/test/command/format/test-command.rb

@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2013  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
+
+class CommandFormatTest < Test::Unit::TestCase
+  class EscapeValueTest < self
+    test '\n' do
+      assert_equal('"\\n"', escape_value("\n"))
+    end
+
+    test '"' do
+      assert_equal('"\\""', escape_value("\""))
+    end
+
+    test "\\" do
+      assert_equal('"\\\\"', escape_value("\\"))
+    end
+
+    def escape_value(value)
+      Groonga::Command::Format::Command.escape_value(value)
+    end
+  end
+end

data/test/command/test-select.rb

@@ -21,10 +21,71 @@ class SelectCommandTest < Test::Unit::TestCase
 
   def test_ordered_argument
     table = "Users"
-    command = parse("select", [table], :output_type => false)
+    match_columns = "name * 10 || description"
+    query = "groonga"
+    filter = "age >= 18"
+    scorer = "_score = age"
+    sortby = "_score"
+    output_columns = "_key, name"
+    offset = "10"
+    limit = "20"
+    drilldown = "name"
+    drilldown_sortby = "_nsubrecs"
+    drilldown_output_columns = "name, _nsubrecs"
+    drilldown_offset = "5"
+    drilldown_limit = "10"
+    cache = "no"
+    match_escalation_threshold = "-1"
+    query_expansion = "deprecated"
+    query_flags = "ALLOW_LEADING_NOT"
+    query_expander = "Terms.synonym"
+    command = parse("select",
+                    [
+                      table,
+                      match_columns,
+                      query,
+                      filter,
+                      scorer,
+                      sortby,
+                      output_columns,
+                      offset,
+                      limit,
+                      drilldown,
+                      drilldown_sortby,
+                      drilldown_output_columns,
+                      drilldown_offset,
+                      drilldown_limit,
+                      cache,
+                      match_escalation_threshold,
+                      query_expansion,
+                      query_flags,
+                      query_expander,
+                    ],
+                    :output_type => false)
 
     assert_instance_of(Groonga::Command::Select, command)
-    assert_equal({:table => table}, command.arguments)
+    assert_equal({
+                   :table                      => table,
+                   :match_columns              => match_columns,
+                   :query                      => query,
+                   :filter                     => filter,
+                   :scorer                     => scorer,
+                   :sortby                     => sortby,
+                   :output_columns             => output_columns,
+                   :offset                     => offset,
+                   :limit                      => limit,
+                   :drilldown                  => drilldown,
+                   :drilldown_sortby           => drilldown_sortby,
+                   :drilldown_output_columns   => drilldown_output_columns,
+                   :drilldown_offset           => drilldown_offset,
+                   :drilldown_limit            => drilldown_limit,
+                   :cache                      => cache,
+                   :match_escalation_threshold => match_escalation_threshold,
+                   :query_expansion            => query_expansion,
+                   :query_flags                => query_flags,
+                   :query_expander             => query_expander,
+                 },
+                 command.arguments)
   end
 
   def test_scorer

data/test/command/test-table-create.rb

@@ -26,8 +26,9 @@ class TableCreateCommandTest < Test::Unit::TestCase
       key_type          = "ShortText"
       value_type        = "UInt32"
       default_tokenizer = "TokenBigram"
+      normalizer        = "NormalizerAuto"
 
-      command = parse([name, flags, key_type, value_type, default_tokenizer])
+      command = parse([name, flags, key_type, value_type, default_tokenizer, normalizer])
       assert_instance_of(Groonga::Command::TableCreate, command)
       assert_equal({
                      :name              => name,
@@ -35,6 +36,7 @@ class TableCreateCommandTest < Test::Unit::TestCase
                      :key_type          => key_type,
                      :value_type        => value_type,
                      :default_tokenizer => default_tokenizer,
+                     :normalizer        => normalizer,
                    },
                    command.arguments)
     end

data/test/test-parser.rb

@@ -113,6 +113,24 @@ class ParserTest < Test::Unit::TestCase
           @parser << "status\n"
           assert_equal("status", parsed_command.name)
         end
+
+        def test_multi_lines
+          parsed_commands = []
+          @parser.on_command do |command|
+            parsed_commands << command
+          end
+
+          @parser << <<-COMMAND_LIST.chomp
+table_list
+status
+          COMMAND_LIST
+          assert_equal(["table_list"],
+                       parsed_commands.collect(&:name))
+
+          @parser.finish
+          assert_equal(["table_list", "status"],
+                       parsed_commands.collect(&:name))
+        end
       end
 
       class LoadTest < self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groonga-command
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-23 00:00:00.000000000 Z
+date: 2013-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
@@ -151,45 +151,48 @@ files:
 - Gemfile
 - groonga-command.gemspec
 - .yardopts
-- lib/groonga/command/register.rb
-- lib/groonga/command/version.rb
-- lib/groonga/command/column-rename.rb
 - lib/groonga/command/truncate.rb
+- lib/groonga/command/parser.rb
+- lib/groonga/command/table-remove.rb
 - lib/groonga/command/load.rb
 - lib/groonga/command/delete.rb
-- lib/groonga/command/error.rb
-- lib/groonga/command/column-create.rb
+- lib/groonga/command/base.rb
 - lib/groonga/command/suggest.rb
-- lib/groonga/command/table-remove.rb
+- lib/groonga/command/error.rb
+- lib/groonga/command/register.rb
+- lib/groonga/command/version.rb
 - lib/groonga/command/column-remove.rb
+- lib/groonga/command/column-rename.rb
+- lib/groonga/command/dump.rb
 - lib/groonga/command/table-create.rb
+- lib/groonga/command/format/command.rb
+- lib/groonga/command/format/uri.rb
+- lib/groonga/command/column-create.rb
 - lib/groonga/command/get.rb
-- lib/groonga/command/base.rb
-- lib/groonga/command/dump.rb
-- lib/groonga/command/table-rename.rb
 - lib/groonga/command/select.rb
-- lib/groonga/command/parser.rb
+- lib/groonga/command/table-rename.rb
 - lib/groonga/command.rb
-- doc/text/lgpl-2.1.txt
 - doc/text/news.md
-- test/command/test-column-remove.rb
-- test/command/test-table-rename.rb
+- doc/text/lgpl-2.1.txt
+- test/groonga-command-test-utils.rb
+- test/run-test.rb
 - test/command/test-table-create.rb
-- test/command/test-column-rename.rb
-- test/command/test-load.rb
-- test/command/test-suggest.rb
+- test/command/test-dump.rb
+- test/command/test-table-rename.rb
 - test/command/test-table-remove.rb
+- test/command/test-truncate.rb
 - test/command/test-delete.rb
+- test/command/test-select.rb
 - test/command/test-base.rb
 - test/command/test-column-create.rb
 - test/command/test-register.rb
-- test/command/test-select.rb
-- test/command/test-truncate.rb
-- test/command/test-dump.rb
 - test/command/test-get.rb
+- test/command/test-suggest.rb
+- test/command/format/test-command.rb
+- test/command/test-column-rename.rb
+- test/command/test-load.rb
+- test/command/test-column-remove.rb
 - test/test-parser.rb
-- test/run-test.rb
-- test/groonga-command-test-utils.rb
 homepage: https://github.com/groonga/groonga-command
 licenses:
 - LGPLv2.1+
@@ -217,22 +220,23 @@ specification_version: 3
 summary: Groonga-command is a library to process [groonga](http://groonga.org/)'s
   command syntax. You can write a program to process groonga's command by using groonga-command.
 test_files:
-- test/command/test-column-remove.rb
-- test/command/test-table-rename.rb
+- test/groonga-command-test-utils.rb
+- test/run-test.rb
 - test/command/test-table-create.rb
-- test/command/test-column-rename.rb
-- test/command/test-load.rb
-- test/command/test-suggest.rb
+- test/command/test-dump.rb
+- test/command/test-table-rename.rb
 - test/command/test-table-remove.rb
+- test/command/test-truncate.rb
 - test/command/test-delete.rb
+- test/command/test-select.rb
 - test/command/test-base.rb
 - test/command/test-column-create.rb
 - test/command/test-register.rb
-- test/command/test-select.rb
-- test/command/test-truncate.rb
-- test/command/test-dump.rb
 - test/command/test-get.rb
+- test/command/test-suggest.rb
+- test/command/format/test-command.rb
+- test/command/test-column-rename.rb
+- test/command/test-load.rb
+- test/command/test-column-remove.rb
 - test/test-parser.rb
-- test/run-test.rb
-- test/groonga-command-test-utils.rb
 has_rdoc: