consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1660 from consul/fix/rubocop_issues

Browse Source 
Fix some Rubocop issues
This commit is contained in:
Raimond Garcia
2017-06-20 21:49:59 +02:00
committed by GitHub
parent 91061dc47f 1eebc33da9
commit 09a2f2b795
21 changed files with 108 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
.rubocop_todo.yml
View File

@@ -6,37 +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
Lint/AmbiguousRegexpLiteral:
Exclude:
- 'app/helpers/verification_helper.rb'
- 'spec/features/verification/residence_spec.rb'
# 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.
# SupportedStyles: either, start_of_block, start_of_line
Lint/BlockAlignment:
Exclude:
- 'spec/features/tracks_spec.rb'
- 'spec/models/proposal_spec.rb'
# Offense count: 1
# Cop supports --auto-correct.
# Configuration parameters: AlignWith, SupportedStyles, AutoCorrect.
# SupportedStyles: start_of_line, def
Lint/DefEndAlignment:
Exclude:
- 'app/controllers/comments_controller.rb'
# Offense count: 1
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
@@ -45,11 +14,6 @@ Lint/InheritException:
Exclude:
- 'app/controllers/concerns/feature_flags.rb'
# Offense count: 7
Lint/NestedMethodDefinition:
Exclude:
- 'lib/acts_as_paranoid_aliases.rb'
# Offense count: 13
Lint/ParenthesesAsGroupedExpression:
Exclude:
@@ -58,11 +22,6 @@ Lint/ParenthesesAsGroupedExpression:
- 'spec/features/proposals_spec.rb'
- 'spec/models/debate_spec.rb'
# Offense count: 1
Lint/UnderscorePrefixedVariableName:
Exclude:
- 'lib/manager_authenticator.rb'
# Offense count: 4
# Cop supports --auto-correct.
# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
@@ -120,12 +79,6 @@ Metrics/ModuleLength:
Metrics/PerceivedComplexity:
Max: 11
# Offense count: 1
# Cop supports --auto-correct.
Performance/RedundantBlockCall:
Exclude:
- 'app/mailers/mailer.rb'
# Offense count: 4
# Cop supports --auto-correct.
Performance/RedundantMatch:
@@ -194,14 +147,6 @@ Rails/PluralizationGrammar:
- 'spec/features/proposals_spec.rb'
- 'spec/models/residence_spec.rb'
# Offense count: 2
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
# SupportedStyles: referer, referrer
Rails/RequestReferer:
Exclude:
- 'app/controllers/users/sessions_controller.rb'
# Offense count: 11
# Configuration parameters: EnforcedStyle, SupportedStyles.
# SupportedStyles: strict, flexible
@@ -257,25 +202,6 @@ Layout/AlignParameters:
- 'spec/models/user_spec.rb'
- 'spec/rails_helper.rb'
# Offense count: 1
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
# SupportedStyles: always, conditionals
Style/AndOr:
Exclude:
- 'app/helpers/embed_videos_helper.rb'
# Offense count: 1
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
# SupportedStyles: line_count_based, semantic, braces_for_chaining
# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
# FunctionalMethods: let, let!, subject, watch
# IgnoredMethods: lambda, proc, it
Style/BlockDelimiters:
Exclude:
- 'spec/features/users_auth_spec.rb'
# Offense count: 2
# Cop supports --auto-correct.
Layout/BlockEndNewline:

8
app/controllers/legislation/annotations_controller.rb
View File

@@ -30,15 +30,17 @@ class Legislation::AnnotationsController < ApplicationController
def create
if !@process.allegations_phase.open? || @draft_version.final_version?
render json: {}, status: :not_found and return
render(json: {}, status: :not_found) && (return)
end
existing_annotation = @draft_version.annotations.where(
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

16
app/controllers/legislation/processes_controller.rb
View File

@@ -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

7
app/controllers/management/sessions_controller.rb
View File

@@ -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
end

4
app/controllers/pages_controller.rb
View File

@@ -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]

2
app/controllers/users/sessions_controller.rb
View File

@@ -11,7 +11,7 @@ class Users::SessionsController < Devise::SessionsController
end
def after_sign_out_path_for(resource)
request.referrer.present? ? request.referrer : super
request.referer.present? ? request.referer : super
end
def verifying_via_email?

2
app/helpers/embed_videos_helper.rb
View File

@@ -21,7 +21,7 @@ module EmbedVideosHelper
match = link.match(reg_exp)
end
if match and match[2]
if match && match[2]
'<iframe src="' + src + match[2] + '" style="border:0;" allowfullscreen title="' + title + '"></iframe>'
else
''

6
app/helpers/verification_helper.rb
View File

@@ -7,12 +7,12 @@ module VerificationHelper
end
def mask_phone(number)
match = number.match /\d{3}$/
match = number.match(/\d{3}$/)
"******#{match}"
end
def mask_email(string)
match = string.match /^(\w{1,3})(.*)@(.*)/
match = string.match(/^(\w{1,3})(.*)@(.*)/)
data_to_display = match[1]
data_to_mask = match[2]
@@ -21,4 +21,4 @@ module VerificationHelper
data_to_display + "*"*data_to_mask.size + "@" + email_provider
end
end
end

2
app/mailers/mailer.rb
View File

@@ -129,7 +129,7 @@ class Mailer < ApplicationMailer
def with_user(user, &block)
I18n.with_locale(user.locale) do
block.call
yield
end
end

6
app/models/notification.rb
View File

@@ -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
end

2
app/models/officing/residence.rb
View File

@@ -62,7 +62,7 @@ class Officing::Residence
document_type: document_type).first
end
def residence_in_madrid
def residence_in_madrid
return if errors.any?
unless residency_valid?

5
app/models/site_customization/image.rb
View File

@@ -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

48
lib/acts_as_paranoid_aliases.rb
View File

@@ -2,36 +2,38 @@ module ActsAsParanoidAliases
def self.included(base)
base.extend(ClassMethods)
self.class_eval do
def hide
return false if hidden?
update_attribute(:hidden_at, Time.current)
after_hide
end
def hide
return false if hidden?
update_attribute(:hidden_at, Time.current)
after_hide
end
def hidden?
deleted?
end
def hidden?
deleted?
end
def after_hide
end
def after_hide
end
def confirmed_hide?
confirmed_hide_at.present?
end
def confirmed_hide?
confirmed_hide_at.present?
end
def confirm_hide
update_attribute(:confirmed_hide_at, Time.current)
end
def confirm_hide
update_attribute(:confirmed_hide_at, Time.current)
end
def restore(opts={})
return false unless hidden?
super(opts)
update_attribute(:confirmed_hide_at, nil)
after_restore
end
def restore(opts={})
return false unless hidden?
super(opts)
update_attribute(:confirmed_hide_at, nil)
after_restore
end
def after_restore
def after_restore
end
end
end

4
lib/manager_authenticator.rb
View File

@@ -5,7 +5,7 @@ class ManagerAuthenticator
end
def auth
return false unless [@manager[:login], @manager[:user_key], @manager[:date]].all? {|_| _.present?}
return false unless [@manager[:login], @manager[:user_key], @manager[:date]].all? {|manager| manager.present?}
return @manager if manager_exists? && application_authorized?
false
end
@@ -41,4 +41,4 @@ class ManagerAuthenticator
def application_key
Rails.application.secrets.managers_application_key.to_s
end
end
end

25
spec/features/admin/poll/polls_spec.rb
View File

@@ -248,18 +248,21 @@ feature 'Admin polls' do
booth_assignment_recounted = create(:poll_booth_assignment, poll: poll)
booth_assignment_final_recounted = create(:poll_booth_assignment, poll: poll)
3.times { |i| create(:poll_recount,
booth_assignment: booth_assignment,
date: poll.starts_at + i.days,
count: 33) }
3.times do |i|
create(:poll_recount,
booth_assignment: booth_assignment,
date: poll.starts_at + i.days,
count: 33)
end
3.times { |i| create(:poll_final_recount,
booth_assignment: booth_assignment,
date: poll.starts_at + i.days,
count: 21) }
3.times do |i|
create(:poll_final_recount,
booth_assignment: booth_assignment,
date: poll.starts_at + i.days,
count: 21)
end
2.times { create(:poll_voter,
booth_assignment: booth_assignment_final_recounted) }
2.times { create(:poll_voter, booth_assignment: booth_assignment_final_recounted) }
create(:poll_recount,
booth_assignment: booth_assignment_recounted,
@@ -363,4 +366,4 @@ feature 'Admin polls' do
end
end
end
end

18
spec/features/budgets/investments_spec.rb
View File

@@ -337,14 +337,16 @@ feature 'Budget Investments' do
end
context "Show (feasible budget investment)" do
let(:investment) { create(:budget_investment,
:feasible,
:finished,
budget: budget,
group: group,
heading: heading,
price: 16,
price_explanation: 'Every wheel is 4 euros, so total is 16')}
let(:investment) do
create(:budget_investment,
:feasible,
:finished,
budget: budget,
group: group,
heading: heading,
price: 16,
price_explanation: 'Every wheel is 4 euros, so total is 16')
end
background do
user = create(:user)

12
spec/features/officing/final_recount_spec.rb
View File

@@ -110,10 +110,12 @@ feature 'Officing Final Recount' do
booth_assignment: final_officer_assignment.booth_assignment,
date: 7.days.ago,
count: 100)
33.times { create(:poll_voter, :valid_document,
poll: poll,
booth_assignment: final_officer_assignment.booth_assignment,
created_at: final_recount.date) }
33.times do
create(:poll_voter, :valid_document,
poll: poll,
booth_assignment: final_officer_assignment.booth_assignment,
created_at: final_recount.date)
end
visit new_officing_poll_final_recount_path(poll)
within("#poll_final_recount_#{final_recount.id}") do
@@ -144,4 +146,4 @@ feature 'Officing Final Recount' do
expect(page).to have_select('date', selected: I18n.l(final_recount.date.to_date, format: :long))
end
end
end

2
spec/features/tracks_spec.rb
View File

@@ -8,7 +8,7 @@ feature 'Tracking' do
visit proposals_path
expect(page.html).to include "anonymous"
end
end
scenario 'Usertype level_1_user' do
create(:geozone)

14
spec/features/users_auth_spec.rb
View File

@@ -107,9 +107,17 @@ feature 'Users' do
let(:twitter_hash){ {provider: 'twitter', uid: '12345', info: {name: 'manuela'}} }
let(:twitter_hash_with_email){ {provider: 'twitter', uid: '12345', info: {name: 'manuela', email: 'manuelacarmena@example.com'}} }
let(:twitter_hash_with_verified_email){ {provider: 'twitter',
uid: '12345',
info: {name: 'manuela', email: 'manuelacarmena@example.com', verified: '1'}} }
let(:twitter_hash_with_verified_email) do
{
provider: 'twitter',
uid: '12345',
info: {
name: 'manuela',
email: 'manuelacarmena@example.com',
verified: '1'
}
}
end
scenario 'Sign up when Oauth provider has a verified email' do
OmniAuth.config.add_mock(:twitter, twitter_hash_with_verified_email)

2
spec/features/verification/residence_spec.rb
View File

@@ -56,7 +56,7 @@ feature 'Residence' do
click_button 'Verify residence'
expect(page).to have_content /\d errors? prevented the verification of your residence/
expect(page).to have_content(/\d errors? prevented the verification of your residence/)
end
scenario 'Error on postal code not in census' do

2
spec/models/proposal_spec.rb
View File

@@ -99,7 +99,7 @@ describe Proposal do
expect(proposal).to be_valid
proposal.responsible_name = "12345678Z"
end
end
it "should not be updated when the author is deleted" do
author = create(:user, :level_three, document_number: "12345678Z")