Skip to content

Commit 551598c

Browse files
committed
update to Rails 5.0
1 parent a6f4a2f commit 551598c

38 files changed

+389
-148
lines changed

Gemfile

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
11
source 'https://rubygems.org'
22
ruby '2.3.1'
3-
gem 'rails', '4.2.7.1'
3+
gem 'rails', '~> 5.0.0', '>= 5.0.0.1'
44
gem 'sqlite3'
5+
gem 'puma', '~> 3.0'
56
gem 'sass-rails', '~> 5.0'
67
gem 'uglifier', '>= 1.3.0'
7-
gem 'coffee-rails', '~> 4.1.0'
8+
gem 'coffee-rails', '~> 4.2'
89
gem 'jquery-rails'
9-
gem 'turbolinks'
10-
gem 'jbuilder', '~> 2.0'
10+
gem 'turbolinks', '~> 5'
11+
gem 'jbuilder', '~> 2.5'
1112
group :development, :test do
12-
gem 'byebug'
13+
gem 'byebug', platform: :mri
1314
end
1415
group :development do
15-
gem 'web-console', '~> 2.0'
16+
gem 'web-console'
17+
gem 'listen', '~> 3.0.5'
1618
gem 'spring'
19+
gem 'spring-watcher-listen', '~> 2.0.0'
1720
end
18-
gem 'bootstrap', '~> 4.0.0.alpha4'
21+
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
22+
gem 'bootstrap', '~> 4.0.0.alpha3.1'
1923
gem 'high_voltage'
2024
group :development do
2125
gem 'better_errors'

Gemfile.lock

Lines changed: 81 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,57 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (4.2.7.1)
5-
actionpack (= 4.2.7.1)
6-
actionview (= 4.2.7.1)
7-
activejob (= 4.2.7.1)
4+
actioncable (5.0.0.1)
5+
actionpack (= 5.0.0.1)
6+
nio4r (~> 1.2)
7+
websocket-driver (~> 0.6.1)
8+
actionmailer (5.0.0.1)
9+
actionpack (= 5.0.0.1)
10+
actionview (= 5.0.0.1)
11+
activejob (= 5.0.0.1)
812
mail (~> 2.5, >= 2.5.4)
9-
rails-dom-testing (~> 1.0, >= 1.0.5)
10-
actionpack (4.2.7.1)
11-
actionview (= 4.2.7.1)
12-
activesupport (= 4.2.7.1)
13-
rack (~> 1.6)
14-
rack-test (~> 0.6.2)
15-
rails-dom-testing (~> 1.0, >= 1.0.5)
13+
rails-dom-testing (~> 2.0)
14+
actionpack (5.0.0.1)
15+
actionview (= 5.0.0.1)
16+
activesupport (= 5.0.0.1)
17+
rack (~> 2.0)
18+
rack-test (~> 0.6.3)
19+
rails-dom-testing (~> 2.0)
1620
rails-html-sanitizer (~> 1.0, >= 1.0.2)
17-
actionview (4.2.7.1)
18-
activesupport (= 4.2.7.1)
21+
actionview (5.0.0.1)
22+
activesupport (= 5.0.0.1)
1923
builder (~> 3.1)
2024
erubis (~> 2.7.0)
21-
rails-dom-testing (~> 1.0, >= 1.0.5)
25+
rails-dom-testing (~> 2.0)
2226
rails-html-sanitizer (~> 1.0, >= 1.0.2)
23-
activejob (4.2.7.1)
24-
activesupport (= 4.2.7.1)
25-
globalid (>= 0.3.0)
26-
activemodel (4.2.7.1)
27-
activesupport (= 4.2.7.1)
28-
builder (~> 3.1)
29-
activerecord (4.2.7.1)
30-
activemodel (= 4.2.7.1)
31-
activesupport (= 4.2.7.1)
32-
arel (~> 6.0)
33-
activesupport (4.2.7.1)
27+
activejob (5.0.0.1)
28+
activesupport (= 5.0.0.1)
29+
globalid (>= 0.3.6)
30+
activemodel (5.0.0.1)
31+
activesupport (= 5.0.0.1)
32+
activerecord (5.0.0.1)
33+
activemodel (= 5.0.0.1)
34+
activesupport (= 5.0.0.1)
35+
arel (~> 7.0)
36+
activesupport (5.0.0.1)
37+
concurrent-ruby (~> 1.0, >= 1.0.2)
3438
i18n (~> 0.7)
35-
json (~> 1.7, >= 1.7.7)
3639
minitest (~> 5.1)
37-
thread_safe (~> 0.3, >= 0.3.4)
3840
tzinfo (~> 1.1)
3941
addressable (2.4.0)
40-
arel (6.0.3)
42+
arel (7.1.4)
4143
autoprefixer-rails (6.5.0.2)
4244
execjs
4345
better_errors (2.1.1)
4446
coderay (>= 1.0.0)
4547
erubis (>= 2.6.6)
4648
rack (>= 0.9.0)
47-
binding_of_caller (0.7.2)
48-
debug_inspector (>= 0.0.1)
4949
bootstrap (4.0.0.alpha4)
5050
autoprefixer-rails (>= 6.0.3)
5151
sass (>= 3.4.19)
5252
builder (3.2.2)
5353
byebug (9.0.6)
54-
capybara (2.9.2)
54+
capybara (2.10.1)
5555
addressable
5656
mime-types (>= 1.16)
5757
nokogiri (>= 1.3.3)
@@ -61,9 +61,9 @@ GEM
6161
childprocess (0.5.9)
6262
ffi (~> 1.0, >= 1.0.11)
6363
coderay (1.1.1)
64-
coffee-rails (4.1.1)
64+
coffee-rails (4.2.1)
6565
coffee-script (>= 2.2.0)
66-
railties (>= 4.0.0, < 5.1.x)
66+
railties (>= 4.0.0, < 5.2.x)
6767
coffee-script (2.4.1)
6868
coffee-script-source
6969
execjs
@@ -93,50 +93,57 @@ GEM
9393
rails-dom-testing (>= 1, < 3)
9494
railties (>= 4.2.0)
9595
thor (>= 0.14, < 2.0)
96-
json (1.8.3)
9796
launchy (2.4.3)
9897
addressable (~> 2.3)
98+
listen (3.0.8)
99+
rb-fsevent (~> 0.9, >= 0.9.4)
100+
rb-inotify (~> 0.9, >= 0.9.7)
99101
loofah (2.0.3)
100102
nokogiri (>= 1.5.9)
101103
mail (2.6.4)
102104
mime-types (>= 1.16, < 4)
105+
method_source (0.8.2)
103106
mime-types (3.1)
104107
mime-types-data (~> 3.2015)
105108
mime-types-data (3.2016.0521)
106109
mini_portile2 (2.1.0)
107110
minitest (5.9.1)
108111
multi_json (1.12.1)
112+
nio4r (1.2.1)
109113
nokogiri (1.6.8.1)
110114
mini_portile2 (~> 2.1.0)
111-
rack (1.6.4)
115+
puma (3.6.0)
116+
rack (2.0.1)
112117
rack-test (0.6.3)
113118
rack (>= 1.0)
114-
rails (4.2.7.1)
115-
actionmailer (= 4.2.7.1)
116-
actionpack (= 4.2.7.1)
117-
actionview (= 4.2.7.1)
118-
activejob (= 4.2.7.1)
119-
activemodel (= 4.2.7.1)
120-
activerecord (= 4.2.7.1)
121-
activesupport (= 4.2.7.1)
119+
rails (5.0.0.1)
120+
actioncable (= 5.0.0.1)
121+
actionmailer (= 5.0.0.1)
122+
actionpack (= 5.0.0.1)
123+
actionview (= 5.0.0.1)
124+
activejob (= 5.0.0.1)
125+
activemodel (= 5.0.0.1)
126+
activerecord (= 5.0.0.1)
127+
activesupport (= 5.0.0.1)
122128
bundler (>= 1.3.0, < 2.0)
123-
railties (= 4.2.7.1)
124-
sprockets-rails
125-
rails-deprecated_sanitizer (1.0.3)
126-
activesupport (>= 4.2.0.alpha)
127-
rails-dom-testing (1.0.7)
128-
activesupport (>= 4.2.0.beta, < 5.0)
129+
railties (= 5.0.0.1)
130+
sprockets-rails (>= 2.0.0)
131+
rails-dom-testing (2.0.1)
132+
activesupport (>= 4.2.0, < 6.0)
129133
nokogiri (~> 1.6.0)
130-
rails-deprecated_sanitizer (>= 1.0.1)
131134
rails-html-sanitizer (1.0.3)
132135
loofah (~> 2.0)
133136
rails_layout (1.0.31)
134-
railties (4.2.7.1)
135-
actionpack (= 4.2.7.1)
136-
activesupport (= 4.2.7.1)
137+
railties (5.0.0.1)
138+
actionpack (= 5.0.0.1)
139+
activesupport (= 5.0.0.1)
140+
method_source
137141
rake (>= 0.8.7)
138142
thor (>= 0.18.1, < 2.0)
139143
rake (11.3.0)
144+
rb-fsevent (0.9.7)
145+
rb-inotify (0.9.7)
146+
ffi (>= 0.5.0)
140147
rspec-core (3.5.4)
141148
rspec-support (~> 3.5.0)
142149
rspec-expectations (3.5.0)
@@ -170,14 +177,17 @@ GEM
170177
activesupport (>= 4.2)
171178
spring-commands-rspec (1.0.4)
172179
spring (>= 0.9.1)
180+
spring-watcher-listen (2.0.1)
181+
listen (>= 2.7, < 4.0)
182+
spring (>= 1.2, < 3.0)
173183
sprockets (3.7.0)
174184
concurrent-ruby (~> 1.0)
175185
rack (> 1, < 3)
176186
sprockets-rails (3.2.0)
177187
actionpack (>= 4.0)
178188
activesupport (>= 4.0)
179189
sprockets (>= 3.0.0)
180-
sqlite3 (1.3.11)
190+
sqlite3 (1.3.12)
181191
thor (0.19.1)
182192
thread_safe (0.3.5)
183193
tilt (2.0.5)
@@ -188,12 +198,15 @@ GEM
188198
thread_safe (~> 0.1)
189199
uglifier (3.0.2)
190200
execjs (>= 0.3.0, < 3)
191-
web-console (2.3.0)
192-
activemodel (>= 4.0)
193-
binding_of_caller (>= 0.7.2)
194-
railties (>= 4.0)
195-
sprockets-rails (>= 2.0, < 4.0)
201+
web-console (3.3.1)
202+
actionview (>= 5.0)
203+
activemodel (>= 5.0)
204+
debug_inspector
205+
railties (>= 5.0)
196206
websocket (1.2.3)
207+
websocket-driver (0.6.4)
208+
websocket-extensions (>= 0.1.0)
209+
websocket-extensions (0.1.2)
197210
xpath (2.0.0)
198211
nokogiri (~> 1.3)
199212

@@ -205,25 +218,29 @@ DEPENDENCIES
205218
bootstrap (~> 4.0.0.alpha3.1)
206219
byebug
207220
capybara
208-
coffee-rails (~> 4.1.0)
221+
coffee-rails (~> 4.2)
209222
database_cleaner
210223
factory_girl_rails
211224
faker
212225
high_voltage
213-
jbuilder (~> 2.0)
226+
jbuilder (~> 2.5)
214227
jquery-rails
215228
launchy
216-
rails (= 4.2.7.1)
229+
listen (~> 3.0.5)
230+
puma (~> 3.0)
231+
rails (~> 5.0.0, >= 5.0.0.1)
217232
rails_layout
218233
rspec-rails
219234
sass-rails (~> 5.0)
220235
selenium-webdriver
221236
spring
222237
spring-commands-rspec
238+
spring-watcher-listen (~> 2.0.0)
223239
sqlite3
224-
turbolinks
240+
turbolinks (~> 5)
241+
tzinfo-data
225242
uglifier (>= 1.3.0)
226-
web-console (~> 2.0)
243+
web-console
227244

228245
RUBY VERSION
229246
ruby 2.3.1p112

Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Add your own tasks in files placed in lib/tasks ending in .rake,
22
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
33

4-
require File.expand_path('../config/application', __FILE__)
4+
require_relative 'config/application'
55

66
Rails.application.load_tasks

app/assets/config/manifest.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
//= link_tree ../images
2+
//= link_directory ../javascripts .js
3+
//= link_directory ../stylesheets .css

app/assets/javascripts/cable.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// Action Cable provides the framework to deal with WebSockets in Rails.
2+
// You can generate new channels where WebSocket features live using the rails generate channel command.
3+
//
4+
//= require action_cable
5+
//= require_self
6+
//= require_tree ./channels
7+
8+
(function() {
9+
this.App || (this.App = {});
10+
11+
App.cable = ActionCable.createConsumer();
12+
13+
}).call(this);
File renamed without changes.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module ApplicationCable
2+
class Channel < ActionCable::Channel::Base
3+
end
4+
end
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module ApplicationCable
2+
class Connection < ActionCable::Connection::Base
3+
end
4+
end

app/controllers/application_controller.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
class ApplicationController < ActionController::Base
2-
# Prevent CSRF attacks by raising an exception.
3-
# For APIs, you may want to use :null_session instead.
42
protect_from_forgery with: :exception
53

6-
before_filter :show_flash
4+
before_action :show_flash
75

86
private
97

app/jobs/application_job.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
class ApplicationJob < ActiveJob::Base
2+
end

0 commit comments

Comments
 (0)