fluent-plugin-droonga 0.9.0 → 0.9.9

data/test/unit/{plugin/output_adapter/groonga/test_select.rb → plugins/groonga/select/test_adapter_output.rb}

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 Droonga Project
+# Copyright (C) 2013-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
@@ -13,14 +13,16 @@
 # 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"
+require "droonga/plugins/groonga/select"
 
-class OutputAdapterGroongaSelectTest < Test::Unit::TestCase
-  def setup
-    @select = Droonga::GroongaOutputAdapter::Select.new
+class GroongaSelectAdapterOutputTest < Test::Unit::TestCase
+  private
+  def convert(search_response)
+    converter = Droonga::Plugins::Groonga::Select::ResponseConverter.new
+    converter.convert(search_response)
   end
 
-  class ResponseTest < self
+  class RecordsTest < self
     def test_empty
       start_time = "2001-08-02T10:45:23.5+09:00"
       elapsed_time = 0
@@ -41,15 +43,12 @@ class OutputAdapterGroongaSelectTest < Test::Unit::TestCase
       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]]]
+      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

data/test/unit/{plugin/handler → plugins}/groonga/test_column_create.rb

@@ -14,8 +14,15 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 class ColumnCreateTest < GroongaHandlerTest
+  def create_handler
+    Droonga::Plugins::Groonga::ColumnCreate::Handler.new("droonga",
+                                                         @handler.context)
+  end
+
   def test_success
-    process(:table_create, {"name" => "Books"})
+    Groonga::Schema.define(:context => @context) do |schema|
+      schema.create_table("Books", :type => :hash)
+    end
     process(:column_create,
             {"table" => "Books", "name" => "title", "type" => "ShortText"})
     response = @messenger.values.last
@@ -40,7 +47,9 @@ class ColumnCreateTest < GroongaHandlerTest
   end
 
   def test_name
-    process(:table_create, {"name" => "Books"})
+    Groonga::Schema.define(:context => @context) do |schema|
+      schema.create_table("Books", :type => :hash)
+    end
     process(:column_create,
             {"table" => "Books", "name" => "title", "type" => "ShortText"})
     assert_equal(<<-SCHEMA, dump)
@@ -50,7 +59,9 @@ column_create Books title COLUMN_SCALAR ShortText
   end
 
   def test_type
-    process(:table_create, {"name" => "Books"})
+    Groonga::Schema.define(:context => @context) do |schema|
+      schema.create_table("Books", :type => :hash)
+    end
     process(:column_create,
             {"table" => "Books", "name" => "main_text", "type" => "LongText"})
     assert_equal(<<-SCHEMA, dump)
@@ -76,7 +87,9 @@ column_create Books main_text COLUMN_SCALAR LongText
           "type"  => "ShortText",
           "flags" => data[:flags],
         }
-        process(:table_create, {"name" => "Books"})
+        Groonga::Schema.define(:context => @context) do |schema|
+          schema.create_table("Books", :type => :hash)
+        end
         process(:column_create, request)
         assert_equal(<<-EXPECTED, dump)
 table_create Books TABLE_HASH_KEY --key_type ShortText
@@ -88,7 +101,9 @@ column_create Books title #{data[:flags]} ShortText
     class IndexTest < self
       def setup
         super
-        process(:table_create, {"name" => "Books"})
+        Groonga::Schema.define(:context => @context) do |schema|
+          schema.create_table("Books", :type => :hash)
+        end
         process(:column_create,
                 {"table" => "Books", "name" => "title", "type" => "ShortText"})
       end

data/test/unit/{plugin/handler → plugins}/groonga/test_table_create.rb

@@ -14,6 +14,11 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 class TableCreateTest < GroongaHandlerTest
+  def create_handler
+    Droonga::Plugins::Groonga::TableCreate::Handler.new("droonga",
+                                                        @handler.context)
+  end
+
   def test_success
     process(:table_create, {"name" => "Books"})
     response = @messenger.values.last

data/test/unit/{plugin/handler → plugins}/groonga/test_table_remove.rb

@@ -14,9 +14,16 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 class TableRemoveTest < GroongaHandlerTest
+  def create_handler
+    Droonga::Plugins::Groonga::TableRemove::Handler.new("droonga",
+                                                        @handler.context)
+  end
+
   def setup
     super
-    process(:table_create, {"name" => "Books"})
+    Groonga::Schema.define(:context => @context) do |schema|
+      schema.create_table("Books", :type => :hash)
+    end
   end
 
   def test_success

data/test/unit/{plugin/handler → plugins}/test_groonga.rb

@@ -13,7 +13,7 @@
 # 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/handler/groonga"
+require "droonga/plugins/groonga"
 
 class GroongaHandlerTest < Test::Unit::TestCase
   include PluginHelper
@@ -31,7 +31,6 @@ class GroongaHandlerTest < Test::Unit::TestCase
   private
   def setup_plugin
     @handler = Droonga::Test::StubHandler.new
-    @plugin = Droonga::GroongaHandler.new(@handler)
     @messenger = Droonga::Test::StubHandlerMessenger.new
   end
 
@@ -45,7 +44,8 @@ class GroongaHandlerTest < Test::Unit::TestCase
 
   def process(command, request)
     message = Droonga::Test::StubHandlerMessage.new(request)
-    @plugin.send(command, message, @messenger)
+    handler = create_handler
+    handler.handle(message, @messenger)
   end
 
   NORMALIZED_START_TIME = Time.parse("2013-07-11T16:04:28+0900").to_i
@@ -57,12 +57,12 @@ class GroongaHandlerTest < Test::Unit::TestCase
   end
 
   NORMALIZED_HEADER_SUCCESS = [
-    Droonga::GroongaHandler::Status::SUCCESS,
+    Droonga::Plugins::Groonga::Status::SUCCESS,
     NORMALIZED_START_TIME,
     NORMALIZED_ELAPSED_TIME,
   ]
   NORMALIZED_HEADER_INVALID_ARGUMENT = [
-    Droonga::GroongaHandler::Status::INVALID_ARGUMENT,
+    Droonga::Plugins::Groonga::Status::INVALID_ARGUMENT,
     NORMALIZED_START_TIME,
     NORMALIZED_ELAPSED_TIME,
   ]

data/test/unit/{plugin/handler → plugins}/test_search.rb

@@ -13,7 +13,7 @@
 # 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/handler/search"
+require "droonga/plugins/search"
 
 class SearchHandlerTest < Test::Unit::TestCase
   def setup
@@ -29,7 +29,7 @@ class SearchHandlerTest < Test::Unit::TestCase
 
   def setup_plugin
     @handler = Droonga::Test::StubHandler.new
-    @plugin = Droonga::SearchHandler.new(@handler)
+    @plugin = Droonga::Plugins::Search::Handler.new("droonga", @handler.context)
     @messenger = Droonga::Test::StubHandlerMessenger.new
   end
 
@@ -41,7 +41,7 @@ class SearchHandlerTest < Test::Unit::TestCase
   private
   def search(request, headers={})
     message = Droonga::Test::StubHandlerMessage.new(request, headers)
-    @plugin.search(message, @messenger)
+    @plugin.handle(message, @messenger)
     results_to_result_set(@messenger.values.first)
   end
 
@@ -78,13 +78,29 @@ class SearchHandlerTest < Test::Unit::TestCase
 
     class NoParameterTest < self
       def test_empty
-        assert_search({}, {})
+        assert_raise(Droonga::Searcher::NoQuery) do
+          search({})
+        end
+      end
+
+      def test_nil
+        assert_raise(Droonga::Searcher::NoQuery) do
+          search(nil)
+        end
       end
     end
 
     class QueriesTest < self
       def test_empty
-        assert_search({}, {"queries" => {}})
+        assert_raise(Droonga::Searcher::NoQuery) do
+          search({"queries" => {}})
+        end
+      end
+
+      def test_nil
+        assert_raise(Droonga::Searcher::NoQuery) do
+          search({"queries" => nil})
+        end
       end
     end
 

data/test/unit/{plugin/handler → plugins}/test_watch.rb

@@ -15,11 +15,13 @@
 # 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/handler/watch"
+require "droonga/plugins/watch"
 
 class WatchHandlerTest < Test::Unit::TestCase
   include WatchHelper
 
+  SUCCESS_RESULT = { "success" => true }
+
   def setup
     setup_database
     setup_schema
@@ -34,7 +36,6 @@ class WatchHandlerTest < Test::Unit::TestCase
   private
   def setup_plugin
     @handler = Droonga::Test::StubHandler.new
-    @plugin = Droonga::WatchHandler.new(@handler)
     @messenger = Droonga::Test::StubHandlerMessenger.new
   end
 
@@ -44,11 +45,15 @@ class WatchHandlerTest < Test::Unit::TestCase
 
   def process(command, request, headers={})
     message = Droonga::Test::StubHandlerMessage.new(request, headers)
-    @plugin.send(command, message, @messenger)
+    create_plugin.handle(message, @messenger)
   end
 
   public
   class SubscribeTest < self
+    def create_plugin
+      Droonga::Plugins::Watch::SubscribeHandler.new("droonga", @handler.context)
+    end
+
     def test_subscribe
       request = {
         "route" => "localhost:23003/output",
@@ -56,7 +61,7 @@ class WatchHandlerTest < Test::Unit::TestCase
         "subscriber" => "localhost"
       }
       process(:subscribe, request)
-      assert_equal([[true]], @messenger.values)
+      assert_equal([SUCCESS_RESULT], @messenger.values)
 
       assert_equal(
         ["localhost:23003/output"],
@@ -70,7 +75,7 @@ class WatchHandlerTest < Test::Unit::TestCase
         "subscriber" => "localhost"
       }
       process(:subscribe, request, "from" => "localhost:23004/output")
-      assert_equal([[true]], @messenger.values)
+      assert_equal([SUCCESS_RESULT], @messenger.values)
 
       assert_equal(
         ["localhost:23004/output"],
@@ -85,7 +90,7 @@ class WatchHandlerTest < Test::Unit::TestCase
         "route" => "localhost:23003/output"
       }
       process(:subscribe, request, "from" => "localhost:23004/output")
-      assert_equal([[true]], @messenger.values)
+      assert_equal([SUCCESS_RESULT], @messenger.values)
 
       assert_equal(
         ["localhost:23003/output"],
@@ -109,6 +114,11 @@ class WatchHandlerTest < Test::Unit::TestCase
       setup_subscription
     end
 
+    def create_plugin
+      Droonga::Plugins::Watch::UnsubscribeHandler.new("droonga",
+                                                      @handler.context)
+    end
+
     def test_unsubscribe
       request = {
         "route" => "localhost:23003/output",
@@ -116,7 +126,7 @@ class WatchHandlerTest < Test::Unit::TestCase
         "subscriber" => "localhost"
       }
       process(:unsubscribe, request)
-      assert_equal([[true]], @messenger.values)
+      assert_equal([SUCCESS_RESULT], @messenger.values)
     end
 
     private
@@ -127,7 +137,7 @@ class WatchHandlerTest < Test::Unit::TestCase
         "subscriber" => "localhost"
       }
       process(:subscribe, request)
-      assert_equal([[true]], @messenger.values)
+      assert_equal([SUCCESS_RESULT], @messenger.values)
       @messenger.values.clear
     end
   end
@@ -138,6 +148,11 @@ class WatchHandlerTest < Test::Unit::TestCase
       setup_subscription
     end
 
+    def create_plugin
+      Droonga::Plugins::Watch::FeedHandler.new("droonga",
+                                               @handler.context)
+    end
+
     def test_feed_match
       request = {
         "targets" => {
@@ -177,8 +192,12 @@ class WatchHandlerTest < Test::Unit::TestCase
         "condition" => "たいやき",
         "subscriber" => "localhost"
       }
-      process(:subscribe, request)
-      assert_equal([[true]], @messenger.values)
+      message = Droonga::Test::StubHandlerMessage.new(request, {})
+      subscribe_handler =
+        Droonga::Plugins::Watch::SubscribeHandler.new("droonga",
+                                                      @handler.context)
+      subscribe_handler.handle(message, @messenger)
+      assert_equal([SUCCESS_RESULT], @messenger.values)
     end
   end
 end

data/{lib/droonga/command_mapper.rb → test/unit/test_command_repository.rb}

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright (C) 2013 Droonga Project
 #
 # This library is free software; you can redistribute it and/or
@@ -15,31 +13,27 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-module Droonga
-  class CommandMapper
-    def initialize
-      @commands = {}
-    end
+require "droonga/command_repository"
+
+class CommandRepositoryTest < Test::Unit::TestCase
+  def setup
+    @repository = Droonga::CommandRepository.new
+  end
 
-    def register(name_or_map)
-      if name_or_map.is_a?(Hash)
-        command_map = name_or_map
-        command_map.each do |command_name, method_name|
-          @commands[command_name.to_s] = method_name
-        end
-      else
-        name = name_or_map
-        method_name = name
-        @commands[name.to_s] = method_name
-      end
+  class FindTest < self
+    def setup
+      super
+      @command = Droonga::Command.new(:select,
+                                      :pattern => ["type", :equal, "select"])
+      @repository.register(@command)
     end
 
-    def [](command)
-      @commands[command.to_s]
+    def test_match
+      assert_equal(@command, @repository.find({ "type" => "select" }))
     end
 
-    def commands
-      @commands.keys
+    def test_not_match
+      assert_nil(@repository.find({ "type" => "search" }))
     end
   end
 end

data/test/unit/{test_plugin.rb → test_legacy_plugin.rb}

@@ -13,11 +13,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"
+require "droonga/legacy_plugin"
 
-class PluginTest < Test::Unit::TestCase
+class LegacyPluginTest < Test::Unit::TestCase
   class PluggableTest < self
-    class DummyTypePlugin < Droonga::Plugin
+    class DummyTypePlugin < Droonga::LegacyPlugin
       extend Droonga::PluginRegisterable
     end
 

data/test/unit/{test_plugin_repository.rb → test_legacy_plugin_repository.rb}

@@ -13,11 +13,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_repository"
+require "droonga/legacy_plugin_repository"
 
-class PluginRepositoryTest < Test::Unit::TestCase
+class LegacyPluginRepositoryTest < Test::Unit::TestCase
   def setup
-    @repository = Droonga::PluginRepository.new
+    @repository = Droonga::LegacyPluginRepository.new
   end
 
   class StubPlugin

data/test/unit/test_message_matcher.rb

@@ -0,0 +1,137 @@
+# 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
+
+require "droonga/message_matcher"
+
+class MessageMatcherTest < Test::Unit::TestCase
+  def matcher(pattern)
+    Droonga::MessageMatcher.new(pattern)
+  end
+
+  class ResolvePathTest < self
+    def resolve_path(path, message)
+      matcher(nil).send(:resolve_path, path, message)
+    end
+
+    def test_nonexistent
+      assert_equal(Droonga::MessageMatcher::NONEXISTENT_PATH,
+                   resolve_path("nonexistent.path", {}))
+    end
+
+    def test_top_level
+      assert_equal("select",
+                   resolve_path("type",
+                                {
+                                  "type" => "select"
+                                }))
+    end
+
+    def test_nested
+      assert_equal(10,
+                   resolve_path("body.output.limit",
+                                {
+                                  "body" => {
+                                    "output" => {
+                                      "limit" => 10,
+                                    },
+                                  },
+                                }))
+    end
+  end
+
+  class MatchTest < self
+    def match?(pattern, message)
+      matcher(pattern).match?(message)
+    end
+
+    class EqualTest < self
+      def test_same_value
+        assert_true(match?(["type", :equal, "select"],
+                           {
+                             "type" => "select"
+                           }))
+      end
+
+      def test_different_value
+        assert_false(match?(["type", :equal, "select"],
+                            {
+                              "type" => "search",
+                            }))
+      end
+    end
+
+    class InTest < self
+      def test_exist
+        assert_true(match?(["type", :in, ["table_create", "table_remove"]],
+                           {
+                             "type" => "table_remove"
+                           }))
+      end
+
+      def test_not_exist
+        assert_false(match?(["type", :in, ["table_create", "table_remove"]],
+                            {
+                              "type" => "column_create",
+                            }))
+      end
+    end
+
+    class IncludeTest < self
+      def test_exist
+        assert_true(match?(["originalTypes", :include?, "select"],
+                           {
+                             "originalTypes" => ["search", "select"],
+                           }))
+      end
+
+      def test_not_exist
+        assert_false(match?(["originalTypes", :include?, "select"],
+                            {
+                              "originalTypes" => ["load"],
+                            }))
+      end
+
+      def test_no_key
+        assert_false(match?(["originalTypes", :include?, "select"],
+                            {}))
+      end
+
+      def test_not_enumerable
+        assert_false(match?(["originalTypes", :include?, "select"],
+                            {
+                              "originalTypes" => 29,
+                            }))
+      end
+    end
+
+    class ExistTest < self
+      def test_exist
+        assert_true(match?(["body.result", :exist?],
+                           {
+                             "body" => {
+                               "result" => nil,
+                             },
+                           }))
+      end
+
+      def test_not_exist
+        assert_false(match?(["body.result", :exist?],
+                            {
+                              "body" => nil,
+                            }))
+      end
+    end
+  end
+end