droonga-client 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f75dd4c556d84c4e966646bc997a2572a4ca1fd
-  data.tar.gz: 3b34c387045228fde45119808abc0044baeb8599
+  metadata.gz: b93424bbf1204f04881870bed8343e65072ee30f
+  data.tar.gz: 264ed3acb88d12ae24c6828f31c1f056bca0b1cf
 SHA512:
-  metadata.gz: fb76c805ec407b17f4d6d920c6dc7c59858cb41c038d41a5d48609d90d895c854380856fa0ac2918a967749fa0b4bf676bf1d35fedc6f52b6e693602939adcdb
-  data.tar.gz: 267a919cb82b3e9a3ae5b948dd700137556dc3f13d5158d5307ca167c4805638795219760f34b066993a9a14d2d39149df39b35597f6cb6cd27c23424bc81260
+  metadata.gz: 9b7558962c63b1faa32cc1717abd224cfe8d4fdfa41723c5186914cf70421ee6ebd66df4b12a94cbaf43cb4cc837eb4124f5294d7810032a3efcb2636c516782
+  data.tar.gz: 1308a45eaeb3a71d269d45a1c17aa0bf3629fffc83c3f10f112d7bbbd4d69e65e1ecd90b9d881845011d13ed70b7bb185af4c43432f40d0a7e048898e8e60bc1

data/bin/droonga-send

@@ -25,14 +25,33 @@ require "droonga/client"
 options = OpenStruct.new
 options.report_request = false
 options.report_throughput = false
+options.default_protocol = "droonga"
+options.default_port     = 10031
+options.default_tag      = "droonga"
 
 servers = []
 default_server = "droonga:localhost:10031/droonga"
 messages_per_second = Droonga::Client::RateLimiter::NO_LIMIT
 
-def parse_server(server)
-  connect_info, tag = server.split(/\//, 2)
-  protocol, host, port = connect_info.split(/:/, 3)
+def parse_server(server, options)
+  server_matcher = /\A(?:(droonga|http):)?([^:]+)(?::([0-9]+))?(?:\/(.+))?\z/
+  server =~ server_matcher
+  protocol = $1
+  host     = $2
+  port     = $3
+  tag      = $4
+
+  if protocol and host =~ /\A[0-9]+\z/ and port.nil?
+    # "host:port" case can be detected as "protocol:host" wrongly.
+    port     = host
+    host     = protocol
+    protocol = nil
+  end
+
+  protocol ||= options.default_protocol
+  port     ||= options.default_port
+  tag      ||= options.default_tag
+
   {
     :host     => host,
     :port     => Integer(port),
@@ -81,6 +100,8 @@ parser.on("--server=PROTOCOL:HOST:PORT/TAG",
           "Droonga server to be connected.",
           "Use multiple servers to use round-robin requests.",
           "Specify this option multiple times to use multiple servers.",
+          "Protocol, port, and tag can be provided via other options ",
+          "but host name must be specified.",
           "(#{default_server})") do |server|
   servers << server
 end
@@ -90,6 +111,21 @@ parser.on("--messages-per-second=N", Integer,
           "(#{messages_per_second})") do |n|
   messages_per_second = n
 end
+parser.on("--default-protocol=PROTOCOL",
+          "Default protocol for servers.",
+          "(#{options.default_protocol})") do |protocol|
+  options.default_protocol = protocol
+end
+parser.on("--default-port=PORT", Integer,
+          "Default port for servers.",
+          "(#{options.default_port})") do |port|
+  options.default_port = port
+end
+parser.on("--default-tag=TAG",
+          "Default tag for servers.",
+          "(#{options.default_tag})") do |tag|
+  options.default_tag = tag
+end
 parser.separator("")
 parser.separator("Report:")
 parser.on("--[no-]report-request",
@@ -106,7 +142,7 @@ request_json_files = parser.parse!(ARGV)
 
 servers << default_server if servers.empty?
 clients = servers.collect do |server|
-  client_options = parse_server(server)
+  client_options = parse_server(server, options)
   client = Droonga::Client.new(client_options)
   Droonga::Client::RateLimiter.new(client, messages_per_second)
 end

data/doc/text/news.md

@@ -1,5 +1,9 @@
 # News
 
+## 0.1.9: 2014-07-29 (planned)
+
+ * droonga-send: Accept default protocol, port, and tag. Now you can omit them for the `--server` option.
+
 ## 0.1.8: 2014-07-14
 
 ### Fixes

data/lib/droonga/client.rb

@@ -64,14 +64,25 @@ module Droonga
     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
       @connection.send(message, options, &block)
     end
 
     def request(message, options={}, &block)
+      if message["id"].nil?
+        message = message.merge("id" => generate_id)
+      end
       @connection.request(message, options, &block)
     end
 
     def subscribe(message, options={}, &block)
+      if message["id"].nil?
+        message = message.merge("id" => generate_id)
+      end
       @connection.subscribe(message, options, &block)
     end
 
@@ -92,5 +103,9 @@ module Droonga
         Connection::DroongaProtocol.new(options)
       end
     end
+
+    def generate_id
+      Time.now.to_f.to_s
+    end
   end
 end

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

@@ -183,9 +183,7 @@ module Droonga
           end
 
           def request(message, options={}, &block)
-            id = message["id"] || generate_id
-            message = message.merge("id" => id,
-                                    "replyTo" => @receiver.droonga_name)
+            message = message.merge("replyTo" => @receiver.droonga_name)
             send(message, options) do |error|
               yield(error)
             end
@@ -197,6 +195,7 @@ module Droonga
                 response = _response
               end
             end
+            id = message["id"]
             @receiver.register(id) do |response|
               @receiver.unregister(id)
               block.call(response)
@@ -211,14 +210,13 @@ module Droonga
           end
 
           def subscribe(message, options={}, &block)
-            id = message["id"] || generate_id
-            message = message.merge("id" => id,
-                                    "replyTo" => @receiver.droonga_name,
+            message = message.merge("replyTo" => @receiver.droonga_name,
                                     "from" => @receiver.droonga_name)
             send(message, options) do |error|
               yield(error)
             end
 
+            id = message["id"]
             request = InfiniteRequest.new(@loop)
             sync = block.nil?
             if sync
@@ -245,11 +243,6 @@ module Droonga
           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
             @sender.send("#{@tag}.message", message) do
               host = @sender.peeraddr[3]
               port = @sender.peeraddr[1]
@@ -263,11 +256,6 @@ module Droonga
             @sender.close
             @receiver.close
           end
-
-          private
-          def generate_id
-            Time.now.to_f.to_s
-          end
         end
       end
     end

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

@@ -105,10 +105,6 @@ module Droonga
           end
 
           def send(message, options={}, &block)
-            if message["id"].nil? or message["date"].nil?
-              message = message.merge("id"   => Time.now.to_f.to_s,
-                                      "date" => Time.now)
-            end
             @logger.post("message", message)
           end
 
@@ -151,7 +147,6 @@ module Droonga
               @client_handlers.each_key do |client|
                 client.close
               end
-              @read_ios.clear
             end
 
             def host

data/lib/droonga/client/version.rb

@@ -17,6 +17,6 @@
 
 module Droonga
   class Client
-    VERSION = "0.1.8"
+    VERSION = "0.1.9"
   end
 end

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: droonga-client
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Droonga Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-14 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fluent-logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: droonga-message-pack-packer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: packnga
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Droonga client for Ruby
@@ -131,8 +131,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".yardopts"
+- .gitignore
+- .yardopts
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -161,17 +161,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Droonga client for Ruby