Skip to content

Commit 1413358

Browse files
committed
Appease Rubocop
1 parent 892b281 commit 1413358

File tree

10 files changed

+20
-13
lines changed

10 files changed

+20
-13
lines changed

lib/inertia_rails/defer_prop.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22

33
module InertiaRails
44
class DeferProp < IgnoreOnFirstLoadProp
5-
DEFAULT_GROUP = "default"
5+
DEFAULT_GROUP = 'default'
66

77
attr_reader :group
88

99
def initialize(group: nil, merge: nil, &block)
10+
super(&block)
11+
1012
@group = group || DEFAULT_GROUP
1113
@merge = merge
1214
@block = block

lib/inertia_rails/lazy_prop.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ def initialize(value = nil, &block)
66
raise ArgumentError, 'You must provide either a value or a block, not both' if value && block
77

88
InertiaRails.deprecator.warn(
9-
"`lazy` is deprecated and will be removed in InertiaRails 4.0, use `optional` instead."
9+
'`lazy` is deprecated and will be removed in InertiaRails 4.0, use `optional` instead.'
1010
)
1111

1212
@value = value

lib/inertia_rails/optional_prop.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
module InertiaRails
24
class OptionalProp < IgnoreOnFirstLoadProp
35
end

lib/inertia_rails/renderer.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,7 @@ def deferred_props_keys
144144

145145
def merge_props_keys
146146
@props.each_with_object([]) do |(key, prop), result|
147-
if prop.try(:merge?) && reset_keys.exclude?(key)
148-
result << key
149-
end
147+
result << key if prop.try(:merge?) && reset_keys.exclude?(key)
150148
end
151149
end
152150

spec/dummy/app/controllers/inertia_encrypt_history_controller.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
# frozen_string_literal: true
2+
13
class InertiaEncryptHistoryController < ApplicationController
24
inertia_config(
3-
encrypt_history: -> { action_name != "default_config" }
5+
encrypt_history: -> { action_name != 'default_config' }
46
)
57

68
def default_config
@@ -20,6 +22,6 @@ def clear_history
2022
end
2123

2224
def clear_history_after_redirect
23-
redirect_to :empty_test, inertia: {clear_history: true}
25+
redirect_to :empty_test, inertia: { clear_history: true }
2426
end
2527
end

spec/dummy/app/controllers/inertia_render_test_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ def merge_props
106106
render inertia: 'TestComponent', props: {
107107
merge: InertiaRails.merge { 'merge prop' },
108108
regular: 'regular prop',
109-
deferred_merge: InertiaRails.defer(merge: true) { 'deferred and merge prop'},
109+
deferred_merge: InertiaRails.defer(merge: true) { 'deferred and merge prop' },
110110
deferred: InertiaRails.defer { 'deferred' },
111111
}
112112
end

spec/inertia/encrypt_history_spec.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
# frozen_string_literal: true
2+
13
RSpec.describe 'Inertia encrypt history', type: :request do
2-
let(:headers) { {'X-Inertia' => true} }
4+
let(:headers) { { 'X-Inertia' => true } }
35

46
context 'with default config' do
57
it 'returns encryptHistory false' do
@@ -20,7 +22,6 @@
2022
end
2123

2224
context 'with override config' do
23-
2425
it 'returns encryptHistory false' do
2526
get encrypt_history_override_config_path, headers: headers
2627

spec/inertia/lazy_prop_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
end
88
end
99

10-
it "is deprecated" do
11-
expect(deprecator).to receive(:warn).with("`lazy` is deprecated and will be removed in InertiaRails 4.0, use `optional` instead.")
10+
it 'is deprecated' do
11+
expect(deprecator).to receive(:warn).with('`lazy` is deprecated and will be removed in InertiaRails 4.0, use `optional` instead.')
1212

1313
described_class.new('value')
1414
end

spec/inertia/rendering_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@
450450
'X-Inertia' => true,
451451
'X-Inertia-Partial-Data' => 'deferred_merge',
452452
'X-Inertia-Partial-Component' => 'TestComponent',
453-
'X-Inertia-Reset' => 'deferred_merge'
453+
'X-Inertia-Reset' => 'deferred_merge',
454454
}}
455455

456456
it 'returns listed and merge props' do

spec/inertia/ssr_spec.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,9 @@
7171
it 'renders inertia without ssr as a fallback' do
7272
get props_path
7373

74+
# rubocop:disable Layout/LineLength
7475
expect(response.body).to include '<div id="app" data-page="{&quot;component&quot;:&quot;TestComponent&quot;,&quot;props&quot;:{&quot;name&quot;:&quot;Brandon&quot;,&quot;sport&quot;:&quot;hockey&quot;},&quot;url&quot;:&quot;/props&quot;,&quot;version&quot;:&quot;1.0&quot;,&quot;encryptHistory&quot;:false,&quot;clearHistory&quot;:false}"></div>'
76+
# rubocop:enable Layout/LineLength
7577
end
7678
end
7779
end

0 commit comments

Comments
 (0)