groonga-command 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94a17f5c7b56db7a29320cb7af65395183b7a43c
-  data.tar.gz: 5a199858fd2c1a291bc6fdc4f0e5d76518f19011
+  metadata.gz: 90745a99d72f93d9d719234502ba3647dcb1925c
+  data.tar.gz: ae6c07674439ffecdccacb23a24522dc342859d5
 SHA512:
-  metadata.gz: '0107882a318b6518b8825d68c9c38958b9a98ef3f0e110de7985c848425046e3202ae13a32670353bb99c34a3ac685b697248dabe25ce2747fe3daff0a907bc7'
-  data.tar.gz: 2f83719bcb481a8a745deca1f3c5337f1f4e6c341f34299f3d03c740e7f9e9a458c07cfe7928cc2c5c30444830ab90ba25549011c09e919915ca082496a2e013
+  metadata.gz: bcc65e519bb8f64dfc51dd8b71d4070bcefd3a7a730c2bf96c161d953a9a7da5d5e05b475fbcc8dfca3c2a3f6ee1980455ebccb1aefd1e44d9c21bcb267c41c8
+  data.tar.gz: fad54dfbfe207833888e7d7681c9fa9a2109c20aef29cbf602984b048b082e57ef4079e0add7c051755727cbb1165b3e26a4c9b7f77b4fe3d47c5e76fe537fbf

data/doc/text/news.md

@@ -1,5 +1,12 @@
 # News
 
+## 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

data/lib/groonga/command/base.rb

@@ -156,7 +156,7 @@ module Groonga
       end
 
       def to_elasticsearch_format(options={})
-        format = Format::Elasticsearch.new(@command_name, normalized_arguments)
+        format = Format::Elasticsearch.new(self)
         format.json(options)
       end
 

data/lib/groonga/command/format/elasticsearch.rb

@@ -18,71 +18,67 @@ module Groonga
   module Command
     module Format
       class Elasticsearch
-        def initialize(name, arguments)
-          @name = name
-          @arguments = arguments
+        def initialize(command)
+          @command = command
         end
 
         def json(options={})
-          return nil unless @name == "load"
+          return nil unless @command.is_a?(Load)
 
           components = []
-          elasticsearch_version = options[:version] || 5
+          action = build_action(options)
+          each_source do |source|
+            components << JSON.generate(action)
+            components << JSON.generate(source)
+          end
+          components.join("\n")
+        end
 
-          sorted_arguments = @arguments.sort_by(&:first)
-          sorted_arguments.each do |name, value|
-            case name
-            when :table
-              case elasticsearch_version
-              when 7
-                header = {
-                  "index" => {
-                    "_index" => value.downcase,
-                    "_type"=>"_doc",
-                  }
-                }
-              when 8
-                header = {
-                  "index" => {
-                    "_index" => value.downcase,
-                  }
-                }
-              else
-                # Version 5.x or 6.x
-                header = {
-                  "index" => {
-                    "_index" => value.downcase,
-                    "_type" => "groonga",
-                  }
-                }
-              end
-              components << JSON.generate(header)
-            when :values
-              record = JSON.parse(value)
+        private
+        def elasticsearch_version(options)
+          options[:version] || 5
+        end
 
-              if record[0].is_a?(::Array)
-                column_names = nil
+        def build_action(options)
+          index_name = @command.table.downcase
+          case elasticsearch_version(options)
+          when 5, 6
+            {
+              "index" => {
+                "_index" => index_name,
+                "_type" => "groonga",
+              }
+            }
+          when 7
+            {
+              "index" => {
+                "_index" => index_name,
+                "_type"=>"_doc",
+              }
+            }
+          else
+            {
+              "index" => {
+                "_index" => index_name,
+              }
+            }
+          end
+        end
 
-                record.each do |load_value|
-                  if column_names.nil?
-                    column_names = load_value
-                    next
-                  end
-                  body = {}
-                  column_values = load_value
-                  column_names.zip(column_values) do |column_name, column_value|
-                    body[column_name] = column_value
-                  end
-                  components << JSON.generate(body)
-                end
+        def each_source
+          columns = @command.columns
+          values = @command.values || []
+          values.each do |value|
+            if value.is_a?(::Array)
+              if columns.nil?
+                columns = value
               else
-                record.each do |load_value|
-                  components << JSON.generate(load_value)
-                end
+                yield(Hash[columns.zip(value)])
               end
+            else
+              yield(value)
             end
           end
-          components.join("\n")
         end
       end
     end

data/lib/groonga/command/version.rb

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

data/test/command/test-base.rb

@@ -134,13 +134,53 @@ select \\
       end
     end
 
+    sub_test_case("no use :columns") do
+      def single_record
+        load = Groonga::Command::Load.new("load",
+                                          :table => "Site",
+                                          :values => <<-VALUES)
+  [
+  ["_key", "title"]
+  ["http://example.org/","This is test record 1!"]
+  ]
+        VALUES
+
+        expected = <<-OUTPUT.chomp
+{"index":{"_index":"site","_type":"groonga"}}
+{"_key":"http://example.org/","title":"This is test record 1!"}
+        OUTPUT
+
+        assert_equal(expected, load.to_elasticsearch_format)
+      end
+
+      def multiple_records
+        load = Groonga::Command::Load.new("load",
+                                          :table => "Site",
+                                          :columns => "_key,title",
+                                          :values => <<-VALUES)
+  [
+  ["http://example.org/","This is test record 1!"],
+  ["http://example.net/","This is test record 2!"]
+  ]
+        VALUES
+
+        expected = <<-OUTPUT.chomp
+{"index":{"_index":"site","_type":"groonga"}}
+{"_key":"http://example.org/","title":"This is test record 1!"}
+{"_key":"http://example.net/","title":"This is test record 2!"}
+        OUTPUT
+
+        assert_equal(expected, load.to_elasticsearch_format)
+      end
+    end
+
     sub_test_case("single record") do
       def test_brackets_format
-        load = Groonga::Command::Base.new("load",
+        load = Groonga::Command::Load.new("load",
                                           :table => "Site",
+                                          :columns => "_key,title",
                                           :values => <<-VALUES)
   [
-  ["_key","title"],
   ["http://example.org/","This is test record 1!"]
   ]
         VALUES
@@ -154,7 +194,7 @@ select \\
       end
 
       def test_curly_brackets_format
-        load = Groonga::Command::Base.new("load",
+        load = Groonga::Command::Load.new("load",
                                           :table => "Site",
                                           :values => <<-VALUES)
   [
@@ -173,11 +213,11 @@ select \\
 
     sub_test_case("multiple records") do
       def test_brackets_format
-        load = Groonga::Command::Base.new("load",
+        load = Groonga::Command::Load.new("load",
                                           :table => "Site",
+                                          :columns => "_key,title",
                                           :values => <<-VALUES)
   [
-  ["_key","title"],
   ["http://example.org/","This is test record 1!"],
   ["http://example.net/","This is test record 2!"]
   ]
@@ -186,6 +226,7 @@ select \\
         expected = <<-OUTPUT.chomp
 {"index":{"_index":"site","_type":"groonga"}}
 {"_key":"http://example.org/","title":"This is test record 1!"}
+{"index":{"_index":"site","_type":"groonga"}}
 {"_key":"http://example.net/","title":"This is test record 2!"}
         OUTPUT
 
@@ -193,7 +234,7 @@ select \\
       end
 
       def test_curly_brackets_format
-        load = Groonga::Command::Base.new("load",
+        load = Groonga::Command::Load.new("load",
                                           :table => "Site",
                                           :values => <<-VALUES)
   [
@@ -205,6 +246,7 @@ select \\
         expected = <<-OUTPUT.chomp
 {"index":{"_index":"site","_type":"groonga"}}
 {"_key":"http://example.org/","title":"This is test record 1!"}
+{"index":{"_index":"site","_type":"groonga"}}
 {"_key":"http://example.net/","title":"This is test record 2!"}
         OUTPUT
 
@@ -213,11 +255,11 @@ select \\
     end
 
     def setup
-      @load = Groonga::Command::Base.new("load",
+      @load = Groonga::Command::Load.new("load",
                                          :table => "Site",
+                                         :columns =>"_key,title",
                                          :values => <<-VALUES)
 [
-["_key","title"],
 ["http://example.org/","This is test record 1!"]
 ]
       VALUES

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groonga-command
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-20 00:00:00.000000000 Z
+date: 2019-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json