Normalize Ruby syntax with Rubocop

Author: myabc

Diff for: Gemfile

@@ -1,41 +1,43 @@
 source 'https://rubygems.org'
 
-gem 'rails',              '5.1.6'
+gem 'rails', '5.1.6'
+
 gem 'pg'
 
-gem 'puma',               '~> 3.11.4'
+gem 'puma', '~> 3.11.4'
 
-gem 'settingslogic'
+gem 'dotenv-rails'
 gem 'newrelic_rpm'
+gem 'settingslogic'
+
 gem 'devise',             '~> 4.4.3'
 gem 'omniauth',           '~> 1.6.1'
 gem 'omniauth-github'
 gem 'omniauth-twitter'
 gem 'simple_form',        '~> 3.5.1'
-gem 'dotenv-rails'
 
-gem 'modernizr-rails'
-gem 'sprockets-rails',    '~> 3.2.0'
-gem 'jquery-rails'
-gem 'turbolinks'
-gem 'jbuilder',           '~> 2.5'
+gem 'autoprefixer-rails', '~> 8.2'
 gem 'bourbon',            '~> 5.0.0'
-gem 'neat',               '~> 2.1.0'
+gem 'coffee-rails',       '~> 4.2.1'
+gem 'draper',             '~> 3.0.0.pre1'
 gem 'haml-rails',         '~> 1.0.0'
-gem 'rails_html_helpers'
-gem 'draper',           '~> 3.0.0.pre1'
+gem 'jbuilder',           '~> 2.5'
+gem 'jquery-rails'
+gem 'modernizr-rails'
+gem 'neat', '~> 2.1.0'
 gem 'pundit'
+gem 'rails_html_helpers'
 gem 'redcarpet'
-gem 'sass-rails',       '~> 5.0.6'
-gem 'coffee-rails',     '~> 4.2.1'
-gem 'uglifier',         '>= 1.0.3'
-
-gem 'autoprefixer-rails', '~> 8.2'
+gem 'sass-rails',         '~> 5.0.6'
+gem 'sprockets-rails',    '~> 3.2.0'
+gem 'turbolinks'
+gem 'uglifier', '>= 1.0.3'
 
 gem 'activemodel-serializers-xml'
 
 group :development do
   gem 'foreman'
+
   gem 'better_errors'
   gem 'binding_of_caller'
 
@@ -45,18 +47,18 @@ group :development do
 end
 
 group :test, :development do
-  gem 'rspec-rails',       '~> 3.3'
   gem 'factory_bot_rails', '~> 4.8'
+  gem 'rspec-rails',       '~> 3.3'
 end
 
 group :test do
-  gem 'rails-controller-testing'
-  gem 'rspec-its'
-  gem 'rspec-activemodel-mocks'
-  gem 'simplecov',        require: false
-  gem 'capybara',         '~> 2.1'
   gem 'accept_values_for'
+  gem 'capybara', '~> 2.1'
   gem 'json_spec'
+  gem 'rails-controller-testing'
+  gem 'rspec-activemodel-mocks'
+  gem 'rspec-its'
+  gem 'simplecov', require: false
 end
 
 group :production, :staging do

Diff for: Rakefile

@@ -1,6 +1,6 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
+require File.expand_path('config/application', __dir__)
 
 Activities::Application.load_tasks

Diff for: app/controllers/activities_controller.rb

@@ -1,7 +1,7 @@
 class ActivitiesController < ApiController
   respond_to :html
 
-  skip_before_action :authenticate_user!, only: [:index, :show]
+  skip_before_action :authenticate_user!, only: %i[index show]
   before_action :load_and_authorize_activity, only: %i[show edit update destroy]
 
   def index
@@ -34,46 +34,45 @@ def create
 
   def update
     if @activity
-      type        = @activity.update_attributes(sanitized_params) ? :notice : :error
+      type        = @activity.update(sanitized_params) ? :notice : :error
       flash[type] = I18n.t("edit_activity.#{type}")
     end
     respond_with(@activity, location: edit_activity_path(@activity))
   end
 
   def destroy
     if @activity && params[:confirm_delete] && @activity.destroy
-      redirect_to root_path, notice: I18n.t("destroy_activity.notice")
+      redirect_to root_path, notice: I18n.t('destroy_activity.notice')
     else
-      flash[:error] = I18n.t("destroy_activity.error")
+      flash[:error] = I18n.t('destroy_activity.error')
       render :edit
     end
   end
 
   private
 
-    def load_and_authorize_activity
-      @activity = current_event.activity(params[:id]) or
-        raise(ActiveRecord::RecordNotFound)
-      authorize @activity
-      @activity = @activity.decorate
-    end
-
-    def sanitized_params
-      params.require(:activity)
-            .permit(:start_time,
-                    :end_time,
-                    :name,
-                    :location,
-                    :requirements,
-                    :requires_event_ticket,
-                    :description,
-                    :limit_of_participants,
-                    :anytime,
-                    :image_url)
-    end
+  def load_and_authorize_activity
+    @activity = current_event.activity(params[:id]) or
+      raise(ActiveRecord::RecordNotFound)
+    authorize @activity
+    @activity = @activity.decorate
+  end
 
-    def query_params
-      params.permit(:search, :filter)
-    end
+  def sanitized_params
+    params.require(:activity)
+          .permit(:start_time,
+                  :end_time,
+                  :name,
+                  :location,
+                  :requirements,
+                  :requires_event_ticket,
+                  :description,
+                  :limit_of_participants,
+                  :anytime,
+                  :image_url)
+  end
 
+  def query_params
+    params.permit(:search, :filter)
+  end
 end

Diff for: app/controllers/api_controller.rb

@@ -1,7 +1,5 @@
 require_dependency 'api_responder'
 
 class ApiController < ApplicationController
-
   self.responder = ApiResponder
-
 end

Diff for: app/controllers/application_controller.rb

@@ -19,28 +19,27 @@ def current_event
 
   def not_found
     if request.xhr?
-      render nothing: true, status: 404
+      render nothing: true, status: :not_found
     else
-      raise ActionController::RoutingError.new('Not Found')
+      raise ActionController::RoutingError, 'Not Found'
     end
   end
 
   private
 
-    def clean_up_session
-      session[:omniauth] = nil
-    end
-
-    def rescue_access_denied
-      render nothing: true, status: 401
-    end
+  def clean_up_session
+    session[:omniauth] = nil
+  end
 
-    def rescue_record_not_found
-      not_found
-    end
+  def rescue_access_denied
+    render nothing: true, status: :unauthorized
+  end
 
-    def layout_by_resource
-      devise_controller? ? 'user' : 'application'
-    end
+  def rescue_record_not_found
+    not_found
+  end
 
+  def layout_by_resource
+    devise_controller? ? 'user' : 'application'
+  end
 end

Diff for: app/controllers/participations_controller.rb

@@ -21,8 +21,7 @@ def destroy
 
   private
 
-    def current_activity
-      @current_activity ||= current_event.activity(params[:activity_id]).try(:decorate)
-    end
-
+  def current_activity
+    @current_activity ||= current_event.activity(params[:activity_id]).try(:decorate)
+  end
 end

Diff for: app/controllers/registrations_controller.rb

@@ -1,6 +1,6 @@
 class RegistrationsController < Devise::RegistrationsController
   skip_before_action :authenticate_user!, only: :create
-  skip_before_action :clean_up_session, only: [:new, :create]
+  skip_before_action :clean_up_session, only: %i[new create]
 
   helper_method :during_oauth_flow?
 
@@ -29,29 +29,28 @@ def update
 
   private
 
-    def during_oauth_flow?
-      !current_user && @user.new_record? && session[:omniauth].present?
-    end
+  def during_oauth_flow?
+    !current_user && @user.new_record? && session[:omniauth].present?
+  end
 
-    def build_resource(*args)
-      super.tap do |user|
-        if user && session[:omniauth]
-          user.apply_omniauth(session[:omniauth])
-          user.valid?
-        end
+  def build_resource(*args)
+    super.tap do |user|
+      if user && session[:omniauth]
+        user.apply_omniauth(session[:omniauth])
+        user.valid?
       end
     end
+  end
 
-    def after_update_path_for(resource)
-      edit_user_registration_path
-    end
-
-    def sign_up_params
-      editable_params
-    end
+  def after_update_path_for(_resource)
+    edit_user_registration_path
+  end
 
-    def editable_params
-      params.require(:user).permit(:name, :email, :password, :password_confirmation, :show_participation)
-    end
+  def sign_up_params
+    editable_params
+  end
 
+  def editable_params
+    params.require(:user).permit(:name, :email, :password, :password_confirmation, :show_participation)
+  end
 end