Permalink
Browse files

Upgrade to Rails 5

  • Loading branch information...
heycarsten committed Feb 10, 2017
1 parent aee135d commit 48057a8aadd3e451961343fc77d572ff5807cc65
Showing with 406 additions and 401 deletions.
  1. +9 −2 .gitignore
  2. +18 −15 Gemfile
  3. +78 −74 Gemfile.lock
  4. +1 −1 Rakefile
  5. +3 −0 app/assets/config/manifest.js
  6. +12 −0 app/assets/javascripts/cable.js
  7. 0 app/assets/javascripts/channels/.keep
  8. +4 −0 app/channels/application_cable/channel.rb
  9. +4 −0 app/channels/application_cable/connection.rb
  10. +4 −4 app/controllers/api/v1/datasets_controller.rb
  11. +4 −4 app/controllers/api/v1/inventories_controller.rb
  12. +4 −4 app/controllers/api/v1/products_controller.rb
  13. +1 −25 app/controllers/api/v1/root_controller.rb
  14. +4 −4 app/controllers/api/v1/stores_controller.rb
  15. +1 −1 app/controllers/api/v2/manager/accounts_controller.rb
  16. +3 −3 app/controllers/api/v2/manager/passwords_controller.rb
  17. +2 −2 app/controllers/api/v2/manager/sessions_controller.rb
  18. +1 −1 app/controllers/api/v2/manager/verifications_controller.rb
  19. +2 −0 app/controllers/application_controller.rb
  20. +2 −0 app/jobs/application_job.rb
  21. +4 −0 app/mailers/application_mailer.rb
  22. +1 −3 app/mailers/email_mailer.rb
  23. +1 −3 app/mailers/user_mailer.rb
  24. +3 −0 app/models/application_record.rb
  25. +1 −1 app/models/category.rb
  26. +1 −1 app/models/crawl.rb
  27. +1 −1 app/models/crawl_event.rb
  28. +1 −1 app/models/email.rb
  29. +1 −1 app/models/inventory.rb
  30. +1 −1 app/models/key.rb
  31. +1 −1 app/models/plan.rb
  32. +1 −1 app/models/producer.rb
  33. +1 −1 app/models/product.rb
  34. +1 −1 app/models/store.rb
  35. +1 −1 app/models/user.rb
  36. +4 −6 app/views/layouts/application.html.erb
  37. +1 −0 app/views/layouts/mailer.text.erb
  38. +7 −2 bin/rails
  39. +17 −13 bin/setup
  40. +29 −0 bin/update
  41. +2 −1 config.ru
  42. +1 −3 config/application.rb
  43. +1 −1 config/boot.rb
  44. +9 −0 config/cable.yml
  45. +1 −1 config/environment.rb
  46. +23 −11 config/environments/development.rb
  47. +23 −16 config/environments/production.rb
  48. +6 −6 config/environments/test.rb
  49. +6 −0 config/initializers/rails/application_controller_renderer.rb
  50. +2 −0 config/initializers/rails/cookies_serializer.rb
  51. +24 −0 config/initializers/rails/new_framework_defaults.rb
  52. +6 −1 config/initializers/rails/wrap_parameters.rb
  53. +1 −1 config/puma.rb
  54. +8 −16 config/routes.rb
  55. +6 −0 config/spring.rb
  56. +3 −3 db/seeds.rb
  57. 0 public/apple-touch-icon-precomposed.png
  58. 0 public/apple-touch-icon.png
  59. +0 −5 spec/controllers/admin/plans_controller_spec.rb
  60. +0 −5 spec/controllers/admin/users_controller_spec.rb
  61. +0 −5 spec/controllers/api/v2/categories_controller_spec.rb
  62. +0 −5 spec/controllers/api/v2/producers_controller_spec.rb
  63. +0 −5 spec/models/category_spec.rb
  64. +0 −5 spec/models/key_spec.rb
  65. +0 −5 spec/models/plan_spec.rb
  66. +0 −5 spec/models/producer_spec.rb
  67. +5 −4 spec/requests/api/v1/datasets_spec.rb
  68. +42 −0 spec/requests/api/v1/legacy_endpoints_spec.rb
  69. +1 −1 spec/requests/api/v1/products_spec.rb
  70. +0 −117 spec/routing/api/v1/legacy_routing_spec.rb
  71. +1 −1 spec/support/api_helpers.rb
@@ -5,5 +5,12 @@ config/database.yml
config/skylight.yml
config/secrets.yml
db/*.rdb
log/*.log
tmp/**/*

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

# Ignore Byebug command history file.
.byebug_history
33 Gemfile
@@ -1,8 +1,7 @@
source 'https://rubygems.org'

gem 'rails', '4.2.7'
gem 'rails', '5.0.1'
gem 'responders'
gem 'oj'
gem 'pg'
gem 'pg_search'
gem 'bcrypt'
@@ -13,33 +12,37 @@ gem 'gcoder'
gem 'puma'
gem 'jquery-rails'
gem 'bootstrap-sass', '~> 3.3.3'
gem 'sass-rails', '~> 5.0.1'
gem 'therubyracer', platforms: :ruby
gem 'uglifier'
#gem 'skylight', '~> 0.6.0'
#gem 'honeybadger', '~> 2.0.6'
gem 'sass-rails', '~> 5.0'
gem 'uglifier', '>= 1.3.0'
gem 'stripe', git: 'https://github.com/stripe/stripe-ruby'

gem 'capistrano', '~> 3.3.5'
gem 'capistrano-rails'
gem 'capistrano-bundler'
gem 'capistrano-rvm'

# Crawler Junk
gem 'excon', require: false
gem 'amatch', require: false
gem 'stringex', require: false
gem 'nokogiri', require: false
gem 'unicode_utils', require: false
gem 'aws-sdk', '~> 2'
gem 'aws-sdk', '~> 2', require: false

group :development do
gem 'capistrano', '~> 3.3.5'
gem 'capistrano-rails'
gem 'capistrano-bundler'
gem 'capistrano-rvm'
gem 'quiet_assets'
gem 'pry-rails'
gem 'spring'
gem 'spring-commands-rspec'
gem 'web-console', '>= 3.3.0'
gem 'listen', '~> 3.0.5'

# 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'
# gem 'spring-commands-rspec'
end

group :test, :development do
gem 'byebug', platform: :mri
gem 'rspec-rails'
gem 'fabrication', require: false
gem 'awesome_print', require: 'ap'
@@ -16,60 +16,63 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.2.7)
actionpack (= 4.2.7)
actionview (= 4.2.7)
activejob (= 4.2.7)
actioncable (5.0.1)
actionpack (= 5.0.1)
nio4r (~> 1.2)
websocket-driver (~> 0.6.1)
actionmailer (5.0.1)
actionpack (= 5.0.1)
actionview (= 5.0.1)
activejob (= 5.0.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.7)
actionview (= 4.2.7)
activesupport (= 4.2.7)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-dom-testing (~> 2.0)
actionpack (5.0.1)
actionview (= 5.0.1)
activesupport (= 5.0.1)
rack (~> 2.0)
rack-test (~> 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.7)
activesupport (= 4.2.7)
actionview (5.0.1)
activesupport (= 5.0.1)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
activejob (4.2.7)
activesupport (= 4.2.7)
globalid (>= 0.3.0)
activemodel (4.2.7)
activesupport (= 4.2.7)
builder (~> 3.1)
activerecord (4.2.7)
activemodel (= 4.2.7)
activesupport (= 4.2.7)
arel (~> 6.0)
activesupport (4.2.7)
activejob (5.0.1)
activesupport (= 5.0.1)
globalid (>= 0.3.6)
activemodel (5.0.1)
activesupport (= 5.0.1)
activerecord (5.0.1)
activemodel (= 5.0.1)
activesupport (= 5.0.1)
arel (~> 7.0)
activesupport (5.0.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
amatch (0.3.0)
tins (~> 1.0)
arel (6.0.4)
arel (7.1.4)
autoprefixer-rails (6.7.2)
execjs
awesome_print (1.7.0)
aws-sdk (2.7.3)
aws-sdk-resources (= 2.7.3)
aws-sdk-core (2.7.3)
aws-sdk (2.7.5)
aws-sdk-resources (= 2.7.5)
aws-sdk-core (2.7.5)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
aws-sdk-resources (2.7.3)
aws-sdk-core (= 2.7.3)
aws-sdk-resources (2.7.5)
aws-sdk-core (= 2.7.5)
aws-sigv4 (1.0.0)
bcrypt (3.1.11)
bootstrap-sass (3.3.7)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
builder (3.2.3)
byebug (9.0.6)
capistrano (3.3.5)
capistrano-stats (~> 1.1.0)
i18n
@@ -87,13 +90,15 @@ GEM
capistrano-stats (1.1.1)
coderay (1.1.1)
concurrent-ruby (1.0.4)
debug_inspector (0.0.2)
diff-lcs (1.3)
domain_name (0.5.20161129)
unf (>= 0.0.5, < 1.0.0)
erubis (2.7.0)
excon (0.54.0)
excon (0.55.0)
execjs (2.7.0)
fabrication (2.16.0)
ffi (1.9.17)
gcoder (1.2.0)
hashie
multi_json
@@ -109,7 +114,6 @@ GEM
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.6)
kaminari (1.0.1)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.0.1)
@@ -122,7 +126,9 @@ GEM
activerecord
kaminari-core (= 1.0.1)
kaminari-core (1.0.1)
libv8 (3.16.14.17)
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.4)
@@ -138,9 +144,9 @@ GEM
net-ssh (>= 2.6.5)
net-ssh (4.0.1)
netrc (0.11.0)
nio4r (1.2.1)
nokogiri (1.7.0.1)
mini_portile2 (~> 2.1.0)
oj (2.18.1)
pg (0.19.0)
pg_search (2.0.1)
activerecord (>= 4.2)
@@ -153,38 +159,37 @@ GEM
pry-rails (0.3.4)
pry (>= 0.9.10)
puma (3.7.0)
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
rack (1.6.5)
rack (2.0.1)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.7)
actionmailer (= 4.2.7)
actionpack (= 4.2.7)
actionview (= 4.2.7)
activejob (= 4.2.7)
activemodel (= 4.2.7)
activerecord (= 4.2.7)
activesupport (= 4.2.7)
rails (5.0.1)
actioncable (= 5.0.1)
actionmailer (= 5.0.1)
actionpack (= 5.0.1)
actionview (= 5.0.1)
activejob (= 5.0.1)
activemodel (= 5.0.1)
activerecord (= 5.0.1)
activesupport (= 5.0.1)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.7)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.8)
activesupport (>= 4.2.0.beta, < 5.0)
railties (= 5.0.1)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.2)
activesupport (>= 4.2.0, < 6.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
railties (4.2.7)
actionpack (= 4.2.7)
activesupport (= 4.2.7)
railties (5.0.1)
actionpack (= 5.0.1)
activesupport (= 5.0.1)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.0.0)
rb-fsevent (0.9.8)
rb-inotify (0.9.8)
ffi (>= 0.5.0)
redis (3.3.3)
ref (2.0.0)
responders (2.3.0)
railties (>= 4.2.0, < 5.1)
rest-client (2.0.0)
@@ -217,10 +222,6 @@ GEM
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
slop (3.6.0)
spring (2.0.1)
activesupport (>= 4.2)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
@@ -232,9 +233,6 @@ GEM
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
stringex (2.7.0)
therubyracer (0.12.3)
libv8 (~> 3.16.14.15)
ref
thor (0.19.4)
thread_safe (0.3.5)
tilt (2.0.6)
@@ -247,6 +245,14 @@ GEM
unf_ext
unf_ext (0.0.7.2)
unicode_utils (1.4.0)
web-console (3.4.0)
actionview (>= 5.0)
activemodel (>= 5.0)
debug_inspector
railties (>= 5.0)
websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)

PLATFORMS
ruby
@@ -258,6 +264,7 @@ DEPENDENCIES
aws-sdk (~> 2)
bcrypt
bootstrap-sass (~> 3.3.3)
byebug
capistrano (~> 3.3.5)
capistrano-bundler
capistrano-rails
@@ -267,25 +274,22 @@ DEPENDENCIES
gcoder
jquery-rails
kaminari
listen (~> 3.0.5)
nokogiri
oj
pg
pg_search
pry-rails
puma
quiet_assets
rails (= 4.2.7)
rails (= 5.0.1)
redis
responders
rspec-rails
sass-rails (~> 5.0.1)
spring
spring-commands-rspec
sass-rails (~> 5.0)
stringex
stripe!
therubyracer
uglifier
uglifier (>= 1.3.0)
unicode_utils
web-console (>= 3.3.0)

BUNDLED WITH
1.14.3
@@ -1,6 +1,6 @@
# Add your own tasks in files placed in lib/tasks ending in .rake,
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.

require File.expand_path('../config/application', __FILE__)
require_relative 'config/application'

Rails.application.load_tasks
@@ -0,0 +1,3 @@
//= link_tree ../images
//= link_directory ../javascripts .js
//= link_directory ../stylesheets .css
@@ -0,0 +1,12 @@
// Action Cable provides the framework to deal with WebSockets in Rails.
// You can generate new channels where WebSocket features live using the
// rails generate channel command.
//
//= require action_cable
//= require_self
//= require_tree ./channels

(function() {
this.App || (this.App = {});
App.cable = ActionCable.createConsumer();
}).call(this);
@@ -0,0 +1,4 @@
module ApplicationCable
class Channel < ActionCable::Channel::Base
end
end
@@ -0,0 +1,4 @@
module ApplicationCable
class Connection < ActionCable::Connection::Base
end
end
Oops, something went wrong.

0 comments on commit 48057a8

Please sign in to comment.