kyototycoon 0.5.1 → 0.5.2

data/Changes.md

@@ -1,3 +1,8 @@
+## v0.5.2
+
+* fixed encoded response handling
+* fixed miss named method
+
 ## v0.5.1
 
 * changing server dicision logic

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 uu59<a@tt25.org>
+Copyright (c) 2011 uu59<a@tt25.org>
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/kyototycoon.gemspec

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

data/lib/kyototycoon/tsvrpc/skinny.rb

@@ -22,18 +22,25 @@ class KyotoTycoon
         status = first_line[9, 3]
         bodylen = 0
         body = ""
+        colenc = nil
         loop do
           line = @sock.gets
+          if line['Content-Type'] && line['colenc=']
+            colenc = line.match(/colenc=([A-Z])/).to_a[1]
+            next
+          end
+
           if line['Content-Length']
             bodylen = line.match(/[0-9]+/)[0].to_i
             next
           end
+
           if line == "\r\n"
             break
           end
         end
         body = @sock.read(bodylen)
-        [status.to_i, body]
+        [status.to_i, Tsvrpc.decode_responce_body(body, colenc)]
       end
 
       def start

data/lib/kyototycoon/tsvrpc.rb

@@ -35,5 +35,24 @@ class KyotoTycoon
       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

@@ -281,7 +281,7 @@ class KyotoTycoon
     }
     if @checked_servers.nil?
       msg = "alived server not exists"
-      @logger.crit(msg)
+      @logger.fatal(msg)
       raise msg
     end
     @checked_servers

metadata

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