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

Selam Ainalem Brittany Jones #22

Open
wants to merge 47 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
b8aa88b
generated models and controllers for assignment
SelamawitA May 7, 2018
6c88a50
set up initial rails
brittanyrjones May 7, 2018
0e31da9
fixed merge conflicts
brittanyrjones May 7, 2018
ee9a611
added routes
SelamawitA May 7, 2018
acb5bfc
fixed merge conflict
brittanyrjones May 7, 2018
6fa02dc
added has many and belongs to relationship in movie.rb file
brittanyrjones May 7, 2018
5446bfe
fixed issues with testing
brittanyrjones May 7, 2018
edf1cae
created db
brittanyrjones May 7, 2018
bd4c580
changed movie relationship to rentals to has many
brittanyrjones May 7, 2018
ae3bcf9
changed customer table phone
brittanyrjones May 7, 2018
04bf93a
changed table movie to have lower case inventory
brittanyrjones May 7, 2018
96c7dcb
added validations to models
brittanyrjones May 7, 2018
80410d2
added due date
brittanyrjones May 7, 2018
26049cc
removed outdated seed data and including one passing test for custome…
SelamawitA May 8, 2018
c74d2af
added movie model tests, and movies yml data
brittanyrjones May 8, 2018
5e6d706
completed customer testing and added to yml files
SelamawitA May 8, 2018
da42bab
updated yml merge conflict
SelamawitA May 8, 2018
e39735d
all movie model tests passing
brittanyrjones May 8, 2018
e90f503
added a few tests to the rental_test.rb file
SelamawitA May 8, 2018
dbab047
Merge branch 'master' of https://github.com/SelamawitA/VideoStoreAPI
SelamawitA May 8, 2018
fc65474
added simplcov, added tests for customers controller, added method in…
brittanyrjones May 8, 2018
4c5df2b
added movie checkout count to db
brittanyrjones May 8, 2018
b07c325
added model testing for rentals
SelamawitA May 8, 2018
906446c
added config folders
brittanyrjones May 8, 2018
6c11f96
fixed merge conflict
brittanyrjones May 8, 2018
795da34
changed db to have default of 0 for movies checked out
brittanyrjones May 8, 2018
8f6fb27
edit movies controller tests
brittanyrjones May 8, 2018
0d84086
added create method and testing for movies controller
SelamawitA May 8, 2018
57f7c4e
made small update
SelamawitA May 8, 2018
28c1005
meged to master
brittanyrjones May 8, 2018
26de219
updated create method and confirmed functionality in tests and Postman
SelamawitA May 8, 2018
256d1c4
Updated schema Date objects to be of type datetime.
SelamawitA May 8, 2018
473d577
fixed merge conflict
brittanyrjones May 8, 2018
c309aeb
added checkout method and to rental_controller and model methods to s…
SelamawitA May 9, 2018
f25e5e0
merge conflict
brittanyrjones May 9, 2018
73cb909
added checkout method for rental controller class.
SelamawitA May 9, 2018
220833c
cleaned up formatting on rental_controller.rb
SelamawitA May 9, 2018
8bdd256
added tests titles to rental controleer tests file
SelamawitA May 9, 2018
bd26300
merged
brittanyrjones May 9, 2018
0bd7bca
removed strong params from movies controller and associated tests
SelamawitA May 9, 2018
946d307
conflict
brittanyrjones May 9, 2018
e5a1178
small edit
SelamawitA May 9, 2018
98acae0
Merge branch 'master' of https://github.com/SelamawitA/VideoStoreAPI
SelamawitA May 9, 2018
b32d7fe
small update
SelamawitA May 9, 2018
82537f0
added default value of 10 to inventory and available inventory to the…
SelamawitA May 11, 2018
217cd7c
fixed bugs in rental controller, ran smoke tests, and updated/cleaned…
SelamawitA May 12, 2018
3bfe7be
cleaned up tests for rental_controller and movies controller, re-ran …
SelamawitA May 12, 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
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
51 changes: 51 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
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'
gem 'simplecov', require: false
end
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.1.5)
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.15.1)
docile (~> 1.1.0)
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