Final Media Ranker PR #33

lindseyreno · 2015-12-18T04:18:06Z

Recommend you add coverage to your .gitignore if you're going to use 'simplecov'

lindseyreno · 2015-12-18T03:46:51Z

Try to keep indentation consistent

lindseyreno · 2015-12-18T03:52:48Z

This is just a style guide (have you covered this?) thing: def show; end looks cleaner.

lindseyreno · 2015-12-18T03:54:13Z

I really like that you made this method private

lindseyreno · 2015-12-18T03:57:03Z

I like that your controllers are really clean and easy to read

lindseyreno · 2015-12-18T04:03:29Z

Have you discovered/learned about scopes yet? This would be good opportunity to check them out. Also recommend using a constant for the 10 here.

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		--color
		--require spec_helper

-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,8 @@ gem 'rails', '4.2.5' @@
     # Use SCSS for stylesheets
     gem 'sass-rails', '~> 5.0'
     # Use Uglifier as compressor for JavaScript assets
+    gem 'bootstrap-sass', '~> 3.3.6'
     gem 'uglifier', '>= 1.3.0'
     # Use CoffeeScript for .coffee assets and views
     gem 'coffee-rails', '~> 4.1.0'
@@ Expand All / @@ -31,9 +33,12 @@ gem 'sdoc', '~> 0.4.0', group: :doc @@
     # Use Capistrano for deployment
     # gem 'capistrano-rails', group: :development
+    gem 'simplecov'
     group :development, :test do
       # Call 'byebug' anywhere in the code to stop execution and get a debugger console
       gem 'byebug'
+      gem 'rspec-rails'
     end
     group :development do
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -37,12 +37,18 @@ GEM @@
           thread_safe (~> 0.3, >= 0.3.4)
           tzinfo (~> 1.1)
         arel (6.0.3)
+        autoprefixer-rails (6.1.2)
+          execjs
+          json
         better_errors (2.1.1)
           coderay (>= 1.0.0)
           erubis (>= 2.6.6)
           rack (>= 0.9.0)
         binding_of_caller (0.7.2)
           debug_inspector (>= 0.0.1)
+        bootstrap-sass (3.3.6)
+          autoprefixer-rails (>= 5.2.1)
+          sass (>= 3.3.4)
         builder (3.2.2)
         byebug (8.2.1)
         coderay (1.1.0)
@@ Expand All / @@ -54,6 +60,8 @@ GEM @@
           execjs
         coffee-script-source (1.10.0)
         debug_inspector (0.0.2)
+        diff-lcs (1.2.5)
+        docile (1.1.5)
         erubis (2.7.0)
         execjs (2.6.0)
         globalid (0.3.6)
@@ Expand Down Expand Up / @@ -107,6 +115,23 @@ GEM @@
           thor (>= 0.18.1, < 2.0)
         rake (10.4.2)
         rdoc (4.2.0)
+        rspec-core (3.4.1)
+          rspec-support (~> 3.4.0)
+        rspec-expectations (3.4.0)
+          diff-lcs (>= 1.2.0, < 2.0)
+          rspec-support (~> 3.4.0)
+        rspec-mocks (3.4.0)
+          diff-lcs (>= 1.2.0, < 2.0)
+          rspec-support (~> 3.4.0)
+        rspec-rails (3.4.0)
+          actionpack (>= 3.0, < 4.3)
+          activesupport (>= 3.0, < 4.3)
+          railties (>= 3.0, < 4.3)
+          rspec-core (~> 3.4.0)
+          rspec-expectations (~> 3.4.0)
+          rspec-mocks (~> 3.4.0)
+          rspec-support (~> 3.4.0)
+        rspec-support (3.4.1)
         sass (3.4.19)
         sass-rails (5.0.4)
           railties (>= 4.0.0, < 5.0)
@@ Expand All / @@ -117,6 +142,11 @@ GEM @@
         sdoc (0.4.1)
           json (~> 1.7, >= 1.7.7)
           rdoc (~> 4.0)
+        simplecov (0.11.1)
+          docile (~> 1.1.0)
+          json (~> 1.8)
+          simplecov-html (~> 0.10.0)
+        simplecov-html (0.10.0)
         spring (1.5.0)
         sprockets (3.4.1)
           rack (> 1, < 3)
@@ Expand Down Expand Up / @@ -147,14 +177,17 @@ PLATFORMS @@
     DEPENDENCIES
       better_errors
       binding_of_caller
+      bootstrap-sass (~> 3.3.6)
       byebug
       coffee-rails (~> 4.1.0)
       jbuilder (~> 2.0)
       jquery-rails
       pg
       rails (= 4.2.5)
+      rspec-rails
       sass-rails (~> 5.0)
       sdoc (~> 0.4.0)
+      simplecov
       spring
       sqlite3
       turbolinks
@@ Expand Down @@

-Original file line number
+Diff line change
@@ -0,0 +1,3 @@
+    # Place all the behaviors and hooks related to the matching controller here.
+    # All this logic will automatically be available in application.js.
+    # You can use CoffeeScript in this file: http://coffeescript.org/

-Original file line number
+Diff line change
@@ Expand Up / @@ -11,6 +11,7 @@ @@
     // about supported directives.
     //
     //= require jquery
+    //= require bootstrap-sprockets
     //= require jquery_ujs
     //= require turbolinks
     //= require_tree .

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Final Media Ranker PR #33

Uh oh!

Diff view

Diff view

There are no files selected for viewing

lindseyreno Dec 18, 2015

Uh oh!

lindseyreno Dec 18, 2015

Uh oh!

lindseyreno Dec 18, 2015

Uh oh!

lindseyreno Dec 18, 2015

Uh oh!

lindseyreno Dec 18, 2015

Uh oh!

lindseyreno Dec 18, 2015

Uh oh!

Uh oh!

-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,30 @@ @@
      * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
      * file per style scope.
      *
-     *= require_tree .
-     *= require_self
      */
+     // "bootstrap-sprockets" must be imported before "bootstrap" and "bootstrap/variables"
+     @import "bootstrap-sprockets";
+     @import "bootstrap";
+     .page-header {
+       background: url(/assets/owl.jpg);
+       background-repeat: no-repeat;
+       padding-bottom: 9px;
+      margin: 40px 0 20px;
+      border-bottom: 1px solid #eee;
+    }
+    .page-header h1 {
+        margin-left: 150px;
+    }
+    a {
+        color: #428bca;
+    }
+    .btn-primary {
+      margin-top: 10px;
+      margin-right: 10px;
+      margin-bottom: 10px;
+    }

-Original file line number
+Diff line change
@@ -0,0 +1,52 @@
+    class AlbumsController < ApplicationController
+      before_action only: [:show, :edit, :update, :upvote] { @album = Album.find(params[:id]) }
+      def index
+        @albums = Album.order(rank: :desc)
+      end
+      def show
+      end
+      def new
+        @album = Album.new
+      end
+      def create
+        @album = Album.create(album_params[:album])
+        if @album.save
+          redirect_to album_path(@album)
+        else
+          render "new"
+        end
+      end
+      def edit
+      end
+      def update
+        @album.update(album_params[:album])
+        if @album.save
+          redirect_to album_path(@album)
+        else
+          render "edit"
+        end
+      end
+      def destroy
+        Album.destroy(params[:id])
+        redirect_to albums_path
+      end
+      def upvote
+        @album.rank += 1
+        @album.save
+        redirect_to album_path(@album.id)
+      end
+      private
+      def album_params
+        params.permit(album: [:name, :artist, :description, :rank])
+      end
+    end

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,5 @@ class ApplicationController < ActionController::Base @@
       # Prevent CSRF attacks by raising an exception.
       # For APIs, you may want to use :null_session instead.
       protect_from_forgery with: :exception
     end

-Original file line number
+Diff line change
@@ -0,0 +1,54 @@
+    class BooksController < ApplicationController
+      before_action only: [:show, :edit, :update, :upvote] { @book = Book.find(params[:id])}
+      def index
+        @books = Book.order(rank: :desc)
+      end
+      def show
+      end
+      def new
+        @book = Book.new
+      end
+      def create
+        @book = Book.create(book_params[:book])
+        if @book.save
+          redirect_to book_path(@book)
+        else
+          render "new"
+        end
+      end
+      def edit
+      end
+      def update
+        @book.update(book_params[:book])
+        if @book.save
+          redirect_to book_path(@book)
+        else
+          render "edit"
+        end
+      end
+      def destroy
+        Book.destroy(params[:id])
+        redirect_to books_path
+      end
+      def upvote
+        @book = Book.find(params[:id])
+        @book.rank += 1
+        @book.save
+        redirect_to book_path(@book)
+      end
+      private
+      def book_params
+        params.permit(book: [:name, :author, :description, :rank])
+      end
+    end

-Original file line number
+Diff line change
@@ -0,0 +1,51 @@
+    class MoviesController < ApplicationController
+      before_action only: [:show, :edit, :update, :upvote] { @movie = Movie.find(params[:id]) }
+      def index
+        @movies = Movie.order(rank: :desc)
+      end
+      def show
+      end
+      def new
+        @movie = Movie.new
+      end
+      def create
+        @movie = Movie.create(movie_params[:movie])
+        if @movie.save
+          redirect_to movie_path(@movie)
+        else
+          render "new"
+        end
+      end
+      def edit
+      end
+      def update
+        @movie.update(movie_params[:movie])
+        if @movie.save
+          redirect_to movie_path(@movie)
+        else
+          render "edit"
+        end
+      end
+      def destroy
+        Movie.destroy(params[:id])
+        redirect_to movies_path
+      end
+      def upvote
+        @movie.rank += 1
+        @movie.save
+        redirect_to movie_path(@movie)
+      end
+      private
+      def movie_params
+        params.permit(movie: [:name, :director, :description, :rank])
+      end
+    end

-Original file line number
+Diff line change
@@ -0,0 +1,7 @@
+    class WelcomeController < ApplicationController
+      def index
+        @movies = Movie.order(rank: :desc).limit(10)
+        @books = Book.order(rank: :desc).limit(10)
+        @albums = Album.order(rank: :desc).limit(10)
+      end
+    end

-Original file line number
+Diff line change
@@ -0,0 +1,10 @@
+    <%= render partial: "application/edit",
+      locals: {
+        media: @album,
+        title: "Album",
+        singular_name: "album",
+        plur_name: "albums",
+        maker: "artist",
+        created_by: "Recorded by:",
+      }
+    %>

Final Media Ranker PR #33

Are you sure you want to change the base?

Uh oh!

Final Media Ranker PR #33

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

lindseyreno Dec 18, 2015

Choose a reason for hiding this comment

Uh oh!

lindseyreno Dec 18, 2015

Choose a reason for hiding this comment

Uh oh!

lindseyreno Dec 18, 2015

Choose a reason for hiding this comment

Uh oh!

lindseyreno Dec 18, 2015

Choose a reason for hiding this comment

Uh oh!

lindseyreno Dec 18, 2015

Choose a reason for hiding this comment

Uh oh!

lindseyreno Dec 18, 2015

Choose a reason for hiding this comment

Uh oh!

Uh oh!