remote task tests working

2 files changed, 5 insertions, 8 deletions

diff --git a/application.rb b/application.rb
index 0e239a0..a27b48a 100644
--- a/application.rb
+++ b/application.rb
@@ -1,7 +1,3 @@
-require "opentox-server"
-@@class = RDF::OT.Task
-require File.join(ENV["HOME"],".opentox","config","task.rb")
-
 module OpenTox
   class Application < Service
 
@@ -28,8 +24,8 @@ module OpenTox
       end
     end
 
-    get '/:id/?' do
-      uri = uri("/#{params[:id]}")
+    get '/task/:id/?' do
+      uri = uri("/task/#{params[:id]}")
       rdf = FourStore.get(uri, request.env['HTTP_ACCEPT'])
       halt status_code(uri), rdf
     end
@@ -40,8 +36,8 @@ module OpenTox
 
 =end
 
-    put '/:id/:status/?' do
-      uri = uri params[:id]
+    put '/task/:id/:status/?' do
+      uri = uri("/task/#{params[:id]}")
       sparql = []
       case params[:status]
       when "Completed"
diff --git a/config.ru b/config.ru
index 580e75e..0bb9dd0 100644
--- a/config.ru
+++ b/config.ru
@@ -1,3 +1,4 @@
+SERVICE = "task"
 require 'bundler'
 require 'bundler/setup'
 Bundler.require