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.

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

Convert XML <title> to HTML <span> #1445

Merged
merged 1 commit into from
Dec 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions app/helpers/arclight/ead_format_helpers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,19 @@ def transform_ead_to_html(value)
def ead_to_html_scrubber
Loofah::Scrubber.new do |node|
format_render_attributes(node) if node.attr('render').present?
convert_to_span(node) if CONVERT_TO_SPAN_TAGS.include? node.name
format_lists(node) if %w[list chronlist].include? node.name
node
end
end

# Tags that should be converted to <span> tags because of formatting conflicts between XML and HTML
CONVERT_TO_SPAN_TAGS = ['title'].freeze

def convert_to_span(node)
node.name = 'span'
end

def condense_whitespace(str)
str.squish.strip.gsub(/>[\n\s]+</, '><')
end
Expand Down
8 changes: 8 additions & 0 deletions spec/controllers/concerns/arclight/ead_format_helpers_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,14 @@ class TestController
end
end

describe 'converts conflicting tags' do
# this is needed because browsers apply display:none to <title> tags by default
it 'converts <title> tags to <span> tags' do
content = helper.render_html_tags(value: %w[<title>Title</title>])
expect(content).to eq_ignoring_whitespace '<span>Title</span>'
end
end

describe 'nodes with @render attributes' do
it 'altrender custom -> html class' do
content = helper.render_html_tags(value: ['<emph render="altrender" altrender="my-custom-class">special text</emph>'])
Expand Down