Add Category for Today's Event

app/controllers/events_controller.rb

@@ -2,12 +2,25 @@
 
 class EventsController < ApplicationController
   def index
-    @past_events, @future_events = Event.published.includes(
+    grouped_events = Event.published.includes(
       :translations,
       :location,
       :talks,
       :sponsors
-    ).partition { |e| e.starts_at < Time.now }
+    ).order(:starts_at).group_by do |event|
+      if event.starts_at < Date.today
+        :past
+      elsif event.starts_at.to_date == Date.today
+        :today
+      else
+        :future
+      end
+    end
+
+    @past_events, @todays_event, @future_events = grouped_events.values_at(
+      :past, :today, :future
+    )
+
   end
 
   def show

app/controllers/home_controller.rb

@@ -2,11 +2,24 @@
 
 class HomeController < ApplicationController
   def index
-    @past_events, @future_events = Event.published.includes(
+    grouped_events = Event.published.includes(
       :translations,
       :location,
       :sponsors,
       talks: %i(member translations)
-    ).order(:starts_at).limit(5).partition { |e| e.starts_at < Time.now }
+    ).order(:starts_at).limit(5).group_by do |event|
+      if event.starts_at < Date.today
+        :past
+      elsif event.starts_at.to_date == Date.today
+        :today
+      else
+        :future
+      end
+    end
+    @past_events, @todays_event, @future_events = grouped_events.values_at(
+      :past, :today, :future
+    )
+
   end
+
 end

app/views/events/index.html.erb

@@ -1,6 +1,16 @@
 <% provide :title, "Events" %>
 
-<% if @future_events.any? %>
+<% if @todays_event %>
+  <h1>Today's Event</h1>
+
+  <div class='todays-event'>
+    <%= render @todays_event %>
+  </div>
+
+<% end %>
+
+
+<% if @future_events %>
   <h1>Upcoming <%= 'Event'.pluralize(@future_events.count) %></h1>
 
   <div class='future-events'>

spec/controllers/events_controller_spec.rb

@@ -7,6 +7,7 @@
   let!(:scheduled_event) { create(:event, :scheduled, starts_at: Date.tomorrow) }
   let!(:past_event)      { create(:event, :scheduled, starts_at: 1.month.ago) }
   let!(:future_event)    { create(:event, :scheduled, starts_at: 1.month.from_now) }
+  let!(:today_event)  { create :event, :scheduled, starts_at: DateTime.now}
 
   describe "GET #index" do
     before :each do
@@ -24,6 +25,7 @@
     it "does not include proposed events" do
       expect(assigns(:past_events)).not_to   include proposed_event
       expect(assigns(:future_events)).not_to include proposed_event
+      expect(assigns(:todays_event)).not_to include proposed_event
     end
 
     it "renders the :index template" do
@@ -33,11 +35,21 @@
     it "gets past events" do
       expect(assigns(:past_events)).to     include past_event
       expect(assigns(:past_events)).not_to include future_event
+      expect(assigns(:past_events)).not_to include today_event
+
     end
 
     it "gets future events" do
       expect(assigns(:future_events)).to     include future_event
       expect(assigns(:future_events)).not_to include past_event
+      expect(assigns(:future_events)).not_to include today_event
+    end
+
+    it "gets todays event" do
+      expect(assigns(:todays_event)).to     include today_event
+      expect(assigns(:todays_event)).not_to include past_event
+      expect(assigns(:todays_event)).not_to include future_event
+
     end
   end
 

spec/features/authentication_spec.rb

@@ -5,6 +5,7 @@
 RSpec.describe "Authentication" do
   let(:user) { create(:user) }
   let(:admin) { create(:user, :admin) }
+  let!(:past_event)   { create :event, :scheduled, starts_at: 1.month.ago }
 
   context "Guest user" do
     scenario "Can sign up", vcr: { match_requests_on: [

spec/features/sign_up_with_twitter_spec.rb

@@ -10,6 +10,7 @@
 ' do
 
   describe "access to questions index" do
+     let!(:past_event)   { create :event, :scheduled, starts_at: 1.month.ago }
     background do
       visit root_path
       click_on "Log in"

spec/views/events/index.html.erb_spec.rb

@@ -6,6 +6,7 @@
   let!(:future_event) { create :event, :scheduled, starts_at: 1.month.from_now }
   let!(:past_event)   { create :event, :scheduled, starts_at: 1.month.ago }
 
+
   before do
     assign :future_events, [future_event]
     assign :past_events, [past_event]
@@ -31,6 +32,15 @@
     end
   end
 
+  context "there are no events today" do
+    before { assign :today_event, [] }
+
+    it "does not display anything about today's events" do
+      render
+      expect(rendered).not_to have_css "h1", text: "Today's Event"
+    end
+  end
+
   context "event has a talk" do
     let(:member) { create :member }
     let!(:talk)  { create :talk, state: "scheduled", event: past_event, member: member }