Skip to content
This repository was archived by the owner on Oct 31, 2023. It is now read-only.

Commit 4be20c2

Browse files
committed
Upgrade to Rails 5.0
[Closes #6]
1 parent 1274c25 commit 4be20c2

File tree

61 files changed

+43772
-305
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+43772
-305
lines changed

.rubocop.yml

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
require: rubocop-rspec
22

3+
RSpec/FilePath:
4+
Enabled: false
5+
36
RSpec/NestedGroups:
47
Enabled: false
58

@@ -37,6 +40,7 @@ Metrics:
3740
Enabled: false
3841

3942
# Naming
43+
4044
Naming/PredicateName:
4145
Enabled: false
4246

@@ -45,9 +49,6 @@ Naming/PredicateName:
4549
Rails:
4650
Enabled: true
4751

48-
Rails/FilePath:
49-
Enabled: false
50-
5152
# Style
5253

5354
Style/Documentation:
@@ -56,6 +57,9 @@ Style/Documentation:
5657
Style/GlobalVars:
5758
AllowedVariables: [$redis]
5859

60+
Style/MixinUsage:
61+
Exclude: [bin/*]
62+
5963
Style/SafeNavigation:
6064
Enabled: false
6165

.travis.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,4 @@ script: ./bin/ci
55
after_script: '[ "$TRAVIS_RUBY_VERSION" != "2.5.5" ] || bundle exec rake coveralls:push'
66
rvm:
77
- 2.5.5
8-
notifications:
9-
email:
10-
on_failure: always
11-
slack:
12-
secure: YLqK6RvH71ZjXEWP84D2AsjDWpG549XE3EQsLizCsURV1VFvDj1g4L9zhVoSAuVj5LLAFSahQqQ1RpZdzaPUtjh72QmHWrOf4lRAS93tH6XTcbIMHCZ8nIO9HX+ErmH8uxEqwiejNxJWvI24hPjfPEtsV2MiJW7Ub2tHABG1WfA=
8+
- 2.6.3

Gemfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "https://rubygems.org"
44

5-
gem "rails", "~> 4.2"
5+
gem "rails", "~> 5.0.0"
66
gem "puma"
77
gem "sass-rails"
88
gem "uglifier" # Use Uglifier as compressor for JavaScript assets
@@ -16,7 +16,7 @@ gem "jquery-rails" # Use jquery as the JavaScript library
1616

1717
# Our additional Gems are listed below
1818
gem "secure_headers", "< 4" # TODO: upgrade
19-
gem "rails-i18n"
19+
gem "rails-i18n", "~> 5.1" # for 5.0.x, 5.1.x and 5.2.x
2020
gem "crazy_money"
2121
gem "ordinalize_full", require: "ordinalize_full/integer"
2222
gem "buckybox-api" # to use the git version: git: "https://github.com/buckybox/buckybox-api-ruby"

Gemfile.lock

+105-96
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,58 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (4.2.11.1)
5-
actionpack (= 4.2.11.1)
6-
actionview (= 4.2.11.1)
7-
activejob (= 4.2.11.1)
4+
actioncable (5.0.7.2)
5+
actionpack (= 5.0.7.2)
6+
nio4r (>= 1.2, < 3.0)
7+
websocket-driver (~> 0.6.1)
8+
actionmailer (5.0.7.2)
9+
actionpack (= 5.0.7.2)
10+
actionview (= 5.0.7.2)
11+
activejob (= 5.0.7.2)
812
mail (~> 2.5, >= 2.5.4)
9-
rails-dom-testing (~> 1.0, >= 1.0.5)
10-
actionpack (4.2.11.1)
11-
actionview (= 4.2.11.1)
12-
activesupport (= 4.2.11.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.7.2)
15+
actionview (= 5.0.7.2)
16+
activesupport (= 5.0.7.2)
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.11.1)
18-
activesupport (= 4.2.11.1)
21+
actionview (5.0.7.2)
22+
activesupport (= 5.0.7.2)
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.3)
23-
activejob (4.2.11.1)
24-
activesupport (= 4.2.11.1)
25-
globalid (>= 0.3.0)
26-
activemodel (4.2.11.1)
27-
activesupport (= 4.2.11.1)
27+
activejob (5.0.7.2)
28+
activesupport (= 5.0.7.2)
29+
globalid (>= 0.3.6)
30+
activemodel (5.0.7.2)
31+
activesupport (= 5.0.7.2)
32+
activemodel-serializers-xml (1.0.2)
33+
activemodel (> 5.x)
34+
activesupport (> 5.x)
2835
builder (~> 3.1)
29-
activerecord (4.2.11.1)
30-
activemodel (= 4.2.11.1)
31-
activesupport (= 4.2.11.1)
32-
arel (~> 6.0)
33-
activesupport (4.2.11.1)
34-
i18n (~> 0.7)
36+
activerecord (5.0.7.2)
37+
activemodel (= 5.0.7.2)
38+
activesupport (= 5.0.7.2)
39+
arel (~> 7.0)
40+
activesupport (5.0.7.2)
41+
concurrent-ruby (~> 1.0, >= 1.0.2)
42+
i18n (>= 0.7, < 2)
3543
minitest (~> 5.1)
36-
thread_safe (~> 0.3, >= 0.3.4)
3744
tzinfo (~> 1.1)
38-
addressable (2.5.2)
45+
addressable (2.6.0)
3946
public_suffix (>= 2.0.2, < 4.0)
40-
arel (6.0.4)
47+
arel (7.1.4)
4148
ast (2.4.0)
4249
autoprefixer-rails (8.2.0)
4350
execjs
4451
axiom-types (0.1.1)
4552
descendants_tracker (~> 0.0.4)
4653
ice_nine (~> 0.11.0)
4754
thread_safe (~> 0.3, >= 0.3.1)
48-
backports (3.11.1)
55+
backports (3.15.0)
4956
better_errors (2.4.0)
5057
coderay (>= 1.0.0)
5158
erubi (>= 1.0.0)
@@ -101,26 +108,26 @@ GEM
101108
crazy_money (1.4.0)
102109
currency_data (>= 1.1.0)
103110
i18n (>= 0.7)
104-
cucumber (3.1.0)
111+
cucumber (3.1.2)
105112
builder (>= 2.1.2)
106-
cucumber-core (~> 3.1.0)
107-
cucumber-expressions (~> 5.0.4)
113+
cucumber-core (~> 3.2.0)
114+
cucumber-expressions (~> 6.0.1)
108115
cucumber-wire (~> 0.0.1)
109116
diff-lcs (~> 1.3)
110-
gherkin (~> 5.0)
117+
gherkin (~> 5.1.0)
111118
multi_json (>= 1.7.5, < 2.0)
112119
multi_test (>= 0.1.2)
113-
cucumber-core (3.1.0)
120+
cucumber-core (3.2.1)
114121
backports (>= 3.8.0)
115122
cucumber-tag_expressions (~> 1.1.0)
116-
gherkin (>= 5.0.0)
117-
cucumber-expressions (5.0.13)
118-
cucumber-rails (1.5.0)
119-
capybara (>= 1.1.2, < 3)
120-
cucumber (>= 1.3.8, < 4)
123+
gherkin (~> 5.0)
124+
cucumber-expressions (6.0.1)
125+
cucumber-rails (1.7.0)
126+
capybara (>= 2.3.0, < 4)
127+
cucumber (>= 3.0.2, < 4)
121128
mime-types (>= 1.17, < 4)
122-
nokogiri (~> 1.5)
123-
railties (>= 4, < 5.2)
129+
nokogiri (~> 1.8)
130+
railties (>= 4.2, < 7)
124131
cucumber-tag_expressions (1.1.1)
125132
cucumber-wire (0.0.1)
126133
currency_data (1.1.0)
@@ -129,13 +136,14 @@ GEM
129136
thread_safe (~> 0.3, >= 0.3.1)
130137
diff-lcs (1.3)
131138
docile (1.1.5)
132-
draper (2.1.0)
133-
actionpack (>= 3.0)
134-
activemodel (>= 3.0)
135-
activesupport (>= 3.0)
136-
request_store (~> 1.0)
139+
draper (3.1.0)
140+
actionpack (>= 5.0)
141+
activemodel (>= 5.0)
142+
activemodel-serializers-xml (>= 1.0)
143+
activesupport (>= 5.0)
144+
request_store (>= 1.0)
137145
equalizer (0.0.11)
138-
erubi (1.7.1)
146+
erubi (1.8.0)
139147
erubis (2.7.0)
140148
ethon (0.11.0)
141149
ffi (>= 1.3.0)
@@ -144,7 +152,7 @@ GEM
144152
ffi (1.10.0)
145153
figaro (1.1.1)
146154
thor (~> 0.14)
147-
gherkin (5.0.0)
155+
gherkin (5.1.0)
148156
globalid (0.4.2)
149157
activesupport (>= 4.2.0)
150158
haml (5.0.4)
@@ -167,6 +175,7 @@ GEM
167175
i18n (0.9.5)
168176
concurrent-ruby (~> 1.0)
169177
ice_nine (0.11.2)
178+
jaro_winkler (1.5.3)
170179
jquery-rails (4.3.1)
171180
rails-dom-testing (>= 1, < 3)
172181
railties (>= 4.2.0)
@@ -182,62 +191,62 @@ GEM
182191
nokogiri (>= 1.5.9)
183192
mail (2.7.1)
184193
mini_mime (>= 0.1.1)
185-
mime-types (3.1)
194+
method_source (0.9.2)
195+
mime-types (3.2.2)
186196
mime-types-data (~> 3.2015)
187-
mime-types-data (3.2016.0521)
188-
mini_mime (1.0.1)
197+
mime-types-data (3.2019.0331)
198+
mini_mime (1.0.2)
189199
mini_portile2 (2.4.0)
190200
minitest (5.11.3)
191201
multi_json (1.13.1)
192202
multi_test (0.1.2)
193203
naught (1.1.0)
204+
nio4r (2.4.0)
194205
nokogiri (1.10.3)
195206
mini_portile2 (~> 2.4.0)
196207
oj (3.5.0)
197208
ordinalize_full (1.5.0)
198209
i18n (~> 0.8)
199-
parallel (1.12.1)
200-
parser (2.5.0.5)
210+
parallel (1.17.0)
211+
parser (2.6.3.0)
201212
ast (~> 2.4.0)
202-
poltergeist (1.17.0)
203-
capybara (~> 2.1)
213+
poltergeist (1.18.1)
214+
capybara (>= 2.1, < 4)
204215
cliver (~> 0.3.1)
205216
websocket-driver (>= 0.2.0)
206-
powerpack (0.1.1)
207-
public_suffix (3.0.2)
217+
public_suffix (3.1.1)
208218
puma (3.11.3)
209-
rack (1.6.11)
219+
rack (2.0.7)
210220
rack-test (0.6.3)
211221
rack (>= 1.0)
212-
rails (4.2.11.1)
213-
actionmailer (= 4.2.11.1)
214-
actionpack (= 4.2.11.1)
215-
actionview (= 4.2.11.1)
216-
activejob (= 4.2.11.1)
217-
activemodel (= 4.2.11.1)
218-
activerecord (= 4.2.11.1)
219-
activesupport (= 4.2.11.1)
220-
bundler (>= 1.3.0, < 2.0)
221-
railties (= 4.2.11.1)
222-
sprockets-rails
223-
rails-deprecated_sanitizer (1.0.3)
224-
activesupport (>= 4.2.0.alpha)
225-
rails-dom-testing (1.0.9)
226-
activesupport (>= 4.2.0, < 5.0)
227-
nokogiri (~> 1.6)
228-
rails-deprecated_sanitizer (>= 1.0.1)
222+
rails (5.0.7.2)
223+
actioncable (= 5.0.7.2)
224+
actionmailer (= 5.0.7.2)
225+
actionpack (= 5.0.7.2)
226+
actionview (= 5.0.7.2)
227+
activejob (= 5.0.7.2)
228+
activemodel (= 5.0.7.2)
229+
activerecord (= 5.0.7.2)
230+
activesupport (= 5.0.7.2)
231+
bundler (>= 1.3.0)
232+
railties (= 5.0.7.2)
233+
sprockets-rails (>= 2.0.0)
234+
rails-dom-testing (2.0.3)
235+
activesupport (>= 4.2.0)
236+
nokogiri (>= 1.6)
229237
rails-html-sanitizer (1.0.4)
230238
loofah (~> 2.2, >= 2.2.2)
231-
rails-i18n (4.0.9)
232-
i18n (~> 0.7)
233-
railties (~> 4.0)
234-
railties (4.2.11.1)
235-
actionpack (= 4.2.11.1)
236-
activesupport (= 4.2.11.1)
239+
rails-i18n (5.1.3)
240+
i18n (>= 0.7, < 2)
241+
railties (>= 5.0, < 6)
242+
railties (5.0.7.2)
243+
actionpack (= 5.0.7.2)
244+
activesupport (= 5.0.7.2)
245+
method_source
237246
rake (>= 0.8.7)
238247
thor (>= 0.18.1, < 2.0)
239248
rainbow (3.0.0)
240-
rake (12.3.2)
249+
rake (12.3.3)
241250
rb-fsevent (0.10.3)
242251
rb-inotify (0.10.0)
243252
ffi (~> 1.0)
@@ -262,16 +271,16 @@ GEM
262271
rspec-mocks (~> 3.7.0)
263272
rspec-support (~> 3.7.0)
264273
rspec-support (3.7.1)
265-
rubocop (0.54.0)
274+
rubocop (0.73.0)
275+
jaro_winkler (~> 1.5.1)
266276
parallel (~> 1.10)
267-
parser (>= 2.5)
268-
powerpack (~> 0.1)
277+
parser (>= 2.6)
269278
rainbow (>= 2.2.2, < 4.0)
270279
ruby-progressbar (~> 1.7)
271-
unicode-display_width (~> 1.0, >= 1.0.1)
280+
unicode-display_width (>= 1.4.0, < 1.7)
272281
rubocop-rspec (1.24.0)
273282
rubocop (>= 0.53.0)
274-
ruby-progressbar (1.9.0)
283+
ruby-progressbar (1.10.1)
275284
ruby_parser (3.11.0)
276285
sexp_processor (~> 4.9)
277286
safe_yaml (1.0.4)
@@ -291,9 +300,9 @@ GEM
291300
select2-rails (3.5.10)
292301
thor (~> 0.14)
293302
sexp_processor (4.10.1)
294-
simple_form (3.5.1)
295-
actionpack (> 4, < 5.2)
296-
activemodel (> 4, < 5.2)
303+
simple_form (4.1.0)
304+
actionpack (>= 5.0)
305+
activemodel (>= 5.0)
297306
simplecov (0.14.1)
298307
docile (~> 1.1.0)
299308
json (>= 1.8, < 3)
@@ -322,7 +331,7 @@ GEM
322331
thread_safe (~> 0.1)
323332
uglifier (4.1.8)
324333
execjs (>= 0.3.0, < 3)
325-
unicode-display_width (1.3.0)
334+
unicode-display_width (1.6.0)
326335
useragent (0.16.10)
327336
vcr (4.0.0)
328337
virtus (1.0.5)
@@ -334,10 +343,10 @@ GEM
334343
addressable (>= 2.3.6)
335344
crack (>= 0.3.2)
336345
hashdiff
337-
websocket-driver (0.7.0)
346+
websocket-driver (0.6.5)
338347
websocket-extensions (>= 0.1.0)
339-
websocket-extensions (0.1.3)
340-
xpath (3.0.0)
348+
websocket-extensions (0.1.4)
349+
xpath (3.2.0)
341350
nokogiri (~> 1.8)
342351

343352
PLATFORMS
@@ -371,9 +380,9 @@ DEPENDENCIES
371380
ordinalize_full
372381
poltergeist
373382
puma
374-
rails (~> 4.2)
383+
rails (~> 5.0.0)
375384
rails-html-sanitizer
376-
rails-i18n
385+
rails-i18n (~> 5.1)
377386
redis
378387
rspec-rails
379388
rubocop

0 commit comments

Comments
 (0)