adding Ingredient and StepIngredient models

README.md

@@ -18,3 +18,6 @@
 * ember
 * rubymotion
 * ios
+
+## API
+

app/models/ingredient.rb

@@ -0,0 +1,5 @@
+class Ingredient < ActiveRecord::Base
+  attr_accessible :name, :description
+
+  has_many :step_ingredients
+end

app/models/step_ingredient.rb

@@ -0,0 +1,8 @@
+class StepIngredient < ActiveRecord::Base
+  attr_accessible :volume
+
+  validates_presence_of :step_id, :ingredient_id
+
+  belongs_to :step
+  belongs_to :ingredient
+end

db/migrate/20130301220049_setup_initial_schema.rb

@@ -1,5 +1,4 @@
 class SetupInitialSchema < ActiveRecord::Migration
-
   def change 
     create_table "recipes", :force => true do |t|
       t.string   "name", :null => false
@@ -16,6 +15,20 @@ def change
       t.datetime "created_at", :null => false
       t.datetime "updated_at", :null => false
     end
-  end
 
+    create_table "ingredients", :force => true do |t|
+      t.string "name", :null => false
+      t.string "description"
+      t.datetime "created_at", :null => false
+      t.datetime "updated_at", :null => false
+    end
+
+    create_table "step_ingredients", :force => true do |t|
+      t.integer "step_id", :null => false
+      t.integer "ingredient_id", :null => false
+      t.string "volume"
+      t.datetime "created_at", :null => false
+      t.datetime "updated_at", :null => false
+    end
+  end
 end

db/schema.rb

@@ -13,13 +13,28 @@
 
 ActiveRecord::Schema.define(:version => 20130301220049) do
 
+  create_table "ingredients", :force => true do |t|
+    t.string   "name",        :null => false
+    t.string   "description"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
   create_table "recipes", :force => true do |t|
     t.string   "name",        :null => false
     t.string   "description"
     t.datetime "created_at",  :null => false
     t.datetime "updated_at",  :null => false
   end
 
+  create_table "step_ingredients", :force => true do |t|
+    t.integer  "step_id",       :null => false
+    t.integer  "ingredient_id", :null => false
+    t.string   "volume"
+    t.datetime "created_at",    :null => false
+    t.datetime "updated_at",    :null => false
+  end
+
   create_table "steps", :force => true do |t|
     t.string   "name",                       :null => false
     t.string   "description"

spec/factories/ingredients.rb

@@ -0,0 +1,8 @@
+FactoryGirl.define do
+
+  factory :ingredient do
+    name "Salt"
+    description "It's kind of salty"
+  end
+
+end

spec/factories/step_ingredients.rb

@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :step_ingredient do
+    step
+    ingredient
+    volume "1 piece"
+  end
+end

spec/models/ingredient_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe Ingredient do
+
+  it 'has a valid factory' do
+    FactoryGirl.create(:ingredient).should be_valid
+  end
+
+  it { should have_many(:step_ingredients) }
+
+end

spec/models/step_ingredient_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe StepIngredient do
+
+  it 'has a valid factory' do
+    FactoryGirl.create(:step_ingredient).should be_valid
+  end
+
+  it 'is invalid without a step_id' do
+     FactoryGirl.build(:step_ingredient, step_id: nil).should_not be_valid
+   end
+
+  it 'is invalid without an ingredient_id' do
+    FactoryGirl.build(:step_ingredient, ingredient_id: nil).should_not be_valid
+  end
+
+  it { should belong_to(:step) }
+  it { should belong_to(:ingredient) }
+
+end