groonga-client 0.0.2 → 0.0.3

data/test/response/test-table-list.rb

@@ -1,5 +1,3 @@
-require "test/unit/rr"
-
 require "response/helper"
 
 class TestResponseTableList < Test::Unit::TestCase
@@ -9,16 +7,9 @@ class TestResponseTableList < Test::Unit::TestCase
     header = [0,1372430096.70991,0.000522851943969727]
     body = [[["id","UInt32"],["name","ShortText"],["path","ShortText"],["flags","ShortText"],["domain","ShortText"],["range","ShortText"],["default_tokenizer","ShortText"],["normalizer","ShortText"]],
       [256,"Test","/tmp/test.db.0000100","TABLE_HASH_KEY|PERSISTENT",nil,nil,nil,nil]]
+    raw_response = [header, body].to_json
 
-    connection = Object.new
-    stub(connection).send.with_any_args.yields([header, body].to_json) do
-      request = Object.new
-      stub(request).wait do
-        true
-      end
-    end
-
-    response = make_command("table_list").execute(connection)
+    response = parse_raw_response("table_list", raw_response)
     assert_equal(Groonga::Client::Response::TableList, response.class)
   end
 end

data/test/results/test-column-list.rb

@@ -3,12 +3,13 @@ require "test/unit/rr"
 class TestResultsColumnList < Test::Unit::TestCase
   class TestResults < self
     def setup
+      command = nil
       header = [0,1372430096.70991,0.000522851943969727]
       body = [[["id","UInt32"],["name","ShortText"],["path","ShortText"],["type","ShortText"],["flags","ShortText"],["domain","ShortText"],["range","ShortText"],["source","ShortText"]],
         [259,"_key","","","COLUMN_SCALAR","Bigram","ShortText",[]],
         [278,"comment_index","/tmp/db.db.0000116","index","COLUMN_INDEX|WITH_POSITION|PERSISTENT","Bigram","Comments",["Comments.comment"]],
         [277,"users_index","/tmp/db.db.0000115","index","COLUMN_INDEX|WITH_SECTION|WITH_POSITION|PERSISTENT","Bigram","Users",["Users.name","Users.location_str","Users.description"]]]
-      @column_list = Groonga::Client::Response::ColumnList.new(header, body)
+      @column_list = Groonga::Client::Response::ColumnList.new(command, header, body)
     end
 
     def test_column_list

data/test/results/test-table-list.rb

@@ -2,12 +2,13 @@ require "test/unit/rr"
 
 class TestResultsTableList < Test::Unit::TestCase
   def setup
+    command = nil
     header = [0,1372430096.70991,0.000522851943969727]
     body = [[["id","UInt32"],["name","ShortText"],["path","ShortText"],["flags","ShortText"],["domain","ShortText"],["range","ShortText"],["default_tokenizer","ShortText"],["normalizer","ShortText"]],
       [257,"Ages","/tmp/test.db.0000101","TABLE_DAT_KEY|PERSISTENT","UInt32",nil,nil,nil],
       [256,"Lexicon","/tmp/test.db.0000100","TABLE_PAT_KEY|PERSISTENT","ShortText",nil,"TokenBigram","NormalizerAuto"],
       [258,"Logs","/tmp/test.db.0000102","TABLE_NO_KEY|PERSISTENT",nil,nil,nil,nil]]
-    @table_list = Groonga::Client::Response::TableList.new(header, body)
+    @table_list = Groonga::Client::Response::TableList.new(command, header, body)
   end
 
   def test_table_list

data/test/test-client.rb

@@ -152,30 +152,29 @@ class TestClient < Test::Unit::TestCase
       XML
       response = client.table_list(:output_type => :xml)
       expected_body = [
-        table(256,
-              "Users",
-              "/tmp/db/db.0000100",
-              "TABLE_HASH_KEY|PERSISTENT",
-              nil,
-              nil,
-              nil,
-              nil),
+        [
+          ["id", "UInt32"],
+          ["name", "ShortText"],
+          ["path", "ShortText"],
+          ["flags", "ShortText"],
+          ["domain", "ShortText"],
+          ["range", "ShortText"],
+          ["default_tokenizer", "ShortText"],
+          ["normalizer", "ShortText"],
+        ],
+        [
+          256,
+          "Users",
+          "/tmp/db/db.0000100",
+          "TABLE_HASH_KEY|PERSISTENT",
+          nil,
+          nil,
+          nil,
+          nil,
+        ],
       ]
       assert_response(expected_body, response)
     end
-
-    private
-    def table(id, name, path, flags, domain, range, default_tokenizer,
-              normalizer)
-      Groonga::Client::Response::TableList::Table.new(id,
-                                                      name,
-                                                      path,
-                                                      flags,
-                                                      domain,
-                                                      range,
-                                                      default_tokenizer,
-                                                      normalizer)
-    end
   end
 
   module ColumnsTests
@@ -213,6 +212,16 @@ JSON
     end
   end
 
+  module OpenTests
+    def test_return_value
+      stub_response("['not-used']")
+      response = open_client do |client|
+        "response"
+      end
+      assert_equal("response", response)
+    end
+  end
+
   module Tests
     include Utils
     include Assertions
@@ -220,6 +229,7 @@ JSON
     include OutputTypeTests
     include ColumnsTests
     include ParametersTests
+    include OpenTests
   end
 
   class TestGQTP < self
@@ -237,14 +247,20 @@ JSON
         client = @server.accept
         @server.close
 
-        header = GQTP::Header.parse(client.read(GQTP::Header.size))
-        client.read(header.size)
+        loop do
+          raw_header = client.read(GQTP::Header.size)
+          break if raw_header.nil?
+
+          header = GQTP::Header.parse(raw_header)
+          client.read(header.size)
 
-        response_header = GQTP::Header.new
-        response_header.size = @response_body.bytesize
+          response_header = GQTP::Header.new
+          response_header.size = @response_body.bytesize
+
+          client.write(response_header.pack)
+          client.write(@response_body)
+        end
 
-        client.write(response_header.pack)
-        client.write(@response_body)
         client.close
       end
     end

data/test/test-command.rb

@@ -3,23 +3,56 @@ class TestCommand < Test::Unit::TestCase
     @client = Groonga::Client.open(:protocol => :http)
   end
 
+  def test_column_create
+    response = Object.new
+    mock(@client).execute_command("column_create", :table => :Test, :name => :Body, :type => :ShortText) do
+      response
+    end
+    @client.column_create(:table => :Test, :name => :Body, :type => :ShortText)
+  end
+
   def test_column_list
+    response = Object.new
     mock(@client).execute_command("column_list", :table => :Test) do
-      Object.new
+      response
     end
     @client.column_list(:table => :Test)
   end
 
+  def test_load
+    values = [
+      {
+        :_key => "Groonga",
+        :body => "It's very fast!!"
+      }
+    ]
+    response = Object.new
+    mock(@client).execute_command("load", :table => :Test, :values => values.to_json) do
+      response
+    end
+    @client.load(:table => :Test, :values => values.to_json)
+  end
+
   def test_select
+    response = Object.new
     mock(@client).execute_command("select", :table => :Test) do
-      Object.new
+      response
     end
     @client.select(:table => :Test)
   end
 
+  def test_table_create
+    response = Object.new
+    mock(@client).execute_command("table_create", :name => :Test) do
+      response
+    end
+    @client.table_create(:name => :Test)
+  end
+
   def test_table_list
+    response = Object.new
     mock(@client).execute_command("table_list", {}) do
-      Object.new
+      response
     end
     @client.table_list
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groonga-client
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2013-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gqtp
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -179,43 +179,47 @@ files:
 - Gemfile
 - groonga-client.gemspec
 - .yardopts
-- lib/groonga/client/protocol/gqtp.rb
-- lib/groonga/client/protocol/http.rb
-- lib/groonga/client/version.rb
-- lib/groonga/client/response/cache_limit.rb
-- lib/groonga/client/response/register.rb
-- lib/groonga/client/response/column_list.rb
-- lib/groonga/client/response/status.rb
+- lib/groonga/client/response.rb
+- lib/groonga/client/response/clearlock.rb
 - lib/groonga/client/response/column_remove.rb
 - lib/groonga/client/response/quit.rb
+- lib/groonga/client/response/log_put.rb
 - lib/groonga/client/response/load.rb
 - lib/groonga/client/response/delete.rb
+- lib/groonga/client/response/base.rb
+- lib/groonga/client/response/status.rb
+- lib/groonga/client/response/table_create.rb
+- lib/groonga/client/response/register.rb
 - lib/groonga/client/response/column_create.rb
-- lib/groonga/client/response/log_reopen.rb
+- lib/groonga/client/response/check.rb
+- lib/groonga/client/response/cache_limit.rb
 - lib/groonga/client/response/column_rename.rb
-- lib/groonga/client/response/log_level.rb
 - lib/groonga/client/response/defrag.rb
-- lib/groonga/client/response/base.rb
-- lib/groonga/client/response/dump.rb
 - lib/groonga/client/response/table_list.rb
+- lib/groonga/client/response/log_level.rb
+- lib/groonga/client/response/log_reopen.rb
+- lib/groonga/client/response/dump.rb
 - lib/groonga/client/response/select.rb
-- lib/groonga/client/response/log_put.rb
-- lib/groonga/client/response/clearlock.rb
-- lib/groonga/client/response/check.rb
+- lib/groonga/client/response/column_list.rb
+- lib/groonga/client/version.rb
 - lib/groonga/client/command.rb
-- lib/groonga/client/response.rb
+- lib/groonga/client/connection/request.rb
+- lib/groonga/client/connection/error.rb
+- lib/groonga/client/connection/gqtp.rb
+- lib/groonga/client/connection/http.rb
 - lib/groonga/client.rb
 - doc/text/news.md
-- test/response/test-table-list.rb
-- test/response/test-column-list.rb
+- test/run-test.rb
+- test/test-client.rb
 - test/response/helper.rb
 - test/response/test-select.rb
-- test/run-test.rb
+- test/response/test-table-list.rb
+- test/response/test-column-list.rb
+- test/test-command.rb
 - test/results/test-table-list.rb
 - test/results/test-column-list.rb
-- test/results/test-select.rb
-- test/test-command.rb
-- test/test-client.rb
+- test/connection/test-gqtp.rb
+- test/connection/test-http.rb
 homepage: https://github.com/ranguba/groonga-client
 licenses:
 - LGPLv2.1 or later
@@ -243,14 +247,15 @@ specification_version: 3
 summary: Groonga-client is a client for groonga (http://groonga.org/) implemented
   with pure ruby.
 test_files:
-- test/response/test-table-list.rb
-- test/response/test-column-list.rb
+- test/run-test.rb
+- test/test-client.rb
 - test/response/helper.rb
 - test/response/test-select.rb
-- test/run-test.rb
+- test/response/test-table-list.rb
+- test/response/test-column-list.rb
+- test/test-command.rb
 - test/results/test-table-list.rb
 - test/results/test-column-list.rb
-- test/results/test-select.rb
-- test/test-command.rb
-- test/test-client.rb
+- test/connection/test-gqtp.rb
+- test/connection/test-http.rb
 has_rdoc: 

data/test/results/test-select.rb

@@ -1,63 +0,0 @@
-require "test/unit/rr"
-
-class TestResultsSelect < Test::Unit::TestCase
-  class TestResults < self
-    def setup
-      header = [0,1372430096.70991,0.000522851943969727]
-      body = [[[6],[["_id","UInt32"],["country","Country"],["domain","Domain"]],[1,"japan",".com"],[2,"brazil",".com"],[3,"japan",".org"],[4,"usa",".com"],[5,"japan",".org"],[6,"usa",".com"]],
-        [[3],[["_key","ShortText"],["_nsubrecs","Int32"]],["japan",3],["brazil",1],["usa",2]],
-        [[2],[["_key","ShortText"],["_nsubrecs","Int32"]],[".com",4],[".org",2]]]
-      @select = Groonga::Client::Response::Select.new(header, body)
-    end
-
-    def test_n_records
-      assert_equal(6, @select.n_records)
-    end
-
-    def test_records
-      expected_records = [
-        {"_id"=>1, "country"=>"japan", "domain"=>".com"},
-        {"_id"=>2, "country"=>"brazil", "domain"=>".com"},
-        {"_id"=>3, "country"=>"japan", "domain"=>".org"},
-        {"_id"=>4, "country"=>"usa", "domain"=>".com"},
-        {"_id"=>5, "country"=>"japan", "domain"=>".org"},
-        {"_id"=>6, "country"=>"usa", "domain"=>".com"},
-      ]
-      assert_equal(expected_records, @select.records)
-    end
-
-    def test_drilldowns
-      expected_drilldowns = [
-        Drilldown.new(3, [
-            {"_key"=>"japan", "_nsubrecs"=>3},
-            {"_key"=>"brazil", "_nsubrecs"=>1},
-            {"_key"=>"usa", "_nsubrecs"=>2},]),
-        Drilldown.new(2, [
-            {"_key"=>".com", "_nsubrecs"=>4},
-            {"_key"=>".org", "_nsubrecs"=>2}]),
-      ]
-      assert_equal(expected_drilldowns, @select.drilldowns.collect{|drilldown|
-          Drilldown.new(drilldown.n_hits, drilldown.items)
-        })
-    end
-  end
-
-  class TestNoRecordsBody < self
-    def setup
-      header = [0,1372430096.70991,0.000522851943969727]
-      body = [[[6],[["_id","UInt32"],["country","Country"]]]]
-      @select = Groonga::Client::Response::Select.new(header, body)
-    end
-
-    def test_n_records
-      assert_equal(6, @select.n_records)
-    end
-
-    def test_records
-      assert_equal([], @select.records)
-    end
-  end
-
-  Drilldown = Struct.new(:n_hits, :items)
-end
-