Order events and reduce N+1 on rich text fields

app/controllers/admin/events_controller.rb

@@ -4,7 +4,7 @@ class EventsController < BaseController
     rescue_from ActiveRecord::RecordNotFound, with: :record_not_found
 
     def index
-      @events = Event.all.order(created_at: :desc)
+      @events = Event.with_all_rich_text.all.order(created_at: :desc)
     end
 
     def new
@@ -63,7 +63,7 @@ def destroy
 
     # Use callbacks to share common setup or constraints between actions.
     def set_event
-      @event = Event.find_by!(slug: params[:id])
+      @event = Event.with_all_rich_text.find_by!(slug: params[:id])
     end
 
     # Only allow a list of trusted parameters through.

app/controllers/events_controller.rb

@@ -1,32 +1,32 @@
 class EventsController < ApplicationController
   # GET /events
   def index
-    @events = Event.upcoming
+    @events = Event.with_all_rich_text.upcoming
   end
 
   # GET /events/all or /events/all.ics
   def all
-    @events = Event.published
+    @events = Event.with_all_rich_text.published.order(start_at: :desc)
 
     respond_to do |format|
       format.html { render :index }
-      format.ics { render plain: Calendar.new(@events.order(start_at: :asc)).to_ical }
+      format.ics { render plain: Calendar.new(@events.reorder(start_at: :asc)).to_ical }
     end
   end
 
   def show
-    @event = Event.find_by!(slug: params[:slug])
+    @event = Event.with_all_rich_text.find_by!(slug: params[:slug])
   rescue ActiveRecord::RecordNotFound
-    redirect_to all_events_path, error: "Event not found"
+    redirect_to all_events_path, error: 'Event not found'
   end
 
   def past
-    @events = Event.past
+    @events = Event.with_all_rich_text.past
     render :index
   end
 
   def next
-    @events = Event.upcoming.first
+    @events = Event.with_all_rich_text.upcoming.first
     render :index
   end
 end

app/helpers/application_helper.rb

@@ -1,9 +1,19 @@
 module ApplicationHelper
   def title
-    "#{content_for(:page_title)} | Toronto Ruby" || 'Toronto Ruby'
+    text = content_for(:page_title)
+    if text.present?
+      "#{text} | Toronto Ruby"
+    else
+      'Toronto Ruby'
+    end
   end
 
   def description
-    content_for(:page_description) || 'Toronto Ruby Meetups'
+    text = content_for(:page_description)
+    if text.present?
+      text
+    else
+      'Toronto Ruby Meetups'
+    end
   end
 end

app/views/admin/events/edit.html.erb

@@ -7,3 +7,7 @@
 <div>
   <%= link_to "Back to events", admin_events_path %>
 </div>
+
+<% content_for :page_title do %>
+ Editing <%= @event.name %>
+<% end %>

app/views/admin/events/index.html.erb

@@ -15,6 +15,6 @@
 </div>
 
 <% content_for :page_title do %>
-Admin Home
+  Admin Home
 <% end %>
 

app/views/admin/events/new.html.erb

@@ -7,3 +7,6 @@
 <div>
   <%= link_to "Back to events", events_path %>
 </div>
+<% content_for :page_title do %>
+  Create new event
+<% end %>

app/views/admin/events/show.html.erb

@@ -4,3 +4,7 @@
 <% end %>
 
 <%= render partial: "layouts/event_layout" %>
+
+<% content_for :page_title do %>
+ <%= @event.name %>
+<% end %>

app/views/events/show.html.erb

@@ -2,7 +2,6 @@
  <%= @event.name %>
 <% end %>
 
-
 <%= content_for :event_content do %>
   <%= render partial: "events/event", locals: { event: @event } %>
 <% end %>