Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
2feed61
initial rails api setup
May 14, 2019
ffef6d6
Initial db setup
carlabosco May 14, 2019
b824647
generated controllers
May 14, 2019
c5cf416
added routes
May 14, 2019
e2665db
Added validations for customer and movie
carlabosco May 14, 2019
2220ffa
Merge commit
carlabosco May 14, 2019
62aaff3
added create valid rental test
May 14, 2019
12724c8
fleshed out valid new rental test
May 14, 2019
002679c
Added index to customer
carlabosco May 14, 2019
0b28dc6
added test for new rental w/ invalid customer id
May 14, 2019
be39749
added test for new rental w/ invalid movie
May 14, 2019
fccbdaf
added movies fixtures
May 14, 2019
fbc7913
Added test to customer model
carlabosco May 14, 2019
932e23f
added movies index test 1
May 14, 2019
56e0ba2
added check for json and array in index test
May 14, 2019
70fa899
added response length = movie count check
May 14, 2019
424c415
Added checked-out count column to customers table
carlabosco May 14, 2019
eb87d6a
added movie field test
May 14, 2019
6a12ac9
added movie sort tests
May 14, 2019
25e083b
added test for create movie w/ valid data
May 14, 2019
74b2b3c
added create movie test for invalid data
May 14, 2019
d157356
Merge pull request #1 from laneia/customers
laneia May 14, 2019
c5816d9
Merge branch 'master' of https://github.com/laneia/VideoStoreAPI into…
May 14, 2019
0365f3f
Added tests for json response in customer controller
carlabosco May 14, 2019
9c8a7a2
Merge branch 'master' of https://github.com/laneia/VideoStoreAPI into…
carlabosco May 14, 2019
80804e6
added movies index method
May 14, 2019
2c5c257
added movie show method and params
May 14, 2019
8bd03b3
added create movie method
May 14, 2019
7efcaad
edited variable name for consistency new_movie -> movie
May 14, 2019
df2c3c2
all movies controller tests passing
May 14, 2019
b480c67
added show movie valid id test
May 15, 2019
88fa6e1
added movie show test for invalid id
May 15, 2019
457e5e9
added movie show correct fields test
May 15, 2019
c7b3548
added rental_params
May 15, 2019
7e46e23
added checkout, due date, status to rentals
May 15, 2019
040b374
added availability rental model
May 15, 2019
efe3621
added checkout rentals controller method
May 15, 2019
cb295c4
added checkin rentals method
May 15, 2019
ae236ee
renamed test to match rental checkout
May 15, 2019
d75a1ae
added rental routes and new tests, not passing yet
May 15, 2019
a4a2842
Merge branch 'movies-and-rentals' of https://github.com/laneia/VideoS…
carlabosco May 15, 2019
9300e21
Added validations for rental, tests for movie model
carlabosco May 15, 2019
73edce5
added rental fixture
May 15, 2019
ff44e41
Merge branch 'movies-and-rentals' of https://github.com/laneia/VideoS…
carlabosco May 15, 2019
3feae06
added available_inventory to movies
May 15, 2019
084788e
got rental tests passing, updated fixtures for available_inventory
May 15, 2019
99281be
Changed rental fixtures, added rental validation test
carlabosco May 15, 2019
06fa9c7
merge commit
carlabosco May 15, 2019
ef49e0d
fixed merge conflict
May 15, 2019
150fbc4
merge commit
carlabosco May 15, 2019
7d24164
added available_inventory method to movie
May 15, 2019
5cf8ac4
Merge branch 'master' of https://github.com/laneia/VideoStoreAPI
carlabosco May 15, 2019
7195177
fixing test description for consistency
May 15, 2019
1709dbe
Added relations tests to rental
carlabosco May 15, 2019
cfb912d
Merge branch 'master' of https://github.com/laneia/VideoStoreAPI
carlabosco May 15, 2019
771265d
Removed unnecessary line from movies model test
carlabosco May 15, 2019
3aff11d
added available_inventory test one
May 15, 2019
047b2ff
added new movie fixture with no rentals
May 15, 2019
f331145
added second available_inventory test for no rental
May 15, 2019
45d7795
added available_inventory to movie show & test
May 15, 2019
b5e9f85
Changed available inventory default to inventory
carlabosco May 15, 2019
f0ad8e9
added available_inventory to movies index & test
May 15, 2019
aacc695
merge commit
carlabosco May 15, 2019
3fa1bce
Merge branch 'master' of https://github.com/laneia/VideoStoreAPI into…
carlabosco May 15, 2019
08ab61a
added test and validations for movies model
May 15, 2019
12f399b
Merge branch 'master' of https://github.com/laneia/VideoStoreAPI
May 15, 2019
51518d8
added integer validation tests
May 15, 2019
d64632e
added relationship tests to movie test
May 15, 2019
ac630b5
test fixture cosistency
May 15, 2019
1625736
Added tests to customer model and controller
carlabosco May 16, 2019
0ad2029
Merge branch 'master' of https://github.com/laneia/VideoStoreAPI
carlabosco May 16, 2019
a173b16
added rental validations and tests, relevant test fixtures
May 16, 2019
7d4c882
Merge branch 'master' of https://github.com/laneia/VideoStoreAPI
May 16, 2019
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
Binary file added .DS_Store
Binary file not shown.
23 changes: 23 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# 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

# Ignore uploaded files in development
/storage/*
!/storage/.keep

.byebug_history

# Ignore master key for decrypting credentials and more.
/config/master.key
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ruby-2.4.1
54 changes: 54 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.4.1'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.2.3'
# Use postgresql as the database for Active Record
gem 'pg', '>= 0.18', '< 2.0'
# Use Puma as the app server
gem 'puma', '~> 3.11'
# 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 ActiveStorage variant
# gem 'mini_magick', '~> 4.8'

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

# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', '>= 1.1.0', require: false

# 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
169 changes: 169 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,169 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.2.3)
actionpack (= 5.2.3)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.3)
actionpack (= 5.2.3)
actionview (= 5.2.3)
activejob (= 5.2.3)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.3)
actionview (= 5.2.3)
activesupport (= 5.2.3)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.3)
activesupport (= 5.2.3)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.3)
activesupport (= 5.2.3)
globalid (>= 0.3.6)
activemodel (5.2.3)
activesupport (= 5.2.3)
activerecord (5.2.3)
activemodel (= 5.2.3)
activesupport (= 5.2.3)
arel (>= 9.0)
activestorage (5.2.3)
actionpack (= 5.2.3)
activerecord (= 5.2.3)
marcel (~> 0.3.1)
activesupport (5.2.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
ansi (1.5.0)
arel (9.0.0)
bootsnap (1.4.4)
msgpack (~> 1.0)
builder (3.2.3)
byebug (11.0.1)
coderay (1.1.2)
concurrent-ruby (1.1.5)
crass (1.0.4)
erubi (1.8.0)
ffi (1.10.0)
globalid (0.4.2)
activesupport (>= 4.2.0)
i18n (1.6.0)
concurrent-ruby (~> 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.3)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
mini_mime (>= 0.1.1)
marcel (0.3.3)
mimemagic (~> 0.3.2)
method_source (0.9.2)
mimemagic (0.3.3)
mini_mime (1.0.1)
mini_portile2 (2.4.0)
minitest (5.11.3)
minitest-rails (3.0.0)
minitest (~> 5.8)
railties (~> 5.0)
minitest-reporters (1.3.6)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
msgpack (1.2.10)
nio4r (2.3.1)
nokogiri (1.10.3)
mini_portile2 (~> 2.4.0)
pg (1.1.4)
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-rails (0.3.9)
pry (>= 0.10.4)
puma (3.12.1)
rack (2.0.7)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.3)
actioncable (= 5.2.3)
actionmailer (= 5.2.3)
actionpack (= 5.2.3)
actionview (= 5.2.3)
activejob (= 5.2.3)
activemodel (= 5.2.3)
activerecord (= 5.2.3)
activestorage (= 5.2.3)
activesupport (= 5.2.3)
bundler (>= 1.3.0)
railties (= 5.2.3)
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.2.3)
actionpack (= 5.2.3)
activesupport (= 5.2.3)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rake (12.3.2)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
ruby-progressbar (1.10.0)
ruby_dep (1.5.0)
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.2)
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.3)
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
websocket-driver (0.7.0)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)

PLATFORMS
ruby

DEPENDENCIES
bootsnap (>= 1.1.0)
byebug
listen (>= 3.0.5, < 3.2)
minitest-rails
minitest-reporters
pg (>= 0.18, < 2.0)
pry-rails
puma (~> 3.11)
rails (~> 5.2.3)
spring
spring-watcher-listen (~> 2.0.0)
tzinfo-data

RUBY VERSION
ruby 2.4.1p111

BUNDLED WITH
1.16.6
9 changes: 9 additions & 0 deletions Guardfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
guard :minitest, autorun: false, spring: true do
watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" }
watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' }
watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" }
watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" }
watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" }
watch(%r{^test/.+_test.rb$})
watch(%r{^test/test_helper.rb$}) { 'test' }
end
Loading