resolved conflicts, replace text/x-yaml with application/x-yaml, acceess classification values w/o confidence

1 files changed, 56 insertions, 17 deletions

diff --git a/opentox-ruby-api-wrapper.gemspec b/opentox-ruby-api-wrapper.gemspec
index 18dc1df..d158479 100644
--- a/opentox-ruby-api-wrapper.gemspec
+++ b/opentox-ruby-api-wrapper.gemspec
@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{opentox-ruby-api-wrapper}
-  s.version = "1.4.4.4"
+  s.version = "1.5.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Christoph Helma"]
-  s.date = %q{2010-05-28}
+  s.authors = ["Christoph Helma, Martin Guetlein"]
+  s.date = %q{2010-06-25}
   s.description = %q{Ruby wrapper for the OpenTox REST API (http://www.opentox.org)}
   s.email = %q{helma@in-silico.ch}
   s.executables = ["yaml2owl.rb", "opentox-install-ubuntu.sh", "opentox-install-debian.sh"]
@@ -49,50 +49,89 @@ Gem::Specification.new do |s|
   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.5}
+  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::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sinatra>, [">= 0"])
+      s.add_runtime_dependency(%q<emk-sinatra-url-for>, [">= 0"])
+      s.add_runtime_dependency(%q<sinatra-respond_to>, [">= 0"])
+      s.add_runtime_dependency(%q<sinatra-static-assets>, [">= 0"])
       s.add_runtime_dependency(%q<rest-client>, [">= 0"])
       s.add_runtime_dependency(%q<rack>, [">= 0"])
       s.add_runtime_dependency(%q<rack-contrib>, [">= 0"])
       s.add_runtime_dependency(%q<rack-flash>, [">= 0"])
-      s.add_runtime_dependency(%q<emk-sinatra-url-for>, [">= 0"])
-      s.add_runtime_dependency(%q<datamapper>, [">= 0"])
-      s.add_runtime_dependency(%q<sinatra-static-assets>, [">= 0"])
+      s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
+      s.add_runtime_dependency(%q<rubyzip>, [">= 0"])
+      s.add_runtime_dependency(%q<builder>, [">= 0"])
+      s.add_runtime_dependency(%q<roo>, [">= 0"])
+      s.add_runtime_dependency(%q<spreadsheet>, [">= 0"])
+      s.add_runtime_dependency(%q<google-spreadsheet-ruby>, [">= 0"])
+      s.add_runtime_dependency(%q<tmail>, [">= 0"])
+      s.add_runtime_dependency(%q<dm-core>, [">= 1"])
+      s.add_runtime_dependency(%q<dm-serializer>, [">= 1"])
+      s.add_runtime_dependency(%q<dm-timestamps>, [">= 1"])
+      s.add_runtime_dependency(%q<dm-types>, [">= 1"])
+      s.add_runtime_dependency(%q<dm-migrations>, [">= 1"])
+      s.add_runtime_dependency(%q<dm-mysql-adapter>, [">= 1"])
+      s.add_runtime_dependency(%q<haml>, [">= 3"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<thin>, [">= 0"])
     else
       s.add_dependency(%q<sinatra>, [">= 0"])
+      s.add_dependency(%q<emk-sinatra-url-for>, [">= 0"])
+      s.add_dependency(%q<sinatra-respond_to>, [">= 0"])
+      s.add_dependency(%q<sinatra-static-assets>, [">= 0"])
       s.add_dependency(%q<rest-client>, [">= 0"])
       s.add_dependency(%q<rack>, [">= 0"])
       s.add_dependency(%q<rack-contrib>, [">= 0"])
       s.add_dependency(%q<rack-flash>, [">= 0"])
-      s.add_dependency(%q<emk-sinatra-url-for>, [">= 0"])
-      s.add_dependency(%q<datamapper>, [">= 0"])
-      s.add_dependency(%q<sinatra-static-assets>, [">= 0"])
+      s.add_dependency(%q<nokogiri>, [">= 0"])
+      s.add_dependency(%q<rubyzip>, [">= 0"])
+      s.add_dependency(%q<builder>, [">= 0"])
+      s.add_dependency(%q<roo>, [">= 0"])
+      s.add_dependency(%q<spreadsheet>, [">= 0"])
+      s.add_dependency(%q<google-spreadsheet-ruby>, [">= 0"])
+      s.add_dependency(%q<tmail>, [">= 0"])
+      s.add_dependency(%q<dm-core>, [">= 1"])
+      s.add_dependency(%q<dm-serializer>, [">= 1"])
+      s.add_dependency(%q<dm-timestamps>, [">= 1"])
+      s.add_dependency(%q<dm-types>, [">= 1"])
+      s.add_dependency(%q<dm-migrations>, [">= 1"])
+      s.add_dependency(%q<dm-mysql-adapter>, [">= 1"])
+      s.add_dependency(%q<haml>, [">= 3"])
       s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<thin>, [">= 0"])
     end
   else
     s.add_dependency(%q<sinatra>, [">= 0"])
+    s.add_dependency(%q<emk-sinatra-url-for>, [">= 0"])
+    s.add_dependency(%q<sinatra-respond_to>, [">= 0"])
+    s.add_dependency(%q<sinatra-static-assets>, [">= 0"])
     s.add_dependency(%q<rest-client>, [">= 0"])
     s.add_dependency(%q<rack>, [">= 0"])
     s.add_dependency(%q<rack-contrib>, [">= 0"])
     s.add_dependency(%q<rack-flash>, [">= 0"])
-    s.add_dependency(%q<emk-sinatra-url-for>, [">= 0"])
-    s.add_dependency(%q<datamapper>, [">= 0"])
-    s.add_dependency(%q<sinatra-static-assets>, [">= 0"])
+    s.add_dependency(%q<nokogiri>, [">= 0"])
+    s.add_dependency(%q<rubyzip>, [">= 0"])
+    s.add_dependency(%q<builder>, [">= 0"])
+    s.add_dependency(%q<roo>, [">= 0"])
+    s.add_dependency(%q<spreadsheet>, [">= 0"])
+    s.add_dependency(%q<google-spreadsheet-ruby>, [">= 0"])
+    s.add_dependency(%q<tmail>, [">= 0"])
+    s.add_dependency(%q<dm-core>, [">= 1"])
+    s.add_dependency(%q<dm-serializer>, [">= 1"])
+    s.add_dependency(%q<dm-timestamps>, [">= 1"])
+    s.add_dependency(%q<dm-types>, [">= 1"])
+    s.add_dependency(%q<dm-migrations>, [">= 1"])
+    s.add_dependency(%q<dm-mysql-adapter>, [">= 1"])
+    s.add_dependency(%q<haml>, [">= 3"])
     s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<thin>, [">= 0"])
   end
 end