Skip to content

Commit 457e637

Browse files
committed
Run rubocop -A for all touched files
1 parent 3e00ec5 commit 457e637

File tree

4 files changed

+56
-35
lines changed

4 files changed

+56
-35
lines changed

.rubocop_todo.yml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This configuration was generated by
22
# `rubocop --auto-gen-config --exclude-limit 10000`
3-
# on 2025-04-01 18:59:20 UTC using RuboCop version 1.75.1.
3+
# on 2025-04-10 07:56:29 UTC using RuboCop version 1.75.2.
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
@@ -51,14 +51,13 @@ Layout/ExtraSpacing:
5151
Layout/FirstHashElementIndentation:
5252
EnforcedStyle: consistent
5353

54-
# Offense count: 6
54+
# Offense count: 5
5555
# This cop supports safe autocorrection (--autocorrect).
5656
# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
5757
# SupportedStyles: space, no_space
5858
# SupportedStylesForEmptyBraces: space, no_space
5959
Layout/SpaceBeforeBlockBraces:
6060
Exclude:
61-
- 'spec/dummy/app/controllers/inertia_render_test_controller.rb'
6261
- 'spec/inertia/error_sharing_spec.rb'
6362
- 'spec/inertia/request_spec.rb'
6463

@@ -106,13 +105,12 @@ Layout/TrailingEmptyLines:
106105
- 'lib/tasks/inertia_rails.rake'
107106
- 'spec/inertia/rails_mimic_spec.rb'
108107

109-
# Offense count: 10
108+
# Offense count: 9
110109
# This cop supports safe autocorrection (--autocorrect).
111110
# Configuration parameters: AllowInHeredoc.
112111
Layout/TrailingWhitespace:
113112
Exclude:
114113
- 'lib/inertia_rails/rspec.rb'
115-
- 'spec/dummy/app/controllers/inertia_render_test_controller.rb'
116114
- 'spec/dummy/config/environments/test.rb'
117115

118116
# Offense count: 1
@@ -227,7 +225,7 @@ Style/ExpandPathArguments:
227225
Exclude:
228226
- 'spec/rails_helper.rb'
229227

230-
# Offense count: 65
228+
# Offense count: 63
231229
# This cop supports unsafe autocorrection (--autocorrect-all).
232230
# Configuration parameters: EnforcedStyle.
233231
# SupportedStyles: always, always_true, never
@@ -239,7 +237,6 @@ Style/FrozenStringLiteralComment:
239237
- 'lib/inertia_rails/controller.rb'
240238
- 'lib/inertia_rails/engine.rb'
241239
- 'lib/inertia_rails/helper.rb'
242-
- 'lib/inertia_rails/inertia_rails.rb'
243240
- 'lib/inertia_rails/rspec.rb'
244241
- 'lib/inertia_rails/version.rb'
245242
- 'lib/patches/better_errors.rb'
@@ -259,7 +256,6 @@ Style/FrozenStringLiteralComment:
259256
- 'spec/dummy/app/controllers/inertia_merge_shared_controller.rb'
260257
- 'spec/dummy/app/controllers/inertia_multithreaded_share_controller.rb'
261258
- 'spec/dummy/app/controllers/inertia_rails_mimic_controller.rb'
262-
- 'spec/dummy/app/controllers/inertia_render_test_controller.rb'
263259
- 'spec/dummy/app/controllers/inertia_responders_test_controller.rb'
264260
- 'spec/dummy/app/controllers/inertia_session_continuity_test_controller.rb'
265261
- 'spec/dummy/app/controllers/inertia_share_test_controller.rb'
@@ -337,14 +333,13 @@ Style/IfUnlessModifierOfIfUnless:
337333
Exclude:
338334
- 'lib/inertia_rails/controller.rb'
339335

340-
# Offense count: 3
336+
# Offense count: 2
341337
# This cop supports safe autocorrection (--autocorrect).
342338
# Configuration parameters: EnforcedStyle.
343339
# SupportedStyles: line_count_dependent, lambda, literal
344340
Style/Lambda:
345341
Exclude:
346342
- 'spec/dummy/app/controllers/inertia_lambda_shared_props_controller.rb'
347-
- 'spec/dummy/app/controllers/inertia_render_test_controller.rb'
348343
- 'spec/dummy/app/controllers/transformed_inertia_rails_mimic_controller.rb'
349344

350345
# Offense count: 1
@@ -456,7 +451,7 @@ Style/TrailingCommaInArguments:
456451
- 'spec/dummy/app/controllers/inertia_config_test_controller.rb'
457452
- 'spec/dummy/app/controllers/inertia_rails_mimic_controller.rb'
458453

459-
# Offense count: 22
454+
# Offense count: 12
460455
# This cop supports safe autocorrection (--autocorrect).
461456
# Configuration parameters: EnforcedStyleForMultiline.
462457
# SupportedStylesForMultiline: comma, consistent_comma, diff_comma, no_comma
@@ -466,13 +461,12 @@ Style/TrailingCommaInHashLiteral:
466461
- 'spec/dummy/app/controllers/inertia_lambda_shared_props_controller.rb'
467462
- 'spec/dummy/app/controllers/inertia_merge_instance_props_controller.rb'
468463
- 'spec/dummy/app/controllers/inertia_merge_shared_controller.rb'
469-
- 'spec/dummy/app/controllers/inertia_render_test_controller.rb'
470464
- 'spec/dummy/config/environments/development.rb'
471465
- 'spec/dummy/config/environments/test.rb'
472466
- 'spec/inertia/response_spec.rb'
473467
- 'spec/inertia/rspec_helper_spec.rb'
474468

475-
# Offense count: 24
469+
# Offense count: 19
476470
# This cop supports safe autocorrection (--autocorrect).
477471
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
478472
# URISchemes: http, https

lib/inertia_rails/inertia_rails.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
require 'inertia_rails/base_prop'
24
require 'inertia_rails/ignore_on_first_load_prop'
35
require 'inertia_rails/always_prop'

spec/dummy/app/controllers/inertia_render_test_controller.rb

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
# frozen_string_literal: true
2+
13
class InertiaRenderTestController < ApplicationController
2-
34
def props
45
render inertia: 'TestComponent', props: {
56
name: 'Brandon',
6-
sport: -> { 'hockey' }
7+
sport: -> { 'hockey' },
78
}
89
end
910

@@ -18,9 +19,9 @@ def except_props
1819
end,
1920
nested: {
2021
first: 'first nested param',
21-
second: 'second nested param'
22+
second: 'second nested param',
2223
},
23-
always: InertiaRails.always { 'always prop' }
24+
always: InertiaRails.always { 'always prop' },
2425
}
2526
end
2627

@@ -36,10 +37,10 @@ def deeply_nested_props
3637
nested: {
3738
first: 'first nested param',
3839
second: 'second nested param',
39-
evaluated: -> do
40+
evaluated: lambda do
4041
{
4142
first: 'first evaluated nested param',
42-
second: 'second evaluated nested param'
43+
second: 'second evaluated nested param',
4344
}
4445
end,
4546
deeply_nested: {
@@ -48,10 +49,10 @@ def deeply_nested_props
4849
what_about_nil: nil,
4950
what_about_empty_hash: {},
5051
deeply_nested_always: InertiaRails.always { 'deeply nested always prop' },
51-
deeply_nested_lazy: InertiaRails.lazy { 'deeply nested lazy prop' }
52-
}
52+
deeply_nested_lazy: InertiaRails.lazy { 'deeply nested lazy prop' },
53+
},
5354
},
54-
always: InertiaRails.always { 'always prop' }
55+
always: InertiaRails.always { 'always prop' },
5556
}
5657
end
5758

@@ -79,7 +80,7 @@ def lazy_props
7980
level: InertiaRails.lazy do
8081
'worse than he believes'
8182
end,
82-
grit: InertiaRails.lazy(->{ 'intense' })
83+
grit: InertiaRails.lazy(-> { 'intense' }),
8384
}
8485
end
8586

@@ -98,17 +99,17 @@ def always_props
9899
optional: InertiaRails.optional do
99100
'optional prop'
100101
end,
101-
another_optional: InertiaRails.optional { 'another optional prop' }
102+
another_optional: InertiaRails.optional { 'another optional prop' },
102103
}
103104
end
104105

105106
def merge_props
106107
render inertia: 'TestComponent', props: {
107108
merge: InertiaRails.merge { 'merge prop' },
108-
deep_merge: InertiaRails.deep_merge { {deep: 'merge prop'} },
109+
deep_merge: InertiaRails.deep_merge { { deep: 'merge prop' } },
109110
regular: 'regular prop',
110111
deferred_merge: InertiaRails.defer(merge: true) { 'deferred and merge prop' },
111-
deferred_deep_merge: InertiaRails.defer(deep_merge: true) { {deep: 'deferred and merge prop'} },
112+
deferred_deep_merge: InertiaRails.defer(deep_merge: true) { { deep: 'deferred and merge prop' } },
112113
deferred: InertiaRails.defer { 'deferred' },
113114
}
114115
end
@@ -120,7 +121,7 @@ def deferred_props
120121
level: InertiaRails.defer do
121122
'worse than he believes'
122123
end,
123-
grit: InertiaRails.defer { 'intense' }
124+
grit: InertiaRails.defer { 'intense' },
124125
}
125126
end
126127
end

spec/inertia/rendering_spec.rb

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,39 +83,56 @@
8383
end
8484

8585
context 'with a default component' do
86-
let(:page) { InertiaRails::Renderer.new('inertia_route_with_default_component', controller, request, response, '').send(:page) }
86+
let(:page) do
87+
InertiaRails::Renderer.new('inertia_route_with_default_component', controller, request, response,
88+
'').send(:page)
89+
end
8790

8891
before { get inertia_route_with_default_component_path }
8992

9093
it { is_expected.to include inertia_div(page) }
9194
end
9295

9396
context 'with a default component resource' do
94-
let(:page) { InertiaRails::Renderer.new('items/inertia_route_with_default_component', controller, request, response, '').send(:page) }
97+
let(:page) do
98+
InertiaRails::Renderer.new('items/inertia_route_with_default_component', controller, request, response,
99+
'').send(:page)
100+
end
95101

96102
before { get item_inertia_route_with_default_component_path(item_id: 1) }
97103

98104
it { is_expected.to include inertia_div(page) }
99105
end
100106

101107
context 'with a default component resource on member' do
102-
let(:page) { InertiaRails::Renderer.new('items/inertia_route_with_default_component_on_member', controller, request, response, '').send(:page) }
108+
let(:page) do
109+
InertiaRails::Renderer.new(
110+
'items/inertia_route_with_default_component_on_member', controller, request, response, ''
111+
).send(:page)
112+
end
103113

104114
before { get inertia_route_with_default_component_on_member_item_path(id: 1) }
105115

106116
it { is_expected.to include inertia_div(page) }
107117
end
108118

109119
context 'with a default component resource on collection' do
110-
let(:page) { InertiaRails::Renderer.new('items/inertia_route_with_default_component_on_collection', controller, request, response, '').send(:page) }
120+
let(:page) do
121+
InertiaRails::Renderer.new(
122+
'items/inertia_route_with_default_component_on_collection', controller, request, response, ''
123+
).send(:page)
124+
end
111125

112126
before { get inertia_route_with_default_component_on_collection_items_path }
113127

114128
it { is_expected.to include inertia_div(page) }
115129
end
116130

117131
context 'with a default component resource & scoped' do
118-
let(:page) { InertiaRails::Renderer.new('items/inertia_route_with_default_component', controller, request, response, '').send(:page) }
132+
let(:page) do
133+
InertiaRails::Renderer.new('items/inertia_route_with_default_component', controller, request, response,
134+
'').send(:page)
135+
end
119136

120137
before { get scoped_item_inertia_route_with_default_component_path(item_id: 1) }
121138

@@ -513,7 +530,8 @@
513530
before { get merge_props_path, headers: headers }
514531

515532
it 'returns non-optional props and meta on first load' do
516-
expect(response.parsed_body['props']).to eq('merge' => 'merge prop', 'deep_merge' => { 'deep' => 'merge prop' }, 'regular' => 'regular prop')
533+
expect(response.parsed_body['props']).to eq('merge' => 'merge prop', 'deep_merge' => { 'deep' => 'merge prop' },
534+
'regular' => 'regular prop')
517535
expect(response.parsed_body['mergeProps']).to match_array(%w[merge deferred_merge])
518536
expect(response.parsed_body['deepMergeProps']).to match_array(%w[deep_merge deferred_deep_merge])
519537
expect(response.parsed_body['deferredProps']).to eq('default' => %w[deferred_merge deferred_deep_merge deferred])
@@ -529,7 +547,10 @@
529547
end
530548

531549
it 'returns listed and merge props' do
532-
expect(response.parsed_body['props']).to eq({ 'deferred_merge' => 'deferred and merge prop', 'deferred_deep_merge' => { 'deep' => 'deferred and merge prop' } })
550+
expect(response.parsed_body['props']).to eq(
551+
'deferred_merge' => 'deferred and merge prop',
552+
'deferred_deep_merge' => { 'deep' => 'deferred and merge prop' }
553+
)
533554
expect(response.parsed_body['mergeProps']).to match_array(%w[merge deferred_merge])
534555
expect(response.parsed_body['deepMergeProps']).to match_array(%w[deep_merge deferred_deep_merge])
535556
expect(response.parsed_body['deferredProps']).to be_nil
@@ -547,7 +568,10 @@
547568
end
548569

549570
it 'returns listed and merge props' do
550-
expect(response.parsed_body['props']).to eq({ 'deferred_merge' => 'deferred and merge prop', 'deferred_deep_merge' => { 'deep' => 'deferred and merge prop' } })
571+
expect(response.parsed_body['props']).to eq(
572+
'deferred_merge' => 'deferred and merge prop',
573+
'deferred_deep_merge' => { 'deep' => 'deferred and merge prop' }
574+
)
551575
expect(response.parsed_body['mergeProps']).to match_array(%w[merge])
552576
expect(response.parsed_body['deferredProps']).to be_nil
553577
end

0 commit comments

Comments
 (0)