swap jsx with jiffy

chitika · Dec 17, 2012 · 9762bea · 9762bea
1 parent 04698ea
commit 9762bea
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/bench/cberl_bench.config b/bench/cberl_bench.config
@@ -12,7 +12,7 @@
 %% code path to cberl/jiffy/poolboy
 {code_paths, ["*/cberl",
               "*/cberl/deps/poolboy",
-              "*/cberl/deps/jsx"]}.
+              "*/cberl/deps/jiffy"]}.
 
 {key_generator, {int_to_str, {uniform_int, 100000}}}.
 

diff --git a/rebar.config b/rebar.config
@@ -7,8 +7,8 @@
 {port_specs, [{"priv/cberl_drv.so", ["c_src/*.c"]}]}.
 
 {deps, [
-    {'jsx', "", {git, "git@github.com:talentdeficit/jsx.git", {branch, master}}},
-    {'poolboy', "", {git, "git@github.com:devinus/poolboy.git", {branch, master}}}
+    {'jiffy', "", {git, "https://github.com/davisp/jiffy.git", {branch, master}}},
+    {'poolboy', "", {git, "https://github.com/devinus/poolboy.git", {branch, master}}}
 ]}.
 
 {erl_opts, [debug_info, warnings_as_errors]}.

diff --git a/src/cberl_transcoder.erl b/src/cberl_transcoder.erl
@@ -20,7 +20,7 @@ encode_value(Encoders, Value) ->
 encode_value1(Flag, Value) when Flag band ?'CBE_STR' =/= 0 ->
     encode_value1(Flag bxor ?'CBE_STR', list_to_binary(Value));
 encode_value1(Flag, Value) when Flag band ?'CBE_JSON' =/= 0 ->
-    encode_value1(Flag bxor ?'CBE_JSON', jsx:encode(Value));
+    encode_value1(Flag bxor ?'CBE_JSON', jiffy:encode(Value));
 encode_value1(Flag, Value) when Flag band ?'CBE_RAW' =/= 0 ->
     encode_value1(Flag bxor ?'CBE_RAW', term_to_binary(Value));
 encode_value1(0, Value) ->
@@ -30,7 +30,7 @@ encode_value1(0, Value) ->
 decode_value(Flag, Value) when ?'CBE_RAW' band Flag =/= 0-> 
     decode_value(Flag bxor ?'CBE_RAW', binary_to_term(Value));
 decode_value(Flag, Value) when ?'CBE_JSON' band Flag =/= 0-> 
-    decode_value(Flag bxor ?'CBE_JSON', jsx:decode(Value));                
+    decode_value(Flag bxor ?'CBE_JSON', jiffy:decode(Value));                
 decode_value(Flag, Value) when ?'CBE_STR' band Flag =/= 0-> 
     decode_value(Flag bxor ?'CBE_STR', binary_to_list(Value));
 decode_value(0, Value) ->