cleanup Plotly.jl

Author: bpostlethwaite

src/Plotly.jl

@@ -1,8 +1,8 @@
 module Plotly
-using HTTPClient
+using HTTPClient.HTTPC
 using JSON
 
-type PlotlyAccount 
+type PlotlyAccount
     username::String
     api_key::String
 end
@@ -31,12 +31,12 @@ default_opts = {
 "version" => "0.2"}
 
 function signup(username::String, email::String)
-    r = HTTPClient.HTTPC.post("http://plot.ly/apimkacct", 
-    merge(default_opts, 
-    {"un" => username, 
+    r = post("http://plot.ly/apimkacct",
+    merge(default_opts,
+    {"un" => username,
     "email" => email}))
     if r.http_code == 200
-        results = JSON.parse(bytestring(r.body)) 
+        results = JSON.parse(bytestring(r.body))
         for flag in ["error","warning","message"]
             if haskey(results, flag) && results[flag] != ""
                 println(results[flag])
@@ -50,7 +50,7 @@ function signup(username::String, email::String)
 end
 
 function signin(username::String, api_key::String)
-    global plotlyaccount 
+    global plotlyaccount
     plotlyaccount = PlotlyAccount(username,api_key)
 end
 
@@ -61,12 +61,15 @@ function plot(data::Array,options=Dict())
         return
     end
     opt = merge(default_options,options)
-    r = HTTPClient.HTTPC.post("http://plot.ly/clientresp", 
-    merge(default_opts,
-    {"un" => plotlyaccount.username,
-    "key" => plotlyaccount.api_key,
-    "args" => json(data),
-    "kwargs" => json(opt)}))
+    r = post("http://plot.ly/clientresp",
+             merge(default_opts,
+                   {
+                    "un" => plotlyaccount.username,
+                    "key" => plotlyaccount.api_key,
+                    "args" => json(data),
+                    "kwargs" => json(opt)
+                    })
+             )
     body=JSON.parse(bytestring(r.body))
     if r.http_code != 200
         error(["r.http_code"])
@@ -90,7 +93,7 @@ function layout(layout_opts::Dict,meta_opts=Dict())
 
     merge!(meta_opts,get_required_params(["filename","fileopt"],meta_opts))
 
-    r = HTTPClient.HTTPC.post("http://plot.ly/clientresp",
+    r = post("http://plot.ly/clientresp",
     merge(default_opts,
     {"un" => plotlyaccount.username,
     "key" => plotlyaccount.api_key,
@@ -109,7 +112,7 @@ function style(style_opts,meta_opts=Dict())
 
     merge!(meta_opts,get_required_params(["filename","fileopt"],meta_opts))
 
-    r = HTTPClient.HTTPC.post("http://plot.ly/clientresp",
+    r = post("http://plot.ly/clientresp",
     merge(default_opts,
     {"un" => plotlyaccount.username,
     "key" => plotlyaccount.api_key,
@@ -122,7 +125,7 @@ end
 function get_required_params(required,opts)
     # Priority given to user-inputted opts, then currentplot
     result=Dict()
-    for p in required 
+    for p in required
         global currentplot
         if haskey(opts,p)
             result[p] = opts[p]
@@ -139,84 +142,86 @@ function __parseresponse(r)
     body=JSON.parse(bytestring(r.body))
     if r.http_code != 200
         error(["r.http_code"])
-    elseif body["error"] != ""
+    elseif haskey(body, "error") && body["error"] != ""
         error(body["error"])
+    elseif haskey(body, "detail") && body["detail"] != ""
+        error(body["detail"])
     else
         body
     end
 end
 
 function get_template(format_type::String)
-    if format_type == "layout" 
+    if format_type == "layout"
         return {
                 "title"=>"Click to enter Plot title",
                 "xaxis"=>{
                         "range"=>[-1,6],
                         "type"=>"-",
                         "mirror"=>true,
                         "linecolor"=>"#000",
-                        "linewidth"=>1, 
+                        "linewidth"=>1,
                         "tick0"=>0,
                         "dtick"=>2,
                         "ticks"=>"outside",
                         "ticklen"=>5,
                         "tickwidth"=>1,
                         "tickcolor"=>"#000",
-                        "nticks"=>0, 
+                        "nticks"=>0,
                         "showticklabels"=>true,
                         "tickangle"=>"auto",
                         "exponentformat"=>"e",
-                        "showexponent"=>"all", 
+                        "showexponent"=>"all",
                         "showgrid"=>true,
                         "gridcolor"=>"#ddd",
-                        "gridwidth"=>1, 
+                        "gridwidth"=>1,
                         "autorange"=>true,
-                        "autotick"=>true, 
+                        "autotick"=>true,
                         "zeroline"=>true,
                         "zerolinecolor"=>"#000",
-                        "zerolinewidth"=>1, 
+                        "zerolinewidth"=>1,
                         "title"=>"Click to enter X axis title",
-                        "unit"=>"", 
-                        "titlefont"=>{"family"=>"","size"=>0,"color"=>""}, 
-                        "tickfont"=>{"family"=>"","size"=>0,"color"=>""}}, 
+                        "unit"=>"",
+                        "titlefont"=>{"family"=>"","size"=>0,"color"=>""},
+                        "tickfont"=>{"family"=>"","size"=>0,"color"=>""}},
                 "yaxis"=>{
                         "range"=>[-1,4],
                         "type"=>"-",
                         "mirror"=>true,
                         "linecolor"=>"#000",
-                        "linewidth"=>1, 
+                        "linewidth"=>1,
                         "tick0"=>0,
                         "dtick"=>1,
                         "ticks"=>"outside",
                         "ticklen"=>5,
                         "tickwidth"=>1,
                         "tickcolor"=>"#000",
-                        "nticks"=>0, 
+                        "nticks"=>0,
                         "showticklabels"=>true,
                         "tickangle"=>"auto",
                         "exponentformat"=>"e",
-                        "showexponent"=>"all", 
+                        "showexponent"=>"all",
                         "showgrid"=>true,
                         "gridcolor"=>"#ddd",
-                        "gridwidth"=>1, 
+                        "gridwidth"=>1,
                         "autorange"=>true,
-                        "autotick"=>true, 
+                        "autotick"=>true,
                         "zeroline"=>true,
                         "zerolinecolor"=>"#000",
-                        "zerolinewidth"=>1, 
+                        "zerolinewidth"=>1,
                         "title"=>"Click to enter Y axis title",
-                        "unit"=>"", 
-                        "titlefont"=>{"family"=>"","size"=>0,"color"=>""}, 
-                        "tickfont"=>{"family"=>"","size"=>0,"color"=>""}}, 
+                        "unit"=>"",
+                        "titlefont"=>{"family"=>"","size"=>0,"color"=>""},
+                        "tickfont"=>{"family"=>"","size"=>0,"color"=>""}},
                 "legend"=>{
-                        "bgcolor"=>"#fff", 
-                        "bordercolor"=>"#000", 
-                        "borderwidth"=>1, 
-                        "font"=>{"family"=>"","size"=>0,"color"=>""}, 
+                        "bgcolor"=>"#fff",
+                        "bordercolor"=>"#000",
+                        "borderwidth"=>1,
+                        "font"=>{"family"=>"","size"=>0,"color"=>""},
                         "traceorder"=>"normal"},
                 "width"=>700,
                 "height"=>450,
-                "autosize"=>"initial", 
+                "autosize"=>"initial",
                 "margin"=>{"l"=>80,"r"=>80,"t"=>80,"b"=>80,"pad"=>2},
                 "paper_bgcolor"=>"#fff",
                 "plot_bgcolor"=>"#fff",