From 9789095fbf7f2053a95b328d299b49950fa48676 Mon Sep 17 00:00:00 2001
From: gebele <gebele@in-silico.ch>
Date: Fri, 17 Oct 2014 15:37:02 +0200
Subject: updated Gemfile with local opentox-gems; added validation to gemspec

---
 Gemfile           | 8 ++++++++
 application.rb    | 2 +-
 lazar-gui.gemspec | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index e9d1078..1b83cff 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,14 @@
 source "https://rubygems.org"
+gemspec
 gem "sinatra"
 gem "haml"
 gem "sass"
 gem "opentox-server", :path => "../opentox-server"
 gem "opentox-client", :path => "../opentox-client"
+gem "opentox-algorithm", :path => "../algorithm"
+gem "opentox-compound", :path => "../compound"
+gem "opentox-dataset", :path => "../dataset"
+gem "opentox-feature", :path => "../feature"
+gem "opentox-model", :path => "../model"
+gem "opentox-task", :path => "../task"
+gem "opentox-validation", :path => "../validation"
diff --git a/application.rb b/application.rb
index 0185518..22900f6 100644
--- a/application.rb
+++ b/application.rb
@@ -9,7 +9,7 @@ helpers do
   # models must be edited with RDF.type => (RDF::OT.PredictionModel, EchaEndpoint)
   @@models = []
   models = `curl -k GET -H accept:text/uri-list #{$model[:uri]}`.split("\n")
-  .collect{|m| model = OpenTox::Model::Lazar.find m; if model.type.flatten.to_s =~ /PredictionModel/ then @@models << model end}
+  .collect{|m| model = OpenTox::Model::Lazar.find m; @@models << model if model.type.flatten.to_s =~ /PredictionModel/}
   @@cv = []
   `curl -k GET -H accept:text/uri-list #{$validation[:uri]}/crossvalidation`.split("\n").each{|cv| x = OpenTox::Validation.find cv; @@cv << x}
 end
diff --git a/lazar-gui.gemspec b/lazar-gui.gemspec
index dbc4cec..8b07ab2 100644
--- a/lazar-gui.gemspec
+++ b/lazar-gui.gemspec
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "opentox-feature"
   s.add_runtime_dependency "opentox-model"
   s.add_runtime_dependency "opentox-task"
+  s.add_runtime_dependency "opentox-validation"
   s.add_runtime_dependency "sinatra"
   s.add_runtime_dependency "haml"
   s.add_runtime_dependency "sass"
-- 
cgit v1.2.3