fix activerecord version, improve rake init script

1 files changed, 4 insertions, 3 deletions

diff --git a/report/environment.rb b/report/environment.rb
index e04c397..f2bbe66 100644
--- a/report/environment.rb
+++ b/report/environment.rb
@@ -1,7 +1,7 @@
 
 ['rubygems', 'logger', 'fileutils', 'sinatra', 'sinatra/url_for', 'rest_client', 
   'yaml', 'fileutils', 'mime/types', 'abbrev', 
-  'rexml/document',  'ruby-plot', 'active_record', 'ar-extensions', 'opentox-ruby-api-wrapper' ].each do |g|
+  'rexml/document',  'ruby-plot', 'opentox-ruby-api-wrapper' ].each do |g|
     require g
 end
 gem 'ruby-plot', '= 0.0.2'
@@ -9,6 +9,9 @@ gem 'ruby-plot', '= 0.0.2'
 module Reports
 end
 
+require "lib/ot_predictions.rb"
+require "lib/active_record_setup.rb"
+
 require "report/plot_factory.rb"
 require "report/xml_report.rb"
 require "report/xml_report_util.rb"
@@ -21,8 +24,6 @@ require "report/validation_data.rb"
 require "report/util.rb"
 require "report/external/mimeparse.rb"
 
-require "lib/ot_predictions.rb"
-require "lib/active_record_setup.rb"