summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.de>2010-02-02 17:00:49 +0100
committerChristoph Helma <helma@in-silico.de>2010-02-02 17:00:49 +0100
commit97a70bb21b6898d6099c786bc65d3ecf16a8f145 (patch)
tree82e912b346464b6b5fb70ba61d9abf1841e9984e
parent3ca6d652f1433cb851e10a6cf89eb16fc6b2d9c3 (diff)
centralized database configuration
-rw-r--r--application.rb9
-rw-r--r--config.ru2
2 files changed, 2 insertions, 9 deletions
diff --git a/application.rb b/application.rb
index e340b24..a74038a 100644
--- a/application.rb
+++ b/application.rb
@@ -1,13 +1,6 @@
require 'rubygems'
-gem 'opentox-ruby-api-wrapper', '=1.2.6'
+gem 'opentox-ruby-api-wrapper', '= 1.2.7'
require 'opentox-ruby-api-wrapper'
-require 'do_sqlite3'
-require 'dm-core'
-require 'dm-serializer'
-require 'dm-timestamps'
-require 'dm-types'
-
-DataMapper::setup(:default, "sqlite3://#{Dir.pwd}/dataset.sqlite3")
class Dataset
include DataMapper::Resource
diff --git a/config.ru b/config.ru
index 1c00295..ec0402a 100644
--- a/config.ru
+++ b/config.ru
@@ -1,4 +1,4 @@
require 'rubygems'
require 'opentox-ruby-api-wrapper'
-require 'tasks/config'
+require 'config/config_ru'
run Sinatra::Application