makersquare · Jessekevon · Oct 11, 2013 · Oct 12, 2013 · Oct 30, 2013 · Oct 30, 2013
diff --git a/Gemfile b/Gemfile
@@ -29,6 +29,10 @@ gem 'turbolinks'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 1.2'
 
+gem 'hirb'
+
+gem 'haml'
+
 group :doc do
   # bundle exec rake doc:rails generates the API under doc/api.
   gem 'sdoc', require: false

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -38,7 +38,10 @@ GEM
     coffee-script-source (1.6.3)
     erubis (2.7.0)
     execjs (2.0.2)
+    haml (4.0.3)
+      tilt
     hike (1.2.3)
+    hirb (0.7.1)
     i18n (0.6.5)
     jbuilder (1.5.2)
       activesupport (>= 3.0.0)
@@ -116,6 +119,8 @@ PLATFORMS
 
 DEPENDENCIES
   coffee-rails (~> 4.0.0)
+  haml
+  hirb
   jbuilder (~> 1.2)
   jquery-rails
   pry

diff --git a/README.rdoc b/README.rdoc
@@ -1,28 +1,8 @@
-== README
+• Create a resturaunt menu using Ruby on Rails
 
-This README would normally document whatever steps are necessary to get the
-application up and running.
+• Homepage should list all menu items
 
-Things you may want to cover:
+• Each menu item should have a name, a price, and a list of ingredients
 
-* Ruby version
-
-* System dependencies
-
-* Configuration
-
-* Database creation
-
-* Database initialization
-
-* How to run the test suite
-
-* Services (job queues, cache servers, search engines, etc.)
-
-* Deployment instructions
-
-* ...
-
-
-Please feel free to use a different markup language if you do not plan to run
-<tt>rake doc:app</tt>.
+• User should be able to add menu items at the bottom of the homepage
+• Technology: Ruby on Rails and Haml
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
@@ -1,3 +1,21 @@
+body {
+	background-color: #dbe3eb;
+}
+
+h1 {
+	text-align: center;
+	font-family: molesk;
+	font-size: 3em;
+}
+
+td {
+	text-align: center;
+}
+
+a {
+	text-decoration: none;
+}
+
 /*
  * This is a manifest file that'll be compiled into application.css, which will include all the files
  * listed below.

diff --git a/app/models/ingredient.rb b/app/models/ingredient.rb
@@ -0,0 +1,4 @@
+class Ingredient < ActiveRecord::Base
+  has_many :recipes
+  has_many :menu_items, :through => :recipes
+end
diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb
@@ -1,2 +1,4 @@
-class MenuItem < ActiveRecord::Base
+ class MenuItem < ActiveRecord::Base
+  has_many :recipes
+  has_many :ingredients, :through => :recipes
 end
diff --git a/app/models/recipe.rb b/app/models/recipe.rb
@@ -0,0 +1,4 @@
+class Recipe < ActiveRecord::Base
+  belongs_to :menu_item
+  belongs_to :ingredient
+end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -8,6 +8,8 @@
 </head>
 <body>
 
+<h1>MAKERSBISTRO</h1>
+
 <%= yield %>
 
 </body>

diff --git a/app/views/menu_items/index.html.erb b/app/views/menu_items/index.html.erb
diff --git a/app/views/menu_items/index.html.haml b/app/views/menu_items/index.html.haml
@@ -0,0 +1,23 @@
+%h1 Now Serving:
+
+%table
+  %thead
+    %tr
+      %th
+      %th
+      %th
+      %th
+
+    %tbody
+      -@menu_items.each do |menu_item|
+        %tr
+          %td= menu_item.name
+          %td= menu_item.price
+          %td= link_to 'Show', menu_item
+          %td= link_to 'Edit', edit_menu_item_path(menu_item)
+          %td= link_to 'Destroy', menu_item, data: { method: :delete }
+
+%br
+
+= link_to 'New Menu item', new_menu_item_path
+
diff --git a/config/routes.rb b/config/routes.rb
@@ -1,56 +1,9 @@
 Makerbistro::Application.routes.draw do
-  # The priority is based upon order of creation: first created -> highest priority.
-  # See how all your routes lay out with "rake routes".
+  resources :menu_items do
+    resources :recipes
+  end
 
-  # You can have the root of your site routed with "root"
-  # root 'welcome#index'
+  resources :ingredients, only: [:show]
 
-  # Example of regular route:
-  #   get 'products/:id' => 'catalog#view'
-
-  # Example of named route that can be invoked with purchase_url(id: product.id)
-  #   get 'products/:id/purchase' => 'catalog#purchase', as: :purchase
-
-  # Example resource route (maps HTTP verbs to controller actions automatically):
-  #   resources :products
-
-  # Example resource route with options:
-  #   resources :products do
-  #     member do
-  #       get 'short'
-  #       post 'toggle'
-  #     end
-  #
-  #     collection do
-  #       get 'sold'
-  #     end
-  #   end
-
-  # Example resource route with sub-resources:
-  #   resources :products do
-  #     resources :comments, :sales
-  #     resource :seller
-  #   end
-
-  # Example resource route with more complex sub-resources:
-  #   resources :products do
-  #     resources :comments
-  #     resources :sales do
-  #       get 'recent', on: :collection
-  #     end
-  #   end
-
-  # Example resource route with concerns:
-  #   concern :toggleable do
-  #     post 'toggle'
-  #   end
-  #   resources :posts, concerns: :toggleable
-  #   resources :photos, concerns: :toggleable
-
-  # Example resource route within a namespace:
-  #   namespace :admin do
-  #     # Directs /admin/products/* to Admin::ProductsController
-  #     # (app/controllers/admin/products_controller.rb)
-  #     resources :products
-  #   end
+  root 'menu_items#index'
 end
diff --git a/db/migrate/20131010155724_create_menu_items.rb b/db/migrate/20131010155724_create_menu_items.rb
@@ -2,6 +2,7 @@ class CreateMenuItems < ActiveRecord::Migration
   def change
     create_table :menu_items do |t|
       t.string :name
+      t.string :price
       t.timestamps
     end
   end

diff --git a/db/migrate/20131011162357_create_recipes.rb b/db/migrate/20131011162357_create_recipes.rb
@@ -0,0 +1,10 @@
+class CreateRecipes < ActiveRecord::Migration
+  def change
+    create_table :recipes do |t|
+      t.references :menu_item
+      t.references :ingredient
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20131011162407_create_ingredients.rb b/db/migrate/20131011162407_create_ingredients.rb
@@ -0,0 +1,9 @@
+ class CreateIngredients < ActiveRecord::Migration
+  def change
+    create_table :ingredients do |t|
+      t.string :name
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -0,0 +1,36 @@
+# 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.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 20131011162407) do
+
+  create_table "ingredients", force: true do |t|
+    t.string   "name"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "menu_items", force: true do |t|
+    t.string   "name"
+    t.string   "price"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "recipes", force: true do |t|
+    t.integer  "menu_item_id"
+    t.integer  "ingredient_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+end
diff --git a/public/stitched_wool.png b/public/stitched_wool.png
diff --git a/test/fixtures/ingredients.yml b/test/fixtures/ingredients.yml
@@ -0,0 +1,11 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
+
+# This model initially had no columns defined.  If you add columns to the
+# model remove the '{}' from the fixture names and add the columns immediately
+# below each fixture, per the syntax in the comments below
+#
+one: {}
+# column: value
+#
+two: {}
+#  column: value
diff --git a/test/fixtures/recipes.yml b/test/fixtures/recipes.yml
@@ -0,0 +1,11 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
+
+# This model initially had no columns defined.  If you add columns to the
+# model remove the '{}' from the fixture names and add the columns immediately
+# below each fixture, per the syntax in the comments below
+#
+one: {}
+# column: value
+#
+two: {}
+#  column: value
diff --git a/test/models/ingredient_test.rb b/test/models/ingredient_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class IngredientTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/models/recipe_test.rb b/test/models/recipe_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class RecipeTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,8 @@ @@
     </head>
     <body>
+    <h1>MAKERSBISTRO</h1>
     <%= yield %>
     </body>
@@ Expand Down @@