Merge pull request #20 from merl-dev/master

replaced HTTPClient with Requests

Author: malmaud

REQUIRE

@@ -1,2 +1,2 @@
-HTTPClient
+Requests
 JSON

src/Plotly.jl

@@ -1,10 +1,14 @@
+__precompile__(true)
+
 module Plotly
-using HTTPClient.HTTPC
+using Requests
 using JSON
 
 include("plot.jl")
 include("utils.jl")
 
+#export default_options, default_opts, get_config, get_plot_endpoint, get_credentials,get_content_endpoint,get_template
+
 type CurrentPlot
     filename::ASCIIString
     fileopt::ASCIIString
@@ -49,19 +53,22 @@ function plot(data::Array,options=Dict())
     creds = get_credentials()
     endpoint = get_plot_endpoint()
     opt = merge(default_options,options)
+
+    #post("http://httpbin.org/post"; headers = Dict("Date" => "Tue, 15 Nov 1994 08:12:31 GMT"), cookies = Dict("sessionkey" => "abc"))
+
     r = post(endpoint,
-             merge(default_opts,
+             data = merge(default_opts,
                    Dict(
                     "un" => creds.username,
                     "key" => creds.api_key,
                     "args" => json(data),
                     "kwargs" => json(opt)
                     ))
              )
-    body=JSON.parse(bytestring(r.body))
+    body=Requests.json(r)
 
-    if r.http_code != 200
-        error(["r.http_code"])
+    if statuscode(r) != 200
+        error(["r.status"])
     elseif body["error"] != ""
         error(body["error"])
     else
@@ -78,7 +85,7 @@ function layout(layout_opts::Dict,meta_opts=Dict())
     merge!(meta_opts,get_required_params(["filename","fileopt"],meta_opts))
 
     r = post(endpoint,
-    merge(default_opts,
+    data = merge(default_opts,
     Dict("un" => creds.username,
     "key" => creds.api_key,
     "args" => json(layout_opts),
@@ -94,7 +101,7 @@ function style(style_opts,meta_opts=Dict())
     merge!(meta_opts,get_required_params(["filename","fileopt"],meta_opts))
 
     r = post(endpoint,
-    merge(default_opts,
+    data = merge(default_opts,
     Dict("un" => creds.username,
     "key" => creds.api_key,
     "args" => json([style_opts]),
@@ -118,12 +125,9 @@ function getFile(file_id::ASCIIString, owner=None)
 
   auth = string("Basic ", base64("$username:$api_key"))
 
-  options = RequestOptions(headers=[
-                                    ("Authorization", auth),
-                                    ("Plotly-Client-Platform", lib_version)
-                                    ])
+  options = Dict("Authorization"=> auth,"Plotly-Client-Platform"=> lib_version)
 
-  r = get(endpoint, options)
+  r = get(endpoint, headers=options)
   print(r)
 
   __parseresponse(r)
@@ -148,9 +152,9 @@ function get_required_params(required,opts)
 end
 
 function __parseresponse(r)
-    body=JSON.parse(bytestring(r.body))
-    if r.http_code != 200
-        error(["r.http_code"])
+    body=Requests.json(r)
+    if statuscode(r) != 200
+        error(["r.status"])
     elseif haskey(body, "error") && body["error"] != ""
         error(body["error"])
     elseif haskey(body, "detail") && body["detail"] != ""

test/test_utils.jl

@@ -3,7 +3,7 @@ using JSON
 using Base.Test
 
 #test signin only one endpoint specified
-@test_throws ErrorException Plotly.signin("fake_username", "fake_api_key", {"plotly_domain"=>"test"})
+@test_throws ErrorException Plotly.signin("fake_username", "fake_api_key", Dict("plotly_domain"=>"test"))
 
 #test signin and get_credentials
 Plotly.signin("test_username", "test_api_key")
@@ -12,7 +12,7 @@ creds = Plotly.get_credentials()
 @test creds.api_key == "test_api_key"
 
 #test signin + endpoints and get_config
-endpoints = {"plotly_domain"=>"my_plotly_domain", "plotly_api_domain"=>"my_plotly_api_domain"}
+endpoints = Dict("plotly_domain"=>"my_plotly_domain", "plotly_api_domain"=>"my_plotly_api_domain")
 Plotly.signin("test_username", "test_api_key", endpoints)
 config = Plotly.get_config()
 @test config.plotly_domain == "my_plotly_domain"