reorganized requires, added install_gems to Rakefile, text/x-yaml to application/x-yaml

7 files changed, 10 insertions, 19 deletions

diff --git a/report/environment.rb b/report/environment.rb
index 154374f..7c9aa8b 100644
--- a/report/environment.rb
+++ b/report/environment.rb
@@ -1,19 +1,11 @@
 
-require 'rubygems'
-require 'logger'
-require 'fileutils'
-require 'sinatra'
-require 'sinatra/url_for' 
-require 'rest_client'
-require 'yaml'
-require 'opentox-ruby-api-wrapper'
-require 'fileutils'
-require 'mime/types'
-require 'ruby-plot'
+['rubygems', 'logger', 'fileutils', 'sinatra', 'sinatra/url_for', 'rest_client', 
+  'yaml', 'opentox-ruby-api-wrapper', 'fileutils', 'mime/types', 'abbrev', 
+  'rexml/document', 'active_record', 'ar-extensions', 'ruby-plot'].each do |g|
+    require g
+end
 gem 'ruby-plot', '= 0.0.2'
 
-require 'active_record'
-require 'ar-extensions'
 unless ActiveRecord::Base.connected?
   ActiveRecord::Base.establish_connection(  
      :adapter => @@config[:database][:adapter],
diff --git a/report/report_application.rb b/report/report_application.rb
index dc61e3a..27c44b6 100644
--- a/report/report_application.rb
+++ b/report/report_application.rb
@@ -64,7 +64,7 @@ get '/report/:type/:id' do
     format = Reports::ReportFormat.get_format(accept_header)
     content_type format
     #PENDING: get_report should return file or string, check for result.is_file instead of format
-    if format=="text/x-yaml" or format=="application/rdf+xml"
+    if format=="application/x-yaml" or format=="application/rdf+xml"
       report
     else
       result = body(File.new(report))
diff --git a/report/report_format.rb b/report/report_format.rb
index 2eeb546..e61d9be 100644
--- a/report/report_format.rb
+++ b/report/report_format.rb
@@ -10,7 +10,7 @@ ENV['SAXON_JAR'] = "saxonhe9-2-0-3j/saxon9he.jar" unless ENV['SAXON_JAR']
 #
 module Reports::ReportFormat
   
-  CONTENT_TYPES = ["text/x-yaml","text/html","application/rdf+xml", "text/xml","application/pdf"]
+  CONTENT_TYPES = ["application/x-yaml","text/html","application/rdf+xml", "text/xml","application/pdf"]
   
   # returns report-format, according to header value
   def self.get_format(accept_header_value)
diff --git a/report/report_persistance.rb b/report/report_persistance.rb
index ac430c4..a06dba8 100644
--- a/report/report_persistance.rb
+++ b/report/report_persistance.rb
@@ -247,7 +247,7 @@ module Reports
       case format
       when "application/rdf+xml"
         report.to_rdf
-      when "text/x-yaml"
+      when "application/x-yaml"
         report.to_yaml
       else
         super
diff --git a/report/report_test.rb b/report/report_test.rb
index 702ec34..ff4e3db 100644
--- a/report/report_test.rb
+++ b/report/report_test.rb
@@ -17,7 +17,7 @@ class Reports::ApplicationTest < Test::Unit::TestCase
   
   def test_nothing
   
-    get "/report/validation/1",nil,'HTTP_ACCEPT' => "application/rdf+xml"#"text/x-yaml"     
+    get "/report/validation/1",nil,'HTTP_ACCEPT' => "application/rdf+xml"#"application/x-yaml"     
     puts last_response.body.to_s
     
     #Reports::XMLReport.generate_demo_xml_report.write_to
diff --git a/report/util.rb b/report/util.rb
index 06a3232..db783b3 100644
--- a/report/util.rb
+++ b/report/util.rb
@@ -1,4 +1,4 @@
-require 'abbrev'
+
 # graph-files are generated in the tmp-dir before they are stored
 ENV['TMP_DIR'] = File.join(FileUtils.pwd,"reports","tmp") unless ENV['TMP_DIR']
 
diff --git a/report/xml_report.rb b/report/xml_report.rb
index 4b838a2..a621400 100644
--- a/report/xml_report.rb
+++ b/report/xml_report.rb
@@ -1,5 +1,4 @@
 
-require 'rexml/document'
 require "report/xml_report_util.rb"
 
 ENV['REPORT_DTD'] = "docbook-xml-4.5/docbookx.dtd" unless ENV['REPORT_DTD']