kyototycoon-client 0.0.5 → 0.0.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f7e73da497ce6d2c925987e974083238447360b5
+  data.tar.gz: a9f89abc3fdf1998926a2e8a8e62ad9c86cdc3f9
+SHA512:
+  metadata.gz: b8654438189056f4f5f7bc2080c7bb36fdd05b66487abe6c8d4b7c4d25b9c4c93830cf7b19204f251fb860c0d096179ce530063294b2023081c5420e74a706d7
+  data.tar.gz: 94bae80a1a18b9bd7fe5ccbd8ec0992e89f89f76b193f3b5da9ea8505794bcae6dd1e2a501a1586a15c98c31a2a6354d5c266f8cb287719adc775eb284bc5421

data/README.md

@@ -5,6 +5,10 @@ KyotoTycoon ruby client with TCP connection and binary protocol.
 ## Changelog
 
 * 0.0.2: Add dbid parameter to remove_bulk
+* 0.0.3: Do nothing if record is empty
+* 0.0.4: Support multibyte characters
+* 0.0.5: Fixed empty key bug
+* 0.0.6: Fixed script protocol bug
 
 
 ## Installation
@@ -75,3 +79,8 @@ Client receives response as key-value set format.
     => {"keyX" => "valueX", "keyY" => "valueY", ... } 
 
 Number of key sent and number of key received are depend on LUA function definition.
+
+You can test script protocol as below:
+
+    ktserver -port [your port] -scr test/lua/echo.lua
+    rake test HOST=localhost PORT=[your port] SCRIPT=1

data/lib/kyototycoon/client.rb

@@ -84,7 +84,7 @@ module Kyototycoon
       keyvalues.each do |k, v|
         records.push(Record.new(k, v))
       end
-      results = @connection.script(records)
+      results = @connection.script(method, records)
       return {} if results == nil
       results.inject({}) {|map, rec| map[rec.key] = rec.value; map;}
     end

data/lib/kyototycoon/client/connection.rb

@@ -95,9 +95,10 @@ module Kyototycoon
       count.to_i # number of registerd
     end
 
-    def script(records)
-      header_entries = [Magic::PLAY_SCRIPT, Flag::RESERVED, records.length]
-      request = header_entries.pack("CNN")
+    def script(method, records)
+      header_entries = [Magic::PLAY_SCRIPT, Flag::RESERVED, method.length, records.length]
+      request = header_entries.pack("CNNN")
+      request << method.dup.force_encoding("binary")
 
       records.each do |r|
         k = r.key.dup.force_encoding("binary")

data/lib/kyototycoon/client/version.rb

@@ -1,5 +1,5 @@
 module Kyototycoon
   class Client
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/test/kyototycoon/client/test_client.rb

@@ -147,14 +147,15 @@ class ClientTest < Test::Unit::TestCase
   end
 
 
-  # def test_script
-  #   return unless @client
-
-  #  @client.open
-  #  assert_equal( @client.script("dummy", "key", "value"), {} )
-  #  assert_equal( @client.script_bulk("dummy", {}), {} )
-  #  @client.close
-  # end
+  def test_script
+    return unless ENV["SCRIPT"].to_i == 1
+    return unless @client
+
+    @client.open
+    assert_equal( @client.script("echo", "key", "value"), {"key" => "value"} )
+    assert_equal( @client.script_bulk("echo", {"key" => "value", "foo" => "bar"}), {"key" => "value", "foo" => "bar"} )
+    @client.close
+  end
 end
 
 class MockConnection

data/test/lua/echo.lua

@@ -0,0 +1,12 @@
+kt = __kyototycoon__
+db = kt.db
+
+function echo(inmap, outmap)
+
+  for k, v in pairs(inmap) do
+    outmap[k] = v
+  end
+
+  return kt.RVSUCCESS
+
+end

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: kyototycoon-client
 version: !ruby/object:Gem::Version
-  version: 0.0.5
-  prerelease: 
+  version: 0.0.6
 platform: ruby
 authors:
 - imasho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: KyotoTycoon binary access module, supports get(bulk), set(bulk), remove(bulk),
@@ -51,7 +46,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -66,32 +61,33 @@ files:
 - test/benchmark.rb
 - test/helper.rb
 - test/kyototycoon/client/test_client.rb
+- test/lua/echo.lua
 homepage: ''
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: KyotoTycoon binary access module
 test_files:
 - test/benchmark.rb
 - test/helper.rb
 - test/kyototycoon/client/test_client.rb
+- test/lua/echo.lua