@@ -16,6 +16,20 @@ class Datagrammer when 's'; scanner.scan_string when 'i'; scanner.scan_integer when 'f'; scanner.scan_float + when 'T'; true + when 'F'; false + when 'N'; nil + # not supported yet: + # when 'b'; # blob + # when 'S'; # symbol + # when 't'; # OSC timetag + # when 'h'; # 64-bit integer + # when 'd'; # 64-bit "double" float + # when 'r'; # 32-bit RGBA color + # when 'm'; # four-byte midi message + # when 'I'; # infinity + # when '['; # beginning of array + # when ']'; # end of array end end arguments.unshift(message) @@ -46,6 +60,9 @@ class Datagrammer when String; 's' when Integer; 'i' when Float; 'f' + when TrueClass; 'T' + when FalseClass; 'F' + when NilClass; 'N' end end.join pad(str) @@ -57,6 +74,7 @@ class Datagrammer when String; pad(argument) when Integer; [argument].pack('N') when Float; [argument].pack('g') + when TrueClass, FalseClass, NilClass; # no arguments end end.join end lib/datagrammer/packet.rb @@ -26,11 +26,22 @@ describe Datagrammer::Packet do encoded = "tick\n\000\000\000,ii\000\000\000\000\n\000\000\334\n" Datagrammer::Packet.decode(encoded).should == ["tick\n", 10, 56330] end + + it "handles encoded booleans correctly" do + encoded = "boolean\000,TF\000" + Datagrammer::Packet.decode(encoded).should == ["boolean", true, false] + end + + it "handles encoded nils correctly" do + encoded = "nil\000,N\000\000" + Datagrammer::Packet.decode(encoded).should == ["nil", nil] + end end describe "encode" do [ [['hello'], "hello\000\000\000,\000\000\000"], [['hello','world'], "hello\000\000\000,s\000\000world\000\000\000"], + [['hello', true, false, nil], "hello\000\000\000,TFN\000\000\000\000"], [['hello', 'world', 1, 2.0], "hello\000\000\000,sif\000\000\000\000world\000\000\000\000\000\000\001@\000\000\000"] ].each do |message, expected| describe "message: #{message.join(', ')}" do spec/packet_spec.rb 1240aaecab6f4321e4c5e6ba1994ba67506c15ac Matt Lyon matt@flowerpowered.com http://github.com/mattly/datagrammer/commit/ff5d3244e08e44d6129c8769fa81cccdc5ef5239 ff5d3244e08e44d6129c8769fa81cccdc5ef5239 2008-11-08T09:52:09-08:00 2008-11-08T09:52:09-08:00 packet encodes and decodes booleans and nils 5f4fd663eeff87ad75f324704ba458939d1eaccd Matt Lyon matt@flowerpowered.com