summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/environment.rb4
-rw-r--r--opentox-ruby-api-wrapper.gemspec15
2 files changed, 10 insertions, 9 deletions
diff --git a/lib/environment.rb b/lib/environment.rb
index 3d4cd69..81c7ea2 100644
--- a/lib/environment.rb
+++ b/lib/environment.rb
@@ -24,7 +24,8 @@ end
# database
if @@config[:database]
- ['dm-core', 'dm-serializer', 'dm-timestamps', 'dm-types'].each{|lib| require lib }
+ #['dm-core', 'dm-serializer', 'dm-timestamps', 'dm-types'].each{|lib| require lib }
+ ['datamapper'].each{|lib| require lib }
case @@config[:database][:adapter]
when /sqlite/i
db_dir = File.join(basedir, "db")
@@ -128,6 +129,7 @@ RDF = Redland::Namespace.new 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'
OWL = Redland::Namespace.new 'http://www.w3.org/2002/07/owl#'
DC = Redland::Namespace.new 'http://purl.org/dc/elements/1.1/'
OT = Redland::Namespace.new 'http://www.opentox.org/api/1.1#'
+#OT = Redland::Namespace.new 'http://ortona.informatik.uni-freiburg.de/opentox.owl#'
XML = Redland::Namespace.new 'http://www.w3.org/2001/XMLSchema#'
# Regular expressions for parsing classification data
diff --git a/opentox-ruby-api-wrapper.gemspec b/opentox-ruby-api-wrapper.gemspec
index 258ee09..dffefa6 100644
--- a/opentox-ruby-api-wrapper.gemspec
+++ b/opentox-ruby-api-wrapper.gemspec
@@ -9,10 +9,10 @@ Gem::Specification.new do |s|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Christoph Helma"]
- s.date = %q{2010-03-18}
+ s.date = %q{2010-05-26}
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", "yaml2owl.rb"]
+ s.executables = ["yaml2owl.rb", "opentox-install-ubuntu.sh", "opentox-install-debian.sh"]
s.extra_rdoc_files = [
"LICENSE",
"README.rdoc"
@@ -31,11 +31,13 @@ Gem::Specification.new do |s|
"lib/config/config_ru.rb",
"lib/dataset.rb",
"lib/environment.rb",
+ "lib/features.rb",
"lib/helper.rb",
"lib/model.rb",
"lib/opentox-ruby-api-wrapper.rb",
"lib/opentox.owl",
"lib/owl.rb",
+ "lib/rest_client_wrapper.rb",
"lib/spork.rb",
"lib/task.rb",
"lib/tasks/opentox.rb",
@@ -62,8 +64,7 @@ Gem::Specification.new do |s|
s.add_runtime_dependency(%q<rack-flash>, [">= 0"])
s.add_runtime_dependency(%q<emk-sinatra-url-for>, [">= 0"])
s.add_runtime_dependency(%q<cehoffman-sinatra-respond_to>, [">= 0"])
- s.add_runtime_dependency(%q<dm-more>, [">= 0"])
- s.add_runtime_dependency(%q<dm-core>, [">= 0"])
+ s.add_runtime_dependency(%q<datamapper>, [">= 0"])
s.add_runtime_dependency(%q<sinatra-static-assets>, [">= 0"])
s.add_development_dependency(%q<cucumber>, [">= 0"])
s.add_development_dependency(%q<jeweler>, [">= 0"])
@@ -76,8 +77,7 @@ Gem::Specification.new do |s|
s.add_dependency(%q<rack-flash>, [">= 0"])
s.add_dependency(%q<emk-sinatra-url-for>, [">= 0"])
s.add_dependency(%q<cehoffman-sinatra-respond_to>, [">= 0"])
- s.add_dependency(%q<dm-more>, [">= 0"])
- s.add_dependency(%q<dm-core>, [">= 0"])
+ s.add_dependency(%q<datamapper>, [">= 0"])
s.add_dependency(%q<sinatra-static-assets>, [">= 0"])
s.add_dependency(%q<cucumber>, [">= 0"])
s.add_dependency(%q<jeweler>, [">= 0"])
@@ -91,8 +91,7 @@ Gem::Specification.new do |s|
s.add_dependency(%q<rack-flash>, [">= 0"])
s.add_dependency(%q<emk-sinatra-url-for>, [">= 0"])
s.add_dependency(%q<cehoffman-sinatra-respond_to>, [">= 0"])
- s.add_dependency(%q<dm-more>, [">= 0"])
- s.add_dependency(%q<dm-core>, [">= 0"])
+ s.add_dependency(%q<datamapper>, [">= 0"])
s.add_dependency(%q<sinatra-static-assets>, [">= 0"])
s.add_dependency(%q<cucumber>, [">= 0"])
s.add_dependency(%q<jeweler>, [">= 0"])