Fix #32 - Add scope for upcoming events.

Added a scope to the Event model to get ongoing or upcoming Events.
Added spec for testing that only future and ongoing events are selected, while past events are not.
Updated events controller to select only ongoing or upcoming events.

app/controllers/events_controller.rb

@@ -7,7 +7,7 @@ class EventsController < ApplicationController
 
  # GET /events or /events.json
  def index
- @events = Event.all
+ @events = Event.ongoing_or_upcoming
  end
 
  # GET /events/1 or /events/1.json

app/models/event.rb

@@ -7,6 +7,8 @@ class Event < ApplicationRecord
 
  validates :start_at, :end_at, presence: true
 
+ scope :ongoing_or_upcoming, -> { where("end_at >= ?", Time.zone.now) }
+
  def to_s
  name
  end

spec/models/event_spec.rb

@@ -3,5 +3,19 @@
 require "rails_helper"
 
 RSpec.describe Event, type: :model do
- pending "add some examples to (or delete) #{__FILE__}"
+ let(:event) { create :event }
+
+ it { expect(event).to be_valid }
+
+ describe "#ongoing_or_upcoming" do
+ subject { described_class.ongoing_or_upcoming }
+
+ let!(:past_event) { create :event, end_at: 1.day.ago }
+ let!(:upcoming_event) { create :event, start_at: 3.days.from_now, end_at: 5.days.from_now }
+ let!(:ongoing_event) { create :event, start_at: 3.days.ago, end_at: 1.day.from_now }
+
+ it { is_expected.to include(upcoming_event) }
+ it { is_expected.to include(ongoing_event) }
+ it { is_expected.not_to include(past_event) }
+ end
 end