From d3190ba5fd87db05bdf3219dae00afaf31257718 Mon Sep 17 00:00:00 2001 From: Christoph Helma Date: Tue, 30 Nov 2010 12:43:04 +0100 Subject: Accept: text/uri-list for running algoritms --- lib/algorithm.rb | 2 +- lib/task.rb | 6 +- opentox-ruby-api-wrapper.gemspec | 146 --------------------------------------- opentox-ruby.gemspec | 133 +++++++++++++++++++++++++++++++++++ 4 files changed, 137 insertions(+), 150 deletions(-) delete mode 100644 opentox-ruby-api-wrapper.gemspec create mode 100644 opentox-ruby.gemspec diff --git a/lib/algorithm.rb b/lib/algorithm.rb index a6fa4a7..a2f7786 100644 --- a/lib/algorithm.rb +++ b/lib/algorithm.rb @@ -15,7 +15,7 @@ module OpenTox # @param [optional,Hash] params Algorithm parameters # @return [String] URI of new resource (dataset, model, ...) def run(params=nil) - RestClientWrapper.post(@uri, params).to_s + RestClientWrapper.post(@uri, {:accept => 'text/uri-list'}, params).to_s end # Get OWL-DL representation in RDF/XML format diff --git a/lib/task.rb b/lib/task.rb index 5b59395..17f95e6 100644 --- a/lib/task.rb +++ b/lib/task.rb @@ -243,10 +243,10 @@ module OpenTox "'" unless @metadata[OT.resultURI] and @metadata[OT.resultURI].to_s.uri? if completed? if @http_code == 202 - raise "illegal task state, code is 202, but hasStatus is not Running: '"+@metadata[OT.hasStatus]+"'" unless running? + raise "#{@uri}: illegal task state, code is 202, but hasStatus is not Running: '"+@metadata[OT.hasStatus]+"'" unless running? elsif @http_code == 201 - raise "illegal task state, code is 201, but hasStatus is not Completed: '"+@metadata[OT.hasStatus]+"'" unless completed? - raise "illegal task state, code is 201, resultURI is no task-URI: '"+@metadata[OT.resultURI].to_s+ + raise "#{@uri}: illegal task state, code is 201, but hasStatus is not Completed: '"+@metadata[OT.hasStatus]+"'" unless completed? + raise "#{@uri}: illegal task state, code is 201, resultURI is no task-URI: '"+@metadata[OT.resultURI].to_s+ "'" unless @metadata[OT.resultURI] and @metadata[OT.resultURI].to_s.uri? end rescue => ex diff --git a/opentox-ruby-api-wrapper.gemspec b/opentox-ruby-api-wrapper.gemspec deleted file mode 100644 index fd00851..0000000 --- a/opentox-ruby-api-wrapper.gemspec +++ /dev/null @@ -1,146 +0,0 @@ -# Generated by jeweler -# DO NOT EDIT THIS FILE DIRECTLY -# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command -# -*- encoding: utf-8 -*- - -Gem::Specification.new do |s| - s.name = %q{opentox-ruby-api-wrapper} - s.version = "0.0.1" - - s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= - s.authors = ["Christoph Helma, Martin Guetlein"] - s.date = %q{2010-11-24} - s.description = %q{Ruby wrapper for the OpenTox REST API (http://www.opentox.org)} - s.email = %q{helma@in-silico.ch} - s.executables = ["opentox-install-ubuntu.sh", "yaml2owl.rb", "opentox-install-debian.sh"] - s.extra_rdoc_files = [ - "LICENSE", - "README.rdoc" - ] - s.files = [ - "LICENSE", - "README.rdoc", - "Rakefile", - "VERSION", - "bin/opentox-install-debian.sh", - "bin/opentox-install-ubuntu.sh", - "bin/yaml2owl.rb", - "lib/algorithm.rb", - "lib/compound.rb", - "lib/config/config_ru.rb", - "lib/dataset.rb", - "lib/environment.rb", - "lib/feature.rb", - "lib/helper.rb", - "lib/model.rb", - "lib/opentox-ruby-api-wrapper.rb", - "lib/opentox.owl", - "lib/opentox.rb", - "lib/overwrite.rb", - "lib/owl.rb.RDF", - "lib/owl.rb.nt", - "lib/owl.rb.rdfxml.initial", - "lib/owl.rb.redland", - "lib/parser.rb", - "lib/rest_client_wrapper.rb", - "lib/serializer.rb", - "lib/spork.rb", - "lib/task.rb", - "lib/templates/config.yaml", - "lib/validation.rb" - ] - s.homepage = %q{http://github.com/helma/opentox-ruby-api-wrapper} - s.rdoc_options = ["--charset=UTF-8"] - s.require_paths = ["lib"] - s.rubygems_version = %q{1.3.7} - s.summary = %q{Ruby wrapper for the OpenTox REST API} - - if s.respond_to? :specification_version then - current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION - s.specification_version = 3 - - if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then - s.add_runtime_dependency(%q, [">= 0"]) - s.add_runtime_dependency(%q, [">= 0"]) - s.add_runtime_dependency(%q, [">= 0"]) - s.add_runtime_dependency(%q, [">= 0"]) - s.add_runtime_dependency(%q, [">= 0"]) - s.add_runtime_dependency(%q, [">= 0"]) - s.add_runtime_dependency(%q, [">= 0"]) - s.add_runtime_dependency(%q, [">= 0"]) - s.add_runtime_dependency(%q, [">= 0"]) - s.add_runtime_dependency(%q, [">= 0"]) - s.add_runtime_dependency(%q, [">= 0"]) - s.add_runtime_dependency(%q, [">= 0"]) - s.add_runtime_dependency(%q, [">= 0"]) - s.add_runtime_dependency(%q, [">= 0"]) - s.add_runtime_dependency(%q, [">= 0"]) - s.add_runtime_dependency(%q, [">= 0"]) - s.add_runtime_dependency(%q, [">= 1"]) - s.add_runtime_dependency(%q, [">= 1"]) - s.add_runtime_dependency(%q, [">= 1"]) - s.add_runtime_dependency(%q, [">= 1"]) - s.add_runtime_dependency(%q, [">= 1"]) - s.add_runtime_dependency(%q, [">= 1"]) - s.add_runtime_dependency(%q, [">= 1"]) - s.add_runtime_dependency(%q, [">= 3"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - else - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 1"]) - s.add_dependency(%q, [">= 1"]) - s.add_dependency(%q, [">= 1"]) - s.add_dependency(%q, [">= 1"]) - s.add_dependency(%q, [">= 1"]) - s.add_dependency(%q, [">= 1"]) - s.add_dependency(%q, [">= 1"]) - s.add_dependency(%q, [">= 3"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - end - else - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 1"]) - s.add_dependency(%q, [">= 1"]) - s.add_dependency(%q, [">= 1"]) - s.add_dependency(%q, [">= 1"]) - s.add_dependency(%q, [">= 1"]) - s.add_dependency(%q, [">= 1"]) - s.add_dependency(%q, [">= 1"]) - s.add_dependency(%q, [">= 3"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - end -end - diff --git a/opentox-ruby.gemspec b/opentox-ruby.gemspec new file mode 100644 index 0000000..e89af96 --- /dev/null +++ b/opentox-ruby.gemspec @@ -0,0 +1,133 @@ +# Generated by jeweler +# DO NOT EDIT THIS FILE DIRECTLY +# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command +# -*- encoding: utf-8 -*- + +Gem::Specification.new do |s| + s.name = %q{opentox-ruby} + s.version = "0.0.1" + + s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= + s.authors = ["Christoph Helma, Martin Guetlein, Andreas Maunz, Micha Rautenberg, David Vorgrimmler"] + s.date = %q{2010-11-24} + s.description = %q{Ruby wrapper for the OpenTox REST API (http://www.opentox.org)} + s.email = %q{helma@in-silico.ch} + s.executables = ["opentox-install-ubuntu.sh", "opentox-install-debian.sh"] + s.extra_rdoc_files = [ + "LICENSE", + "README.rdoc" + ] + s.files = [ + "LICENSE", + "README.rdoc", + "Rakefile", + "VERSION", + "bin/opentox-install-debian.sh", + "bin/opentox-install-ubuntu.sh", + "lib/algorithm.rb", + "lib/compound.rb", + "lib/config/config_ru.rb", + "lib/dataset.rb", + "lib/environment.rb", + "lib/helper.rb", + "lib/model.rb", + "lib/opentox.owl", + "lib/overwrite.rb", + "lib/rest_client_wrapper.rb", + "lib/spork.rb", + "lib/task.rb", + "lib/templates/config.yaml", + "lib/validation.rb" + ] + s.homepage = %q{http://github.com/helma/opentox-ruby-api-wrapper} + s.rdoc_options = ["--charset=UTF-8"] + s.require_paths = ["lib"] + s.rubygems_version = %q{1.3.7} + s.summary = %q{Ruby wrapper for the OpenTox REST API} + + if s.respond_to? :specification_version then + current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION + s.specification_version = 3 + + if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then + s.add_runtime_dependency(%q, [">= 0"]) + s.add_runtime_dependency(%q, [">= 0"]) + s.add_runtime_dependency(%q, [">= 0"]) + s.add_runtime_dependency(%q, [">= 0"]) + s.add_runtime_dependency(%q, [">= 0"]) + s.add_runtime_dependency(%q, [">= 0"]) + s.add_runtime_dependency(%q, [">= 0"]) + s.add_runtime_dependency(%q, [">= 0"]) + s.add_runtime_dependency(%q, [">= 0"]) + s.add_runtime_dependency(%q, [">= 0"]) + s.add_runtime_dependency(%q, [">= 0"]) + s.add_runtime_dependency(%q, [">= 0"]) + s.add_runtime_dependency(%q, [">= 0"]) + s.add_runtime_dependency(%q, [">= 0"]) + s.add_runtime_dependency(%q, [">= 0"]) + s.add_runtime_dependency(%q, [">= 0"]) + s.add_runtime_dependency(%q, [">= 1"]) + s.add_runtime_dependency(%q, [">= 1"]) + s.add_runtime_dependency(%q, [">= 1"]) + s.add_runtime_dependency(%q, [">= 1"]) + s.add_runtime_dependency(%q, [">= 1"]) + s.add_runtime_dependency(%q, [">= 1"]) + s.add_runtime_dependency(%q, [">= 1"]) + s.add_runtime_dependency(%q, [">= 3"]) + s.add_development_dependency(%q, [">= 0"]) + else + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 1"]) + s.add_dependency(%q, [">= 1"]) + s.add_dependency(%q, [">= 1"]) + s.add_dependency(%q, [">= 1"]) + s.add_dependency(%q, [">= 1"]) + s.add_dependency(%q, [">= 1"]) + s.add_dependency(%q, [">= 1"]) + s.add_dependency(%q, [">= 3"]) + s.add_dependency(%q, [">= 0"]) + end + else + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 1"]) + s.add_dependency(%q, [">= 1"]) + s.add_dependency(%q, [">= 1"]) + s.add_dependency(%q, [">= 1"]) + s.add_dependency(%q, [">= 1"]) + s.add_dependency(%q, [">= 1"]) + s.add_dependency(%q, [">= 1"]) + s.add_dependency(%q, [">= 3"]) + s.add_dependency(%q, [">= 0"]) + end +end + -- cgit v1.2.3