Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
b15b00d
initial setup
kimpossible1 Nov 6, 2017
e883364
got seed data loaded
kimpossible1 Nov 6, 2017
e501466
did zomg route and method
kimpossible1 Nov 6, 2017
9186f3a
added controller for customers
kimpossible1 Nov 6, 2017
15a3716
added index def to movies and an appropriate route
kimpossible1 Nov 6, 2017
9f6ddc0
added index method for customers controller and an appropriate route
kimpossible1 Nov 6, 2017
631f1fe
added tests for customers index controller method
kimpossible1 Nov 6, 2017
3011912
Add index controller tests for movies controller
biciclista22 Nov 7, 2017
05fd82a
Add gem pry and began controller testing for customers show
biciclista22 Nov 7, 2017
5e5a468
Add controller tests for customers show and add customers show contro…
biciclista22 Nov 7, 2017
4122c25
Changes to requirements on API information shared for customers and m…
biciclista22 Nov 7, 2017
682bbdf
movie show method and controller test complete
biciclista22 Nov 7, 2017
71033c8
create method nd controller tests for movies
kimpossible1 Nov 7, 2017
c99690e
Adding edit controller test for customers but not complete. Add some …
biciclista22 Nov 7, 2017
e619873
Fix merge conflicts
biciclista22 Nov 7, 2017
8b5f056
passing controller create tests and commented out model tests for now
biciclista22 Nov 7, 2017
62e2958
added movie yml data
kimpossible1 Nov 7, 2017
45529ca
Add customer fixture data
biciclista22 Nov 7, 2017
5e55c92
Merge branch 'master' of https://github.com/kimpossible1/VideoStoreAPI
biciclista22 Nov 7, 2017
59a7e96
Add customer model validation testing - passing
biciclista22 Nov 7, 2017
7f47644
Change to customer controller test to get it to pass with new custome…
biciclista22 Nov 7, 2017
6a9a4b0
added validation tests for movies
kimpossible1 Nov 7, 2017
c7d3bb4
update
kimpossible1 Nov 7, 2017
0b083b2
added rentals model and relationships to all models
kimpossible1 Nov 7, 2017
4dc7c78
set up model validations for rentals
kimpossible1 Nov 7, 2017
23a9e31
Add rental YAML data and begin work on rental relationship testing
biciclista22 Nov 7, 2017
3092add
initial rental model relationship test passing with change in YAML re…
biciclista22 Nov 7, 2017
d0c2719
adding tests for movies model relationships
kimpossible1 Nov 7, 2017
25985ca
Merge branch 'master' of https://github.com/kimpossible1/VideoStoreAPI
kimpossible1 Nov 7, 2017
7faae8a
Change in model through relationships in customers and movies
biciclista22 Nov 7, 2017
73f6e7a
Merge branch 'master' of https://github.com/kimpossible1/VideoStoreAPI
biciclista22 Nov 7, 2017
cbb5742
update
kimpossible1 Nov 7, 2017
9a61209
Merge branch 'master' of https://github.com/kimpossible1/VideoStoreAPI
kimpossible1 Nov 7, 2017
e81f5c1
Basic rentals relationship model tests passing with addition of two r…
biciclista22 Nov 7, 2017
730eb9a
some basic relationship tests for movie model
kimpossible1 Nov 7, 2017
04f95b9
Merge branch 'master' of https://github.com/kimpossible1/VideoStoreAPI
kimpossible1 Nov 7, 2017
686d6a1
added tests for relationshiops in customer model
kimpossible1 Nov 7, 2017
1f9ab87
generated rentals controller
kimpossible1 Nov 7, 2017
e164aa0
Added validation testing for rental model
biciclista22 Nov 7, 2017
a8c0c67
Merge branch 'master' of https://github.com/kimpossible1/VideoStoreAPI
biciclista22 Nov 7, 2017
49fce95
added index method for rentals controller
kimpossible1 Nov 7, 2017
6493c6d
Merge branch 'master' of https://github.com/kimpossible1/VideoStoreAPI
kimpossible1 Nov 7, 2017
65e0f4c
added column to rentals model for checkin_date
kimpossible1 Nov 7, 2017
1f269de
made route for rentals checkout
kimpossible1 Nov 7, 2017
5f5be20
deleted last update
kimpossible1 Nov 7, 2017
6efbc5e
Add checkout route, stub out checkout controller tests
biciclista22 Nov 7, 2017
d332aa4
fix merge conflict in routes
biciclista22 Nov 7, 2017
46434c6
trying to flesh out checkout method in controller but not working yet
kimpossible1 Nov 7, 2017
8b0c9ce
added a method in movie model for checking a movie's inventory and ad…
kimpossible1 Nov 7, 2017
ea6f4de
started some methods in movie model for adding and decreasing inventory
kimpossible1 Nov 7, 2017
ebbd7be
added some tests in movie model for increase and decrease inventory b…
kimpossible1 Nov 7, 2017
9679fdd
fixed movie model issues with inventory check, increase and decrease
kimpossible1 Nov 7, 2017
81f4b42
Playing around with checkout tests, specifically strong params
biciclista22 Nov 7, 2017
ce26543
Passing checkout controller test 1 with correct params call syntax
biciclista22 Nov 7, 2017
ca3a9c2
updated check in method in Rentals Controller
biciclista22 Nov 8, 2017
e4fa2a9
Added model method for overdue and controller method for overdue and …
kimpossible1 Nov 8, 2017
e16326c
Migrations for date types made for customers registered at and rental…
biciclista22 Nov 8, 2017
4fe821b
Change to customers controller tests to account for change in date type
biciclista22 Nov 8, 2017
cce67b6
Add migrations to include an additional column to movies and customer…
biciclista22 Nov 8, 2017
b50c087
Add additional data to yaml files
biciclista22 Nov 8, 2017
e9010a0
Changes to tests to factor with additional columns added to movies an…
biciclista22 Nov 8, 2017
7965d14
Update README.md
kimpossible1 May 15, 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
Binary file added .DS_Store
Binary file not shown.
16 changes: 16 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# 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
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) 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.4'
# Use postgresql as the database for Active Record
gem 'pg', '~> 0.18'
# 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', '~> 3.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]
gem 'pry-rails'
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]

gem 'jquery-turbolinks'
group :development do
gem 'better_errors'
gem 'pry-rails'
gem 'binding_of_caller'
end

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
end
170 changes: 170 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.1.4)
actionpack (= 5.1.4)
nio4r (~> 2.0)
websocket-driver (~> 0.6.1)
actionmailer (5.1.4)
actionpack (= 5.1.4)
actionview (= 5.1.4)
activejob (= 5.1.4)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.1.4)
actionview (= 5.1.4)
activesupport (= 5.1.4)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.1.4)
activesupport (= 5.1.4)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.1.4)
activesupport (= 5.1.4)
globalid (>= 0.3.6)
activemodel (5.1.4)
activesupport (= 5.1.4)
activerecord (5.1.4)
activemodel (= 5.1.4)
activesupport (= 5.1.4)
arel (~> 8.0)
activesupport (5.1.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
minitest (~> 5.1)
tzinfo (~> 1.1)
ansi (1.5.0)
arel (8.0.0)
better_errors (2.4.0)
coderay (>= 1.0.0)
erubi (>= 1.0.0)
rack (>= 0.9.0)
binding_of_caller (0.7.3)
debug_inspector (>= 0.0.1)
builder (3.2.3)
byebug (9.1.0)
coderay (1.1.2)
concurrent-ruby (1.0.5)
crass (1.0.2)
debug_inspector (0.0.3)
erubi (1.7.0)
ffi (1.9.18)
globalid (0.4.1)
activesupport (>= 4.2.0)
i18n (0.9.1)
concurrent-ruby (~> 1.0)
jquery-turbolinks (2.1.0)
railties (>= 3.1.0)
turbolinks
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.1.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.0)
mini_mime (>= 0.1.1)
method_source (0.9.0)
mini_mime (0.1.4)
mini_portile2 (2.3.0)
minitest (5.10.3)
minitest-rails (3.0.0)
minitest (~> 5.8)
railties (~> 5.0)
minitest-reporters (1.1.18)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
nio4r (2.1.0)
nokogiri (1.8.1)
mini_portile2 (~> 2.3.0)
pg (0.21.0)
pry (0.11.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-rails (0.3.6)
pry (>= 0.10.4)
puma (3.10.0)
rack (2.0.3)
rack-test (0.7.0)
rack (>= 1.0, < 3)
rails (5.1.4)
actioncable (= 5.1.4)
actionmailer (= 5.1.4)
actionpack (= 5.1.4)
actionview (= 5.1.4)
activejob (= 5.1.4)
activemodel (= 5.1.4)
activerecord (= 5.1.4)
activesupport (= 5.1.4)
bundler (>= 1.3.0)
railties (= 5.1.4)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
railties (5.1.4)
actionpack (= 5.1.4)
activesupport (= 5.1.4)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.2.1)
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
ruby-progressbar (1.9.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.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)
turbolinks (5.0.1)
turbolinks-source (~> 5)
turbolinks-source (5.0.3)
tzinfo (1.2.4)
thread_safe (~> 0.1)
websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)

PLATFORMS
ruby

DEPENDENCIES
better_errors
binding_of_caller
byebug
jquery-turbolinks
listen (>= 3.0.5, < 3.2)
minitest-rails
minitest-reporters
pg (~> 0.18)
pry-rails
puma (~> 3.7)
rails (~> 5.1.4)
spring
spring-watcher-listen (~> 2.0.0)
tzinfo-data

BUNDLED WITH
1.16.0
Loading