droonga-client 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee9432ca6044b36092942ac41aa627930b7b9d9a
-  data.tar.gz: a6f8e194ccad61f14f5f270e57994a69fdfc5fe5
+  metadata.gz: c506f2bd7e3f43ef73c8ed5463a678fb6a281cda
+  data.tar.gz: b6f6a5fec2421d4b625060d9b4d2f61b1d229cdc
 SHA512:
-  metadata.gz: 11b805404b3bffee885633090fdde5cee4966e4cf27d0ec781770d1e6c50a488715500c6cc2c0a6cab657eef3d86563b8bbf7ea0eece59abbc650567b645c90e
-  data.tar.gz: 2966e8a79f03671b924d2d1214ec5ea1f990e3ccf9fa7138a78b768036c78e1f799258c19234ca3eb587211971a39272553ca83cd9a64a81b5ddf24720e14bf6
+  metadata.gz: 8c644cdee887e5733d8349eda8ea6aa5f316d73357ea311e0af419a439d13d998260d7443ae7f8062b1aba1e021c6a64f2d7360f4acc0225c5b630cd9c67ea53
+  data.tar.gz: 3cc489e4cb5de93c5705df1a3c961fd6d320f4e97b20fd0529fd4ce63509374e02af892c48dad4bf7c9d52f0cc98310744f31ee2b538a066ecb7194dae6cc91d

data/bin/droonga-add

@@ -0,0 +1,98 @@
+#!/usr/bin/env ruby
+#
+# Copyright (C) 2015 Droonga Project
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License version 2.1 as published by the Free Software Foundation.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+require "json"
+
+require "droonga/command/base"
+
+module Droonga
+  module Command
+    class Add < Base
+      def run
+        parse_options do |option|
+          option.banner("Usage: droonga-add [options]\n" +
+                        "   ex: droonga-add --table User --name Adam --age 10\n" +
+                        "       droonga-add --table Server --value:host example.com\n" +
+                        "       (You can specify column value expressly with the prefix \"value:\".)")
+
+          option.on("table=",
+                    "Name of the target table.",
+                    :required => true)
+          option.on("key=",
+                    "A unique key for the added record.",
+                    :default => nil)
+        end
+
+        add_params = {
+          "table"  => @options[:table],
+          "key"    => @options[:key],
+          "values" => build_values(ARGV),
+        }
+        add_message = {
+          "dataset" => @options[:dataset],
+          "type" => "add",
+          "body" => add_params,
+        }
+
+        puts "Adding new record..."
+        puts(JSON.pretty_generate(add_params))
+
+        response = request(add_message)
+        raise NoResponse.new unless response
+
+        if response["body"]
+          puts "Done."
+          true
+        else
+          false
+        end
+      rescue MissingRequiredParameter
+        puts(@options)
+        false
+      rescue NoResponse
+        puts("Error: request timed out.")
+        false
+      end
+
+      private
+      def build_values(argv)
+        values = {}
+        column_name = nil
+        argv.each do |arg|
+          case arg
+          when /\A--value:([^\s=]+)=(.+)\z/
+            values[$1] = $2
+          when /\A--value:([^\s=]+)\z/
+            column_name = $1
+          when /\A--([^\s=]+)=(.+)\z/
+            values[$1] = $2
+          when /\A--([^\s=]+)\z/
+            column_name = $1
+          else
+            if column_name
+              values[column_name] = arg
+              column_name = nil
+            end
+          end
+        end
+        values
+      end
+    end
+  end
+end
+
+exit(Droonga::Command::Add.new.run)

data/bin/droonga-groonga

@@ -0,0 +1,98 @@
+#!/usr/bin/env ruby
+#
+# Copyright (C) 2015 Droonga Project
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License version 2.1 as published by the Free Software Foundation.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+require "json"
+
+require "droonga/command/base"
+
+module Droonga
+  module Command
+    class Groonga < Base
+      class InvalidCommandName < StandardError
+      end
+
+      class MissingCommandName < StandardError
+      end
+
+      def run
+        parse_options do |option|
+          option.banner("Usage: droonga-groonga [groonga-command-name] [options]\n" +
+                        "   ex: droonga-groonga select --table=Users")
+
+          option.separator("Formatting:")
+          option.on(:pretty,
+                    "Output result as a pretty print JSON.",
+                    :default => false)
+        end
+
+        @command = ARGV.shift
+        assert_valid_command
+
+        groonga_message = {
+          "dataset" => @options[:dataset],
+          "type" => @command,
+          "body" => build_params(ARGV),
+        }
+
+        response = request(groonga_message)
+        raise NoResponse.new unless response
+        body = response["body"]
+
+        if @options[:pretty]
+          puts(JSON.pretty_generate(body))
+        else
+          puts(JSON.generate(body))
+        end
+
+        true
+      rescue MissingRequiredParameter, InvalidCommandName, MissingCommandName
+        puts(@options)
+        false
+      rescue NoResponse
+        puts("Error: request timed out.")
+        false
+      end
+
+      private
+      def assert_valid_command
+        raise InvalidCommandName.new(@command) if /\A--.+\z/ =~ @command
+        raise MissingCommandName.new if @command.nil?
+      end
+
+      def build_params(argv)
+        params = {}
+        option_name = nil
+        argv.each do |arg|
+          case arg
+          when /\A--([^\s=]+)=(.+)\z/
+            params[$1] = $2
+          when /\A--([^\s=]+)\z/
+            option_name = $1
+          else
+            if option_name
+              params[option_name] = arg
+              option_name = nil
+            end
+          end
+        end
+        params
+      end
+    end
+  end
+end
+
+exit(Droonga::Command::Groonga.new.run)

data/bin/droonga-request

@@ -22,16 +22,20 @@ require "json"
 require "droonga/client"
 
 options = {
-  :host                => "localhost",
-  :port                => 10031,
-  :tag                 => "droonga",
+  :host                => Droonga::Client::DEFAULT_HOST,
+  :port                => Droonga::Client::DEFAULT_PORT,
+  :tag                 => Droonga::Client::DEFAULT_TAG,
+  :default_dataset     => Droonga::Client::DEFAULT_DATASET,
   :protocol            => :droonga,
+  :default_target_role => Droonga::Client::DEFAULT_TARGET_ROLE,
   :timeout             => 1,
   :exit_on_response    => true,
-  :receiver_host       => "localhost",
+  :receiver_host       => Droonga::Client::DEFAULT_HOST,
   :receiver_port       => 0,
   :report_request      => false,
   :report_elapsed_time => true,
+  :completion          => true,
+  :validation          => true,
 }
 
 parser = OptionParser.new
@@ -97,11 +101,34 @@ parser.on("--[no-]report-elapsed-time",
           "(#{options[:report_elapsed_time]})") do |report_elapsed_time|
   options[:report_elapsed_time] = report_elapsed_time
 end
+parser.separator("")
+parser.separator("Messages:")
+parser.on("--detault-dataset=NAME",
+          "Default dataset name for sending messages.",
+          "(#{options[:default_dataset]})") do |name|
+  options[:default_dataset] = name
+end
+parser.on("--detault-target-role=ROLE",
+          "Default target role of engine nodes for sending messages.",
+          "(#{options[:default_target_role]})") do |role|
+  options[:default_target_role] = role
+end
+parser.on("--[no-]completion",
+          "Do completion of required fields for input message or not.",
+          "(#{options[:completion]})") do |completion|
+  options[:completion] = completion
+end
+parser.on("--[no-]validation",
+          "Do validation for input message or not.",
+          "(#{options[:validation]})") do |validation|
+  options[:validation] = validation
+end
 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

data/bin/droonga-send

@@ -26,11 +26,16 @@ options = OpenStruct.new
 options.report_request = false
 options.report_throughput = false
 options.default_protocol = "droonga"
-options.default_port     = 10031
-options.default_tag      = "droonga"
+options.default_host     = Droonga::Client::DEFAULT_HOST
+options.default_port     = Droonga::Client::DEFAULT_PORT
+options.default_tag      = Droonga::Client::DEFAULT_TAG
+options.default_dataset  = Droonga::Client::DEFAULT_DATASET
+options.default_target_role = Droonga::Client::DEFAULT_TARGET_ROLE
+options.completion       = true
+options.validation       = true
 
 servers = []
-default_server = "droonga:localhost:10031/droonga"
+default_server = "#{options.default_protocol}:#{options.default_host}:#{options.default_port}/#{options.default_tag}"
 messages_per_second = Droonga::Client::RateLimiter::DEFAULT_LIMIT
 
 def parse_server(server, options)
@@ -57,6 +62,9 @@ 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,
   }
 end
 
@@ -138,6 +146,28 @@ parser.on("--report-throughput",
           "(no)") do
   options.report_throughput = true
 end
+parser.separator("")
+parser.separator("Messages:")
+parser.on("--default-dataset=NAME",
+          "Default dataset name for sending messages.",
+          "(#{options.default_dataset})") do |name|
+  options.default_dataset = name
+end
+parser.on("--default-target-role=ROLE",
+          "Default target role of engine nodes for sending messages.",
+          "(#{options.default_target_role})") do |role|
+  options.default_target_role = role
+end
+parser.on("--[no-]completion",
+          "Do completion of required fields for input message or not.",
+          "(#{options.completion})") do |completion|
+  options.completion = completion
+end
+parser.on("--[no-]validation",
+          "Do validation for input message or not.",
+          "(#{options.validation})") do |validation|
+  options.validation = validation
+end
 request_json_files = parser.parse!(ARGV)
 
 servers << default_server if servers.empty?
@@ -157,6 +187,7 @@ 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

data/bin/droonga-system-status

@@ -0,0 +1,55 @@
+#!/usr/bin/env ruby
+#
+# Copyright (C) 2015 Droonga Project
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License version 2.1 as published by the Free Software Foundation.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+require "json"
+
+require "droonga/command/base"
+
+module Droonga
+  module Command
+    class SystemStatus < Base
+      def run
+        parse_options do |option|
+          option.on(:pretty,
+                    "Output result as a pretty print JSON.",
+                    :default => false)
+        end
+
+        response = request("dataset" => @options[:dataset],
+                           "type"    => "system.status")
+        raise NoResponse.new unless response
+        body = response["body"]
+
+        if @options[:pretty]
+          puts(JSON.pretty_generate(body))
+        else
+          puts(JSON.generate(body))
+        end
+
+        true
+      rescue MissingRequiredParameter
+        puts(@options)
+        false
+      rescue NoResponse
+        puts("Error: request timed out.")
+        false
+      end
+    end
+  end
+end
+
+exit(Droonga::Command::SystemStatus.new.run)

data/doc/text/news.md

@@ -1,5 +1,28 @@
 # News
 
+## 0.2.1: 2005-04-29
+
+ * Required fields of input messages are automatically completed by default.
+ * Input messages are automatically validated by default.
+ * Timeout option for subscription is available.
+   You can unsubscribe subscription automatically with specified timeout, like:
+   `client.subscribe(request, :subscription_timeout => 10)`
+ * New utility commands are available as shorthand.
+   * `droonga-system-status`: allows you to send a `system.status` request to the cluster easily.
+   * `droonga-add`: allows you to send an `add` request to the cluster easily.
+   * `droonga-groonga`: works like the `groonga` command.
+ * droonga-send, droonga-request:
+   * A new option `--[no-]completion` is introduced.
+     You should specify `--no-completion` to send incomplete messages intentionally.
+   * A new option `--[no-]validation` is introduced.
+     You should specify `--no-validation` to send invalid messages intentionally.
+   * A new option `--default-dataset` is introduced.
+     It is used for sending messages if they have no `dataset` field.
+   * A new option `--default-target-role` is introduced.
+     It is used for sending messages if they have no `targetRole` field.
+   * The "date" field is filled with the format same to droonga-engine's internal one
+     like "2015-04-08T06:16:20.571303Z".
+
 ## 0.2.0: 2014-11-29
 
  * droonga-send:

data/droonga-client.gemspec

@@ -35,13 +35,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "msgpack"
+  spec.add_runtime_dependency "droonga-message-pack-packer"
   spec.add_runtime_dependency "fluent-logger"
+  spec.add_runtime_dependency "msgpack"
   spec.add_runtime_dependency "rack"
+  spec.add_runtime_dependency "slop", "<= 3.6.0"
   spec.add_runtime_dependency "yajl-ruby"
-  spec.add_runtime_dependency "droonga-message-pack-packer"
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
   spec.add_development_dependency "packnga"
+  spec.add_development_dependency "rake"
 end

data/lib/droonga/client.rb

@@ -20,9 +20,27 @@ require "droonga/client/error"
 require "droonga/client/connection/http"
 require "droonga/client/connection/droonga-protocol"
 require "droonga/client/rate-limiter"
+require "droonga/client/message_completer"
+require "droonga/client/message_validator"
 
 module Droonga
   class Client
+    DEFAULT_HOST = Socket.gethostname
+    DEFAULT_HOST.force_encoding("US-ASCII") if DEFAULT_HOST.ascii_only?
+    DEFAULT_PORT = 10031
+    DEFAULT_TAG  = "droonga"
+    DEFAULT_DATASET = "Default"
+    DEFAULT_TARGET_ROLE = "any"
+    DEFAULT_TIMEOUT_SECONDS = 3
+
+    attr_writer :on_error
+
+    class ConnectionError < StandardError
+      def initialize(error)
+        super(error.inspect)
+      end
+    end
+
     class << self
       # Opens a new connection and yields a {Client} object to use the
       # connection. The client is closed after the given block is
@@ -60,30 +78,39 @@ module Droonga
     # @option options [Integer] :timeout (5)
     #   The timeout value for connecting to, writing to and reading
     #   from Droonga Engine.
+    # @option options [Boolean] :completion (true)
+    #   Do or do not complete required fields of input messages.
+    # @option options [Boolean] :validation (true)
+    #   Do or do not validate input messages.
     def initialize(options={})
       @connection = create_connection(options)
+      @connection.on_error = lambda do |error|
+        on_error(ConnectionError.new(error))
+      end
+
+      @completion = options[:completion] != false
+      @validation = options[:validation] != false
+
+      @completer = MessageCompleter.new(:default_timeout => options[:default_timeout],
+                                        :default_target_role => options[:default_target_role])
+      @validator = MessageValidator.new
     end
 
     def send(message, options={}, &block)
-      if message["id"].nil? or message["date"].nil?
-        id = message["id"] || generate_id
-        date = message["date"] || Time.now
-        message = message.merge("id" => id, "date" => date)
-      end
+      message = do_completion(message, options)
+      do_validation(message, options)
       @connection.send(message, options, &block)
     end
 
     def request(message, options={}, &block)
-      if message["id"].nil?
-        message = message.merge("id" => generate_id)
-      end
+      message = do_completion(message, options)
+      do_validation(message, options)
       @connection.request(message, options, &block)
     end
 
     def subscribe(message, options={}, &block)
-      if message["id"].nil?
-        message = message.merge("id" => generate_id)
-      end
+      message = do_completion(message, options)
+      do_validation(message, options)
       @connection.subscribe(message, options, &block)
     end
 
@@ -105,8 +132,26 @@ module Droonga
       end
     end
 
-    def generate_id
-      Time.now.to_f.to_s
+    def do_completion(message, options={})
+      if options[:completion].nil?
+        return message unless @completion
+      else
+        return message if options[:completion] == false
+      end
+      @completer.complete(message)
+    end
+
+    def do_validation(message, options={})
+      if options[:validation].nil?
+        return unless @validation
+      else
+        return if options[:validation] == false
+      end
+      @validator.validate(message)
+    end
+
+    def on_error(error)
+      @on_error.call(error) if @on_error
     end
   end
 end

data/lib/droonga/client/connection/droonga-protocol.rb

@@ -21,12 +21,23 @@ module Droonga
   class Client
     module Connection
       class DroongaProtocol
+        class BackendError < StandardError
+          def initialize(error)
+            super(error.inspect)
+          end
+        end
+
+        attr_writer :on_error
+
         def initialize(options={})
           @host = options[:host] || "127.0.0.1"
           @port = options[:port] || 24224
           @tag = options[:tag] || "droonga"
           @options = options
           @backend = create_backend
+          @backend.on_error = lambda do |error|
+            on_error(BackendError.new(error))
+          end
         end
 
         # Sends a request message and receives one or more response
@@ -121,6 +132,10 @@ module Droonga
           backend_class = self.class.const_get(backend_name)
           backend_class.new(@host, @port, @tag, @options)
         end
+
+        def on_error(error)
+          @on_error.call(error) if @on_error
+        end
       end
     end
   end

data/lib/droonga/client/connection/droonga-protocol/coolio.rb

@@ -21,6 +21,17 @@ module Droonga
     module Connection
       class DroongaProtocol
         class Coolio
+          attr_writer :on_error
+
+          class ReceiverError < StandardError
+            def initialize(error)
+              super(error.inspect)
+            end
+          end
+
+          class NilMessage < StandardError
+          end
+
           class Request
             def initialize(receiver, id, loop)
               @receiver = receiver
@@ -37,11 +48,22 @@ module Droonga
           end
 
           class InfiniteRequest
-            def initialize(loop)
+            attr_writer :on_timeout
+
+            def initialize(loop, options={})
               @loop = loop
+              @subscription_timeout = options[:subscription_timeout]
             end
 
             def wait
+              if @subscription_timeout
+                @timer = Coolio::TimerWatcher.new(@subscription_timeout)
+                @timer.on_timer do
+                  @timer.detach
+                  @on_timeout.call if @on_timeout
+                end
+                @loop.attach(@timer)
+              end
               @loop.run
             end
           end
@@ -91,6 +113,9 @@ module Droonga
           end
 
           class Receiver < ::Coolio::TCPServer
+            attr_accessor :max_messages
+            attr_writer :on_error
+
             def initialize(*args)
               super(*args) do |engine|
                 @engines << engine
@@ -98,6 +123,7 @@ module Droonga
               end
               @requests = {}
               @engines = []
+              @max_messages = nil
             end
 
             def close
@@ -142,14 +168,28 @@ module Droonga
             private
             def handle_engine(engine)
               unpacker = MessagePack::Unpacker.new
+              n_messages = 0
               on_read = lambda do |data|
                 unpacker.feed_each(data) do |fluent_message|
+                  unless fluent_message
+                    on_error(NilMessage.new("coolio / unpacker.feed_each"))
+                  end
                   tag, time, droonga_message = fluent_message
+                  unless droonga_message
+                    on_error(NilMessage.new("coolio / unpacker.feed_each",
+                                            :fluent_message => fluent_message.inspect))
+                  end
                   id = droonga_message["inReplyTo"]
                   request = @requests[id]
-                  next if request.nil?
-                  request[:received] = true
-                  request[:callback].call(droonga_message)
+                  n_messages += 1
+                  if request
+                    request[:received] = true
+                    request[:callback].call(droonga_message)
+                  end
+                  if @max_messages and
+                       n_messages >= @max_messages
+                    unregister(id)
+                  end
                 end
               end
               engine.on_read do |data|
@@ -163,6 +203,10 @@ module Droonga
                 on_close.call
               end
             end
+
+            def on_error(error)
+              @on_error.call(error) if @on_error
+            end
           end
 
           def initialize(host, port, tag, options={})
@@ -179,6 +223,9 @@ module Droonga
             @receiver_host = @options[:receiver_host] || Socket.gethostname
             @receiver_port = @options[:receiver_port] || 0
             @receiver = Receiver.new(@receiver_host, @receiver_port)
+            @receiver.on_error = lambda do |error|
+              on_error(ReceiverError.new(error))
+            end
             @receiver.attach(@loop)
           end
 
@@ -217,7 +264,14 @@ module Droonga
             end
 
             id = message["id"]
-            request = InfiniteRequest.new(@loop)
+            request_options = {
+              :subscription_timeout => options[:subscription_timeout],
+            }
+            @receiver.max_messages = options[:max_messages]
+            request = InfiniteRequest.new(@loop, request_options)
+            request.on_timeout = lambda do
+              @receiver.unregister(id)
+            end
             sync = block.nil?
             if sync
               yielder = nil
@@ -256,6 +310,10 @@ module Droonga
             @sender.close
             @receiver.close
           end
+
+          def on_error(error)
+            @on_error.call(error) if @on_error
+          end
         end
       end
     end

data/lib/droonga/client/connection/droonga-protocol/thread.rb

@@ -23,6 +23,19 @@ module Droonga
     module Connection
       class DroongaProtocol
         class Thread
+          DEFAULT_TIMEOUT_SECONDS = 10
+
+          attr_writer :on_error
+
+          class ReceiverError < StandardError
+            def initialize(error)
+              super(error.inspect)
+            end
+          end
+
+          class NilMessage < StandardError
+          end
+
           class Request
             def initialize(thread)
               @thread = thread
@@ -47,6 +60,9 @@ module Droonga
 
           def request(message, options={}, &block)
             receiver = create_receiver
+            receiver.on_error = lambda do |error|
+              on_error(ReceiverError.new(error))
+            end
             message = message.dup
             message["replyTo"] = "#{receiver.host}:#{receiver.port}/droonga"
             send(message, options)
@@ -78,23 +94,48 @@ module Droonga
             message["from"] = receive_end_point
             send(message, options)
 
+            subscription_timeout = options[:subscription_timeout]
+            max_messages = options[:max_messages]
+            start = Time.now
             receive_options = {
-              :timeout => nil,
+              :timeout => options[:timeout] || DEFAULT_TIMEOUT_SECONDS,
             }
+            n_messages = 0
             sync = block.nil?
             if sync
               Enumerator.new do |yielder|
                 loop do
                   receiver.receive(receive_options) do |object|
                     yielder << object
+                    n_messages += 1
+                  end
+                  if max_messages and
+                       n_messages >= max_messages
+                    break
+                  end
+                  if subscription_timeout
+                    elapsed_seconds = Time.now - start
+                    break if elapsed_seconds >= subscription_timeout
                   end
                 end
+                receiver.close
               end
             else
               thread = ::Thread.new do
                 begin
                   loop do
-                    receiver.receive(receive_options, &block)
+                    receiver.receive(receive_options) do |message|
+                      block.call(message)
+                      n_messages += 1
+                    end
+                    if max_messages and
+                         n_messages >= max_messages
+                      break
+                    end
+                    if subscription_timeout
+                      elapsed_seconds = Time.now - start
+                      break if elapsed_seconds >= subscription_timeout
+                    end
                   end
                 ensure
                   receiver.close
@@ -133,7 +174,13 @@ module Droonga
             end
           end
 
+          def on_error(error)
+            @on_error.call(error) if @on_error
+          end
+
           class Receiver
+            attr_writer :on_error
+
             def initialize(options={})
               host = options[:host] || Socket.gethostname
               port = options[:port] || 0
@@ -162,7 +209,7 @@ module Droonga
               timeout = options[:timeout]
               catch do |tag|
                 loop do
-                  start = Time.new
+                  start = Time.now
                   readable_ios, = IO.select(@read_ios, nil, nil, timeout)
                   break if readable_ios.nil?
                   if timeout
@@ -198,7 +245,14 @@ module Droonga
                     @client_handlers.delete(client)
                   else
                     unpacker.feed_each(data) do |fluent_message|
+                      unless fluent_message
+                        on_error(NilMessage.new("thread / unpacker.feed_each"))
+                      end
                       tag, time, droonga_message = fluent_message
+                      unless droonga_message
+                        on_error(NilMessage.new("thread / unpacker.feed_each",
+                                                :fluent_message => fluent_message))
+                      end
                       yield(droonga_message)
                     end
                   end
@@ -207,6 +261,10 @@ module Droonga
                 @client_handlers[io].call
               end
             end
+
+            def on_error(error)
+              @on_error.call(error) if @on_error
+            end
           end
         end
       end

data/lib/droonga/client/connection/http.rb

@@ -26,6 +26,8 @@ module Droonga
   class Client
     module Connection
       class HTTP
+        attr_writer :on_error
+
         class InvalidHTTPMethodError < Error
           attr_reader :http_method
           attr_reader :request_message
@@ -179,6 +181,10 @@ module Droonga
             "#{base_path}?#{Rack::Utils.build_nested_query(parameters)}"
           end
         end
+
+        def on_error(error)
+          @on_error.call(error) if @on_error
+        end
       end
     end
   end

data/lib/droonga/client/message_completer.rb

@@ -0,0 +1,60 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2015 Droonga Project
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License version 2.1 as published by the Free Software Foundation.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+require "time"
+
+module Droonga
+  class Client
+    class MessageCompleter
+      def initialize(options={})
+        @options = options
+        @fixed_date = @options[:fixed_date]
+        @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
+        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
+
+      private
+      def generate_id
+        Time.now.to_f.to_s
+      end
+
+      MICRO_SECONDS_DECIMAL_PLACE = 6
+
+      def new_date
+        Time.now.utc.iso8601(MICRO_SECONDS_DECIMAL_PLACE)
+      end
+
+      def have_timeout?(message)
+        return true if message["timeout"]
+        return false unless message["body"].is_a?(Hash)
+        not message["body"]["timeout"].nil?
+      end
+    end
+  end
+end

data/lib/droonga/client/message_validator.rb

@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2015 Droonga Project
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License version 2.1 as published by the Free Software Foundation.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+require "time"
+
+module Droonga
+  class Client
+    class MessageValidator
+      class MissingDataset < ArgumentError
+      end
+
+      class InvalidDate < ArgumentError
+      end
+
+      def initialize(options={})
+        @options = options
+      end
+
+      def validate(message)
+        validate_dataset(message)
+        validate_date(message)
+      end
+
+      private
+      def validate_dataset(message)
+        unless message["dataset"]
+          raise MissingDataset.new(message)
+        end
+      end
+
+      def validate_date(message)
+        Time.parse(message["date"])
+      rescue ArgumentError
+        raise InvalidDate.new(message)
+      end
+    end
+  end
+end

data/lib/droonga/client/version.rb

@@ -17,6 +17,6 @@
 
 module Droonga
   class Client
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/lib/droonga/command/base.rb

@@ -0,0 +1,97 @@
+#!/usr/bin/env ruby
+#
+# Copyright (C) 2015 Droonga Project
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License version 2.1 as published by the Free Software Foundation.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+require "slop"
+
+require "droonga/client"
+
+module Droonga
+  module Command
+    class MissingRequiredParameter < StandardError
+    end
+
+    class NoResponse < StandardError
+    end
+
+    class Base
+      private
+      def parse_options(&block)
+        options = Slop.parse(:help => true) do |option|
+          yield(option) if block_given?
+
+          option.separator("Connections:")
+          option.on(:host=,
+                    "Host name of the engine node.",
+                    :default => Client::DEFAULT_HOST)
+          option.on(:port=,
+                    "Port number to communicate with the engine.",
+                    :as => Integer,
+                    :default => Client::DEFAULT_PORT)
+          option.on(:tag=,
+                    "Tag name to communicate with the engine.",
+                    :default => Client::DEFAULT_TAG)
+          option.on(:dataset=,
+                    "Dataset name for the sending message.",
+                    :default => Client::DEFAULT_DATASET)
+          option.on("receiver-host=",
+                    "Host name of this host.",
+                    :default => Client::DEFAULT_HOST)
+          option.on("target-role=",
+                    "Role of engine nodes which should receive the message.",
+                    :default => Client::DEFAULT_TARGET_ROLE)
+          option.on("timeout=",
+                    "Time to terminate unresponsive connections (in seconds).",
+                    :default => Client::DEFAULT_TIMEOUT_SECONDS)
+        end
+        @options = options
+      rescue Slop::MissingOptionError => error
+        $stderr.puts(error)
+        raise MissingRequiredParameter.new
+      end
+
+      def request(message)
+        response = nil
+        open do |client|
+          response = client.request(message)
+        end
+        response
+      end
+
+      def send(message)
+        open do |client|
+          client.send(message)
+        end
+      end
+
+      def open(&block)
+        options = {
+          :host          => @options[:host],
+          :port          => @options[:port],
+          :tag           => @options[:tag],
+          :protocol      => :droonga,
+          :receiver_host => @options["receiver-host"],
+          :receiver_port => 0,
+          :default_timeout => @options[:timeout],
+          :default_target_role => @options[:target_role],
+        }
+        Droonga::Client.open(options) do |client|
+          yield(client)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: droonga-client
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Droonga Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-28 00:00:00.000000000 Z
+date: 2015-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: msgpack
+  name: droonga-message-pack-packer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: msgpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -67,7 +67,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: droonga-message-pack-packer
+  name: slop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 3.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 3.6.0
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -95,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: packnga
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -109,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: packnga
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -126,8 +140,11 @@ description: Droonga client for Ruby
 email:
 - droonga@groonga.org
 executables:
+- droonga-add
+- droonga-groonga
 - droonga-request
 - droonga-send
+- droonga-system-status
 extensions: []
 extra_rdoc_files: []
 files:
@@ -137,8 +154,11 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/droonga-add
+- bin/droonga-groonga
 - bin/droonga-request
 - bin/droonga-send
+- bin/droonga-system-status
 - doc/text/news.md
 - droonga-client.gemspec
 - lib/droonga/client.rb
@@ -149,8 +169,11 @@ files:
 - lib/droonga/client/connection/error.rb
 - lib/droonga/client/connection/http.rb
 - lib/droonga/client/error.rb
+- lib/droonga/client/message_completer.rb
+- lib/droonga/client/message_validator.rb
 - lib/droonga/client/rate-limiter.rb
 - lib/droonga/client/version.rb
+- lib/droonga/command/base.rb
 homepage: https://github.com/droonga/droonga-client-ruby
 licenses:
 - LGPL-2.1