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

VideoStoreAPI - Angela and Maria - Octos #4

Open
wants to merge 60 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
402f194
new rails api run
knockknockhusthere May 7, 2018
c21e04a
zomg it works
knockknockhusthere May 7, 2018
bcb0b77
create movie model
May 7, 2018
5007ca2
create migration - movie
May 7, 2018
d5cd62c
create movies yml and movie_test
May 7, 2018
01aafa4
update schema
May 7, 2018
7b0fee9
created customer model
knockknockhusthere May 7, 2018
2a5406c
added registered date and seeded
knockknockhusthere May 7, 2018
631b813
create join table customersmovies; update schema; update relations
May 7, 2018
ded7ff1
added movies model relation test and renamed join table
knockknockhusthere May 8, 2018
b6bddae
finished movie model relations testing
knockknockhusthere May 8, 2018
92ace8c
movie model validation tests
knockknockhusthere May 8, 2018
953621c
update yml
May 8, 2018
eb53abd
Merge branch 'master' of https://github.com/knockknockhusthere/VideoS…
May 8, 2018
e1dce6a
created routes
knockknockhusthere May 8, 2018
8ad2a07
update ymls again
May 8, 2018
69682e1
Merge branch 'master' of https://github.com/knockknockhusthere/VideoS…
May 8, 2018
f808d1c
create index tests for customers controller
May 8, 2018
e2546ff
add movies controller tests for index method
May 8, 2018
c073879
wrote and tested movie show action
knockknockhusthere May 8, 2018
6969629
wrote and tested show method for movies controller
knockknockhusthere May 8, 2018
481ee1b
add create and movie_params method to movies controller and their tests
May 8, 2018
0b2d4ec
generate rentals controller and model; add check_in check_out to routes
May 8, 2018
2bf87a4
update rental model and controller
May 8, 2018
65aa797
update rental model and controller - again
May 8, 2018
46e84b6
even more rental updates
May 8, 2018
d544069
moved some things into the controller logic
knockknockhusthere May 8, 2018
2b62a26
checkin and checkout routes
knockknockhusthere May 9, 2018
60916cb
fixed movie params to match smoketests
knockknockhusthere May 9, 2018
89dd223
updated rentals checkout method, now working
knockknockhusthere May 9, 2018
dcd3650
add logic to rental controller check_in method
May 9, 2018
dfb482a
added model relations and wrote first test for rental check in
knockknockhusthere May 9, 2018
fea1948
wrote rentals controller check in method tests
knockknockhusthere May 10, 2018
15d66ab
add two tests: won't create a rental when movie_id and customer_id DNE
May 10, 2018
d4ece01
add YML for 'purple' with available_inventory attribute set to nil by…
May 10, 2018
36fff26
add movie model tests for available_inventory, decreasing and increas…
May 10, 2018
fe7f1d5
add available_inventory methods - setting, decreasing, increasing - t…
May 10, 2018
85e3087
update rentals_controller to include available_inventory methods call…
May 10, 2018
16677cc
add miscellaneous comments and TODOs
May 10, 2018
dd1da3b
wrote a check in test
knockknockhusthere May 10, 2018
ebd476a
resolved merge conflicts
knockknockhusthere May 10, 2018
40a1619
resolved merge conflicts
knockknockhusthere May 10, 2018
2c983e8
resolved merge conflicts and syntax errors
knockknockhusthere May 10, 2018
035d824
add simplecov to gemfile; add coverage to .gitignore
May 10, 2018
08d4112
add simplecov to test_helper
May 10, 2018
4b87831
add TODO for setting up and running test for rental model
May 10, 2018
4b6e5b9
modify movies_controller test to include available_inventory attribute
May 10, 2018
48484c7
update movie model and tests; add custom validation and private metho…
May 10, 2018
222719b
resolved merge conflicts
knockknockhusthere May 11, 2018
956fdf6
wrote positive test for rental model, tested available_inventory func…
knockknockhusthere May 11, 2018
1f0870e
skipped tests for old join tables
knockknockhusthere May 11, 2018
96d988d
wrote some validation test stubs for customers
knockknockhusthere May 11, 2018
a898d07
fixed a validation test to instantiate movie with an inventory, and f…
knockknockhusthere May 11, 2018
910170e
fixed some more tests, deleted unnecessary line from movie controller…
knockknockhusthere May 11, 2018
ce4cddb
rewrote relations model tests
knockknockhusthere May 11, 2018
f84ab77
added two validation tests to customer
knockknockhusthere May 11, 2018
db30769
wrote tests for customer check_out_count methods
knockknockhusthere May 11, 2018
92e13e0
wrote validation tests for rentals
knockknockhusthere May 11, 2018
056bb8b
fixed rental controller test, edited rentals controller to pass postm…
knockknockhusthere May 11, 2018
d7d4607
add extra test - invalid if available_inventory is zero or less
May 11, 2018
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
18 changes: 18 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global'

# Ignore bundler config.
/.bundle

# Ignore all logfiles and tempfiles.
/log/*
/tmp/*
!/log/.keep
!/tmp/.keep

.byebug_history

coverage
52 changes: 52 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
source 'https://rubygems.org'

git_source(:github) do |repo_name|
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
"https://github.com/#{repo_name}.git"
end


# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.1.6'
# Use postgresql as the database for Active Record
gem 'pg', '>= 0.18', '< 2.0'
# Use Puma as the app server
gem 'puma', '~> 3.7'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
# gem 'jbuilder', '~> 2.5'
# Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 4.0'
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible
# gem 'rack-cors'

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
end

group :development do
gem 'listen', '>= 3.0.5', '< 3.2'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

group :development, :test do
gem 'pry-rails'
end

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
end

gem 'simplecov', require: false, group: :test
162 changes: 162 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,162 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.1.6)
actionpack (= 5.1.6)
nio4r (~> 2.0)
websocket-driver (~> 0.6.1)
actionmailer (5.1.6)
actionpack (= 5.1.6)
actionview (= 5.1.6)
activejob (= 5.1.6)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.1.6)
actionview (= 5.1.6)
activesupport (= 5.1.6)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.1.6)
activesupport (= 5.1.6)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.1.6)
activesupport (= 5.1.6)
globalid (>= 0.3.6)
activemodel (5.1.6)
activesupport (= 5.1.6)
activerecord (5.1.6)
activemodel (= 5.1.6)
activesupport (= 5.1.6)
arel (~> 8.0)
activesupport (5.1.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
ansi (1.5.0)
arel (8.0.0)
builder (3.2.3)
byebug (10.0.2)
coderay (1.1.2)
concurrent-ruby (1.0.5)
crass (1.0.4)
docile (1.3.0)
erubi (1.7.1)
ffi (1.9.23)
globalid (0.4.1)
activesupport (>= 4.2.0)
i18n (1.0.1)
concurrent-ruby (~> 1.0)
json (2.1.0)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.2.2)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.0)
mini_mime (>= 0.1.1)
method_source (0.9.0)
mini_mime (1.0.0)
mini_portile2 (2.3.0)
minitest (5.11.3)
minitest-rails (3.0.0)
minitest (~> 5.8)
railties (~> 5.0)
minitest-reporters (1.2.0)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
nio4r (2.3.1)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
pg (1.0.0)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-rails (0.3.6)
pry (>= 0.10.4)
puma (3.11.4)
rack (2.0.5)
rack-test (1.0.0)
rack (>= 1.0, < 3)
rails (5.1.6)
actioncable (= 5.1.6)
actionmailer (= 5.1.6)
actionpack (= 5.1.6)
actionview (= 5.1.6)
activejob (= 5.1.6)
activemodel (= 5.1.6)
activerecord (= 5.1.6)
activesupport (= 5.1.6)
bundler (>= 1.3.0)
railties (= 5.1.6)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
railties (5.1.6)
actionpack (= 5.1.6)
activesupport (= 5.1.6)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.3.1)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
ruby-progressbar (1.9.0)
ruby_dep (1.5.0)
simplecov (0.16.1)
docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
spring (2.0.2)
activesupport (>= 4.2)
spring-watcher-listen (2.0.1)
listen (>= 2.7, < 4.0)
spring (>= 1.2, < 3.0)
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
thor (0.20.0)
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)

PLATFORMS
ruby

DEPENDENCIES
byebug
listen (>= 3.0.5, < 3.2)
minitest-rails
minitest-reporters
pg (>= 0.18, < 2.0)
pry-rails
puma (~> 3.7)
rails (~> 5.1.6)
simplecov
spring
spring-watcher-listen (~> 2.0.0)
tzinfo-data

BUNDLED WITH
1.16.1
Loading