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

Commit 75afe61

Browse files
committed
refactor: update to ruby3
1 parent 633ab01 commit 75afe61

File tree

10 files changed

+155
-145
lines changed

10 files changed

+155
-145
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ jobs:
1313
runs-on: ubuntu-20.04
1414
strategy:
1515
matrix:
16-
ruby-version:
17-
- 2.5.7
18-
- 3.0.4
16+
ruby-version: ['2.5.7', '3.0.4']
1917
mongodb-version: ['4.2.14']
2018
include:
2119
- ruby-version: 2.5.7

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ gem 'rack-protection', '~> 1.5.5'
6060
group :test do
6161
gem 'codecov', :require => false
6262
gem 'mongoid_cleaner', '~> 1.2.0'
63-
gem 'factory_girl', '~> 4.0'
63+
gem 'factory_bot'
6464
gem 'faker', '~> 1.6'
6565
gem 'guard'
6666
gem 'guard-unicorn'

Gemfile.lock

Lines changed: 114 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
GIT
22
remote: https://github.com/edx/mongoid-tree
3-
revision: c7407871e32d472b98c3f31bc30a44118e4e6dfc
3+
revision: 51384016e09a0623fe7b5511b6aff1435607ee0f
44
specs:
55
mongoid-tree (2.1.1)
66
mongoid (>= 4.0, < 8)
@@ -24,182 +24,194 @@ GEM
2424
minitest (~> 5.1)
2525
tzinfo (~> 1.1)
2626
zeitwerk (~> 2.2, >= 2.2.2)
27-
addressable (2.8.0)
28-
public_suffix (>= 2.0.2, < 5.0)
29-
bson (4.7.0)
27+
addressable (2.8.1)
28+
public_suffix (>= 2.0.2, < 6.0)
29+
bson (4.15.0)
3030
bson_ext (1.5.1)
31-
codecov (0.2.6)
32-
colorize
33-
json
34-
simplecov
35-
coderay (1.1.1)
36-
colorize (0.8.1)
37-
concurrent-ruby (1.1.9)
38-
crack (0.4.3)
39-
safe_yaml (~> 1.0.0)
40-
dalli (2.7.6)
41-
delayed_job (4.1.8)
42-
activesupport (>= 3.0, < 6.1)
43-
delayed_job_mongoid (2.3.1)
31+
codecov (0.6.0)
32+
simplecov (>= 0.15, < 0.22)
33+
coderay (1.1.3)
34+
concurrent-ruby (1.1.10)
35+
crack (0.4.5)
36+
rexml
37+
dalli (3.2.0)
38+
delayed_job (4.1.10)
39+
activesupport (>= 3.0, < 8.0)
40+
delayed_job_mongoid (3.0.0)
4441
delayed_job (>= 3.0, < 5)
45-
mongoid (>= 3.0, < 8)
46-
mongoid-compatibility (>= 0.4.0)
47-
diff-lcs (1.3)
48-
docile (1.3.2)
49-
domain_name (0.5.20170404)
42+
mongoid (>= 5.0)
43+
diff-lcs (1.5.0)
44+
docile (1.4.0)
45+
domain_name (0.5.20190701)
5046
unf (>= 0.0.5, < 1.0.0)
51-
elasticsearch (7.8.0)
52-
elasticsearch-api (= 7.8.0)
53-
elasticsearch-transport (= 7.8.0)
54-
elasticsearch-api (7.8.0)
47+
elasticsearch (7.8.1)
48+
elasticsearch-api (= 7.8.1)
49+
elasticsearch-transport (= 7.8.1)
50+
elasticsearch-api (7.8.1)
5551
multi_json
56-
elasticsearch-model (7.1.0)
52+
elasticsearch-model (7.1.1)
5753
activesupport (> 3)
5854
elasticsearch (> 1)
5955
hashie
60-
elasticsearch-transport (7.8.0)
56+
elasticsearch-transport (7.8.1)
6157
faraday (~> 1)
6258
multi_json
63-
enumerize (2.1.2)
59+
enumerize (2.5.0)
6460
activesupport (>= 3.2)
6561
eventmachine (1.2.7)
66-
factory_girl (4.8.0)
67-
activesupport (>= 3.0.0)
68-
faker (1.7.3)
69-
i18n (~> 0.5)
70-
faraday (1.0.1)
71-
multipart-post (>= 1.2, < 3)
62+
factory_bot (6.2.1)
63+
activesupport (>= 5.0.0)
64+
faker (1.9.6)
65+
i18n (>= 0.7)
66+
faraday (1.10.2)
67+
faraday-em_http (~> 1.0)
68+
faraday-em_synchrony (~> 1.0)
69+
faraday-excon (~> 1.1)
70+
faraday-httpclient (~> 1.0)
71+
faraday-multipart (~> 1.0)
72+
faraday-net_http (~> 1.0)
73+
faraday-net_http_persistent (~> 1.0)
74+
faraday-patron (~> 1.0)
75+
faraday-rack (~> 1.0)
76+
faraday-retry (~> 1.0)
77+
ruby2_keywords (>= 0.0.4)
78+
faraday-em_http (1.0.0)
79+
faraday-em_synchrony (1.0.0)
80+
faraday-excon (1.1.0)
81+
faraday-httpclient (1.0.1)
82+
faraday-multipart (1.0.4)
83+
multipart-post (~> 2)
84+
faraday-net_http (1.0.1)
85+
faraday-net_http_persistent (1.2.0)
86+
faraday-patron (1.0.0)
87+
faraday-rack (1.0.0)
88+
faraday-retry (1.0.3)
7289
faye-websocket (0.11.1)
7390
eventmachine (>= 0.12.0)
7491
websocket-driver (>= 0.5.1)
7592
ffi (1.9.25)
76-
formatador (0.2.5)
77-
guard (2.14.1)
93+
formatador (1.1.0)
94+
guard (2.18.0)
7895
formatador (>= 0.2.4)
7996
listen (>= 2.7, < 4.0)
80-
lumberjack (~> 1.0)
97+
lumberjack (>= 1.0.12, < 2.0)
8198
nenv (~> 0.1)
8299
notiffany (~> 0.0)
83-
pry (>= 0.9.12)
100+
pry (>= 0.13.0)
84101
shellany (~> 0.0)
85102
thor (>= 0.18.1)
86103
guard-unicorn (0.2.0)
87104
guard (>= 1.1)
88-
hashdiff (0.3.4)
89-
hashie (4.1.0)
90-
http-cookie (1.0.3)
105+
hashdiff (1.0.1)
106+
hashie (5.0.0)
107+
http-accept (1.7.0)
108+
http-cookie (1.0.5)
91109
domain_name (~> 0.5)
92-
i18n (0.9.5)
110+
i18n (1.12.0)
93111
concurrent-ruby (~> 1.0)
94-
json (2.3.1)
95-
kgio (2.11.0)
96-
listen (3.1.5)
97-
rb-fsevent (~> 0.9, >= 0.9.4)
98-
rb-inotify (~> 0.9, >= 0.9.7)
99-
ruby_dep (~> 1.2)
100-
lumberjack (1.0.12)
101-
method_source (0.8.2)
102-
mime-types (3.1)
112+
kgio (2.11.4)
113+
listen (3.7.1)
114+
rb-fsevent (~> 0.10, >= 0.10.3)
115+
rb-inotify (~> 0.9, >= 0.9.10)
116+
lumberjack (1.2.8)
117+
method_source (1.0.0)
118+
mime-types (3.4.1)
103119
mime-types-data (~> 3.2015)
104-
mime-types-data (3.2016.0521)
120+
mime-types-data (3.2022.0105)
105121
mini_portile2 (2.3.0)
106122
minitest (5.15.0)
107-
mongo (2.5.3)
108-
bson (>= 4.3.0, < 5.0.0)
109-
mongoid (7.0.5)
110-
activemodel (>= 5.1, < 6.1)
111-
mongo (>= 2.5.1, < 3.0.0)
112-
origin (~> 2.1)
113-
tzinfo (>= 0.3.37)
114-
mongoid-compatibility (0.4.1)
115-
activesupport
116-
mongoid (>= 2.0)
123+
mongo (2.18.1)
124+
bson (>= 4.14.1, < 5.0.0)
125+
mongoid (7.5.1)
126+
activemodel (>= 5.1, < 7.1, != 7.0.0)
127+
mongo (>= 2.10.5, < 3.0.0)
128+
ruby2_keywords (~> 0.0.5)
117129
mongoid_cleaner (1.2.0)
118130
mongoid (>= 4.0)
119131
mongoid_magic_counter_cache (1.1.1)
120132
mongoid
121133
rake
122134
multi_json (1.15.0)
123-
multipart-post (2.1.1)
135+
multipart-post (2.2.3)
124136
nenv (0.3.0)
125137
netrc (0.11.0)
126-
newrelic_rpm (5.6.0.349)
127-
nokogiri (1.8.1)
138+
newrelic_rpm (8.10.1)
139+
nokogiri (1.8.5)
128140
mini_portile2 (~> 2.3.0)
129-
notiffany (0.1.1)
141+
notiffany (0.1.3)
130142
nenv (~> 0.1)
131143
shellany (~> 0.0)
132-
origin (2.3.1)
133-
protected_attributes_continued (1.5.0)
144+
protected_attributes_continued (1.8.2)
134145
activemodel (>= 5.0)
135-
pry (0.10.4)
136-
coderay (~> 1.1.0)
137-
method_source (~> 0.8.1)
138-
slop (~> 3.4)
139-
pry-nav (0.2.4)
140-
pry (>= 0.9.10, < 0.11.0)
141-
public_suffix (4.0.6)
146+
pry (0.14.1)
147+
coderay (~> 1.1)
148+
method_source (~> 1.0)
149+
pry-nav (1.0.0)
150+
pry (>= 0.9.10, < 0.15)
151+
public_suffix (4.0.7)
142152
rack (1.6.13)
143153
rack-protection (1.5.5)
144154
rack
145-
rack-test (0.6.3)
146-
rack (>= 1.0)
147-
rack-timeout (0.4.2)
148-
raindrops (0.18.0)
155+
rack-test (2.0.2)
156+
rack (>= 1.3)
157+
rack-timeout (0.6.3)
158+
raindrops (0.20.0)
149159
rake (12.3.3)
150-
rb-fsevent (0.9.8)
151-
rb-inotify (0.9.10)
152-
ffi (>= 0.5.0, < 2)
153-
rdiscount (2.2.0.1)
154-
rest-client (2.0.2)
160+
rb-fsevent (0.11.2)
161+
rb-inotify (0.10.1)
162+
ffi (~> 1.0)
163+
rdiscount (2.2.0.2)
164+
rest-client (2.1.0)
165+
http-accept (>= 1.7.0, < 2.0)
155166
http-cookie (>= 1.0.2, < 2.0)
156167
mime-types (>= 1.16, < 4.0)
157168
netrc (~> 0.8)
169+
rexml (3.2.5)
158170
rs_voteable_mongo (1.3.0)
159171
mongoid (~> 7.0)
160172
rspec (3.6.0)
161173
rspec-core (~> 3.6.0)
162174
rspec-expectations (~> 3.6.0)
163175
rspec-mocks (~> 3.6.0)
164-
rspec-collection_matchers (1.1.3)
176+
rspec-collection_matchers (1.2.0)
165177
rspec-expectations (>= 2.99.0.beta1)
166178
rspec-core (3.6.0)
167179
rspec-support (~> 3.6.0)
168180
rspec-expectations (3.6.0)
169181
diff-lcs (>= 1.2.0, < 2.0)
170182
rspec-support (~> 3.6.0)
171-
rspec-its (1.2.0)
183+
rspec-its (1.3.0)
172184
rspec-core (>= 3.0.0)
173185
rspec-expectations (>= 3.0.0)
174186
rspec-mocks (3.6.0)
175187
diff-lcs (>= 1.2.0, < 2.0)
176188
rspec-support (~> 3.6.0)
177189
rspec-support (3.6.0)
178-
ruby_dep (1.5.0)
190+
ruby2_keywords (0.0.5)
179191
rubyzip (1.2.4)
180-
safe_yaml (1.0.4)
181192
shellany (0.0.1)
182-
simplecov (0.19.0)
193+
simplecov (0.21.2)
183194
docile (~> 1.1)
184195
simplecov-html (~> 0.11)
185-
simplecov-html (0.12.2)
196+
simplecov_json_formatter (~> 0.1)
197+
simplecov-html (0.12.3)
198+
simplecov_json_formatter (0.1.4)
186199
sinatra (1.4.8)
187200
rack (~> 1.5)
188201
rack-protection (~> 1.4)
189202
tilt (>= 1.3, < 3)
190-
sinatra-param (1.4.0)
191-
sinatra (~> 1.3)
192-
slop (3.6.0)
193-
thor (0.19.4)
203+
sinatra-param (1.6.0)
204+
sinatra (>= 1.3)
205+
thor (1.2.1)
194206
thread_safe (0.3.6)
195-
tilt (2.0.7)
207+
tilt (2.0.11)
196208
timecop (0.9.5)
197-
tzinfo (1.2.9)
209+
tzinfo (1.2.10)
198210
thread_safe (~> 0.1)
199211
unf (0.1.4)
200212
unf_ext
201-
unf_ext (0.0.7.4)
202-
unicorn (5.3.1)
213+
unf_ext (0.0.8.2)
214+
unicorn (6.1.0)
203215
kgio (~> 2.6)
204216
raindrops (~> 0.7)
205217
webmock (3.0.1)
@@ -209,12 +221,12 @@ GEM
209221
websocket-driver (0.7.5)
210222
websocket-extensions (>= 0.1.0)
211223
websocket-extensions (0.1.5)
212-
will_paginate (3.1.6)
224+
will_paginate (3.3.1)
213225
will_paginate_mongoid (2.0.1)
214226
mongoid
215227
will_paginate (~> 3.0)
216228
yajl-ruby (1.3.1)
217-
zeitwerk (2.5.4)
229+
zeitwerk (2.6.0)
218230

219231
PLATFORMS
220232
ruby
@@ -233,7 +245,7 @@ DEPENDENCIES
233245
elasticsearch (~> 7.8.0)
234246
elasticsearch-model (~> 7.1.0)
235247
enumerize
236-
factory_girl (~> 4.0)
248+
factory_bot
237249
faker (~> 1.6)
238250
faye-websocket (~> 0.11.0)
239251
ffi (~> 1.9.24)

Gemfile3

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,15 @@ gem 'rack-protection', '~> 1.5.5'
6060
group :test do
6161
gem 'codecov', :require => false
6262
gem 'mongoid_cleaner', '~> 1.2.0'
63-
gem 'factory_girl', '~> 4.0'
64-
gem 'faker', '~> 1.6'
63+
gem 'factory_bot'
64+
gem 'faker'
6565
gem 'guard'
6666
gem 'guard-unicorn'
6767
gem 'rack-test', :require => 'rack/test'
6868
gem 'rspec', '~> 3.6.0'
6969
gem 'rspec-its'
7070
gem 'rspec-collection_matchers'
71-
gem 'webmock', '~> 3.0.1'
71+
gem 'webmock'
7272
end
7373

7474
group 'newrelic_rpm' do

0 commit comments

Comments
 (0)