Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Media Ranker Project #49

Open
wants to merge 30 commits into
base: th/master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
dbd1e17
made 3 models - book, movie, album
TammyHer Nov 30, 2015
f2135a6
created 4 new controller - 1 for welcome
TammyHer Nov 30, 2015
ab36e37
made home page
TammyHer Nov 30, 2015
61e4358
made routes and actions in the controllers
TammyHer Nov 30, 2015
61e33ff
created some seed
TammyHer Nov 30, 2015
aa71225
i MADE AN EDIT BUTTON
TammyHer Nov 30, 2015
72475cf
made new links for albums
TammyHer Dec 1, 2015
998cc26
the upvote is working... whhhhoooo
TammyHer Dec 1, 2015
b11a522
made an index page for albums
TammyHer Dec 1, 2015
da7e1e1
completed views and controller for movies (exapt delete)
TammyHer Dec 1, 2015
babed91
completed 3 models most view and controllers
TammyHer Dec 1, 2015
e68f880
made link to movie's name
TammyHer Dec 1, 2015
c64fc6a
fixed some bugs in the indexes
TammyHer Dec 1, 2015
93dfe18
made an if statement so the upvote will work in both different pages
TammyHer Dec 1, 2015
9beadeb
all deleting are working
TammyHer Dec 1, 2015
993546e
set a default rank=0, and made the validations and display the user i…
TammyHer Dec 1, 2015
f079caa
fixed some bugs - ready for testing
TammyHer Dec 1, 2015
0a98e48
got all my test to work in movies controller
TammyHer Dec 2, 2015
aad7dbb
made most of the test- include upvote
TammyHer Dec 2, 2015
4371636
upvote_i works in movies
TammyHer Dec 2, 2015
e66d3a9
only one more test and I'm good to go
TammyHer Dec 2, 2015
3d33ca3
yay got 91%. I'm good to go
TammyHer Dec 2, 2015
e22e549
did some nice bootstrap - table and index
TammyHer Dec 2, 2015
6de9d81
added some more bootstrap - DELETE button and nice table
TammyHer Dec 3, 2015
563a06d
I put the buttons in the same line as BUTTON and not link_to
TammyHer Dec 3, 2015
166ea54
bootstrap and hello kitty
TammyHer Dec 3, 2015
4050037
i think I'm done. now needs to dry things
TammyHer Dec 3, 2015
04ecc23
made list of 10 from each on the home page
TammyHer Dec 3, 2015
54cbacc
done
TammyHer Dec 4, 2015
fedf322
final stuff
TammyHer Dec 5, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
made link to movie's name
TammyHer committed Dec 1, 2015
commit e68f8806cc7e7b07f39e4d5b8e549a4093a4818a
2 changes: 2 additions & 0 deletions .rspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
--color
--require spec_helper
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -41,6 +41,7 @@ group :development do
# Access an IRB console on exception pages or by using <%= console %> in views
gem 'web-console', '~> 2.0'
gem 'better_errors'
gem 'rspec-rails'

# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
19 changes: 19 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -54,6 +54,7 @@ GEM
execjs
coffee-script-source (1.10.0)
debug_inspector (0.0.2)
diff-lcs (1.2.5)
erubis (2.7.0)
execjs (2.6.0)
globalid (0.3.6)
@@ -106,6 +107,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)
@@ -150,6 +168,7 @@ DEPENDENCIES
jbuilder (~> 2.0)
jquery-rails
rails (= 4.2.5)
rspec-rails
sass-rails (~> 5.0)
sdoc (~> 0.4.0)
spring
3 changes: 2 additions & 1 deletion app/controllers/albums_controller.rb
Original file line number Diff line number Diff line change
@@ -35,7 +35,8 @@ def update


def create

Album.create(album_params[:album])
redirect_to show_path
end

def destroy
2 changes: 2 additions & 0 deletions app/controllers/books_controller.rb
Original file line number Diff line number Diff line change
@@ -34,6 +34,8 @@ def update
end

def create
Book.create(book[:book])
redirect_to show_path
end

def destroy
2 changes: 2 additions & 0 deletions app/controllers/movies_controller.rb
Original file line number Diff line number Diff line change
@@ -34,6 +34,8 @@ def update
end

def create
movie.create(movie_params[:movie])
redirect_to show_path
end

def destroy
1 change: 1 addition & 0 deletions app/models/album.rb
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
class Album < ActiveRecord::Base
validates :name, presence: true

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good job doubling up on your validations (model and form). It's a good habit to have

end
1 change: 1 addition & 0 deletions app/models/book.rb
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
class Book < ActiveRecord::Base
validates :name, presence: true
end
1 change: 1 addition & 0 deletions app/models/movie.rb
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
class Movie < ActiveRecord::Base
validates :name, presence: true
end
2 changes: 1 addition & 1 deletion app/views/movies/index.html.erb
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<% @movies.each do |movie| %>
<tr>
<td>Ranked: <%= movie.rank %> </td>
<td> <%= movie.name %> </td>
<td> <%= link_to movie.name, movie_path(movie.id) %> </td>
<td> <%= button_to "Upvote", { action: "update" , class: "upvote", id: movie.id}, method: "patch" %> </td>
</tr>
<% end %>
2 changes: 1 addition & 1 deletion app/views/movies/show.html.erb
Original file line number Diff line number Diff line change
@@ -5,5 +5,5 @@
<%= button_to "Upvote", { action: "update" , class: "upvote"}, method: "patch"%>
<%= button_to "Edit", { action: "edit", id: @movie.id }, method: :get %>
<%= button_to "Delete", action: "destroy", id: @movie.id %>
<%= button_to "View all movies", albums_path, method: :get%>
<%= button_to "View all movies", movies_path, method: :get%>
<%= button_to "View all media", root_path, method: :get %>
10 changes: 10 additions & 0 deletions spec/controllers/albums_controller_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
require 'rails_helper'

RSpec.describe AlbumsController, type: :controller do
describe "GET 'index'" do
it "is successful" do
get :index
expect(response.status).to eq 200
end
end
end
10 changes: 10 additions & 0 deletions spec/controllers/books_controller_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
require 'rails_helper'

RSpec.describe BooksController, type: :controller do
describe "GET 'index'" do
it "is successful" do
get :index
expect(response.status).to eq 200
end
end
end
10 changes: 10 additions & 0 deletions spec/controllers/movies_controller_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
require 'rails_helper'

RSpec.describe MoviesController, type: :controller do
describe "GET 'index'" do
it "is successful" do
get :index
expect(response.status).to eq 200
end
end
end
15 changes: 15 additions & 0 deletions spec/helpers/albums_helper_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
require 'rails_helper'

# Specs in this file have access to a helper object that includes
# the PostsHelper. For example:
#
# describe PostsHelper 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 AlbumsHelper, type: :helper do
# pending "add some examples to (or delete) #{__FILE__}"
end
15 changes: 15 additions & 0 deletions spec/helpers/books_helper_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
require 'rails_helper'

# Specs in this file have access to a helper object that includes
# the PostsHelper. For example:
#
# describe PostsHelper 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 BooksHelper, type: :helper do
# pending "add some examples to (or delete) #{__FILE__}"
end
15 changes: 15 additions & 0 deletions spec/helpers/movies_helper_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
require 'rails_helper'

# Specs in this file have access to a helper object that includes
# the PostsHelper. For example:
#
# describe PostsHelper 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 MoviesHelper, type: :helper do
# pending "add some examples to (or delete) #{__FILE__}"
end
23 changes: 23 additions & 0 deletions spec/models/album_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
require 'rails_helper'

RSpec.describe Album, type: :model do
describe ".validates" do
it "must have a name" do
expect(Album.new(name: nil)).to_not be_valid
end
end

# it "can't have 141 characters" do
# expect(Post.new(bod: "a" * 141)).to be_invalid
# end
#
# it "can have 140 characters" do
# expect(Post.new(bod: "a" * 140)).to be_valid
# end
# end
#
# it "count it's characters" do
# expect(Post.new(bod: "b" * 122).characters_count).to eq 122
# end

end
23 changes: 23 additions & 0 deletions spec/models/book_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
require 'rails_helper'

RSpec.describe Book, type: :model do
describe ".validates" do
it "must have a name" do
expect(Book.new(name: nil)).to_not be_valid
end
end

# it "can't have 141 characters" do
# expect(Post.new(bod: "a" * 141)).to be_invalid
# end
#
# it "can have 140 characters" do
# expect(Post.new(bod: "a" * 140)).to be_valid
# end
# end
#
# it "count it's characters" do
# expect(Post.new(bod: "b" * 122).characters_count).to eq 122
# end

end
22 changes: 22 additions & 0 deletions spec/models/movie_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
require 'rails_helper'

RSpec.describe Movie, type: :model do
describe ".validates" do
it "must have a name" do
expect(Movie.new(name: nil)).to_not be_valid
end
end

# it "can't have 141 characters" do
# expect(Post.new(bod: "a" * 141)).to be_invalid
# end
#
# it "can have 140 characters" do
# expect(Post.new(bod: "a" * 140)).to be_valid
# end
# end
#
# it "count it's characters" do
# expect(Post.new(bod: "b" * 122).characters_count).to eq 122
# end
end
57 changes: 57 additions & 0 deletions spec/rails_helper.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
# This file is copied to spec/ when you run 'rails generate rspec:install'
ENV['RAILS_ENV'] ||= 'test'
require File.expand_path('../../config/environment', __FILE__)
# Prevent database truncation if the environment is production
abort("The Rails environment is running in production mode!") if Rails.env.production?
require 'spec_helper'
require 'rspec/rails'
# Add additional requires below this line. Rails is not loaded until this point!

# Requires supporting ruby files with custom matchers and macros, etc, in
# spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
# run as spec files by default. This means that files in spec/support that end
# in _spec.rb will both be required and run as specs, causing the specs to be
# run twice. It is recommended that you do not name files matching this glob to
# end with _spec.rb. You can configure this pattern with the --pattern
# option on the command line or in ~/.rspec, .rspec or `.rspec-local`.
#
# The following line is provided for convenience purposes. It has the downside
# of increasing the boot-up time by auto-requiring all files in the support
# directory. Alternatively, in the individual `*_spec.rb` files, manually
# require only the support files necessary.
#
# Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }

# Checks for pending migration and applies them before tests are run.
# If you are not using ActiveRecord, you can remove this line.
ActiveRecord::Migration.maintain_test_schema!

RSpec.configure do |config|
# Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
config.fixture_path = "#{::Rails.root}/spec/fixtures"

# If you're not using ActiveRecord, or you'd prefer not to run each of your
# examples within a transaction, remove the following line or assign false
# instead of true.
config.use_transactional_fixtures = true

# RSpec Rails can automatically mix in different behaviours to your tests
# based on their file location, for example enabling you to call `get` and
# `post` in specs under `spec/controllers`.
#
# You can disable this behaviour by removing the line below, and instead
# explicitly tag your specs with their type, e.g.:
#
# RSpec.describe UsersController, :type => :controller do
# # ...
# end
#
# The different available types are documented in the features, such as in
# https://relishapp.com/rspec/rspec-rails/docs
config.infer_spec_type_from_file_location!

# Filter lines from Rails gems in backtraces.
config.filter_rails_from_backtrace!
# arbitrary gems may also be filtered via:
# config.filter_gems_from_backtrace("gem name")
end
92 changes: 92 additions & 0 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
# This file was generated by the `rails generate rspec:install` command. Conventionally, all
# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
# The generated `.rspec` file contains `--require spec_helper` which will cause
# this file to always be loaded, without a need to explicitly require it in any
# files.
#
# Given that it is always loaded, you are encouraged to keep this file as
# light-weight as possible. Requiring heavyweight dependencies from this file
# will add to the boot time of your test suite on EVERY test run, even for an
# individual file that may not need all of that loaded. Instead, consider making
# a separate helper file that requires the additional dependencies and performs
# the additional setup, and require it from the spec files that actually need
# it.
#
# The `.rspec` file also contains a few flags that are not defaults but that
# users commonly want.
#
# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
RSpec.configure do |config|
# rspec-expectations config goes here. You can use an alternate
# assertion/expectation library such as wrong or the stdlib/minitest
# assertions if you prefer.
config.expect_with :rspec do |expectations|
# This option will default to `true` in RSpec 4. It makes the `description`
# and `failure_message` of custom matchers include text for helper methods
# defined using `chain`, e.g.:
# be_bigger_than(2).and_smaller_than(4).description
# # => "be bigger than 2 and smaller than 4"
# ...rather than:
# # => "be bigger than 2"
expectations.include_chain_clauses_in_custom_matcher_descriptions = true
end

# rspec-mocks config goes here. You can use an alternate test double
# library (such as bogus or mocha) by changing the `mock_with` option here.
config.mock_with :rspec do |mocks|
# Prevents you from mocking or stubbing a method that does not exist on
# a real object. This is generally recommended, and will default to
# `true` in RSpec 4.
mocks.verify_partial_doubles = true
end

# The settings below are suggested to provide a good initial experience
# with RSpec, but feel free to customize to your heart's content.
=begin
# These two settings work together to allow you to limit a spec run
# to individual examples or groups you care about by tagging them with
# `:focus` metadata. When nothing is tagged with `:focus`, all examples
# get run.
config.filter_run :focus
config.run_all_when_everything_filtered = true
# Allows RSpec to persist some state between runs in order to support
# the `--only-failures` and `--next-failure` CLI options. We recommend
# you configure your source control system to ignore this file.
config.example_status_persistence_file_path = "spec/examples.txt"
# Limits the available syntax to the non-monkey patched syntax that is
# recommended. For more details, see:
# - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
# - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
# - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
config.disable_monkey_patching!
# Many RSpec users commonly either run the entire suite or an individual
# file, and it's useful to allow more verbose output when running an
# individual spec file.
if config.files_to_run.one?
# Use the documentation formatter for detailed output,
# unless a formatter has already been configured
# (e.g. via a command-line flag).
config.default_formatter = 'doc'
end
# Print the 10 slowest examples and example groups at the
# end of the spec run, to help surface which specs are running
# particularly slow.
config.profile_examples = 10
# Run specs in random order to surface order dependencies. If you find an
# order dependency and want to debug it, you can fix the order by providing
# the seed, which is printed after each run.
# --seed 1234
config.order = :random
# Seed global randomization in this process using the `--seed` CLI option.
# Setting this allows you to use `--seed` to deterministically reproduce
# test failures related to randomization by passing the same `--seed` value
# as the one that triggered the failure.
Kernel.srand config.seed
=end
end