reworking routes

app/controllers/application_controller.rb

@@ -35,15 +35,21 @@ class ApplicationController < ActionController::Base
   end
   helper_method :allow_greenlight_users?
 
-  private
-
-  # Ensure the user is logged into the room they are accessing.
-  def verify_room_ownership
-    # Redirect to correct room or root if not logged in.
-    if current_user.nil?
-      redirect_to root_path
-    elsif @room.nil? || current_user != @room.user
-      redirect_to room_path(current_user.room.uid)
-    end
+  # Generate a URL to start a meeting.
+  def owner_meeting_url
+    opts = default_meeting_options
+    opts[:user_is_moderator] = true
+    @room.meeting.join_path(current_user.name, opts)
+  end
+  helper_method :owner_meeting_url
+  
+  # Default, unconfigured meeting options.
+  def default_meeting_options
+    {
+      user_is_moderator: false,
+      meeting_logout_url: request.base_url + logout_room_path(@room.uid),
+      meeting_recorded: true,
+      moderator_message: "To invite someone to the meeting, send them this link:\n\n#{request.base_url + room_path(@room.uid)}"
+    }
   end
 end

app/controllers/meetings_controller.rb

@@ -1,8 +1,8 @@
 class MeetingsController < ApplicationController
 
-  before_action :verify_room_ownership
+  #before_action :verify_room_ownership
 
-  # GET /rooms/:room_uid/meetings
+  # GET /r/:room_uid/meetings
   def index
   end
 

app/controllers/rooms_controller.rb

@@ -1,82 +1,114 @@
 class RoomsController < ApplicationController
 
   before_action :find_room, :verify_room_ownership
-  skip_before_action :verify_room_ownership, only: [:join, :wait]
+  skip_before_action :verify_room_ownership, only: [:index, :join, :wait]
 
-  # GET /rooms/:room_uid
+  # GET /r/:room_uid
   def index
+    opts = default_meeting_options
 
-  end
-
-  # GET /rooms/:room_uid/join
-  def join
-    if @meeting
-      opts = default_meeting_options
-      if @meeting.is_running?
-        if current_user
-          # Check if the current user is the room/session owner.
-          opts[:user_is_moderator] = @meeting.room.owned_by?(current_user)
+    if @meeting.is_running?
+      if current_user
+        # If you don't own the room but the meeting is running, join up.
+        if !@room.owned_by?(current_user)
+          opts[:user_is_moderator] = false
           redirect_to @meeting.join_path(current_user.name, opts)
-        else
-          # If the unauthenticated user has supplied a join name.
-          if params[:join_name]
-            redirect_to @meeting.join_path(params[:join_name], opts)
-          else
-            # Render the join page so they can supply their name.
-            render :join
-          end
         end
       else
-        # Only start the meeting if owner is joining first.
-        if current_user && @room.owned_by?(current_user)
-          opts[:user_is_moderator] = true
-          redirect_to @meeting.join_path(current_user.name, opts)
-        else
-          # Send the user to a polling page that will auto join them when it starts.
-          # The wait action/page handles input of name for unauthenticated users.
-          redirect_to wait_room_path(room_uid: @room.uid)
-        end
+        # If you're unauthenticated, you must enter a name to join the meeting.
+        redirect_to join_room_path(@room.uid)
       end
     else
-      # Handle room doesn't exist.
-  
+      # If the meeting isn't running and you don't own the room, go to the waiting page.
+      if !@room.owned_by?(current_user)
+        redirect_to wait_room_path(@room.uid)
+      end
     end
   end
 
-  # GET /rooms/:room_uid/wait
-  def wait
-    if @room
-      if @meeting.is_running?
-        if current_user
-          # If they are logged in and waiting, use their account name.
-          redirect_to @meeting.join_path(current_user.name, default_meeting_options)
-        elsif !params[:unauthenticated_join_name].blank?
-          # Otherwise, use the name they submitted on the wating page.
-          redirect_to @meeting.join_path(params[:unauthenticated_join_name], default_meeting_options)
+  # GET /r/:room_uid/start
+  def start
+    # Join the user in and start the meeting.
+    opts = default_meeting_options
+    opts[:user_is_moderator] = true
+    redirect_to @meeting.join_path(current_user.name, opts)
+  end
+
+  # GET /r/:room_uid/join
+  def join
+    if @meeting.is_running?
+      opts = default_meeting_options
+
+      if current_user
+        # If the user exists, join them in.
+        opts[:user_is_moderator] = @room.owned_by?(current_user)
+        redirect_to @meeting.join_path(current_user.name, opts)
+      else
+        # If they are unauthenticated, prompt for join name.
+        if params[:join_name]
+          redirect_to @meeting.join_path(params[:join_name], opts)
+        else
+          # Render the join page so they can supply their name.
+          render :join
         end
       end
     else
-      # Handle room doesn't exist.
-  
+      if @room.owned_by?(current_user)
+        # Redirect owner to room.
+        redirect_to room_path(@room.uid)
+      else
+        # Otherwise, they have to wait for the meeting to start.
+        redirect_to wait_room_path(@room.uid)
+      end
     end
   end
 
+  # GET /r/:room_uid/wait
+  def wait
+    if @meeting.is_running?
+      if current_user
+        # If they are logged in and waiting, use their account name.
+        redirect_to @meeting.join_path(current_user.name, default_meeting_options)
+      elsif !params[:unauthenticated_join_name].blank?
+        # Otherwise, use the name they submitted on the wating page.
+        redirect_to @meeting.join_path(params[:unauthenticated_join_name], default_meeting_options)
+      end
+    end
+  end
+
+  # GET /r/:room_uid/logout
+  def logout
+    # Redirect the owner to their room.
+    redirect_to room_path(@room.uid)
+  end
+
   private
 
   # Find the room from the uid.
   def find_room
     @room = Room.find_by(uid: params[:room_uid])
+
+    if @room.nil?
+      # Handle room doesn't exist.
+
+    end
+
     @meeting = @room.meeting
   end
 
-  # Default, unconfigured meeting options.
-  def default_meeting_options
-    {
-      user_is_moderator: false,
-      meeting_logout_url: request.base_url + room_path(room_uid: @room.uid),
-      meeting_recorded: true,
-      moderator_message: "To invite someone to the meeting, send them this link:
-        #{request.base_url + join_room_path(room_uid: @room.uid)}"
-    }
+  # Ensure the user is logged into the room they are accessing.
+  def verify_room_ownership
+    bring_to_room if !@room.owned_by?(current_user)
+  end
+
+  # Redirects a user to their room.
+  def bring_to_room
+    if current_user
+      # Redirect authenticated users to their room.
+      redirect_to room_path(current_user.room.uid)
+    else
+      # Redirect unauthenticated users to root.
+      redirect_to root_path
+    end
   end
 end

app/helpers/application_helper.rb

@@ -1,4 +1,5 @@
 module ApplicationHelper
+  include MeetingsHelper
 
   # Gets all configured omniauth providers.
   def configured_providers

app/models/room.rb

@@ -5,6 +5,7 @@ class Room < ApplicationRecord
   belongs_to :user
   has_one :meeting
 
+  # Determines if a user owns a room.
   def owned_by?(user)
     return false if user.nil?
     user.room == self
@@ -16,6 +17,7 @@ class Room < ApplicationRecord
   def set_uid
     digest = user.id.to_s + user.provider + user.username
     digest += user.uid unless user.uid.nil?
-    self.uid = Digest::SHA1.hexdigest(digest)[0..12]
+
+    self.uid = [user.name.split(' ').first.downcase, Digest::SHA1.hexdigest(digest)[0..7]].join('-')
   end
 end

app/views/rooms/index.html.erb

@@ -13,9 +13,7 @@
 <% if @room.meeting.is_running? %>
   <p>meeting is already running</p>
 <% else %>
-  <%= form_tag join_room_path, method: :get do %>
-    <%= submit_tag 'Start Meeting' %>
-  <% end %>
+  <%= link_to "Start Meeting", start_room_path(@room.uid) %>
 <% end %>
 
 <br><br>

app/views/rooms/join.html.erb

@@ -1,7 +1,7 @@
 <p>The join the meeting, enter a name.</p>
 
 <p>Enter a name to start a session.</p>
-<%= form_tag join_meeting_path(room_uid: @meeting.room.uid, meeting_uid: @meeting.uid) do %>
+<%= form_tag join_room_path(room_uid: @room.uid) do %>
   <%= text_field_tag "join_name" %>
   <%= submit_tag "Join" %>
 <% end %>

config/routes.rb

@@ -1,10 +1,12 @@
 Rails.application.routes.draw do
 
   # Room and Meeting routes.
-  scope '/rooms/:room_uid' do
+  scope '/r/:room_uid' do
     get '/', to: 'rooms#index', as: :room
+    match '/start', to: 'rooms#start', as: :start_room, via: [:get, :post]
     match '/join', to: 'rooms#join', as: :join_room, via: [:get, :post]
     match '/wait', to: 'rooms#wait', as: :wait_room, via: [:get, :post]
+    match '/logout', to: 'rooms#logout', as: :logout_room, via: [:get, :post]
     resources :meetings, only: [:index], param: :meeting_uid
   end
 

test/controllers/rooms_controller_test.rb

@@ -8,9 +8,6 @@ class RoomsControllerTest < ActionDispatch::IntegrationTest
 
     @kitchen = rooms(:kitchen)
     @garage = rooms(:garage)
-
-    @steve.room = @kitchen
-    @mark.room = @garage
   end
 
   test 'should redirect to root if not logged in.' do

test/fixtures/rooms.yml

@@ -6,7 +6,9 @@
 #
 
 kitchen:
+  user: steve
   uid: "13579"
 
 garage:
+  user: mark
   uid: "02468"