diff options
author | Christoph Helma <ch@in-silico.ch> | 2009-08-14 14:44:57 +0200 |
---|---|---|
committer | Christoph Helma <ch@in-silico.ch> | 2009-08-14 14:44:57 +0200 |
commit | 1fd85f5b8925e8fd8986497e9fab3a49acc64379 (patch) | |
tree | 9086a048bf864dc37374f28eb06a42b5545ffce5 | |
parent | 26f689641023f4587bfe2af7975ee8d97af4a1df (diff) |
Installation updated
-rw-r--r-- | README | 1 | ||||
-rw-r--r-- | Rakefile | 2 | ||||
-rw-r--r-- | application.rb | 7 | ||||
-rw-r--r-- | test.rb | 6 |
4 files changed, 10 insertions, 6 deletions
@@ -4,6 +4,7 @@ OpenTox Datasets * An OpenTox REST Webservice * Stores associations between compounds and features in datasets * Implements a subset of the OpenTox dataset API (http://opentox.org/wiki/opentox/Dataset). +* Current version runs at http://webservices.in-silico.ch/dataset/v0 REST API @@ -3,7 +3,7 @@ require 'rake' desc "Install required gems" task :install do - `sudo gem install sinatra emk-sinatra-url-for builder dm-core dm-more` + puts `sudo gem install sinatra emk-sinatra-url-for builder datamapper json_pure do_sqlite3` end desc "Run tests" diff --git a/application.rb b/application.rb index 670f277..4fdb685 100644 --- a/application.rb +++ b/application.rb @@ -1,5 +1,6 @@ ## SETUP -[ 'rubygems', 'sinatra', 'sinatra/url_for', 'datamapper', 'dm-more', 'builder', 'api_key' ].each do |lib| +#[ 'rubygems', 'sinatra', 'sinatra/url_for', 'dm-core', 'dm-more', 'builder', 'api_key' ].each do |lib| +[ 'rubygems', 'sinatra', 'sinatra/url_for', 'dm-core', 'dm-more', 'builder' ].each do |lib| require lib end @@ -59,7 +60,7 @@ end ## REST API -get '/' do +get '/?' do Dataset.all.collect{ |d| url_for("/", :full) + d.id.to_s }.join("\n") end @@ -186,7 +187,7 @@ get '/:id/feature/*/compounds' do Association.all(:dataset_id => params[:id], :feature_uri => feature_uri).collect { |a| a.compound_uri }.uniq.join("\n") end -post '/' do +post '/?' do #protected! dataset = Dataset.find_or_create :name => params[:name] url_for("/", :full) + dataset.id.to_s @@ -17,14 +17,14 @@ class DatasetsTest < Test::Unit::TestCase end def test_create_dataset - authorize "api", API_KEY + #authorize "api", API_KEY post '/', :name => "Test dataset" assert last_response.ok? assert_equal "http://example.org/1", last_response.body.chomp end def test_create_dataset_and_insert_data - authorize "api", API_KEY + #authorize "api", API_KEY post '/', :name => "Test dataset" post '/1', :compound_uri => "test_compound_uri", :feature_uri => "test_feature_uri" get '/1' @@ -34,9 +34,11 @@ class DatasetsTest < Test::Unit::TestCase assert last_response.body.include?('test_feature_uri') end +=begin def test_unauthorized_create post '/', :name => "Test dataset" assert !last_response.ok? end +=end end |