use #fail instead of #raise to signal exceptions, as suggested by RuboCop

This commit is contained in:
Hauke Klement
2015-02-17 09:05:04 +01:00
parent b21a7ee8e8
commit c99b0e6256
6 changed files with 9 additions and 9 deletions

View File

@ -95,7 +95,7 @@ module Lti
private :return_to_consumer private :return_to_consumer
def send_score(score) def send_score(score)
raise Error.new("Score #{score} must be between 0 and #{MAXIMUM_SCORE}!") unless (0..MAXIMUM_SCORE).include?(score) fail(Error, "Score #{score} must be between 0 and #{MAXIMUM_SCORE}!") unless (0..MAXIMUM_SCORE).include?(score)
provider = build_tool_provider(consumer: Consumer.find_by(id: session[:consumer_id]), parameters: session[:lti_parameters]) provider = build_tool_provider(consumer: Consumer.find_by(id: session[:consumer_id]), parameters: session[:lti_parameters])
if provider.nil? if provider.nil?
{status: 'error'} {status: 'error'}

View File

@ -21,7 +21,7 @@ class ApplicationPolicy
private :no_one private :no_one
def require_user! def require_user!
raise Pundit::NotAuthorizedError unless @user fail Pundit::NotAuthorizedError unless @user
end end
private :require_user! private :require_user!
@ -33,7 +33,7 @@ class ApplicationPolicy
end end
def require_user! def require_user!
raise Pundit::NotAuthorizedError unless @user fail Pundit::NotAuthorizedError unless @user
end end
private :require_user! private :require_user!
end end

View File

@ -17,7 +17,7 @@ class Assessor
if options[:execution_environment].testing_framework? if options[:execution_environment].testing_framework?
@testing_framework_adapter = Kernel.const_get(options[:execution_environment].testing_framework).new @testing_framework_adapter = Kernel.const_get(options[:execution_environment].testing_framework).new
else else
raise Error.new('No testing framework adapter set!') fail(Error, 'No testing framework adapter set!')
end end
end end
end end

View File

@ -10,7 +10,7 @@ module CodeOcean
content = options[:erb] ? YAML.load(ERB.new(::File.new(path, 'r').read).result) : YAML.load_file(path) content = options[:erb] ? YAML.load(ERB.new(::File.new(path, 'r').read).result) : YAML.load_file(path)
content[Rails.env].with_indifferent_access content[Rails.env].with_indifferent_access
else else
raise Error.new("Configuration file not found: #{path}") fail(Error, "Configuration file not found: #{path}")
end end
end end
end end

View File

@ -10,7 +10,7 @@ class DockerClient
def self.check_availability! def self.check_availability!
Timeout::timeout(config[:connection_timeout]) { Docker.version } Timeout::timeout(config[:connection_timeout]) { Docker.version }
rescue Excon::Errors::SocketError, Timeout::Error rescue Excon::Errors::SocketError, Timeout::Error
raise Error.new("The Docker host at #{Docker.url} is not reachable!") raise(Error, "The Docker host at #{Docker.url} is not reachable!")
end end
def command_substitutions(filename) def command_substitutions(filename)
@ -96,12 +96,12 @@ class DockerClient
@execution_environment = options[:execution_environment] @execution_environment = options[:execution_environment]
@user = options[:user] @user = options[:user]
@image = self.class.find_image_by_tag(@execution_environment.docker_image) @image = self.class.find_image_by_tag(@execution_environment.docker_image)
raise Error.new("Cannot find image #{@execution_environment.docker_image}!") unless @image fail(Error, "Cannot find image #{@execution_environment.docker_image}!") unless @image
end end
def self.initialize_environment def self.initialize_environment
unless config[:connection_timeout] && config[:workspace_root] unless config[:connection_timeout] && config[:workspace_root]
raise Error.new('Docker configuration missing!') fail(Error, 'Docker configuration missing!')
end end
Docker.url = config[:host] if config[:host] Docker.url = config[:host] if config[:host]
check_availability! check_availability!

View File

@ -15,7 +15,7 @@ class TestingFrameworkAdapter
end end
def parse_output(output) def parse_output(output)
raise NotImplementedError.new("#{self.class} should implement #parse_output!") fail(NotImplementedError, "#{self.class} should implement #parse_output!")
end end
private :parse_output private :parse_output