groonga-command 1.0.4 → 1.0.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4654fec50cf4403398ad01e35a8044936faa2a0c
+  data.tar.gz: 4060b65fbf62018cea9469f357f1fc9069315f66
+SHA512:
+  metadata.gz: 0017d4332d7d050a4cf37417a05089faba2fbf6081530a0880a39a01012e16c34fd75c81c3cbae9e6eec8cdb242baa19ffeaa402746f1b19c5920493ae1747b0
+  data.tar.gz: 57f9e10c322527640118ea6e0539437a9629687d3fd3cd668b0e9f903cadede2461dd42ab434ac066d292f7fddf96d5c95c73bbd782e470f27dbee325e7c6648

data/README.md

@@ -6,9 +6,9 @@ groonga-command
 
 ## Description
 
-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.
+Groonga-command is a library that represents
+[groonga](http://groonga.org/)'s command. You can write a program that
+handle groonga's command by using groonga-command.
 
 ## Install
 

data/doc/text/news.md

@@ -1,5 +1,12 @@
 # News
 
+## 1.0.5: 2013-09-29
+
+### Improvements
+
+  * Extracted {Groonga::Command::Parser} as groonga-command-parser gem.
+    Now, groonga-command gem doesn't depend on any extension libraries.
+
 ## 1.0.4: 2013-09-18
 
 ### Improvements

data/groonga-command.gemspec

@@ -1,6 +1,6 @@
 # -*- mode: ruby; coding: utf-8 -*-
 #
-# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# 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
@@ -52,8 +52,6 @@ Gem::Specification.new do |spec|
   spec.licenses = ["LGPLv2.1+"]
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency("yajl-ruby")
-
   spec.add_development_dependency("test-unit")
   spec.add_development_dependency("test-unit-notify")
   spec.add_development_dependency("rake")

data/lib/groonga/command/version.rb

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

data/lib/groonga/command.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# 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
@@ -17,4 +17,20 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "groonga/command/version"
-require "groonga/command/parser"
+
+require "groonga/command/error"
+
+require "groonga/command/column-create"
+require "groonga/command/column-remove"
+require "groonga/command/column-rename"
+require "groonga/command/delete"
+require "groonga/command/dump"
+require "groonga/command/get"
+require "groonga/command/load"
+require "groonga/command/register"
+require "groonga/command/select"
+require "groonga/command/suggest"
+require "groonga/command/table-create"
+require "groonga/command/table-remove"
+require "groonga/command/table-rename"
+require "groonga/command/truncate"

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

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-213  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
@@ -17,9 +17,14 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class ColumnCreateCommandTest < Test::Unit::TestCase
-  class CommandLineTest < self
-    include GroongaCommandTestUtils::CommandLineCommandParser
+  private
+  def column_create_command(pair_arguments={}, ordered_arguments=[])
+    Groonga::Command::ColumnCreate.new("column_create",
+                                       pair_arguments,
+                                       ordered_arguments)
+  end
 
+  class ConstructorTest < self
     def test_ordered_arguments
       table    = "Lexicon"
       name     = "content_index"
@@ -27,8 +32,7 @@ class ColumnCreateCommandTest < Test::Unit::TestCase
       type     = "Posts"
       source   = "content"
 
-      command = parse([table, name, flags, type, source])
-      assert_instance_of(Groonga::Command::ColumnCreate, command)
+      command = column_create_command({}, [table, name, flags, type, source])
       assert_equal({
                      :table    => table,
                      :name     => name,
@@ -38,120 +42,115 @@ class ColumnCreateCommandTest < Test::Unit::TestCase
                    },
                    command.arguments)
     end
+  end
 
-    private
-    def parse(arguments)
-      super("column_create", arguments, :output_type => false)
+  class FlagsTest < self
+    def test_multiple
+      command = column_create_command({"flags" => "COLUMN_INDEX|WITH_POSITION"})
+      assert_equal(["COLUMN_INDEX", "WITH_POSITION"],
+                   command.flags)
     end
 
-    class FlagsTest < self
-      def test_multiple
-        command = parse({"flags" => "COLUMN_INDEX|WITH_POSITION"})
-        assert_equal(["COLUMN_INDEX", "WITH_POSITION"],
-                     command.flags)
-      end
+    def test_one
+      command = column_create_command({"flags" => "COLUMN_VECTOR"})
+      assert_equal(["COLUMN_VECTOR"],
+                   command.flags)
+    end
 
-      def test_one
-        command = parse({"flags" => "COLUMN_VECTOR"})
-        assert_equal(["COLUMN_VECTOR"],
-                     command.flags)
-      end
+    def test_no_flags
+      command = column_create_command({})
+      assert_equal([], command.flags)
+    end
 
-      def test_no_flags
-        command = parse({})
-        assert_equal([], command.flags)
+    class PredicateTest < self
+      data({
+             "COLUMN_SCALAR" => {
+               :expected => true,
+               :flags    => "COLUMN_SCALAR",
+             },
+             "other flag"   => {
+               :expected => false,
+               :flags    => "COLUMN_VECTOR",
+             }
+           })
+      def test_column_scalar?(data)
+        command = column_create_command({"flags" => data[:flags]})
+        assert_equal(data[:expected], command.column_scalar?)
       end
 
-      class PredicateTest < self
-        data({
-               "COLUMN_SCALAR" => {
-                 :expected => true,
-                 :flags    => "COLUMN_SCALAR",
-               },
-               "other flag"   => {
-                 :expected => false,
-                 :flags    => "COLUMN_VECTOR",
-               }
-             })
-        def test_column_scalar?(data)
-          command = parse({"flags" => data[:flags]})
-          assert_equal(data[:expected], command.column_scalar?)
-        end
-
-        data({
-               "COLUMN_VECTOR" => {
-                 :expected => true,
-                 :flags    => "COLUMN_VECTOR",
-               },
-               "other flag"   => {
-                 :expected => false,
-                 :flags    => "COLUMN_INDEX",
-               }
-             })
-        def test_column_vector?(data)
-          command = parse({"flags" => data[:flags]})
-          assert_equal(data[:expected], command.column_vector?)
-        end
+      data({
+             "COLUMN_VECTOR" => {
+               :expected => true,
+               :flags    => "COLUMN_VECTOR",
+             },
+             "other flag"   => {
+               :expected => false,
+               :flags    => "COLUMN_INDEX",
+             }
+           })
+      def test_column_vector?(data)
+        command = column_create_command({"flags" => data[:flags]})
+        assert_equal(data[:expected], command.column_vector?)
+      end
 
-        data({
-               "COLUMN_INDEX" => {
-                 :expected => true,
-                 :flags    => "COLUMN_INDEX",
-               },
-               "other flag"   => {
-                 :expected => false,
-                 :flags    => "COLUMN_SCALAR",
-               }
-             })
-        def test_column_index?(data)
-          command = parse({"flags" => data[:flags]})
-          assert_equal(data[:expected], command.column_index?)
-        end
+      data({
+             "COLUMN_INDEX" => {
+               :expected => true,
+               :flags    => "COLUMN_INDEX",
+             },
+             "other flag"   => {
+               :expected => false,
+               :flags    => "COLUMN_SCALAR",
+             }
+           })
+      def test_column_index?(data)
+        command = column_create_command({"flags" => data[:flags]})
+        assert_equal(data[:expected], command.column_index?)
+      end
 
-        data({
-               "WITH_SECTION" => {
-                 :expected => true,
-                 :flags    => "COLUMN_INDEX|WITH_SECTION",
-               },
-               "other flag"   => {
-                 :expected => false,
-                 :flags    => "COLUMN_INDEX|WITH_WEIGHT",
-               }
-             })
-        def test_with_section?(data)
-          command = parse({"flags" => data[:flags]})
-          assert_equal(data[:expected], command.with_section?)
-        end
+      data({
+             "WITH_SECTION" => {
+               :expected => true,
+               :flags    => "COLUMN_INDEX|WITH_SECTION",
+             },
+             "other flag"   => {
+               :expected => false,
+               :flags    => "COLUMN_INDEX|WITH_WEIGHT",
+             }
+           })
+      def test_with_section?(data)
+        command = column_create_command({"flags" => data[:flags]})
+        assert_equal(data[:expected], command.with_section?)
+      end
 
-        data({
-               "WITH_WEIGHT" => {
-                 :expected => true,
-                 :flags    => "COLUMN_INDEX|WITH_WEIGHT",
-               },
-               "other flag"   => {
-                 :expected => false,
-                 :flags    => "COLUMN_INDEX|WITH_POSITION",
-               }
-             })
-        def test_with_weight?(data)
-          command = parse({"flags" => data[:flags]})
-          assert_equal(data[:expected], command.with_weight?)
-        end
+      data({
+             "WITH_WEIGHT" => {
+               :expected => true,
+               :flags    => "COLUMN_INDEX|WITH_WEIGHT",
+             },
+             "other flag"   => {
+               :expected => false,
+               :flags    => "COLUMN_INDEX|WITH_POSITION",
+             }
+           })
+      def test_with_weight?(data)
+        command = column_create_command({"flags" => data[:flags]})
+        assert_equal(data[:expected], command.with_weight?)
+      end
 
-        data({
-               "WITH_POSITION" => {
-                 :expected => true,
-                 :flags    => "COLUMN_INDEX|WITH_POSITION",
-               },
-               "other flag"   => {
-                 :expected => false,
-                 :flags    => "COLUMN_INDEX|WITH_SECTION",
-               }
-             })
-        def test_with_position?(data)
-          command = parse({"flags" => data[:flags]})
-          assert_equal(data[:expected], command.with_position?)
-        end
+      data({
+             "WITH_POSITION" => {
+               :expected => true,
+               :flags    => "COLUMN_INDEX|WITH_POSITION",
+             },
+             "other flag"   => {
+               :expected => false,
+               :flags    => "COLUMN_INDEX|WITH_SECTION",
+             }
+           })
+      def test_with_position?(data)
+        command = column_create_command({"flags" => data[:flags]})
+        assert_equal(data[:expected], command.with_position?)
       end
     end
   end

data/test/command/test-column-remove.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# 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
@@ -17,25 +17,24 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class ColumnRemoveCommandTest < Test::Unit::TestCase
-  class CommandLineTest < self
-    include GroongaCommandTestUtils::CommandLineCommandParser
+  private
+  def column_remove_command(pair_arguments={}, ordered_arguments=[])
+    Groonga::Command::ColumnRemove.new("column_remove",
+                                       pair_arguments,
+                                       ordered_arguments)
+  end
 
+  class ConstructorTest < self
     def test_ordered_arguments
       table = "Users"
       name  = "age"
 
-      command = parse(table, name)
-      assert_instance_of(Groonga::Command::ColumnRemove, command)
+      command = column_remove_command({}, [table, name])
       assert_equal({
                      :table => table,
                      :name  => name,
                    },
                    command.arguments)
     end
-
-    private
-    def parse(*arguments)
-      super("column_remove", arguments, :output_type => false)
-    end
   end
 end

data/test/command/test-column-rename.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# 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
@@ -17,16 +17,20 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class ColumnRenameCommandTest < Test::Unit::TestCase
-  class CommandLineTest < self
-    include GroongaCommandTestUtils::CommandLineCommandParser
+  private
+  def column_rename_command(pair_arguments={}, ordered_arguments=[])
+    Groonga::Command::ColumnRename.new("column_rename",
+                                       pair_arguments,
+                                       ordered_arguments)
+  end
 
+  class ConstructorTest < self
     def test_ordered_arguments
       table    = "Users"
       name     = "name"
       new_name = "nick"
 
-      command = parse(table, name, new_name)
-      assert_instance_of(Groonga::Command::ColumnRename, command)
+      command = column_rename_command({}, [table, name, new_name])
       assert_equal({
                      :table    => table,
                      :name     => name,
@@ -34,10 +38,5 @@ class ColumnRenameCommandTest < Test::Unit::TestCase
                    },
                    command.arguments)
     end
-
-    private
-    def parse(*arguments)
-      super("column_rename", arguments, :output_type => false)
-    end
   end
 end

data/test/command/test-delete.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# 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
@@ -17,17 +17,21 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class DeleteCommandTest < Test::Unit::TestCase
-  class CommandLineTest < self
-    include GroongaCommandTestUtils::CommandLineCommandParser
+  private
+  def delete_command(pair_arguments={}, ordered_arguments=[])
+    Groonga::Command::Delete.new("delete",
+                                 pair_arguments,
+                                 ordered_arguments)
+  end
 
+  class ConstructorTest < self
     def test_ordered_arguments
       table  = "Users"
       key    = "Alice"
       id     = "29"
       filter = "age == 20"
 
-      command = parse(table, key, id, filter)
-      assert_instance_of(Groonga::Command::Delete, command)
+      command = delete_command({}, [table, key, id, filter])
       assert_equal({
                      :table  => table,
                      :key    => key,
@@ -36,10 +40,5 @@ class DeleteCommandTest < Test::Unit::TestCase
                    },
                    command.arguments)
     end
-
-    private
-    def parse(*arguments)
-      super("delete", arguments, :output_type => false)
-    end
   end
 end

data/test/command/test-dump.rb

@@ -17,14 +17,14 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class DumpCommandTest < Test::Unit::TestCase
-  include GroongaCommandTestUtils::CommandLineCommandParser
-
-  def test_output_type
-    assert_equal(:none, command.output_type)
+  private
+  def dump_command(pair_arguments={}, ordered_arguments=[])
+    Groonga::Command::Dump.new("dump", pair_arguments, ordered_arguments)
   end
 
-  private
-  def command(arguments={})
-    Groonga::Command::Dump.new("dump", arguments)
+  class OutputTypeTest < self
+    def test_none
+      assert_equal(:none, dump_command.output_type)
+    end
   end
 end

data/test/command/test-get.rb

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #
+# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
 # Copyright (C) 2012  Haruka Yoshihara <yoshihara@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -17,28 +18,24 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class GetCommandTest < Test::Unit::TestCase
-  class CommandLineTest < self
-    include GroongaCommandTestUtils::CommandLineCommandParser
+  private
+  def get_command(pair_arguments={}, ordered_arguments=[])
+    Groonga::Command::Get.new("get", pair_arguments, ordered_arguments)
+  end
 
+  class ConstructorTest < self
     def test_ordered_arguments
       table          = "Users"
       key            = "Alice"
       output_columns = "name, address"
 
-      command = parse(table, key, output_columns)
-      assert_instance_of(Groonga::Command::Get, command)
-
-      expected_arguments = {
-        :table          => table,
-        :key            => key,
-        :output_columns => output_columns,
-      }
-      assert_equal(expected_arguments, command.arguments)
-    end
-
-    private
-    def parse(*arguments)
-      super("get", arguments, :output_type => false)
+      command = get_command({}, [table, key, output_columns])
+      assert_equal({
+                     :table          => table,
+                     :key            => key,
+                     :output_columns => output_columns,
+                   },
+                   command.arguments)
     end
   end
 end

data/test/command/test-load.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# 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
@@ -17,9 +17,14 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class LoadCommandTest < Test::Unit::TestCase
-  class CommandLineTest < self
-    include GroongaCommandTestUtils::CommandLineCommandParser
+  private
+  def load_command(pair_arguments={}, ordered_arguments=[])
+    Groonga::Command::Load.new("load",
+                               pair_arguments,
+                               ordered_arguments)
+  end
 
+  class ConstructorTest < self
     def test_ordered_arguments
       values     = "[[\"Alice\"], [\"Bob\"]]"
       table      = "Users"
@@ -28,8 +33,15 @@ class LoadCommandTest < Test::Unit::TestCase
       input_type = "json"
       each       = "strlen(_key)"
 
-      command = parse(values, table, columns, ifexists, input_type, each)
-      assert_instance_of(Groonga::Command::Load, command)
+      ordered_arguments = [
+        values,
+        table,
+        columns,
+        ifexists,
+        input_type,
+        each,
+      ]
+      command = load_command({}, ordered_arguments)
       assert_equal({
                      :values     => values,
                      :table      => table,
@@ -40,10 +52,5 @@ class LoadCommandTest < Test::Unit::TestCase
                    },
                    command.arguments)
     end
-
-    private
-    def parse(*arguments)
-      super("load", arguments, :output_type => false)
-    end
   end
 end

data/test/command/test-register.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# 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
@@ -17,23 +17,22 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class RegisterCommandTest < Test::Unit::TestCase
-  class CommandLineTest < self
-    include GroongaCommandTestUtils::CommandLineCommandParser
+  private
+  def register_command(pair_arguments={}, ordered_arguments=[])
+    Groonga::Command::Register.new("register",
+                                   pair_arguments,
+                                   ordered_arguments)
+  end
 
+  class ConstructorTest < self
     def test_ordered_arguments
       path = "tokenizers/mecab"
 
-      command = parse(path)
-      assert_instance_of(Groonga::Command::Register, command)
+      command = register_command({}, [path])
       assert_equal({
                      :path => path,
                    },
                    command.arguments)
     end
-
-    private
-    def parse(*arguments)
-      super("register", arguments, :output_type => false)
-    end
   end
 end