Merge pull request chi-otters-2017#35 from chi-otters-2017/ratings_on_recipe_page

yangashley · web-flow · commit bcb1c15a4324 · 2017-01-27T11:59:44.000-06:00
Ratings on recipe page
diff --git a/app/assets/javascripts/rating.js b/app/assets/javascripts/rating.js
@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
@@ -1,4 +1,9 @@
 .container {
+  margin: 5%, auto;
+  padding-bottom: 5%;
+}
+
+.nav {
   margin: 0%, auto;
   font-family: 'Bree Serif', serif;
 }
@@ -7,9 +12,11 @@
   background-color: #A2D5F2;
   border-bottom-radius: 10px;
 }
+
 .nav-link{
   margin-left: 5em;
 }
+
 .nav-link:hover{
   font-size: larger;
   background-color: white;
@@ -40,6 +47,12 @@
 #add-recipe {
   margin-top: 20px;
 }
+
+
+#recipe-rating {
+  margin: 20px 0px;
+}
+
 .title{
   font-family: 'Lobster', cursive;
   font-size: 5em;
diff --git a/app/assets/stylesheets/rating.scss b/app/assets/stylesheets/rating.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the rating controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/controllers/ratings_controller.rb b/app/controllers/ratings_controller.rb
@@ -0,0 +1,28 @@
+class RatingsController < ApplicationController
+  include SessionsHelper
+
+  def create
+    get_recipe
+
+    @rating = @recipe.ratings.new(rating_params)
+    @rating.update_attributes(user_id: current_user.id)
+    if @rating.save
+      flash[:notice] = "Rating has been recorded."
+
+      redirect_to recipe_path(@recipe)
+    else
+      render file: 'public/404.html'
+    end
+  end
+
+
+  private
+
+  def rating_params
+    params.require(:rating).permit(:user_id, :recipe_id, :stars)
+  end
+
+  def get_recipe
+    @recipe ||= Recipe.find_by(id: params[:recipe_id])
+  end
+end
diff --git a/app/controllers/recipes_controller.rb b/app/controllers/recipes_controller.rb
@@ -24,10 +24,10 @@ def create
   def show
     if get_recipe
       if logged_in
-        get_recipe
+        @rating = Rating.new
         render :show
       else
-        render :show
+        render 'general_use_partials/_login_required'
       end
     else
       render file: 'public/404.html'
@@ -77,11 +77,6 @@ def recipe_params
     params.require(:recipe).permit(:title, :category_id, :user_id, :directions, :time, :difficulty)
   end
 
-
-  def get_recipe
-    @recipe ||= Recipe.find_by(id: params[:id])
-  end
-
    def get_category
     @category ||= Category.find_by(id: params[:category_id])
   end
diff --git a/app/helpers/rating_helper.rb b/app/helpers/rating_helper.rb
@@ -0,0 +1,15 @@
+module RatingHelper
+  def recipe_rating(recipe)
+    total = 0
+    recipe.ratings.each do |rating|
+      total += rating.stars
+    end
+    average = (total.to_f / recipe.ratings.count.to_f).round(2)
+  end
+
+  def already_rated?(recipe)
+    !!recipe.ratings.find_by(user_id: current_user.id)
+  end
+
+
+end
diff --git a/app/helpers/recipes_helper.rb b/app/helpers/recipes_helper.rb
@@ -16,4 +16,13 @@ def recipe_owner?(recipe)
     session[:user_id] == recipe.user_id
   end
 
+
+  def get_recipe
+    @recipe ||= Recipe.find_by(id: params[:id])
+  end
+
+  def already_rated?(recipe)
+    !!recipe.ratings.find_by(user_id: current_user.id)
+  end
+
 end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -13,7 +13,7 @@
 
   <body>
 
-    <div id="nav-bar" class='container'>
+    <div id="nav-bar" class='nav'>
       <span class='nav-link'>
       <% if !!logged_in %>
         <% if admin? %>
diff --git a/app/views/rating/edit.html.erb b/app/views/rating/edit.html.erb
@@ -0,0 +1,2 @@
+<h1>Rating#edit</h1>
+<p>Find me in app/views/rating/edit.html.erb</p>
diff --git a/app/views/recipes/edit.html.erb b/app/views/recipes/edit.html.erb
@@ -1,27 +1,28 @@
-<h1>Edit Recipe</h1>
+<article class='container'><h1>Edit Recipe</h1>
 
-<strong><p class='alert'><%= flash.alert %></p></strong>
-<% if @recipe.errors.any? %>
-  <% @recipe.errors.full_messages.each do |error| %>
-  <li class='error'><%= error %></li>
+  <strong><p class='alert'><%= flash.alert %></p></strong>
+  <% if @recipe.errors.any? %>
+    <% @recipe.errors.full_messages.each do |error| %>
+    <li class='error'><%= error %></li>
+    <% end %>
   <% end %>
-<% end %>
 
-<%= form_for @recipe, url: category_recipe_path do |f| %>
+  <%= form_for @recipe, url: category_recipe_path do |f| %>
 
-<p><%= f.label :title %></p>
-<p><%= f.text_field :title %></p>
+  <p><%= f.label :title %></p>
+  <p><%= f.text_field :title %></p>
 
-<p><%= f.label :directions %></p>
-<p><%= f.text_area :directions %></p>
+  <p><%= f.label :directions %></p>
+  <p><%= f.text_area :directions %></p>
 
-<p><%= f.label :time %></p>
-<span><%= f.text_field :time %></span>
-<span><%= f.label "in minutes" %></span>
+  <p><%= f.label :time %></p>
+  <span><%= f.text_field :time %></span>
+  <span><%= f.label "in minutes" %></span>
 
-<p><%= f.label :difficulty %></p>
-<p><%= f.select :difficulty, options_for_select([['easy', 'easy'], ['medium', 'medium'], ['hard', 'hard']], selected: params[:difficulty]) %></p><br>
+  <p><%= f.label :difficulty %></p>
+  <p><%= f.select :difficulty, options_for_select([['easy', 'easy'], ['medium', 'medium'], ['hard', 'hard']], selected: params[:difficulty]) %></p><br>
 
-<%= f.submit %>
-<% end %>
+  <%= f.submit %>
+  <% end %>
 
+</article>
diff --git a/app/views/recipes/show.html.erb b/app/views/recipes/show.html.erb
@@ -32,7 +32,24 @@
     <p>Difficulty: <%= @recipe.difficulty %></p>
     <p>Directions: <%= @recipe.directions %></p>
 
+    <p><%= flash.notice %></p>
+
+    <b><p>Rating: </p></b>
+    <% if @recipe.ratings.any? %>
+      <p id='recipe-rating'><%= recipe_rating(@recipe) %></p><br><br>
+    <% else %>
+      <p>Not yet rated.</p>
+    <% end %>
+    <% if !already_rated?(@recipe) %>
+      <%= form_for @rating, url: recipe_ratings_path(@recipe) do |f| %>
+
+      <p><%= f.select :stars, options_for_select([['1 STAR', 1.00], ['2 STAR', 2.00], ['3 STAR', 3.00], ['4 STAR', 4.00], ['5 STAR', 5.00]]) %></p><br>
+      <%= f.submit "Submit Rating" %>
+      <% end %>
+    <% end %>
+
     <% if recipe_owner?(@recipe) || admin? %>
+
       <%= link_to "Edit", edit_category_recipe_path(@recipe.category, @recipe) %><br>
       <%= link_to 'Delete', category_recipe_path(@recipe.category, @recipe), method: :delete %>
       <% end %>
diff --git a/config/routes.rb b/config/routes.rb
@@ -1,4 +1,9 @@
 Rails.application.routes.draw do
+
+  # post 'rating', to: 'ratings#create'
+
+  # get 'rating/edit'
+
   get 'measures/new'
 
   root 'categories#index'
@@ -18,6 +23,9 @@
 
 
   resources :recipes, only: [:show] do
+    resources :ratings, only: [:create, :edit]
     resources :measures, only: [:new, :create]
   end
+
+
 end
diff --git a/db/seeds.rb b/db/seeds.rb
@@ -45,7 +45,7 @@
   rating_info = {
     recipe_id: (1..20).to_a.sample,
     user_id: (1..10).to_a.sample,
-    stars: (1..5).to_a.sample
+    stars: (1.00..5.00).to_a.sample
   }
 
   Rating.create(rating_info)
diff --git a/spec/controllers/rating_controller_spec.rb b/spec/controllers/rating_controller_spec.rb
@@ -0,0 +1,26 @@
+require 'rails_helper'
+
+RSpec.describe RatingController, type: :controller do
+
+  describe "GET #new" do
+    it "returns http success" do
+      get :new
+      expect(response).to have_http_status(:success)
+    end
+  end
+
+  describe "GET #create" do
+    it "returns http success" do
+      get :create
+      expect(response).to have_http_status(:success)
+    end
+  end
+
+  describe "GET #edit" do
+    it "returns http success" do
+      get :edit
+      expect(response).to have_http_status(:success)
+    end
+  end
+
+end
diff --git a/spec/helpers/rating_helper_spec.rb b/spec/helpers/rating_helper_spec.rb
@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+# Specs in this file have access to a helper object that includes
+# the RatingHelper. For example:
+#
+# describe RatingHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       expect(helper.concat_strings("this","that")).to eq("this that")
+#     end
+#   end
+# end
+RSpec.describe RatingHelper, type: :helper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/rating/create.html.erb_spec.rb b/spec/views/rating/create.html.erb_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe "rating/create.html.erb", type: :view do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/rating/edit.html.erb_spec.rb b/spec/views/rating/edit.html.erb_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe "rating/edit.html.erb", type: :view do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/rating/new.html.erb_spec.rb b/spec/views/rating/new.html.erb_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe "rating/new.html.erb", type: :view do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+// Place all the behaviors and hooks related to the matching controller here.`
	`2`	`+// All this logic will automatically be available in application.js.`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+// Place all the styles related to the rating controller here.`
	`2`	`+// They will automatically be included in application.css.`
	`3`	`+// You can use Sass (SCSS) here: http://sass-lang.com/`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+<h1>Rating#edit</h1>`
	`2`	`+<p>Find me in app/views/rating/edit.html.erb</p>`