droonga-client 0.1.6 → 0.1.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ffd6d3d2d200ed371e9796d222810204d63fe573
+  data.tar.gz: dd0ccbf7334fc5f1d17f609c038441cad708fcee
+SHA512:
+  metadata.gz: e08a13f2c2bad4374bec11b277d88b595f3384ee271a8506fa248d29ab493ecbb60e2435c6889a1f5327b30c169ec805816a3f14622129aee2bed75c9c229a07
+  data.tar.gz: de0d11dd6ac42a60dde0821cdc706a2d63b99d5396c60849c077d5ec99b31e3976372fb2abfb3c628610522973e1612e31bdbaaf8b89fcf6f3f08bf580d8c8e1

data/bin/droonga-request

@@ -23,7 +23,7 @@ require "droonga/client"
 
 options = {
   :host                => "localhost",
-  :port                => 24224,
+  :port                => 10031,
   :tag                 => "droonga",
   :protocol            => :droonga,
   :timeout             => 1,
@@ -35,6 +35,7 @@ options = {
 }
 
 parser = OptionParser.new
+parser.version = Droonga::Client::VERSION
 parser.banner += " REQUEST_JSON_FILE"
 parser.separator("")
 parser.separator("Connect:")

data/bin/droonga-send

@@ -27,7 +27,7 @@ options.report_request = false
 options.report_throughput = false
 
 servers = []
-default_server = "droonga:localhost:24224/droonga"
+default_server = "droonga:localhost:10031/droonga"
 messages_per_second = Droonga::Client::RateLimiter::NO_LIMIT
 
 def parse_server(server)
@@ -73,6 +73,7 @@ class ThroughputReporter
 end
 
 parser = OptionParser.new
+parser.version = Droonga::Client::VERSION
 parser.banner += " REQUEST_JSON_FILE1 REQUEST_JSON_FILE2 ..."
 parser.separator("")
 parser.separator("Connection:")

data/doc/text/news.md

@@ -1,8 +1,13 @@
 # News
 
-## 0.1.6: 2014-04-29 (planned)
+## 0.1.7: 2014-05-29
 
- * Supports droonga's protocol.
+ * Updated the default port number, same to `droonga-engine`'s one.
+
+## 0.1.6: 2014-04-29
+
+ * Supports Droonga's protocol.
+ * Used "Cool.io" backend for Droonga protocol.
 
 ## 0.1.5: 2014-03-29
 

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

@@ -47,14 +47,46 @@ module Droonga
           end
 
           class Sender < ::Coolio::TCPSocket
-            def initialize(socket)
-              super(socket)
+            def initialize(*args)
+              super
+              @connected = false
+              @failed_to_connect = false
+              @buffer = []
             end
 
-            def send(tag, data)
+            def close
+              return if @failed_to_connect
+              super
+            end
+
+            def send(tag, data, &on_error)
+              if @failed_to_connect
+                on_error.call(data)
+              end
               fluent_message = [tag, Time.now.to_i, data]
               packed_fluent_message = MessagePackPacker.pack(fluent_message)
-              write(packed_fluent_message)
+              if @connected
+                write(packed_fluent_message)
+              else
+                @buffer << [packed_fluent_message, on_error]
+              end
+            end
+
+            def on_connect
+              @connected = true
+              @buffer.each do |packed_message,|
+                write(packed_message)
+              end
+              @buffer.clear
+            end
+
+            def on_connect_failed
+              @failed_to_connect = true
+              @buffer.each do |packed_message, on_error|
+                _, _, message = MessagePack.unpack(packed_message)
+                on_error.call(message)
+              end
+              @buffer.clear
             end
           end
 
@@ -70,10 +102,10 @@ module Droonga
 
             def close
               super
-              @engines.each do |engine|
+              engines = @engines.dup
+              engines.each do |engine|
                 engine.close
               end
-              @engines.clear
             end
 
             def host
@@ -154,7 +186,9 @@ module Droonga
             id = message["id"] || generate_id
             message = message.merge("id" => id,
                                     "replyTo" => @receiver.droonga_name)
-            send(message, options)
+            send(message, options) do |error|
+              yield(error)
+            end
 
             sync = block.nil?
             if sync
@@ -179,8 +213,11 @@ module Droonga
           def subscribe(message, options={}, &block)
             id = message["id"] || generate_id
             message = message.merge("id" => id,
+                                    "replyTo" => @receiver.droonga_name,
                                     "from" => @receiver.droonga_name)
-            send(message, options)
+            send(message, options) do |error|
+              yield(error)
+            end
 
             request = InfiniteRequest.new(@loop)
             sync = block.nil?
@@ -213,7 +250,13 @@ module Droonga
               date = message["date"] || Time.now
               message = message.merge("id" => id, "date" => date)
             end
-            @sender.send("#{@tag}.message", message)
+            @sender.send("#{@tag}.message", message) do
+              host = @sender.peeraddr[3]
+              port = @sender.peeraddr[1]
+              detail = message
+              error = ConnectionError.new(host, port, detail)
+              yield(error)
+            end
           end
 
           def close

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

@@ -72,8 +72,10 @@ module Droonga
 
           def subscribe(message, options={}, &block)
             receiver = create_receiver
+            receive_end_point = "#{receiver.host}:#{receiver.port}/droonga"
             message = message.dup
-            message["from"] = "#{receiver.host}:#{receiver.port}/droonga"
+            message["replyTo"] = receive_end_point
+            message["from"] = receive_end_point
             send(message, options)
 
             receive_options = {

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

@@ -33,6 +33,18 @@ module Droonga
           super("Unknown #{@protocol} backend: <#{backend}>: #{detail}")
         end
       end
+
+      class ConnectionError < Error
+        attr_reader :host
+        attr_reader :port
+        attr_reader :detail
+        def initialize(host, port, detail)
+          @host = host
+          @port = port
+          @detail = detail
+          super("Failed to connect: <#{@host}:#{@port}>: #{@detail}")
+        end
+      end
     end
   end
 end

data/lib/droonga/client/version.rb

@@ -17,6 +17,6 @@
 
 module Droonga
   class Client
-    VERSION = "0.1.6"
+    VERSION = "0.1.7"
   end
 end

metadata

@@ -1,104 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: droonga-client
 version: !ruby/object:Gem::Version
-  version: 0.1.6
-  prerelease: 
+  version: 0.1.7
 platform: ruby
 authors:
 - Droonga Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
-  requirement: &76464960 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76464960
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fluent-logger
-  requirement: &76464730 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76464730
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &76464520 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76464520
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &76464310 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76464310
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: droonga-message-pack-packer
-  requirement: &76464100 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76464100
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &76463850 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *76463850
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &76463640 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76463640
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: packnga
-  requirement: &76463410 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76463410
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Droonga client for Ruby
 email:
 - droonga@groonga.org
@@ -131,27 +154,26 @@ files:
 homepage: https://github.com/droonga/droonga-client-ruby
 licenses:
 - LGPL-2.1
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Droonga client for Ruby
 test_files: []
 has_rdoc: