pennmarc 1.0.14 → 1.0.15.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76a91ac26d34008866dd6b66d66b9bbebf5d952d4bda7514d34a40b87f436244
-  data.tar.gz: 6d6813b9dcbadcf45905a48bb30dbc48fbe47ab081d8457d4936cb2263ba1c91
+  metadata.gz: cd846248b3c6fcde1cfd8a74312d84f46ce28f534effaff22ec112a5456afd2f
+  data.tar.gz: 7e5789d9ef2594767e438a5b1fd2978b1508afad975785059b3520d795fda15b
 SHA512:
-  metadata.gz: a704d7a8957d042ad629446626fa8734e1d9b5c0ee65ba844343765d7c196ac0e8da3ae328213b1832556786b63a426c8ad2b4dc1e9b806795a723530d9367eb
-  data.tar.gz: 01f2d33cd2e7ec4a0aecb5f032bacd438a553d6d8667c5a0191e282f4722358fd23755b788a9ce21f32677d076e7224a04a73c24345f1146fd76198c42e9ebf3
+  metadata.gz: 82a79402e68c4b48f3d38fa165042472aab3a8d811797145811af8a873d177ceb9020a2e71c9853f5c792a37d0533d7a87c7ec94506507c817e3dc09db345dcf
+  data.tar.gz: 87196088380e9b7f6750511434edcc49467ca9ee47e9577cb3f42ce75e595a2f7cb62605ede37d1a4b17b59876dec437a0beee131ee97eb19f1c411751c849cc

data/.gitlab-ci.yml

@@ -1,4 +1,8 @@
 include:
+  - project: "devops/gitlab/ci-templates/general"
+    file:
+      - ".install_hashicorp_vault.yml"
+      - ".vault_jwt_auth.yml"
   - project: "devops/gitlab/ci-templates/ruby"
     ref: "sans-dind"
     file:
@@ -37,19 +41,10 @@ gem_publication:
   image: ruby:3.2.2
   variables:
     GEMSPEC_FILE: "${CI_PROJECT_NAME}.gemspec"
-    VAULT_VERSION: "1.10.1"
+    VAULT_VERSION: "1.15.5"
   before_script:
-    - | 
-      apt-get update && apt-get -y install \
-      wget \
-      unzip && \
-      wget https://releases.hashicorp.com/vault/${VAULT_VERSION}/vault_${VAULT_VERSION}_linux_amd64.zip -O /tmp/vault_${VAULT_VERSION}.zip && \
-      unzip /tmp/vault_${VAULT_VERSION}.zip -d /usr/bin && \
-      rm -fr /tmp/vault_${VAULT_VERSION}.zip && \
-      apt-get remove -y wget unzip && \
-      apt-get clean
-    - export VAULT_ADDR=${VAULT_URL}
-    - export VAULT_TOKEN="$(vault write -field=token auth/jwt/${CI_SERVER_HOST}/login role=${JWT_ROLE} jwt=${CI_JOB_JWT})"
+    - !reference [.install_hashicorp_vault, before_script]
+    - !reference [.vault_jwt_auth, before_script]
     - export GEM_HOST_API_KEY="$(vault kv get -field=rubygems_api_key ${VAULT_KV_ENDPOINT}${ENVIRONMENT})"
     - |
       gem -v

data/lib/pennmarc/helpers/citation.rb

@@ -11,9 +11,9 @@ module PennMARC
       # field 520 (Summary, Etc. Note).
       # https://www.loc.gov/marc/bibliographic/bd510.html
       # @param [MARC::Record] record
-      # @return [Array] array of citations and any linked alternates
+      # @return [Array<String>] array of citations and any linked alternates
       def cited_in_show(record)
-        datafield_and_linked_alternate(record, '510')
+        datafield_and_linked_alternate(record, '510').uniq
       end
 
       # Field 524 is the Preferred Citation of Described Materials Note. It is the Format for the citation of the
@@ -22,9 +22,9 @@ module PennMARC
       # introductory phrase that is generated as a display constant based on the first indicator value.
       # https://www.loc.gov/marc/bibliographic/bd524.html
       # @param [MARC::Record] record
-      # @return [Array] array of citation of described materials note and any linked alternates
+      # @return [Array<String>] array of citation of described materials note and any linked alternates
       def cite_as_show(record)
-        datafield_and_linked_alternate(record, '524')
+        datafield_and_linked_alternate(record, '524').uniq
       end
     end
   end

data/lib/pennmarc/helpers/classification.rb

@@ -28,7 +28,7 @@ module PennMARC
       # @param [MARC::Record] record
       # @return [Array<String>] array of classifications
       def facet(record)
-        record.fields(TAGS).flat_map do |field|
+        record.fields(TAGS).flat_map { |field|
           call_number_type = subfield_values(field, call_number_type_sf(field))&.first
           call_numbers = subfield_values(field, call_number_sf(field))
 
@@ -39,7 +39,7 @@ module PennMARC
 
             format_facet(class_code, call_number_type, title)
           end
-        end
+        }.uniq
       end
 
       private

data/lib/pennmarc/helpers/creator.rb

@@ -67,9 +67,9 @@ module PennMARC
       def show(record)
         fields = record.fields(TAGS)
         fields += record.fields('880').select { |field| subfield_value_in?(field, '6', TAGS) }
-        fields.filter_map do |field|
+        fields.filter_map { |field|
           join_subfields(field, &subfield_not_in?(%w[0 1 4 6 8 e w]))
-        end
+        }.uniq
       end
 
       # Author/Creator sort. Does not map and include any relator codes.
@@ -95,11 +95,11 @@ module PennMARC
           700 => 'abcdjq', 710 => 'abcdjq', 711 => 'abcen',
           800 => 'abcdjq', 810 => 'abcdjq', 811 => 'abcen'
         }
-        source_map.flat_map do |field_num, subfields|
+        source_map.flat_map { |field_num, subfields|
           record.fields(field_num.to_s).map do |field|
             trim_punctuation(join_subfields(field, &subfield_in?(subfields.chars)))
           end
-        end
+        }.uniq
       end
 
       # Conference for display, intended for results display
@@ -108,9 +108,9 @@ module PennMARC
       # @param [Hash] relator_map
       # @return [Array<String>] array of conference values
       def conference_show(record, relator_map: Mappers.relator)
-        record.fields('111').filter_map do |field|
+        record.fields('111').filter_map { |field|
           name_from_main_entry field, relator_map
-        end
+        }.uniq
       end
 
       # Conference detailed display, intended for record show page.
@@ -130,7 +130,7 @@ module PennMARC
           conf_extra = join_subfields field, &subfield_in?(%w[e j w])
           join_and_squish [conf, conf_extra].compact_blank
         end
-        values + record.fields('880').filter_map do |field|
+        conferences = values + record.fields('880').filter_map do |field|
           next unless subfield_value_in? field, '6', %w[111 711]
 
           next if subfield_defined? field, 'i'
@@ -139,15 +139,16 @@ module PennMARC
           conf_extra = join_subfields(field, &subfield_in?(%w[4 e j w]))
           join_and_squish [conf, conf_extra]
         end
+        conferences.uniq
       end
 
       # Conference name values for searching
       # @param [MARC::Record] record
       # @return [Array<String>]
       def conference_search(record)
-        record.fields(CONFERENCE_SEARCH_TAGS).filter_map do |field|
+        record.fields(CONFERENCE_SEARCH_TAGS).filter_map { |field|
           join_subfields(field, &subfield_in?(%w[a c d e]))
-        end
+        }.uniq
       end
 
       # Retrieve contributor values for display from fields {https://www.oclc.org/bibformats/en/7xx/700.html 700}
@@ -159,7 +160,7 @@ module PennMARC
       # @return [Array<String>]
       def contributor_show(record, relator_map: Mappers.relator)
         indicator_2_options = ['', ' ', '0']
-        contributors = record.fields(%w[700 710]).filter_map do |field|
+        values = record.fields(%w[700 710]).filter_map do |field|
           next unless indicator_2_options.member?(field.indicator2)
           next if subfield_defined? field, 'i'
 
@@ -176,7 +177,7 @@ module PennMARC
           }.join
           "#{contributor} #{contributor_append}".squish
         end
-        contributors + record.fields('880').filter_map do |field|
+        contributors = values + record.fields('880').filter_map do |field|
           next unless subfield_value_in?(field, '6', %w[700 710])
           next if subfield_defined?(field, 'i')
 
@@ -184,6 +185,7 @@ module PennMARC
           contributor_append = join_subfields(field, &subfield_in?(%w[e u 3]))
           "#{contributor} #{contributor_append}".squish
         end
+        contributors.uniq
       end
 
       private

data/lib/pennmarc/helpers/database.rb

@@ -19,13 +19,13 @@ module PennMARC
       # @param [Marc::Record]
       # @return [Array<string>] Array of types
       def type_facet(record)
-        record.fields('944').filter_map do |field|
+        record.fields('944').filter_map { |field|
           # skip unless specified database format type present
           next unless subfield_value?(field, 'a', /#{DATABASES_FACET_VALUE}/o)
 
           type = field.find { |subfield| subfield.code == 'b' }
           type&.value
-        end
+        }.uniq
       end
 
       # Retrieves database subject category/communities of interest (subfield 'a') from
@@ -37,13 +37,13 @@ module PennMARC
       def category_facet(record)
         return [] unless curated_db?(record)
 
-        record.fields('943').filter_map do |field|
+        record.fields('943').filter_map { |field|
           # skip unless Community of Interest code is in subfield '2'
           next unless subfield_value?(field, '2', /#{COI_CODE}/o)
 
           category = field.find { |subfield| subfield.code == 'a' }
           category&.value
-        end
+        }.uniq
       end
 
       # Concatenates database subject category with database sub subject category in the format "category--subcategory"
@@ -58,7 +58,7 @@ module PennMARC
       def subcategory_facet(record)
         return [] unless curated_db?(record)
 
-        record.fields('943').filter_map do |field|
+        record.fields('943').filter_map { |field|
           # skip unless Community of Interest code is in subfield '2'
           next unless subfield_value?(field, '2', /#{COI_CODE}/o)
 
@@ -73,7 +73,7 @@ module PennMARC
           next if subcategory.blank?
 
           "#{category.value}--#{subcategory.value}"
-        end
+        }.uniq
       end
 
       private

data/lib/pennmarc/helpers/edition.rb

@@ -14,9 +14,10 @@ module PennMARC
       # @param [MARC::Record] record
       # @return [Array<String>] array of editions and their alternates
       def show(record)
-        record.fields('250').map { |field|
+        editions = record.fields('250').map { |field|
           join_subfields(field, &subfield_not_in?(%w[6 8]))
         } + linked_alternate_not_6_or_8(record, '250')
+        editions.uniq
       end
 
       # Edition values for display in search results. Just grab the first 250 field.
@@ -42,12 +43,13 @@ module PennMARC
 
           other_edition_value(field, relator_map)
         end
-        values + record.fields('880').filter_map do |field|
+        editions = values + record.fields('880').filter_map do |field|
           next unless field.indicator2.blank? && subfield_value_in?(field, '6', %w[775]) &&
                       subfield_defined?(field, 'i')
 
           other_edition_value(field, relator_map)
         end
+        editions.uniq
       end
 
       private

data/lib/pennmarc/helpers/format.rb

@@ -48,7 +48,7 @@ module PennMARC
                                end
           join_subfields(f, &subfield_not_in?(subfield_to_ignore))
         end
-        results.compact_blank
+        results.compact_blank.uniq
       end
 
       # Get Format values for faceting. Format values are determined using complex logic for each possible format value.
@@ -122,23 +122,24 @@ module PennMARC
                        OTHER
                      end
         end
-        formats.concat(curated_format(record))
+        formats.concat(curated_format(record)).uniq
       end
 
       # Show "Other Format" values from {https://www.oclc.org/bibformats/en/7xx/776.html 776} and any 880 linkage.
       # @todo is 774 an error in the linked field in legacy? i changed to 776 here
       # @param [MARC::Record] record
-      # @return [Array] other format values for display
+      # @return [Array<String>] other format values for display
       def other_show(record)
-        other_formats = record.fields('776').filter_map do |field|
+        values = record.fields('776').filter_map do |field|
           value = join_subfields(field, &subfield_in?(%w[i a s t o]))
           next if value.blank?
 
           value
         end
-        other_formats + linked_alternate(record, '776') do |sf|
+        other_formats = values + linked_alternate(record, '776') do |sf|
           sf.code.in? %w[i a s t o]
         end
+        other_formats.uniq
       end
 
       # Retrieve cartographic reference data for map/atlas formats for display from
@@ -146,9 +147,9 @@ module PennMARC
       # @param [MARC::Record] record
       # @return [Array<String>]
       def cartographic_show(record)
-        record.fields(%w[255 342]).map do |field|
+        record.fields(%w[255 342]).map { |field|
           join_subfields(field, &subfield_not_in?(%w[6 8]))
-        end
+        }.uniq
       end
 
       # Check if a set of locations has any locations that include the term 'manuscripts'

data/lib/pennmarc/helpers/identifier.rb

@@ -34,11 +34,12 @@ module PennMARC
       # @param [MARC::Record] record
       # @return [Array<String>]
       def isbn_show(record)
-        isbn_values = record.fields('020').filter_map do |field|
+        values = record.fields('020').filter_map do |field|
           joined_isbn = join_subfields(field, &subfield_in?(%w[a]))
           joined_isbn.presence
         end
-        isbn_values + linked_alternate(record, '020', &subfield_in?(%w[a]))
+        isbn_values = values + linked_alternate(record, '020', &subfield_in?(%w[a]))
+        isbn_values.uniq
       end
 
       # Get ISSN values for display from the {https://www.oclc.org/bibformats/en/0xx/022.html 022 field} and related
@@ -47,11 +48,12 @@ module PennMARC
       # @param [MARC::Record] record
       # @return [Array<String>]
       def issn_show(record)
-        issn_values = record.fields('022').filter_map do |field|
+        values = record.fields('022').filter_map do |field|
           joined_issn = join_subfields(field, &subfield_in?(%w[a]))
           joined_issn.presence
         end
-        issn_values + linked_alternate(record, '022', &subfield_in?(%w[a]))
+        issn_values = values + linked_alternate(record, '022', &subfield_in?(%w[a]))
+        issn_values.uniq
       end
 
       # Get numeric OCLC ID of first {https://www.oclc.org/bibformats/en/0xx/035.html 035 field}
@@ -82,7 +84,7 @@ module PennMARC
       # @param [MARC::Record] record
       # @return [Array<String>]
       def oclc_id_search(record)
-        record.fields('035').flat_map do |field|
+        record.fields('035').flat_map { |field|
           field.filter_map do |subfield|
             # skip unless subfield 'a' or 'z'
             next unless subfield.code.in?(%w[a z])
@@ -98,7 +100,7 @@ module PennMARC
 
             match[1]
           end
-        end
+        }.uniq
       end
 
       # Get publisher issued identifiers from fields {https://www.oclc.org/bibformats/en/0xx/024.html 024},
@@ -109,7 +111,7 @@ module PennMARC
       # @param [MARC::Record] record
       # @return [Array<string>]
       def publisher_number_show(record)
-        record.fields(%w[024 028 880]).filter_map do |field|
+        record.fields(%w[024 028 880]).filter_map { |field|
           next if field.tag == '880' && subfield_value_not_in?(field, '6', %w[024 028])
 
           # do not return doi values from 024 ǂ2
@@ -118,7 +120,7 @@ module PennMARC
           else
             join_subfields(field, &subfield_not_in?(%w[5 6])).presence
           end
-        end
+        }.uniq
       end
 
       # Get publisher issued identifiers for searching of a record. Values extracted from fields
@@ -127,19 +129,19 @@ module PennMARC
       # @param [MARC::Record] record
       # @return [Array<String>]
       def publisher_number_search(record)
-        record.fields(%w[024 028]).filter_map do |field|
+        record.fields(%w[024 028]).filter_map { |field|
           joined_identifiers = join_subfields(field, &subfield_in?(%w[a]))
           joined_identifiers.presence
-        end
+        }.uniq
       end
 
       # Retrieve fingerprint for display from the {https://www.oclc.org/bibformats/en/0xx/026.html 026} field
       # @param [MARC::Record] record
       # @return [Array<String>]
       def fingerprint_show(record)
-        record.fields('026').map do |field|
+        record.fields('026').map { |field|
           join_subfields(field, &subfield_not_in?(%w[2 5 6 8]))
-        end
+        }.uniq
       end
 
       # Retrieve DOI values stored in {https://www.oclc.org/bibformats/en/0xx/024.html 024}.
@@ -147,14 +149,14 @@ module PennMARC
       # @param [MARC::Record] record
       # @return [Array<String>]
       def doi_show(record)
-        record.fields('024').filter_map do |field|
+        record.fields('024').filter_map { |field|
           # skip unless indicator1 is '7'
           next unless field.indicator1.in?(%w[7])
           # skip unless ǂ2 is the string literal 'doi'
           next unless subfield_value_in?(field, '2', %w[doi])
 
           join_subfields(field, &subfield_in?(%w[a]))
-        end
+        }.uniq
       end
 
       private

data/lib/pennmarc/helpers/language.rb

@@ -18,7 +18,8 @@ module PennMARC
         values = record.fields('546').map do |field|
           join_subfields field, &subfield_not_in?(%w[6 8])
         end
-        values + linked_alternate(record, '546', &subfield_not_in?(%w[6 8]))
+        language_values = values + linked_alternate(record, '546', &subfield_not_in?(%w[6 8]))
+        language_values.uniq
       end
 
       # Get language values for searching and faceting of a record. The values are extracted from subfields
@@ -33,7 +34,7 @@ module PennMARC
       # @param [MARC::Record] record
       # @param [Hash] iso_639_2_mapping iso-639-2 spec hash for language code translation
       # @param [Hash] iso_639_3_mapping iso-639-3 spec hash for language code translation
-      # @return [Array] array of language values
+      # @return [Array<String>] array of language values
       def values(record, iso_639_2_mapping: Mappers.iso_639_2_language, iso_639_3_mapping: Mappers.iso_639_3_language)
         values = record.fields('041').filter_map { |field|
           mapper = subfield_value?(field, '2', /iso639-3/) ? iso_639_3_mapping : iso_639_2_mapping

data/lib/pennmarc/helpers/note.rb

@@ -16,11 +16,11 @@ module PennMARC
       # @return [Array<String>]
       def notes_show(record)
         notes_fields = %w[500 502 504 515 518 525 533 540 550 580 586 588]
-        record.fields(notes_fields + ['880']).filter_map do |field|
+        record.fields(notes_fields + ['880']).filter_map { |field|
           next if field.tag == '880' && subfield_value_not_in?(field, '6', notes_fields)
 
           join_subfields(field, &subfield_not_in?(%w[5 6 8]))
-        end
+        }.uniq
       end
 
       # Retrieve local notes for display from fields {https://www.oclc.org/bibformats/en/5xx/561.html 561},
@@ -38,11 +38,12 @@ module PennMARC
 
         additional_fields = %w[562 563 585 590]
 
-        local_notes + record.fields(additional_fields + ['880']).filter_map do |field|
+        notes = local_notes + record.fields(additional_fields + ['880']).filter_map do |field|
           next if field.tag == '880' && subfield_value_not_in?(field, '6', additional_fields)
 
           join_subfields(field, &subfield_not_in?(%w[5 6 8]))
         end
+        notes.uniq
       end
 
       # Retrieve provenance notes for display from fields {https://www.oclc.org/bibformats/en/5xx/561.html 561} and
@@ -63,7 +64,8 @@ module PennMARC
 
           join_subfields(field, &subfield_in?(%w[a]))
         end
-        provenance_notes + prefixed_subject_and_alternate(record, 'PRO')
+        notes = provenance_notes + prefixed_subject_and_alternate(record, 'PRO')
+        notes.uniq
       end
 
       # Retrieve contents notes for display from fields {https://www.oclc.org/bibformats/en/5xx/505.html 505} and
@@ -75,16 +77,16 @@ module PennMARC
           next if field.tag == '880' && subfield_value_not_in?(field, '6', %w[505])
 
           join_subfields(field, &subfield_not_in?(%w[6 8])).split('--')
-        }.flatten
+        }.flatten.uniq
       end
 
       # Retrieve access restricted notes for display from field {https://www.oclc.org/bibformats/en/5xx/506.html 506}.
       # @param [MARC::Record] record
       # @return [Array<String>]
       def access_restriction_show(record)
-        record.fields('506').filter_map do |field|
+        record.fields('506').filter_map { |field|
           join_subfields(field, &subfield_not_in?(%w[5 6]))
-        end
+        }.uniq
       end
 
       # Retrieve finding aid notes for display from field {https://www.oclc.org/bibformats/en/5xx/555.html 555} and its
@@ -161,7 +163,7 @@ module PennMARC
 
           sub3_and_other_subs(field, &subfield_in?(%w[a b c d e f]))
         end
-        system_details_notes
+        system_details_notes.uniq
       end
 
       private

data/lib/pennmarc/helpers/production.rb

@@ -8,21 +8,21 @@ module PennMARC
       # @param [MARC::Record] record
       # @return [Array<String>]
       def show(record)
-        get_264_or_880_fields(record, '0')
+        get_264_or_880_fields(record, '0').uniq
       end
 
       # Retrieve distribution values for display from {https://www.oclc.org/bibformats/en/2xx/264.html 264 field}.
       # @param [MARC::Record] record
       # @return [Array<String>]
       def distribution_show(record)
-        get_264_or_880_fields(record, '2')
+        get_264_or_880_fields(record, '2').uniq
       end
 
       # Retrieve manufacture values for display from {https://www.oclc.org/bibformats/en/2xx/264.html 264 field}.
       # @param [MARC::Record] record
       # @return [Array<String>]
       def manufacture_show(record)
-        get_264_or_880_fields(record, '3')
+        get_264_or_880_fields(record, '3').uniq
       end
 
       # Retrieve publication values. Return publication values from
@@ -60,7 +60,7 @@ module PennMARC
 
           values += joined264
         end
-        values.filter_map { |value| value&.strip }
+        values.filter_map { |value| value&.strip }.uniq
       end
 
       # Retrieve publication values for display from fields
@@ -68,7 +68,7 @@ module PennMARC
       # {https://www.oclc.org/bibformats/en/2xx/260.html 260}-262 and their linked alternates,
       # and {https://www.oclc.org/bibformats/en/2xx/264.html 264} and its linked alternate.
       # @param [MARC::Record] record
-      # @return [Object]
+      # @return [Array<String>]
       def publication_show(record)
         values = record.fields('245').first(1).flat_map { |field| subfield_values(field, 'f') }
 
@@ -86,22 +86,22 @@ module PennMARC
         end
 
         values += get_264_or_880_fields(record, '1')
-        values.compact_blank
+        values.compact_blank.uniq
       end
 
       # Retrieve place of publication for display from {https://www.oclc.org/bibformats/en/7xx/752.html 752 field} and
       # its linked alternate.
       # @note legacy version returns array of hash objects including data for display link
       # @param [MARC::Record] record
-      # @return [Object]
+      # @return [Array<String>]
       def place_of_publication_show(record)
-        record.fields(%w[752 880]).filter_map do |field|
+        record.fields(%w[752 880]).filter_map { |field|
           next if field.tag == '880' && subfield_values(field, '6').exclude?('752')
 
           place = join_subfields(field, &subfield_not_in?(%w[6 8 e w]))
           place_extra = join_subfields(field, &subfield_in?(%w[e w]))
           "#{place} #{place_extra}"
-        end
+        }.uniq
       end
 
       private

data/lib/pennmarc/helpers/relation.rb

@@ -14,11 +14,11 @@ module PennMARC
       # in this field should be sufficient to locate host item record.
       #
       # @param [MARC::Record] record
-      # @return [Array] contained in values for display
+      # @return [Array<String>] contained in values for display
       def contained_in_show(record)
-        record.fields('773').map do |field|
+        record.fields('773').map { |field|
           join_subfields(field, &subfield_not_in?(%w[6 7 8 w]))
-        end
+        }.uniq
       end
 
       # Get "chronology" information from specially-prefixed 650 (subject) fields
@@ -56,7 +56,7 @@ module PennMARC
 
           values_with_title_prefix(field, sf_exclude: %w[0 4 6 8 i], relator_map: relator_map)
         end
-        values + record.fields('880').filter_map do |field|
+        relation_values = values + record.fields('880').filter_map do |field|
           next if field.indicator2.present?
 
           next unless subfield_value?(field, '6', /^(#{RELATED_WORK_FIELDS.join('|')})/)
@@ -65,6 +65,7 @@ module PennMARC
 
           values_with_title_prefix(field, sf_exclude: %w[0 4 6 8 i], relator_map: relator_map)
         end
+        relation_values.uniq
       end
 
       # Get "Contains" values from {CONTAINS_FIELDS} in the 7XX range. Must have indicator 2 value of 2 indicating an
@@ -72,20 +73,21 @@ module PennMARC
       # values in sf 0, 5, 6, and 8.
       # @param [MARC::Record] record
       # @param [Hash] relator_map
-      # @return [Array]
+      # @return [Array<String>]
       def contains_show(record, relator_map: Mappers.relator)
-        acc = record.fields(CONTAINS_FIELDS).filter_map do |field|
+        values = record.fields(CONTAINS_FIELDS).filter_map do |field|
           next unless field.indicator2 == '2'
 
           values_with_title_prefix(field, sf_exclude: %w[0 4 5 6 8 i], relator_map: relator_map)
         end
-        acc + record.fields('880').filter_map do |field|
+        contains_values = values + record.fields('880').filter_map do |field|
           next unless field.indicator2 == '2'
 
           next unless subfield_value?(field, '6', /^(#{CONTAINS_FIELDS.join('|')})/)
 
           values_with_title_prefix(field, sf_include: %w[0 5 6 8 i])
         end
+        contains_values.uniq
       end
 
       # Get "Constituent Unit" values from {https://www.oclc.org/bibformats/en/7xx/774.html MARC 774}. Include
@@ -93,10 +95,11 @@ module PennMARC
       # @param [MARC::Record] record
       # @return [Array]
       def constituent_unit_show(record)
-        acc = record.fields('774').filter_map do |field|
+        values = record.fields('774').filter_map do |field|
           join_subfields(field, &subfield_in?(%w[i a s t]))
         end
-        acc + linked_alternate(record, '774', &subfield_in?(%w[i a s t]))
+        constituent_values = values + linked_alternate(record, '774', &subfield_in?(%w[i a s t]))
+        constituent_values.uniq
       end
 
       # Get "Has Supplement" values from {https://www.oclc.org/bibformats/en/7xx/770.html MARC 770}. Ignore

data/lib/pennmarc/helpers/series.rb

@@ -31,7 +31,8 @@ module PennMARC
                  end || []
 
         values += remaining_show_entries(record, tags_present)
-        values + series_880_fields(record)
+        series_values = values + series_880_fields(record)
+        series_values.uniq
       end
 
       # Values from series fields for display.
@@ -75,7 +76,7 @@ module PennMARC
 
           filtered_values.map { |v| v.gsub(/\(|\)/, '') }.join(' ')
         end
-        values
+        values.uniq
       end
 
       # Information concerning the immediate predecessor of the target item (chronological relationship). When a note
@@ -83,9 +84,9 @@ module PennMARC
       # indicator position for display.
       # https://www.loc.gov/marc/bibliographic/bd780.html
       # @param [MARC::Record] record
-      # @return [String] continues fields string
+      # @return [Array<String>] continues fields string
       def get_continues_show(record)
-        continues(record, '780')
+        continues(record, '780').uniq
       end
 
       # Information concerning the immediate successor to the target item (chronological relationship). When a note is
@@ -93,9 +94,9 @@ module PennMARC
       # position for display.
       # https://www.loc.gov/marc/bibliographic/bd785.html
       # @param [MARC::Record] record
-      # @return [String] continued by fields string
+      # @return [Array<String>] continued by fields string
       def get_continued_by_show(record)
-        continues(record, '785')
+        continues(record, '785').uniq
       end
 
       private
@@ -127,7 +128,7 @@ module PennMARC
       # @note added 2017/04/10: filter out 0 (authority record numbers) added by Alma
       # @param [MARC::Record] record
       # @param [String] first_tag
-      # @return [Array<Hash>] array of author show entry hashes
+      # @return [Array<String>] array of author show entry strings
       def title_show_entries(record, first_tag)
         record.fields(first_tag).map do |field|
           series = join_subfields(field, &subfield_not_in?(%w[0 5 6 8 c e w v n]))
@@ -156,6 +157,7 @@ module PennMARC
       # links that field to the 880 field. The data in field 880 may be in more than one script. This function exists
       # because it differs than the tradition use of linked_alternate.
       # @param [MARC::Record] record
+      # @return [Array<String>]
       def series_880_fields(record)
         record.fields('880').filter_map do |field|
           next unless subfield_value?(field, '6', /^(800|810|811|830|400|410|411|440|490)/)
@@ -189,7 +191,7 @@ module PennMARC
       # Get subfields from a given field (continues or continued_by).
       # @param [MARC::Record] record
       # @param [String] tag
-      # @return [String] joined subfields
+      # @return [Array<String>] joined subfields
       def continues(record, tag)
         record.fields.filter_map do |field|
           next unless field.tag == tag || (field.tag == '880' && subfield_value?(field, '6', /^#{tag}/))

data/lib/pennmarc/helpers/subject.rb

@@ -32,9 +32,9 @@ module PennMARC
       #       a search (non-display) field?
       # @param [Hash] relator_map
       # @param [MARC::Record] record
-      # @return [Array] array of all subject values for search
+      # @return [Array<String>] array of all subject values for search
       def search(record, relator_map: Mappers.relator)
-        subject_fields(record, type: :search).filter_map do |field|
+        subject_fields(record, type: :search).filter_map { |field|
           subj_parts = field.filter_map do |subfield|
             # TODO: use term hash here? pro/chr would be rejected...
             # TODO: should we care about punctuation in a search field? relator mapping?
@@ -55,21 +55,21 @@ module PennMARC
           next if subj_parts.empty?
 
           join_and_squish subj_parts
-        end
+        }.uniq
       end
 
       # All Subjects for faceting
       #
       # @note this is ported mostly form MG's new-style Subject parsing
       # @param [MARC::Record] record
-      # @return [Array] array of all subject values for faceting
+      # @return [Array<String>] array of all subject values for faceting
       def facet(record)
-        subject_fields(record, type: :facet).filter_map do |field|
+        subject_fields(record, type: :facet).filter_map { |field|
           term_hash = build_subject_hash(field)
           next if term_hash.blank? || term_hash[:count]&.zero?
 
           format_term type: :facet, term: term_hash
-        end
+        }.uniq
       end
 
       # All Subjects for display. This includes all {DISPLAY_TAGS} and {LOCAL_TAGS}. For tags that specify a source,

data/lib/pennmarc/helpers/title.rb

@@ -35,11 +35,11 @@ module PennMARC
       # @param [MARC::Record] record
       # @return [Array<String>] array of title values for search
       def search(record)
-        record.fields(%w[245 880]).filter_map do |field|
+        record.fields(%w[245 880]).filter_map { |field|
           next if field.tag == '880' && subfield_value_not_in?(field, '6', %w[245])
 
           join_subfields(field, &subfield_not_in?(%w[c 6 8 h]))
-        end
+        }.uniq
       end
 
       # Auxiliary Title Search field. Takes from many fields defined in {AUX_TITLE_TAGS} that contain title-like
@@ -47,10 +47,11 @@ module PennMARC
       # @param [MARC::Record] record
       # @return [Array<String>] array of auxiliary title values for search
       def search_aux(record)
-        search_aux_values(record: record, title_type: :main, &subfield_not_in?(%w[c 6 8])) +
-          search_aux_values(record: record, title_type: :related, &subfield_not_in?(%w[s t])) +
-          search_aux_values(record: record, title_type: :entity, &subfield_in?(%w[t])) +
-          search_aux_values(record: record, title_type: :note, &subfield_in?(%w[t]))
+        values = search_aux_values(record: record, title_type: :main, &subfield_not_in?(%w[c 6 8])) +
+                 search_aux_values(record: record, title_type: :related, &subfield_not_in?(%w[s t])) +
+                 search_aux_values(record: record, title_type: :entity, &subfield_in?(%w[t])) +
+                 search_aux_values(record: record, title_type: :note, &subfield_in?(%w[t]))
+        values.uniq
       end
 
       # Journal Title Search field. Takes from {https://www.loc.gov/marc/bibliographic/bd245.html 245} and linked 880.
@@ -61,11 +62,11 @@ module PennMARC
       def journal_search(record)
         return [] if not_a_serial?(record)
 
-        record.fields(%w[245 880]).filter_map do |field|
+        record.fields(%w[245 880]).filter_map { |field|
           next if field.tag == '880' && subfield_value_not_in?(field, '6', %w[245])
 
           join_subfields(field, &subfield_not_in?(%w[c 6 8 h]))
-        end
+        }.uniq
       end
 
       # Auxiliary Journal Title Search field. Takes from many fields defined in {AUX_TITLE_TAGS} that contain title-like
@@ -74,10 +75,11 @@ module PennMARC
       # @param [MARC::Record] record
       # @return [Array<String>] auxiliary journal title information for search
       def journal_search_aux(record)
-        search_aux_values(record: record, title_type: :main, journal: true, &subfield_not_in?(%w[c 6 8])) +
-          search_aux_values(record: record, title_type: :related, journal: true, &subfield_not_in?(%w[s t])) +
-          search_aux_values(record: record, title_type: :entity, journal: true, &subfield_in?(%w[t])) +
-          search_aux_values(record: record, title_type: :note, journal: true, &subfield_in?(%w[t]))
+        values = search_aux_values(record: record, title_type: :main, journal: true, &subfield_not_in?(%w[c 6 8])) +
+                 search_aux_values(record: record, title_type: :related, journal: true, &subfield_not_in?(%w[s t])) +
+                 search_aux_values(record: record, title_type: :entity, journal: true, &subfield_in?(%w[t])) +
+                 search_aux_values(record: record, title_type: :note, journal: true, &subfield_in?(%w[t]))
+        values.uniq
       end
 
       # Single-valued Title, for use in headings. Takes the first {https://www.oclc.org/bibformats/en/2xx/245.html 245}
@@ -162,12 +164,13 @@ module PennMARC
 
           join_subfields(field, &subfield_not_in?(%w[5 6 8 e w]))
         end
-        standardized_titles + record.fields('880').filter_map do |field|
+        titles = standardized_titles + record.fields('880').filter_map do |field|
           next unless subfield_undefined?(field, 'i') ||
                       subfield_value_in?(field, '6', %w[130 240 730])
 
           join_subfields field, &subfield_not_in?(%w[5 6 8 e w])
         end
+        titles.uniq
       end
 
       # Other Title for display
@@ -187,11 +190,12 @@ module PennMARC
 
           join_subfields(field, &subfield_not_in?(%w[5 6 8]))
         end
-        other_titles + record.fields('880').filter_map do |field|
+        titles = other_titles + record.fields('880').filter_map do |field|
           next unless subfield_value_in? field, '6', %w[246 740]
 
           join_subfields(field, &subfield_not_in?(%w[5 6 8]))
         end
+        titles.uniq
       end
 
       # Former Title for display.
@@ -204,13 +208,13 @@ module PennMARC
       # @return [Array<String>] array of former titles
       def former_show(record)
         record.fields
-              .filter_map do |field|
+              .filter_map { |field|
           next unless field.tag == '247' || (field.tag == '880' && subfield_value?(field, '6', /^247/))
 
           former_title = join_subfields field, &subfield_not_in?(%w[6 8 e w]) # 6 and 8 are not meaningful for display
           former_title_append = join_subfields field, &subfield_in?(%w[e w])
           "#{former_title} #{former_title_append}".strip
-        end
+        }.uniq
       end
 
       private

data/lib/pennmarc/util.rb

@@ -173,7 +173,7 @@ module PennMARC
     # Returns the non-6,8 subfields from a datafield and its 880 link.
     # @param [MARC::Record] record
     # @param [String] tag
-    # @return [Array] acc
+    # @return [Array<String>] values
     def datafield_and_linked_alternate(record, tag)
       record.fields(tag).filter_map { |field|
         join_subfields(field, &subfield_not_in?(%w[6 8]))
@@ -238,7 +238,7 @@ module PennMARC
     # @param [String] prefix to select from subject field
     # @return [Array] array of values
     def prefixed_subject_and_alternate(record, prefix)
-      record.fields(%w[650 880]).filter_map do |field|
+      record.fields(%w[650 880]).filter_map { |field|
         next unless field.indicator2 == '4'
 
         next if field.tag == '880' && subfield_values(field, '6').exclude?('650')
@@ -248,7 +248,7 @@ module PennMARC
         elements = field.select(&subfield_in?(%w[a])).map { |sf| sf.value.gsub(/^%?#{prefix}/, '') }
         elements << join_subfields(field, &subfield_not_in?(%w[a 6 8 e w 5]))
         join_and_squish elements
-      end
+      }.uniq
     end
 
     # Does the given field specify an allowed source code?

data/lib/pennmarc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PennMARC
-  VERSION = '1.0.14'
+  VERSION = '1.0.15.pre'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pennmarc
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.15.pre
 platform: ruby
 authors:
 - Mike Kanning
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-30 00:00:00.000000000 Z
+date: 2024-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -166,9 +166,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.4.10
 signing_key: