YUKI Hiroshi
null+****@clear*****
Wed Apr 29 13:22:54 JST 2015
YUKI Hiroshi 2015-04-29 13:22:54 +0900 (Wed, 29 Apr 2015) New Revision: 2b86bdfc35948d7df21223a1526ac7976991839b https://github.com/droonga/droonga-client-ruby/commit/2b86bdfc35948d7df21223a1526ac7976991839b Message: Apply default target role via MessageCompleter Modified files: bin/droonga-request bin/droonga-send lib/droonga/client.rb lib/droonga/client/message_completer.rb Modified: bin/droonga-request (+0 -1) =================================================================== --- bin/droonga-request 2015-04-29 13:05:30 +0900 (85b8940) +++ bin/droonga-request 2015-04-29 13:22:54 +0900 (b0f60f2) @@ -129,7 +129,6 @@ client = Droonga::Client.new(options) json_parser = Yajl::Parser.new json_parser.on_parse_complete = lambda do |request_message| request_message["dataset"] ||= options[:default_dataset] - request_message["targetRole"] ||= options[:default_target_role] if options[:report_request] message = "Request: " begin Modified: bin/droonga-send (+1 -1) =================================================================== --- bin/droonga-send 2015-04-29 13:05:30 +0900 (cf29538) +++ bin/droonga-send 2015-04-29 13:22:54 +0900 (b894fdd) @@ -62,6 +62,7 @@ def parse_server(server, options) :port => Integer(port), :protocol => protocol.to_sym, :tag => tag, + :default_target_role => options.default_target_role, :completion => options.completion, :validation => options.validation, } @@ -187,7 +188,6 @@ client_index = 0 json_parser = Yajl::Parser.new json_parser.on_parse_complete = lambda do |request_message| request_message["dataset"] ||= options.default_dataset - request_message["targetRole"] ||= options.default_target_role if options.report_request message = "Request: " begin Modified: lib/droonga/client.rb (+2 -1) =================================================================== --- lib/droonga/client.rb 2015-04-29 13:05:30 +0900 (81e256c) +++ lib/droonga/client.rb 2015-04-29 13:22:54 +0900 (ff933cc) @@ -91,7 +91,8 @@ module Droonga @completion = options[:completion] != false @validation = options[:validation] != false - @completer = MessageCompleter.new(:default_timeout => options[:default_timeout]) + @completer = MessageCompleter.new(:default_timeout => options[:default_timeout], + :default_target_role => options[:default_target_role]) @validator = MessageValidator.new end Modified: lib/droonga/client/message_completer.rb (+4 -0) =================================================================== --- lib/droonga/client/message_completer.rb 2015-04-29 13:05:30 +0900 (6975717) +++ lib/droonga/client/message_completer.rb 2015-04-29 13:22:54 +0900 (ceb5c16) @@ -24,6 +24,7 @@ module Droonga @options = options @fixed_date = @options[:fixed_date] @default_timeout = @options[:default_timeout] + @default_target_role = @options[:default_target_role] end def complete(message) @@ -32,6 +33,9 @@ module Droonga if not have_timeout?(message) and @default_timeout message["timeout"] = @default_timeout end + if not message["targetRole"].nil? and @default_target_role + message["targetRole"] = @default_target_role + end message.merge("id" => id, "date" => date) end -------------- next part -------------- HTML����������������������������...Download