Rename strip function.

basho · Dec 4, 2012 · a4dd897 · a4dd897
1 parent 854853b
commit a4dd897
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/riak_cs_control_helpers.erl b/src/riak_cs_control_helpers.erl
@@ -14,11 +14,11 @@
 
 -export([configure_s3_connection/0,
          administration_bucket_name/0,
-         reencode_attributes/1,
+         strip_root_from_attributes/1,
          iso8601/1,
          admin_key/0]).
 
-reencode_attributes(Attributes) ->
+strip_root_from_attributes(Attributes) ->
     {struct, [{<<"user">>, DecodedAttributes}]} = mochijson2:decode(Attributes),
     mochijson2:encode(DecodedAttributes).
 

diff --git a/src/riak_cs_control_wm_user.erl b/src/riak_cs_control_wm_user.erl
@@ -83,7 +83,7 @@ from_json(ReqData, Context) ->
         {true, NewContext} ->
             try
                 Attributes = wrq:req_body(ReqData),
-                NewAttributes = riak_cs_control_helpers:reencode_attributes(Attributes),
+                NewAttributes = riak_cs_control_helpers:strip_root_from_attributes(Attributes),
                 {ok, _Response} = riak_cs_control_session:put_user(KeyId, NewAttributes),
                 Resource = "/users/" ++ KeyId,
                 NewReqData = wrq:set_resp_header("Location", Resource, ReqData),

diff --git a/src/riak_cs_control_wm_users.erl b/src/riak_cs_control_wm_users.erl
@@ -95,7 +95,7 @@ maybe_create_user(ReqData, Context) ->
         undefined ->
             try
                 Attributes = wrq:req_body(ReqData),
-                NewAttributes = riak_cs_control_helpers:reencode_attributes(Attributes),
+                NewAttributes = riak_cs_control_helpers:strip_root_from_attributes(Attributes),
                 {ok, {_Headers, Body}} = riak_cs_control_session:put_user(NewAttributes),
                 ParsedResponse = mochijson2:decode(Body),
                 {true, Context#context{user=ParsedResponse}}