groonga-command 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d2f555370a8c3bba2991a68593c7bb398054a23e4445d46ec29dbaf2b875762
-  data.tar.gz: f4e599c46ff4e418539b10f6e6171eb28dbcceda8c59156e2afb296b4d0b50c7
+  metadata.gz: 9b4f9e1034bd01512b802d2bb3e40cb35365b51379d5ce8d88c121b388d64ca0
+  data.tar.gz: 91d75b6923d074a9e469524301c5dd970a0aa1068beedd351ae64e6a5591a715
 SHA512:
-  metadata.gz: 342c12272bb17b82cfa81070f87a13e0fbec393aa925feed32788c3d8702f50f033cdcc9ac06c8720edfc691fe8d50d98f013279268de20fa7415d1ecbff1dd6
-  data.tar.gz: 11b5f90f786a5e9ed636ed88f623f7042a15c37c3c92f20f708534213037f82f5dc52814763d0a2d4930f106801bc658839eca754114809e34f574e45ee3ecaa
+  metadata.gz: f384098ada70451a767d8c0b662b6906b5c4fce5bd90073275b3330d7d2a1118f9fb8e05da959855920fc7b1a960b25349548f655f80408e581b6240b741e6f6
+  data.tar.gz: d9bb4dd1c5ab2a842ead8f94a29142222164e8f8d4b9aedd8f3985658482b435b26b6bfcc47b9373b2ddba9a459c1d8d28a0dcf015de47012a583f20fbe188c6

data/doc/text/news.md

@@ -1,5 +1,15 @@
 # News
 
+## 1.4.3: 2019-09-02
+
+### Improvements
+
+  * {Groonga::Command::LogicalRangeFilter#use_range_index}: Added.
+
+  * {Groonga::Command::LogicalRangeFilter#post_filter}: Added.
+
+  * {Groonga::Command::LogicalRangeFilter#sort_keys}: Added.
+
 ## 1.4.2: 2019-08-21
 
 ### Improvements

data/lib/groonga/command/base.rb

@@ -232,15 +232,22 @@ module Groonga
         value.strip.split(/\s*[| ]\s*/)
       end
 
-      def boolean_value(name, default_value)
-        parse_boolean_value(self[name], default_value)
+      def boolean_value(name, **keyword_args)
+        parse_boolean_value(self[name], **keyword_args)
       end
 
-      def parse_boolean_value(value, default_value)
-        return default_value if value.nil?
+      def parse_boolean_value(value, default:, invalid:)
+        return default if value.nil?
         value = value.strip
-        return default_value if value.empty?
-        value == "yes"
+        return default if value.empty?
+        case value
+        when "yes"
+          true
+        when "no"
+          false
+        else
+          invalid
+        end
       end
     end
   end

data/lib/groonga/command/dump.rb

@@ -47,7 +47,9 @@ module Groonga
       #
       # @since 1.3.4
       def sort_hash_table?
-        boolean_value(:sort_hash_table, false)
+        boolean_value(:sort_hash_table,
+                      default: false,
+                      invalid: false)
       end
     end
   end

data/lib/groonga/command/load.rb

@@ -70,7 +70,9 @@ module Groonga
       #
       # @since 1.3.0
       def output_ids?
-        boolean_value(:output_ids, false)
+        boolean_value(:output_ids,
+                      default: false,
+                      invalid: false)
       end
 
       private

data/lib/groonga/command/logical-range-filter.rb

@@ -1,5 +1,6 @@
 # Copyright (C) 2015  Hiroshi Hatake <hatake@clear-code.com>
-# Copyright (C) 2018  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2018-2019  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2019  Yasuhiro Horimoto <horimoto@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
@@ -44,6 +45,9 @@ module Groonga
             :limit,
             :filter,
             :output_columns,
+            :use_range_index,
+            :post_filter,
+            :sort_keys,
           ]
         end
       end
@@ -130,6 +134,30 @@ module Groonga
       def output_columns
         self[:output_columns]
       end
+
+      # @return [Boolean, nil] Whether force to use or not use range index.
+      #   `nil` means that decided whether use range index automatically.
+      #
+      # @since 1.4.3
+      def use_range_index
+        boolean_value(:use_range_index,
+                      default: nil,
+                      invalid: nil)
+      end
+
+      # @return [String] `post_filter` parameter value.
+      #
+      # @since 1.4.3
+      def post_filter
+        self[:post_filter]
+      end
+
+      # @return [::Array<String>] The sort keys.
+      #
+      # @since 1.4.3
+      def sort_keys
+        parse_array_value(self[:sort_keys] || "")
+      end
     end
   end
 end

data/lib/groonga/command/object-remove.rb

@@ -48,7 +48,9 @@ module Groonga
       #
       # @since 1.1.7
       def force?
-        boolean_value(:force, false)
+        boolean_value(:force,
+                      default: false,
+                      invalid: false)
       end
     end
   end

data/lib/groonga/command/version.rb

@@ -16,6 +16,6 @@
 
 module Groonga
   module Command
-    VERSION = "1.4.2"
+    VERSION = "1.4.3"
   end
 end

data/test/command/test-logical-range-filter.rb

@@ -1,4 +1,6 @@
 # Copyright (C) 2015  Hiroshi Hatake <hatake@clear-code.com>
+# Copyright (C) 2019  Yasuhiro Horimoto <horimoto@clear-code.com>
+# Copyright (C) 2019  Sutou Kouhei <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
@@ -23,17 +25,20 @@ class LogicalRangeFilterCommandTest < Test::Unit::TestCase
 
   class ConstructorTest < self
     def test_ordered_arguments
-      logical_table  = "Logs"
-      shard_key      = "timestamp",
-      min            = "2015-02-12 00:00:00"
-      min_border     = "include"
-      max            = "2015-02-13 00:00:00"
-      max_border     = "exclude"
-      order          = "ascending"
-      offset         = "10"
-      limit          = "20"
-      filter         = "value == 10"
-      output_columns = "_key, timestamp"
+      logical_table   = "Logs"
+      shard_key       = "timestamp",
+      min             = "2015-02-12 00:00:00"
+      min_border      = "include"
+      max             = "2015-02-13 00:00:00"
+      max_border      = "exclude"
+      order           = "ascending"
+      offset          = "10"
+      limit           = "20"
+      filter          = "value == 10"
+      output_columns  = "_key, timestamp"
+      use_range_index = "yes"
+      post_filter     = "_score > 10"
+      sort_keys       = "timestamp, -_score"
 
       ordered_arguments = [
         logical_table,
@@ -47,20 +52,26 @@ class LogicalRangeFilterCommandTest < Test::Unit::TestCase
         limit,
         filter,
         output_columns,
+        use_range_index,
+        post_filter,
+        sort_keys,
       ]
       command = logical_range_filter_command({}, ordered_arguments)
       assert_equal({
-                     :logical_table  => logical_table,
-                     :shard_key      => shard_key,
-                     :min            => min,
-                     :min_border     => min_border,
-                     :max            => max,
-                     :max_border     => max_border,
-                     :order          => order,
-                     :offset         => offset,
-                     :limit          => limit,
-                     :filter         => filter,
-                     :output_columns => output_columns,
+                     :logical_table   => logical_table,
+                     :shard_key       => shard_key,
+                     :min             => min,
+                     :min_border      => min_border,
+                     :max             => max,
+                     :max_border      => max_border,
+                     :order           => order,
+                     :offset          => offset,
+                     :limit           => limit,
+                     :filter          => filter,
+                     :output_columns  => output_columns,
+                     :use_range_index => use_range_index,
+                     :post_filter     => post_filter,
+                     :sort_keys       => sort_keys,
                    },
                    command.arguments)
     end
@@ -135,4 +146,40 @@ class LogicalRangeFilterCommandTest < Test::Unit::TestCase
       assert_equal("_key, timestamp", command.output_columns)
     end
   end
+
+  class UseRangeIndexTest < self
+    def test_yes
+      command = logical_range_filter_command(:use_range_index => "yes")
+      assert_true(command.use_range_index)
+    end
+
+    def test_no
+      command = logical_range_filter_command(:use_range_index => "no")
+      assert_false(command.use_range_index)
+    end
+
+    def test_default
+      command = logical_range_filter_command
+      assert_nil(command.use_range_index)
+    end
+
+    def test_invalid
+      command = logical_range_filter_command(:use_range_index => "invalid")
+      assert_nil(command.use_range_index)
+    end
+  end
+
+  class PostFilterTest < self
+    def test_reader
+      command = logical_range_filter_command(:post_filter => "_score > 10")
+      assert_equal("_score > 10", command.post_filter)
+    end
+  end
+
+  class SortKeysTest < self
+    def test_reader
+      command = logical_range_filter_command(:sort_keys => "timestamp, -_score")
+      assert_equal(["timestamp", "-_score"], command.sort_keys)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groonga-command
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-21 00:00:00.000000000 Z
+date: 2019-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -271,65 +271,66 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6.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-logical-table-remove.rb
-- test/command/test-reindex.rb
+- test/command/test-range-filter.rb
 - test/command/test-column-rename.rb
-- test/command/test-query-log-flags-set.rb
-- test/command/test-normalize.rb
-- test/command/test-request-cancel.rb
+- test/command/test-object-exist.rb
+- test/command/test-config-get.rb
+- test/command/test-table-create.rb
+- test/command/test-plugin-register.rb
+- test/command/test-query-log-flags-remove.rb
+- test/command/format/test-command.rb
+- test/command/test-table-rename.rb
+- test/command/test-truncate.rb
+- test/command/test-log-put.rb
 - test/command/test-query-log-flags-get.rb
-- test/command/test-range-filter.rb
-- test/command/test-log-level.rb
-- test/command/test-table-tokenize.rb
-- test/command/test-logical-select.rb
-- test/command/test-column-list.rb
-- test/command/test-status.rb
-- test/command/test-load.rb
-- test/command/test-table-remove.rb
-- test/command/test-index-column-diff.rb
-- test/command/test-suggest.rb
-- test/command/test-delete.rb
+- test/command/test-query-log-flags-set.rb
 - test/command/test-logical-range-filter.rb
-- test/command/test-column-copy.rb
-- test/command/test-base.rb
-- test/command/test-table-create.rb
-- test/command/test-table-list.rb
-- test/command/test-select.rb
+- test/command/test-column-list.rb
+- test/command/test-ruby-load.rb
 - test/command/test-query-log-flags-add.rb
+- test/command/test-table-copy.rb
 - test/command/test-config-delete.rb
+- test/command/test-logical-select.rb
+- test/command/test-tokenize.rb
+- test/command/test-table-tokenize.rb
+- test/command/test-request-cancel.rb
+- test/command/test-column-copy.rb
+- test/command/test-suggest.rb
+- test/command/test-column-remove.rb
+- test/command/test-object-remove.rb
+- test/command/test-logical-shard-list.rb
+- test/command/test-column-create.rb
 - test/command/test-get.rb
-- test/command/test-plugin-register.rb
-- test/command/test-config-get.rb
-- test/command/format/test-command.rb
-- test/command/test-shutdown.rb
+- test/command/test-load.rb
+- test/command/test-reindex.rb
+- test/command/test-plugin-unregister.rb
 - test/command/test-io-flush.rb
+- test/command/test-logical-table-remove.rb
+- test/command/test-index-column-diff.rb
+- test/command/test-register.rb
+- test/command/test-object-inspect.rb
+- test/command/test-delete.rb
 - test/command/test-query-expand.rb
-- test/command/test-logical-shard-list.rb
-- test/command/test-log-put.rb
-- test/command/test-query-log-flags-remove.rb
-- test/command/test-object-remove.rb
-- test/command/test-logical-count.rb
+- test/command/test-table-list.rb
+- test/command/test-status.rb
 - test/command/test-thread-limit.rb
-- test/command/test-column-remove.rb
-- test/command/test-table-copy.rb
-- test/command/test-ruby-load.rb
-- test/command/test-object-inspect.rb
-- test/command/test-plugin-unregister.rb
-- test/command/test-table-rename.rb
-- test/command/test-truncate.rb
-- test/command/test-tokenize.rb
 - test/command/test-config-set.rb
-- test/command/test-object-exist.rb
+- test/command/test-log-level.rb
+- test/command/test-shutdown.rb
 - test/command/test-ruby-eval.rb
-- test/command/test-register.rb
-- test/command/test-dump.rb
-- test/command/test-column-create.rb
 - test/command/test-schema.rb
+- test/command/test-normalize.rb
+- test/command/test-dump.rb
+- test/command/test-base.rb
+- test/command/test-logical-count.rb
+- test/command/test-table-remove.rb
+- test/command/test-select.rb
 - test/groonga-command-test-utils.rb