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

JLN - Project Complete #37

Open
wants to merge 38 commits into
base: jln/master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
0fe6d42
Set up routes
noglows Nov 30, 2015
154571b
Created controllers
noglows Nov 30, 2015
3eaed4d
Generated models
noglows Nov 30, 2015
a40f4d8
Created seed data
noglows Nov 30, 2015
f8bc680
Root route shows all media
noglows Nov 30, 2015
96185c7
/movies page functional
noglows Nov 30, 2015
6580143
Movie details page
noglows Nov 30, 2015
3778de5
Created a partial for show
noglows Nov 30, 2015
e87f17d
Created a partial for the index page
noglows Nov 30, 2015
a1a9828
Added model validation
noglows Nov 30, 2015
bac7ad0
Added ability to delete movies
noglows Nov 30, 2015
1ce0a3b
Can edit a movie
noglows Nov 30, 2015
a7bd36e
Can vote for a movie
noglows Nov 30, 2015
f2b4ebb
Can view all books, add books, edit books, delete books, and vote for…
noglows Nov 30, 2015
a9ec8e7
Everything working for albums
noglows Nov 30, 2015
c41e10f
Fixed a grammatical error
noglows Nov 30, 2015
3638388
Added limits to amount of content shown on root page
noglows Dec 1, 2015
75159ea
Set up rspec files
noglows Dec 1, 2015
10206ea
Wrote some more specs
noglows Dec 1, 2015
8a5dadb
Created a new model method
noglows Dec 1, 2015
1f3268a
Fixed some partials
noglows Dec 1, 2015
764f5bd
Partial fixes and form change
noglows Dec 1, 2015
4c78ba4
Create bug fix
noglows Dec 1, 2015
1522a59
Added more rspec tests and added simplecov to gemfile
noglows Dec 1, 2015
0a92188
Specs added for albums and movies
noglows Dec 2, 2015
e0d89bb
Added polymorphic path to upvote
noglows Dec 2, 2015
16fd820
100% test coverage achieved
noglows Dec 2, 2015
e27c9f4
Fixed a bug where votes gets reset everytime there is an edit
noglows Dec 2, 2015
ecdea13
Initial Bootstrap set-up
noglows Dec 2, 2015
ee47433
Page title correctly styled
noglows Dec 2, 2015
218fb9f
Root route styled correctly
noglows Dec 2, 2015
bd8cd86
Content index page styled
noglows Dec 2, 2015
ef8642d
Form correctly styled
noglows Dec 2, 2015
9b47eaf
Show page correctly styled
noglows Dec 2, 2015
dd7cf4c
Link color was slightly different - fixed
noglows Dec 2, 2015
44c898e
Converted rspec tests to shared examples
noglows Dec 3, 2015
8710224
Tidied up shared specs
noglows Dec 3, 2015
7c4dbd9
Spec cleanup
noglows Dec 3, 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
Added more rspec tests and added simplecov to gemfile
noglows committed Dec 1, 2015
commit 1522a591d47b66af159dcb4882ac25f1aec4227b
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -37,6 +37,7 @@ group :development, :test do
gem 'byebug'

gem 'rspec-rails'
gem 'simplecov', :require => false, :group => :test

# Debugging
gem 'better_errors'
7 changes: 7 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -55,6 +55,7 @@ GEM
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)
@@ -139,6 +140,11 @@ GEM
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
simplecov (0.11.0)
docile (~> 1.1.0)
json (~> 1.8)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
slop (3.6.0)
spring (1.5.0)
sprockets (3.4.1)
@@ -179,6 +185,7 @@ DEPENDENCIES
rspec-rails
sass-rails (~> 5.0)
sdoc (~> 0.4.0)
simplecov
spring
sqlite3
turbolinks
3 changes: 2 additions & 1 deletion app/models/album.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
class Album < ActiveRecord::Base
validates :name, presence:true
validates :votes, presence: true

def self.page_grammer
item_path = "/albums/"
content_type = "Album"
return item_path, content_type
end

end
3 changes: 2 additions & 1 deletion app/models/book.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
class Book < ActiveRecord::Base
validates :name, presence:true
validates :votes, presence:true

def self.page_grammer
item_path = "/books/"
content_type = "Book"
return item_path, content_type
end

end
3 changes: 2 additions & 1 deletion app/models/movie.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
class Movie < ActiveRecord::Base
validates :name, presence:true
validates :votes, presence:true

def self.page_grammer
item_path = "/movies/"
content_type = "Movie"
return item_path, content_type
end

end
5 changes: 5 additions & 0 deletions coverage/.last_run.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"result": {
"covered_percent": 78.52
}
}
Loading