groonga-command 1.3.9 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: df5f0941b5d73fcc9d7375e5fe8962025092023641ca609002589ce0f1933fc9
-  data.tar.gz: 1fc0f07a6703553d9552f43880bccfd3c7003235f185dfca08f1a5bf221fd4ab
+SHA1:
+  metadata.gz: 94a17f5c7b56db7a29320cb7af65395183b7a43c
+  data.tar.gz: 5a199858fd2c1a291bc6fdc4f0e5d76518f19011
 SHA512:
-  metadata.gz: 672af58bbf47ae2e9e97a2eec2340fc2892b46f07a436c957a031e328c5de8ea28a8d018d0120fc79ef21d19e92bec327dbf5934984a31431c11f31fb6c7ba5c
-  data.tar.gz: 80b33c5adf0266ab0383d960d0e5c849ea01f9c023b52177728193d2fc4df2fca3b16ed4a2e99daa9b66e477c56f1b4af99fb5928ff6106f95038ebe123e24ba
+  metadata.gz: '0107882a318b6518b8825d68c9c38958b9a98ef3f0e110de7985c848425046e3202ae13a32670353bb99c34a3ac685b697248dabe25ce2747fe3daff0a907bc7'
+  data.tar.gz: 2f83719bcb481a8a745deca1f3c5337f1f4e6c341f34299f3d03c740e7f9e9a458c07cfe7928cc2c5c30444830ab90ba25549011c09e919915ca082496a2e013

data/doc/text/news.md

@@ -1,5 +1,13 @@
 # News
 
+## 1.4.0: 2019-03-20
+
+### Improvements
+
+  * {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,5 @@
 # Copyright (C) 2012-2017  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
@@ -16,6 +17,7 @@
 
 require "groonga/command/format/uri"
 require "groonga/command/format/command"
+require "groonga/command/format/elasticsearch"
 
 module Groonga
   module Command
@@ -153,6 +155,11 @@ module Groonga
         format.command_line(options)
       end
 
+      def to_elasticsearch_format(options={})
+        format = Format::Elasticsearch.new(@command_name, normalized_arguments)
+        format.json(options)
+      end
+
       def to_s
         if uri_format?
           to_uri_format

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

@@ -0,0 +1,90 @@
+# 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
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+module Groonga
+  module Command
+    module Format
+      class Elasticsearch
+        def initialize(name, arguments)
+          @name = name
+          @arguments = arguments
+        end
+
+        def json(options={})
+          return nil unless @name == "load"
+
+          components = []
+          elasticsearch_version = options[:version] || 5
+
+          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)
+
+              if record[0].is_a?(::Array)
+                column_names = nil
+
+                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
+              else
+                record.each do |load_value|
+                  components << JSON.generate(load_value)
+                end
+              end
+            end
+          end
+          components.join("\n")
+        end
+      end
+    end
+  end
+end

data/lib/groonga/command/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2018  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2019  Kouhei Sutou <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
@@ -16,6 +16,6 @@
 
 module Groonga
   module Command
-    VERSION = "1.3.9"
+    VERSION = "1.4.0"
   end
 end

data/test/command/test-base.rb

@@ -122,6 +122,138 @@ select \\
     end
   end
 
+  class CovnertToElasticsearchFormatTest < self
+    sub_test_case("non target command") do
+      def test_select_command
+        select = Groonga::Command::Base.new("select",
+                                            :table => "Users",
+                                            :filter => "age<=30",
+                                            :output_type => "json")
+        assert_equal(nil,
+                     select.to_elasticsearch_format)
+      end
+    end
+
+    sub_test_case("single record") do
+      def test_brackets_format
+        load = Groonga::Command::Base.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 test_curly_brackets_format
+        load = Groonga::Command::Base.new("load",
+                                          :table => "Site",
+                                          :values => <<-VALUES)
+  [
+  {"_key": "http://example.org/", "title": "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
+    end
+
+    sub_test_case("multiple records") do
+      def test_brackets_format
+        load = Groonga::Command::Base.new("load",
+                                          :table => "Site",
+                                          :values => <<-VALUES)
+  [
+  ["_key","title"],
+  ["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
+
+      def test_curly_brackets_format
+        load = Groonga::Command::Base.new("load",
+                                          :table => "Site",
+                                          :values => <<-VALUES)
+  [
+  {"_key": "http://example.org/", "title": "This is test record 1!"},
+  {"_key": "http://example.net/", "title": "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
+
+    def setup
+      @load = Groonga::Command::Base.new("load",
+                                         :table => "Site",
+                                         :values => <<-VALUES)
+[
+["_key","title"],
+["http://example.org/","This is test record 1!"]
+]
+      VALUES
+    end
+
+    sub_test_case(":version") do
+      def test_5
+        assert_equal(<<-REQUESTS.chomp, @load.to_elasticsearch_format(:version => 5))
+{"index":{"_index":"site","_type":"groonga"}}
+{"_key":"http://example.org/","title":"This is test record 1!"}
+        REQUESTS
+      end
+
+      def test_6
+        assert_equal(<<-REQUESTS.chomp, @load.to_elasticsearch_format(:version => 6))
+{"index":{"_index":"site","_type":"groonga"}}
+{"_key":"http://example.org/","title":"This is test record 1!"}
+        REQUESTS
+      end
+
+      def test_7
+        assert_equal(<<-REQUESTS.chomp, @load.to_elasticsearch_format(:version => 7))
+{"index":{"_index":"site","_type":"_doc"}}
+{"_key":"http://example.org/","title":"This is test record 1!"}
+        REQUESTS
+      end
+
+      def test_8
+        assert_equal(<<-REQUESTS.chomp, @load.to_elasticsearch_format(:version => 8))
+{"index":{"_index":"site"}}
+{"_key":"http://example.org/","title":"This is test record 1!"}
+        REQUESTS
+      end
+    end
+  end
+
   sub_test_case("#to_s") do
     def setup
       @table = "Users"

metadata

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