Rubocop autocorrections

This commit is contained in:
Bertocq
2017-07-25 12:48:23 +02:00
parent 58331e6425
commit 7d406cae76
12 changed files with 36 additions and 31 deletions

View File

@@ -440,6 +440,8 @@ Style/AccessorMethodName:
Style/BracesAroundHashParameters: Style/BracesAroundHashParameters:
Exclude: Exclude:
- 'app/models/concerns/searchable.rb' - 'app/models/concerns/searchable.rb'
- 'spec/features/budgets/investments_spec.rb'
- 'spec/features/proposals_spec.rb'
# Offense count: 119 # Offense count: 119
# Configuration parameters: EnforcedStyle, SupportedStyles. # Configuration parameters: EnforcedStyle, SupportedStyles.

View File

@@ -26,8 +26,8 @@ class UsersController < ApplicationController
when "proposals" then load_proposals when "proposals" then load_proposals
when "debates" then load_debates when "debates" then load_debates
when "budget_investments" then load_budget_investments when "budget_investments" then load_budget_investments
when "comments" then load_comments when "comments" then load_comments
when "follows" then load_follows when "follows" then load_follows
else load_available_activity else load_available_activity
end end
end end

View File

@@ -20,7 +20,7 @@ module FollowablesHelper
end end
def followable_class_name(followable) def followable_class_name(followable)
followable.class.to_s.parameterize.gsub('-', '_') followable.class.to_s.parameterize('_')
end end
def find_or_build_follow(user, followable) def find_or_build_follow(user, followable)

View File

@@ -5,5 +5,4 @@ class Follow < ActiveRecord::Base
validates :user_id, presence: true validates :user_id, presence: true
validates :followable_id, presence: true validates :followable_id, presence: true
validates :followable_type, presence: true validates :followable_type, presence: true
end end

View File

@@ -1,16 +1,16 @@
require 'http' require 'http'
API_ENDPOINT = 'https://decide.madrid.es/graphql' API_ENDPOINT = 'https://decide.madrid.es/graphql'.freeze
def make_request(query_string) def make_request(query_string)
HTTP.headers('User-Agent' => 'Mozilla/5.0', accept: 'application/json') HTTP.headers('User-Agent' => 'Mozilla/5.0', accept: 'application/json')
.get( .get(
API_ENDPOINT, API_ENDPOINT,
params: { query: query_string.gsub("\n", '').gsub(" ", '') } params: { query: query_string.delete("\n").delete(" ") }
) )
end end
query = """ query = <<-GRAPHQL
{ {
proposal(id: 1) { proposal(id: 1) {
id, id,
@@ -18,7 +18,7 @@ query = """
public_created_at public_created_at
} }
} }
""" GRAPHQL
response = make_request(query) response = make_request(query)

View File

@@ -1,12 +1,12 @@
require 'http' require 'http'
API_ENDPOINT = 'https://decide.madrid.es/graphql' API_ENDPOINT = 'https://decide.madrid.es/graphql'.freeze
def make_request(query_string) def make_request(query_string)
HTTP.headers('User-Agent' => 'Mozilla/5.0', accept: 'application/json') HTTP.headers('User-Agent' => 'Mozilla/5.0', accept: 'application/json')
.get( .get(
API_ENDPOINT, API_ENDPOINT,
params: { query: query_string.gsub("\n", '').gsub(" ", '') } params: { query: query_string.delete("\n").delete(" ") }
) )
end end
@@ -15,9 +15,9 @@ def build_query(options = {})
page_size_parameter = "first: #{page_size}" page_size_parameter = "first: #{page_size}"
page_number = options[:page_number] || 0 page_number = options[:page_number] || 0
after_parameter = page_number > 0 ? ", after: \"#{options[:next_cursor]}\"" : "" after_parameter = page_number.positive? ? ", after: \"#{options[:next_cursor]}\"" : ""
""" <<-GRAPHQL
{ {
proposals(#{page_size_parameter}#{after_parameter}) { proposals(#{page_size_parameter}#{after_parameter}) {
pageInfo { pageInfo {
@@ -33,7 +33,7 @@ def build_query(options = {})
} }
} }
} }
""" GRAPHQL
end end
page_number = 0 page_number = 0
@@ -61,5 +61,5 @@ loop do
page_number += 1 page_number += 1
break if !has_next_page break unless has_next_page
end end

View File

@@ -28,7 +28,9 @@ class LocalCensus
end end
def district_code def district_code
@body.district_code rescue nil @body.district_code
rescue
nil
end end
def gender def gender
@@ -43,7 +45,9 @@ class LocalCensus
end end
def name def name
"#{@body.nombre} #{@body.apellido1}" rescue nil "#{@body.nombre} #{@body.apellido1}"
rescue
nil
end end
private private

View File

@@ -219,7 +219,7 @@ feature 'Users' do
end end
scenario 'Display interests' do scenario 'Display interests' do
proposal = create(:proposal, tag_list: "Sport") proposal = create(:proposal, tag_list: "Sport")
create(:follow, :followed_proposal, followable: proposal, user: @user) create(:follow, :followed_proposal, followable: proposal, user: @user)
login_as(@user) login_as(@user)
@@ -375,7 +375,7 @@ feature 'Users' do
visit user_path(@user, filter: "follows") visit user_path(@user, filter: "follows")
expect(page).to have_selector(".activity li.active", text: "1 Following" ) expect(page).to have_selector(".activity li.active", text: "1 Following")
end end
describe 'Proposals' do describe 'Proposals' do
@@ -471,7 +471,7 @@ feature 'Users' do
end end
scenario 'Display budget investment with action buttons inside accordion budget investment tab when current user is a verified user and author', :js do scenario 'Display budget investment with action buttons inside accordion budget investment tab when current user is a verified user and author', :js do
user = create(:user, :level_two) user = create(:user, :level_two)
budget_investment = create(:budget_investment, author: user) budget_investment = create(:budget_investment, author: user)
create(:follow, followable: budget_investment, user: user) create(:follow, followable: budget_investment, user: user)
login_as user login_as user
@@ -484,7 +484,7 @@ feature 'Users' do
end end
scenario 'Display budget investment with action buttons inside accordion budget investment tab when there is no logged user', :js do scenario 'Display budget investment with action buttons inside accordion budget investment tab when there is no logged user', :js do
user = create(:user, :level_two) user = create(:user, :level_two)
budget_investment = create(:budget_investment, author: user) budget_investment = create(:budget_investment, author: user)
create(:follow, followable: budget_investment, user: user) create(:follow, followable: budget_investment, user: user)
@@ -496,7 +496,7 @@ feature 'Users' do
end end
scenario 'Display budget investment without action buttons inside accordion budget investment tab when current user is not budget investment author', :js do scenario 'Display budget investment without action buttons inside accordion budget investment tab when current user is not budget investment author', :js do
user = create(:user, :level_two) user = create(:user, :level_two)
budget_investment = create(:budget_investment) budget_investment = create(:budget_investment)
create(:follow, followable: budget_investment, user: user) create(:follow, followable: budget_investment, user: user)
login_as user login_as user

View File

@@ -5,7 +5,7 @@ describe CensusCaller do
describe '#call' do describe '#call' do
it "returns data from local_census_records if census API is not available" do it "returns data from local_census_records if census API is not available" do
census_api_response = CensusApi::Response.new({:get_habita_datos_response=>{:get_habita_datos_return=>{:datos_habitante=>{}, :datos_vivienda=>{}}}}) census_api_response = CensusApi::Response.new(get_habita_datos_response: {get_habita_datos_return: {datos_habitante: {}, datos_vivienda: {}}})
local_census_response = LocalCensus::Response.new(create(:local_census_record)) local_census_response = LocalCensus::Response.new(create(:local_census_record))
CensusApi.any_instance.stub(:call).and_return(census_api_response) CensusApi.any_instance.stub(:call).and_return(census_api_response)
@@ -20,7 +20,7 @@ describe CensusCaller do
end end
it "returns data from census API if it's available and valid" do it "returns data from census API if it's available and valid" do
census_api_response = CensusApi::Response.new({get_habita_datos_response: {get_habita_datos_return: {datos_habitante: {item: {fecha_nacimiento_string: "1-1-1980"}}}}}) census_api_response = CensusApi::Response.new(get_habita_datos_response: {get_habita_datos_return: {datos_habitante: {item: {fecha_nacimiento_string: "1-1-1980"}}}})
local_census_response = LocalCensus::Response.new(create(:local_census_record)) local_census_response = LocalCensus::Response.new(create(:local_census_record))
CensusApi.any_instance.stub(:call).and_return(census_api_response) CensusApi.any_instance.stub(:call).and_return(census_api_response)

View File

@@ -658,10 +658,10 @@ describe User do
end end
describe "#interests" do describe "#interests" do
let(:user) { create(:user) } let(:user) { create(:user) }
it "should return followed object tags" do it "should return followed object tags" do
proposal = create(:proposal, tag_list: "Sport") proposal = create(:proposal, tag_list: "Sport")
create(:follow, followable: proposal, user: user) create(:follow, followable: proposal, user: user)
expect(user.interests).to eq ["Sport"] expect(user.interests).to eq ["Sport"]
@@ -670,7 +670,7 @@ describe User do
it "should discard followed objects duplicated tags" do it "should discard followed objects duplicated tags" do
proposal1 = create(:proposal, tag_list: "Sport") proposal1 = create(:proposal, tag_list: "Sport")
proposal2 = create(:proposal, tag_list: "Sport") proposal2 = create(:proposal, tag_list: "Sport")
budget_investment = create(:budget_investment, tag_list: "Sport") budget_investment = create(:budget_investment, tag_list: "Sport")
create(:follow, followable: proposal1, user: user) create(:follow, followable: proposal1, user: user)
create(:follow, followable: proposal2, user: user) create(:follow, followable: proposal2, user: user)

View File

@@ -3,7 +3,7 @@ shared_examples "followable" do |followable_class_name, followable_path, followa
let!(:arguments) { {} } let!(:arguments) { {} }
let!(:followable) { create(followable_class_name) } let!(:followable) { create(followable_class_name) }
let!(:followable_dom_name) { followable_class_name.gsub('_', '-') } let!(:followable_dom_name) { followable_class_name.tr('_', '-') }
before do before do
followable_path_arguments.each do |argument_name, path_to_value| followable_path_arguments.each do |argument_name, path_to_value|