Diff
Modified: trunk/Gemfile (3561 => 3562)
--- trunk/Gemfile 2013-05-23 08:40:29 UTC (rev 3561)
+++ trunk/Gemfile 2013-05-23 08:55:55 UTC (rev 3562)
@@ -20,6 +20,7 @@
gem "rdf", "~> 1.0.6"
gem "rdf-raptor", "~> 1.0.1"
gem "rdf-n3", "~> 1.0.0"
+gem "rdf-turtle", "~> 1.0.6"
gem "recaptcha", "~> 0.3.4"
gem "encrypted_strings", "~> 0.3.3"
gem "encrypted_attributes", "~> 0.4.1"
Modified: trunk/lib/acts_as_rdf_serializable.rb (3561 => 3562)
--- trunk/lib/acts_as_rdf_serializable.rb 2013-05-23 08:40:29 UTC (rev 3561)
+++ trunk/lib/acts_as_rdf_serializable.rb 2013-05-23 08:55:55 UTC (rev 3562)
@@ -53,6 +53,7 @@
begin
@rdf = self.to_rdf
rescue
+ raise unless Rails.env == "production"
errors.add_to_base(self.rdf_serializable_options[:generation_error_message] || "RDF failed to generate")
false
else
Modified: trunk/lib/workflow_processors/blog2_template.rb (3561 => 3562)
--- trunk/lib/workflow_processors/blog2_template.rb 2013-05-23 08:40:29 UTC (rev 3561)
+++ trunk/lib/workflow_processors/blog2_template.rb 2013-05-23 08:55:55 UTC (rev 3562)
@@ -4,8 +4,10 @@
# See license.txt for details.
# Defines an interface that all workflow type processors need to adhere to.
+
+require 'file_upload'
+
module WorkflowProcessors
- require 'file_upload'
class Blog2Template < Interface
# Begin Class Methods
Modified: trunk/lib/workflow_processors/galaxy.rb (3561 => 3562)
--- trunk/lib/workflow_processors/galaxy.rb 2013-05-23 08:40:29 UTC (rev 3561)
+++ trunk/lib/workflow_processors/galaxy.rb 2013-05-23 08:55:55 UTC (rev 3562)
@@ -3,10 +3,10 @@
# Copyright (c) 2010 University of Manchester and the University of Southampton.
# See license.txt for details.
+require 'libxml'
+
module WorkflowProcessors
- require 'libxml'
-
class Galaxy < WorkflowProcessors::Interface
Mime::Type.register "application/vnd.galaxy.workflow+json", :galaxy_workflow
Modified: trunk/lib/workflow_processors/statjr_ebook.rb (3561 => 3562)
--- trunk/lib/workflow_processors/statjr_ebook.rb 2013-05-23 08:40:29 UTC (rev 3561)
+++ trunk/lib/workflow_processors/statjr_ebook.rb 2013-05-23 08:55:55 UTC (rev 3562)
@@ -3,6 +3,9 @@
# Copyright (c) 2008 University of Manchester and the University of Southampton.
# See license.txt for details.
+require "zip/zip"
+require 'rdf/raptor'
+
module WorkflowProcessors
class StatjrEbook < WorkflowProcessors::Interface
@@ -131,9 +134,6 @@
module Parser
- require "zip/zip"
- require 'rdf/raptor'
-
def self.parse(stream)
begin
Tempfile.open("deep", "tmp") do |zip_file|
Modified: trunk/lib/workflow_processors/taverna2.rb (3561 => 3562)
--- trunk/lib/workflow_processors/taverna2.rb 2013-05-23 08:40:29 UTC (rev 3561)
+++ trunk/lib/workflow_processors/taverna2.rb 2013-05-23 08:55:55 UTC (rev 3562)
@@ -3,17 +3,17 @@
# Copyright (c) 2008 University of Manchester and the University of Southampton.
# See license.txt for details.
+require 't2flow/model'
+require 't2flow/parser'
+require 't2flow/dot'
+require 'libxml'
+require 'rdf'
+require 'rdf/n3'
+require 'rdf/turtle'
+require 'file_upload'
+
module WorkflowProcessors
- require 't2flow/model'
- require 't2flow/parser'
- require 't2flow/dot'
- require 'libxml'
- require 'rdf'
- require 'rdf/n3'
-
- require 'file_upload'
-
class Taverna2 < Interface
# Register Taverna 2 MIME Types
Mime::Type.register "application/vnd.taverna.t2flow+xml", :t2flow
Modified: trunk/lib/workflow_processors/taverna_scufl.rb (3561 => 3562)
--- trunk/lib/workflow_processors/taverna_scufl.rb 2013-05-23 08:40:29 UTC (rev 3561)
+++ trunk/lib/workflow_processors/taverna_scufl.rb 2013-05-23 08:55:55 UTC (rev 3562)
@@ -3,13 +3,12 @@
# Copyright (c) 2008 University of Manchester and the University of Southampton.
# See license.txt for details.
+require 'scufl/model'
+require 'scufl/parser'
+require 'scufl/dot'
+require 'file_upload'
+
module WorkflowProcessors
-
- require 'scufl/model'
- require 'scufl/parser'
- require 'scufl/dot'
-
- require 'file_upload'
class TavernaScufl < WorkflowProcessors::Interface
# Register Taverna MIME Types