adhere to rubocop guidelines

This commit is contained in:
Josh
2018-06-26 10:29:46 -04:00
parent d2a677d15f
commit ad5f218f23
64 changed files with 305 additions and 212 deletions

View File

@ -1,3 +1,5 @@
# frozen_string_literal: true
module ApplicationCable
class Channel < ActionCable::Channel::Base
end

View File

@ -1,3 +1,5 @@
# frozen_string_literal: true
module ApplicationCable
class Connection < ActionCable::Connection::Base
end

View File

@ -1,3 +1,5 @@
# frozen_string_literal: true
class WaitingChannel < ApplicationCable::Channel
def subscribed
stream_from "#{params[:uid]}_waiting_channel"

View File

@ -1,3 +1,5 @@
# frozen_string_literal: true
require 'bigbluebutton_api'
class ApplicationController < ActionController::Base
@ -43,18 +45,18 @@ class ApplicationController < ActionController::Base
# Determines if a form field needs the is-invalid class.
def form_is_invalid?(obj, key)
'is-invalid' if !obj.errors.messages[key].empty?
'is-invalid' unless obj.errors.messages[key].empty?
end
helper_method :form_is_invalid?
# Default, unconfigured meeting options.
def default_meeting_options
invite_msg = "To invite someone to the meeting, send them this link:"
{
user_is_moderator: false,
meeting_logout_url: request.base_url + logout_room_path(@room),
meeting_recorded: true,
moderator_message: "To invite someone to the meeting, send them this link:\n\n
#{request.base_url + relative_root + room_path(@room)}"
moderator_message: "#{invite_msg}\n\n #{request.base_url + relative_root + room_path(@room)}",
}
end
end

View File

@ -1,9 +1,10 @@
# frozen_string_literal: true
class ErrorsController < ApplicationController
def not_found
render status: 404
end
def unprocessable
render status: 422
end

View File

@ -1,6 +1,7 @@
class MainController < ApplicationController
# frozen_string_literal: true
#before_action :redirect_to_room
class MainController < ApplicationController
# before_action :redirect_to_room
# GET /
def index

View File

@ -1,5 +1,6 @@
class RoomsController < ApplicationController
# frozen_string_literal: true
class RoomsController < ApplicationController
before_action :validate_accepted_terms, unless: -> { !Rails.configuration.terms }
before_action :find_room, except: :create
before_action :verify_room_ownership, except: [:create, :show, :join, :logout]
@ -9,7 +10,7 @@ class RoomsController < ApplicationController
# POST /
def create
redirect_to root_path unless current_user
@room = Room.new(name: room_params[:name])
@room.owner = current_user
@ -19,9 +20,6 @@ class RoomsController < ApplicationController
else
redirect_to @room
end
else
# Handle room didn't save.
end
end
@ -29,7 +27,7 @@ class RoomsController < ApplicationController
def show
if current_user && @room.owned_by?(current_user)
@recordings = @room.recordings
@is_running = @room.is_running?
@is_running = @room.running?
else
render :join
end
@ -47,7 +45,7 @@ class RoomsController < ApplicationController
return
end
if @room.is_running?
if @room.running?
if current_user
redirect_to @room.join_path(current_user.name, opts, current_user.uid)
else
@ -92,13 +90,13 @@ class RoomsController < ApplicationController
current_user.main_room = @room
current_user.save
redirect_to @room
redirect_to @room
end
# POST /:room_uid/:record_id
def update_recording
meta = {
"meta_#{META_LISTED}" => (params[:state] == "public")
"meta_#{META_LISTED}" => (params[:state] == "public"),
}
res = @room.update_recording(params[:record_id], meta)
@ -124,12 +122,10 @@ class RoomsController < ApplicationController
if len > 60
"#{len / 60} hrs"
elsif len == 0
"< 1 min"
else
if len == 0
"< 1 min"
else
"#{len} min"
end
"#{len} min"
end
end
helper_method :recording_length
@ -147,7 +143,7 @@ class RoomsController < ApplicationController
# Ensure the user is logged into the room they are accessing.
def verify_room_ownership
bring_to_room if !@room.owned_by?(current_user)
bring_to_room unless @room.owned_by?(current_user)
end
# Redirects a user to their room.

View File

@ -1,5 +1,6 @@
class SessionsController < ApplicationController
# frozen_string_literal: true
class SessionsController < ApplicationController
# GET /users/login
def new
end
@ -13,11 +14,8 @@ class SessionsController < ApplicationController
# POST /users/login
def create
user = User.find_by(email: session_params[:email])
if user && user.authenticate(session_params[:password])
if user.&authenticate(session_params[:password])
login(user)
else
# Login unsuccessful, display error message.
end
end

View File

@ -1,5 +1,6 @@
class UsersController < ApplicationController
# frozen_string_literal: true
class UsersController < ApplicationController
before_action :find_user, only: [:edit, :update]
before_action :ensure_unauthenticated, only: [:new, :create]
@ -12,7 +13,7 @@ class UsersController < ApplicationController
@user.provider = "greenlight"
if @user.save
login(@user)
login(@user)
else
# Handle error on user creation.
render :new
@ -61,16 +62,13 @@ class UsersController < ApplicationController
redirect_to edit_user_path(@user), notice: "Information successfully updated."
else
# Append custom errors.
errors.each do |k, v| @user.errors.add(k, v) end
errors.each { |k, v| @user.errors.add(k, v) }
render :edit
end
elsif @user.update_attributes(user_params)
redirect_to edit_user_path(@user), notice: "Information successfully updated."
else
# Update the core user attributes.
if @user.update_attributes(user_params)
redirect_to edit_user_path(@user), notice: "Information successfully updated."
else
render :edit
end
render :edit
end
end
@ -83,7 +81,7 @@ class UsersController < ApplicationController
redirect_to current_user.main_room
end
end
private
def find_user

View File

@ -1,3 +1,5 @@
# frozen_string_literal: true
module ApplicationHelper
include MeetingsHelper
@ -12,7 +14,7 @@ module ApplicationHelper
def omniauth_login_url(provider)
"#{Rails.configuration.relative_url_root}/auth/#{provider}"
end
# Determine if Greenlight is configured to allow user signups.
def allow_user_signup?
Rails.configuration.allow_user_signup

View File

@ -1,2 +1,4 @@
# frozen_string_literal: true
module ErrorsHelper
end

View File

@ -1,2 +1,4 @@
# frozen_string_literal: true
module MainHelper
end

View File

@ -1,2 +1,4 @@
# frozen_string_literal: true
module MeetingsHelper
end

View File

@ -1,2 +1,4 @@
# frozen_string_literal: true
module RoomsHelper
end

View File

@ -1,11 +1,12 @@
# frozen_string_literal: true
module SessionsHelper
# Logs a user into GreenLight.
def login(user)
session[:user_id] = user.id
# If there are not terms, or the user has accepted them, go to their room.
if !Rails.configuration.terms || user.accepted_terms then
if !Rails.configuration.terms || user.accepted_terms
redirect_to user.main_room
else
redirect_to terms_path

View File

@ -1,2 +1,4 @@
# frozen_string_literal: true
module UsersHelper
end

View File

@ -1,2 +1,4 @@
# frozen_string_literal: true
class ApplicationJob < ActiveJob::Base
end

View File

@ -1,3 +1,5 @@
# frozen_string_literal: true
class NotifyUserWaitingJob < ApplicationJob
queue_as :default

View File

@ -1,3 +1,5 @@
# frozen_string_literal: true
class ApplicationMailer < ActionMailer::Base
default from: 'from@example.com'
layout 'mailer'

View File

@ -1,7 +1,9 @@
# frozen_string_literal: true
class ApplicationRecord < ActiveRecord::Base
self.abstract_class = true
def to_param
uid
uid
end
end

View File

@ -1,5 +1,6 @@
class Room < ApplicationRecord
# frozen_string_literal: true
class Room < ApplicationRecord
before_create :setup
validates :name, presence: true
@ -8,7 +9,6 @@ class Room < ApplicationRecord
RETURNCODE_SUCCESS = "SUCCESS"
META_LISTED = "gl-listed"
UID_LENGTH = 6
# Determines if a user owns a room.
def owned_by?(user)
@ -17,7 +17,7 @@ class Room < ApplicationRecord
end
# Checks if a room is running on the BigBlueButton server.
def is_running?
def running?
bbb.is_meeting_running?(bbb_id)
end
@ -34,16 +34,11 @@ class Room < ApplicationRecord
moderatorPW: random_password(12),
attendeePW: random_password(12),
moderatorOnlyMessage: options[:moderator_message],
"meta_#{META_LISTED}": false
"meta_#{META_LISTED}": false,
}
# Update session info.
self.update_attributes(sessions: sessions + 1, last_session: DateTime.now)
#meeting_options.merge!(
#{ "meta_room-id": options[:room_owner],
# "meta_meeting-name": options[:meeting_name]}
#) if options[:room_owner]
update_attributes(sessions: sessions + 1, last_session: DateTime.now)
# Send the create request.
begin
@ -56,7 +51,7 @@ class Room < ApplicationRecord
# Returns a URL to join a user into a meeting.
def join_path(name, options = {}, uid = nil)
# Create the meeting if it isn't running.
start_session(options) unless is_running?
start_session(options) unless running?
# Set meeting options.
options[:meeting_logout_url] ||= nil
@ -64,7 +59,7 @@ class Room < ApplicationRecord
options[:user_is_moderator] ||= false
options[:meeting_recorded] ||= false
return call_invalid_res if !bbb
return call_invalid_res unless bbb
# Get the meeting info.
meeting_info = bbb.get_meeting_info(bbb_id, nil)
@ -78,30 +73,26 @@ class Room < ApplicationRecord
# Generate the join URL.
join_opts = {}
join_opts.merge!({userID: uid}) if uid
join_opts.merge!({joinViaHtml5: true}) if Rails.configuration.html5_enabled
join_opts[:userID] = uid if uid
join_opts[:joinViaHtml5] = true if Rails.configuration.html5_enabled
bbb.join_meeting_url(bbb_id, name, password, join_opts)
end
# Notify waiting users that a meeting has started.
def notify_waiting
ActionCable.server.broadcast("#{uid}_waiting_channel", {
action: "started"
})
ActionCable.server.broadcast("#{uid}_waiting_channel", action: "started")
end
# Retrieves all the users in a room.
def participants
begin
res = bbb.get_meeting_info(bbb_id, nil)
res[:attendees].map do |att|
User.find_by(uid: att[:userID], name: att[:fullName])
end
rescue BigBlueButton::BigBlueButtonException => exc
# The meeting is most likely not running.
[]
res = bbb.get_meeting_info(bbb_id, nil)
res[:attendees].map do |att|
User.find_by(uid: att[:userID], name: att[:fullName])
end
rescue BigBlueButton::BigBlueButtonException
# The meeting is most likely not running.
[]
end
# Fetches all recordings for a room.
@ -120,18 +111,18 @@ class Room < ApplicationRecord
end
r.delete(:playback)
end
end
res[:recordings]
end
# Fetches a rooms public recordings.
def public_recordings
recordings.select do |r| r[:metadata][:"gl-listed"] == "true" end
recordings.select { |r| r[:metadata][:"gl-listed"] == "true" }
end
def update_recording(record_id, meta)
meta.merge!({recordID: record_id})
meta[:recordID] = record_id
bbb.send_api_request("updateRecordings", meta)
end
@ -153,12 +144,12 @@ class Room < ApplicationRecord
# Sets a BigBlueButtonApi object for interacting with the API.
def bbb
@bbb ||= BigBlueButton::BigBlueButtonApi.new(remove_slash(bbb_endpoint), bbb_secret, "0.8")
#@bbb ||= if Rails.configuration.loadbalanced_configuration
# lb_user = retrieve_loadbalanced_credentials(self.room.owner.provider)
# BigBlueButton::BigBlueButtonApi.new(remove_slash(lb_user["apiURL"]), lb_user["secret"], "0.8")
#else
# BigBlueButton::BigBlueButtonApi.new(remove_slash(bbb_endpoint), bbb_secret, "0.8")
#end
# @bbb ||= if Rails.configuration.loadbalanced_configuration
# lb_user = retrieve_loadbalanced_credentials(self.room.owner.provider)
# BigBlueButton::BigBlueButtonApi.new(remove_slash(lb_user["apiURL"]), lb_user["secret"], "0.8")
# else
# BigBlueButton::BigBlueButtonApi.new(remove_slash(bbb_endpoint), bbb_secret, "0.8")
# end
end
# Generates a uid for the room and BigBlueButton.
@ -167,10 +158,15 @@ class Room < ApplicationRecord
self.bbb_id = Digest::SHA1.hexdigest(Rails.application.secrets[:secret_key_base] + Time.now.to_i.to_s).to_s
end
# Generates a three character uid chunk.
def uid_chunk
charset = ("a".."z").to_a - %w(b i l o s) + ("2".."9").to_a - %w(5 8)
(0...3).map { charset.to_a[rand(charset.size)] }.join
end
# Generates a random room uid that uses the users name.
def random_room_uid
charset = %w{ 2 3 4 6 7 9 a c d e f g h j k m n p q r t v w x y z}
owner.firstname.downcase + "-" + (0...UID_LENGTH).map{ charset.to_a[rand(charset.size)] }.join.insert(UID_LENGTH / 2, "-")
[owner.firstname, uid_chunk, uid_chunk].join('-').downcase
end
# Rereives the loadbalanced BigBlueButton credentials for a user.
@ -182,7 +178,7 @@ class Room < ApplicationRecord
uri = encode_bbb_url(
Rails.configuration.loadbalancer_endpoint,
Rails.configuration.loadbalancer_secret,
{name: provider}
name: provider
)
# Make the request.
@ -190,7 +186,7 @@ class Room < ApplicationRecord
http.use_ssl = (uri.scheme == 'https')
response = http.get(uri.request_uri)
unless response.kind_of?(Net::HTTPSuccess)
unless response.is_a?(Net::HTTPSuccess)
raise "Error retrieving provider credentials: #{response.code} #{response.message}"
end
@ -209,7 +205,7 @@ class Room < ApplicationRecord
encoded_params = OAuth::Helper.normalize(params)
string = "getUser" + encoded_params + secret
checksum = OpenSSL::Digest.digest('sha1', string).unpack("H*").first
URI.parse("#{base_url}?#{encoded_params}&checksum=#{checksum}")
end
@ -220,7 +216,7 @@ class Room < ApplicationRecord
# Generates a random password for a meeting.
def random_password(length)
o = ([('a'..'z'), ('A'..'Z')].map do |i| i.to_a end).flatten
((0...length).map do o[rand(o.length)] end).join
charset = ("a".."z").to_a + ("A".."Z").to_a
((0...length).map { charset[rand(charset.length)] }).join
end
end

View File

@ -1,17 +1,18 @@
class User < ApplicationRecord
# frozen_string_literal: true
class User < ApplicationRecord
after_create :initialize_main_room
before_save { email.downcase! unless email.nil? }
before_save { email.try(:downcase!) }
has_many :rooms
belongs_to :main_room, class_name: 'Room', foreign_key: :room_id, required: false
validates :name, length: { maximum: 24 }, presence: true
validates :provider, presence: true
validates :image, format: {with: /\.(png|jpg)\Z/i}, allow_blank: true
validates :image, format: { with: /\.(png|jpg)\Z/i }, allow_blank: true
validates :email, length: { maximum: 60 }, allow_blank: true,
uniqueness: { case_sensitive: false },
format: {with: /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i }
format: { with: /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i }
validates :password, length: { minimum: 6 }, confirmation: true, if: :greenlight_account?
@ -19,26 +20,15 @@ class User < ApplicationRecord
has_secure_password(validations: false)
class << self
# Generates a user from omniauth.
def from_omniauth(auth)
user = find_or_initialize_by(
social_uid: auth['uid'],
provider: auth['provider']
)
user.name = send("#{auth['provider']}_name", auth)
user.username = send("#{auth['provider']}_username", auth)
user.email = send("#{auth['provider']}_email", auth)
user.image = send("#{auth['provider']}_image", auth)
user.save!
user
end
# Generates a user from a trusted launcher.
def from_launch(auth)
find_or_initialize_by(social_uid: auth['uid'], provider: auth['provider']).tap do |u|
u.name = send("#{auth['provider']}_name", auth)
u.username = send("#{auth['provider']}_username", auth)
u.email = send("#{auth['provider']}_email", auth)
u.image = send("#{auth['provider']}_image", auth)
u.save!
end
end
private
@ -80,9 +70,9 @@ class User < ApplicationRecord
# Retrives a list of all a users rooms that are not the main room, sorted by last session date.
def secondary_rooms
secondary = (rooms - [main_room])
no_session, session = secondary.partition do |r| r.last_session.nil? end
sorted = session.sort_by do |r| r.last_session end
session + no_session
no_session, session = secondary.partition { |r| r.last_session.nil? }
sorted = session.sort_by(&:last_session)
sorted + no_session
end
def firstname
@ -99,6 +89,6 @@ class User < ApplicationRecord
def initialize_main_room
self.uid = "gl-#{(0...12).map { (65 + rand(26)).chr }.join.downcase}"
self.main_room = Room.create!(owner: self, name: firstname + "'s Room")
self.save
save
end
end