Skip to content

Commit

Permalink
Updating GEMs to address security warnings. Updated deprecated use of…
Browse files Browse the repository at this point in the history
… Faker.
  • Loading branch information
jayvarner committed Jun 17, 2019
1 parent 8b461a5 commit 85381cf
Show file tree
Hide file tree
Showing 11 changed files with 126 additions and 100 deletions.
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ end

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.2.0'
gem "rack", ">= 2.0.6"
gem 'pg'
# Multitenancy for Rails and ActiveRecord
gem 'apartment'
Expand All @@ -20,6 +21,7 @@ gem 'acts-as-taggable-on', '~> 5.0'
gem 'puma', '~> 3.7'
# Use Redis adapter to run Action Cable in production
gem 'redis', '~> 3.0'
gem "actionview", ">= 5.2.2.1"
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

Expand Down
198 changes: 111 additions & 87 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,16 @@ GIT

GIT
remote: https://github.com/stympy/faker.git
revision: a9f579d70aa907be7bf895f84cff186124bd9484
revision: a48340cb30afc2e9be43342b09662b831267a1c5
branch: master
specs:
faker (1.9.1)
faker (1.9.3)
i18n (>= 0.7)
pastel (~> 0.7.2)
thor (~> 0.20.0)
tty-pager (~> 0.12.0)
tty-screen (~> 0.6.5)
tty-tree (~> 0.3.0)

GIT
remote: https://github.com/thoughtbot/shoulda-matchers.git
Expand All @@ -27,73 +32,72 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actioncable (5.2.1)
actionpack (= 5.2.1)
actioncable (5.2.3)
actionpack (= 5.2.3)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.1)
actionpack (= 5.2.1)
actionview (= 5.2.1)
activejob (= 5.2.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.1)
actionview (= 5.2.1)
activesupport (= 5.2.1)
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.1)
activesupport (= 5.2.1)
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)
active_model_serializers (0.10.8)
active_model_serializers (0.10.9)
actionpack (>= 4.1, < 6)
activemodel (>= 4.1, < 6)
case_transform (>= 0.2)
jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
activejob (5.2.1)
activesupport (= 5.2.1)
activejob (5.2.3)
activesupport (= 5.2.3)
globalid (>= 0.3.6)
activemodel (5.2.1)
activesupport (= 5.2.1)
activerecord (5.2.1)
activemodel (= 5.2.1)
activesupport (= 5.2.1)
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.1)
actionpack (= 5.2.1)
activerecord (= 5.2.1)
activestorage (5.2.3)
actionpack (= 5.2.3)
activerecord (= 5.2.3)
marcel (~> 0.3.1)
activesupport (5.2.1)
activesupport (5.2.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
acts-as-taggable-on (5.0.0)
activerecord (>= 4.2.8)
airbrussh (1.3.1)
airbrussh (1.3.2)
sshkit (>= 1.6.1, != 1.7.0)
apartment (2.2.0)
activerecord (>= 3.1.2, < 6.0)
parallel (>= 0.7.1)
public_suffix (>= 2)
rack (>= 1.3.6)
arel (9.0.0)
bcrypt (3.1.12)
bcrypt (3.1.13)
builder (3.2.3)
cancancan (2.3.0)
capistrano (3.11.0)
airbrussh (>= 1.0.0)
i18n
rake (>= 10.0.0)
sshkit (>= 1.9.0)
capistrano-bundler (1.4.0)
capistrano-bundler (1.5.0)
capistrano (~> 3.1)
sshkit (~> 1.2)
capistrano-passenger (0.2.0)
capistrano (~> 3.0)
capistrano-rails (1.4.0)
Expand All @@ -102,33 +106,34 @@ GEM
capistrano-rbenv (2.1.4)
capistrano (~> 3.1)
sshkit (~> 1.3)
carrierwave (1.2.3)
carrierwave (1.3.1)
activemodel (>= 4.0.0)
activesupport (>= 4.0.0)
mime-types (>= 1.16)
case_transform (0.2)
activesupport
concurrent-ruby (1.1.1)
concurrent-ruby (1.1.5)
crass (1.0.4)
database_cleaner (1.7.0)
diff-lcs (1.3)
erubi (1.7.1)
factory_bot (4.11.1)
activesupport (>= 3.0.0)
factory_bot_rails (4.11.1)
factory_bot (~> 4.11.1)
railties (>= 3.0.0)
ffi (1.9.25)
globalid (0.4.1)
equatable (0.6.0)
erubi (1.8.0)
factory_bot (5.0.2)
activesupport (>= 4.2.0)
factory_bot_rails (5.0.2)
factory_bot (~> 5.0.2)
railties (>= 4.2.0)
ffi (1.11.1)
globalid (0.4.2)
activesupport (>= 4.2.0)
httparty (0.13.7)
json (~> 1.8)
multi_xml (>= 0.5.2)
httpclient (2.8.3)
i18n (1.1.1)
i18n (1.6.0)
concurrent-ruby (~> 1.0)
json (1.8.6)
jsonapi-renderer (0.2.0)
jsonapi-renderer (0.2.2)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
Expand All @@ -140,44 +145,47 @@ GEM
mini_mime (>= 0.1.1)
marcel (0.3.3)
mimemagic (~> 0.3.2)
method_source (0.9.1)
method_source (0.9.2)
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2018.0812)
mimemagic (0.3.2)
mini_magick (4.9.2)
mime-types-data (3.2019.0331)
mimemagic (0.3.3)
mini_magick (4.9.3)
mini_mime (1.0.1)
mini_portile2 (2.3.0)
mini_portile2 (2.4.0)
minitest (5.11.3)
multi_xml (0.6.0)
multipart-post (2.0.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (5.0.2)
multipart-post (2.1.1)
net-scp (2.0.0)
net-ssh (>= 2.6.5, < 6.0.0)
net-ssh (5.2.0)
nio4r (2.3.1)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
nokogiri (1.10.3)
mini_portile2 (~> 2.4.0)
oauth (0.5.4)
parallel (1.12.1)
pg (1.1.3)
public_suffix (3.0.3)
puma (3.12.0)
rack (2.0.5)
rack-cors (1.0.2)
parallel (1.17.0)
pastel (0.7.3)
equatable (~> 0.6)
tty-color (~> 0.5)
pg (1.1.4)
public_suffix (3.1.0)
puma (3.12.1)
rack (2.0.7)
rack-cors (1.0.3)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.1)
actioncable (= 5.2.1)
actionmailer (= 5.2.1)
actionpack (= 5.2.1)
actionview (= 5.2.1)
activejob (= 5.2.1)
activemodel (= 5.2.1)
activerecord (= 5.2.1)
activestorage (= 5.2.1)
activesupport (= 5.2.1)
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.1)
railties (= 5.2.3)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
Expand All @@ -188,37 +196,36 @@ GEM
bcrypt (~> 3.1.7)
httparty (~> 0.13.3)
rails (>= 3.2.6, < 6)
railties (5.2.1)
actionpack (= 5.2.1)
activesupport (= 5.2.1)
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.1)
rake (12.3.2)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rb-inotify (0.10.0)
ffi (~> 1.0)
redis (3.3.5)
rspec-core (3.8.0)
rspec-core (3.8.1)
rspec-support (~> 3.8.0)
rspec-expectations (3.8.2)
rspec-expectations (3.8.4)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-mocks (3.8.0)
rspec-mocks (3.8.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-rails (3.8.1)
rspec-rails (3.8.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.8.0)
rspec-support (~> 3.8.0)
rspec-support (3.8.0)
rspec-support (3.8.2)
ruby_dep (1.5.0)
spring (2.0.2)
activesupport (>= 4.2)
spring (2.1.0)
spring-watcher-listen (2.0.1)
listen (>= 2.7, < 4.0)
spring (>= 1.2, < 3.0)
Expand All @@ -229,25 +236,40 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sshkit (1.18.0)
sshkit (1.18.2)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
strings (0.1.5)
strings-ansi (~> 0.1)
unicode-display_width (~> 1.5)
unicode_utils (~> 1.4)
strings-ansi (0.1.0)
test-prof (0.9.0)
thor (0.20.0)
thor (0.20.3)
thread_safe (0.3.6)
tty-color (0.5.0)
tty-pager (0.12.1)
strings (~> 0.1.4)
tty-screen (~> 0.6)
tty-which (~> 0.4)
tty-screen (0.6.5)
tty-tree (0.3.0)
tty-which (0.4.1)
tzinfo (1.2.5)
thread_safe (~> 0.1)
unicode-display_width (1.6.0)
unicode_utils (1.4.0)
vimeo (1.5.4)
httparty (>= 0.4.5)
httpclient (>= 2.1.5.2)
json (>= 1.1.9)
multipart-post (>= 1.0.1)
oauth (>= 0.4.3)
websocket-driver (0.7.0)
websocket-driver (0.7.1)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
websocket-extensions (0.1.4)
youtube_rails (1.2.2)
yt (0.32.2)
yt (0.32.3)
activesupport
yt-support (>= 0.1)
yt-support (0.1.3)
Expand All @@ -256,6 +278,7 @@ PLATFORMS
ruby

DEPENDENCIES
actionview (>= 5.2.2.1)
active_model_serializers (~> 0.10.0.rc3)
acts-as-taggable-on (~> 5.0)
apartment
Expand All @@ -273,6 +296,7 @@ DEPENDENCIES
mini_magick
pg
puma (~> 3.7)
rack (>= 2.0.6)
rack-cors
rails (~> 5.2.0)
redis (~> 3.0)
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/v1/tours_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
# This is only for testing calls to versioned endpoints.
class V1::ToursController < ApplicationController
def index
json_response(message: Faker::HitchhikersGuideToTheGalaxy.quote)
json_response(message: Faker::Movies::HitchhikersGuideToTheGalaxy.quote)
end
end
2 changes: 1 addition & 1 deletion config/initializers/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module OpenTourApi
class Application
VERSION = '3.0.0rc'
VERSION = '3.0.1rc'
end
end
4 changes: 2 additions & 2 deletions db/seeds.rb
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@
3.times { FactoryBot.create(:tour_set) }

4.times do
# User.create(display_name: Faker::Lebowski.character)
# User.create(display_name: Faker::Movies::Lebowski)
FactoryBot.create(:login)
Login.last.user.update_attribute(:display_name, Faker::Lebowski.character)
Login.last.user.update_attribute(:display_name, Faker::Movies::Lebowski)
end

TourSet.all.each do |ts|
Expand Down
Loading

0 comments on commit 85381cf

Please sign in to comment.