kyototycoon-client 0.0.3 → 0.0.4

data/lib/kyototycoon/client/connection.rb

@@ -29,9 +29,11 @@ module Kyototycoon
       header_entries = [Magic::SET_BULK, Flag::RESERVED, records.length]
       request = header_entries.pack("CNN")
 
-      records.each do |r|
-        request << [r.db_id, r.key.length, r.value.length, r.expire.to_i >> 32, r.expire.to_i & 0x00000000FFFFFFFF].pack("nNNNN")  <<
-                    r.key << r.value
+      records.each do |r| 
+        k = r.key.dup.force_encoding("binary")
+        v = r.value.force_encoding("binary")
+        request << [r.db_id, k.length, v.length, r.expire.to_i >> 32, 
+                    r.expire.to_i & 0x00000000FFFFFFFF].pack("nN*") << k << v
       end
 
       @socket.write(request)
@@ -49,7 +51,8 @@ module Kyototycoon
       request = header_entries.pack("CNN")
 
       records.each do |r|
-        request << [r.db_id, r.key.length].pack("nN") << r.key
+        k = r.key.dup.force_encoding('binary')
+        request << [r.db_id, k.length].pack("nN") << k
       end
 
       @socket.write(request)
@@ -63,14 +66,13 @@ module Kyototycoon
       count.times do |i|
         res_body = @socket.read(18)
 
-        dbid, keysize, valuesize, ext_expire, expire = res_body.unpack("nNNNN")
+        dbid, keysize, valuesize, ext_expire, expire = res_body.unpack("nN*")
         expire = ext_expire << 32 | expire
 
         key = @socket.read(keysize)
         value = @socket.read(valuesize)
-        results.push(Record.new(key, value, dbid, expire))
+        results.push(Record.new(key.dup.force_encoding('UTF-8'), value.force_encoding('UTF-8'), expire, dbid))
       end
-
       results
     end
 
@@ -79,7 +81,8 @@ module Kyototycoon
       request = header_entries.pack("CNN")
 
       records.each do |r|
-        request <<  [r.db_id, r.key.length].pack("nN") << r.key
+        k = r.key.dup.force_encoding('binary')
+        request <<  [r.db_id, k.length].pack("nN") << k
       end
 
       @socket.write(request)
@@ -97,7 +100,9 @@ module Kyototycoon
       request = header_entries.pack("CNN")
 
       records.each do |r|
-        request << [r.key.length, r.value.length].pack("NN") << r.key << r.value
+        k = r.key.dup.force_encoding("binary")
+        v = r.value.force_encoding("binary")
+        request << [k.length, v.length].pack("NN") << k << v
       end
 
       @socket.write(request)
@@ -113,7 +118,7 @@ module Kyototycoon
         keysize, valuesize = res_body.unpack("NN")
         key = @socket.read(keysize)
         value = @socket.read(valuesize)
-        results.push(Record.new(key, value, 0, 0))
+        results.push(Record.new(key.dup.force_encoding('UTF-8'), value.force_encoding('UTF-8'), 0, 0))
       end
 
       results

data/lib/kyototycoon/client/version.rb

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

data/test/kyototycoon/client/test_client.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 require "helper"
 
 class ClientTest < Test::Unit::TestCase
@@ -26,6 +27,16 @@ class ClientTest < Test::Unit::TestCase
     @client.close
   end
 
+  def test_clud_multibyte_characters
+    @client.open
+    assert_equal(@client.set("あ", "あいのまち"), true)
+    assert_equal(@client.get("あ"), "あいのまち")
+    assert_nil(@client.get("ん"))
+    assert_equal(@client.remove("あ"), true)
+    assert_nil(@client.get("あ"))
+    @client.close
+  end
+
   def test_clud_bulk
     @client.open
     @client.remove_bulk(["key1", "key2", "key3", "key4"])
@@ -39,6 +50,19 @@ class ClientTest < Test::Unit::TestCase
     @client.close
   end
 
+  def test_clud_bulk_multibyte_charactors
+    @client.open
+    @client.remove_bulk(["あ", "い", "う", "え"])
+
+    assert_equal( @client.set_bulk( {"あ" => "あいのまち", "い" => "いしかずちょう", "う" => "ういろうのちょう"} ), 3)
+    assert_equal( @client.get_bulk( ["あ", "い", "う", "え"] ),
+                  {"あ" => "あいのまち", "い" => "いしかずちょう", "う" => "ういろうのちょう"} )
+    assert_equal( @client.remove_bulk( ["あ", "い"] ), 2 )
+    assert_equal( @client.get_bulk( ["あ", "い", "う", "え"] ),
+                  {"う" => "ういろうのちょう"} )
+    @client.close
+  end
+
   def test_expire
     @client.open
     assert_equal(@client.set_bulk( {"key1" => ["value1", 1]} ), 1)   # expire after 1 second
@@ -55,15 +79,36 @@ class ClientTest < Test::Unit::TestCase
     assert_equal(@client.get("key2"), "value2")
     assert_equal(@client.get("key3"), "value3")
     assert_equal(@client.get("key4"), nil)
+    @client.remove_bulk( ["key2", "key3"] )
+    @client.close
+  end
+
+  def test_expire_multibyte_characters
+    @client.open
+    assert_equal(@client.set_bulk( {"あ" => ["あいのまち", 1]} ), 1)   # expire after 1 second
+    assert_equal(@client.set_bulk( {"い" => "いしかずちょう"} ), 1)        # not expire
+    assert_equal(@client.set("う", "ういろうのちょう"), true)                # not expire
+    assert_equal(@client.set("え", "えびすがわ", 1), true)             # expire after 1 second
+
+    assert_equal(@client.get("あ"), "あいのまち")
+    assert_equal(@client.get("い"), "いしかずちょう")
+    assert_equal(@client.get("う"), "ういろうのちょう")
+    assert_equal(@client.get("え"), "えびすがわ")
+    sleep 3
+    assert_equal(@client.get("あ"), nil)
+    assert_equal(@client.get("い"), "いしかずちょう")
+    assert_equal(@client.get("う"), "ういろうのちょう")
+    assert_equal(@client.get("え"), nil)
+    @client.remove_bulk( ["い", "う"] )
     @client.close
   end
 
   def test_dbid
     @client.open
-    assert_equal(@client.set_bulk( {"key1" => "value1"}, 0 ), 1)
-    assert_equal(@client.set_bulk( {"key1" => "value1"}, 1 ), 0)
-    assert_equal(@client.get("key1", 0), "value1")
-    assert_equal(@client.get("key1", 1), nil)
+    assert_equal(@client.set_bulk( {"あ" => "あいのまち"}, 0 ), 1)
+    assert_equal(@client.set_bulk( {"あ" => "あいのまち"}, 1 ), 0)
+    assert_equal(@client.get("あ", 0), "あいのまち")
+    assert_equal(@client.get("あ", 1), nil)
     @client.close
   end
 

metadata

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