songs and albums sinatra example breakout

3a81fa16 · Faisal Al-Tameemi · d129994e · 3a81fa16 · 3a81fa16 · 3a81fa16
Commit 3a81fa16 authored May 16, 2016 by Faisal Al-Tameemi
10 changed files
--- a/app/actions.rb
+++ b/app/actions.rb
@@ -2,3 +2,13 @@
 get '/' do
  erb :index
 end
+get '/songs' do
+  @songs = Song.all
+  erb :songs
+end
+get '/albums' do
+  @albums = Album.all
+  erb :albums
+end
--- a/app/models/album.rb
+++ b/app/models/album.rb
+class Album  < ActiveRecord::Base
+  has_many :songs
+end
--- a/app/models/song.rb
+++ b/app/models/song.rb
+class Song  < ActiveRecord::Base
+  belongs_to :album
+end
--- a/app/views/albums.erb
+++ b/app/views/albums.erb
+<h1>
+  Albums
+</h1>
+<ul>
+  <% @albums.each do |album| %>
+      <li> <%= album.title %> </li>
+  <% end %>
+</ul>
--- a/app/views/layout.erb
+++ b/app/views/layout.erb
@@ -18,6 +18,10 @@
  <title></title>
 </head>
 <body>
+  <nav>
+    <li>Nav item 1</li>
+    <li>Nav item 2</li>
+  </nav>
  <%= yield %>
 </body>
 </html>
--- a/app/views/songs.erb
+++ b/app/views/songs.erb
+<h1>
+  Songs
+</h1>
+<ul>
+  <% @songs.each do |song| %>
+      <li> <%= song.name %>, <%= song.album.title %> </li>
+  <% end %>
+</ul>
--- a/db/migrate/20160516192321_songs.rb
+++ b/db/migrate/20160516192321_songs.rb
+class Songs < ActiveRecord::Migration
+  def change
+    create_table :songs do |s|
+      s.string :name
+      s.string :artist
+      s.integer :likes
+    end
+  end
+end
--- a/db/migrate/20160516192840_albums.rb
+++ b/db/migrate/20160516192840_albums.rb
+class Albums < ActiveRecord::Migration
+  def change
+    create_table :albums do |al|
+      al.string :title
+      al.string :record_label
+      al.date :release_date
+    end
+  end
+end
--- a/db/migrate/20160516195607_songs_foreign_key.rb
+++ b/db/migrate/20160516195607_songs_foreign_key.rb
+class SongsForeignKey < ActiveRecord::Migration
+  def change
+    add_column :songs, :album_id, :integer
+  end
+end
--- a/db/schema.rb
+++ b/db/schema.rb
+# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -10,11 +11,19 @@
 #
 # It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20140321144528) do
+ActiveRecord::Schema.define(version: 20160516195607) do
-  create_table "users", force: true do |t|
+  create_table "albums", force: :cascade do |t|
+    t.string "title"
+    t.string "record_label"
+    t.date   "release_date"
+  end
+  create_table "songs", force: :cascade do |t|
    t.string  "name"
-    t.string "email"
+    t.string  "artist"
+    t.integer "likes"
+    t.integer "album_id"
  end
 end