From 0bb5dae334ab17bc6ebe106acd1e1c47dfd4f68f Mon Sep 17 00:00:00 2001 From: Hauke Klement Date: Mon, 16 Feb 2015 11:33:03 +0100 Subject: [PATCH] changed literal array syntax, as suggested by RuboCop --- app/controllers/concerns/file_parameters.rb | 2 +- app/controllers/concerns/lti.rb | 2 +- app/models/code_ocean/file.rb | 4 ++-- app/models/concerns/user.rb | 2 +- app/models/file_type.rb | 6 +++--- app/models/submission.rb | 2 +- config/deploy.rb | 4 ++-- db/seeds/development.rb | 2 +- spec/factories/file_type.rb | 2 +- spec/factories/shared_traits.rb | 2 +- spec/models/submission_spec.rb | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/controllers/concerns/file_parameters.rb b/app/controllers/concerns/file_parameters.rb index 186f86f6..e61e719e 100644 --- a/app/controllers/concerns/file_parameters.rb +++ b/app/controllers/concerns/file_parameters.rb @@ -1,6 +1,6 @@ module FileParameters def file_attributes - %w[content context_id feedback_message file_id file_type_id hidden id name native_file path read_only role weight] + %w(content context_id feedback_message file_id file_type_id hidden id name native_file path read_only role weight) end private :file_attributes end diff --git a/app/controllers/concerns/lti.rb b/app/controllers/concerns/lti.rb index a6de4eaa..023e445f 100644 --- a/app/controllers/concerns/lti.rb +++ b/app/controllers/concerns/lti.rb @@ -5,7 +5,7 @@ module Lti MAXIMUM_SCORE = 1 MAXIMUM_SESSION_AGE = 60.minutes - SESSION_PARAMETERS = %w[launch_presentation_return_url lis_outcome_service_url lis_result_sourcedid] + SESSION_PARAMETERS = %w(launch_presentation_return_url lis_outcome_service_url lis_result_sourcedid) def build_tool_provider(options = {}) if options[:consumer] && options[:parameters] diff --git a/app/models/code_ocean/file.rb b/app/models/code_ocean/file.rb index 9def60cb..9cc85832 100644 --- a/app/models/code_ocean/file.rb +++ b/app/models/code_ocean/file.rb @@ -3,8 +3,8 @@ require File.expand_path('../../../uploaders/file_uploader', __FILE__) module CodeOcean class File < ActiveRecord::Base DEFAULT_WEIGHT = 1.0 - ROLES = %w[main_file reference_implementation regular_file teacher_defined_test user_defined_file user_defined_test] - TEACHER_DEFINED_ROLES = ROLES - %w[user_defined_file] + ROLES = %w(main_file reference_implementation regular_file teacher_defined_test user_defined_file user_defined_test) + TEACHER_DEFINED_ROLES = ROLES - %w(user_defined_file) after_initialize :set_default_values before_validation :set_ancestor_values, if: :incomplete_descendent? diff --git a/app/models/concerns/user.rb b/app/models/concerns/user.rb index f0dfb2d3..e934e664 100644 --- a/app/models/concerns/user.rb +++ b/app/models/concerns/user.rb @@ -1,7 +1,7 @@ module User extend ActiveSupport::Concern - ROLES = %w[admin teacher] + ROLES = %w(admin teacher) included do belongs_to :consumer diff --git a/app/models/file_type.rb b/app/models/file_type.rb index e6ab911e..831d8aba 100644 --- a/app/models/file_type.rb +++ b/app/models/file_type.rb @@ -1,9 +1,9 @@ class FileType < ActiveRecord::Base include Creation - AUDIO_FILE_EXTENSIONS = %w[.aac .flac .m4a .mp3 .ogg .wav .wma] - IMAGE_FILE_EXTENSIONS = %w[.bmp .gif .jpeg .jpg .png] - VIDEO_FILE_EXTENSIONS = %w[.avi .flv .mkv .mp4 .m4v .ogv .webm] + AUDIO_FILE_EXTENSIONS = %w(.aac .flac .m4a .mp3 .ogg .wav .wma) + IMAGE_FILE_EXTENSIONS = %w(.bmp .gif .jpeg .jpg .png) + VIDEO_FILE_EXTENSIONS = %w(.avi .flv .mkv .mp4 .m4v .ogv .webm) after_initialize :set_default_values diff --git a/app/models/submission.rb b/app/models/submission.rb index b783ec1b..dd7991fa 100644 --- a/app/models/submission.rb +++ b/app/models/submission.rb @@ -2,7 +2,7 @@ class Submission < ActiveRecord::Base include Context include Creation - CAUSES = %w[assess download file render run save submit test] + CAUSES = %w(assess download file render run save submit test) FILENAME_URL_PLACEHOLDER = '{filename}' belongs_to :exercise diff --git a/config/deploy.rb b/config/deploy.rb index 227f6ba6..2156b44b 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -5,8 +5,8 @@ set :application, 'code_ocean' set :config_example_suffix, '.example' set :deploy_to, '/var/www/app' set :keep_releases, 3 -set :linked_dirs, %w[bin log public/uploads tmp/cache tmp/files tmp/pids tmp/sockets] -set :linked_files, %w[config/action_mailer.yml config/database.yml config/secrets.yml config/sendmail.yml config/smtp.yml] +set :linked_dirs, %w(bin log public/uploads tmp/cache tmp/files tmp/pids tmp/sockets) +set :linked_files, %w(config/action_mailer.yml config/database.yml config/secrets.yml config/sendmail.yml config/smtp.yml) set :log_level, :info set :puma_threads, [0, 16] set :repo_url, 'git@github.com:openHPI/codeocean.git' diff --git a/db/seeds/development.rb b/db/seeds/development.rb index 96a67bef..4a3d77e5 100644 --- a/db/seeds/development.rb +++ b/db/seeds/development.rb @@ -3,7 +3,7 @@ FactoryGirl.create(:consumer) FactoryGirl.create(:consumer, name: 'openSAP') # users -%w[admin external_user teacher].each { |factory_name| FactoryGirl.create(factory_name) } +%w(admin external_user teacher).each { |factory_name| FactoryGirl.create(factory_name) } # execution environments ExecutionEnvironment.create_factories diff --git a/spec/factories/file_type.rb b/spec/factories/file_type.rb index e33c1f28..b60a95ab 100644 --- a/spec/factories/file_type.rb +++ b/spec/factories/file_type.rb @@ -181,7 +181,7 @@ FactoryGirl.define do singleton_file_type end - %w[binary executable renderable].each do |attribute| + %w(binary executable renderable).each do |attribute| trait(attribute) do self.send(attribute, true) end diff --git a/spec/factories/shared_traits.rb b/spec/factories/shared_traits.rb index 033652be..5f8ce318 100644 --- a/spec/factories/shared_traits.rb +++ b/spec/factories/shared_traits.rb @@ -1,5 +1,5 @@ FactoryGirl.define do - %w[admin external_user teacher].each do |factory_name| + %w(admin external_user teacher).each do |factory_name| trait :"created_by_#{factory_name}" do association :user, factory: factory_name end diff --git a/spec/models/submission_spec.rb b/spec/models/submission_spec.rb index 12a8b4fc..45d093b1 100644 --- a/spec/models/submission_spec.rb +++ b/spec/models/submission_spec.rb @@ -18,7 +18,7 @@ describe Submission do expect(Submission.create.errors[:user_type]).to be_present end - %w[download render run test].each do |action| + %w(download render run test).each do |action| describe "##{action}_url" do let(:url) { @submission.send(:"#{action}_url") }