kyototycoon-client 0.0.2 → 0.0.3

data/.gitignore

@@ -15,3 +15,9 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+
+vendor/
+*~
+#*
+.#*
+*.swp

data/lib/kyototycoon/client/connection.rb

@@ -81,9 +81,9 @@ module Kyototycoon
       records.each do |r|
         request <<  [r.db_id, r.key.length].pack("nN") << r.key
       end
-    
+
       @socket.write(request)
-      response = @socket.read(5) 
+      response = @socket.read(5)
       raise "no response" unless response
 
       magic, count = response.unpack("CN")

data/lib/kyototycoon/client/version.rb

@@ -1,5 +1,5 @@
 module Kyototycoon
   class Client
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/kyototycoon/client.rb

@@ -35,10 +35,11 @@ module Kyototycoon
     end
 
     def script(method, key, value)
-      script_bulk(method, { key => value } ) 
+      script_bulk(method, { key => value } )
     end
 
     def set_bulk(keyvalues, dbid = 0)
+      return 0 if keyvalues.empty?
       raise "connection closed" unless @connection.is_open
 
       records = []
@@ -53,6 +54,7 @@ module Kyototycoon
     end
 
     def get_bulk(keys, dbid=0)
+      return [] if keys.empty?
       raise "connection closed" unless @connection.is_open
 
       records = []
@@ -65,12 +67,13 @@ module Kyototycoon
     end
 
     def remove_bulk(keys, dbid=0)
+      return 0 if keys.empty?
       raise "connection closed" unless @connection.is_open
 
       records = []
       keys.each do |k|
         records.push(Record.new(k, nil, nil, dbid))
-      end 
+      end
       @connection.remove(records)
     end
 

data/test/kyototycoon/client/test_client.rb

@@ -1,9 +1,13 @@
 require "helper"
 
 class ClientTest < Test::Unit::TestCase
+
+  HOST = ENV["HOST"] || "localhost"
+  PORT = (ENV["PORT"] || 1978).to_i
+
   def setup
-    raise "host and port of KyotoTycoon test server is required: rake test HOST=xxx PORT=xxx" if (!ENV["HOST"] || !ENV["PORT"])
-    @client = Kyototycoon::Client.new(ENV["HOST"], ENV["PORT"].to_i) 
+    raise "host and port of KyotoTycoon test server is required: rake test HOST=xxx PORT=xxx" if (!HOST || !PORT)
+    @client = Kyototycoon::Client.new(HOST, PORT)
   end
 
   def test_open
@@ -24,12 +28,14 @@ class ClientTest < Test::Unit::TestCase
 
   def test_clud_bulk
     @client.open
+    @client.remove_bulk(["key1", "key2", "key3", "key4"])
+
     assert_equal( @client.set_bulk( {"key1" => "valueA", "key2" => "valueB", "key3" => "valueC"} ), 3)
-    assert_equal( @client.get_bulk( ["key1", "key2", "key3", "key4"] ), 
-                                    {"key1" => "valueA", "key2" => "valueB", "key3" => "valueC"} )
+    assert_equal( @client.get_bulk( ["key1", "key2", "key3", "key4"] ),
+                  {"key1" => "valueA", "key2" => "valueB", "key3" => "valueC"} )
     assert_equal( @client.remove_bulk( ["key1", "key2"] ), 2 )
-    assert_equal( @client.get_bulk( ["key1", "key2", "key3", "key4"] ), 
-                                    {"key3" => "valueC"} )
+    assert_equal( @client.get_bulk( ["key1", "key2", "key3", "key4"] ),
+                  {"key3" => "valueC"} )
     @client.close
   end
 
@@ -61,6 +67,39 @@ class ClientTest < Test::Unit::TestCase
     @client.close
   end
 
+  def test_empty_records
+    client = Kyototycoon::Client.new(HOST, PORT)
+    client.instance_eval do |obj|
+      class << self
+        define_method :connection=, Proc.new { |connection|
+          @connection = connection
+        }
+      end
+    end
+
+    mock = MockConnection.new
+    client.connection = mock
+
+    client.get_bulk([])
+    assert_equal false, mock.called_get?
+
+    client.set_bulk([])
+    assert_equal false, mock.called_set?
+
+    client.remove_bulk([])
+    assert_equal false, mock.called_remove?
+
+    client.get(1)
+    assert_equal true, mock.called_get?
+
+    client.set(1, 1)
+    assert_equal true, mock.called_set?
+
+    client.remove(1)
+    assert_equal true, mock.called_remove?
+  end
+
+
   # def test_script
   #   return unless @client
 
@@ -70,3 +109,42 @@ class ClientTest < Test::Unit::TestCase
   #  @client.close
   # end
 end
+
+class MockConnection
+  def initialize
+    @get    = false
+    @set    = false
+    @remove = false
+  end
+
+  def is_open
+    true
+  end
+
+  def get(records)
+    @get = true
+    []
+  end
+
+  def set(records)
+    @set = true
+    0
+  end
+
+  def remove(records)
+    @remove = true
+    true
+  end
+
+  def called_get?
+    @get
+  end
+
+  def called_set?
+    @set
+  end
+
+  def called_remove?
+    @remove
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kyototycoon-client
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2013-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler