djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-02-03 05:23:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Change first_of_value to first_of_hash, and add more test cases (#33647)

Browse Source
This commit is contained in:
Jonathan de Jong 2025-01-22 15:02:05 +01:00 committed by GitHub
parent e155aab39e
commit b18caff5b6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/lib/link_details_extractor.rb
View File

@ -46,7 +46,7 @@ class LinkDetailsExtractor
end end
def image def image
obj = first_of_value(json['image']) obj = first_of_hash(json['image'])
return obj['url'] if obj.is_a?(Hash) return obj['url'] if obj.is_a?(Hash)
@ -85,15 +85,15 @@ class LinkDetailsExtractor
private private
def author def author
first_of_value(json['author']) || {} first_of_hash(json['author']) || {}
end end
def publisher def publisher
first_of_value(json['publisher']) || {} first_of_hash(json['publisher']) || {}
end end
def first_of_value(arr) def first_of_hash(arr)
arr.is_a?(Array) ? arr.first : arr arr.is_a?(Array) ? arr.flatten.find { |item| item.is_a?(Hash) } : arr
end end
def root_array(root) def root_array(root)

38
spec/lib/link_details_extractor_spec.rb
View File

@ -249,6 +249,44 @@ RSpec.describe LinkDetailsExtractor do
expect(subject.author_name).to eq 'Author 1, Author 2' expect(subject.author_name).to eq 'Author 1, Author 2'
end end
end end
context 'with embedded arrays' do
let(:ld_json) do
{
'@context' => 'https://schema.org',
'@type' => 'NewsArticle',
'headline' => 'A lot of authors',
'description' => 'But we decided to cram them into one',
'author' => [[{
'@type' => 'Person',
'name' => ['Author 1'],
}]],
'publisher' => [[{
'@type' => 'NewsMediaOrganization',
'name' => 'Pet News',
'url' => 'https://example.com',
}]],
}.to_json
end
let(:html) { <<~HTML }
<!doctype html>
<html>
<body>
<script type="application/ld+json">
#{ld_json}
</script>
</body>
</html>
HTML
it 'gives correct author_name' do
expect(subject.author_name).to eq 'Author 1'
end
it 'gives provider_name' do
expect(subject.provider_name).to eq 'Pet News'
end
end
end end
context 'when Open Graph protocol data is present' do context 'when Open Graph protocol data is present' do