Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ Style/GuardClause:

Style/HashSyntax:
Enabled: true
EnforcedShorthandSyntax: always

Style/IfUnlessModifier:
Enabled: false
Expand Down
6 changes: 3 additions & 3 deletions app/controllers/admin/meeting_invitations_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ def update
status = params.permit(:attendance_status)[:attendance_status]
attended = params.permit(:attended)[:attended]

@invitation.update(attending: status, attended: attended)
@invitation.update(attending: status, attended:)

redirect_to [:admin, @invitation.meeting],
notice: t('admin.messages.invitation.update_rsvp', name: @invitation.member.full_name)
Expand All @@ -15,12 +15,12 @@ def create
member = Member.find(params[:meeting_invitations][:member])
meeting = Meeting.find_by(slug: params[:meeting_invitations][:meeting_id])

if MeetingInvitation.accepted.where(meeting: meeting, member: member).exists?
if MeetingInvitation.accepted.where(meeting:, member:).exists?
return redirect_to [:admin, meeting],
notice: t('admin.messages.invitation.already_on_list', name: member.full_name)
end

invitation = meeting.invitations.find_or_create_by(member: member)
invitation = meeting.invitations.find_or_create_by(member:)
invitation.assign_attributes(attending: true, role: 'Participant')

if invitation.save
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/admin/meetings_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def invite
private

def set_meeting
@meeting = Meeting.find_by!(slug: slug)
@meeting = Meeting.find_by!(slug:)
end

def slug
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/admin/member_search_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ def index
redirect_to callback_url and return
end

render 'index', locals: { members: members, callback_url: callback_url }
render 'index', locals: { members:, callback_url: }
end

def results
pick_params = params.expect(member_pick: { members: [] })
members = Member.find(pick_params[:members])
render 'show', locals: { members: members }
render 'show', locals: { members: }
end
end
2 changes: 1 addition & 1 deletion app/controllers/admin/workshops_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,6 @@ def set_sponsor
end

def workshop_sponsor(host = false)
@workshop_sponsor ||= WorkshopSponsor.new(workshop: @workshop, sponsor: @sponsor, host: host)
@workshop_sponsor ||= WorkshopSponsor.new(workshop: @workshop, sponsor: @sponsor, host:)
end
end
2 changes: 1 addition & 1 deletion app/controllers/chapter_controller.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
class ChapterController < ApplicationController
def show
@chapter = ChapterPresenter.new(Chapter.active.find_by!(slug: slug))
@chapter = ChapterPresenter.new(Chapter.active.find_by!(slug:))

upcoming_workshops = upcoming_events_by_chapter(@chapter)
@upcoming_workshops = event_presenters_by_date(upcoming_workshops)
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/concerns/workshop_invitation_concerns.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def back_with_message(message)
end

def set_invitation
@invitation = WorkshopInvitation.includes(:workshop, :member).find_by!(token: token)
@invitation = WorkshopInvitation.includes(:workshop, :member).find_by!(token:)
end
end
end
4 changes: 2 additions & 2 deletions app/controllers/contact_preferences_controller.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
class ContactPreferencesController < ApplicationController
def show
@contact = Contact.find_by(token: token)
@contact = Contact.find_by(token:)

return if @contact

Expand All @@ -9,7 +9,7 @@ def show

def update
contact = Contact.find_by!(token: contact_preferences[:token])
contact.update(mailing_list_consent: mailing_list_consent)
contact.update(mailing_list_consent:)
ContactMailingListService.sync(contact)
audit_contact_subscription(contact)

Expand Down
10 changes: 5 additions & 5 deletions app/controllers/events_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def show

return unless logged_in?

invitation = Invitation.find_by(member: current_user, event: event, attending: true)
invitation = Invitation.find_by(member: current_user, event:, attending: true)
redirect_to event_invitation_path(@event, invitation) if invitation
end

Expand All @@ -44,7 +44,7 @@ def rsvp
ticket = Services::Ticket.new(request, params)
member = Member.find_by(email: ticket.email)
invitation = member.invitations.where(event: @event, role: 'Student').first
invitation ||= Invitation.create_or_find_by(event: @event, member: member, role: 'Student')
invitation ||= Invitation.create_or_find_by(event: @event, member:, role: 'Student')

invitation.update(attending: true)
head :ok
Expand All @@ -63,8 +63,8 @@ def latest_model_updated

def find_invitation_and_redirect_to_event(role)
set_event
invitation = Invitation.create_or_find_by(event: @event, member: current_user, role: role)
invitation = Invitation.find_by(event: @event, member: current_user, role: role) unless invitation.persisted?
invitation = Invitation.create_or_find_by(event: @event, member: current_user, role:)
invitation = Invitation.find_by(event: @event, member: current_user, role:) unless invitation.persisted?
redirect_to event_invitation_path(@event, invitation)
end

Expand Down Expand Up @@ -135,7 +135,7 @@ def paginated_events(upcoming:)
total = ActiveRecord::Base.connection.select_value(count_query.to_sql).to_i
return nil if total.zero?

pagy_opts = { count: total, page: page, limit: 20, request: request }
pagy_opts = { count: total, page:, limit: 20, request: }
pagy_opts[:request] = Pagy::Request.new(pagy_opts)
pagy = Pagy::Offset.new(**pagy_opts)

Expand Down
6 changes: 3 additions & 3 deletions app/controllers/invitations_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ def attend
EventInvitationMailer.attending(@invitation.event, @invitation.member, @invitation).deliver_now
end
notice = t('messages.invitations.spot_not_confirmed') if event.surveys_required
redirect_back fallback_location: root_path, notice: notice
redirect_back fallback_location: root_path, notice:
else
email = event.chapters.present? ? event.chapters.first.email : 'hello@codebar.io'
redirect_back(
fallback_location: root_path,
notice: t('messages.invitations.event.no_available_seats', email: email)
notice: t('messages.invitations.event.no_available_seats', email:)
)
end
end
Expand Down Expand Up @@ -95,7 +95,7 @@ def load_invitation
MeetingInvitation.find_by(token: params[:token], member: current_user)
else
meeting = Meeting.find_by(slug: params[:meeting_id])
MeetingInvitation.new(meeting: meeting, member: current_user, role: 'Participant')
MeetingInvitation.new(meeting:, member: current_user, role: 'Participant')
end
end
end
4 changes: 2 additions & 2 deletions app/controllers/members_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ def profile
def update
if @member.update(member_params)
notice = 'Your details have been updated.'
redirect_to profile_path, notice: notice
redirect_to profile_path, notice:
else
render 'edit'
end
end

def unsubscribe
require 'verifier'
member = Verifier.new(token: token).verify(Member)
member = Verifier.new(token:).verify(Member)

session[:member_id] = member.id

Expand Down
4 changes: 2 additions & 2 deletions app/controllers/subscriptions_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def index
end

def create
subscription = Subscription.new(group_id: group_id, member: current_user)
subscription = Subscription.new(group_id:, member: current_user)

if subscription.save
SubscriptionMailingListService.subscribe(subscription)
Expand All @@ -23,7 +23,7 @@ def create

def destroy
# Don't error if subscription is not found
subscription = current_user.subscriptions.find_by(group_id: group_id)
subscription = current_user.subscriptions.find_by(group_id:)
SubscriptionMailingListService.unsubscribe(subscription) if subscription
subscription&.destroy

Expand Down
2 changes: 1 addition & 1 deletion app/controllers/workshops_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def role_params
end

def find_attending_invitation(workshop, user)
WorkshopInvitation.find_by(workshop: workshop, member: user, attending: true)
WorkshopInvitation.find_by(workshop:, member: user, attending: true)
end

def find_or_create_invitation(workshop, user, role)
Expand Down
6 changes: 3 additions & 3 deletions app/helpers/email_header_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ def mail_to_member(member, subject, from_email = 'meetings@codebar.io', cc = '',

mail(from: "codebar.io <#{from_email}>",
to: member.email,
cc: cc,
bcc: bcc,
subject: subject,
cc:,
bcc:,
subject:,
&block)
end

Expand Down
2 changes: 1 addition & 1 deletion app/models/chapter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def eligible_coaches
private

def members_for_group(name)
members.where(groups: { name: name }).distinct
members.where(groups: { name: }).distinct
end

def expire_chapters_sidebar_cache
Expand Down
2 changes: 1 addition & 1 deletion app/models/feedback.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class Feedback < ApplicationRecord
validates :tutorial, presence: true

def self.submit_feedback(params, token)
feedback_request = FeedbackRequest.find_by(token: token)
feedback_request = FeedbackRequest.find_by(token:)
return false unless feedback_request

feedback = Feedback.new(params)
Expand Down
2 changes: 1 addition & 1 deletion app/models/meeting.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def to_param
end

def attending?(member)
invitations.accepted.where(member: member).present?
invitations.accepted.where(member:).present?
end

def not_full
Expand Down
2 changes: 1 addition & 1 deletion app/models/waiting_list.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class WaitingList < ApplicationRecord
scope :with_notes_and_their_authors, -> { includes(member: [{ member_notes: :author }, :attendance_warnings]) }

def self.add(invitation, auto_rsvp = true)
find_or_create_by(invitation: invitation) do |waiting_list|
find_or_create_by(invitation:) do |waiting_list|
waiting_list.auto_rsvp = auto_rsvp
end
end
Expand Down
2 changes: 1 addition & 1 deletion app/serializers/workshop_calendar.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def configure(event, host_name:)

event.url = invitation_url
event.organizer = workshop.chapter.email.to_s
event.summary = I18n.t('workshop.calendar.summary', host_name: host_name)
event.summary = I18n.t('workshop.calendar.summary', host_name:)
event.ip_class = 'PRIVATE'
end

Expand Down
6 changes: 3 additions & 3 deletions app/services/auditor.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ def log(&block)
end

def log_with_note(note)
create(note: note)
create(note:)
end

private

def create(changes)
PublicActivity::Activity.create(trackable: model,
key: key,
key:,
owner: user,
recipient: recipient,
recipient:,
parameters: changes)
end
end
Expand Down
4 changes: 2 additions & 2 deletions app/services/chapter_creation_service.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ def self.call(params)
chapter.groups.create!(name: 'Coaches')
end

Result.new(chapter: chapter, success: true, errors: nil)
Result.new(chapter:, success: true, errors: nil)
rescue ActiveRecord::RecordInvalid => e
Result.new(chapter: chapter, success: false, errors: e.message)
Result.new(chapter:, success: false, errors: e.message)
end
end
4 changes: 2 additions & 2 deletions app/services/invitation_logger.rb
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def finish_batch(total_invitees)
return unless @log

@log.update!(
total_invitees: total_invitees,
total_invitees:,
completed_at: Time.current,
status: :completed
)
Expand All @@ -83,7 +83,7 @@ def resolved_chapter_id
end

def find_or_build_entry(member, invitation, status)
@log.entries.find_or_create_by(member: member, invitation: invitation) do |entry|
@log.entries.find_or_create_by(member:, invitation:) do |entry|
entry.status = status
end
end
Expand Down
8 changes: 4 additions & 4 deletions app/services/invitation_manager.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def send_monthly_attendance_reminder_emails(monthly)

def send_meeting_emails(meeting)
meeting.invitees.not_banned.each do |invitee|
invitation = MeetingInvitation.new(meeting: meeting, member: invitee, role: 'Participant')
invitation = MeetingInvitation.new(meeting:, member: invitee, role: 'Participant')
next unless invitation.save

MeetingInvitationMailer.invite(meeting, invitee, invitation).deliver_now
Expand Down Expand Up @@ -164,14 +164,14 @@ def chapter_coaches(chapter)
end

def create_invitation(workshop, member, role)
WorkshopInvitation.find_or_create_by!(workshop: workshop, member: member, role: role)
WorkshopInvitation.find_or_create_by!(workshop:, member:, role:)
rescue StandardError => e
log_invitation_failure(workshop, member, role, e)
nil
end

def create_event_invitation(event, member, role)
Invitation.find_or_create_by!(event: event, member: member, role: role)
Invitation.find_or_create_by!(event:, member:, role:)
rescue StandardError => e
log_event_meeting_invitation_failure("event_id=#{event.id}", member, e)
nil
Expand Down Expand Up @@ -260,7 +260,7 @@ def invitation_logger(loggable, initiator_id, audience, chapter_id)
initiator = Member.find_by(id: initiator_id)
return nil unless initiator

InvitationLogger.new(loggable, initiator, audience, :invite, chapter_id: chapter_id)
InvitationLogger.new(loggable, initiator, audience, :invite, chapter_id:)
end

def start_invitation_batch(logger)
Expand Down
2 changes: 1 addition & 1 deletion app/services/three_month_email_service.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def self.send_chaser
.distinct

members.find_each do |member|
MemberMailer.with(member: member).chaser.deliver_later
MemberMailer.with(member:).chaser.deliver_later
end
end
end
Loading