kyototycoon 0.5.2 → 0.5.3

data/Changes.md

@@ -1,3 +1,8 @@
+## v0.5.3
+
+* fixed bug using base64 encoding
+* regenerate socket when that closed
+
 ## v0.5.2
 
 * fixed encoded response handling

data/kyototycoon.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kyototycoon}
-  s.version = "0.5.2"
+  s.version = "0.5.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["uu59"]
-  s.date = %q{2011-01-03}
+  s.date = %q{2011-01-05}
   s.description = %q{KyotoTycoon client for Ruby}
   s.email = %q{a@tt25.org}
   s.extra_rdoc_files = [

data/lib/kyototycoon/tsvrpc/skinny.rb

@@ -40,10 +40,11 @@ class KyotoTycoon
           end
         end
         body = @sock.read(bodylen)
-        [status.to_i, Tsvrpc.decode_responce_body(body, colenc)]
+        [status.to_i, body, colenc]
       end
 
       def start
+        @sock = nil if @sock && @sock.closed?
         @sock ||= ::TCPSocket.new(@host, @port)
       end
 

data/lib/kyototycoon/tsvrpc.rb

@@ -3,9 +3,19 @@
 
 class KyotoTycoon
   module Tsvrpc
-    def self.parse(body)
+    def self.parse(body, colenc)
+      decoder = case colenc
+        when "U"
+          lambda{|body| CGI.unescape(body)}
+        when "B"
+          lambda{|body| Base64.decode64(body)}
+        when nil
+          lambda{|body| body}
+        else
+          raise "Unknown colenc(response) '#{colenc}'"
+      end
       body.split("\n").inject({}){|r, line|
-        k,v = *line.split("\t", 2).map{|v| CGI.unescape(v)}
+        k,v = *line.split("\t", 2).map{|v| decoder.call(v)}
         r[k] = v
         r
       }
@@ -14,45 +24,22 @@ class KyotoTycoon
     def self.build_query(params, colenc='U')
       query = ""
       if params
-        case colenc.to_s.upcase.to_sym
+        encoder = case colenc.to_s.upcase.to_sym
           when :U
-            query = params.inject([]){|r, tmp|
-              unless tmp.last.nil?
-                r << tmp.map{|v| CGI.escape(v.to_s)}.join("\t")
-              end
-              r
-            }.join("\r\n")
+            lambda{|body| CGI.escape(body.to_s)}
           when :B
-            query = params.inject([]){|r, tmp|
-              unless tmp.last.nil?
-                r << tmp.map{|v| Base64.encode64(v.to_s).rstrip}.join("\t")
-              end
-              r
-            }.join("\r\n")
+            lambda{|body| [body.to_s].pack('m').gsub("\n","")}
           else
             raise "Unknown colenc '#{colenc}'"
         end
+        query = params.inject([]){|r, tmp|
+          unless tmp.last.nil?
+            r << tmp.map{|v| encoder.call(v)}.join("\t")
+          end
+          r
+        }.join("\r\n")
       end
       query
     end
-
-    def self.decode_responce_body(body, colenc)
-      case colenc
-        when "B"
-          body.split("\n").map{|row|
-            row.split("\t").map{|col| Base64.decode64(col)}.join("\t")
-          }.join("\n")
-        when "U"
-          body.split("\n").map{|row|
-            row.split("\t").map{|col|
-              CGI.unescape(col)
-            }.join("\t")
-          }.join("\n")
-        when nil
-          body
-        else
-          raise "Unknown colenc(response) '#{colenc}'"
-      end
-    end
   end
 end

data/lib/kyototycoon.rb

@@ -13,7 +13,7 @@ require "kyototycoon/tsvrpc/skinny.rb"
 require "kyototycoon/stream.rb"
 
 class KyotoTycoon
-  VERSION = '0.5.1'
+  VERSION = '0.5.3'
 
   attr_accessor :colenc, :connect_timeout, :servers
   attr_reader :serializer, :logger, :db
@@ -67,7 +67,7 @@ class KyotoTycoon
 
   def get(key)
     res = request('/rpc/get', {:key => key})
-    @serializer.decode(Tsvrpc.parse(res[:body])['value'])
+    @serializer.decode(Tsvrpc.parse(res[:body], res[:colenc])['value'])
   end
   alias_method :[], :get
 
@@ -78,18 +78,18 @@ class KyotoTycoon
 
   def set(key, value, xt=nil)
     res = request('/rpc/set', {:key => key, :value => @serializer.encode(value), :xt => xt})
-    Tsvrpc.parse(res[:body])
+    Tsvrpc.parse(res[:body], res[:colenc])
   end
   alias_method :[]=, :set
 
   def add(key, value, xt=nil)
     res = request('/rpc/add', {:key => key, :value => @serializer.encode(value), :xt => xt})
-    Tsvrpc.parse(res[:body])
+    Tsvrpc.parse(res[:body], res[:colenc])
   end
 
   def replace(key, value, xt=nil)
     res = request('/rpc/replace', {:key => key, :value => @serializer.encode(value), :xt => xt})
-    Tsvrpc.parse(res[:body])
+    Tsvrpc.parse(res[:body], res[:colenc])
   end
 
   def append(key, value, xt=nil)
@@ -108,7 +108,7 @@ class KyotoTycoon
 
   def increment(key, num=1, xt=nil)
     res = request('/rpc/increment', {:key => key, :num => num, :xt => xt})
-    Tsvrpc.parse(res[:body])['num'].to_i
+    Tsvrpc.parse(res[:body], res[:colenc])['num'].to_i
   end
   alias_method :incr, :increment
 
@@ -119,7 +119,7 @@ class KyotoTycoon
 
   def increment_double(key, num, xt=nil)
     res = request('/rpc/increment_double', {:key => key, :num => num, :xt => xt})
-    Tsvrpc.parse(res[:body])['num'].to_f
+    Tsvrpc.parse(res[:body], res[:colenc])['num'].to_f
   end
 
   def set_bulk(records)
@@ -129,7 +129,7 @@ class KyotoTycoon
       values["_#{k}"] = @serializer.encode(v)
     }
     res = request('/rpc/set_bulk', values)
-    Tsvrpc.parse(res[:body])
+    Tsvrpc.parse(res[:body], res[:colenc])
   end
 
   def get_bulk(keys)
@@ -139,7 +139,7 @@ class KyotoTycoon
     }
     res = request('/rpc/get_bulk', params)
     ret = {}
-    Tsvrpc.parse(res[:body]).each{|k,v|
+    Tsvrpc.parse(res[:body], res[:colenc]).each{|k,v|
       ret[k] = k.match(/^_/) ? @serializer.decode(v) : v
     }
     ret
@@ -151,7 +151,7 @@ class KyotoTycoon
       params
     }
     res = request('/rpc/remove_bulk', params)
-    Tsvrpc.parse(res[:body])
+    Tsvrpc.parse(res[:body], res[:colenc])
   end
 
   def clear
@@ -169,23 +169,23 @@ class KyotoTycoon
 
   def echo(value)
     res = request('/rpc/echo', value)
-    Tsvrpc.parse(res[:body])
+    Tsvrpc.parse(res[:body], res[:colenc])
   end
 
   def report
     res = request('/rpc/report')
-    Tsvrpc.parse(res[:body])
+    Tsvrpc.parse(res[:body], res[:colenc])
   end
 
   def status
     res = request('/rpc/status')
-    Tsvrpc.parse(res[:body])
+    Tsvrpc.parse(res[:body], res[:colenc])
   end
 
   def match_prefix(prefix)
     res = request('/rpc/match_prefix', {:prefix => prefix})
     keys = []
-    Tsvrpc.parse(res[:body]).each{|k,v|
+    Tsvrpc.parse(res[:body], res[:colenc]).each{|k,v|
       if k != 'num'
         keys << k[1, k.length]
       end
@@ -199,7 +199,7 @@ class KyotoTycoon
     end
     res = request('/rpc/match_regex', {:regex => re})
     keys = []
-    Tsvrpc.parse(res[:body]).each{|k,v|
+    Tsvrpc.parse(res[:body], res[:colenc]).each{|k,v|
       if k != 'num'
         keys << k[1, k.length]
       end
@@ -217,11 +217,11 @@ class KyotoTycoon
       params[:DB] = @db
     end
 
-    status,body = client.request(path, params, @colenc)
+    status,body,colenc = client.request(path, params, @colenc)
     if ![200, 450].include?(status.to_i)
       raise body
     end
-    res = {:status => status, :body => body}
+    res = {:status => status, :body => body, :colenc => colenc}
     @logger.info("#{path}: #{res[:status]} with query parameters #{params.inspect}")
     res
   end

data/spec/helper.rb

@@ -64,6 +64,10 @@ describe do
     @kt[:a] = 1
     @kt[:b] = 1
     @kt.keys.sort.should == %w!a b!.sort
+    @kt.clear
+
+    @kt[:longvalue] = "-" * 2048
+    @kt[:longvalue].should == '-' * 2048
   end
 
   it 'should provide bulk' do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - uu59
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-03 00:00:00 +09:00
+date: 2011-01-05 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency