diff options
| author | Christoph Helma <helma@in-silico.ch> | 2011-03-10 12:13:54 +0100 |
|---|---|---|
| committer | Christoph Helma <helma@in-silico.ch> | 2011-03-10 12:13:54 +0100 |
| commit | bb4b2f1972d663e0063958f64aa55a33eaa4194c (patch) | |
| tree | d04345e52a24d4606f177180903a8a3eb25fb868 | |
| parent | 0917543b4fb73b4049338790561af7fdf050d50b (diff) | |
| parent | 97821ad3851177f54e1999159ebf0b9987d40a27 (diff) | |
Merge branch 'release/v1.0.0' into development
| -rw-r--r-- | README | 11 | ||||
| -rw-r--r-- | application.rb | 2 |
2 files changed, 8 insertions, 5 deletions
@@ -4,7 +4,8 @@ OpenTox Task * An OpenTox REST Webservice (http://www.opentox.org) * Does _not_ comply to the (incomplete) OpenTox API -REST operations: +REST operations +--------------- Get a list of all tasks GET / - Task URIs 200 Get the status of a task GET /{id}/status - created|started|completed|cancelled 200,404 @@ -17,10 +18,12 @@ Cancel a task PUT /{id}/cancelled "" - Delete a task DELETE /{id} - - 200, 404 Delete all tasks DELETE / - - 200 -IMPORTANT NOTE: My framework does not accept empty PUT requests. Please send an empty parameter (e.g. with -d '' for curl) or you will receive a "411 Length Required" error. +IMPORTANT NOTE: Our framework does not accept empty PUT requests. Please send an empty parameter (e.g. with -d '' for curl) or you will receive a "411 Length Required" error. -More documentation: Source code (application.rb) +API documentation +----------------- -Copyright (c) 2009 Christoph Helma. See LICENSE for details. +http://rdoc.info/github/opentox/task +Copyright (c) 2009-2011 Christoph Helma, Martin Guetlein, Micha Rautenberg, Andreas Maunz, David Vorgrimmler, Denis Gebele. See LICENSE for details. diff --git a/application.rb b/application.rb index 7db4ce9..673cc4d 100644 --- a/application.rb +++ b/application.rb @@ -1,5 +1,5 @@ require 'rubygems' -gem "opentox-ruby", "~> 0" +gem "opentox-ruby", "~> 1" require 'opentox-ruby' set :lock, true |