fluent-plugin-droonga 0.8.0 → 0.9.0

data/test/unit/plugin/handler/groonga/test_column_create.rb

@@ -19,8 +19,22 @@ class ColumnCreateTest < GroongaHandlerTest
     process(:column_create,
             {"table" => "Books", "name" => "title", "type" => "ShortText"})
     response = @messenger.values.last
+    assert_valid_output(response)
+    response = response["result"]
     assert_equal(
-      [[Droonga::GroongaHandler::Status::SUCCESS, NORMALIZED_START_TIME, NORMALIZED_ELAPSED_TIME], true],
+      [NORMALIZED_HEADER_SUCCESS, true],
+      [normalize_header(response.first), response.last]
+    )
+  end
+
+  def test_unknown_table
+    process(:column_create,
+            {"table" => "Unknown", "name" => "title", "type" => "ShortText"})
+    response = @messenger.values.last
+    assert_valid_output(response)
+    response = response["result"]
+    assert_equal(
+      [NORMALIZED_HEADER_INVALID_ARGUMENT, false],
       [normalize_header(response.first), response.last]
     )
   end

data/test/unit/plugin/handler/groonga/test_table_create.rb

@@ -17,8 +17,10 @@ class TableCreateTest < GroongaHandlerTest
   def test_success
     process(:table_create, {"name" => "Books"})
     response = @messenger.values.last
+    assert_valid_output(response)
+    response = response["result"]
     assert_equal(
-      [[Droonga::GroongaHandler::Status::SUCCESS, NORMALIZED_START_TIME, NORMALIZED_ELAPSED_TIME], true],
+      [NORMALIZED_HEADER_SUCCESS, true],
       [normalize_header(response.first), response.last]
     )
   end
@@ -26,8 +28,10 @@ class TableCreateTest < GroongaHandlerTest
   def test_failure
     process(:table_create, {})
     response = @messenger.values.last
+    assert_valid_output(response)
+    response = response["result"]
     assert_equal(
-      [[Droonga::GroongaHandler::Status::INVALID_ARGUMENT, NORMALIZED_START_TIME, NORMALIZED_ELAPSED_TIME], false],
+      [NORMALIZED_HEADER_INVALID_ARGUMENT, false],
       [normalize_header(response.first), response.last]
     )
   end

data/test/unit/plugin/handler/groonga/test_table_remove.rb

@@ -0,0 +1,58 @@
+# Copyright (C) 2014 Droonga Project
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License version 2.1 as published by the Free Software Foundation.
+#
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+class TableRemoveTest < GroongaHandlerTest
+  def setup
+    super
+    process(:table_create, {"name" => "Books"})
+  end
+
+  def test_success
+    process(:table_remove, {"name" => "Books"})
+    response = @messenger.values.last
+    assert_valid_output(response)
+    response = response["result"]
+    assert_equal(
+      [NORMALIZED_HEADER_SUCCESS, true],
+      [normalize_header(response.first), response.last]
+    )
+    assert_equal(<<-SCHEMA, dump)
+    SCHEMA
+  end
+
+  def test_failure
+    process(:table_remove, {})
+    response = @messenger.values.last
+    assert_valid_output(response)
+    response = response["result"]
+    assert_equal(
+      [NORMALIZED_HEADER_INVALID_ARGUMENT, false],
+      [normalize_header(response.first), response.last]
+    )
+  end
+
+  def test_remove
+    process(:table_remove, {"name" => "Books"})
+    assert_equal(<<-SCHEMA, dump)
+    SCHEMA
+  end
+
+  def test_unknown_table
+    process(:table_remove, {"name" => "Unknown"})
+    assert_equal(<<-SCHEMA, dump)
+table_create Books TABLE_HASH_KEY --key_type ShortText
+    SCHEMA
+  end
+end

data/test/unit/plugin/handler/test_add.rb

@@ -16,7 +16,9 @@
 require "droonga/plugin/handler/add"
 
 class AddHandlerTest < Test::Unit::TestCase
-  SUCCESS_RESPONSE_BODY = true
+  SUCCESS_RESPONSE_BODY = {
+    "success" => true,
+  }
 
   def setup
     setup_database

data/test/unit/plugin/handler/test_groonga.rb

@@ -55,4 +55,28 @@ class GroongaHandlerTest < Test::Unit::TestCase
     elapsed_time = NORMALIZED_ELAPSED_TIME
     [header[0], start_time, elapsed_time]
   end
+
+  NORMALIZED_HEADER_SUCCESS = [
+    Droonga::GroongaHandler::Status::SUCCESS,
+    NORMALIZED_START_TIME,
+    NORMALIZED_ELAPSED_TIME,
+  ]
+  NORMALIZED_HEADER_INVALID_ARGUMENT = [
+    Droonga::GroongaHandler::Status::INVALID_ARGUMENT,
+    NORMALIZED_START_TIME,
+    NORMALIZED_ELAPSED_TIME,
+  ]
+
+  def assert_valid_output(output)
+    expected = {
+      "result" => [],
+    }
+    normalized_output = Marshal.load(Marshal.dump(output))
+    normalized_output.each do |key, value|
+      if value.is_a?(Array)
+        normalized_output[key] = []
+      end
+    end
+    assert_equal(expected, normalized_output)
+  end
 end

data/test/unit/plugin/handler/test_search.rb

@@ -222,6 +222,300 @@ class SearchHandlerTest < Test::Unit::TestCase
                       })
       end
 
+      def test_attributes_simple
+        assert_search({
+                        "sections-result" => {
+                          "attributes" => [
+                            {
+                              "name" => "key",
+                              "type" => "ShortText",
+                              "vector" => false
+                            },
+                            {
+                              "name" => "title",
+                              "type" => "ShortText",
+                              "vector" => false
+                            }
+                          ]
+                        },
+                      },
+                      {
+                        "queries" => {
+                          "sections-result" => {
+                            "source" => "Sections",
+                            "output" => {
+                              "elements" => [
+                                "attributes"
+                              ],
+                              "attributes" => [
+                                {
+                                  "label" => "key",
+                                  "source" => "_key",
+                                },
+                                "title",
+                              ],
+                            },
+                          },
+                        },
+                      })
+      end
+
+      def test_attributes_complex
+        assert_search({
+                        "sections-result" => {
+                          "attributes" => {
+                            "key" => {
+                              "type" => "ShortText",
+                              "vector" => false
+                            },
+                            "title" => {
+                              "type" => "ShortText",
+                              "vector" => false
+                            }
+                          }
+                        },
+                      },
+                      {
+                        "queries" => {
+                          "sections-result" => {
+                            "source" => "Sections",
+                            "output" => {
+                              "format" => "complex",
+                              "elements" => [
+                                "attributes"
+                              ],
+                              "attributes" => [
+                                {
+                                  "label" => "key",
+                                  "source" => "_key",
+                                },
+                                "title",
+                              ],
+                            },
+                          },
+                        },
+                      })
+      end
+
+      def test_attributes_expression_simple
+        assert_search({
+                        "sections-result" => {
+                          "attributes" => [
+                            {
+                              "name" => "text", # TODO include some information
+                            },
+                          ]
+                        },
+                      },
+                      {
+                        "queries" => {
+                          "sections-result" => {
+                            "source" => "Sections",
+                            "output" => {
+                              "elements" => [
+                                "attributes"
+                              ],
+                              "attributes" => [
+                                {
+                                  "label" => "text",
+                                  "source" => "'hello'",
+                                },
+                              ],
+                            },
+                          },
+                        },
+                      })
+      end
+
+      def test_attributes_expression_complex
+        assert_search({
+                        "sections-result" => {
+                          "attributes" => {
+                            "text" => {} # TODO include some information
+                          },
+                        },
+                      },
+                      {
+                        "queries" => {
+                          "sections-result" => {
+                            "source" => "Sections",
+                            "output" => {
+                              "format" => "complex",
+                              "elements" => [
+                                "attributes"
+                              ],
+                              "attributes" => [
+                                {
+                                  "label" => "text",
+                                  "source" => "'hello'",
+                                },
+                              ],
+                            },
+                          },
+                        },
+                      })
+      end
+
+      def test_attributes_subrecs_simple
+        assert_search({
+                        "sections-result" => {
+                          "attributes" => [
+                            {
+                              "name" => "key",
+                              "type" => "ShortText",
+                              "vector" => false
+                            },
+                            {
+                              "name" => "title",
+                              "type" => "ShortText",
+                              "vector" => false
+                            },
+                            {
+                              "name" => "_nsubrecs",
+                              "type" => "Int32",
+                              "vector" => false
+                            },
+                            {
+                              "name" => "subrecs",
+                              "attributes" => [
+                                {
+                                  "name" => "_key",
+                                  "type" => "ShortText",
+                                  "vector" => false
+                                },
+                                {
+                                  "name" => "sectionTitle",
+                                  "type" => "ShortText",
+                                  "vector" => false
+                                },
+                                {
+                                  "name" => "documentTitle",
+                                  "type" => "ShortText",
+                                  "vector" => false
+                                }
+                              ]
+                            }
+                          ]
+                        },
+                      },
+                      {
+                        "queries" => {
+                          "sections-result" => {
+                            "source" => "Sections",
+                            "groupBy" => {
+                              "key" => "document",
+                              "maxNSubRecords" => 1
+                            },
+                            "output" => {
+                              "elements" => [
+                                "attributes"
+                              ],
+                              "attributes" => [
+                                {
+                                  "label" => "key",
+                                  "source" => "_key",
+                                },
+                                "title",
+                                "_nsubrecs",
+                                {
+                                  "label" => "subrecs",
+                                  "source" => "_subrecs",
+                                  "attributes" => [
+                                    "_key",
+                                    {
+                                      "label" => "sectionTitle",
+                                      "source" => "title"
+                                    },
+                                    {
+                                      "label" => "documentTitle",
+                                      "source" => "document.title"
+                                    }
+                                  ]
+                                }
+                              ],
+                            },
+                          },
+                        },
+                      })
+      end
+
+      def test_attributes_subrecs_complex
+        assert_search({
+                        "sections-result" => {
+                          "attributes" => {
+                            "key" => {
+                              "type" => "ShortText",
+                              "vector" => false
+                            },
+                            "title" => {
+                              "type" => "ShortText",
+                              "vector" => false
+                            },
+                            "_nsubrecs" => {
+                              "type" => "Int32",
+                              "vector" => false
+                            },
+                            "subrecs" => {
+                              "attributes" => {
+                                "_key" => {
+                                  "type" => "ShortText",
+                                  "vector" => false
+                                },
+                                "sectionTitle" => {
+                                  "type" => "ShortText",
+                                  "vector" => false
+                                },
+                                "documentTitle" => {
+                                  "type" => "ShortText",
+                                  "vector" => false
+                                }
+                              }
+                            }
+                          }
+                        },
+                      },
+                      {
+                        "queries" => {
+                          "sections-result" => {
+                            "source" => "Sections",
+                            "groupBy" => {
+                              "key" => "document",
+                              "maxNSubRecords" => 1
+                            },
+                            "output" => {
+                              "format" => "complex",
+                              "elements" => [
+                                "attributes"
+                              ],
+                              "attributes" => [
+                                {
+                                  "label" => "key",
+                                  "source" => "_key",
+                                },
+                                "title",
+                                "_nsubrecs",
+                                {
+                                  "label" => "subrecs",
+                                  "source" => "_subrecs",
+                                  "attributes" => [
+                                    "_key",
+                                    {
+                                      "label" => "sectionTitle",
+                                      "source" => "title"
+                                    },
+                                    {
+                                      "label" => "documentTitle",
+                                      "source" => "document.title"
+                                    }
+                                  ]
+                                }
+                              ],
+                            },
+                          },
+                        },
+                      })
+      end
+
       class AttributesTest < self
         def test_source_only
           expected = {

data/test/unit/plugin/handler/test_watch.rb

@@ -153,7 +153,7 @@ class WatchHandlerTest < Test::Unit::TestCase
                        },
                        {
                          "to"   => "localhost:23003/output",
-                         "type" => "watch.notification",
+                         "type" => "watch.publish",
                        },
                      ],
                    ],

data/test/unit/plugin/{adapter → input_adapter}/groonga/test_select.rb

@@ -1,3 +1,4 @@
+
 # Copyright (C) 2013 Droonga Project
 #
 # This library is free software; you can redistribute it and/or
@@ -13,11 +14,11 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-require "droonga/plugin/adapter/groonga/select"
+require "droonga/plugin/input_adapter/groonga/select"
 
-class AdapterGroongaSelectTest < Test::Unit::TestCase
+class InputAdapterGroongaSelectTest < Test::Unit::TestCase
   def setup
-    @select = Droonga::GroongaAdapter::Select.new
+    @select = Droonga::GroongaInputAdapter::Select.new
   end
 
   class RequestTest < self
@@ -52,7 +53,7 @@ class AdapterGroongaSelectTest < Test::Unit::TestCase
 
     private
     def convert(select_request)
-      @select.convert_request(select_request)
+      @select.convert(select_request)
     end
 
     class OutputColumnsTest < self
@@ -244,37 +245,4 @@ class AdapterGroongaSelectTest < Test::Unit::TestCase
       end
     end
   end
-
-  class ResponseTest < self
-    def test_empty
-      start_time = "2001-08-02T10:45:23.5+09:00"
-      elapsed_time = 0
-      count = 0
-
-      search_response = {
-        "EmptyTable" => {
-          "startTime"   => start_time,
-          "elapsedTime" => elapsed_time,
-          "count"       => count,
-          "attributes"  => [
-            {"name" => "_id", "type" => "UInt32", "vector" => false},
-          ],
-          "records"     => [],
-        },
-      }
-
-      status_code = 0
-      start_time_in_unix_time = Time.parse(start_time).to_f
-      headers = [["_id","UInt32"]]
-      expected_select_response = [[status_code, start_time_in_unix_time, elapsed_time],
-                                  [[[count], headers]]]
-
-      assert_equal(expected_select_response, convert(search_response))
-    end
-
-    private
-    def convert(search_response)
-      @select.convert_response(search_response)
-    end
-  end
 end

data/test/unit/plugin/output_adapter/groonga/test_select.rb

@@ -0,0 +1,55 @@
+# Copyright (C) 2013 Droonga Project
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License version 2.1 as published by the Free Software Foundation.
+#
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+require "droonga/plugin/output_adapter/groonga/select"
+
+class OutputAdapterGroongaSelectTest < Test::Unit::TestCase
+  def setup
+    @select = Droonga::GroongaOutputAdapter::Select.new
+  end
+
+  class ResponseTest < self
+    def test_empty
+      start_time = "2001-08-02T10:45:23.5+09:00"
+      elapsed_time = 0
+      count = 0
+
+      search_response = {
+        "EmptyTable" => {
+          "startTime"   => start_time,
+          "elapsedTime" => elapsed_time,
+          "count"       => count,
+          "attributes"  => [
+            {"name" => "_id", "type" => "UInt32", "vector" => false},
+          ],
+          "records"     => [],
+        },
+      }
+
+      status_code = 0
+      start_time_in_unix_time = Time.parse(start_time).to_f
+      headers = [["_id","UInt32"]]
+      expected_select_response = [[status_code, start_time_in_unix_time, elapsed_time],
+                                  [[[count], headers]]]
+
+      assert_equal(expected_select_response, convert(search_response))
+    end
+
+    private
+    def convert(search_response)
+      @select.convert(search_response)
+    end
+  end
+end