Kouhei Sutou
null+****@clear*****
Thu Jan 30 17:53:03 JST 2014
Kouhei Sutou 2014-01-30 17:53:03 +0900 (Thu, 30 Jan 2014) New Revision: b8f4558427b9e4be5abba12b4ba5fe8d9f83579f https://github.com/droonga/fluent-plugin-droonga/commit/b8f4558427b9e4be5abba12b4ba5fe8d9f83579f Message: catalog: use "output_adapter.plugins" Modified files: lib/droonga/catalog/base.rb lib/droonga/catalog/version1.rb test/unit/catalog/test_version1.rb Modified: lib/droonga/catalog/base.rb (+5 -0) =================================================================== --- lib/droonga/catalog/base.rb 2014-01-30 17:48:06 +0900 (3d3205b) +++ lib/droonga/catalog/base.rb 2014-01-30 17:53:03 +0900 (188da9f) @@ -17,6 +17,7 @@ require "digest/sha1" require "zlib" require "droonga/message_processing_error" require "droonga/input_adapter_options" +require "droonga/output_adapter_options" module Droonga module Catalog @@ -139,6 +140,10 @@ module Droonga InputAdapterOptions.new(@data["input_adapter"]) end + def output_adapter_options + OutputAdapterOptions.new(@data["output_adapter"]) + end + private def compute_total_weight(dataset) dataset["ring"].reduce(0) do |result, zone| Modified: lib/droonga/catalog/version1.rb (+6 -0) =================================================================== --- lib/droonga/catalog/version1.rb 2014-01-30 17:48:06 +0900 (76f5277) +++ lib/droonga/catalog/version1.rb 2014-01-30 17:53:03 +0900 (53df3e8) @@ -21,6 +21,7 @@ module Droonga def initialize(*args) super normalize_input_adapter + normalize_output_adapter end private @@ -28,6 +29,11 @@ module Droonga @data["input_adapter"] ||= {} @data["input_adapter"]["plugins"] ||= @options["plugins"] end + + def normalize_output_adapter + @data["output_adapter"] ||= {} + @data["output_adapter"]["plugins"] ||= @options["plugins"] + end end end end Modified: test/unit/catalog/test_version1.rb (+53 -0) =================================================================== --- test/unit/catalog/test_version1.rb 2014-01-30 17:48:06 +0900 (914de93) +++ test/unit/catalog/test_version1.rb 2014-01-30 17:53:03 +0900 (390029d) @@ -154,4 +154,57 @@ class CatalogTest < Test::Unit::TestCase end end end + + class OutputAdapterOptionsTest < self + def setup + end + + def options(data) + minimum_data = { + "datasets" => [], + } + catalog = create_catalog(minimum_data.merge(data), "base-path") + catalog.output_adapter_options + end + + class PluginsTest < self + def plugins(data) + options(data).plugins + end + + def test_nothing + assert_equal([], plugins({})) + end + + def test_options + data = { + "options" => { + "plugins" => ["groonga"], + } + } + assert_equal(["groonga"], plugins(data)) + end + + def test_output_adapter + data = { + "output_adapter" => { + "plugins" => ["groonga"], + } + } + assert_equal(["groonga"], plugins(data)) + end + + def test_options_and_output_adapter + data = { + "options" => { + "plugins" => ["basic"], + }, + "output_adapter" => { + "plugins" => ["groonga"], + } + } + assert_equal(["groonga"], plugins(data)) + end + end + end end -------------- next part -------------- HTML����������������������������...Download