Merge pull request #33 from iced/master

Proper use of null for jiffy-style encoding/decoding.

Author: kuenishi

src/msgpack.erl

@@ -166,15 +166,15 @@ parse_options([{ext, {Packer,Unpacker}}|TL], Opt0) when
 -include_lib("eunit/include/eunit.hrl").
 
 test_data()->
-    [true, false, nil,
+    [true, false, null,
      0, 1, 2, 123, 512, 1230, 678908, 16#FFFFFFFFFF,
      -1, -23, -512, -1230, -567898, -16#FFFFFFFFFF,
      -16#80000001,
      123.123, -234.4355, 1.0e-34, 1.0e64,
      [23, 234, 0.23],
      <<"hogehoge">>, <<"243546rf7g68h798j", 0, 23, 255>>,
      <<"hoasfdafdas][">>,
-     [0,42, <<"sum">>, [1,2]], [1,42, nil, [3]],
+     [0,42, <<"sum">>, [1,2]], [1,42, null, [3]],
      -234, -40000, -16#10000000, -16#100000000,
      42
     ].

src/msgpack_packer.erl

@@ -34,8 +34,10 @@ pack(F, _) when is_float(F) ->
     pack_double(F);
 pack(null, _Opt = ?OPTION{interface=jsx}) ->
     << 16#C0:8 >>;
+pack(null, _Opt = ?OPTION{interface=jiffy}) ->
+    << 16#C0:8 >>;
 pack(nil, _Opt = ?OPTION{interface=Interface}) 
-  when Interface =/= jsx ->
+  when Interface =/= jsx andalso Interface =/= jiffy ->
     << 16#C0:8 >>;
 pack(false, _) ->
     << 16#C2:8 >>;

src/msgpack_unpacker.erl

@@ -35,6 +35,8 @@
 %% ATOMS
 unpack_stream(<<16#C0, Rest/binary>>, _Opt = ?OPTION{interface=jsx}) ->
     {null, Rest};
+unpack_stream(<<16#C0, Rest/binary>>, _Opt = ?OPTION{interface=jiffy}) ->
+    {null, Rest};
 unpack_stream(<<16#C0, Rest/binary>>, _) ->
     {nil, Rest};
 unpack_stream(<<16#C2, Rest/binary>>, _) ->

test/msgpack_test.erl

@@ -146,22 +146,22 @@ issue_jiffy_5_test() ->
 
 issue_27_test_() ->
     [
-     %% nil(jiffy) => nil(msgpack) => null(jsx)
+     %% null(jiffy) => nil(msgpack) => null(jsx)
      ?_assertEqual({ok, null},
-                   msgpack:unpack(msgpack:pack(nil), [{format,jsx}])),
+                   msgpack:unpack(msgpack:pack(null), [{format,jsx}])),
 
-     %% nil(jiffy) => nil(msgpack) => nil(jiffy)
-     ?_assertEqual({ok, nil},
-                   msgpack:unpack(msgpack:pack(nil, [{format,jiffy}]))),
+     %% null(jiffy) => nil(msgpack) => null(jiffy)
+     ?_assertEqual({ok, null},
+                   msgpack:unpack(msgpack:pack(null, [{format,jiffy}]))),
 
 
-     %% null(jsx) => nil(msgpack) => nil(jiffy)
-     ?_assertEqual({ok, nil},
+     %% null(jsx) => nil(msgpack) => null(jiffy)
+     ?_assertEqual({ok, null},
                    msgpack:unpack(msgpack:pack(null, [{format,jsx}]))),
 
-     %% null(jiffy-atom) => <<null>>(msgpack-binary) => <<"nil">>
-     ?_assertEqual({ok, <<"null">>},
-                   msgpack:unpack(msgpack:pack(null, [{allow_atom,pack}]))),
+     %% nil(jiffy-atom) => <<nil>>(msgpack-binary) => <<"nil">>
+     ?_assertEqual({ok, <<"nil">>},
+                   msgpack:unpack(msgpack:pack(nil, [{allow_atom,pack}]))),
 
      %% nil(jsx-atom) => <<nil>>(msgpack-binary) => <<"nil">>
      ?_assertEqual({ok, <<"nil">>},