groonga-command 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 90745a99d72f93d9d719234502ba3647dcb1925c
-  data.tar.gz: ae6c07674439ffecdccacb23a24522dc342859d5
+SHA256:
+  metadata.gz: 4d2f555370a8c3bba2991a68593c7bb398054a23e4445d46ec29dbaf2b875762
+  data.tar.gz: f4e599c46ff4e418539b10f6e6171eb28dbcceda8c59156e2afb296b4d0b50c7
 SHA512:
-  metadata.gz: bcc65e519bb8f64dfc51dd8b71d4070bcefd3a7a730c2bf96c161d953a9a7da5d5e05b475fbcc8dfca3c2a3f6ee1980455ebccb1aefd1e44d9c21bcb267c41c8
-  data.tar.gz: fad54dfbfe207833888e7d7681c9fa9a2109c20aef29cbf602984b048b082e57ef4079e0add7c051755727cbb1165b3e26a4c9b7f77b4fe3d47c5e76fe537fbf
+  metadata.gz: 342c12272bb17b82cfa81070f87a13e0fbec393aa925feed32788c3d8702f50f033cdcc9ac06c8720edfc691fe8d50d98f013279268de20fa7415d1ecbff1dd6
+  data.tar.gz: 11b5f90f786a5e9ed636ed88f623f7042a15c37c3c92f20f708534213037f82f5dc52814763d0a2d4930f106801bc658839eca754114809e34f574e45ee3ecaa

data/doc/text/news.md

@@ -1,12 +1,22 @@
 # News
 
+## 1.4.2: 2019-08-21
+
+### Improvements
+
+  * {Groonga::Command::LogicalSelect#sort_keys}: Added.
+
+### Fixes
+
+  * Fixed a bug that Command::Base#== uses name instead of command_name [GitHub#13][Reported by yagisumi]
+
 ## 1.4.1: 2019-03-26
 
 ### Fixes
 
   * Fixed a bug that result of conversion to the Elasticsearch
     format result is wrong
-  
+
 ## 1.4.0: 2019-03-20
 
 ### Improvements
@@ -14,7 +24,7 @@
   * {Groonga::Command::Format::Elasticsearch}: Added.
 
   * {Groonga::Command::Base#to_elasticsearch_format}: Added.
-  
+
 ## 1.3.9: 2019-03-19
 
 ### Improvements

data/lib/groonga/command/base.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2017  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2019  Sutou Kouhei <kou@clear-code.com>
 # Copyright (C) 2019 Yasuhiro Horimoto <horimoto@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -123,7 +123,7 @@ module Groonga
 
       def ==(other)
         other.is_a?(self.class) and
-          @command_name == other.name and
+          @command_name == other.command_name and
           @arguments == other.arguments
       end
 

data/lib/groonga/command/logical-select.rb

@@ -50,6 +50,7 @@ module Groonga
             :drilldown_limit,
             :drilldown_calc_types,
             :drilldown_calc_target,
+            :sort_keys,
           ]
         end
       end
@@ -188,6 +189,13 @@ module Groonga
       def drilldown_calc_target
         self[:drilldown_calc_target]
       end
+
+      # @return [::Array<String>] The sort keys.
+      #
+      # @since 1.4.2
+      def sort_keys
+        parse_array_value(self[:sort_keys] || self[:sortby] || "")
+      end
     end
   end
 end

data/lib/groonga/command/version.rb

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

data/test/command/test-logical-select.rb

@@ -41,6 +41,7 @@ class LogicalSelectCommandTest < Test::Unit::TestCase
       drilldown_limit            = "10"
       drilldown_calc_types       = "MIN,AVG"
       drilldown_calc_target      = "n_occurred"
+      sort_keys                  = "-_score"
 
       ordered_arguments = [
         logical_table,
@@ -61,6 +62,7 @@ class LogicalSelectCommandTest < Test::Unit::TestCase
         drilldown_limit,
         drilldown_calc_types,
         drilldown_calc_target,
+        sort_keys,
       ]
       command = logical_select_command({}, ordered_arguments)
       assert_equal({
@@ -82,6 +84,7 @@ class LogicalSelectCommandTest < Test::Unit::TestCase
                      :drilldown_limit          => drilldown_limit,
                      :drilldown_calc_types     => drilldown_calc_types,
                      :drilldown_calc_target    => drilldown_calc_target,
+                     :sort_keys                => sort_keys,
                    },
                    command.arguments)
     end
@@ -205,4 +208,11 @@ class LogicalSelectCommandTest < Test::Unit::TestCase
       assert_equal("n_occurred", command.drilldown_calc_target)
     end
   end
+
+  class SortKeysTest < self
+    def test_reader
+      command = logical_select_command(:sort_keys => "-_score, _key")
+      assert_equal(["-_score", "_key"], command.sort_keys)
+    end
+  end
 end

data/test/command/test-plugin-unregister.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2015-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
@@ -42,4 +42,22 @@ class PluginUnregisterCommandTest < Test::Unit::TestCase
       assert_equal("query_expanders/tsv", command.name)
     end
   end
+
+  class EqualTest < self
+    def test_equal
+      command1 = plugin_unregister_command(:name => "query_expanders/tsv")
+      command2 = plugin_unregister_command(:name => "query_expanders/tsv")
+      assert do
+        command1 == command2
+      end
+    end
+
+    def test_not_equal
+      command1 = plugin_unregister_command(:name => "query_expanders/tsv")
+      command2 = plugin_unregister_command(:name => "functions/vector")
+      assert do
+        command1 != command2
+      end
+    end
+  end
 end

metadata

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