voldemort-rb 0.1.5 → 0.1.6

data/lib/connection/connection.rb

@@ -1,7 +1,5 @@
-require 'json'
 require 'nokogiri'
 
-
 class Connection
 
   attr_accessor :hosts          # The hosts from where we bootstrapped.
@@ -36,25 +34,25 @@ class Connection
   def bootstrap
     cluster_response = self.get_from("metadata", "cluster.xml", false)
     cluster_xml_doc = Nokogiri::XML(cluster_response[1][0][1])
-    self.nodes = self.parse_nodes_from(cluster_xml_doc)   
-    
+    self.nodes = self.parse_nodes_from(cluster_xml_doc)
+
     stores_response = self.get_from("metadata", "stores.xml", false)
 
     stores_xml = stores_response[1][0][1]
-    
+
     doc = Nokogiri::XML(stores_xml)
-  
-    self.key_serializer_type = self.parse_schema_type(doc, 'key-serializer') 
+
+    self.key_serializer_type = self.parse_schema_type(doc, 'key-serializer')
     self.value_serializer_type = self.parse_schema_type(doc, 'value-serializer')
     self.key_serializer_schemas = self.parse_schema_from(doc, 'key-serializer')
     self.value_serializer_schemas = self.parse_schema_from(doc, 'value-serializer')
-     
+
     self.connect_to_random_node
-   
+
   rescue StandardError => e
      raise("There was an error trying to bootstrap from the specified servers: #{e}")
   end
-  
+
   def connect_to_random_node
     nodes = self.nodes.sort_by { rand }
     for node in nodes do
@@ -65,7 +63,7 @@ class Connection
       end
     end
   end
-  
+
   def parse_schema_type(doc, serializer = 'value-serializer')
     type_doc = doc.xpath("//stores/store[name = \"#{self.db_name}\"]/#{serializer}/type")
     if(type_doc != nil)
@@ -73,17 +71,16 @@ class Connection
     else
       return nil
     end
-  end  
-  
+  end
+
   def parse_schema_from(doc, serializer = 'value-serializer')
     parsed_schemas = {}
     doc.xpath("//stores/store[name = \"#{self.db_name}\"]/#{serializer}/schema-info").each do |value_serializer|
       parsed_schemas[value_serializer.attributes['version'].text] = value_serializer.text
     end
     return parsed_schemas
-  end  
-  
-  
+  end
+
   def parse_nodes_from(doc)
     nodes = []
     doc.xpath("/cluster/server").each do |n|

data/lib/voldemort-serializer.rb

@@ -83,16 +83,26 @@ class VoldemortJsonBinarySerializer
     	end
     else
       case(type)
-        when 'string': bytes << write_string(object)
-        when 'int8': bytes << write_int8(object)
-        when 'int16': bytes << write_int16(object)
-        when 'int32': bytes << write_int32(object)
-        when 'int64': bytes << write_int64(object)
-        when 'float32': bytes << write_float32(object)
-        when 'float64': bytes << write_float64(object)
-        when 'date': bytes << write_date(object)
-        when 'bytes': bytes << write_bytes(object)
-        when 'boolean': bytes << write_boolean(object)
+        when 'string'
+          bytes << write_string(object)
+        when 'int8'
+          bytes << write_int8(object)
+        when 'int16'
+          bytes << write_int16(object)
+        when 'int32'
+          bytes << write_int32(object)
+        when 'int64'
+          bytes << write_int64(object)
+        when 'float32'
+          bytes << write_float32(object)
+        when 'float64'
+          bytes << write_float64(object)
+        when 'date'
+          bytes << write_date(object)
+        when 'bytes'
+          bytes << write_bytes(object)
+        when 'boolean'
+          bytes << write_boolean(object)
         else
           # TODO throw unsupported type exception
       end
@@ -329,16 +339,26 @@ class VoldemortJsonBinarySerializer
       return read_list(bytes, type)
     else
       case(type)
-        when 'string': return read_bytes(bytes)
-        when 'int8': return read_int8(bytes)
-        when 'int16': return read_int16(bytes)
-        when 'int32': return read_int32(bytes)
-        when 'int64': return read_int64(bytes)
-        when 'float32': return read_float32(bytes)
-        when 'float64': return read_float64(bytes)
-        when 'date': return read_date(bytes)
-        when 'bytes': return read_bytes(bytes)
-        when 'boolean': return read_boolean(bytes)
+        when 'string'
+          return read_bytes(bytes)
+        when 'int8'
+          return read_int8(bytes)
+        when 'int16'
+          return read_int16(bytes)
+        when 'int32'
+          return read_int32(bytes)
+        when 'int64'
+          return read_int64(bytes)
+        when 'float32'
+          return read_float32(bytes)
+        when 'float64'
+          return read_float64(bytes)
+        when 'date'
+          return read_date(bytes)
+        when 'bytes'
+          return read_bytes(bytes)
+        when 'boolean'
+          return read_boolean(bytes)
         # TODO default throw unknown type exception
       end
     end

data/spec/connection_spec.rb

@@ -23,7 +23,8 @@ describe Connection do
     it "should parse nodes from xml" do
       @connection.should respond_to(:parse_nodes_from)
       xml = "<cluster>\r\n  <name>mycluster</name>\r\n  <server>\r\n    <id>0</id>\r\n    <host>localhost</host>\r\n    <http-port>8081</http-port>\r\n    <socket-port>6666</socket-port>\r\n    <admin-port>6667</admin-port>\r\n    <partitions>0, 1</partitions>\r\n  </server>\r\n</cluster>"
-      nodes = @connection.parse_nodes_from(xml)
+      doc = Nokogiri::XML(xml)
+      nodes = @connection.parse_nodes_from(doc)
       nodes.first.host.should eql("localhost")
       nodes.first.port.should eql("6666")
       nodes.length.should eql(1)

data/spec/voldemort_client_spec.rb

@@ -6,6 +6,8 @@ describe VoldemortClient do
 
   before(:each) do
     connection = mock(TCPConnection)
+    connection.stub!(:key_serializer_type).and_return("string")
+    connection.stub!(:value_serializer_type).and_return("string")
     node = mock(VoldemortNode)
     connection.stub!(:bootstrap).and_return(node)
     TCPConnection.stub!(:new).and_return(connection)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: voldemort-rb
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Alejandro Crosa
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-18 00:00:00 -03:00
+date: 2011-05-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency