Merge branch 'master' of git://github.com/jimm/mongo-ruby-driver

lib/mongo/util/byte_buffer.rb

@@ -97,13 +97,15 @@ class ByteBuffer
     end
   end
 
-  # If +size+ == 1, returns one byte. Else returns array of bytes of length
-  # +size+.
-  def get(len=1)
+  # If +size+ == nil, returns one byte. Else returns array of bytes of length
+  # # +size+.
+  def get(len=nil)
+    one_byte = len.nil?
+    len ||= 1
     check_read_length(len)
     start = @cursor
     @cursor += len
-    if len == 1
+    if one_byte
       @buf[start]
     else
       @buf[start, len]

tests/test_byte_buffer.rb

@@ -8,6 +8,24 @@ class ByteBufferTest < Test::Unit::TestCase
     @buf = ByteBuffer.new
   end
 
+  def test_nil_get_returns_one_byte
+    @buf.put_array([1, 2, 3, 4])
+    @buf.rewind
+    assert_equal 1, @buf.get
+  end
+
+  def test_one_get_returns_array_length_one
+    @buf.put_array([1, 2, 3, 4])
+    @buf.rewind
+    assert_equal [1], @buf.get(1)
+  end
+
+  def test_zero_get_returns_empty_array
+    @buf.put_array([1, 2, 3, 4])
+    @buf.rewind
+    assert_equal [], @buf.get(0)
+  end
+
   def test_empty
     assert_equal 0, @buf.length
   end