added notes

Gemfile

@@ -6,6 +6,8 @@ gem 'pg', '~> 0.18.4'
 gem 'sass-rails', '~> 5.0'
 gem 'uglifier', '>= 1.3.0'
 
+gem 'puma'
+
 # See https://github.com/rails/execjs#readme for more supported runtimes
 gem 'therubyracer', platforms: :ruby
 
@@ -27,6 +29,7 @@ group :development, :test do
   gem 'guard', '~> 2.14.0'
   gem 'guard-rspec', require: false
   gem 'rspec-rails', '~> 3.5.0'
+  gem 'rails-controller-testing'
   gem 'factory_girl_rails', '~> 4.7.0'
   gem 'database_cleaner', '~> 1.5.3'
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console

Gemfile.lock

@@ -126,6 +126,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
+    puma (3.6.0)
     rack (2.0.1)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -141,6 +142,10 @@ GEM
       bundler (>= 1.3.0, < 2.0)
       railties (= 5.0.0)
       sprockets-rails (>= 2.0.0)
+    rails-controller-testing (1.0.1)
+      actionpack (~> 5.x)
+      actionview (~> 5.x)
+      activesupport (~> 5.x)
     rails-dom-testing (2.0.1)
       activesupport (>= 4.2.0, < 6.0)
       nokogiri (~> 1.6.0)
@@ -240,7 +245,9 @@ DEPENDENCIES
   jquery-rails (~> 4.1.1)
   kaminari (~> 0.17.0)
   pg (~> 0.18.4)
+  puma
   rails (= 5.0.0)
+  rails-controller-testing
   rspec-rails (~> 3.5.0)
   sass-rails (~> 5.0)
   sqlite3

app/controllers/notes_controller.rb

@@ -0,0 +1,82 @@
+class NotesController < ApplicationController
+  before_action :set_note, only: [:show, :edit, :update, :destroy]
+  before_action :ensure_valid_user
+
+  # GET /notes
+  # GET /notes.json
+  def index
+    @notes = Note.for_user(current_user)
+  end
+
+  # GET /notes/1
+  # GET /notes/1.json
+  def show
+    ensure_owner(@note)
+  end
+
+  # GET /notes/new
+  def new
+    @note = Note.new
+  end
+
+  # GET /notes/1/edit
+  def edit
+    ensure_owner(@note)
+  end
+
+  # POST /notes
+  # POST /notes.json
+  def create
+    @note = Note.new(note_params)
+    @note.user = current_user
+
+    respond_to do |format|
+      if @note.save
+        format.html { redirect_to notes_path, notice: 'Note was successfully created.' }
+        format.json { render :show, status: :created, location: @note }
+      else
+        format.html { render :new }
+        format.json { render json: @note.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PATCH/PUT /notes/1
+  # PATCH/PUT /notes/1.json
+  def update
+    ensure_owner(@note) do
+      respond_to do |format|
+        if @note.update(note_params)
+          format.html { redirect_to notes_path, notice: 'Note was successfully updated.' }
+          format.json { render :show, status: :ok, location: @note }
+        else
+          format.html { render :edit }
+          format.json { render json: @note.errors, status: :unprocessable_entity }
+        end
+      end
+    end
+  end
+
+  # DELETE /notes/1
+  # DELETE /notes/1.json
+  def destroy
+    ensure_owner(@note) do
+      @note.destroy
+      respond_to do |format|
+        format.html { redirect_to notes_url, notice: 'Note was successfully destroyed.' }
+        format.json { head :no_content }
+      end
+    end
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_note
+      @note = Note.find(params[:id])
+    end
+
+    # Never trust parameters from the scary internet, only allow the white list through.
+    def note_params
+      params.require(:note).permit(:user_id, :content)
+    end
+end

app/decorators/note_decorator.rb

@@ -0,0 +1,12 @@
+class NoteDecorator < BaseDecorator
+
+  def date
+    v = super
+    if v && v.respond_to?(:strftime)
+      v.strftime("%Y-%m-%d")
+    else
+      v
+    end
+  end
+
+end

app/helpers/application_helper.rb

@@ -26,6 +26,10 @@ module ApplicationHelper
         nav_item('About', about_path, 'home')
     ]
 
+    if current_user
+      nav << nav_item('Notes', notes_path, 'notes')
+    end
+
     if current_user && current_user.admin?
       nav << nav_item('Admin', admin_users_path, 'admin/users')
     end

app/models/application_record.rb

@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end

app/models/ingredient.rb

@@ -1,4 +1,4 @@
-class Ingredient < ActiveRecord::Base
+class Ingredient < ApplicationRecord
   include TokenizedLike
 
   belongs_to :user

app/models/ingredient_unit.rb

@@ -1,4 +1,4 @@
-class IngredientUnit < ActiveRecord::Base
+class IngredientUnit < ApplicationRecord
   belongs_to :ingredient, inverse_of: :ingredient_units
 
   validates :name, presence: true

app/models/log.rb

@@ -1,4 +1,4 @@
-class Log < ActiveRecord::Base
+class Log < ApplicationRecord
 
   belongs_to :recipe
   belongs_to :source_recipe, class_name: 'Recipe'

app/models/note.rb

@@ -0,0 +1,10 @@
+class Note < ApplicationRecord
+
+  belongs_to :user
+
+  scope :for_user, ->(user) { where(user_id: user) }
+
+  validates :user_id, presence: true
+  validates :content, presence: true
+
+end

app/models/recipe.rb

@@ -1,4 +1,4 @@
-class Recipe < ActiveRecord::Base
+class Recipe < ApplicationRecord
 
   has_many :recipe_ingredients, -> { order :sort_order }, inverse_of: :recipe, dependent: :destroy
   has_many :recipe_steps, -> { order :sort_order }, inverse_of: :recipe, dependent: :destroy

app/models/recipe_ingredient.rb

@@ -1,4 +1,4 @@
-class RecipeIngredient < ActiveRecord::Base
+class RecipeIngredient < ApplicationRecord
 
   belongs_to :ingredient
   belongs_to :recipe, inverse_of: :recipe_ingredients

app/models/recipe_step.rb

@@ -1,4 +1,4 @@
-class RecipeStep < ActiveRecord::Base
+class RecipeStep < ApplicationRecord
 
   belongs_to :recipe, inverse_of: :recipe_steps
 

app/models/usda_food.rb

@@ -1,4 +1,4 @@
-class UsdaFood < ActiveRecord::Base
+class UsdaFood < ApplicationRecord
   include TokenizedLike
 
   has_many :usda_food_weights

app/models/usda_food_weight.rb

@@ -1,4 +1,4 @@
-class UsdaFoodWeight < ActiveRecord::Base
+class UsdaFoodWeight < ApplicationRecord
 
   belongs_to :usda_food
 

app/models/user.rb

@@ -1,4 +1,4 @@
-class User < ActiveRecord::Base
+class User < ApplicationRecord
 
   has_many :recipes, dependent: :nullify
   has_many :ingredients, dependent: :nullify

app/views/notes/_form.html.erb

@@ -0,0 +1,13 @@
+<%= form_for(note) do |f| %>
+  <%= render partial: 'shared/error_list', locals: {model: @note} %>
+
+  <div class="form-group">
+    <%= f.label :content, 'Note', class: 'control-label' %>
+    <%= f.text_field :content, class: 'form-control' %>
+  </div>
+
+  <div class="actions">
+    <%= f.submit class: 'btn btn-primary' %>
+    <%= link_to 'Back', notes_path, class: 'btn btn-default' %>
+  </div>
+<% end %>

app/views/notes/_note.json.jbuilder

@@ -0,0 +1,2 @@
+json.extract! note, :id, :content, :created_at
+json.url note_url(note, format: :json)

app/views/notes/edit.html.erb

@@ -0,0 +1,11 @@
+<div class="row">
+  <div class="col-xs-12">
+    <div class="page-header">
+      <h1>Edit Note</h1>
+    </div>
+
+    <%= render 'form', note: @note %>
+
+  </div>
+</div>
+

app/views/notes/index.html.erb

@@ -0,0 +1,47 @@
+<div class="row">
+  <div class="col-xs-12">
+    <div class="page-header">
+      <h1>Notes</h1>
+    </div>
+
+    <% if @notes.empty? %>
+        <p>No Notes</p>
+    <% else %>
+
+        <%= link_to 'New Note', new_note_path, class: 'btn btn-default' %>
+
+        <br/>
+
+        <table class="table table-condensed table-hover">
+          <thead>
+          <tr>
+            <th>Note</th>
+            <th>Date</th>
+            <th></th>
+          </tr>
+          </thead>
+
+          <tbody>
+          <% decorate(@notes, NoteDecorator).each do |note| %>
+              <tr>
+                <td><%= note.content %></td>
+                <td><%= note.created_at %></td>
+                <td>
+                  <%= link_to note, method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-xs btn-danger' do %>
+                      <span class="glyphicon glyphicon-remove"></span>
+                  <% end %>
+                </td>
+              </tr>
+          <% end %>
+          </tbody>
+        </table>
+    <% end %>
+
+    <br/>
+
+    <%= link_to 'New Note', new_note_path, class: 'btn btn-default' %>
+
+
+  </div>
+</div>
+

app/views/notes/index.json.jbuilder

@@ -0,0 +1 @@
+json.array! @notes, partial: 'notes/note', as: :note

app/views/notes/new.html.erb

@@ -0,0 +1,11 @@
+<div class="row">
+  <div class="col-xs-12">
+    <div class="page-header">
+      <h1>Create Note</h1>
+    </div>
+
+    <%= render 'form', note: @note %>
+
+  </div>
+</div>
+

app/views/notes/show.html.erb

@@ -0,0 +1,15 @@
+<div class="row">
+  <div class="col-xs-12">
+    <div class="page-header">
+      <h1>Note</h1>
+    </div>
+
+    <p>
+      <%= @note.content %>
+    </p>
+
+    <%= link_to 'Back', notes_path, class: 'btn btn-default' %>
+
+  </div>
+</div>
+

app/views/notes/show.json.jbuilder

@@ -0,0 +1 @@
+json.partial! "notes/note", note: @note

config/routes.rb

@@ -1,5 +1,6 @@
 Rails.application.routes.draw do
 
+  resources :notes
   resources :recipes do
     resources :logs, only: [:new, :create]
   end

db/migrate/20160112214203_create_ingredients.rb

@@ -1,4 +1,4 @@
-class CreateIngredients < ActiveRecord::Migration
+class CreateIngredients < ActiveRecord::Migration[4.2]
   def change
     create_table :ingredients do |t|
 

db/migrate/20160112214213_create_recipes.rb

@@ -1,4 +1,4 @@
-class CreateRecipes < ActiveRecord::Migration
+class CreateRecipes < ActiveRecord::Migration[4.2]
   def change
     create_table :recipes do |t|
 

db/migrate/20160112225805_create_recipe_ingredients.rb

@@ -1,4 +1,4 @@
-class CreateRecipeIngredients < ActiveRecord::Migration
+class CreateRecipeIngredients < ActiveRecord::Migration[4.2]
   def change
     create_table :recipe_ingredients do |t|
 

db/migrate/20160113002615_create_recipe_steps.rb

@@ -1,4 +1,4 @@
-class CreateRecipeSteps < ActiveRecord::Migration
+class CreateRecipeSteps < ActiveRecord::Migration[4.2]
   def change
     create_table :recipe_steps do |t|
 

db/migrate/20160119012704_add_deleted_to_recipes.rb

@@ -1,4 +1,4 @@
-class AddDeletedToRecipes < ActiveRecord::Migration
+class AddDeletedToRecipes < ActiveRecord::Migration[4.2]
   def change
     add_column :recipes, :deleted, :boolean
   end

db/migrate/20160119212055_create_users.rb

@@ -1,4 +1,4 @@
-class CreateUsers < ActiveRecord::Migration
+class CreateUsers < ActiveRecord::Migration[4.2]
   def change
     create_table :users do |t|
       t.string :username

db/migrate/20160124212254_create_usda_food.rb

@@ -1,4 +1,4 @@
-class CreateUsdaFood < ActiveRecord::Migration
+class CreateUsdaFood < ActiveRecord::Migration[4.2]
   def change
     create_table :usda_foods do |t|
 

db/migrate/20160124222409_add_ndbn_to_ingredients.rb

@@ -1,4 +1,4 @@
-class AddNdbnToIngredients < ActiveRecord::Migration
+class AddNdbnToIngredients < ActiveRecord::Migration[4.2]
   def change
     change_table :ingredients do |t|
       t.string :ndbn, limit: 5, index: true

db/migrate/20160124231837_add_fields_to_ingredient.rb

@@ -1,4 +1,4 @@
-class AddFieldsToIngredient < ActiveRecord::Migration
+class AddFieldsToIngredient < ActiveRecord::Migration[4.2]
   def change
     change_table :ingredients do |t|
       t.decimal :water, precision: 10, scale: 2

db/migrate/20160130231838_change_ingredients.rb

@@ -1,4 +1,4 @@
-class ChangeIngredients < ActiveRecord::Migration
+class ChangeIngredients < ActiveRecord::Migration[4.2]
   def change
     change_table :recipe_ingredients do |t|
       t.remove :custom_density

db/migrate/20160303180854_add_user_id_to_ingredient.rb

@@ -1,4 +1,4 @@
-class AddUserIdToIngredient < ActiveRecord::Migration
+class AddUserIdToIngredient < ActiveRecord::Migration[4.2]
   def change
     add_column :ingredients, :user_id, :integer
   end

db/migrate/20160309182253_create_usda_food_weights.rb

@@ -1,4 +1,4 @@
-class CreateUsdaFoodWeights < ActiveRecord::Migration
+class CreateUsdaFoodWeights < ActiveRecord::Migration[4.2]
   def change
     create_table :usda_food_weights do |t|
       t.integer :usda_food_id, index: true, null: false

db/migrate/20160311000203_change_amount_column.rb

@@ -1,4 +1,4 @@
-class ChangeAmountColumn < ActiveRecord::Migration
+class ChangeAmountColumn < ActiveRecord::Migration[4.2]
   def change
     change_column :usda_food_weights, :amount, :decimal, precision: 7, scale: 3
   end

db/migrate/20160403205734_change_yields_col.rb

@@ -1,4 +1,4 @@
-class ChangeYieldsCol < ActiveRecord::Migration
+class ChangeYieldsCol < ActiveRecord::Migration[4.2]
   def change
     change_column :recipes, :yields, :string
   end

db/migrate/20160622171944_add_nutrients_to_usda_foods.rb

@@ -1,4 +1,4 @@
-class AddNutrientsToUsdaFoods < ActiveRecord::Migration
+class AddNutrientsToUsdaFoods < ActiveRecord::Migration[4.2]
   def change
     change_table 'usda_foods' do |t|
       t.integer :calcium

db/migrate/20160622180838_add_nutrients_to_ingredients.rb

@@ -1,4 +1,4 @@
-class AddNutrientsToIngredients < ActiveRecord::Migration
+class AddNutrientsToIngredients < ActiveRecord::Migration[4.2]
   def change
     change_table 'ingredients' do |t|
       t.integer :calcium

db/migrate/20160705181132_add_ingredient_units.rb

@@ -1,4 +1,4 @@
-class AddIngredientUnits < ActiveRecord::Migration
+class AddIngredientUnits < ActiveRecord::Migration[4.2]
   def change
     create_table :ingredient_units do |t|
       t.integer :ingredient_id, null: false, index: true

db/migrate/20160707011314_create_logs.rb

@@ -1,4 +1,4 @@
-class CreateLogs < ActiveRecord::Migration
+class CreateLogs < ActiveRecord::Migration[4.2]
   def change
     create_table :logs do |t|
       t.integer :user_id

db/migrate/20161014161544_create_notes.rb

@@ -0,0 +1,10 @@
+class CreateNotes < ActiveRecord::Migration[5.0]
+  def change
+    create_table :notes do |t|
+      t.integer :user_id, null: false, index: true
+      t.text :content, null: false
+
+      t.timestamps
+    end
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160928212209) do
+ActiveRecord::Schema.define(version: 20161014161544) do
 
   create_table "ingredient_units", force: :cascade do |t|
     t.integer "ingredient_id",                          null: false
@@ -65,6 +65,14 @@ ActiveRecord::Schema.define(version: 20160928212209) do
     t.text     "notes"
   end
 
+  create_table "notes", force: :cascade do |t|
+    t.integer  "user_id",    null: false
+    t.text     "content",    null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["user_id"], name: "index_notes_on_user_id"
+  end
+
   create_table "recipe_ingredients", force: :cascade do |t|
     t.integer  "ingredient_id"
     t.integer  "recipe_id"

spec/controllers/notes_controller_spec.rb

@@ -0,0 +1,154 @@
+require 'rails_helper'
+
+RSpec.describe NotesController, type: :controller do
+
+  render_views
+
+  let(:user) {
+    create(:user)
+  }
+
+  let(:valid_attributes) {
+    {content: 'text'}
+  }
+
+  let(:invalid_attributes) {
+    {content: ''}
+  }
+
+  let(:valid_session) { {user_id: user.id} }
+
+  describe "GET #index" do
+    it "assigns all user notes as @notes" do
+      note = create(:note, user: user)
+      create(:note)
+      get :index, params: {}, session: valid_session
+      expect(assigns(:notes)).to eq([note])
+    end
+  end
+
+  describe "GET #show" do
+    it "assigns the requested note as @note" do
+      note = create(:note, user: user)
+      get :show, params: {id: note.to_param}, session: valid_session
+      expect(assigns(:note)).to eq(note)
+    end
+  end
+
+  describe "GET #new" do
+    it "assigns a new note as @note" do
+      get :new, params: {}, session: valid_session
+      expect(assigns(:note)).to be_a_new(Note)
+    end
+  end
+
+  describe "GET #edit" do
+    it "assigns the requested note as @note" do
+      note = create(:note, user: user)
+      get :edit, params: {id: note.to_param}, session: valid_session
+      expect(assigns(:note)).to eq(note)
+    end
+
+    it 'redirects if note is not owned' do
+      note = create(:note)
+      get :edit, params: {id: note.to_param}, session: valid_session
+      expect(response).to redirect_to(root_path)
+    end
+  end
+
+  describe "POST #create" do
+    context "with valid params" do
+      it "creates a new Note" do
+        expect {
+          post :create, params: {note: valid_attributes}, session: valid_session
+        }.to change(Note, :count).by(1)
+      end
+
+      it "assigns a newly created note as @note" do
+        post :create, params: {note: valid_attributes}, session: valid_session
+        expect(assigns(:note)).to be_a(Note)
+        expect(assigns(:note)).to be_persisted
+      end
+
+      it "redirects to the created note" do
+        post :create, params: {note: valid_attributes}, session: valid_session
+        expect(response).to redirect_to(Note.last)
+      end
+    end
+
+    context "with invalid params" do
+      it "assigns a newly created but unsaved note as @note" do
+        post :create, params: {note: invalid_attributes}, session: valid_session
+        expect(assigns(:note)).to be_a_new(Note)
+      end
+
+      it "re-renders the 'new' template" do
+        post :create, params: {note: invalid_attributes}, session: valid_session
+        expect(response).to render_template("new")
+      end
+    end
+  end
+
+  describe "PUT #update" do
+    context "with valid params" do
+      let(:new_attributes) {
+        {content: 'new stuff'}
+      }
+
+      it "updates the requested note" do
+        note = create(:note, user: user)
+        put :update, params: {id: note.to_param, note: new_attributes}, session: valid_session
+        note.reload
+        expect(note.content).to eq 'new stuff'
+      end
+
+      it "assigns the requested note as @note" do
+        note = create(:note, user: user)
+        put :update, params: {id: note.to_param, note: valid_attributes}, session: valid_session
+        expect(assigns(:note)).to eq(note)
+      end
+
+      it "redirects to the note" do
+        note = create(:note, user: user)
+        put :update, params: {id: note.to_param, note: valid_attributes}, session: valid_session
+        expect(response).to redirect_to(note)
+      end
+
+      it 'redirects if note is not owned' do
+        note = create(:note)
+        put :update, params: {id: note.to_param, note: valid_attributes}, session: valid_session
+        expect(response).to redirect_to(root_path)
+      end
+    end
+
+    context "with invalid params" do
+      it "assigns the note as @note" do
+        note = create(:note, user: user)
+        put :update, params: {id: note.to_param, note: invalid_attributes}, session: valid_session
+        expect(assigns(:note)).to eq(note)
+      end
+
+      it "re-renders the 'edit' template" do
+        note = create(:note, user: user)
+        put :update, params: {id: note.to_param, note: invalid_attributes}, session: valid_session
+        expect(response).to render_template("edit")
+      end
+    end
+  end
+
+  describe "DELETE #destroy" do
+    it "destroys the requested note" do
+      note = create(:note, user: user)
+      expect {
+        delete :destroy, params: {id: note.to_param}, session: valid_session
+      }.to change(Note, :count).by(-1)
+    end
+
+    it "redirects to the notes list" do
+      note = create(:note, user: user)
+      delete :destroy, params: {id: note.to_param}, session: valid_session
+      expect(response).to redirect_to(notes_url)
+    end
+  end
+
+end

spec/factories/notes.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :note do
+    user
+    content "MyText"
+  end
+end

spec/models/note_spec.rb

@@ -0,0 +1,4 @@
+require 'rails_helper'
+
+RSpec.describe Note, type: :model do
+end