groonga-command 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afa89d09d8efc12ca74d48129881d5a327995e1b
-  data.tar.gz: 2ef702ff862788373a4208fd34342797fe6e6256
+  metadata.gz: 825e111ecaa00e1ab59e8d94d960c7d0c74ed1c5
+  data.tar.gz: 8cd981a313f1ff936e55f381b34103cf07bf6d7f
 SHA512:
-  metadata.gz: a8a28ba413387eaaeae03810c0d4229b7e4412c76a855bb4563abe1bc1a89a4c4851d88ad8fe6f1690a97110aaaffdefaac581379e6b01452936f89bf4eb2654
-  data.tar.gz: 9f4ad75123c52bdd7a9e73e2dcc44d34705cca63de756b84aea774889393a982f868d9ccec5036a9e85960bf3c9130c9adebee83c318a380436a5a62c91b4f8f
+  metadata.gz: aa021d38662c0d566a6ef81beb5eda9167cbae3b51372f394266ce54636a432bc371166d6239c1a37e4398564352c6b6fe8b9eade91e70fd61f96a2697edf250
+  data.tar.gz: 1a95dfb5a3edbe0153e91d8620724ae09cb75ddced9dac0ff24480d288642bc1d6f5ae8e94524cf6e58ba45400ce8fa56056aa1cac22f077130517e05427cbab

data/doc/text/news.md

@@ -1,5 +1,18 @@
 # News
 
+## 1.3.1: 2016-12-08
+
+### Improvements
+
+  * {Groonga::Command::Select#slices}: Changed return value from
+    `Hash<String, Groonga::Command::Select>` to `Hash<String,
+    Groonga::Command::Select::Slice`.
+
+### Fixes
+
+  * {Groonga::Command::TableCreate#token_filters}: Fixed a bug that
+    multiple token filters can't be parsed.
+
 ## 1.3.0: 2016-12-08
 
 ### Improvements

data/lib/groonga/command/base.rb

@@ -206,6 +206,15 @@ module Groonga
         return nil if value.nil?
         value.strip.split(/\s*,\s*/)
       end
+
+      def flags_value(name)
+        parse_flags_value(self[name] || "")
+      end
+
+      def parse_flags_value(value)
+        return nil if value.nil?
+        value.strip.split(/\s*[| ]\s*/)
+      end
     end
   end
 end

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

@@ -51,7 +51,7 @@ module Groonga
       end
 
       def flags
-        @flags ||= (self[:flags] || "").split(/\s*\|\s*/)
+        @flags ||= flags_value(:flags)
       end
 
       # @return [String] value type name of the column.
@@ -108,7 +108,7 @@ module Groonga
       #
       # @since 1.0.7
       def sources
-        @sources ||= (self[:source] || "").split(/\s*,\s*/)
+        @sources ||= array_value(:source)
       end
     end
   end

data/lib/groonga/command/normalize.rb

@@ -59,7 +59,7 @@ module Groonga
       #
       # @since 1.0.6
       def flags
-        @flags ||= (self[:flags] || "").split(/\s*[| ]\s*/)
+        @flags ||= flags_value(:flags)
       end
     end
   end

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

@@ -56,7 +56,7 @@ module Groonga
       #
       # @since 1.2.1
       def flags
-        @flags ||= (self[:flags] || "").split(/(?:\s*\|\s*)|(?:\s+)/)
+        @flags ||= flags_value(:flags)
       end
 
       # @return [Boolean] `true` if `"ALLOW_PRAGMA"` is specified in

data/lib/groonga/command/select.rb

@@ -107,7 +107,7 @@ module Groonga
         @labeled_drilldowns ||= parse_labeled_drilldowns
       end
 
-      # @return [::Hash<String, Select>] The slices.
+      # @return [::Hash<String, Slice>] The slices.
       #
       # @since 1.3.0
       def slices
@@ -159,7 +159,8 @@ module Groonga
                                     offset,
                                     limit,
                                     calc_types,
-                                    calc_target)
+                                    calc_target,
+                                    label)
           labeled_drilldowns[label] = drilldown
         end
         labeled_drilldowns
@@ -182,7 +183,25 @@ module Groonga
       def build_slices(raw_slices)
         slices = {}
         raw_slices.each do |label, raw_slice|
-          slices[label] = Select.new(raw_slice)
+          match_columns = raw_slice["match_columns"]
+          query = raw_slice["query"]
+          query_expander = raw_slice["query_expander"]
+          query_flags = parse_flags_value(raw_slice["query_flags"])
+          filter = raw_slice["filter"]
+          sort_keys = parse_array_value(raw_slice["sort_keys"])
+          output_columns = parse_array_value(raw_slice["output_columns"])
+          offset = parse_integer_value(raw_slice["offset"])
+          limit = parse_integer_value(raw_slice["limit"])
+          slices[label] = Slice.new(label,
+                                    match_columns,
+                                    query,
+                                    query_expander,
+                                    query_flags,
+                                    filter,
+                                    sort_keys,
+                                    output_columns,
+                                    offset,
+                                    limit)
         end
         slices
       end
@@ -193,7 +212,21 @@ module Groonga
                                    :offset,
                                    :limit,
                                    :calc_types,
-                                   :calc_target)
+                                   :calc_target,
+                                   :label)
+      end
+
+      # @since 1.3.1
+      class Slice < Struct.new(:label,
+                               :match_columns,
+                               :query,
+                               :query_expander,
+                               :query_flags,
+                               :filter,
+                               :sort_keys,
+                               :output_columns,
+                               :offset,
+                               :limit)
       end
     end
   end

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

@@ -62,7 +62,7 @@ module Groonga
       end
 
       def flags
-        @flags ||= (self[:flags] || "").split(/\s*\|\s*/)
+        @flags ||= flags_value(:flags)
       end
 
       # @return [Boolean] true if "TABLE_NO_KEY" is specified in {#flags},
@@ -115,7 +115,7 @@ module Groonga
       # @return [::Array<String>] Token filter names.
       # @since 1.2.1
       def token_filters
-        @token_filters ||= (self[:token_filters] || "").split(/\s*\|\s*/)
+        @token_filters ||= array_value(:token_filters)
       end
     end
   end

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

@@ -60,7 +60,7 @@ module Groonga
       #
       # @since 1.1.0
       def flags
-        @flags ||= (self[:flags] || "").split(/\s*[| ]\s*/)
+        @flags ||= flags_value(:flags)
       end
 
       # @return [String] `mode` parameter value.

data/lib/groonga/command/tokenize.rb

@@ -68,7 +68,7 @@ module Groonga
       #
       # @since 1.0.6
       def flags
-        @flags ||= (self[:flags] || "").split(/\s*[| ]\s*/)
+        @flags ||= flags_value(:flags)
       end
 
       # @return [String] `mode` parameter value.
@@ -85,7 +85,7 @@ module Groonga
       #
       # @since 1.1.0
       def token_filters
-        @token_filters ||= (self[:token_filters] || "").split(/\s*,\s*/)
+        @token_filters ||= array_value(:token_filters)
       end
     end
   end

data/lib/groonga/command/version.rb

@@ -16,6 +16,6 @@
 
 module Groonga
   module Command
-    VERSION = "1.3.0"
+    VERSION = "1.3.1"
   end
 end

data/test/command/test-select.rb

@@ -186,13 +186,15 @@ class SelectCommandTest < Test::Unit::TestCase
       }
       command = select_command(parameters)
       drilldowns = {
-        "author_tag" => drilldown(:keys => ["author", "tag"],
+        "author_tag" => drilldown(:label => "author_tag",
+                                  :keys => ["author", "tag"],
                                   :sort_keys => ["_value.author"],
                                   :output_columns => [
                                     "_value.author",
                                     "_nsubrecs",
                                   ]),
-        "tag" => drilldown(:keys => ["tag"],
+        "tag" => drilldown(:label => "tag",
+                           :keys => ["tag"],
                            :sort_keys => ["-_nsubrecs", "_key"],
                            :output_columns => [
                              "_key",
@@ -219,6 +221,36 @@ class SelectCommandTest < Test::Unit::TestCase
   end
 
   class SlicesTest < self
+    def test_full
+      parameters = {
+        "slices[book_alice].match_columns"  => "tag",
+        "slices[book_alice].query"          => "Book",
+        "slices[book_alice].query_expander" => "Synonyms.tag",
+        "slices[book_alice].query_flags"    => "ALLOW_COLUMN|ALLOW_LEADING_NOT",
+        "slices[book_alice].filter"         => "user == \"alice\"",
+        "slices[book_alice].sort_keys"      => "_score, user",
+        "slices[book_alice].offset"         => "10",
+        "slices[book_alice].limit"          => "25",
+      }
+      command = select_command(parameters)
+
+      slices = {
+        "book_alice" => slice(:label => "book_alice",
+                              :match_columns => "tag",
+                              :query => "Book",
+                              :query_expander => "Synonyms.tag",
+                              :query_flags => [
+                                "ALLOW_COLUMN",
+                                "ALLOW_LEADING_NOT",
+                              ],
+                              :filter => "user == \"alice\"",
+                              :sort_keys => ["_score", "user"],
+                              :offset => 10,
+                              :limit => 25),
+      }
+      assert_equal(slices, command.slices)
+    end
+
     def test_multiple
       parameters = {
         "slices[groonga].query" => "tag:Groonga",
@@ -229,12 +261,22 @@ class SelectCommandTest < Test::Unit::TestCase
       command = select_command(parameters)
 
       slices = {
-        "groonga" => select_command(:query => "tag:Groonga"),
-        "rroonga" => select_command(:filter => "tag == Rroonga",
-                                    :sort_keys => "date",
-                                    :output_columns => "_key, date"),
+        "groonga" => slice(:label => "groonga",
+                           :query => "tag:Groonga"),
+        "rroonga" => slice(:label => "rroonga",
+                           :filter => "tag == Rroonga",
+                           :sort_keys => ["date"],
+                           :output_columns => ["_key", "date"]),
       }
       assert_equal(slices, command.slices)
     end
+
+    def slice(parameters)
+      slice = Groonga::Command::Select::Slice.new
+      parameters.each do |key, value|
+        slice[key] = value
+      end
+      slice
+    end
   end
 end

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

@@ -209,7 +209,7 @@ class TableCreateCommandTest < Test::Unit::TestCase
   class TokenFiltersTest < self
     def test_multiple
       arguments = {
-        "token_filters" => "TokenFilterStopWord|TokenFilterStem",
+        "token_filters" => "TokenFilterStopWord,TokenFilterStem",
       }
       command = table_create_command(arguments)
       assert_equal(["TokenFilterStopWord", "TokenFilterStem"],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groonga-command
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -260,60 +260,60 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: 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.
 test_files:
-- test/run-test.rb
-- test/command/test-column-rename.rb
-- test/command/test-table-remove.rb
-- test/command/test-object-inspect.rb
-- test/command/test-truncate.rb
+- test/groonga-command-test-utils.rb
+- test/command/test-config-delete.rb
+- test/command/test-object-remove.rb
+- test/command/test-table-tokenize.rb
 - test/command/test-reindex.rb
-- test/command/test-normalize.rb
-- test/command/test-tokenize.rb
+- test/command/test-plugin-unregister.rb
+- test/command/test-io-flush.rb
+- test/command/test-base.rb
+- test/command/test-logical-count.rb
 - test/command/test-table-rename.rb
-- test/command/test-logical-range-filter.rb
+- test/command/test-column-rename.rb
 - test/command/test-dump.rb
-- test/command/test-suggest.rb
-- test/command/test-request-cancel.rb
-- test/command/test-config-set.rb
-- test/command/test-get.rb
-- test/command/test-query-expand.rb
-- test/command/test-logical-select.rb
-- test/command/test-column-create.rb
-- test/command/test-log-put.rb
+- test/command/test-normalize.rb
 - test/command/test-config-get.rb
-- test/command/test-log-level.rb
-- test/command/test-column-list.rb
 - test/command/test-register.rb
-- test/command/test-ruby-eval.rb
-- test/command/test-plugin-register.rb
-- test/command/test-table-list.rb
-- test/command/test-logical-table-remove.rb
-- test/command/test-config-delete.rb
 - test/command/test-shutdown.rb
-- test/command/test-io-flush.rb
-- test/command/test-table-create.rb
-- test/command/test-ruby-load.rb
-- test/command/test-load.rb
 - test/command/test-delete.rb
-- test/command/test-select.rb
-- test/command/test-plugin-unregister.rb
-- test/command/test-column-remove.rb
-- test/command/test-range-filter.rb
-- test/command/format/test-command.rb
 - test/command/test-column-copy.rb
-- test/command/test-base.rb
+- test/command/test-tokenize.rb
+- test/command/test-log-put.rb
+- test/command/test-load.rb
+- test/command/test-column-list.rb
+- test/command/test-plugin-register.rb
+- test/command/test-request-cancel.rb
+- test/command/test-column-create.rb
+- test/command/test-config-set.rb
+- test/command/test-logical-range-filter.rb
+- test/command/test-object-inspect.rb
+- test/command/format/test-command.rb
+- test/command/test-logical-select.rb
+- test/command/test-get.rb
+- test/command/test-thread-limit.rb
+- test/command/test-table-list.rb
 - test/command/test-object-exist.rb
+- test/command/test-log-level.rb
+- test/command/test-range-filter.rb
 - test/command/test-status.rb
-- test/command/test-thread-limit.rb
-- test/command/test-schema.rb
-- test/command/test-table-tokenize.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
+- test/command/test-ruby-eval.rb
+- test/command/test-table-create.rb
+- test/command/test-table-remove.rb
+- test/command/test-ruby-load.rb
 - test/command/test-table-copy.rb
-- test/command/test-object-remove.rb
-- test/command/test-logical-count.rb
-- test/groonga-command-test-utils.rb
+- test/command/test-query-expand.rb
+- test/command/test-truncate.rb
+- test/command/test-logical-table-remove.rb
+- test/run-test.rb