YUKI Hiroshi
null+****@clear*****
Thu May 7 11:25:56 JST 2015
YUKI Hiroshi 2015-05-07 11:25:56 +0900 (Thu, 07 May 2015) New Revision: 375d073c14ba0c8255702ad54d57e9453164df27 https://github.com/droonga/droonga-client-ruby/commit/375d073c14ba0c8255702ad54d57e9453164df27 Message: Apply default dataset by client itself 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-05-01 18:18:17 +0900 (b0f60f2) +++ bin/droonga-request 2015-05-07 11:25:56 +0900 (0246e32) @@ -128,7 +128,6 @@ request_json_files = parser.parse!(ARGV) 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] if options[:report_request] message = "Request: " begin Modified: bin/droonga-send (+1 -1) =================================================================== --- bin/droonga-send 2015-05-01 18:18:17 +0900 (b894fdd) +++ bin/droonga-send 2015-05-07 11:25:56 +0900 (44212a6) @@ -62,6 +62,7 @@ def parse_server(server, options) :port => Integer(port), :protocol => protocol.to_sym, :tag => tag, + :default_dataset => options.default_dataset, :default_target_role => options.default_target_role, :completion => options.completion, :validation => options.validation, @@ -187,7 +188,6 @@ end client_index = 0 json_parser = Yajl::Parser.new json_parser.on_parse_complete = lambda do |request_message| - request_message["dataset"] ||= options.default_dataset if options.report_request message = "Request: " begin Modified: lib/droonga/client.rb (+2 -1) =================================================================== --- lib/droonga/client.rb 2015-05-01 18:18:17 +0900 (ff933cc) +++ lib/droonga/client.rb 2015-05-07 11:25:56 +0900 (97dab6e) @@ -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_dataset => options[:default_dataset], + :default_timeout => options[:default_timeout], :default_target_role => options[:default_target_role]) @validator = MessageValidator.new end Modified: lib/droonga/client/message_completer.rb (+5 -1) =================================================================== --- lib/droonga/client/message_completer.rb 2015-05-01 18:18:17 +0900 (ceb5c16) +++ lib/droonga/client/message_completer.rb 2015-05-07 11:25:56 +0900 (4222f14) @@ -23,6 +23,7 @@ module Droonga def initialize(options={}) @options = options @fixed_date = @options[:fixed_date] + @default_dataset = @options[:default_dataset] @default_timeout = @options[:default_timeout] @default_target_role = @options[:default_target_role] end @@ -30,13 +31,16 @@ module Droonga def complete(message) id = message["id"] || generate_id date = message["date"] || @fixed_date || new_date + dataset = message["dataset"] || @default_dataset 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) + message.merge("id" => id, + "date" => date, + "dataset" => dataset) end private -------------- next part -------------- HTML����������������������������...下载
