groonga-command 1.4.4 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce9859484daef364ba74d82aa2391c0f1adbf7c28370b3d8ca974cb7dd18c451
-  data.tar.gz: c59cf788e9ac27ec0eea8e7ae330d62a48b6a48af000ef72d2c284b730969c01
+  metadata.gz: 1e8e7e4033e77829c575d2ef6832f8ad5c8d8883c0279d5fa56b8f368f66d671
+  data.tar.gz: ba868ba8b7f5a04b17ace4c18fe438cd7ecd2e3581d072f8cda4431d09f2ca84
 SHA512:
-  metadata.gz: 801903b0deea2eaccb58f175e3eca3557f3783c1e627986016c65ce82709a7bc3f3ddbe882fd0fed9146e94819d0e8fe68ee836f321b0b5c6a37c72dc216c615
-  data.tar.gz: 7fca220f7e886b28753a6610a228c4deffa2b2e18d0946d44c5179920a9452cc1dae9eed3101c481c61c659151c4f391fc979d3342a38313f0a1a2370d6bd556
+  metadata.gz: fcde76968b9b36f013419f3a38ece4caf3e81550b272a3bcf906b4c9e011be6a4d008a91ef79f7578ac0fd9365233994c1cbbf08c0ac0c25c9babfab75887193
+  data.tar.gz: 6afc4ddf0367b6de2e38de283176f92f82bd95c03d18ed25113983f16b368b207b1728db10d7fb98699766ba1d63c4f8022eb2bbd86f1c95dfa309701cda6f40

data/doc/text/news.md

@@ -1,5 +1,14 @@
 # News
 
+## 1.4.5: 2019-09-02
+
+### Improvements
+
+  * {Groonga::Command::Select}: Added support for labeled drilldowns in slice.
+
+  * {Groonga::Command::LogicalSelect}: Added support for labeled
+    drilldowns in slice.
+
 ## 1.4.4: 2019-09-02
 
 ### Improvements

data/lib/groonga/command/drilldownable.rb

@@ -91,15 +91,15 @@ module Groonga
       #
       # @since 1.2.8
       def labeled_drilldowns
-        @labeled_drilldowns ||= parse_labeled_drilldowns
+        @labeled_drilldowns ||= parse_labeled_drilldowns("")
       end
 
       private
-      def parse_labeled_drilldowns
+      def parse_labeled_drilldowns(prefix)
         raw_labeled_drilldowns = {}
         @arguments.each do |name, value|
           case name.to_s
-          when /\Adrilldowns?\[(.+?)\]\.(.+?)\z/
+          when /\A#{Regexp.escape(prefix)}drilldowns?\[(.+?)\]\.(.+?)\z/
             label = $1
             parameter_name = $2
             raw_labeled_drilldowns[label] ||= {}

data/lib/groonga/command/sliceable.rb

@@ -51,6 +51,7 @@ module Groonga
           output_columns = parse_array_value(raw_slice["output_columns"])
           offset = parse_integer_value(raw_slice["offset"])
           limit = parse_integer_value(raw_slice["limit"])
+          labeled_drilldowns = parse_labeled_drilldowns("slices[#{label}].")
           slices[label] = Slice.new(label,
                                     match_columns,
                                     query,
@@ -60,7 +61,8 @@ module Groonga
                                     sort_keys,
                                     output_columns,
                                     offset,
-                                    limit)
+                                    limit,
+                                    labeled_drilldowns)
         end
         slices
       end
@@ -75,7 +77,8 @@ module Groonga
                                :sort_keys,
                                :output_columns,
                                :offset,
-                               :limit)
+                               :limit,
+                               :labeled_drilldowns)
       end
     end
   end

data/lib/groonga/command/version.rb

@@ -16,6 +16,6 @@
 
 module Groonga
   module Command
-    VERSION = "1.4.4"
+    VERSION = "1.4.5"
   end
 end

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

@@ -344,6 +344,7 @@ class LogicalSelectCommandTest < Test::Unit::TestCase
 
     def slice(parameters)
       slice = Groonga::Command::LogicalSelect::Slice.new
+      slice.labeled_drilldowns = {}
       parameters.each do |key, value|
         slice[key] = value
       end

data/test/command/test-select.rb

@@ -335,6 +335,7 @@ class SelectCommandTest < Test::Unit::TestCase
 
     def slice(parameters)
       slice = Groonga::Command::Select::Slice.new
+      slice.labeled_drilldowns = {}
       parameters.each do |key, value|
         slice[key] = value
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groonga-command
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.5
 platform: ruby
 authors:
 - Kouhei Sutou