zkruby 3.4.4.rc4 → 3.4.4.rc5

data/lib/zkruby/bindata.rb

@@ -2,22 +2,31 @@
 require 'bindata'
 module ZooKeeper
 
-    class ZKBuffer < BinData::Primitive
-        int32be  :len,  :value => lambda { data.nil? ? -1 : data.length }
-        string :data, :read_length => :len
+    class ZKBuffer < BinData::BasePrimitive
 
-        def get;   self.data; end
-        def set(v) self.data = v; end
+        def value_to_binary_string(v)
+            vlen = v.nil? ? -1 : v.length
+            [ vlen, v ].pack("NA*")
+        end
+
+        def read_and_return_value(io)
+            vlen = io.readbytes(4).unpack("i!>")[0]
+            vlen < 0 ? nil : io.readbytes(vlen)
+        end
+
+        def sensible_default
+            nil
+        end
     end
 
-    class ZKString < BinData::Primitive
-        int32be  :len,  :value => lambda { data.nil? ? -1 : data.length }
-        string :data, :read_length => :len
+    class ZKString < ZKBuffer
+        def read_and_return_value(io)
+            value = super
+            value.force_encoding('UTF-8') unless value.nil?
+        end
 
-        def get;   self.data; end
-        def set(v) self.data = v; end
-        def snapshot
-            super.force_encoding('UTF-8')
+        def sensible_default
+            ""
         end
     end
 

data/lib/zkruby/client.rb

@@ -333,7 +333,7 @@ module ZooKeeper
             req = Proto::GetDataRequest.new(:path => path, :watch => watch)
 
             queue_request(req,:get,4,Proto::GetDataResponse,:data,watch) do | response |
-                blk.call( response.stat, response.data.to_s)
+                blk.call( response.stat, response.data.value)
             end
         end
 

data/lib/zkruby/session.rb

@@ -329,7 +329,7 @@ module ZooKeeper
             req = Proto::ConnectRequest.new( :timeout => timeout )
             req.last_zxid_seen = @last_zxid_seen if @last_zxid_seen
             req.session_id =  @session_id if @session_id
-            req.passwd = @session_passwd if @session_passwd
+            req.passwd = @session_passwd || ""
             conn.send_records(req)
         end
 

data/lib/zkruby/version.rb

@@ -1,5 +1,5 @@
 
 module ZooKeeper
     # Major/Minor numbers track zookeeper itself, final digit is our build number
-    VERSION = "3.4.4.rc4"
+    VERSION = "3.4.4.rc5"
 end

data/spec/bindata_spec.rb

@@ -5,6 +5,48 @@ class ZKBTest < BinData::Record
     zk_boolean :bool
 end
 
+class ZKBufferTest < BinData::Record
+    zk_buffer :buff
+end
+class ZKStringTest < BinData::Record
+    zk_string :str
+end
+
+describe ZK::ZKBuffer do
+
+    it "should read null values" do
+        hex = "ffffffff"
+        bin = [ hex ].pack("H*")
+        
+        buffer = ZKBufferTest.read(bin)
+
+        buffer.buff.should == nil
+        buffer.buff.value.should be_nil
+    end
+
+    it "should write null values" do
+        buffer = ZK::ZKBuffer.new(nil)
+        buffer.value.should be_nil
+        buffer.to_binary_s.should == [ "ffffffff" ].pack("H*")
+    end
+
+    it "should read non null values as binary strings"
+    it "should write non null values"
+    it "should write encoded calues as binary strings"
+end
+
+describe ZK::ZKString do
+    it "should produce UTF8 encoded strings" do
+       
+        hex = "000000086162636465666768"  
+        bin = [ hex ].pack("H*")
+        zk_string = ZKStringTest.read(bin)
+        zk_string.str.should == "abcdefgh"
+        zk_string.str.encoding.name.should == "UTF-8"
+
+    end
+end
+
 describe ZK::ZKBoolean do
 
     it "should behave like 'false' after reading 00" do

data/spec/shared/basic.rb

@@ -37,6 +37,25 @@ shared_examples_for "basic integration" do
         @zk.exists?("/zkruby/rspec").should be_false
     end
 
+    it "should differentiate null data from empty strings" do
+        path = @zk.create("/zkruby/rspec",nil,ZK::ACL_OPEN_UNSAFE,:ephemeral)
+        stat,data = @zk.get(path)
+        data.should be_nil
+        # this isn't very helpful
+        stat.data_length.should == 0
+
+        @zk.set(path,"",-1)
+        stat,data = @zk.get(path)
+        data.should == ""
+        stat.data_length.should == 0
+
+        @zk.set(path,nil,-1)
+        stat,data = @zk.get(path)
+        data.should be_nil
+        # this isn't very helpful
+        stat.data_length.should == 0
+    end
+
     it "should accept -1 to delete any version" do
         path = @zk.create("/zkruby/rspec","someData",ZK::ACL_OPEN_UNSAFE,:ephemeral)
         @zk.delete("/zkruby/rspec",-1)

data/zkruby.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   # Yard options in .yardopts
 
   s.add_dependency 'slf4r' , '~> 0.4.2'
-  s.add_dependency 'bindata', '~> 1.4.1'
+  s.add_dependency 'bindata', '~> 1.8.2'
 
   s.add_development_dependency 'eventmachine', '>= 0.12.10'
   s.add_development_dependency 'empathy', '>=0.1.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zkruby
 version: !ruby/object:Gem::Version
-  version: 3.4.4.rc4
+  version: 3.4.4.rc5
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-27 00:00:00.000000000 Z
+date: 2014-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slf4r
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.8.2
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -253,6 +253,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2894475851857234874
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -261,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Pure Ruby language binding for ZooKeeper