lib/riddle/client/response.rb in riddle-1.5.1 vs lib/riddle/client/response.rb in riddle-1.5.2
- old
+ new
@@ -8,84 +8,84 @@
# Create with the data to interpret
def initialize(str)
@str = str
@marker = 0
end
-
+
# Return the next string value in the stream
def next
len = next_int
result = @str[@marker, len]
@marker += len
-
+
Riddle.encode(result)
end
-
+
# Return the next integer value from the stream
def next_int
int = @str[@marker, 4].unpack('N*').first
@marker += 4
-
+
int
end
-
+
def next_64bit_int
high, low = @str[@marker, 8].unpack('N*N*')[0..1]
@marker += 8
-
+
(high << 32) + low
end
-
+
# Return the next float value from the stream
def next_float
float = @str[@marker, 4].unpack('N*').pack('L').unpack('f*').first
@marker += 4
-
+
float
end
-
+
# Returns an array of string items
def next_array
count = next_int
items = []
count.times do
items << self.next
end
-
+
items
end
-
+
# Returns an array of int items
def next_int_array
count = next_int
items = []
count.times do
items << self.next_int
end
-
+
items
end
-
+
def next_float_array
count = next_int
items = []
count.times do
items << self.next_float
end
-
+
items
end
-
+
def next_64bit_int_array
- count = next_int
+ byte_count = next_int
items = []
- count.times do
+ (byte_count / 2).times do
items << self.next_64bit_int
end
-
+
items
end
-
+
# Returns the length of the streamed data
def length
@str.length
end
end