File 0006-remove-support-of-jiffy-JSON-encode-decode... of Package leptus

Overview Repositories Revisions Requests Users Attributes Meta

File 0006-remove-support-of-jiffy-JSON-encode-decoder.patch of Package leptus (Revision 2baf2bf1046cc015f80514d5195c347d)

Currently displaying revision 2baf2bf1046cc015f80514d5195c347d , Show latest

From 6a86736010df96efeca3e69c21dc9f580641c450 Mon Sep 17 00:00:00 2001
From: Led <ledest@gmail.com>
Date: Wed, 3 Aug 2016 13:15:01 +0300
Subject: [PATCH 6/7] remove support of jiffy JSON encode/decoder

---
 rebar.config           |  1 -
 rebar.config.script    | 57 -----------------------------------
 src/leptus.app.src     |  3 +-
 src/leptus_handler.erl |  6 ++--
 src/leptus_json.erl    | 82 --------------------------------------------------
 src/leptus_req.erl     |  4 +--
 6 files changed, 6 insertions(+), 147 deletions(-)
 delete mode 100644 rebar.config.script
 delete mode 100644 src/leptus_json.erl

diff --git a/rebar.config b/rebar.config
index 1889b7e..22e4581 100644
--- a/rebar.config
+++ b/rebar.config
@@ -2,7 +2,6 @@
 
 {deps, [
         {cowboy, ".*", {git, "git://github.com/extend/cowboy.git", {tag, "0.9.0"}}},
-        {jiffy, ".*", {git, "git://github.com/davisp/jiffy.git", {tag, "0.8.5"}}},
         {jsx, ".*", {git, "git://github.com/talentdeficit/jsx.git", {tag, "v1.4.5"}}},
         {msgpack, ".*", {git, "git://github.com/msgpack/msgpack-erlang.git", {tag, "0.2.8"}}}
        ]}.
diff --git a/rebar.config.script b/rebar.config.script
deleted file mode 100644
index 5571ab3..0000000
--- a/rebar.config.script
+++ /dev/null
@@ -1,57 +0,0 @@
-%%-*- mode: erlang -*-
-%% The MIT License
-%%
-%% Copyright (c) 2013-2014 Sina Samavati <sina.samv@gmail.com>
-%%
-%% Permission is hereby granted, free of charge, to any person obtaining a copy
-%% of this software and associated documentation files (the "Software"), to deal
-%% in the Software without restriction, including without limitation the rights
-%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-%% copies of the Software, and to permit persons to whom the Software is
-%% furnished to do so, subject to the following conditions:
-%%
-%% The above copyright notice and this permission notice shall be included in
-%% all copies or substantial portions of the Software.
-%%
-%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-%% THE SOFTWARE.
-
-Deps = fun() ->
-               case lists:keyfind(deps, 1, CONFIG) of
-                   {deps, V} ->
-                       V;
-                   Else ->
-                       Else
-               end
-       end,
-RemoveJsx = fun() ->
-                    L = Deps(),
-                    CONFIG1 = lists:keydelete(deps, 1, CONFIG),
-                    L1 = lists:keydelete(jsx, 1, L),
-                    [{deps, L1}|CONFIG1]
-            end,
-RemoveJiffy = fun() ->
-                      L = Deps(),
-                      CONFIG1 = lists:keydelete(deps, 1, CONFIG),
-                      L1 = lists:keydelete(jiffy, 1, L),
-                      [{deps, L1}, {erl_opts, [{d, 'USE_JSX'}]}|CONFIG1]
-              end,
-code:add_path("ebin"),
-case (catch leptus_json:parser()) of
-    jiffy ->
-        RemoveJsx();
-    jsx ->
-        RemoveJiffy();
-    _ ->
-        case os:getenv("USE_JSX") of
-            false ->
-                RemoveJsx();
-            _ ->
-                RemoveJiffy()
-        end
-end.
diff --git a/src/leptus.app.src b/src/leptus.app.src
index 460fff0..9f6441d 100644
--- a/src/leptus.app.src
+++ b/src/leptus.app.src
@@ -35,7 +35,6 @@
              leptus, leptus_app, leptus_sup,
              leptus_handler, leptus_router, leptus_pt,
              leptus_config, leptus_req_sup, leptus_req,
-             leptus_json, leptus_utils, leptus_logger,
-             leptus_access_log
+             leptus_utils, leptus_logger, leptus_access_log
             ]}
  ]}.
diff --git a/src/leptus_handler.erl b/src/leptus_handler.erl
index 0d104ea..96847d2 100644
--- a/src/leptus_handler.erl
+++ b/src/leptus_handler.erl
@@ -35,7 +35,7 @@
 -type req() :: pid().
 -type status() :: non_neg_integer() | binary() | atom().
 -type headers() :: cowboy:http_headers().
--type body() :: binary() | string() | {json | msgpack, leptus_json:json_term()}
+-type body() :: binary() | string() | {json | msgpack, jsx:json_term()}
               | {html, binary()}.
 -type method() :: get | put | post | delete.
 -type response() :: {body(), handler_state()}
@@ -408,9 +408,9 @@ reply(Status, Headers, Body, Req) ->
 
 -spec prepare_headers_body(headers(), body()) -> {headers(), body()}.
 prepare_headers_body(Headers, {json, Body}) ->
-    {maybe_set_content_type(json, Headers), leptus_json:encode(Body)};
+    {maybe_set_content_type(json, Headers), jsx:encode(Body)};
 prepare_headers_body(Headers, {msgpack, Body}) ->
-    {maybe_set_content_type(msgpack, Headers), msgpack:pack({Body}, [jiffy])};
+    {maybe_set_content_type(msgpack, Headers), msgpack:pack(Body, [jsx])};
 prepare_headers_body(Headers, {html, Body}) ->
     {maybe_set_content_type(html, Headers), Body};
 prepare_headers_body(Headers, Body) ->
diff --git a/src/leptus_json.erl b/src/leptus_json.erl
deleted file mode 100644
index d5215f1..0000000
--- a/src/leptus_json.erl
+++ /dev/null
@@ -1,82 +0,0 @@
-%% Copyright (c) 2013-2015 Sina Samavati <sina.samv@gmail.com>
-%%
-%% Permission is hereby granted, free of charge, to any person obtaining a copy
-%% of this software and associated documentation files (the "Software"), to deal
-%% in the Software without restriction, including without limitation the rights
-%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-%% copies of the Software, and to permit persons to whom the Software is
-%% furnished to do so, subject to the following conditions:
-%%
-%% The above copyright notice and this permission notice shall be included in
-%% all copies or substantial portions of the Software.
-%%
-%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-%% THE SOFTWARE.
-
--module(leptus_json).
-
-%% -----------------------------------------------------------------------------
-%% API
-%% -----------------------------------------------------------------------------
--export([encode/1]).
--export([decode/1]).
--export([parser/0]).
-
--ifdef(USE_JSX).
--define(ENCODE(Term), jsx:encode(Term)).
--define(DECODE(Term), jsx:decode(Term)).
--define(PARSER, jsx).
--else.
--define(USE_JIFFY, true).
--define(ENCODE(Term), jiffy_encode(Term)).
--define(DECODE(Term), jiffy_decode(Term)).
--define(PARSER, jiffy).
--endif.
-
--type json_term() :: [json_term()]
-                   | {binary() | atom(), json_term()}
-                   | true
-                   | false
-                   | null
-                   | integer()
-                   | float()
-                   | binary().
--export_type([json_term/0]).
-
-encode(Term) ->
-    ?ENCODE(Term).
-
-decode(Term) ->
-    ?DECODE(Term).
-
-parser() ->
-    ?PARSER.
-
--ifdef(USE_JIFFY).
-
-%% -----------------------------------------------------------------------------
-%% internal
-%% -----------------------------------------------------------------------------
-jiffy_encode(Term) ->
-    jiffy:encode(before_encode(Term)).
-
-jiffy_decode(Bin) ->
-    after_decode(jiffy:decode(Bin)).
-
-%% -----------------------------------------------------------------------------
-%% before encoding - after decoding (only for jiffy)
-%% -----------------------------------------------------------------------------
-before_encode([{}]) -> {[]};
-before_encode(Term=[{_,_}|_]) -> {Term};
-before_encode(Term) -> Term.
-
-after_decode({[]}) -> [{}];
-after_decode({Term}) -> Term;
-after_decode(Term) -> Term.
-
--endif.
diff --git a/src/leptus_req.erl b/src/leptus_req.erl
index 072f2c5..09d0741 100644
--- a/src/leptus_req.erl
+++ b/src/leptus_req.erl
@@ -112,13 +112,13 @@ version(Pid) ->
 method(Pid) ->
     invoke(Pid, method, []).
 
--spec body(pid()) -> binary() | leptus_json:json_term().
+-spec body(pid()) -> binary() | jsx:json_term().
 body(Pid) ->
     Body = body_raw(Pid),
     case header(Pid, <<"content-type">>) of
         %% decode body if content-type is json or msgpack
         <<"application/json">> ->
-            try leptus_json:decode(Body) of
+            try jsx:decode(Body) of
                 {_, _} -> Body;
                 Term -> Term
             catch _:_ -> Body
-- 
2.9.2

Places

File 0006-remove-support-of-jiffy-JSON-encode-decoder.patch of Package leptus (Revision 2baf2bf1046cc015f80514d5195c347d)

Places