Kouhei Sutou
null+****@clear*****
Mon Feb 17 17:51:33 JST 2014
Kouhei Sutou 2014-02-17 17:51:33 +0900 (Mon, 17 Feb 2014) New Revision: d8e362f035eee8ece037865f9531c199445522e8 https://github.com/droonga/fluent-plugin-droonga/commit/d8e362f035eee8ece037865f9531c199445522e8 Message: adapter: split message configuration for input and output Before: message.input_pattern = [] message.output_pattern = [] After: input_message.pattern = [] output_message.pattern = [] This is backward incompatible change but it is OK. Because we don't release 1.0.0 yet. Copied files: lib/droonga/plugin/metadata/adapter_input_message.rb (from lib/droonga/plugin/metadata/adapter_message.rb) Modified files: lib/droonga/adapter.rb lib/droonga/adapter_runner.rb lib/droonga/plugins/crud.rb lib/droonga/plugins/error.rb lib/droonga/plugins/groonga/generic_response.rb lib/droonga/plugins/groonga/select.rb Renamed files: lib/droonga/plugin/metadata/adapter_output_message.rb (from lib/droonga/plugin/metadata/adapter_message.rb) Modified: lib/droonga/adapter.rb (+8 -3) =================================================================== --- lib/droonga/adapter.rb 2014-02-17 17:44:03 +0900 (e3f2d36) +++ lib/droonga/adapter.rb 2014-02-17 17:51:33 +0900 (a3205b2) @@ -14,15 +14,20 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA require "droonga/pluggable" -require "droonga/plugin/metadata/adapter_message" +require "droonga/plugin/metadata/adapter_input_message" +require "droonga/plugin/metadata/adapter_output_message" module Droonga class Adapter extend Pluggable class << self - def message - Plugin::Metadata::AdapterMessage.new(self) + def input_message + Plugin::Metadata::AdapterInputMessage.new(self) + end + + def output_message + Plugin::Metadata::AdapterOutputMessage.new(self) end def id Modified: lib/droonga/adapter_runner.rb (+2 -2) =================================================================== --- lib/droonga/adapter_runner.rb 2014-02-17 17:44:03 +0900 (8471410) +++ lib/droonga/adapter_runner.rb 2014-02-17 17:51:33 +0900 (7f202e5) @@ -40,7 +40,7 @@ module Droonga adapted_message["appliedAdapters"] = [] @adapter_classes.each do |adapter_class| adapter_class_id = adapter_class.id - pattern = adapter_class.message.input_pattern + pattern = adapter_class.input_message.pattern if pattern matcher = MessageMatcher.new(pattern) $log.trace("#{log_tag}: adapt_input: skip: #{adapter_class_id}", @@ -74,7 +74,7 @@ module Droonga :applied_adapters => applied_adapters) next unless applied_adapters.include?(adapter_class.id) end - pattern = adapter_class.message.output_pattern + pattern = adapter_class.output_message.pattern if pattern matcher = MessageMatcher.new(pattern) $log.trace("#{log_tag}: adapt_output: skip: #{adapter_class_id}", Copied: lib/droonga/plugin/metadata/adapter_input_message.rb (+6 -14) 69% =================================================================== --- lib/droonga/plugin/metadata/adapter_message.rb 2014-02-17 17:44:03 +0900 (9c8d68c) +++ lib/droonga/plugin/metadata/adapter_input_message.rb 2014-02-17 17:51:33 +0900 (cd96e18) @@ -16,30 +16,22 @@ module Droonga module Plugin module Metadata - class AdapterMessage + class AdapterInputMessage def initialize(adapter_class) @adapter_class = adapter_class end - def input_pattern - configuration[:input_pattern] + def pattern + configuration[:pattern] end - def input_pattern=(pattern) - configuration[:input_pattern] = pattern - end - - def output_pattern - configuration[:output_pattern] - end - - def output_pattern=(pattern) - configuration[:output_pattern] = pattern + def pattern=(pattern) + configuration[:pattern] = pattern end private def configuration - @adapter_class.options[:message] ||= {} + @adapter_class.options[:input_message] ||= {} end end end Renamed: lib/droonga/plugin/metadata/adapter_output_message.rb (+6 -14) 69% =================================================================== --- lib/droonga/plugin/metadata/adapter_message.rb 2014-02-17 17:44:03 +0900 (9c8d68c) +++ lib/droonga/plugin/metadata/adapter_output_message.rb 2014-02-17 17:51:33 +0900 (3bb3602) @@ -16,30 +16,22 @@ module Droonga module Plugin module Metadata - class AdapterMessage + class AdapterOutputMessage def initialize(adapter_class) @adapter_class = adapter_class end - def input_pattern - configuration[:input_pattern] + def pattern + configuration[:pattern] end - def input_pattern=(pattern) - configuration[:input_pattern] = pattern - end - - def output_pattern - configuration[:output_pattern] - end - - def output_pattern=(pattern) - configuration[:output_pattern] = pattern + def pattern=(pattern) + configuration[:pattern] = pattern end private def configuration - @adapter_class.options[:message] ||= {} + @adapter_class.options[:output_message] ||= {} end end end Modified: lib/droonga/plugins/crud.rb (+2 -2) =================================================================== --- lib/droonga/plugins/crud.rb 2014-02-17 17:44:03 +0900 (7ad6703) +++ lib/droonga/plugins/crud.rb 2014-02-17 17:51:33 +0900 (f497d92) @@ -24,8 +24,8 @@ module Droonga Plugin.registry.register("crud", self) class Adapter < Droonga::Adapter - message.input_pattern = ["type", :equal, "add"] - message.output_pattern = ["body.success", :exist] + input_message.pattern = ["type", :equal, "add"] + output_message.pattern = ["body.success", :exist] def adapt_output(output_message) success = output_message.body["success"] Modified: lib/droonga/plugins/error.rb (+1 -1) =================================================================== --- lib/droonga/plugins/error.rb 2014-02-17 17:44:03 +0900 (288e612) +++ lib/droonga/plugins/error.rb 2014-02-17 17:51:33 +0900 (03df29a) @@ -21,7 +21,7 @@ module Droonga Plugin.registry.register("error", self) class Adapter < Droonga::Adapter - message.output_pattern = ["body.errors", :exist] + output_message.pattern = ["body.errors", :exist] def adapt_output(output_message) errors = output_message.body["errors"] Modified: lib/droonga/plugins/groonga/generic_response.rb (+2 -2) =================================================================== --- lib/droonga/plugins/groonga/generic_response.rb 2014-02-17 17:44:03 +0900 (4666ed8) +++ lib/droonga/plugins/groonga/generic_response.rb 2014-02-17 17:51:33 +0900 (7341a6e) @@ -25,8 +25,8 @@ module Droonga "table_remove", "column_create", ] - message.input_pattern = ["type", :in, groonga_commands] - message.output_pattern = ["body.result", :exist] + input_message.pattern = ["type", :in, groonga_commands] + output_message.pattern = ["body.result", :exist] def adapt_output(output_message) output_message.body = output_message.body["result"] Modified: lib/droonga/plugins/groonga/select.rb (+1 -1) =================================================================== --- lib/droonga/plugins/groonga/select.rb 2014-02-17 17:44:03 +0900 (144780a) +++ lib/droonga/plugins/groonga/select.rb 2014-02-17 17:51:33 +0900 (cc9d0f3) @@ -101,7 +101,7 @@ module Droonga end class Adapter < Droonga::Adapter - message.input_pattern = ["type", :equal, "select"] + input_message.pattern = ["type", :equal, "select"] def adapt_input(input_message) converter = RequestConverter.new -------------- next part -------------- HTML����������������������������...Download