droonga-client 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8292fde2e0f476c6debeaabe0b41d37b8c66f731
-  data.tar.gz: 31daa786ee3345ee8134670d17ce6faffd3a1b05
+  metadata.gz: d3c30f46700e4f30d650b9022fb6204826bfe5ea
+  data.tar.gz: 090d572047be3b5e5a343b5fab5fbf7c3499a8a2
 SHA512:
-  metadata.gz: 115acca826fbca886c043b57de60b6dc9a416e026cfba439d9301416fb2ec676093f677e08a47f05a36e459ab1969a391240a1ae48317b8256804d39ef3afe1d
-  data.tar.gz: 599402230f792b175d6e5208238bf8c094d75bec9a56aaa0d0c88f402680da7e4278929adfee4b35912de41745b04e40bc09786b3837b392625ba642c92972bd
+  metadata.gz: 719f8766430eafa483db4db130ff6f57d35e8a56949ff4667524e2d7226cb5383d8cae31038bae56c7adfedd50d160bab4f1ec4799955d592781467882e544a2
+  data.tar.gz: 09d56de88c4d4a4ae7bd6cff2d6b3874e7e0c4ea41020a3ccdfb127bc06780c69b8eb745584e162d7bd453634da35a80e7292b5645cd89aff7bc4c03932d798e

data/bin/droonga-request

@@ -16,6 +16,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 require "optparse"
+require "yajl"
 require "json"
 
 require "droonga/client"
@@ -29,6 +30,7 @@ options = {
   :exit_on_response    => true,
   :receiver_host       => "localhost",
   :receiver_port       => 0,
+  :report_request      => false,
   :report_elapsed_time => true,
 }
 
@@ -84,6 +86,11 @@ parser.on("--receiver-port=PORT", Integer,
 end
 parser.separator("")
 parser.separator("Report:")
+parser.on("--[no-]report-request",
+          "Reports request message.",
+          "(#{options[:report_request]})") do |report_request|
+  options[:report_request] = report_request
+end
 parser.on("--[no-]report-elapsed-time",
           "Reports elapsed time.",
           "(#{options[:report_elapsed_time]})") do |report_elapsed_time|
@@ -91,23 +98,36 @@ parser.on("--[no-]report-elapsed-time",
 end
 *rest = parser.parse!(ARGV)
 
-if rest.size < 1
-  puts("request JSON file is missing.")
-  exit(false)
-end
-
 request_json_file = rest.first
 
 client = Droonga::Client.new(options)
-request_message = JSON.parse(File.read(request_json_file))
-start = Time.now
-request = client.request(request_message) do |response|
-  puts("Elapsed time: #{Time.now - start}") if options[:report_elapsed_time]
-  begin
-    puts(JSON.pretty_generate(response))
-  rescue
-    p(response)
+json_parser = Yajl::Parser.new
+json_parser.on_parse_complete = lambda do |request_message|
+  if options[:report_request]
+    print("Request: ")
+    begin
+      puts(JSON.pretty_generate(request_message))
+    rescue
+      p(request_message)
+    end
+  end
+  start = Time.now
+  request = client.request(request_message) do |response|
+    puts("Elapsed time: #{Time.now - start}") if options[:report_elapsed_time]
+    begin
+      puts(JSON.pretty_generate(response))
+    rescue
+      p(response)
+    end
+    break if options[:exit_on_response]
+  end
+  request.wait
+end
+
+if request_json_file
+  File.open(request_json_file) do |input|
+    json_parser.parse(input)
   end
-  break if options[:exit_on_response]
+else
+  json_parser.parse($stdin)
 end
-request.wait

data/doc/text/news.md

@@ -1,5 +1,12 @@
 # News
 
+## 0.1.3: 2014-02-17
+
+### Improvements
+
+  * Supported multiple JSONs.
+  * Added --report-request option.
+
 ## 0.1.2: 2014-02-09
 
 ### Improvements

data/lib/droonga/client/version.rb

@@ -17,6 +17,6 @@
 
 module Droonga
   class Client
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: droonga-client
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Droonga Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-09 00:00:00.000000000 Z
+date: 2014-02-17 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: 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
@@ -116,8 +116,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .yardopts
+- ".gitignore"
+- ".yardopts"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -141,17 +141,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Droonga client for Ruby