add t2b/b2t-like functions

Author: kuenishi

src/msgpack.erl

@@ -37,7 +37,9 @@
 -module(msgpack).
 
 -export([pack/1, unpack/1, unpack_stream/1,
-         pack/2, unpack/2, unpack_stream/2]).
+         pack/2, unpack/2, unpack_stream/2,
+         term_to_binary/1, binary_to_term/1
+        ]).
 
 -include("msgpack.hrl").
 
@@ -46,6 +48,14 @@
 -type object() :: msgpack_term().
 -type options() :: msgpack_list_options().
 
+-spec term_to_binary(term()) -> binary().
+term_to_binary(Term) ->
+    msgpack_term:to_binary(Term).
+
+-spec binary_to_term(binary()) -> term().
+binary_to_term(Bin) ->
+    msgpack_term:from_binary(Bin).
+
 %% @doc Encode an erlang term into an msgpack binary.
 %%      Returns {error, {badarg, term()}} if the input is illegal.
 -spec pack(msgpack:object()) -> binary() | {error, {badarg, term()}}.

src/msgpack_ext.erl

@@ -22,9 +22,9 @@
 %% {ok, {Type, Data} = msgpack_ext_module:pack_ext(Tuple, [{ext, msgpack_ext_module}]),
 %% {ok, Tuple} = msgpack_ext_module:unpack_ext(Type, Data)
 %% 
--callback pack_ext(tuple(), msgpack:options()) ->
+-callback pack_ext(any(), msgpack:options()) ->
     {ok, {Type::byte(), Data::binary()}} |
     {error, any()}.
 
 -callback unpack_ext(Type::byte(), Data::binary()) ->
-    {ok, tuple()} | {error, any()}.
+    {ok, any()} | {error, any()}.

src/msgpack_packer.erl

@@ -50,7 +50,7 @@ pack(Atom, #options_v2{allow_atom=pack} = Opt) when is_atom(Atom) ->
     pack(erlang:atom_to_binary(Atom, unicode), Opt);
 
 %% jiffy interface
-pack({Map}, Opt = ?OPTION{interface=jiffy}) ->
+pack({Map}, Opt = ?OPTION{interface=jiffy}) when is_list(Map) ->
     pack_map(Map, Opt);
 
 %% jsx interface
@@ -83,7 +83,7 @@ pack(List, Opt)  when is_list(List) ->
 
 %% Packing ext type with user defined packer function
 pack(Any, _Opt = ?OPTION{ext_packer=Packer, original_list=Orig})
-  when is_tuple(Any) andalso is_function(Packer) ->
+  when is_function(Packer) ->
 
     case pack_ext(Any, Packer, Orig) of
         {ok, Binary} -> Binary;

src/msgpack_term.erl

@@ -0,0 +1,62 @@
+%%
+%% MessagePack for Erlang
+%%
+%% Copyright (C) 2009-2013 UENISHI Kota
+%%
+%%    Licensed under the Apache License, Version 2.0 (the "License");
+%%    you may not use this file except in compliance with the License.
+%%    You may obtain a copy of the License at
+%%
+%%        http://www.apache.org/licenses/LICENSE-2.0
+%%
+%%    Unless required by applicable law or agreed to in writing, software
+%%    distributed under the License is distributed on an "AS IS" BASIS,
+%%    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%%    See the License for the specific language governing permissions and
+%%    limitations under the License.
+%%
+-module(msgpack_term).
+
+-export([to_binary/1, from_binary/1,
+         pack_ext/2, unpack_ext/2]).
+-behabiour(msgpack_ext).
+
+-define(ERLANG_TERM, 131).
+-define(TERM_OPTION, [{enable_str,true},{ext,?MODULE},{allow_atom,none}]).
+
+to_binary(Term) ->
+    msgpack:pack(Term, ?TERM_OPTION).
+
+from_binary(Bin) ->
+    {ok, Term} = msgpack:unpack(Bin, ?TERM_OPTION),
+    Term.
+
+-spec pack_ext(tuple(), msgpack:options()) ->
+                      {ok, {Type::byte(), Data::binary()}} |
+                      {error, any()}.
+pack_ext(Term, _Options) ->
+    {ok, {?ERLANG_TERM, erlang:term_to_binary(Term)}}.
+
+-spec unpack_ext(Type::byte(), Data::binary()) ->
+    {ok, any()} | {error, any()}.
+unpack_ext(?ERLANG_TERM, Bin) ->
+    {ok, erlang:binary_to_term(Bin)}.
+
+-ifdef(TEST).
+-include_lib("eunit/include/eunit.hrl").
+
+test_data() ->
+    ['foobar atom', %% is_atom/1
+     fun() -> ok end, %% is_function/1
+     self(), %% is_pid/1
+     %% is_port/1
+     make_ref(), %% is_reference/1
+     {me, foo, bar}, %% is_tuple/1
+     {}].
+
+t2b_b2t_test() ->
+    Data = test_data(),
+    ?assertEqual(Data,
+                 msgpack:binary_to_term(msgpack:term_to_binary(Data))).
+
+-endif.