Skip to content

Commit 1b44f8f

Browse files
committed
Merge branch 'main' into rv_add_component_caching
2 parents 8063bd1 + fb2e917 commit 1b44f8f

28 files changed

+238
-158
lines changed

.github/pull-request-template.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@
66

77
<!-- Describe your thought process in making these changes. List any tradeoffs you made. Describe any alternative approaches you considered and why you discarded them. -->
88

9-
### Anything you want to highlight for special attention from reviewers?
9+
### Anything you want to highlight for special attention from reviewers?
10+
11+
<!-- Performance/security implications, reasoning for lack of test coverage, etc -->

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Checkout
2424
uses: actions/checkout@v4
2525
- name: Vale
26-
uses: errata-ai/vale-action@38bf078c328061f59879b347ca344a718a736018
26+
uses: errata-ai/vale-action@d89dee975228ae261d22c15adcd03578634d429c
2727
env:
2828
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
2929
markdown:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
/test/sandbox/log/*
1919
/test/tmp/*
2020
/.yardoc
21+
.DS_Store
2122

2223
## Specific to RubyMotion:
2324
.dat*

Gemfile.lock

Lines changed: 75 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,75 @@
11
PATH
22
remote: .
33
specs:
4-
view_component (3.17.0)
5-
activesupport (>= 5.2.0, < 8.0)
4+
view_component (3.20.0)
5+
activesupport (>= 5.2.0, < 8.1)
66
concurrent-ruby (~> 1.0)
77
method_source (~> 1.0)
88

99
GEM
1010
remote: https://rubygems.org/
1111
specs:
12-
actioncable (7.0.8.4)
13-
actionpack (= 7.0.8.4)
14-
activesupport (= 7.0.8.4)
12+
actioncable (7.0.8.6)
13+
actionpack (= 7.0.8.6)
14+
activesupport (= 7.0.8.6)
1515
nio4r (~> 2.0)
1616
websocket-driver (>= 0.6.1)
17-
actionmailbox (7.0.8.4)
18-
actionpack (= 7.0.8.4)
19-
activejob (= 7.0.8.4)
20-
activerecord (= 7.0.8.4)
21-
activestorage (= 7.0.8.4)
22-
activesupport (= 7.0.8.4)
17+
actionmailbox (7.0.8.6)
18+
actionpack (= 7.0.8.6)
19+
activejob (= 7.0.8.6)
20+
activerecord (= 7.0.8.6)
21+
activestorage (= 7.0.8.6)
22+
activesupport (= 7.0.8.6)
2323
mail (>= 2.7.1)
2424
net-imap
2525
net-pop
2626
net-smtp
27-
actionmailer (7.0.8.4)
28-
actionpack (= 7.0.8.4)
29-
actionview (= 7.0.8.4)
30-
activejob (= 7.0.8.4)
31-
activesupport (= 7.0.8.4)
27+
actionmailer (7.0.8.6)
28+
actionpack (= 7.0.8.6)
29+
actionview (= 7.0.8.6)
30+
activejob (= 7.0.8.6)
31+
activesupport (= 7.0.8.6)
3232
mail (~> 2.5, >= 2.5.4)
3333
net-imap
3434
net-pop
3535
net-smtp
3636
rails-dom-testing (~> 2.0)
37-
actionpack (7.0.8.4)
38-
actionview (= 7.0.8.4)
39-
activesupport (= 7.0.8.4)
37+
actionpack (7.0.8.6)
38+
actionview (= 7.0.8.6)
39+
activesupport (= 7.0.8.6)
4040
rack (~> 2.0, >= 2.2.4)
4141
rack-test (>= 0.6.3)
4242
rails-dom-testing (~> 2.0)
4343
rails-html-sanitizer (~> 1.0, >= 1.2.0)
44-
actiontext (7.0.8.4)
45-
actionpack (= 7.0.8.4)
46-
activerecord (= 7.0.8.4)
47-
activestorage (= 7.0.8.4)
48-
activesupport (= 7.0.8.4)
44+
actiontext (7.0.8.6)
45+
actionpack (= 7.0.8.6)
46+
activerecord (= 7.0.8.6)
47+
activestorage (= 7.0.8.6)
48+
activesupport (= 7.0.8.6)
4949
globalid (>= 0.6.0)
5050
nokogiri (>= 1.8.5)
51-
actionview (7.0.8.4)
52-
activesupport (= 7.0.8.4)
51+
actionview (7.0.8.6)
52+
activesupport (= 7.0.8.6)
5353
builder (~> 3.1)
5454
erubi (~> 1.4)
5555
rails-dom-testing (~> 2.0)
5656
rails-html-sanitizer (~> 1.1, >= 1.2.0)
57-
activejob (7.0.8.4)
58-
activesupport (= 7.0.8.4)
57+
activejob (7.0.8.6)
58+
activesupport (= 7.0.8.6)
5959
globalid (>= 0.3.6)
60-
activemodel (7.0.8.4)
61-
activesupport (= 7.0.8.4)
62-
activerecord (7.0.8.4)
63-
activemodel (= 7.0.8.4)
64-
activesupport (= 7.0.8.4)
65-
activestorage (7.0.8.4)
66-
actionpack (= 7.0.8.4)
67-
activejob (= 7.0.8.4)
68-
activerecord (= 7.0.8.4)
69-
activesupport (= 7.0.8.4)
60+
activemodel (7.0.8.6)
61+
activesupport (= 7.0.8.6)
62+
activerecord (7.0.8.6)
63+
activemodel (= 7.0.8.6)
64+
activesupport (= 7.0.8.6)
65+
activestorage (7.0.8.6)
66+
actionpack (= 7.0.8.6)
67+
activejob (= 7.0.8.6)
68+
activerecord (= 7.0.8.6)
69+
activesupport (= 7.0.8.6)
7070
marcel (~> 1.0)
7171
mini_mime (>= 1.1.0)
72-
activesupport (7.0.8.4)
72+
activesupport (7.0.8.6)
7373
concurrent-ruby (~> 1.0, >= 1.0.2)
7474
i18n (>= 1.6, < 2)
7575
minitest (>= 5.1)
@@ -116,7 +116,7 @@ GEM
116116
diff-lcs (1.5.1)
117117
docile (1.4.1)
118118
drb (2.2.1)
119-
erb_lint (0.6.0)
119+
erb_lint (0.7.0)
120120
activesupport
121121
better_html (>= 2.0.1)
122122
parser (>= 2.7.1.4)
@@ -138,16 +138,16 @@ GEM
138138
i18n (1.14.6)
139139
concurrent-ruby (~> 1.0)
140140
io-console (0.7.2)
141-
irb (1.14.0)
141+
irb (1.14.1)
142142
rdoc (>= 4.0.0)
143143
reline (>= 0.4.2)
144144
jbuilder (2.13.0)
145145
actionview (>= 5.0.0)
146146
activesupport (>= 5.0.0)
147-
json (2.7.2)
147+
json (2.7.4)
148148
language_server-protocol (3.17.0.3)
149149
lint_roller (1.1.0)
150-
loofah (2.22.0)
150+
loofah (2.23.1)
151151
crass (~> 1.0.2)
152152
nokogiri (>= 1.12.0)
153153
m (1.6.2)
@@ -165,7 +165,7 @@ GEM
165165
mini_portile2 (2.8.7)
166166
minitest (5.25.1)
167167
mutex_m (0.2.0)
168-
net-imap (0.4.16)
168+
net-imap (0.5.0)
169169
date
170170
net-protocol
171171
net-pop (0.1.2)
@@ -174,11 +174,10 @@ GEM
174174
timeout
175175
net-smtp (0.5.0)
176176
net-protocol
177-
nio4r (2.7.3)
177+
nio4r (2.7.4)
178178
nokogiri (1.16.7)
179179
mini_portile2 (~> 2.8.2)
180180
racc (~> 1.4)
181-
ostruct (0.6.0)
182181
parallel (1.26.3)
183182
parser (3.3.5.0)
184183
ast (~> 2.4.1)
@@ -192,33 +191,33 @@ GEM
192191
puma (6.4.3)
193192
nio4r (~> 2.0)
194193
racc (1.8.1)
195-
rack (2.2.9)
194+
rack (2.2.10)
196195
rack-test (2.1.0)
197196
rack (>= 1.3)
198-
rails (7.0.8.4)
199-
actioncable (= 7.0.8.4)
200-
actionmailbox (= 7.0.8.4)
201-
actionmailer (= 7.0.8.4)
202-
actionpack (= 7.0.8.4)
203-
actiontext (= 7.0.8.4)
204-
actionview (= 7.0.8.4)
205-
activejob (= 7.0.8.4)
206-
activemodel (= 7.0.8.4)
207-
activerecord (= 7.0.8.4)
208-
activestorage (= 7.0.8.4)
209-
activesupport (= 7.0.8.4)
197+
rails (7.0.8.6)
198+
actioncable (= 7.0.8.6)
199+
actionmailbox (= 7.0.8.6)
200+
actionmailer (= 7.0.8.6)
201+
actionpack (= 7.0.8.6)
202+
actiontext (= 7.0.8.6)
203+
actionview (= 7.0.8.6)
204+
activejob (= 7.0.8.6)
205+
activemodel (= 7.0.8.6)
206+
activerecord (= 7.0.8.6)
207+
activestorage (= 7.0.8.6)
208+
activesupport (= 7.0.8.6)
210209
bundler (>= 1.15.0)
211-
railties (= 7.0.8.4)
210+
railties (= 7.0.8.6)
212211
rails-dom-testing (2.2.0)
213212
activesupport (>= 5.0.0)
214213
minitest
215214
nokogiri (>= 1.6)
216215
rails-html-sanitizer (1.6.0)
217216
loofah (~> 2.21)
218217
nokogiri (~> 1.14)
219-
railties (7.0.8.4)
220-
actionpack (= 7.0.8.4)
221-
activesupport (= 7.0.8.4)
218+
railties (7.0.8.6)
219+
actionpack (= 7.0.8.6)
220+
activesupport (= 7.0.8.6)
222221
method_source
223222
rake (>= 12.2)
224223
thor (~> 1.0)
@@ -230,13 +229,13 @@ GEM
230229
regexp_parser (2.9.2)
231230
reline (0.5.10)
232231
io-console (~> 0.5)
233-
rexml (3.3.7)
234-
rspec-core (3.13.1)
232+
rexml (3.3.9)
233+
rspec-core (3.13.2)
235234
rspec-support (~> 3.13.0)
236235
rspec-expectations (3.13.3)
237236
diff-lcs (>= 1.2.0, < 2.0)
238237
rspec-support (~> 3.13.0)
239-
rspec-mocks (3.13.1)
238+
rspec-mocks (3.13.2)
240239
diff-lcs (>= 1.2.0, < 2.0)
241240
rspec-support (~> 3.13.0)
242241
rspec-rails (5.1.2)
@@ -248,22 +247,21 @@ GEM
248247
rspec-mocks (~> 3.10)
249248
rspec-support (~> 3.10)
250249
rspec-support (3.13.1)
251-
rubocop (1.65.1)
250+
rubocop (1.66.1)
252251
json (~> 2.3)
253252
language_server-protocol (>= 3.17.0)
254253
parallel (~> 1.10)
255254
parser (>= 3.3.0.2)
256255
rainbow (>= 2.2.2, < 4.0)
257256
regexp_parser (>= 2.4, < 3.0)
258-
rexml (>= 3.2.5, < 4.0)
259-
rubocop-ast (>= 1.31.1, < 2.0)
257+
rubocop-ast (>= 1.32.2, < 2.0)
260258
ruby-progressbar (~> 1.7)
261259
unicode-display_width (>= 2.4.0, < 3.0)
262260
rubocop-ast (1.32.3)
263261
parser (>= 3.3.1.0)
264-
rubocop-md (1.2.3)
262+
rubocop-md (1.2.4)
265263
rubocop (>= 1.45)
266-
rubocop-performance (1.21.1)
264+
rubocop-performance (1.22.1)
267265
rubocop (>= 1.48.1, < 2.0)
268266
rubocop-ast (>= 1.31.1, < 2.0)
269267
ruby-progressbar (1.13.0)
@@ -293,18 +291,18 @@ GEM
293291
actionpack (>= 5.2)
294292
activesupport (>= 5.2)
295293
sprockets (>= 3.0.0)
296-
standard (1.40.0)
294+
standard (1.41.1)
297295
language_server-protocol (~> 3.17.0.2)
298296
lint_roller (~> 1.0)
299-
rubocop (~> 1.65.0)
297+
rubocop (~> 1.66.0)
300298
standard-custom (~> 1.0.0)
301-
standard-performance (~> 1.4)
299+
standard-performance (~> 1.5)
302300
standard-custom (1.0.2)
303301
lint_roller (~> 1.0)
304302
rubocop (~> 1.50)
305-
standard-performance (1.4.0)
303+
standard-performance (1.5.0)
306304
lint_roller (~> 1.1)
307-
rubocop-performance (~> 1.21.0)
305+
rubocop-performance (~> 1.22.0)
308306
stringio (3.1.1)
309307
temple (0.10.3)
310308
terminal-table (3.0.2)
@@ -330,7 +328,7 @@ GEM
330328
yard (0.9.37)
331329
yard-activesupport-concern (0.0.1)
332330
yard (>= 0.8)
333-
zeitwerk (2.6.18)
331+
zeitwerk (2.7.1)
334332

335333
PLATFORMS
336334
ruby
@@ -356,7 +354,6 @@ DEPENDENCIES
356354
net-imap
357355
net-pop
358356
net-smtp
359-
ostruct
360357
pry (~> 0.13)
361358
puma (~> 6)
362359
rails (~> 7.0.0)

docs/CHANGELOG.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,36 @@ nav_order: 5
1010

1111
## main
1212

13+
* Ensure HTML output safety wrapper is used for all inline templates.
14+
15+
*Joel Hawksley*
16+
17+
* Expose `.identifier` method as part of public API.
18+
19+
*Joel Hawksley*
20+
21+
## 3.20.0
22+
23+
* Allow rendering `with_collection` to accept an optional `spacer_component` to be rendered between each item.
24+
25+
*Nick Coyne*
26+
27+
* Remove OpenStruct from codebase.
28+
29+
*Oleksii Vasyliev*
30+
31+
## 3.19.0
32+
33+
* Relax Active Support version constraint in gemspec.
34+
35+
*Simon Fish*
36+
37+
## 3.18.0
38+
39+
* Enable components to use `@request` and `request` methods/ivars.
40+
41+
*Blake Williams*
42+
1343
* Fix bug where implicit locales in component filenames threw a `NameError`.
1444

1545
*Chloe Fons*

docs/Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (7.2.1)
4+
activesupport (7.2.1.1)
55
base64
66
bigdecimal
77
concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -247,7 +247,7 @@ GEM
247247
rb-fsevent (0.11.2)
248248
rb-inotify (0.11.1)
249249
ffi (~> 1.0)
250-
rexml (3.3.7)
250+
rexml (3.3.9)
251251
rouge (3.30.0)
252252
rubyzip (2.3.2)
253253
safe_yaml (1.0.5)

docs/_data/library.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version: 3.17.0
1+
version: 3.20.0

0 commit comments

Comments
 (0)