Merge pull request #10 from plotly/api_endpoint_fix

Api endpoint fix

Author: BRONSOLO

src/Plotly.jl

@@ -11,6 +11,8 @@ type CurrentPlot
     url::String
 end
 
+api_version = "v2"
+
 default_options = {"filename"=>"Plot from Julia API",
 "world_readable"=> true,
 "layout"=>{""=>""}}
@@ -31,13 +33,16 @@ default_opts = {
 function get_plot_endpoint()
     config = get_config()
     plot_endpoint = "clientresp"
-    return joinpath(config.plotly_domain, plot_endpoint)
+    return "$(config.plotly_domain)/$plot_endpoint"
 end
 
 function get_content_endpoint(file_id::String, owner::String)
     config = get_config()
-    content_endpoint = "files/$owner:$file_id/content"
-    return joinpath(config.plotly_api_domain, content_endpoint)
+    api_endpoint = "$(config.plotly_api_domain)/$api_version/files"
+    detail = "$owner:$file_id"
+    custom_action = "content"
+    content_endpoint = "$api_endpoint/$detail/$custom_action"
+    return content_endpoint
 end
 
 function plot(data::Array,options=Dict())

test/tests.jl

@@ -4,7 +4,7 @@ using Base.Test
 
 # just check that http://plot.ly/clientresp behaves as expected -- nothing to see here
 
-Plotly.signin("unittest","tfzz811f5n")
+Plotly.signin("unittest","tfzz811f5n", {"plotly_domain"=>"https://plot.ly","plotly_api_domain"=>"https://api.plot.ly"})
 
 (x0,y0) = [1,2,3], [4,5,6]
 (x1,y1) = [1,2,3], [2,10,12]
@@ -50,4 +50,4 @@ Plotly.signin("test_username", "test_api_key", endpoints)
 fid = "123_fake"
 owner = "test_owner"
 content_endpoint = Plotly.get_content_endpoint(fid, owner)
-@test content_endpoint == "my_plotly_api_domain/files/test_owner:123_fake/content"
+@test content_endpoint == "my_plotly_api_domain/v2/files/test_owner:123_fake/content"