updated for datamapper > 1

3 files changed, 41 insertions, 35 deletions

diff --git a/Rakefile b/Rakefile
index 1d9a184..39ec349 100644
--- a/Rakefile
+++ b/Rakefile
@@ -9,13 +9,12 @@ begin
     gem.description = %Q{Ruby wrapper for the OpenTox REST API (http://www.opentox.org)}
     gem.email = "helma@in-silico.ch"
     gem.homepage = "http://github.com/helma/opentox-ruby-api-wrapper"
-    gem.authors = ["Christoph Helma"]
+    gem.authors = ["Christoph Helma, Martin Guetlein"]
+		# dependencies
 		[ "sinatra",
 			"emk-sinatra-url-for",
 			"sinatra-respond_to",
 			"sinatra-static-assets",
-			"dm-more",
-			"dm-core",
 			"rest-client",
 			"rack",
 			"rack-contrib",
@@ -23,20 +22,20 @@ begin
 			"nokogiri",
 			"rubyzip",
 			"builder",
-			"do_mysql",
-			"data_objects",
 			"roo",
 			"spreadsheet",
 			"google-spreadsheet-ruby",
-			"tmail",
-			"haml"
-
-		].each do |dep|
-			gem.add_dependency dep
-		end
-		['cucumber','jeweler'].each do |dep|
-			gem.add_development_dependency dep
-		end
+			"tmail"
+		].each { |dep| gem.add_dependency dep }
+		[ "dm-core",
+			'dm-serializer',
+			'dm-timestamps',
+			'dm-types',
+			'dm-migrations',
+			"dm-mysql-adapter"
+		].each {|dep| gem.add_dependency dep, ">= 1" }
+		gem.add_dependency "haml", ">=3"
+		['cucumber','jeweler'].each { |dep| gem.add_development_dependency dep }
 		gem.files =  FileList["[A-Z]*", "{bin,generators,lib,test}/**/*", 'lib/jeweler/templates/.gitignore']
 		gem.files.include %w(lib/tasks/owl.rb, lib/environment.rb, lib/algorithm.rb, lib/compound.rb, lib/dataset.rb, lib/model.rb, lib/utils.rb, lib/validation.rb, lib/templates/*)
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
diff --git a/lib/environment.rb b/lib/environment.rb
index c112669..105f443 100644
--- a/lib/environment.rb
+++ b/lib/environment.rb
@@ -24,7 +24,7 @@ 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', 'dm-migrations' ].each{|lib| require lib }
 	case @@config[:database][:adapter]
 	when /sqlite/i
 		db_dir = File.join(basedir, "db")
@@ -106,6 +106,7 @@ end
 
 logfile = "#{LOG_DIR}/#{ENV["RACK_ENV"]}.log"
 LOGGER = MyLogger.new(logfile,'daily') # daily rotation
+LOGGER.level = Logger::WARN if ENV["RACK_ENV"] == 'production'
 
 #LOGGER = MyLogger.new(STDOUT)
 #LOGGER.datetime_format = "%Y-%m-%d %H:%M:%S "
diff --git a/opentox-ruby-api-wrapper.gemspec b/opentox-ruby-api-wrapper.gemspec
index 0eb96d8..9a7c0c3 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.5.5"
+  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-21}
+  s.authors = ["Christoph Helma, Martin Guetlein"]
+  s.date = %q{2010-06-15}
   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"]
@@ -49,20 +49,18 @@ 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.6}
+  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<dm-more>, [">= 0"])
-      s.add_runtime_dependency(%q<dm-core>, [">= 0"])
       s.add_runtime_dependency(%q<rest-client>, [">= 0"])
       s.add_runtime_dependency(%q<rack>, [">= 0"])
       s.add_runtime_dependency(%q<rack-contrib>, [">= 0"])
@@ -70,13 +68,17 @@ Gem::Specification.new do |s|
       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<do_mysql>, [">= 0"])
-      s.add_runtime_dependency(%q<data_objects>, [">= 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<haml>, [">= 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"])
     else
@@ -84,8 +86,6 @@ Gem::Specification.new do |s|
       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<dm-more>, [">= 0"])
-      s.add_dependency(%q<dm-core>, [">= 0"])
       s.add_dependency(%q<rest-client>, [">= 0"])
       s.add_dependency(%q<rack>, [">= 0"])
       s.add_dependency(%q<rack-contrib>, [">= 0"])
@@ -93,13 +93,17 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<rubyzip>, [">= 0"])
       s.add_dependency(%q<builder>, [">= 0"])
-      s.add_dependency(%q<do_mysql>, [">= 0"])
-      s.add_dependency(%q<data_objects>, [">= 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<haml>, [">= 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"])
     end
@@ -108,8 +112,6 @@ Gem::Specification.new do |s|
     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<dm-more>, [">= 0"])
-    s.add_dependency(%q<dm-core>, [">= 0"])
     s.add_dependency(%q<rest-client>, [">= 0"])
     s.add_dependency(%q<rack>, [">= 0"])
     s.add_dependency(%q<rack-contrib>, [">= 0"])
@@ -117,13 +119,17 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<rubyzip>, [">= 0"])
     s.add_dependency(%q<builder>, [">= 0"])
-    s.add_dependency(%q<do_mysql>, [">= 0"])
-    s.add_dependency(%q<data_objects>, [">= 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<haml>, [">= 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"])
   end