diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | lib/algorithm.rb | 6 | ||||
| -rw-r--r-- | lib/task.rb | 8 |
3 files changed, 9 insertions, 6 deletions
@@ -3,3 +3,4 @@ coverage rdoc pkg +*~ diff --git a/lib/algorithm.rb b/lib/algorithm.rb index c5d162a..6ae9e72 100644 --- a/lib/algorithm.rb +++ b/lib/algorithm.rb @@ -16,7 +16,8 @@ module OpenTox end def self.create_feature_dataset(params) - RestClient.post params[:feature_generation_uri], :dataset_uri => params[:dataset_uri], :feature_uri => params[:feature_uri] + resource = RestClient::Resource.new(params[:feature_generation_uri], :user => request.username, :password => request.password) + resource.post :dataset_uri => params[:dataset_uri], :feature_uri => params[:feature_uri] end end @@ -39,7 +40,8 @@ module OpenTox end def self.create_model(params) - @uri = RestClient.post File.join(@@config[:services]["opentox-algorithm"], "lazar"), :dataset_uri => params[:dataset_uri], :feature_uri => params[:feature_uri], :feature_generation_uri => File.join(@@config[:services]["opentox-algorithm"], "fminer") + resource = RestClient::Resource.new(File.join(@@config[:services]["opentox-algorithm"], "lazar"), :user => request.username, :password => request.password) + @uri = resource.post :dataset_uri => params[:dataset_uri], :feature_uri => params[:feature_uri], :feature_generation_uri => File.join(@@config[:services]["opentox-algorithm"], "fminer") end end diff --git a/lib/task.rb b/lib/task.rb index e50a982..5dd5e4c 100644 --- a/lib/task.rb +++ b/lib/task.rb @@ -10,7 +10,7 @@ module OpenTox end def self.create - uri = RestClient.post @@config[:services]["opentox-task"], nil + uri = RestClient::Resource.new(@@config[:services]["opentox-task"], :user => request.username, :password => request.password).post nil Task.new(uri) end @@ -24,15 +24,15 @@ module OpenTox def started #LOGGER.info File.join(@uri,'started') - RestClient.put File.join(@uri,'started'), {} + RestClient::Resource.new(@uri, :user => request.username, :password => request.password).put File.join(@uri,'started'), {} end def cancel - RestClient.put File.join(@uri,'cancelled'), {} + RestClient::Resource.new(@uri, :user => request.username, :password => request.password).put File.join(@uri,'cancelled'), {} end def completed(uri) - RestClient.put File.join(@uri,'completed'), :resource => uri + RestClient::Resource.new(@uri, :user => request.username, :password => request.password).put File.join(@uri,'completed'), :resource => uri end def status |