Added body to events removed introduction/conclusion and properly display events on the show page

app/dashboards/event_dashboard.rb

@@ -16,7 +16,8 @@ class EventDashboard < Administrate::BaseDashboard
     updated_at: Field::DateTime,
     title: Field::String,
     introduction: Field::Text,
-    conclusion: Field::Text
+    conclusion: Field::Text,
+    body: Field::Text
   }.freeze
 
   # COLLECTION_ATTRIBUTES
@@ -44,6 +45,7 @@ class EventDashboard < Administrate::BaseDashboard
     :introduction,
     :conclusion,
     :state,
+    :body,
     :starts_at,
     :location
   ].freeze

app/models/event.rb

@@ -15,6 +15,7 @@ class Event < ActiveRecord::Base
   validates :state,
             presence: true,
             inclusion: { in: STATES }
+  validates :body, presence: true
 
   enumerize :state, in: STATES, default: :proposed
 
@@ -25,7 +26,10 @@ def title_with_date
     [title, date].join(" : ")
   end
 
-  # To change the behaviour in /admin/events/1/edit...
+  def date
+    starts_at.strftime("%B %d")
+  end
+
   # driven by views/fields/enum_field/_show.html.erb
   def to_s
     title_with_date

app/views/events/index.html.erb

@@ -1 +1,11 @@
-<h1>Events#index</h1>
+<% @events.each do |event| %>
+  <div class="post clearfix">
+    <h2 class="post-title"><%= link_to event.title, event_path(event)%></h2>
+    <p class="meta">
+      Starts: <%= event.date %>
+    </p>
+    <div class="post-body">
+      <%= render_markdown_as_html(event.body)%>
+    </div>
+  </div>
+<% end %>

app/views/events/show.html.erb

@@ -1,4 +1,9 @@
-<h1><%= @event.title %></h1>
-
-<%= render_markdown_as_html(@event.introduction) %>
-<%= render_markdown_as_html(@event.conclusion) %>
+ <div class="post clearfix">
+    <h2 class="post-title"><%= @event.title%></h2>
+    <p class="meta">
+      Starts: <%= @event.date %>
+    </p>
+    <div class="post-body">
+      <%= @event.body %>
+    </div>
+  </div>

app/views/layouts/_sidebar.html.erb

@@ -5,7 +5,7 @@
       <h4 class='meetup-title'><%= link_to event.title_with_date, event %></h4>
       <div class="meetup-body">
         <p>
-          <%= truncate(event.introduction, length: 400) %>
+          <%= truncate(event.body, length: 400) %>
         </p>
         <p>
           <%= link_to 'Please RSVP', '#' %>

db/migrate/20140929233719_create_events.rb

@@ -1,4 +1,8 @@
 class CreateEvents < ActiveRecord::Migration
+  class Event < ActiveRecord::Base
+    translates :title, :introduction, :conclusion
+  end
+
   def up
     create_table :events do |t|
       t.string :type, null: false

db/migrate/20151206044801_remove_introduction_conclusion_from_event.rb

@@ -0,0 +1,6 @@
+class RemoveIntroductionConclusionFromEvent < ActiveRecord::Migration
+  def change
+    remove_column :event_translations, :introduction, :text
+    remove_column :event_translations, :conclusion, :text
+  end
+end

db/migrate/20151206045102_add_body_to_event.rb

@@ -0,0 +1,9 @@
+class AddBodyToEvent < ActiveRecord::Migration
+  def up
+    Event.add_translation_fields! body: :text
+  end
+
+  def down
+    remove_column :event_translations, :body
+  end
+end

db/schema.rb

@@ -12,18 +12,17 @@
 # It's strongly recommended that you check this file into your version control system.
 
 ActiveRecord::Schema.define(version: 20160308004823) do
-
+  
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
   create_table "event_translations", force: :cascade do |t|
-    t.integer  "event_id",     null: false
-    t.string   "locale",       null: false
-    t.datetime "created_at",   null: false
-    t.datetime "updated_at",   null: false
-    t.string   "title",        null: false
-    t.text     "introduction"
-    t.text     "conclusion"
+    t.integer  "event_id",   null: false
+    t.string   "locale",     null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.string   "title",      null: false
+    t.text     "body"
   end
 
   add_index "event_translations", ["event_id"], name: "index_event_translations_on_event_id", using: :btree
@@ -36,6 +35,8 @@
     t.integer  "location_id",                      null: false
     t.integer  "user_id",                          null: false
     t.string   "state",       default: "proposed"
+    t.integer  "location_id", null: false
+    t.integer  "user_id",     null: false
   end
 
   add_index "events", ["location_id"], name: "index_events_on_location_id", using: :btree
@@ -139,6 +140,8 @@
     t.string   "slug",       default: "temporary-slug", null: false
   end
 
+  add_index "pages", ["slug"], name: "index_pages_on_slug", unique: true, using: :btree
+
   create_table "users", force: :cascade do |t|
     t.string   "email",                  default: "",    null: false
     t.string   "encrypted_password",     default: "",    null: false

spec/factories/events.rb

@@ -9,6 +9,7 @@
     title { Faker::Lorem.sentence }
     introduction { Faker::Lorem.sentence }
     conclusion { Faker::Lorem.paragraph }
+    body { Faker::Lorem.paragraph }
 
     trait :proposed do
       state "proposed"

spec/models/event_spec.rb

@@ -23,5 +23,11 @@
       event = create(:event, author: author)
       expect(event.author).to eq author
     end
+
+    it "does not validate when 'body' is blank" do
+      event = Event.new(title: nil)
+      expect(event).to be_invalid
+      expect(event.errors.messages.keys).to include :body
+    end
   end
 end

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

@@ -0,0 +1,21 @@
+require "rails_helper"
+
+describe "events/index.html.erb" do
+  it "displays all the events" do
+    first_event = create(:event)
+    second_event = create(:event, title: "event two")
+    assign(:events, [first_event, second_event])
+    render
+
+    expect(rendered).to match(/#{first_event.title}/)
+    expect(rendered).to match(/#{second_event.title}/)
+  end
+
+  it "links events title to corresponding show page" do
+    event = create(:event)
+    assign(:events, [event])
+    render
+
+    expect(rendered).to have_link "#{event.title}", href: event_path(event)
+  end
+end