From 6388c9439d0e9b6feba0495ec3b1e22e836d17a6 Mon Sep 17 00:00:00 2001
From: Alejandro Crosa <acrosa@linkedin.com>
Date: Fri, 12 Aug 2011 14:20:18 -0700
Subject: [PATCH] Added multiple fixes to the voldemort ruby client

---
 clients/ruby/lib/connection/connection.rb     | 18 +++++++++---------
 clients/ruby/lib/connection/tcp_connection.rb |  8 ++++----
 clients/ruby/lib/voldemort-serializer.rb      |  2 +-
 clients/ruby/voldemort-rb.gemspec             |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/clients/ruby/lib/connection/connection.rb b/clients/ruby/lib/connection/connection.rb
index 0cc07eb5ae..919bd5d5b1 100644
--- a/clients/ruby/lib/connection/connection.rb
+++ b/clients/ruby/lib/connection/connection.rb
@@ -85,12 +85,12 @@ def parse_nodes_from(doc)
     nodes = []
     doc.xpath("/cluster/server").each do |n|
       node = VoldemortNode.new      
-      node.id = n.xpath("//id").text
-      node.host = n.xpath("//host").text
-      node.port = n.xpath("//socket-port").text
-      node.http_port = n.xpath("//http_port").text
-      node.admin_port = n.xpath("//admin-port").text
-      node.partitions = n.xpath("//partitions").text
+      node.id = n.xpath("id").text
+      node.host = n.xpath("host").text
+      node.port = n.xpath("socket-port").text
+      node.http_port = n.xpath("http_port").text
+      node.admin_port = n.xpath("admin-port").text
+      node.partitions = n.xpath("partitions").text
       nodes << node
     end
     nodes
@@ -128,15 +128,15 @@ def rebalance_connection_if_needed
 
   def get(key)
     self.rebalance_connection_if_needed
-    self.get_from(self.db_name, key, true)
+    self.get_from(self.db_name, key, false)
   end
 
   def get_all(keys)
     self.rebalance_connection_if_needed
-    self.get_all_from(self.db_name, keys, true)
+    self.get_all_from(self.db_name, keys, false)
   end
 
-  def put(key, value, version = nil, route = true)
+  def put(key, value, version = nil, route = false)
     self.rebalance_connection_if_needed
     self.put_from(self.db_name, key, value, version, route)
   end
diff --git a/clients/ruby/lib/connection/tcp_connection.rb b/clients/ruby/lib/connection/tcp_connection.rb
index 4e369e2982..94fc97dde3 100644
--- a/clients/ruby/lib/connection/tcp_connection.rb
+++ b/clients/ruby/lib/connection/tcp_connection.rb
@@ -28,7 +28,7 @@ def connect_to(host, port)
     end
   end
 
-  def get_from(db_name, key, route = true)
+  def get_from(db_name, key, route = false)
     request = VoldemortRequest.new
     request.should_route = route
     request.store = db_name
@@ -43,7 +43,7 @@ def get_from(db_name, key, route = true)
     response
   end
 
-  def get_all_from(db_name, keys, route = true)
+  def get_all_from(db_name, keys, route = false)
     request = VoldemortRequest.new
     request.should_route = route
     request.store = db_name
@@ -58,7 +58,7 @@ def get_all_from(db_name, keys, route = true)
     response
   end
 
-  def put_from(db_name, key, value, version = nil, route = true)
+  def put_from(db_name, key, value, version = nil, route = false)
     version = get_version(key) unless version
     request = VoldemortRequest.new
     request.should_route = route
@@ -80,7 +80,7 @@ def put_from(db_name, key, value, version = nil, route = true)
     version
   end
 
-  def delete_from(db_name, key, version = nil, route = true)
+  def delete_from(db_name, key, version = nil, route = false)
     version = get_version(key) unless version
     request = VoldemortRequest.new
     request.should_route = route
diff --git a/clients/ruby/lib/voldemort-serializer.rb b/clients/ruby/lib/voldemort-serializer.rb
index 7b76fe66a3..ce7a2b8ae5 100644
--- a/clients/ruby/lib/voldemort-serializer.rb
+++ b/clients/ruby/lib/voldemort-serializer.rb
@@ -54,7 +54,7 @@ def read_slice(length, bytes)
   
   def to_bytes(object)
     bytes = ''
-    newest_version = 0 # TODO get highest number from map
+    newest_version = type_def_versions.size > 0 ? (type_def_versions.size-1) : 0
     type_def = @type_def_versions[newest_version]
     
     if(@has_version)
diff --git a/clients/ruby/voldemort-rb.gemspec b/clients/ruby/voldemort-rb.gemspec
index aaf1961c56..2c0d76f0a5 100644
--- a/clients/ruby/voldemort-rb.gemspec
+++ b/clients/ruby/voldemort-rb.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'voldemort-rb'
-  s.version = '0.1.5'
+  s.version = '0.1.8'
   s.summary = %{A Ruby client for the Voldemort distributed key value store}
   s.description = %Q{voldemort-rb allows you to connect to the Voldemort descentralized key value store.}
   s.authors = ["Alejandro Crosa"]