gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #349 from openSUSE/review_140721_basic_rubocop_rules

Browse source 
[Review] Request from 'KalabiYau' @ 'openSUSE/osem/review_140721_basic_rubocop_rules'
This commit is contained in:
Artem Chernikov 2014-07-23 11:00:30 +02:00
commit d9d72eae07
103 changed files with 686 additions and 260 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/admin/dietchoices_controller.rb
View file

@ -8,9 +8,9 @@ class Admin::DietchoicesController < ApplicationController
def update
begin
@conference.update_attributes!(params[:conference])
redirect_to(admin_conference_dietary_list_path(:conference_id => @conference.short_title), :notice => 'Dietary choices were successfully updated.')
rescue Exception => e
redirect_to(admin_conference_dietary_list_path(:conference_id => @conference.short_title), :alert => "Dietary choices update failed: #{e.message}")
redirect_to(admin_conference_dietary_list_path(conference_id: @conference.short_title), notice: 'Dietary choices were successfully updated.')
rescue => e
redirect_to(admin_conference_dietary_list_path(conference_id: @conference.short_title), alert: "Dietary choices update failed: #{e.message}")
end
end
end

9
app/controllers/admin/difficulty_levels_controller.rb
View file

@ -12,19 +12,18 @@ class Admin::DifficultyLevelsController < ApplicationController
@conference.use_difficulty_levels = false
@conference.save!
flash[:error] = "You cannot enable the usage of difficulty levels without having set any levels."
redirect_to(admin_conference_difficulty_levels_path(:conference_id => @conference.short_title))
redirect_to(admin_conference_difficulty_levels_path(conference_id: @conference.short_title))
rescue ActiveRecord::RecordInvalid
flash[:error] = "Something went wrong. Difficulty Levels update failed."
redirect_to(admin_conference_difficulty_levels_path(:conference_id => @conference.short_title))
redirect_to(admin_conference_difficulty_levels_path(conference_id: @conference.short_title))
end
else
flash[:notice] = "Difficulty Levels were successfully updated."
redirect_to(admin_conference_difficulty_levels_path(:conference_id => @conference.short_title))
redirect_to(admin_conference_difficulty_levels_path(conference_id: @conference.short_title))
end
else
flash[:error] = "Difficulty Levels update failed."
redirect_to(admin_conference_difficulty_levels_path(:conference_id => @conference.short_title))
redirect_to(admin_conference_difficulty_levels_path(conference_id: @conference.short_title))
end
end
end

6
app/controllers/admin/events_controller.rb
View file

@ -18,7 +18,7 @@ module Admin
@mystates = []
@mytypes = []
@eventstats = Hash.new
@eventstats = {}
@totallength = 0
@machine_states.each do |mystate|
@ -50,7 +50,7 @@ module Admin
@totallength += myevent.event_type.length
end
if @eventstats[mytype.title] == nil
if @eventstats[mytype.title].nil?
@eventstats[mytype.title] = { 'count' => events_mytype.count,
'length' => events_mytype.count * mytype.length }
end
@ -150,7 +150,7 @@ module Admin
@event = Event.find(params[:id])
@ratings = @event.votes.includes(:user)
if votes = current_user.votes.find_by_event_id(params[:id])
if (votes = current_user.votes.find_by_event_id(params[:id]))
votes.update_attributes(rating: params[:rating])
else
@myvote = @event.votes.build

2
app/controllers/admin/eventtypes_controller.rb
View file

@ -10,7 +10,7 @@ class Admin::EventtypesController < ApplicationController
redirect_to(admin_conference_eventtypes_path(
conference_id: @conference.short_title),
notice: 'Event types were successfully updated.')
rescue Exception => e
rescue => e
redirect_to(admin_conference_eventtypes_path(
conference_id: @conference.short_title),
alert: "Event types update failed: #{e.message}")

18
app/controllers/admin/questions_controller.rb
View file

@ -3,7 +3,7 @@ class Admin::QuestionsController < ApplicationController
def index
@conference = Conference.find_by(short_title: params[:conference_id])
@questions = Question.where(:global => true).all | Question.where(:conference_id => @conference.id)
@questions = Question.where(global: true).all | Question.where(conference_id: @conference.id)
@questions_conference = @conference.questions
@new_question = @conference.questions.new
end
@ -34,7 +34,7 @@ class Admin::QuestionsController < ApplicationController
@question = Question.find(params[:id])
if @question.global == true && !has_role?(current_user, "Admin")
redirect_to(admin_conference_questions_path(:conference_id => @conference.short_title), :alert => "Sorry, you cannot edit global questions. Create a new one.")
redirect_to(admin_conference_questions_path(conference_id: @conference.short_title), alert: "Sorry, you cannot edit global questions. Create a new one.")
end
end
@ -45,9 +45,9 @@ class Admin::QuestionsController < ApplicationController
@question = Question.find(params[:id])
if @question.update_attributes(params[:question])
redirect_to(admin_conference_questions_path(:conference_id => @conference.short_title), :notice => "Question '#{@question.title}' for #{@conference.short_title} successfully updated.")
redirect_to(admin_conference_questions_path(conference_id: @conference.short_title), notice: "Question '#{@question.title}' for #{@conference.short_title} successfully updated.")
else
redirect_to(admin_conference_questions_path(:conference_id => @conference.short_title), :notice => "Update of questions for #{@conference.short_title} failed.")
redirect_to(admin_conference_questions_path(conference_id: @conference.short_title), notice: "Update of questions for #{@conference.short_title} failed.")
end
end
@ -56,9 +56,9 @@ class Admin::QuestionsController < ApplicationController
@conference = Conference.find_by(short_title: params[:conference_id])
if @conference.update_attributes(params[:conference])
redirect_to(admin_conference_questions_path(:conference_id => @conference.short_title), :notice => "Questions for #{@conference.short_title} successfully updated.")
redirect_to(admin_conference_questions_path(conference_id: @conference.short_title), notice: "Questions for #{@conference.short_title} successfully updated.")
else
redirect_to(admin_conference_questions_path(:conference_id => @conference.short_title), :notice => "Update of questions for #{@conference.short_title} failed.")
redirect_to(admin_conference_questions_path(conference_id: @conference.short_title), notice: "Update of questions for #{@conference.short_title} failed.")
end
end
@ -79,7 +79,7 @@ class Admin::QuestionsController < ApplicationController
a.delete
end
flash[:notice] = "Deleted question: #{@question.title} and its answers: #{@question.answers.map {|a| a.title}.join ','}"
end
end
rescue ActiveRecord::RecordInvalid
flash[:error] = "Could not delete question."
end
@ -90,7 +90,7 @@ class Admin::QuestionsController < ApplicationController
flash[:error] = "You must be an admin to delete a question."
end
@questions = Question.where(:global => true).all | Question.where(:conference_id => @conference.id)
@questions_conference = @conference.questions
@questions = Question.where(global: true).all | Question.where(conference_id: @conference.id)
@questions_conference = @conference.questions
end
end

4
app/controllers/admin/registrations_controller.rb
View file

@ -44,7 +44,7 @@ module Admin
@registration.update_attributes!(params[:registration])
flash[:success] = "Successfully updated registration for #{@user.name} #{@user.email}"
redirect_to(admin_conference_registrations_path(@conference.short_title))
rescue Exception => e
rescue => e
Rails.logger.debug e.backtrace.join("\n")
redirect_to(admin_conference_registrations_path(@conference.short_title),
alert: 'Failed to update registration:' + e.message)
@ -104,7 +104,7 @@ module Admin
begin registration.destroy
redirect_to admin_conference_registrations_path
flash[:notice] = "Deleted registration for #{user.name} #{user.email}"
rescue Exception => e
rescue => e
Rails.logger.debug e.backtrace.join("\n")
redirect_to(admin_conference_registrations_path(@conference.short_title),
alert: 'Failed to delete registration:' + e.message)

6
app/controllers/admin/social_events_controller.rb
View file

@ -7,11 +7,9 @@ class Admin::SocialEventsController < ApplicationController
def update
if @conference.update_attributes(params[:conference])
redirect_to(admin_conference_social_events_path(:conference_id => @conference.short_title), :notice => 'Social events were successfully updated.')
redirect_to(admin_conference_social_events_path(conference_id: @conference.short_title), notice: 'Social events were successfully updated.')
else
redirect_to(admin_conference_social_events_path(:conference_id => @conference.short_title), :notice => 'Social events update failed.')
redirect_to(admin_conference_social_events_path(conference_id: @conference.short_title), notice: 'Social events update failed.')
end
end
end

6
app/controllers/admin/stats_controller.rb
View file

@ -48,7 +48,7 @@ module Admin
if @events.count > 0
start_date = @events.minimum('created_at').strftime('%Y-%m-%d')
end_date = @events.maximum('created_at').strftime('%Y-%m-%d')
unless start_date == nil || end_date == nil
unless start_date.nil? || end_date.nil?
@events_time = var_time(start_date, end_date, @events, 'created_at')
end
end
@ -87,7 +87,7 @@ module Admin
typelength += myevent.event_type.length
@totallength += myevent.event_type.length
end
if @eventstats[mytype.title] == nil
if @eventstats[mytype.title].nil?
@eventstats[mytype.title] = { 'count' => events_mytype.count,
'length' => events_mytype.count * mytype.length }
end
@ -187,7 +187,7 @@ module Admin
total = @conference.events.where(state: mystate).count
status = "#{myvar.name}"
percent = 0
percent = 0 # rubocop:disable Lint/UselessAssignment
if value != 0
percent = (value.to_f / total * 100).round(2)
result << { 'status' => status, 'value' => value, 'percent' => percent }

6
app/controllers/admin/supporter_levels_controller.rb
View file

@ -8,9 +8,9 @@ class Admin::SupporterLevelsController < ApplicationController
def update
begin
@conference.update_attributes!(params[:conference])
redirect_to(admin_conference_supporter_levels_path(:conference_id => @conference.short_title), :notice => 'Supporter levels were successfully updated.')
rescue Exception => e
redirect_to(admin_conference_supporter_levels_path(:conference_id => @conference.short_title), :alert => "Supporter levels update failed: #{e.message}")
redirect_to(admin_conference_supporter_levels_path(conference_id: @conference.short_title), notice: 'Supporter levels were successfully updated.')
rescue => e
redirect_to(admin_conference_supporter_levels_path(conference_id: @conference.short_title), alert: "Supporter levels update failed: #{e.message}")
end
end
end

4
app/controllers/admin/supporters_controller.rb
View file

@ -10,7 +10,7 @@ class Admin::SupportersController < ApplicationController
def create
params[:supporter_registration][:conference_id] = @conference.id
supporter = SupporterRegistration.create!(params[:supporter_registration])
redirect_to(admin_conference_supporters_path(:conference_id => @conference.short_title), :notice => "Supporter added")
SupporterRegistration.create!(params[:supporter_registration])
redirect_to(admin_conference_supporters_path(conference_id: @conference.short_title), notice: "Supporter added")
end
end

1
app/controllers/admin/venue_controller.rb
View file

@ -27,5 +27,4 @@ class Admin::VenueController < ApplicationController
@venue = @conference.venue
render :venue_info
end
end

8
app/controllers/admin/volunteers_controller.rb
View file

@ -9,7 +9,7 @@ class Admin::VolunteersController < ApplicationController
if @conference.use_vpositions
@volunteers = @conference.registrations.joins(:vchoices).uniq
else
@volunteers = @conference.registrations.where(:volunteer => true)
@volunteers = @conference.registrations.where(volunteer: true)
end
end
@ -17,9 +17,9 @@ class Admin::VolunteersController < ApplicationController
@conference = Conference.find_by(short_title: params[:conference_id])
begin
@conference.update_attributes!(params[:conference])
redirect_to(admin_conference_volunteers_info_path(:conference_id => params[:conference_id]), :notice => "Volunteering options were successfully updated.")
rescue Exception => e
redirect_to(admin_conference_volunteers_info_path(:conference_id => params[:conference_id]), :alert => "Volunteering options update failed: #{e.message}")
redirect_to(admin_conference_volunteers_info_path(conference_id: params[:conference_id]), notice: "Volunteering options were successfully updated.")
rescue => e
redirect_to(admin_conference_volunteers_info_path(conference_id: params[:conference_id]), alert: "Volunteering options update failed: #{e.message}")
end
end
end

2
app/controllers/api/v1/conferences_controller.rb
View file

@ -7,6 +7,6 @@ class Api::V1::ConferencesController < Api::BaseController
else
conferences = Conference.find_all_by_guid(params[:conference_id])
end
render :json => conferences, :serializer => ConferencesArraySerializer
render json: conferences, serializer: ConferencesArraySerializer
end
end

2
app/controllers/application_controller.rb
View file

@ -70,7 +70,7 @@ class ApplicationController < ActionController::Base
rescue_from CanCan::AccessDenied do |exception|
Rails.logger.debug("Access denied!")
redirect_to root_path, :alert => exception.message
redirect_to root_path, alert: exception.message
end
helper_method :organizer_or_admin?

2
app/controllers/conference_registration_controller.rb
View file

@ -68,7 +68,7 @@ class ConferenceRegistrationController < ApplicationController
else
registration.update_attributes!(registration_params)
end
rescue Exception => e
rescue => e
Rails.logger.debug e.backtrace.join('\n')
redirect_to(register_conference_path(id: conference.short_title),
alert: 'Registration failed:' + e.message)

20
app/controllers/event_attachments_controller.rb
View file

@ -1,6 +1,6 @@
class EventAttachmentsController < ApplicationController
before_filter :verify_user
skip_before_filter :verify_user, :only => [:show]
skip_before_filter :verify_user, only: [:show]
def index
@proposal = Event.find(params[:proposal_id])
@ -52,8 +52,8 @@ class EventAttachmentsController < ApplicationController
if !organizer_or_admin?
begin
event = current_user.events.find(params[:proposal_id])
rescue Exception => e
current_user.events.find(params[:proposal_id])
rescue
# They certainly aren't allowed to attach a file to someone else's proposal
raise ActionController::RoutingError.new('Invalid proposal')
end
@ -67,12 +67,14 @@ class EventAttachmentsController < ApplicationController
respond_to do |format|
if @upload.save
format.html {
render :json => [@upload.to_jq_upload].to_json,
:content_type => 'text/html',
:layout => false
render json: [@upload.to_jq_upload].to_json,
content_type: 'text/html',
layout: false
}
format.json { render json: [@upload.to_jq_upload].to_json, status: :created,
location: conference_proposal_event_attachment_path(@upload.event.conference.short_title, @upload.event, @upload) }
format.json do
render json: [@upload.to_jq_upload].to_json, status: :created,
location: conference_proposal_event_attachment_path(@upload.event.conference.short_title, @upload.event, @upload)
end
else
format.html { render action: "new" }
format.json { render json: @upload.errors, status: :unprocessable_entity }
@ -106,7 +108,7 @@ class EventAttachmentsController < ApplicationController
respond_to do |format|
format.html { redirect_back_or_to conference_proposal_index_path(@conference.short_title), :notice => "Deleted successfully attachment '#{@upload.title}' for proposal '#{@proposal.title}'" }
format.html { redirect_back_or_to conference_proposal_index_path(@conference.short_title), notice: "Deleted successfully attachment '#{@upload.title}' for proposal '#{@proposal.title}'" }
format.json { head :no_content }
end

7
app/controllers/proposal_controller.rb
View file

@ -23,7 +23,7 @@ class ProposalController < ApplicationController
else
@event = Event.find(params[:id])
end
rescue Exception => e
rescue => e
Rails.logger.debug("Proposal failure in verify_access: #{e.message}")
redirect_to(conference_proposal_index_path(conference_id: @conference.short_title),
alert: 'Invalid or uneditable proposal.')
@ -91,7 +91,7 @@ class ProposalController < ApplicationController
event.update_attributes!(params[:event])
redirect_to(conference_proposal_index_path(conference_id: @conference.short_title),
notice: "'#{event.title}' was successfully updated.")
rescue Exception => e
rescue => e
redirect_to edit_conference_proposal_path(@conference.short_title, @event), alert: e.message
end
end
@ -131,7 +131,7 @@ class ProposalController < ApplicationController
begin
@event.save!
rescue Exception => e
rescue => e
@url = conference_proposal_index_path(@conference.short_title)
@event_types = @conference.event_types
@user = current_user
@ -182,7 +182,6 @@ class ProposalController < ApplicationController
end
def restart
@event
if @event.transition_possible? :restart
begin
@event.restart

4
app/controllers/schedule_controller.rb
View file

@ -1,9 +1,8 @@
class ScheduleController < ApplicationController
layout "application"
def index
@conference = Conference.includes(:rooms, {:events => [:speakers, :track, :event_type]}).where("conferences.short_title" => params[:conference_id]).first
@conference = Conference.includes(:rooms, {events: [:speakers, :track, :event_type]}).where("conferences.short_title" => params[:conference_id]).first
@rooms = @conference.rooms
@events = @conference.events
@dates = @conference.start_date..@conference.end_date
@ -14,5 +13,4 @@ class ScheduleController < ApplicationController
@today = @conference.start_date.strftime("%Y-%m-%d")
end
end
end

4
app/controllers/users/omniauth_callbacks_controller.rb
View file

@ -13,7 +13,7 @@ module Users
openid = Openid.find_for_oauth(auth_hash) # Get or create openid
# If openid exists and is associated with a user, sign in with associated user,
# even if the email of the associated user and the email of the provided openid are different
unless user = openid.user
unless (user = openid.user)
user = User.find_for_auth(auth_hash, current_user) # Get or create users
end
@ -26,7 +26,7 @@ module Users
sign_in user
redirect_to root_path, notice: user.email + " signed in successfully with #{provider}"
rescue Exception => e
rescue => e
redirect_back_or_to new_user_registration_path, alert: 'Failed' + e.message
end
end