apply StringLiterals cop (remove double quotes, unless there is string interpolation)

This commit is contained in:
Stella Rouzi 2014-08-18 21:54:43 +03:00
parent f91467a00a
commit b7c45718d8
45 changed files with 275 additions and 109 deletions

View file

@ -28,7 +28,7 @@ module Admin
else
redirect_to(admin_conference_callforpapers_path(
id: @conference.short_title),
alert: "Updating call for papers failed. #{@cfp.errors.to_a.join(". ")}.")
alert: "Updating call for papers failed. #{@cfp.errors.to_a.join('. ')}.")
end
end
@ -44,7 +44,7 @@ module Admin
else
redirect_to(admin_conference_callforpapers_path(
id: @conference.short_title),
alert: "Creating the call for papers failed. #{@cfp.errors.to_a.join(". ")}.")
alert: "Creating the call for papers failed. #{@cfp.errors.to_a.join('. ')}.")
end
end
end

View file

@ -13,18 +13,18 @@ module Admin
begin
@conference.use_difficulty_levels = false
@conference.save!
flash[:error] = "You cannot enable the usage of difficulty levels without having set any levels."
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))
rescue ActiveRecord::RecordInvalid
flash[:error] = "Something went wrong. Difficulty Levels update failed."
flash[:error] = 'Something went wrong. Difficulty Levels update failed.'
redirect_to(admin_conference_difficulty_levels_path(conference_id: @conference.short_title))
end
else
flash[:notice] = "Difficulty Levels were successfully updated."
flash[:notice] = 'Difficulty Levels were successfully updated.'
redirect_to(admin_conference_difficulty_levels_path(conference_id: @conference.short_title))
end
else
flash[:error] = "Difficulty Levels update failed."
flash[:error] = 'Difficulty Levels update failed.'
redirect_to(admin_conference_difficulty_levels_path(conference_id: @conference.short_title))
end
end

View file

@ -33,7 +33,7 @@ module Admin
# GET questions/1/edit
def edit
if @question.global
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
@ -73,13 +73,13 @@ module Admin
flash[:notice] = "Deleted question: #{@question.title} and its answers: #{@question.answers.map {|a| a.title}.join ','}"
end
rescue ActiveRecord::RecordInvalid
flash[:error] = "Could not delete question."
flash[:error] = 'Could not delete question.'
end
else
flash[:error] = "You cannot delete global questions."
flash[:error] = 'You cannot delete global questions.'
end
else
flash[:error] = "You must be an admin to delete a question."
flash[:error] = 'You must be an admin to delete a question.'
end
@questions = Question.where(global: true).all | Question.where(conference_id: @conference.id)

View file

@ -0,0 +1,19 @@
module Admin
class SupportersController < Admin::BaseController
load_and_authorize_resource :conference, find_by: :short_title
load_and_authorize_resource through: :conference
def index
respond_to do |format|
format.html
format.json { render json: DatatableSupporters.new(@conference.supporter_registrations, view_context) }
end
end
def create
params[:supporter_registration][:conference_id] = @conference.id
SupporterRegistration.create!(params[:supporter_registration])
redirect_to(admin_conference_supporters_path(conference_id: @conference.short_title), notice: 'Supporter added')
end
end
end

View file

@ -25,7 +25,7 @@ module Admin
def update
if can_manage_volunteers(@conference)
if @conference.update_attributes(params[:conference])
redirect_to(admin_conference_volunteers_info_path(conference_id: params[:conference_id]), notice: "Volunteering options were successfully updated.")
redirect_to(admin_conference_volunteers_info_path(conference_id: params[:conference_id]), notice: 'Volunteering options were successfully updated.')
else
redirect_to(admin_conference_volunteers_info_path(conference_id: params[:conference_id]), alert: "Volunteering options update failed: #{@conference.errors.full_messages.join '. '}")
end

View file

@ -8,7 +8,7 @@ class ApplicationController < ActionController::Base
check_authorization unless: :devise_controller?
def store_location
session[:return_to] = request.fullpath if request.get? && controller_name != "user_sessions" && controller_name != "sessions"
session[:return_to] = request.fullpath if request.get? && controller_name != 'user_sessions' && controller_name != 'sessions'
end
def after_sign_in_path_for(resource)
@ -49,7 +49,7 @@ class ApplicationController < ActionController::Base
end
rescue_from CanCan::AccessDenied do |exception|
Rails.logger.debug("Access denied!")
Rails.logger.debug('Access denied!')
redirect_to root_path, alert: exception.message
end

View file

@ -9,14 +9,14 @@ class ConferenceController < ApplicationController
subscription = Subscription.new(user_id: current_user.id, conference_id: conference.id)
begin
subscription.save!
flash[:success] = "You have been subscribed to receive Email Notifications from this Conference."
flash[:success] = 'You have been subscribed to receive Email Notifications from this Conference.'
redirect_to root_path
rescue ActiveRecord::RecordInvalid
flash[:error] = subscription.errors.full_messages.to_sentence
redirect_to root_path
end
else
flash[:notice] = "Already Subscribed"
flash[:notice] = 'Already Subscribed'
redirect_to root_path
end
end
@ -25,7 +25,7 @@ class ConferenceController < ApplicationController
conference = Conference.find_by_short_title(params[:id])
subscription = current_user.subscriptions.where(conference_id: conference.id).first
if subscription.blank?
flash[:notice] = "Already Unsubscribed"
flash[:notice] = 'Already Unsubscribed'
redirect_to root_path
else
begin
@ -41,6 +41,6 @@ class ConferenceController < ApplicationController
def gallery_photos
@photos = @conference.photos
render "photos", formats: [:js]
render 'photos', formats: [:js]
end
end

View file

@ -0,0 +1,110 @@
class EventAttachmentsController < ApplicationController
load_and_authorize_resource :conference, find_by: :short_title
load_and_authorize_resource :proposal, class: Event
load_and_authorize_resource :upload, class: EventAttachment, through: :proposal
before_filter :verify_user
skip_before_filter :verify_user, only: [:show]
def index
@uploads = @proposal.event_attachments
@uploads = @uploads.map{|upload| upload.to_jq_upload }
respond_to do |format|
format.html # index.html.erb
format.json { render json: @uploads.to_json}
end
end
def show
if @upload.public?
send_file @upload.attachment.path
return
end
if current_user.nil?
verify_user
return
end
if organizer_or_admin? || current_user == upload.event.submitter
send_file @upload.attachment.path
else
raise ActionController::RoutingError.new('Not Found')
end
end
def new
@upload = EventAttachment.new
respond_to do |format|
format.html # new.html.erb
format.json { render json: @upload }
end
end
def edit; end
def create
params[:event_attachment][:title] = params[:title][0]
params[:event_attachment][:public] = false
params[:event_attachment][:event_id] = params[:proposal_id]
if cannot? :create, EventAttachment
begin
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
end
if params.has_key?(:public)
params[:event_attachment][:public] = true
end
@upload = EventAttachment.new(params[:event_attachment])
respond_to do |format|
if @upload.save
format.html do
render json: [@upload.to_jq_upload].to_json,
content_type: 'text/html',
layout: false
end
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 }
end
end
end
def update
respond_to do |format|
if @upload.update_attributes(params[:upload])
format.html { redirect_to @upload, notice: 'Upload was successfully updated.' }
format.json { head :no_content }
else
format.html { render action: 'edit' }
format.json { render json: @upload.errors, status: :unprocessable_entity }
end
end
end
def destroy
if can? :destroy, @proposal
@upload = @proposal.event_attachments.find(params[:id])
end
@upload.destroy if !@upload.nil?
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.json { head :no_content }
end
end
end

View file

@ -4,7 +4,7 @@ class HomeController < ApplicationController
def index
@today = Date.current
@current = Conference.where("end_date >= ?", @today).order("start_date ASC")
@current = Conference.where('end_date >= ?', @today).order('start_date ASC')
end
def respond_to_options

View file

@ -76,7 +76,7 @@ class ProposalController < ApplicationController
end
redirect_to(conference_proposal_index_path(conference_id: @conference.short_title),
notice: "Proposal was successfully updated.")
notice: 'Proposal was successfully updated.')
end
def destroy
@ -92,7 +92,7 @@ class ProposalController < ApplicationController
@event.save(validate: false)
redirect_to(conference_proposal_index_path(conference_id: @conference.short_title),
notice: "Proposal was successfully withdrawn.")
notice: 'Proposal was successfully withdrawn.')
end
def confirm

View file

@ -1,6 +1,6 @@
class ScheduleController < ApplicationController
authorize_resource class: false
layout "application"
layout 'application'
def index
@conference = Conference.
@ -11,9 +11,9 @@ class ScheduleController < ApplicationController
@dates = @conference.start_date..@conference.end_date
if @dates == Date.current
@today = Date.current.strftime("%Y-%m-%d")
@today = Date.current.strftime('%Y-%m-%d')
else
@today = @conference.start_date.strftime("%Y-%m-%d")
@today = @conference.start_date.strftime('%Y-%m-%d')
end
end
end

View file

@ -92,17 +92,17 @@ module ApplicationHelper
def getdatetime(registration, field)
if registration.send(field.to_sym).kind_of?(String)
DateTime.parse(registration.send(field.to_sym)).strftime("%d %b %H:%M") if registration.send(field.to_sym)
DateTime.parse(registration.send(field.to_sym)).strftime('%d %b %H:%M') if registration.send(field.to_sym)
else
registration.send(field.to_sym).strftime("%d %b %H:%M") if registration.send(field.to_sym)
registration.send(field.to_sym).strftime('%d %b %H:%M') if registration.send(field.to_sym)
end
end
def getdate(var)
if var.kind_of?(String)
DateTime.parse(var).strftime("%a, %d %b")
DateTime.parse(var).strftime('%a, %d %b')
else
var.strftime("%a, %d %b")
var.strftime('%a, %d %b')
end
end
@ -122,24 +122,24 @@ module ApplicationHelper
end
def pre_registered(event)
@conference.events.joins(:registrations).where("events.id = ?", event.id)
@conference.events.joins(:registrations).where('events.id = ?', event.id)
end
def add_association_link(association_name, form_builder, div_class, html_options = {})
link_to_add_association "Add " + association_name.to_s.singularize, form_builder, div_class, html_options.merge(class: "assoc btn btn-success")
link_to_add_association 'Add ' + association_name.to_s.singularize, form_builder, div_class, html_options.merge(class: 'assoc btn btn-success')
end
def remove_association_link(association_name, form_builder)
link_to_remove_association("Remove " + association_name.to_s.singularize, form_builder, class: "assoc btn btn-danger") + tag(:hr)
link_to_remove_association('Remove ' + association_name.to_s.singularize, form_builder, class: 'assoc btn btn-danger') + tag(:hr)
end
def dynamic_association(association_name, title, form_builder, options = {})
render "shared/dynamic_association", association_name: association_name, title: title, f: form_builder, hint: options[:hint]
render 'shared/dynamic_association', association_name: association_name, title: title, f: form_builder, hint: options[:hint]
end
# Same as redirect_to(:back) if there is a valid HTTP referer, otherwise redirect_to()
def redirect_back_or_to(options = {}, response_status = {})
if request.env["HTTP_REFERER"]
if request.env['HTTP_REFERER']
redirect_to(:back)
else
redirect_to(options, response_status)
@ -148,7 +148,7 @@ module ApplicationHelper
# TODO Output better html
def format_comments(comment, padding = 0)
result = ""
result = ''
result += "<div style='padding-left:#{padding}px'>"
result += "<div class='well'>"
result += "<b>#{comment.user.name}</b> <i>#{comment.created_at}</i><br><br>"
@ -160,12 +160,12 @@ module ApplicationHelper
result += "<input name='authenticity_token' type='hidden' value='#{form_authenticity_token}' />"
result += "<textarea name='comment'></textarea>"
result += "<button class='btn btn-primary pull-right' name='button' type='submit'>Add Reply</button>"
result += "</form></div></div>"
result += "</div>"
result += '</form></div></div>'
result += '</div>'
#result += edit_admin_conference_event_path(@conference.short_title, @event)
comment.children.each do |child|
result += format_comments(child, 50)
result += "</div>"
result += '</div>'
end
result
@ -181,7 +181,7 @@ module ApplicationHelper
markdown.render(text).html_safe
end
def markdown_hint(text="")
def markdown_hint(text='')
markdown("#{text} Please look at #{link_to '**Markdown Syntax**', 'https://daringfireball.net/projects/markdown/syntax', target: '_blank'} to format your text")
end

View file

@ -1,6 +1,6 @@
module ProposalHelper
def generate_abstract_length_js(conference)
str = ""
str = ''
conference.event_types.map do |t|
str += "if ($('select option:selected').text() == '#{t.title}') {\n"
str += "str = '#{t.maximum_abstract_length}';\n"

View file

@ -0,0 +1,14 @@
module RegistrationHelper
def generate_supporter_level_js(conference)
str = ''
conference.supporter_levels.map do |t|
next if t.url.empty?
str += "if ($('#registration_supporter_registration_attributes_supporter_level_id option:selected').text() == '#{t.title}') {\n"
str += "console.log('#{t.title}');\n"
str += "str = 'If you have a confirmation or registration code, enter it here. Otherwise, you can purchase a <i>#{t.title}</i> ticket <a href=\"#{t.url}\" target=_new>here</a>, if you need to.';\n"
str += "}\n\n"
end.join("\n")
str
end
end

View file

@ -1,5 +1,5 @@
class Mailbot < ActionMailer::Base
default from: "no-reply@example.com"
default from: 'no-reply@example.com'
def registration_mail(conference, person)
build_email(conference,

View file

@ -1,6 +1,6 @@
module Ahoy
class Event < ActiveRecord::Base
self.table_name = "ahoy_events"
self.table_name = 'ahoy_events'
belongs_to :visit
belongs_to :user

View file

@ -4,7 +4,7 @@ class Contact < ActiveRecord::Base
validates :conference, presence: true
# Conferences only have one contact
validates :conference_id, uniqueness: {message: "has already contact details"}
validates :conference_id, uniqueness: {message: 'has already contact details'}
validates :facebook, :twitter, :googleplus, :instagram,
format: URI::regexp(%w(http https)), allow_blank: true

View file

@ -79,7 +79,7 @@ class Datatable
sort_by << "#{sort_column(colnum)} #{sort_direction(colnum)}"
colnum += 1
end
sort_by.join(", ")
sort_by.join(', ')
end
def sorted? index=0
@ -93,6 +93,6 @@ class Datatable
def sort_direction index=0
index = "sSortDir_#{index}"
params[index] == "desc" ? "desc" : "asc"
params[index] == 'desc' ? 'desc' : 'asc'
end
end

View file

@ -0,0 +1,26 @@
class EventAttachment < ActiveRecord::Base
has_paper_trail
belongs_to :event
attr_accessible :public, :attachment, :event_id, :title
has_attached_file :attachment, path: ':rails_root/storage/:rails_env/attachments/:id/:style/:basename.:extension'
include Rails.application.routes.url_helpers
def to_jq_upload
{
'name' => read_attribute(:attachment_file_name),
'size' => read_attribute(:attachment_file_size),
'title' => read_attribute(:title),
'public' => read_attribute(:public),
#"url" => attachment.url(:original),
'url' => conference_proposal_event_attachment_path(self.event.conference.short_title, self.event_id, self.id),
'delete_url' => conference_proposal_event_attachment_path(self.event.conference.short_title, self.event_id, self.id),
'delete_type' => 'DELETE'
}
end
#:path => ":rails_root/public/system/:attachment/:id/:style/:filename",
# :url => "/system/:attachment/:id/:style/:filename"
#has_paper_trail :meta => {:associated_id => :event_id, :associated_type => "Event"}
end

View file

@ -3,7 +3,7 @@ class Photo < ActiveRecord::Base
belongs_to :conference
validates_presence_of :picture
has_attached_file :picture,
styles: { thumb: "100x100>", large: "300x300>", banner: "600x300>" }
styles: { thumb: '100x100>', large: '300x300>', banner: '600x300>' }
validates_attachment_content_type :picture,
content_type: [/jpg/, /jpeg/, /png/, /gif/],

View file

@ -1,4 +1,4 @@
class Visit < ActiveRecord::Base
has_many :ahoy_events, class_name: "Ahoy::Event"
has_many :ahoy_events, class_name: 'Ahoy::Event'
belongs_to :user
end