| <%= link_to 'Show', menu_item %> | <%= link_to 'Edit', edit_menu_item_path(menu_item) %> | <%= link_to 'Destroy', menu_item, method: :delete, data: { confirm: 'Are you sure?' } %> | +
+
|
<%= notice %>
- -<%= link_to 'Edit', edit_menu_item_path(@menu_item) %> | -<%= link_to 'Back', menu_items_path %> diff --git a/app/views/menu_items/show.html.haml b/app/views/menu_items/show.html.haml new file mode 100644 index 0000000..da01a20 --- /dev/null +++ b/app/views/menu_items/show.html.haml @@ -0,0 +1,12 @@ +%h2= @menu_item.name +%ul + -@menu_item.ingredients.all.each do |ingredient| + %li=ingredient.name + +=simple_form_for @menu_item.ingredients.new do |f| + =f.input :name, placeholder: "new ingredient!", :input_html => {:maxlength => 30, :size => 40} + =f.button :submit + += link_to 'Edit', edit_menu_item_path(@menu_item) +| += link_to 'Back', menu_items_path diff --git a/config/routes.rb b/config/routes.rb index 8320abf..7585cd8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,7 @@ Makerbistro::Application.routes.draw do + resources :menu_items + + post "/menu_items/:id" => "menu_items#show", as: "ingredients" # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". diff --git a/db/migrate/20131011191357_create_recipes.rb b/db/migrate/20131011191357_create_recipes.rb new file mode 100644 index 0000000..9c8e7ac --- /dev/null +++ b/db/migrate/20131011191357_create_recipes.rb @@ -0,0 +1,9 @@ +class CreateRecipes < ActiveRecord::Migration + def change + create_table :recipes do |t| + t.string :name + + t.timestamps + end + end +end diff --git a/db/migrate/20131011191405_create_ingredients.rb b/db/migrate/20131011191405_create_ingredients.rb new file mode 100644 index 0000000..1c22faf --- /dev/null +++ b/db/migrate/20131011191405_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/migrate/20131011191433_add_recipes_ref_menu_item.rb b/db/migrate/20131011191433_add_recipes_ref_menu_item.rb new file mode 100644 index 0000000..041173e --- /dev/null +++ b/db/migrate/20131011191433_add_recipes_ref_menu_item.rb @@ -0,0 +1,6 @@ +class AddRecipesRefMenuItem < ActiveRecord::Migration + def change + add_reference :recipes, :ingredient, index: true + add_reference :recipes, :menu_item, index: true + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000..8c35c4c --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,39 @@ +# 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: 20131011191433) 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.datetime "created_at" + t.datetime "updated_at" + end + + create_table "recipes", force: true do |t| + t.string "name" + t.datetime "created_at" + t.datetime "updated_at" + t.integer "ingredient_id" + t.integer "menu_item_id" + end + + add_index "recipes", ["ingredient_id"], name: "index_recipes_on_ingredient_id" + add_index "recipes", ["menu_item_id"], name: "index_recipes_on_menu_item_id" + +end diff --git a/test/fixtures/ingredients.yml b/test/fixtures/ingredients.yml new file mode 100644 index 0000000..0227c60 --- /dev/null +++ b/test/fixtures/ingredients.yml @@ -0,0 +1,7 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html + +one: + name: MyString + +two: + name: MyString diff --git a/test/fixtures/recipes.yml b/test/fixtures/recipes.yml new file mode 100644 index 0000000..0227c60 --- /dev/null +++ b/test/fixtures/recipes.yml @@ -0,0 +1,7 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html + +one: + name: MyString + +two: + name: MyString diff --git a/test/models/ingredient_test.rb b/test/models/ingredient_test.rb new file mode 100644 index 0000000..511fcf8 --- /dev/null +++ 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 new file mode 100644 index 0000000..5f53f19 --- /dev/null +++ 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