Apply default dataset by client itself

droonga · May 7, 2015 · 375d073 · 375d073
1 parent 8331282
commit 375d073
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/bin/droonga-request b/bin/droonga-request
@@ -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

diff --git a/bin/droonga-send b/bin/droonga-send
@@ -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

diff --git a/lib/droonga/client.rb b/lib/droonga/client.rb
@@ -91,7 +91,8 @@ def initialize(options={})
       @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

diff --git a/lib/droonga/client/message_completer.rb b/lib/droonga/client/message_completer.rb
@@ -23,20 +23,24 @@ class MessageCompleter
       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
 
       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