Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Strip trailing whitespace in templates #1379

Merged
merged 13 commits into from
Jun 21, 2022
Merged

Strip trailing whitespace in templates #1379

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b6e3135
Strip trailing newlines in templates
camertron Jun 2, 2022
4fcf3b2
Use rstrip so only trailing whitespace is trimmed
camertron Jun 2, 2022
9725018
Add changelog entry
camertron Jun 2, 2022
b280714
Add test demonstrating trailing newline behavior
camertron Jun 3, 2022
a271a5b
Use config option
camertron Jun 3, 2022
353f80f
Merge upstream changes
camertron Jun 3, 2022
7947302
Fix linting issues
camertron Jun 6, 2022
7dc890e
Update lib/view_component/base.rb
camertron Jun 16, 2022
56d708d
Add additional docs; rename to strip_trailing_whitespace
camertron Jun 16, 2022
90a6a82
Merging upstream changes
camertron Jun 16, 2022
5854858
Fence code blocks in base.rb
camertron Jun 20, 2022
d6d1041
Move trailing whitespace docs to templates docs
camertron Jun 20, 2022
b303be8
Merging upstream changes
camertron Jun 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions docs/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ title: Changelog

## main

* Strip newlines from templates before compilation to avoid unwanted newlines.

*Cameron Dutro*

## 2.56.1

* Rename private accessor `rendered_component` to `rendered_content`.
Expand Down
2 changes: 1 addition & 1 deletion lib/view_component/compiler.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ def variants_from_inline_calls(calls)

def compiled_template(file_path)
handler = ActionView::Template.handler_for_extension(File.extname(file_path).gsub(".", ""))
template = File.read(file_path)
template = File.read(file_path).rstrip
camertron marked this conversation as resolved.
Show resolved Hide resolved
camertron marked this conversation as resolved.
Show resolved Hide resolved

if handler.method(:call).parameters.length > 1
handler.call(component_class, template)
Expand Down
2 changes: 1 addition & 1 deletion test/sandbox/test/layouts_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class LayoutsTest < ActionDispatch::IntegrationTest
test "rendering with_content_for" do
get "/layout_with_content_for"
assert_response :success
assert_select 'body[data-layout="with_content_for"]', "Hello content for\n\n Foo: bar"
assert_select 'body[data-layout="with_content_for"]', "Hello content for\n Foo: bar"
camertron marked this conversation as resolved.
Show resolved Hide resolved
end
end
end