groonga-command 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bc3354b6043a870c3bc49882c7e32d903f64ca7
-  data.tar.gz: ea676c91a3247a77351a4d096f431617015dad75
+  metadata.gz: 0d32457d22cdba4f0e6ea5758ae038cc66bec03c
+  data.tar.gz: fb8c5369a64d1fb468a058826dfc754a90326ef3
 SHA512:
-  metadata.gz: 201bb9895bf600093ad3b71be43665cf584eb305aad5478ddd79345d724b1214b67f3c121b3a5f74a7d08652bf3c549bad9e9f64ba33ae96fec06356cdad6f55
-  data.tar.gz: 9fda5545e981d63ae3b60c8cbda7285ab52fcef4f3983b99777bedbc8dbb777673433e9ccdaf3133bbe31701427a252e56ad72572b480270cd65bf637c69515e
+  metadata.gz: c725efcfa81fe6cf6bb8c9b846251c8d05574f286a7d05abe5455eb6ee38eb3d1b9b1be09ebfcba52c0032f53d3b1389bebddb10c49b5c509064016aebc620ca
+  data.tar.gz: 14e67e96af3df200db392971cd45eaa6174c6f0746396b42cd117d3d2b23f0ad23c0e65be936f59fa059f75f7d21349d372dfec0311847c9888bd5b87666b826

data/doc/text/news.md

@@ -1,5 +1,13 @@
 # News
 
+## 1.2.1: 2016-08-03
+
+### Improvements
+
+  * {Groonga::Command::Schema}: Added.
+  * {Groonga::Command::QueryExpand}: Added.
+  * {Groonga::Command::TableCreate#token_filters}: Added.
+
 ## 1.2.0: 2016-03-21
 
 ### Improvements

data/lib/groonga/command.rb

@@ -46,12 +46,14 @@ require "groonga/command/object-inspect"
 require "groonga/command/object-remove"
 require "groonga/command/plugin-register"
 require "groonga/command/plugin-unregister"
+require "groonga/command/query-expand"
 require "groonga/command/range-filter"
 require "groonga/command/register"
 require "groonga/command/reindex"
 require "groonga/command/request-cancel"
 require "groonga/command/ruby-eval"
 require "groonga/command/ruby-load"
+require "groonga/command/schema"
 require "groonga/command/select"
 require "groonga/command/shutdown"
 require "groonga/command/status"

data/lib/groonga/command/query-expand.rb

@@ -0,0 +1,99 @@
+# Copyright (C) 2016  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/base"
+
+module Groonga
+  module Command
+    # A command class that represents `query_expand` command.
+    #
+    # @since 1.2.1
+    class QueryExpand < Base
+      Command.register("query_expand", self)
+
+      class << self
+        def parameter_names
+          [
+            :expander,
+            :query,
+            :flags,
+          ]
+        end
+      end
+
+      # @return [String] `expander` parameter value.
+      #
+      # @since 1.2.1
+      def expander
+        self[:expander]
+      end
+
+      # @return [String] `query` parameter value.
+      #
+      # @since 1.2.1
+      def query
+        self[:query]
+      end
+
+      # @return [Array<String>] `flags` parameter value.
+      #
+      # @since 1.2.1
+      def flags
+        @flags ||= (self[:flags] || "").split(/(?:\s*\|\s*)|(?:\s+)/)
+      end
+
+      # @return [Boolean] `true` if `"ALLOW_PRAGMA"` is specified in
+      #   {#flags}, `false` otherwise.
+      #
+      # @since 1.2.1
+      def allow_pragma?
+        flags.include?("ALLOW_PRAGMA")
+      end
+
+      # @return [Boolean] `true` if `"ALLOW_COLUMN"` is specified in
+      #   {#flags}, `false` otherwise.
+      #
+      # @since 1.2.1
+      def allow_column?
+        flags.include?("ALLOW_COLUMN")
+      end
+
+      # @return [Boolean] `true` if `"ALLOW_UPDATE"` is specified in
+      #   {#flags}, `false` otherwise.
+      #
+      # @since 1.2.1
+      def allow_update?
+        flags.include?("ALLOW_UPDATE")
+      end
+
+      # @return [Boolean] `true` if `"ALLOW_LEADING_NOT"` is specified in
+      #   {#flags}, `false` otherwise.
+      #
+      # @since 1.2.1
+      def allow_leading_not?
+        flags.include?("ALLOW_LEADING_NOT")
+      end
+
+      # @return [Boolean] `true` if `"NONE"` is specified in {#flags},
+      #   `false` otherwise.
+      #
+      # @since 1.2.1
+      def none?
+        flags.include?("NONE")
+      end
+    end
+  end
+end

data/lib/groonga/command/schema.rb

@@ -0,0 +1,28 @@
+# Copyright (C) 2016  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/base"
+
+module Groonga
+  module Command
+    # A command class that represents `schema` command.
+    #
+    # @since 1.2.1
+    class Schema < Base
+      Command.register("schema", self)
+    end
+  end
+end

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

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2016  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
@@ -32,6 +30,7 @@ module Groonga
             :value_type,
             :default_tokenizer,
             :normalizer,
+            :token_filters,
           ]
         end
       end
@@ -92,6 +91,12 @@ module Groonga
       def normalizer
         self[:normalizer]
       end
+
+      # @return [::Array<String>] Token filter names.
+      # @since 1.2.1
+      def token_filters
+        @token_filters ||= (self[:token_filters] || "").split(/\s*\|\s*/)
+      end
     end
   end
 end

data/lib/groonga/command/version.rb

@@ -16,6 +16,6 @@
 
 module Groonga
   module Command
-    VERSION = "1.2.0"
+    VERSION = "1.2.1"
   end
 end

data/test/command/test-query-expand.rb

@@ -0,0 +1,171 @@
+# Copyright (C) 2016  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 QueryExpandCommandTest < Test::Unit::TestCase
+  private
+  def query_expand_command(pair_arguments={}, ordered_arguments=[])
+    Groonga::Command::QueryExpand.new("query_expand",
+                                      pair_arguments,
+                                      ordered_arguments)
+  end
+
+  class ConstructorTest < self
+    def test_ordered_arguments
+      expander = "QueryExpanderTSV"
+      query    = "Rroonga"
+      flags    = "ALLOW_PRAGMA|ALLOW_COLUMN"
+
+      command = query_expand_command({},
+                                     [
+                                       expander,
+                                       query,
+                                       flags,
+                                     ])
+      assert_equal({
+                     :expander => expander,
+                     :query    => query,
+                     :flags    => flags,
+                   },
+                   command.arguments)
+    end
+  end
+
+  class ExpanderTest < self
+    def test_reader
+      command = query_expand_command(:expander => "QueryExpanderTSV")
+      assert_equal("QueryExpanderTSV", command.expander)
+    end
+  end
+
+  class QueryTest < self
+    def test_reader
+      command = query_expand_command(:query => "Rroonga")
+      assert_equal("Rroonga", command.query)
+    end
+  end
+
+  class FlagsTest < self
+    def test_omitted
+      command = query_expand_command
+      assert_equal([],
+                   command.flags)
+    end
+
+    def test_one
+      command = query_expand_command(:flags => "ALLOW_COLUMN")
+      assert_equal(["ALLOW_COLUMN"],
+                   command.flags)
+    end
+
+    def test_pipe_separator
+      command = query_expand_command(:flags => "ALLOW_UPDATE|ALLOW_COLUMN")
+      assert_equal(["ALLOW_UPDATE", "ALLOW_COLUMN"],
+                   command.flags)
+    end
+
+    def test_pipe_separator_with_space
+      command = query_expand_command(:flags => "ALLOW_UPDATE | ALLOW_COLUMN")
+      assert_equal(["ALLOW_UPDATE", "ALLOW_COLUMN"],
+                   command.flags)
+    end
+
+    def test_space_separator
+      command = query_expand_command(:flags => "ALLOW_UPDATE ALLOW_COLUMN")
+      assert_equal(["ALLOW_UPDATE", "ALLOW_COLUMN"],
+                   command.flags)
+    end
+  end
+
+  class AllowPragmaTest < self
+    def test_true
+      command = query_expand_command(:flags => "ALLOW_PRAGMA")
+      assert do
+        command.allow_pragma?
+      end
+    end
+
+    def test_false
+      command = query_expand_command(:flags => "ALLOW_COLUMN")
+      assert do
+        not command.allow_pragma?
+      end
+    end
+  end
+
+  class AllowColumnTest < self
+    def test_true
+      command = query_expand_command(:flags => "ALLOW_COLUMN")
+      assert do
+        command.allow_column?
+      end
+    end
+
+    def test_false
+      command = query_expand_command(:flags => "ALLOW_PRAGMA")
+      assert do
+        not command.allow_column?
+      end
+    end
+  end
+
+  class AllowUpdateTest < self
+    def test_true
+      command = query_expand_command(:flags => "ALLOW_UPDATE")
+      assert do
+        command.allow_update?
+      end
+    end
+
+    def test_false
+      command = query_expand_command(:flags => "ALLOW_PRAGMA")
+      assert do
+        not command.allow_update?
+      end
+    end
+  end
+
+  class AllowLeadingNotTest < self
+    def test_true
+      command = query_expand_command(:flags => "ALLOW_LEADING_NOT")
+      assert do
+        command.allow_leading_not?
+      end
+    end
+
+    def test_false
+      command = query_expand_command(:flags => "ALLOW_PRAGMA")
+      assert do
+        not command.allow_leading_not?
+      end
+    end
+  end
+
+  class NoneTest < self
+    def test_true
+      command = query_expand_command(:flags => "NONE")
+      assert do
+        command.none?
+      end
+    end
+
+    def test_false
+      command = query_expand_command(:flags => "ALLOW_PRAGMA")
+      assert do
+        not command.none?
+      end
+    end
+  end
+end

data/test/command/test-schema.rb

@@ -0,0 +1,29 @@
+# Copyright (C) 2016  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 SchemaCommandTest < Test::Unit::TestCase
+  private
+  def schema_command(pair_arguments={}, ordered_arguments=[])
+    Groonga::Command::Schema.new("schema", pair_arguments, ordered_arguments)
+  end
+
+  class ConstructorTest < self
+    def test_ordered_arguments
+      command = schema_command({}, [])
+      assert_equal({}, command.arguments)
+    end
+  end
+end

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

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2012-2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2016  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
@@ -32,6 +30,7 @@ class TableCreateCommandTest < Test::Unit::TestCase
       value_type        = "UInt32"
       default_tokenizer = "TokenBigram"
       normalizer        = "NormalizerAuto"
+      token_filters     = "TokenFilterStopWord|TokenFilterStem"
 
       ordered_arguments = [
         name,
@@ -40,6 +39,7 @@ class TableCreateCommandTest < Test::Unit::TestCase
         value_type,
         default_tokenizer,
         normalizer,
+        token_filters,
       ]
       command = table_create_command({}, ordered_arguments)
       assert_equal({
@@ -49,6 +49,7 @@ class TableCreateCommandTest < Test::Unit::TestCase
                      :value_type        => value_type,
                      :default_tokenizer => default_tokenizer,
                      :normalizer        => normalizer,
+                     :token_filters     => token_filters,
                    },
                    command.arguments)
     end
@@ -185,4 +186,29 @@ class TableCreateCommandTest < Test::Unit::TestCase
       assert_nil(command.normalizer)
     end
   end
+
+  class TokenFiltersTest < self
+    def test_multiple
+      arguments = {
+        "token_filters" => "TokenFilterStopWord|TokenFilterStem",
+      }
+      command = table_create_command(arguments)
+      assert_equal(["TokenFilterStopWord", "TokenFilterStem"],
+                   command.token_filters)
+    end
+
+    def test_one
+      arguments = {
+        "token_filters" => "TokenFilterStopWord",
+      }
+      command = table_create_command(arguments)
+      assert_equal(["TokenFilterStopWord"],
+                   command.token_filters)
+    end
+
+    def test_no_flags
+      command = table_create_command
+      assert_equal([], command.token_filters)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groonga-command
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-21 00:00:00.000000000 Z
+date: 2016-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -167,12 +167,14 @@ files:
 - lib/groonga/command/object-remove.rb
 - lib/groonga/command/plugin-register.rb
 - lib/groonga/command/plugin-unregister.rb
+- lib/groonga/command/query-expand.rb
 - lib/groonga/command/range-filter.rb
 - lib/groonga/command/register.rb
 - lib/groonga/command/reindex.rb
 - lib/groonga/command/request-cancel.rb
 - lib/groonga/command/ruby-eval.rb
 - lib/groonga/command/ruby-load.rb
+- lib/groonga/command/schema.rb
 - lib/groonga/command/select.rb
 - lib/groonga/command/shutdown.rb
 - lib/groonga/command/status.rb
@@ -214,12 +216,14 @@ files:
 - test/command/test-object-remove.rb
 - test/command/test-plugin-register.rb
 - test/command/test-plugin-unregister.rb
+- test/command/test-query-expand.rb
 - test/command/test-range-filter.rb
 - test/command/test-register.rb
 - test/command/test-reindex.rb
 - test/command/test-request-cancel.rb
 - test/command/test-ruby-eval.rb
 - test/command/test-ruby-load.rb
+- test/command/test-schema.rb
 - test/command/test-select.rb
 - test/command/test-shutdown.rb
 - test/command/test-status.rb
@@ -298,6 +302,7 @@ test_files:
 - test/command/test-range-filter.rb
 - test/command/test-status.rb
 - test/command/test-logical-shard-list.rb
+- test/command/test-schema.rb
 - test/command/test-suggest.rb
 - test/command/test-select.rb
 - test/command/test-column-remove.rb
@@ -305,6 +310,7 @@ test_files:
 - test/command/test-table-create.rb
 - test/command/test-table-remove.rb
 - test/command/test-ruby-load.rb
+- test/command/test-query-expand.rb
 - test/command/test-truncate.rb
 - test/command/test-logical-table-remove.rb
 - test/run-test.rb