Skip to content

Commit dcbb668

Browse files
night91night91
authored
Merge pull request #6 from amco/allow_rails-7-1
Support rails 7.1
2 parents e4e1230 + c7d3bae commit dcbb668

40 files changed

+181
-204
lines changed

‎.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.7.2
1+
3.1.2

‎.travis.yml

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,28 @@
11
cache: bundler
22
language: ruby
33
rvm:
4-
- 2.5.8
5-
- 2.6.6
64
- 2.7.2
75
- 3.0.0
6+
- 3.1.2
87
- ruby-head
98

109
gemfile:
11-
- gemfiles/rails_5.0.gemfile
12-
- gemfiles/rails_5.1.gemfile
13-
- gemfiles/rails_5.2.gemfile
1410
- gemfiles/rails_6.0.gemfile
1511
- gemfiles/rails_6.1.gemfile
12+
- gemfiles/rails_7.0.gemfile
1613

1714
jobs:
1815
fast_finish: true
1916
allow_failures:
2017
- rvm: ruby-head
2118
exclude:
22-
- rvm: 2.5.8
19+
- rvm: 3.0.0
20+
gemfile: gemfiles/rails_6.0.gemfile
21+
- rvm: 3.1.2
2322
gemfile: gemfiles/rails_6.0.gemfile
24-
- rvm: 2.5.8
23+
- rvm: 3.1.2
2524
gemfile: gemfiles/rails_6.1.gemfile
2625
- rvm: 2.7.2
27-
gemfile: gemfiles/rails_5.0.gemfile
28-
- rvm: 2.7.2
29-
gemfile: gemfiles/rails_5.1.gemfile
30-
- rvm: 2.7.2
31-
gemfile: gemfiles/rails_5.2.gemfile
32-
- rvm: 3.0.0
33-
gemfile: gemfiles/rails_5.0.gemfile
34-
- rvm: 3.0.0
35-
gemfile: gemfiles/rails_5.1.gemfile
26+
gemfile: gemfiles/rails_7.0.gemfile
3627
- rvm: 3.0.0
37-
gemfile: gemfiles/rails_5.2.gemfile
28+
gemfile: gemfiles/rails_7.0.gemfile

‎Appraisals

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
1-
appraise "rails-5.0" do
2-
gem 'rails', '~> 5.0.0'
3-
end
4-
5-
appraise "rails-5.1" do
6-
gem 'rails', '~> 5.1.0'
7-
end
8-
9-
appraise "rails-5.2" do
10-
gem 'rails', '~> 5.2.0'
11-
end
12-
131
appraise "rails-6.0" do
142
gem 'rails', '~> 6.0.0'
153
end
164

175
appraise "rails-6.1" do
186
gem 'rails', '~> 6.1.0'
197
end
8+
9+
appraise "rails-7.0" do
10+
gem 'rails', '~> 7.0.0'
11+
end

‎Gemfile.lock

Lines changed: 124 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -1,145 +1,164 @@
11
PATH
22
remote: .
33
specs:
4-
acl9 (3.1.0)
5-
rails (> 5.0, < 7.0)
4+
acl9 (3.2.0)
5+
rails (>= 6.0, < 7.1)
66

77
GEM
88
remote: http://rubygems.org/
99
specs:
10-
actioncable (6.0.0)
11-
actionpack (= 6.0.0)
10+
actioncable (7.0.3.1)
11+
actionpack (= 7.0.3.1)
12+
activesupport (= 7.0.3.1)
1213
nio4r (~> 2.0)
1314
websocket-driver (>= 0.6.1)
14-
actionmailbox (6.0.0)
15-
actionpack (= 6.0.0)
16-
activejob (= 6.0.0)
17-
activerecord (= 6.0.0)
18-
activestorage (= 6.0.0)
19-
activesupport (= 6.0.0)
15+
actionmailbox (7.0.3.1)
16+
actionpack (= 7.0.3.1)
17+
activejob (= 7.0.3.1)
18+
activerecord (= 7.0.3.1)
19+
activestorage (= 7.0.3.1)
20+
activesupport (= 7.0.3.1)
2021
mail (>= 2.7.1)
21-
actionmailer (6.0.0)
22-
actionpack (= 6.0.0)
23-
actionview (= 6.0.0)
24-
activejob (= 6.0.0)
22+
net-imap
23+
net-pop
24+
net-smtp
25+
actionmailer (7.0.3.1)
26+
actionpack (= 7.0.3.1)
27+
actionview (= 7.0.3.1)
28+
activejob (= 7.0.3.1)
29+
activesupport (= 7.0.3.1)
2530
mail (~> 2.5, >= 2.5.4)
31+
net-imap
32+
net-pop
33+
net-smtp
2634
rails-dom-testing (~> 2.0)
27-
actionpack (6.0.0)
28-
actionview (= 6.0.0)
29-
activesupport (= 6.0.0)
30-
rack (~> 2.0)
35+
actionpack (7.0.3.1)
36+
actionview (= 7.0.3.1)
37+
activesupport (= 7.0.3.1)
38+
rack (~> 2.0, >= 2.2.0)
3139
rack-test (>= 0.6.3)
3240
rails-dom-testing (~> 2.0)
3341
rails-html-sanitizer (~> 1.0, >= 1.2.0)
34-
actiontext (6.0.0)
35-
actionpack (= 6.0.0)
36-
activerecord (= 6.0.0)
37-
activestorage (= 6.0.0)
38-
activesupport (= 6.0.0)
42+
actiontext (7.0.3.1)
43+
actionpack (= 7.0.3.1)
44+
activerecord (= 7.0.3.1)
45+
activestorage (= 7.0.3.1)
46+
activesupport (= 7.0.3.1)
47+
globalid (>= 0.6.0)
3948
nokogiri (>= 1.8.5)
40-
actionview (6.0.0)
41-
activesupport (= 6.0.0)
49+
actionview (7.0.3.1)
50+
activesupport (= 7.0.3.1)
4251
builder (~> 3.1)
4352
erubi (~> 1.4)
4453
rails-dom-testing (~> 2.0)
4554
rails-html-sanitizer (~> 1.1, >= 1.2.0)
46-
activejob (6.0.0)
47-
activesupport (= 6.0.0)
55+
activejob (7.0.3.1)
56+
activesupport (= 7.0.3.1)
4857
globalid (>= 0.3.6)
49-
activemodel (6.0.0)
50-
activesupport (= 6.0.0)
51-
activerecord (6.0.0)
52-
activemodel (= 6.0.0)
53-
activesupport (= 6.0.0)
54-
activestorage (6.0.0)
55-
actionpack (= 6.0.0)
56-
activejob (= 6.0.0)
57-
activerecord (= 6.0.0)
58-
marcel (~> 0.3.1)
59-
activesupport (6.0.0)
58+
activemodel (7.0.3.1)
59+
activesupport (= 7.0.3.1)
60+
activerecord (7.0.3.1)
61+
activemodel (= 7.0.3.1)
62+
activesupport (= 7.0.3.1)
63+
activestorage (7.0.3.1)
64+
actionpack (= 7.0.3.1)
65+
activejob (= 7.0.3.1)
66+
activerecord (= 7.0.3.1)
67+
activesupport (= 7.0.3.1)
68+
marcel (~> 1.0)
69+
mini_mime (>= 1.1.0)
70+
activesupport (7.0.3.1)
6071
concurrent-ruby (~> 1.0, >= 1.0.2)
61-
i18n (>= 0.7, < 2)
62-
minitest (~> 5.1)
63-
tzinfo (~> 1.1)
64-
zeitwerk (~> 2.1, >= 2.1.8)
65-
appraisal (2.2.0)
72+
i18n (>= 1.6, < 2)
73+
minitest (>= 5.1)
74+
tzinfo (~> 2.0)
75+
appraisal (2.4.1)
6676
bundler
6777
rake
6878
thor (>= 0.14.0)
69-
builder (3.2.3)
70-
byebug (11.0.1)
71-
concurrent-ruby (1.1.5)
72-
crass (1.0.4)
73-
erubi (1.8.0)
74-
globalid (0.4.2)
75-
activesupport (>= 4.2.0)
76-
i18n (1.6.0)
79+
builder (3.2.4)
80+
byebug (11.1.3)
81+
concurrent-ruby (1.1.10)
82+
crass (1.0.6)
83+
digest (3.1.0)
84+
erubi (1.11.0)
85+
globalid (1.0.0)
86+
activesupport (>= 5.0)
87+
i18n (1.12.0)
7788
concurrent-ruby (~> 1.0)
78-
loofah (2.2.3)
89+
loofah (2.18.0)
7990
crass (~> 1.0.2)
8091
nokogiri (>= 1.5.9)
8192
mail (2.7.1)
8293
mini_mime (>= 0.1.1)
83-
marcel (0.3.3)
84-
mimemagic (~> 0.3.2)
85-
method_source (0.9.2)
86-
mimemagic (0.3.3)
87-
mini_mime (1.0.2)
88-
mini_portile2 (2.4.0)
89-
minitest (5.11.3)
90-
nio4r (2.5.1)
91-
nokogiri (1.10.4)
92-
mini_portile2 (~> 2.4.0)
93-
rack (2.0.7)
94-
rack-test (1.1.0)
95-
rack (>= 1.0, < 3)
96-
rails (6.0.0)
97-
actioncable (= 6.0.0)
98-
actionmailbox (= 6.0.0)
99-
actionmailer (= 6.0.0)
100-
actionpack (= 6.0.0)
101-
actiontext (= 6.0.0)
102-
actionview (= 6.0.0)
103-
activejob (= 6.0.0)
104-
activemodel (= 6.0.0)
105-
activerecord (= 6.0.0)
106-
activestorage (= 6.0.0)
107-
activesupport (= 6.0.0)
108-
bundler (>= 1.3.0)
109-
railties (= 6.0.0)
110-
sprockets-rails (>= 2.0.0)
94+
marcel (1.0.2)
95+
method_source (1.0.0)
96+
mini_mime (1.1.2)
97+
minitest (5.16.3)
98+
net-imap (0.2.3)
99+
digest
100+
net-protocol
101+
strscan
102+
net-pop (0.1.1)
103+
digest
104+
net-protocol
105+
timeout
106+
net-protocol (0.1.3)
107+
timeout
108+
net-smtp (0.3.1)
109+
digest
110+
net-protocol
111+
timeout
112+
nio4r (2.5.8)
113+
nokogiri (1.13.8-x86_64-darwin)
114+
racc (~> 1.4)
115+
racc (1.6.0)
116+
rack (2.2.4)
117+
rack-test (2.0.2)
118+
rack (>= 1.3)
119+
rails (7.0.3.1)
120+
actioncable (= 7.0.3.1)
121+
actionmailbox (= 7.0.3.1)
122+
actionmailer (= 7.0.3.1)
123+
actionpack (= 7.0.3.1)
124+
actiontext (= 7.0.3.1)
125+
actionview (= 7.0.3.1)
126+
activejob (= 7.0.3.1)
127+
activemodel (= 7.0.3.1)
128+
activerecord (= 7.0.3.1)
129+
activestorage (= 7.0.3.1)
130+
activesupport (= 7.0.3.1)
131+
bundler (>= 1.15.0)
132+
railties (= 7.0.3.1)
111133
rails-dom-testing (2.0.3)
112134
activesupport (>= 4.2.0)
113135
nokogiri (>= 1.6)
114-
rails-html-sanitizer (1.2.0)
115-
loofah (~> 2.2, >= 2.2.2)
116-
railties (6.0.0)
117-
actionpack (= 6.0.0)
118-
activesupport (= 6.0.0)
136+
rails-html-sanitizer (1.4.3)
137+
loofah (~> 2.3)
138+
railties (7.0.3.1)
139+
actionpack (= 7.0.3.1)
140+
activesupport (= 7.0.3.1)
119141
method_source
120-
rake (>= 0.8.7)
121-
thor (>= 0.20.3, < 2.0)
122-
rake (12.3.3)
123-
sprockets (3.7.2)
142+
rake (>= 12.2)
143+
thor (~> 1.0)
144+
zeitwerk (~> 2.5)
145+
rake (13.0.6)
146+
sqlite3 (1.4.4)
147+
strscan (3.0.4)
148+
thor (1.2.1)
149+
timeout (0.3.0)
150+
tzinfo (2.0.5)
124151
concurrent-ruby (~> 1.0)
125-
rack (> 1, < 3)
126-
sprockets-rails (3.2.1)
127-
actionpack (>= 4.0)
128-
activesupport (>= 4.0)
129-
sprockets (>= 3.0.0)
130-
sqlite3 (1.4.1)
131-
thor (0.20.3)
132-
thread_safe (0.3.6)
133-
tzinfo (1.2.5)
134-
thread_safe (~> 0.1)
135-
websocket-driver (0.7.1)
152+
webrick (1.7.0)
153+
websocket-driver (0.7.5)
136154
websocket-extensions (>= 0.1.0)
137-
websocket-extensions (0.1.4)
138-
yard (0.9.20)
139-
zeitwerk (2.1.10)
155+
websocket-extensions (0.1.5)
156+
yard (0.9.28)
157+
webrick (~> 1.7.0)
158+
zeitwerk (2.6.0)
140159

141160
PLATFORMS
142-
ruby
161+
x86_64-darwin-19
143162

144163
DEPENDENCIES
145164
acl9!
@@ -149,4 +168,4 @@ DEPENDENCIES
149168
yard
150169

151170
BUNDLED WITH
152-
2.2.10
171+
2.3.20

‎acl9.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
2020

2121
s.rdoc_options = ["--charset=UTF-8"]
2222

23-
s.add_dependency "rails", '>= 5.0', '< 7.0'
23+
s.add_dependency "rails", '>= 6.0', '< 7.1'
2424

2525
s.add_development_dependency "yard"
2626
s.add_development_dependency 'sqlite3'

‎gemfiles/rails_5.0.gemfile

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎gemfiles/rails_5.1.gemfile

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎gemfiles/rails_5.2.gemfile renamed to ‎gemfiles/rails_7.0.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ source "http://rubygems.org"
44

55
gem "appraisal"
66
gem "byebug"
7-
gem "rails", "~> 5.2.0"
7+
gem "rails", "~> 7.0.0"
88

99
gemspec path: "../"

‎test/controllers/acl_action_override_test.rb renamed to ‎test/controllers/acl_action_override_controller_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require 'test_helper'
22

3-
class ACLActionOverrideTest < ActionController::TestCase
3+
class AclActionOverrideControllerTest < ActionController::TestCase
44
test "anon can index" do
55
assert get :check_allow, params: { _action: :index }
66
assert_response :ok

0 commit comments

Comments
 (0)