Skip to content

Commit 2238f9a

Browse files
committed
Update dependencies.
1 parent b66602a commit 2238f9a

File tree

8 files changed

+140
-108
lines changed

8 files changed

+140
-108
lines changed

.github/workflows/rubocop.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ jobs:
88
- name: Set up Ruby
99
uses: ruby/setup-ruby@v1
1010
with:
11-
ruby-version: 2.7
11+
ruby-version: 2.6.5
1212
bundler-cache: true
13-
- run: bundle exec rubocop
13+
- run: bundle exec rubocop

.rubocop.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
AllCops:
2+
NewCops: enable
23
Exclude:
34
- vendor/**/*
45

56
Metrics:
67
Enabled: false
78

8-
Metrics/LineLength:
9+
Layout/LineLength:
910
Max: 256
1011
Enabled: false
1112

.rubocop_todo.yml

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,43 @@
11
# This configuration was generated by
22
# `rubocop --auto-gen-config`
3-
# on 2019-11-16 11:24:41 -0500 using RuboCop version 0.76.0.
3+
# on 2022-06-18 00:01:02 UTC using RuboCop version 1.30.1.
44
# The point is for the user to remove these configuration records
55
# one by one as the offenses are removed from the code base.
66
# Note that changes in the inspected code, or installation of new
77
# versions of RuboCop, may require this file to be generated again.
88

99
# Offense count: 1
10-
Lint/AmbiguousBlockAssociation:
10+
# This cop supports unsafe autocorrection (--autocorrect-all).
11+
Lint/NonDeterministicRequireOrder:
1112
Exclude:
12-
- 'api/entities.rb'
13+
- 'config/application.rb'
1314

1415
# Offense count: 1
1516
Lint/UriEscapeUnescape:
1617
Exclude:
1718
- 'api/upload_file.rb'
1819

1920
# Offense count: 1
20-
# Cop supports --auto-correct.
21+
# This cop supports safe autocorrection (--autocorrect).
2122
# Configuration parameters: EnforcedStyle.
2223
# SupportedStyles: line_count_dependent, lambda, literal
2324
Style/Lambda:
2425
Exclude:
2526
- 'app/acme_app.rb'
2627

2728
# Offense count: 1
28-
# Cop supports --auto-correct.
29+
# This cop supports unsafe autocorrection (--autocorrect-all).
30+
Style/MapToHash:
31+
Exclude:
32+
- 'spec/api/documentation_spec.rb'
33+
34+
# Offense count: 1
35+
Style/OpenStructUse:
36+
Exclude:
37+
- 'api/entities.rb'
38+
39+
# Offense count: 1
40+
# This cop supports safe autocorrection (--autocorrect).
2941
Style/RescueModifier:
3042
Exclude:
3143
- 'api/get_json.rb'

Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ group :development do
1818
gem 'guard-rack'
1919
gem 'rake'
2020
gem 'rubocop'
21+
gem 'rubocop-rake'
22+
gem 'rubocop-rspec'
2123
end
2224

2325
group :test do

Gemfile.lock

Lines changed: 112 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,71 @@
11
GEM
22
remote: http://rubygems.org/
33
specs:
4-
activesupport (6.1.4.1)
4+
activesupport (6.1.6)
55
concurrent-ruby (~> 1.0, >= 1.0.2)
66
i18n (>= 1.6, < 2)
77
minitest (>= 5.1)
88
tzinfo (~> 2.0)
99
zeitwerk (~> 2.3)
1010
addressable (2.8.0)
1111
public_suffix (>= 2.0.2, < 5.0)
12-
ast (2.4.0)
13-
axiom-types (0.1.1)
14-
descendants_tracker (~> 0.0.4)
15-
ice_nine (~> 0.11.0)
16-
thread_safe (~> 0.3, >= 0.3.1)
17-
builder (3.2.3)
18-
capybara (3.29.0)
12+
ast (2.4.2)
13+
builder (3.2.4)
14+
capybara (3.36.0)
1915
addressable
16+
matrix
2017
mini_mime (>= 0.1.3)
2118
nokogiri (~> 1.8)
2219
rack (>= 1.6.0)
2320
rack-test (>= 0.6.3)
24-
regexp_parser (~> 1.5)
21+
regexp_parser (>= 1.5, < 3.0)
2522
xpath (~> 3.2)
26-
childprocess (3.0.0)
27-
coderay (1.1.2)
28-
coercible (1.0.0)
29-
descendants_tracker (~> 0.0.1)
30-
concurrent-ruby (1.1.9)
31-
descendants_tracker (0.0.4)
32-
thread_safe (~> 0.3, >= 0.3.1)
33-
diff-lcs (1.3)
34-
equalizer (0.0.11)
35-
ffi (1.11.2)
36-
formatador (0.2.5)
37-
grape (1.2.4)
23+
childprocess (4.1.0)
24+
coderay (1.1.3)
25+
concurrent-ruby (1.1.10)
26+
diff-lcs (1.5.0)
27+
dry-configurable (0.13.0)
28+
concurrent-ruby (~> 1.0)
29+
dry-core (~> 0.6)
30+
dry-container (0.9.0)
31+
concurrent-ruby (~> 1.0)
32+
dry-configurable (~> 0.13, >= 0.13.0)
33+
dry-core (0.7.1)
34+
concurrent-ruby (~> 1.0)
35+
dry-inflector (0.2.1)
36+
dry-logic (1.2.0)
37+
concurrent-ruby (~> 1.0)
38+
dry-core (~> 0.5, >= 0.5)
39+
dry-types (1.5.1)
40+
concurrent-ruby (~> 1.0)
41+
dry-container (~> 0.3)
42+
dry-core (~> 0.5, >= 0.5)
43+
dry-inflector (~> 0.1, >= 0.1.2)
44+
dry-logic (~> 1.0, >= 1.0.2)
45+
ffi (1.15.5)
46+
formatador (1.1.0)
47+
grape (1.6.2)
3848
activesupport
3949
builder
50+
dry-types (>= 1.1)
4051
mustermann-grape (~> 1.0.0)
4152
rack (>= 1.3.0)
4253
rack-accept
43-
virtus (>= 1.0.0)
44-
grape-entity (0.7.1)
45-
activesupport (>= 4.0)
54+
grape-entity (0.10.1)
55+
activesupport (>= 3.0.0)
4656
multi_json (>= 1.3.2)
47-
grape-swagger (0.33.0)
48-
grape (>= 0.16.2)
49-
grape-swagger-entity (0.3.3)
50-
grape-entity (>= 0.5.0)
51-
grape-swagger (>= 0.31.0)
52-
guard (2.16.1)
57+
grape-swagger (1.4.2)
58+
grape (~> 1.3)
59+
grape-swagger-entity (0.5.1)
60+
grape-entity (>= 0.6.0)
61+
grape-swagger (>= 1.2.0)
62+
guard (2.18.0)
5363
formatador (>= 0.2.4)
5464
listen (>= 2.7, < 4.0)
5565
lumberjack (>= 1.0.12, < 2.0)
5666
nenv (~> 0.1)
5767
notiffany (~> 0.0)
58-
pry (>= 0.9.12)
68+
pry (>= 0.13.0)
5969
shellany (~> 0.0)
6070
thor (>= 0.18.1)
6171
guard-bundler (2.2.1)
@@ -67,96 +77,101 @@ GEM
6777
ffi
6878
guard (~> 2.3)
6979
spoon
70-
i18n (1.8.10)
80+
i18n (1.10.0)
7181
concurrent-ruby (~> 1.0)
72-
ice_nine (0.11.2)
73-
jaro_winkler (1.5.4)
74-
json (2.3.0)
75-
listen (3.2.0)
82+
json (2.6.2)
83+
listen (3.7.1)
7684
rb-fsevent (~> 0.10, >= 0.10.3)
7785
rb-inotify (~> 0.9, >= 0.9.10)
78-
lumberjack (1.0.13)
79-
method_source (0.9.2)
80-
mime-types (3.3)
86+
lumberjack (1.2.8)
87+
matrix (0.4.2)
88+
method_source (1.0.0)
89+
mime-types (3.4.1)
8190
mime-types-data (~> 3.2015)
82-
mime-types-data (3.2019.1009)
83-
mini_mime (1.0.2)
84-
mini_portile2 (2.6.1)
85-
minitest (5.14.4)
86-
multi_json (1.14.1)
87-
mustermann (1.0.3)
88-
mustermann-grape (1.0.0)
89-
mustermann (~> 1.0.0)
91+
mime-types-data (3.2022.0105)
92+
mini_mime (1.1.2)
93+
mini_portile2 (2.8.0)
94+
minitest (5.16.0)
95+
multi_json (1.15.0)
96+
mustermann (1.1.1)
97+
ruby2_keywords (~> 0.0.1)
98+
mustermann-grape (1.0.2)
99+
mustermann (>= 1.0.0)
90100
nenv (0.3.0)
91-
newrelic_rpm (6.7.0.359)
92-
nokogiri (1.12.5)
93-
mini_portile2 (~> 2.6.1)
101+
newrelic_rpm (8.8.0)
102+
nokogiri (1.13.6)
103+
mini_portile2 (~> 2.8.0)
94104
racc (~> 1.4)
95105
notiffany (0.1.3)
96106
nenv (~> 0.1)
97107
shellany (~> 0.0)
98-
parallel (1.19.0)
99-
parser (2.6.5.0)
100-
ast (~> 2.4.0)
101-
pry (0.12.2)
102-
coderay (~> 1.1.0)
103-
method_source (~> 0.9.0)
104-
public_suffix (4.0.6)
105-
racc (1.5.2)
106-
rack (2.2.3)
108+
parallel (1.22.1)
109+
parser (3.1.2.0)
110+
ast (~> 2.4.1)
111+
pry (0.14.1)
112+
coderay (~> 1.1)
113+
method_source (~> 1.0)
114+
public_suffix (4.0.7)
115+
racc (1.6.0)
116+
rack (2.2.3.1)
107117
rack-accept (0.4.5)
108118
rack (>= 0.4)
109-
rack-cors (1.0.6)
110-
rack (>= 1.6.0)
119+
rack-cors (1.1.1)
120+
rack (>= 2.0.0)
111121
rack-test (1.1.0)
112122
rack (>= 1.0, < 3)
113-
rainbow (3.0.0)
114-
rake (13.0.1)
115-
rb-fsevent (0.10.3)
116-
rb-inotify (0.10.0)
123+
rainbow (3.1.1)
124+
rake (13.0.6)
125+
rb-fsevent (0.11.1)
126+
rb-inotify (0.10.1)
117127
ffi (~> 1.0)
118-
regexp_parser (1.6.0)
119-
rspec (3.9.0)
120-
rspec-core (~> 3.9.0)
121-
rspec-expectations (~> 3.9.0)
122-
rspec-mocks (~> 3.9.0)
123-
rspec-core (3.9.0)
124-
rspec-support (~> 3.9.0)
125-
rspec-expectations (3.9.0)
128+
regexp_parser (2.5.0)
129+
rexml (3.2.5)
130+
rspec (3.11.0)
131+
rspec-core (~> 3.11.0)
132+
rspec-expectations (~> 3.11.0)
133+
rspec-mocks (~> 3.11.0)
134+
rspec-core (3.11.0)
135+
rspec-support (~> 3.11.0)
136+
rspec-expectations (3.11.0)
126137
diff-lcs (>= 1.2.0, < 2.0)
127-
rspec-support (~> 3.9.0)
128-
rspec-mocks (3.9.0)
138+
rspec-support (~> 3.11.0)
139+
rspec-mocks (3.11.1)
129140
diff-lcs (>= 1.2.0, < 2.0)
130-
rspec-support (~> 3.9.0)
131-
rspec-support (3.9.0)
132-
rubocop (0.76.0)
133-
jaro_winkler (~> 1.5.1)
141+
rspec-support (~> 3.11.0)
142+
rspec-support (3.11.0)
143+
rubocop (1.30.1)
134144
parallel (~> 1.10)
135-
parser (>= 2.6)
145+
parser (>= 3.1.0.0)
136146
rainbow (>= 2.2.2, < 4.0)
147+
regexp_parser (>= 1.8, < 3.0)
148+
rexml (>= 3.2.5, < 4.0)
149+
rubocop-ast (>= 1.18.0, < 2.0)
137150
ruby-progressbar (~> 1.7)
138-
unicode-display_width (>= 1.4.0, < 1.7)
139-
ruby-progressbar (1.10.1)
140-
rubyzip (2.0.0)
141-
selenium-webdriver (3.142.6)
142-
childprocess (>= 0.5, < 4.0)
151+
unicode-display_width (>= 1.4.0, < 3.0)
152+
rubocop-ast (1.18.0)
153+
parser (>= 3.1.1.0)
154+
rubocop-rake (0.6.0)
155+
rubocop (~> 1.0)
156+
rubocop-rspec (2.9.0)
157+
rubocop (~> 1.19)
158+
ruby-progressbar (1.11.0)
159+
ruby2_keywords (0.0.5)
160+
rubyzip (2.3.2)
161+
selenium-webdriver (4.1.0)
162+
childprocess (>= 0.5, < 5.0)
163+
rexml (~> 3.2, >= 3.2.5)
143164
rubyzip (>= 1.2.2)
144165
shellany (0.0.1)
145166
spoon (0.0.6)
146167
ffi
147-
thor (0.20.3)
148-
thread_safe (0.3.6)
168+
thor (1.2.1)
149169
tzinfo (2.0.4)
150170
concurrent-ruby (~> 1.0)
151-
unicode-display_width (1.6.0)
152-
virtus (1.0.5)
153-
axiom-types (~> 0.1)
154-
coercible (~> 1.0)
155-
descendants_tracker (~> 0.0, >= 0.0.3)
156-
equalizer (~> 0.0, >= 0.0.9)
171+
unicode-display_width (2.1.0)
157172
xpath (3.2.0)
158173
nokogiri (~> 1.8)
159-
zeitwerk (2.4.2)
174+
zeitwerk (2.6.0)
160175

161176
PLATFORMS
162177
ruby
@@ -179,10 +194,12 @@ DEPENDENCIES
179194
rake
180195
rspec
181196
rubocop
197+
rubocop-rake
198+
rubocop-rspec
182199
selenium-webdriver
183200

184201
RUBY VERSION
185202
ruby 2.6.5p114
186203

187204
BUNDLED WITH
188-
1.17.2
205+
1.17.3

api/wrap_response_decorator.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ def initialize(app)
66

77
def call(env)
88
status, headers, body_proxy = @app.call(env)
9-
bodies = body_proxy.body.map do |body|
9+
bodies = body_proxy.map do |body|
1010
{ body: JSON.parse(body), status: status }.to_json
1111
end
1212
[200, headers, bodies]

config/application.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
require 'boot'
66

7-
Bundler.require :default, ENV['RACK_ENV']
7+
Bundler.require :default, ENV.fetch('RACK_ENV', nil)
88

99
Dir[File.expand_path('../api/*.rb', __dir__)].each do |f|
1010
require f

0 commit comments

Comments
 (0)