From 21c6d1c4dd926b0459ebdfbbb3842e81d6fdc723 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Fri, 16 Jun 2017 00:17:19 +0200 Subject: [PATCH] Cleanup Lint/AssignmentInCondition rubocop issues on code and remove it from ruboco_todo list --- .rubocop_todo.yml | 8 -------- .../legislation/annotations_controller.rb | 6 ++++-- .../legislation/processes_controller.rb | 16 ++++++++++++---- .../management/sessions_controller.rb | 7 +++---- app/controllers/pages_controller.rb | 4 +++- app/models/notification.rb | 6 ++++-- app/models/site_customization/image.rb | 5 ++--- 7 files changed, 28 insertions(+), 24 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 255c65882..7e3b28c66 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -6,14 +6,6 @@ # Note that changes in the inspected code, or installation of new # versions of RuboCop, may require this file to be generated again. -# Offense count: 3 -# Configuration parameters: AllowSafeAssignment. -Lint/AssignmentInCondition: - Exclude: - - 'app/controllers/management/sessions_controller.rb' - - 'app/models/notification.rb' - - 'lib/capistrano/template.rb' - # Offense count: 2 # Cop supports --auto-correct. # Configuration parameters: AlignWith, SupportedStyles. diff --git a/app/controllers/legislation/annotations_controller.rb b/app/controllers/legislation/annotations_controller.rb index 56f851316..1605a2f67 100644 --- a/app/controllers/legislation/annotations_controller.rb +++ b/app/controllers/legislation/annotations_controller.rb @@ -37,8 +37,10 @@ class Legislation::AnnotationsController < ApplicationController range_start: annotation_params[:ranges].first[:start], range_start_offset: annotation_params[:ranges].first[:startOffset].to_i, range_end: annotation_params[:ranges].first[:end], range_end_offset: annotation_params[:ranges].first[:endOffset].to_i).first - if @annotation = existing_annotation - if comment = @annotation.comments.create(body: annotation_params[:text], user: current_user) + @annotation = existing_annotation + if @annotation.present? + comment = @annotation.comments.create(body: annotation_params[:text], user: current_user) + if comment.present? render json: @annotation.to_json else render json: comment.errors.full_messages, status: :unprocessable_entity diff --git a/app/controllers/legislation/processes_controller.rb b/app/controllers/legislation/processes_controller.rb index 21951fa6f..ee5c10830 100644 --- a/app/controllers/legislation/processes_controller.rb +++ b/app/controllers/legislation/processes_controller.rb @@ -8,7 +8,9 @@ class Legislation::ProcessesController < Legislation::BaseController end def show - if @process.allegations_phase.enabled? && @process.allegations_phase.started? && draft_version = @process.draft_versions.published.last + draft_version = @process.draft_versions.published.last + + if @process.allegations_phase.enabled? && @process.allegations_phase.started? && draft_version.present? redirect_to legislation_process_draft_version_path(@process, draft_version) elsif @process.debate_phase.enabled? redirect_to legislation_process_debate_path(@process) @@ -33,7 +35,9 @@ class Legislation::ProcessesController < Legislation::BaseController @phase = :draft_publication if @process.draft_publication.started? - if draft_version = @process.draft_versions.published.last + draft_version = @process.draft_versions.published.last + + if draft_version.present? redirect_to legislation_process_draft_version_path(@process, draft_version) else render :phase_empty @@ -48,7 +52,9 @@ class Legislation::ProcessesController < Legislation::BaseController @phase = :allegations_phase if @process.allegations_phase.started? - if draft_version = @process.draft_versions.published.last + draft_version = @process.draft_versions.published.last + + if draft_version.present? redirect_to legislation_process_draft_version_path(@process, draft_version) else render :phase_empty @@ -63,7 +69,9 @@ class Legislation::ProcessesController < Legislation::BaseController @phase = :result_publication if @process.result_publication.started? - if final_version = @process.final_draft_version + final_version = @process.final_draft_version + + if final_version.present? redirect_to legislation_process_draft_version_path(@process, final_version) else render :phase_empty diff --git a/app/controllers/management/sessions_controller.rb b/app/controllers/management/sessions_controller.rb index 5d0587ae5..85ed59eae 100644 --- a/app/controllers/management/sessions_controller.rb +++ b/app/controllers/management/sessions_controller.rb @@ -37,9 +37,8 @@ class Management::SessionsController < ActionController::Base end def authenticated_manager? - if manager = ManagerAuthenticator.new(params).auth - session[:manager] = manager - end + manager = ManagerAuthenticator.new(params).auth + session[:manager] = manager if manager.present? end -end \ No newline at end of file +end diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index 81d6e8dbd..654fe2ff8 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -2,7 +2,9 @@ class PagesController < ApplicationController skip_authorization_check def show - if @custom_page = SiteCustomization::Page.published.find_by(slug: params[:id]) + @custom_page = SiteCustomization::Page.published.find_by(slug: params[:id]) + + if @custom_page.present? render action: :custom_page else render action: params[:id] diff --git a/app/models/notification.rb b/app/models/notification.rb index e993e55f8..bbbb18942 100644 --- a/app/models/notification.rb +++ b/app/models/notification.rb @@ -17,7 +17,9 @@ class Notification < ActiveRecord::Base end def self.add(user_id, notifiable) - if notification = Notification.find_by(user_id: user_id, notifiable: notifiable) + notification = Notification.find_by(user_id: user_id, notifiable: notifiable) + + if notification.present? Notification.increment_counter(:counter, notification.id) else Notification.create!(user_id: user_id, notifiable: notifiable) @@ -50,4 +52,4 @@ class Notification < ActiveRecord::Base notifiable.is_a?(ProposalNotification) ? notifiable.proposal : notifiable end -end \ No newline at end of file +end diff --git a/app/models/site_customization/image.rb b/app/models/site_customization/image.rb index 0886a3d03..5e7f38e4d 100644 --- a/app/models/site_customization/image.rb +++ b/app/models/site_customization/image.rb @@ -21,9 +21,8 @@ class SiteCustomization::Image < ActiveRecord::Base def self.image_path_for(filename) image_name = filename.split(".").first - if i = find_by(name: image_name) - i.image.exists? ? i.image.url : nil - end + imageable = find_by(name: image_name) + imageable.present? && imageable.image.exists? ? imageable.image.url : nil end def required_width