summaryrefslogtreecommitdiff
path: root/application.rb
diff options
context:
space:
mode:
authorMartin Gütlein <martin.guetlein@gmail.com>2010-01-08 09:52:29 +0100
committerMartin Gütlein <martin.guetlein@gmail.com>2010-01-08 09:52:29 +0100
commitbb404c382a5929445cdf89706bb8ad831f71259c (patch)
tree819fc9a8f2d251de25bbaa3b3627f0e74ae6e059 /application.rb
parenta6cbe221d074e07f9356ccf1bac336d4f2addd98 (diff)
removed suburi-prefix validation (to avoid name server/validation/validation)
print warning when R_HOME is missing instead of raising error
Diffstat (limited to 'application.rb')
-rw-r--r--application.rb9
1 files changed, 7 insertions, 2 deletions
diff --git a/application.rb b/application.rb
index feb19b1..82be7bb 100644
--- a/application.rb
+++ b/application.rb
@@ -1,6 +1,5 @@
-require "validation/validation_application.rb"
-require "report/report_application.rb"
+
require "example.rb"
[ 'rubygems', 'sinatra', 'sinatra/url_for' ].each do |lib|
@@ -17,5 +16,11 @@ get '/prepare_examples/?' do
"done"
end
+# order is important, first add example methods, than validation
+# (otherwise sinatra will try to locate a validation with name examples)
+
+require "validation/validation_application.rb"
+require "report/report_application.rb"
+