Skip to content

Commit

Permalink
Merge pull request #3750 from mlibrary/hotfix/HELIO-4819/a11y_metadat…
Browse files Browse the repository at this point in the history 
…a_index_accessibilityHazard

add accessibilityHazard; rm field pluralization
  • Loading branch information
@sethaj
sethaj authored Feb 14, 2025
2 parents e02d922 + 33f7e48 commit 5f03ab9
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 14 deletions.
16 changes: 15 additions & 1 deletion app/services/epub_accessibility_metadata_indexing_service.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ def index(epub_file_set_id, solr_doc)

# for these schema values see https://kb.daisy.org/publishing/docs/metadata/schema.org/
solr_doc['epub_a11y_accessibility_summary_ssi'] = accessibility_summary
solr_doc['epub_a11y_accessibility_features_ssim'] = accessibility_features
solr_doc['epub_a11y_accessibility_feature_ssim'] = accessibility_features
solr_doc['epub_a11y_accessibility_hazard_ssim'] = accessibility_hazard
solr_doc['epub_a11y_access_mode_ssim'] = access_mode
@access_mode_sufficient = access_mode_sufficient
solr_doc['epub_a11y_access_mode_sufficient_ssim'] = @access_mode_sufficient
Expand Down Expand Up @@ -73,6 +74,19 @@ def accessibility_features
values.presence&.sort
end

def accessibility_hazard
# this involves multiple entries in separate meta tags
values = @content_metadata.css("meta[#{@meta_attribute}='schema:accessibilityHazard']")

values = if @epub_2
values&.map { |value| value['content']&.strip }
else
values&.map { |value| value&.text&.strip }
end
# want to ensure the indexer is set to nil not [] if these are not present, keeping the field off the doc entirely
values.presence&.sort
end

def access_mode
# this involves multiple entries in separate meta tags
values = @content_metadata.css("meta[#{@meta_attribute}='schema:accessMode']")
Expand Down
31 changes: 18 additions & 13 deletions spec/services/epub_accessibility_metadata_indexing_service_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,8 @@

let(:missing_a11y_metadata_doc_sans_epub_version) { { "epub_a11y_access_mode_ssim" => nil,
"epub_a11y_access_mode_sufficient_ssim" => nil,
"epub_a11y_accessibility_features_ssim" => nil,
"epub_a11y_accessibility_feature_ssim" => nil,
"epub_a11y_accessibility_hazard_ssim" => nil,
"epub_a11y_accessibility_summary_ssi" => nil,
"epub_a11y_certified_by_ssi" => nil,
"epub_a11y_certifier_credential_ssi" => nil,
Expand All @@ -159,16 +160,18 @@
"epub_a11y_access_mode_sufficient_ssim" => ["textual",
"textual,visual",
"textual,visual"],
"epub_a11y_accessibility_features_ssim" => ["ARIA",
"alternativeText",
"displayTransformability",
"index",
"pageBreakMarkers",
"pageNavigation",
"printPageNumbers",
"readingOrder",
"structuralNavigation",
"tableOfContents"],
"epub_a11y_accessibility_feature_ssim" => ["ARIA",
"alternativeText",
"displayTransformability",
"index",
"pageBreakMarkers",
"pageNavigation",
"printPageNumbers",
"readingOrder",
"structuralNavigation",
"tableOfContents"],
"epub_a11y_accessibility_hazard_ssim" => ["flashing",
"motionSimulation"],
"epub_a11y_accessibility_summary_ssi" => "A very complex book with 15 images, 10 tables, and complex formatting...",
"epub_a11y_certified_by_ssi" => "A11yCo",
"epub_a11y_certifier_credential_ssi" => "https://a11yfoo.org/certification",
Expand Down Expand Up @@ -214,7 +217,8 @@
<meta property="schema:accessibilityFeature">index</meta>
<meta property="schema:accessibilityFeature">structuralNavigation</meta>
<meta property="schema:accessibilityFeature">displayTransformability</meta>
<meta property="schema:accessibilityHazard">none</meta>
<meta property="schema:accessibilityHazard">flashing</meta>
<meta property="schema:accessibilityHazard">motionSimulation</meta>
<meta property="schema:accessibilitySummary">A very complex book with 15 images, 10 tables, and complex formatting...</meta>
<meta property="dcterms:conformsTo">EPUB Accessibility 1.1 - WCAG 2.1 Level AA</meta>
<meta property="a11y:certifiedBy">A11yCo</meta>
Expand Down Expand Up @@ -371,7 +375,8 @@
<meta name="schema:accessibilityFeature" content="index"/>
<meta name="schema:accessibilityFeature" content="structuralNavigation"/>
<meta name="schema:accessibilityFeature" content="displayTransformability"/>"
<meta name="schema:accessibilityHazard" content="none"/>
<meta name="schema:accessibilityHazard" content="flashing"/>
<meta name="schema:accessibilityHazard" content="motionSimulation"/>
<meta name="schema:accessibilitySummary" content="A very complex book with 15 images, 10 tables, and complex formatting..."/>
<meta name="dcterms:conformsTo" content="EPUB Accessibility 1.1 - WCAG 2.1 Level AA"/>
<meta name="a11y:certifiedBy" content="A11yCo"/>
Expand Down

0 comments on commit 5f03ab9

Please # to comment.