Code style for the rest of app

nygrenh · nygrenh · commit 09df6c63f9ce · 2018-09-28T20:46:13.000+03:00
diff --git a/app/background_tasks/background_course_refresher_task.rb b/app/background_tasks/background_course_refresher_task.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'background_course_refresher'
 
 class BackgroundCourseRefresherTask
diff --git a/app/background_tasks/submission_reprocessor_task.rb b/app/background_tasks/submission_reprocessor_task.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'submission_processor'
 
 class SubmissionReprocessorTask
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'tailoring'
 
 module ApplicationHelper
@@ -18,7 +20,7 @@ def active_on_current_path_link_to(name, path, options = {})
       classes += ' active'
       options[:class] = classes
     end
-    return link_to(name, path, options)
+    link_to(name, path, options)
   end
 
   def labeled(label, tags = nil, options = {}, &block)
@@ -36,9 +38,9 @@ def labeled(label, tags = nil, options = {}, &block)
     tags = tags.html_safe
 
     if tags =~ /id\s*=\s*"([^"]+)"/
-      target = ' for="' + $1 + '"'
+      target = ' for="' + Regexp.last_match(1) + '"'
     else
-      fail 'Cannot label a tag without an id'
+      raise 'Cannot label a tag without an id'
     end
 
     cls = []
@@ -56,7 +58,7 @@ def labeled(label, tags = nil, options = {}, &block)
     when :label_last
       label_start + tags + label_text + label_end
     else
-      fail 'invalid :order option for labeled()'
+      raise 'invalid :order option for labeled()'
     end
   end
 
@@ -79,7 +81,7 @@ def bs_labeled_field(label, field, options = {})
       str << '</label>'
     else
       label = label_tag label, nil, class: 'control-label'
-      str += raw("<div class=\"form-group\">" + raw(label) + raw(field) + '</div>')
+      str += raw('<div class="form-group">' + raw(label) + raw(field) + '</div>')
     end
     raw(str)
   end
@@ -89,14 +91,14 @@ def use_datatables(table_selector, options = {})
       bJQueryUI: true,
       bSort: false
     }.merge options
-    script = <<EOS
-<script type="text/javascript">
-<!--
-$(document).ready(function() {
-  $('#{escape_javascript table_selector}').dataTable(#{options.to_json});
-});
-//-->
-</script>
+    script = <<~EOS
+      <script type="text/javascript">
+      <!--
+      $(document).ready(function() {
+        $('#{escape_javascript table_selector}').dataTable(#{options.to_json});
+      });
+      //-->
+      </script>
 EOS
     raw(script)
   end
diff --git a/app/helpers/authorize_collection_helper.rb b/app/helpers/authorize_collection_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AuthorizeCollectionHelper
   # This method allows to authorize collections of items
   # TODO: Has to be tested with empty collections and other edge cases
diff --git a/app/helpers/bad_utf8_helper.rb b/app/helpers/bad_utf8_helper.rb
@@ -1,4 +1,6 @@
 
+# frozen_string_literal: true
+
 module BadUtf8Helper
   def force_utf8_violently(str)
     if str.encoding == Encoding.find('UTF-8') && str.valid_encoding?
diff --git a/app/helpers/bootstrap_flash_helper.rb b/app/helpers/bootstrap_flash_helper.rb
@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module BootstrapFlashHelper
-  ALERT_TYPES = [:error, :info, :success, :danger]
+  ALERT_TYPES = %i[error info success danger].freeze
 
   def bootstrap_flash
     flash_messages = []
@@ -8,7 +10,7 @@ def bootstrap_flash
       next if message.blank?
 
       type = :success if type.to_sym == :notice
-      type = :danger   if type.to_sym == :alert
+      type = :danger if type.to_sym == :alert
 
       next unless ALERT_TYPES.include?(type.to_sym)
 
diff --git a/app/helpers/comet_helper.rb b/app/helpers/comet_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'site_setting'
 
 module CometHelper
diff --git a/app/helpers/course_timings_helper.rb b/app/helpers/course_timings_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module CourseTimingsHelper
   def parse_percentage_from_unlock_condition(condition)
     if condition =~ /^(\d+)[%]\s+(?:in|of|from)\s+(\S+)$/
diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module CoursesHelper
   def response_body_for(body)
     return "You wrote:\n\n#{body}\n\n---\n\n"
-    "#{body}"
+    body.to_s
   end
 end
diff --git a/app/helpers/embeddable_helper.rb b/app/helpers/embeddable_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module EmbeddableHelper
   def remove_x_frame_options_header_when_bare_layout
     response.headers.except! 'X-Frame-Options' if @bare_layout
diff --git a/app/helpers/exercises_helper.rb b/app/helpers/exercises_helper.rb
@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module ExercisesHelper
   def exercise_zip_url(e)
-    "#{exercise_url(e, format: 'zip')}"
+    exercise_url(e, format: 'zip').to_s
   end
 
   def exercise_solution_zip_url(e)
-    "#{exercise_solution_url(e, format: 'zip')}"
+    exercise_solution_url(e, format: 'zip').to_s
   end
 
   def green(percentage)
diff --git a/app/helpers/extra_field_helper.rb b/app/helpers/extra_field_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ExtraFieldHelper
   def extra_field(field_value, method_options)
     field = field_value.field
@@ -19,9 +21,9 @@ def extra_field(field_value, method_options)
       when :text
         text_field_tag(field_name, existing_value, { class: 'form-control' }.merge(common_attrs))
       when :boolean
-        check_box_tag(field_name, '1', !existing_value.blank?, common_attrs)
+        check_box_tag(field_name, '1', existing_value.present?, common_attrs)
       else
-        fail "Unknown extra field type: #{field.field_type}"
+        raise "Unknown extra field type: #{field.field_type}"
       end
 
     label_order =
@@ -45,9 +47,9 @@ def extra_field_filter(prefix, field, value)
       when :text
         text_field_tag(field_name, value, class: 'form-control')
       when :boolean
-        check_box_tag(field_name, '1', !value.blank?)
+        check_box_tag(field_name, '1', value.present?)
       else
-        fail "Unknown extra field type: #{field.field_type}"
+        raise "Unknown extra field type: #{field.field_type}"
       end
 
     label_order =
@@ -64,15 +66,15 @@ def extra_field_filter(prefix, field, value)
   def extra_field_checkbox(prefix, field, value)
     return '' if field.field_type == :html
     field_name = prefix + field.name
-    field_tag = check_box_tag(field_name, '1', !value.blank?)
-    labeled_field(raw(field.name.humanize), field_tag, :order => :label_last, :super_class => "checkbox")
+    field_tag = check_box_tag(field_name, '1', value.present?)
+    labeled_field(raw(field.name.humanize), field_tag, order: :label_last, super_class: 'checkbox')
   end
 
   def extra_field_value(value_record)
     field = value_record.field
     case field.field_type
     when :boolean
-      if value_record.value.blank? then 'No' else 'Yes' end
+      value_record.value.blank? ? 'No' : 'Yes'
     else
       value_record.value
     end
diff --git a/app/helpers/feedback_answers_helper.rb b/app/helpers/feedback_answers_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module FeedbackAnswersHelper
   def render_feedback_answer(answer)
     if answer.feedback_question.intrange?
diff --git a/app/helpers/flash_block_helper.rb b/app/helpers/flash_block_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module FlashBlockHelper
   def flash_block
     output = ''
diff --git a/app/helpers/paste_helper.rb b/app/helpers/paste_helper.rb
@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module PasteHelper
 end
diff --git a/app/helpers/points_helper.rb b/app/helpers/points_helper.rb
@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'natsort'
 
 module PointsHelper
   def github_repo_url_to_project_page_url(url)
     if url =~ /github.com[:\/]([^\/]*)\/([^\/]*)\.git/
-      "https://github.com/#{$1}/#{$2}"
+      "https://github.com/#{Regexp.last_match(1)}/#{Regexp.last_match(2)}"
     end
   end
 
diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SessionsHelper
   def sign_in(user)
     session[:user_id] = user.id
@@ -29,17 +31,13 @@ def sign_out
   private
 
   def user_from_session
-    User.find_by_id(session[:user_id])
+    User.find_by(id: session[:user_id])
   end
 
   def user_from_basic_auth
-    if request && request.authorization
+    if request&.authorization
       username, password = ActionController::HttpAuthentication::Basic.user_name_and_password(request)
-      if username && password
-        User.authenticate(username, password)
-      else
-        nil
-      end
+      User.authenticate(username, password) if username && password
     end
   end
 end
diff --git a/app/helpers/submissions_helper.rb b/app/helpers/submissions_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SubmissionsHelper
   def show_submission_list(submissions, options = {})
     locals = {
@@ -80,11 +82,11 @@ def handle_langs_chain(exception)
 
   def submissions_for_datatables(submissions)
     submissions.map do |sub|
-      if can? :read, sub.user
-        user_col = link_to sub.user.login, participant_path(sub.user)
-      else
-        user_col = sub.user.login
-      end
+      user_col = if can? :read, sub.user
+                   link_to sub.user.login, participant_path(sub.user)
+                 else
+                   sub.user.login
+                 end
       [
         sub.created_at.strftime('%Y-%m-%d %H:%M'),
         user_col,
diff --git a/app/helpers/twitter_breadcrumbs_helper.rb b/app/helpers/twitter_breadcrumbs_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module TwitterBreadcrumbsHelper
   def render_breadcrumbs(divider = '/')
     render partial: 'twitter-bootstrap/breadcrumbs', locals: { divider: divider }
diff --git a/app/mailers/course_notification_mailer.rb b/app/mailers/course_notification_mailer.rb
@@ -1,4 +1,6 @@
 
+# frozen_string_literal: true
+
 class CourseNotificationMailer < ActionMailer::Base
   include ActionView::Helpers::SanitizeHelper
   def notification_email(params = {})
diff --git a/app/mailers/feedback_reply_mailer.rb b/app/mailers/feedback_reply_mailer.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class FeedbackReplyMailer < ActionMailer::Base
   def feedback_email(reply_to, to, body, exercise_name)
     from = SiteSetting.value('emails')['from']
diff --git a/app/mailers/new_organization_request_mailer.rb b/app/mailers/new_organization_request_mailer.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class NewOrganizationRequestMailer < ActionMailer::Base
   def request_email(organization)
     email = SiteSetting.value('administrative_email')
diff --git a/app/mailers/password_reset_key_mailer.rb b/app/mailers/password_reset_key_mailer.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class PasswordResetKeyMailer < ActionMailer::Base
   def reset_link_email(user, key, origin = nil)
     @user = user
diff --git a/app/mailers/review_mailer.rb b/app/mailers/review_mailer.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ReviewMailer < ActionMailer::Base
   def review_email(review)
     settings = SiteSetting.value('emails')
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cgi'
 
 class UserMailer < ActionMailer::Base
@@ -6,11 +8,11 @@ def email_confirmation(user, origin = nil)
     @user = user
     token = user.verification_tokens.email.create!
     @url = base_url + confirm_email_path(@user.id, token.token)
-    subject = "Confirm your mooc.fi account email address"
+    subject = 'Confirm your mooc.fi account email address'
     subject = "#{origin}: #{subject}" if origin
     if origin
       origin_name = origin.downcase.tr(' ', '_').gsub(/[\.\/]/, '')
-      @url = @url + "?origin=#{CGI.escape(origin_name)}"
+      @url += "?origin=#{CGI.escape(origin_name)}"
       template_path = Rails.root.join('config', 'email_templates', 'user_mailer', 'email_confirmation')
       html_template_path = template_path.join("#{origin_name}.html.erb")
       text_template_path = template_path.join("#{origin_name}.text.erb")
@@ -28,7 +30,7 @@ def destroy_confirmation(user)
     @user = user
     token = user.verification_tokens.delete_user.create!
     @url = base_url + verify_destroying_user_path(@user.id, token.token)
-    mail(from: SiteSetting.value('emails')['from'], to: user.email, subject: "Confirm deleting your mooc.fi account")
+    mail(from: SiteSetting.value('emails')['from'], to: user.email, subject: 'Confirm deleting your mooc.fi account')
   end
 
   private

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# frozen_string_literal: true`
	`2`	`+`
`1`	`3`	`require 'background_course_refresher'`
`2`	`4`
`3`	`5`	`class BackgroundCourseRefresherTask`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# frozen_string_literal: true`
	`2`	`+`
`1`	`3`	`require 'submission_processor'`
`2`	`4`
`3`	`5`	`class SubmissionReprocessorTask`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# frozen_string_literal: true`
	`2`	`+`
`1`	`3`	`module AuthorizeCollectionHelper`
`2`	`4`	`# This method allows to authorize collections of items`
`3`	`5`	`# TODO: Has to be tested with empty collections and other edge cases`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# frozen_string_literal: true`
	`2`	`+`
`1`	`3`	`require 'site_setting'`
`2`	`4`
`3`	`5`	`module CometHelper`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# frozen_string_literal: true`
	`2`	`+`
`1`	`3`	`module CourseTimingsHelper`
`2`	`4`	`def parse_percentage_from_unlock_condition(condition)`
`3`	`5`	`if condition =~ /^(\d+)[%]\s+(?:in\|of\|from)\s+(\S+)$/`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# frozen_string_literal: true`
	`2`	`+`
`1`	`3`	`module EmbeddableHelper`
`2`	`4`	`def remove_x_frame_options_header_when_bare_layout`
`3`	`5`	`response.headers.except! 'X-Frame-Options' if @bare_layout`