pennmarc 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84864756f38d54ec58b75b355931ba9b4310f7f880245c2c437ecebb63fee447
-  data.tar.gz: ee807c262dc0f5e2117b779b44a47cf10012c8e019340a789ac4c60d21223842
+  metadata.gz: e574f1fae4f59435df3bf467da310ae7e426d82c2fe54ae2321ad326c05e5e99
+  data.tar.gz: de545e5a150b26c73e814e36b167bb688d267a97205cf4cdbab15dfd5c3225a8
 SHA512:
-  metadata.gz: fee3c852594dcdbb871e093f0bd45efb4043e14bfe323f6da3d48bab3dc75eb58f968b26a24e3ae786742c112f3a9ebf7ae43fb1688f33011d4b89c4ded7af1c
-  data.tar.gz: 1192019b7f5b79c90a2d68fa46d7aa6ce7b8a2cea55f78072db3191401a4109c8d96fc5eb47ff86d05805a4cabb3409d4d90062c57ff96bdcbd9d987037160fd
+  metadata.gz: 3c3fc981f5999eaca710a54fa3d247f2d01cc8183e13212151afab0cbb5b37f93531cbd264b22d1d4f30ef730b800efe38039b4bfc42a44cd28778c06f0cde3f
+  data.tar.gz: 729f0f80fd9d9ade7d1ae1085610cd85b8ab31beb1245efcaee246a18c01238abd5adc18dcf995f624448d518f4e36222a71c972d00c537c6367229f7d8d35c6

data/.rubocop_todo.yml

@@ -1,12 +1,12 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --auto-gen-only-exclude --exclude-limit 10000`
-# on 2023-07-28 16:23:59 UTC using RuboCop version 1.51.0.
+# on 2023-08-14 17:52:48 UTC using RuboCop version 1.51.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 21
+# Offense count: 22
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes, Max.
 Metrics/AbcSize:
   Exclude:
@@ -50,7 +50,7 @@ Metrics/CyclomaticComplexity:
     - 'lib/pennmarc/helpers/title.rb'
     - 'lib/pennmarc/util.rb'
 
-# Offense count: 22
+# Offense count: 24
 # Configuration parameters: CountComments, Max, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Exclude:
@@ -86,6 +86,14 @@ Metrics/PerceivedComplexity:
     - 'lib/pennmarc/helpers/title.rb'
     - 'lib/pennmarc/util.rb'
 
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, BlockForwardingName.
+# SupportedStyles: anonymous, explicit
+Naming/BlockForwarding:
+  Exclude:
+    - 'lib/pennmarc/util.rb'
+
 # Offense count: 1
 # Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros.
 # NamePrefix: is_, has_, have_
@@ -104,14 +112,6 @@ Naming/VariableNumber:
   Exclude:
     - 'lib/pennmarc/util.rb'
 
-# Offense count: 7
-# Configuration parameters: MinSize.
-Performance/CollectionLiteralInLoop:
-  Exclude:
-    - 'lib/pennmarc/helpers/creator.rb'
-    - 'lib/pennmarc/helpers/edition.rb'
-    - 'lib/pennmarc/helpers/series.rb'
-
 # Offense count: 6
 # Configuration parameters: Max, CountAsOne.
 RSpec/ExampleLength:
@@ -141,11 +141,3 @@ RSpec/NestedGroups:
 Rails/Output:
   Exclude:
     - 'lib/pennmarc/helpers/date.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
-# URISchemes: http, https
-Layout/LineLength:
-  Exclude:
-    - 'lib/pennmarc/helpers/subject.rb'

data/README.md

@@ -53,6 +53,12 @@ To run rubocop with the configuration:
 rubocop
 ```
 
+#### To regenerate `.rubocop_todo.yml`:
+```shell
+bundle exec rubocop --auto-gen-config  --auto-gen-only-exclude --exclude-limit 10000
+```
+
+
 ### Testing
 
 Testing is done with `rspec`. Test coverage should approach 100% given the relative simplicity of this gem.
@@ -63,6 +69,12 @@ To run the test suite:
 rspec
 ```
 
+## Publishing the Gem
+
+1. Update the version in `pennmarc.gemspec`
+2. Run `gem build pennmarc.gemspec` with the latest code
+3. Run `gem push pennmarc-{version number here}`(e.g. `gem push pennmarc-1.0.0`) to push to RubyGems. You will need access and MFA setup with RubyGems.
+
 ## QA
 
 ### Checking output of an arbitrary MARC XML file
@@ -75,8 +87,6 @@ MARC_FILE=path/to/marc.xml bundle exec rake pennmarc:parse
 
 ## TODO
  - rake task or some similar command to return a full set of values extracted from a specified marcxml file
- - hosting of yard output files?
- - mappings (locations, call number, languages)
  - Pipeline to run tests and publish to Rubygems
     - rubocop check
     - rdoc/yard coverage checks?

data/lib/pennmarc/helpers/creator.rb

@@ -24,17 +24,18 @@ module PennMARC
       #       indicator1 tell us the order of the name?
       # @note ported from get_author_creator_1_search_values
       # @param [MARC::Record] record
-      # @param [Hash] relator_mapping
+      # @param [Hash] relator_map
       # @return [Array<String>] array of author/creator values for indexing
-      def search(record, relator_mapping = relator_map)
+      def search(record, relator_map: Mappers.relator)
+        creator_subfields = %w[a 1 4 6 8]
         acc = record.fields(TAGS).map do |field|
           pieces = field.filter_map do |sf|
             if sf.code == 'a'
               convert_name_order(sf.value)
-            elsif %w[a 1 4 6 8].exclude?(sf.code)
+            elsif creator_subfields.exclude?(sf.code)
               sf.value
             elsif sf.code == '4'
-              relator = translate_relator(sf.value, relator_mapping)
+              relator = translate_relator(sf.value, relator_map)
               next if relator.blank?
 
               relator
@@ -48,12 +49,13 @@ module PennMARC
           end
         end
         # a second iteration over the same fields produces name entries with the names not reordered
+        secondary_subfields = %w[4 6 8]
         acc += record.fields(TAGS).map do |field|
           pieces = field.filter_map do |sf|
-            if !%w[4 6 8].member?(sf.code)
+            if secondary_subfields.exclude?(sf.code)
               sf.value
             elsif sf.code == '4'
-              relator = translate_relator(sf.value, relator_mapping)
+              relator = translate_relator(sf.value, relator_map)
               next if relator.blank?
 
               relator
@@ -88,11 +90,11 @@ module PennMARC
       # All author/creator values for display (like #show, but multivalued?) - no 880 linkage
       # @note ported from get_author_creator_values (indexed as author_creator_a) - shown on results page
       # @param [MARC::Record] record
-      # @param [Hash] relator_mapping
+      # @param [Hash] relator_map
       # @return [Array<String>] array of author/creator values for display
-      def values(record, relator_mapping = relator_map)
+      def values(record, relator_map: Mappers.relator)
         record.fields(TAGS).map do |field|
-          name_from_main_entry(field, relator_mapping)
+          name_from_main_entry(field, relator_map)
         end
       end
 
@@ -109,8 +111,7 @@ module PennMARC
         end
       end
 
-      # Author/Creator sort. Does not map and include any relator
-      # codes.
+      # Author/Creator sort. Does not map and include any relator codes.
       # @todo This includes any URI from ǂ0 which could help to disambiguate in sorts, but ǂ1 is excluded...
       # @note ported from get_author_creator_sort_values
       # @param [MARC::Record] record
@@ -143,11 +144,11 @@ module PennMARC
       # Conference for display, intended for results display
       # @note ported from get_conference_values
       # @param [MARC::Record] record
-      # @param [Hash] relator_mapping
+      # @param [Hash] relator_map
       # @return [Array<String>] array of conference values
-      def conference_show(record, relator_mapping = relator_map)
+      def conference_show(record, relator_map: Mappers.relator)
         record.fields('111').filter_map do |field|
-          name_from_main_entry field, relator_mapping
+          name_from_main_entry field, relator_map
         end
       end
 
@@ -188,19 +189,21 @@ module PennMARC
       # 'a', 'b', 'c', 'd', 'j', and 'q'. Then appends resulting string with joined subfields 'e', 'u', '3', and '4'.
       # @note legacy version returns array of hash objects including data for display link
       # @param [MARC::Record] record
-      # @ param [Hash] relator_mapping
+      # @ param [Hash] relator_map
       # @return [Array<String>]
-      def contributor_show(record, relator_mapping = relator_map)
+      def contributor_show(record, relator_map: Mappers.relator)
+        indicator_2_options = ['', ' ', '0']
         contributors = record.fields(%w[700 710]).filter_map do |field|
-          next unless ['', ' ', '0'].member?(field.indicator2)
+          next unless indicator_2_options.member?(field.indicator2)
           next if subfield_defined? field, 'i'
 
           contributor = join_subfields(field, &subfield_in?(%w[a b c d j q]))
+          contributor_append_subfields = %w[e u 3 4]
           contributor_append = field.filter_map { |subfield|
-            next unless %w[e u 3 4].member?(subfield.code)
+            next unless contributor_append_subfields.member?(subfield.code)
 
             if subfield.code == '4'
-              ", #{translate_relator(subfield.value, relator_mapping)}"
+              ", #{translate_relator(subfield.value, relator_map)}"
             else
               " #{subfield.value}"
             end
@@ -243,8 +246,9 @@ module PennMARC
       # @param [MARC::Field] field
       # @return [String] joined subfield values for value from field
       def name_from_main_entry(field, mapping)
+        name_subfields = %w[0 1 4 6 8]
         s = field.filter_map { |sf|
-          if %w[0 1 4 6 8].exclude?(sf.code)
+          if name_subfields.exclude?(sf.code)
             " #{sf.value}"
           elsif sf.code == '4'
             relator = translate_relator(sf.value, mapping)

data/lib/pennmarc/helpers/edition.rb

@@ -34,47 +34,49 @@ module PennMARC
       # display.
       # https://www.loc.gov/marc/bibliographic/bd775.html
       # @param [MARC::Record] record
-      # @param [Hash] relator_mapping
+      # @param [Hash] relator_map
       # @return [Array<String>] array of other edition strings
-      def other_show(record, relator_mapping = relator_map)
+      def other_show(record, relator_map: Mappers.relator)
         values = record.fields('775').filter_map do |field|
           next unless subfield_defined?(field, :i)
 
-          other_edition_value(field, relator_mapping)
+          other_edition_value(field, relator_map)
         end
-        values += record.fields('880').filter_map do |field|
+        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_mapping)
+          other_edition_value(field, relator_map)
         end
-        values
       end
 
       private
 
       # Assemble a string of relevant edition information.
       # @param [MARC::DataField] field
-      # @param [Hash] relator_mapping
+      # @param [Hash] relator_map
       # @return [String (frozen)] assembled other version string
-      def other_edition_value(field, relator_mapping)
+      def other_edition_value(field, relator_map)
         subi = remove_paren_value_from_subfield_i(field) || ''
+        excluded_subfields = %w[6 8]
+        other_edition_subfields = %w[s x z]
         other_editions = field.filter_map { |sf|
-          next if %w[6 8].member?(sf.code)
+          next if excluded_subfields.member?(sf.code)
 
-          if %w[s x z].member?(sf.code)
+          if other_edition_subfields.member?(sf.code)
             " #{sf.value}"
           elsif sf.code == 't'
-            relator = translate_relator(sf.value, relator_mapping)
+            relator = translate_relator(sf.value, relator_map)
             next if relator.blank?
 
             " #{relator}. "
           end
         }.join
+        other_editions_append_subfields = %w[i h s t x z e f o r w y 7]
         other_editions_append = field.filter_map { |sf|
-          next if %w[6 8].member?(sf.code)
+          next if excluded_subfields.member?(sf.code)
 
-          if %w[i h s t x z e f o r w y 7].exclude?(sf.code)
+          if other_editions_append_subfields.exclude?(sf.code)
             " #{sf.value}"
           elsif sf.code == 'h'
             " (#{sf.value}) "

data/lib/pennmarc/helpers/format.rb

@@ -68,10 +68,10 @@ module PennMARC
       #       for this helper method
       # @note ported from get_format
       # @param [MARC::Record] record
-      # @param [Hash] location_mapping
+      # @param [Hash] location_map
       # @return [Array<String>] format values for faceting
 
-      def facet(record, location_mapping = location_map)
+      def facet(record, location_map: Mappers.location)
         formats = []
         format_code = leader_format(record.leader)
         f007 = record.fields('007').map(&:value)
@@ -88,7 +88,7 @@ module PennMARC
         end
 
         # get all specific_location values from inventory info
-        locations = Location.location record: record, location_mapping: location_mapping,
+        locations = Location.location record: record, location_map: location_map,
                                       display_value: :specific_location
 
         if include_manuscripts?(locations)

data/lib/pennmarc/helpers/genre.rb

@@ -34,8 +34,9 @@ module PennMARC
 
           next if field.tag == '880' && subfield_values(field, '6').exclude?('655')
 
+          subfields = %w[a b]
           sub_with_hyphens = field.find_all(&subfield_not_in?(%w[0 2 5 6 8 c e w])).map { |sf|
-            sep = %w[a b].exclude?(sf.code) ? ' -- ' : ' '
+            sep = subfields.exclude?(sf.code) ? ' -- ' : ' '
             sep + sf.value
           }.join.lstrip
           "#{sub_with_hyphens} #{field.find_all(&subfield_in?(%w[e w])).join(' -- ')}".strip
@@ -46,10 +47,10 @@ module PennMARC
       # @todo the Genre facet in Franklin is pretty ugly. It could be cleaned up by limiting the subfields included
       #       here and cleaning up punctuation.
       # @param [MARC::Record] record
-      # @param [Hash] location_mapping
+      # @param [Hash] location_map
       # @return [Array<String>]
-      def facet(record, location_mapping = location_map)
-        locations = Location.location record: record, location_mapping: location_mapping,
+      def facet(record, location_map: Mappers.location)
+        locations = Location.location record: record, location_map: location_map,
                                       display_value: :specific_location
         manuscript = Format.include_manuscripts?(locations)
         video = record.fields('007').any? { |field| field.value.starts_with? 'v' }

data/lib/pennmarc/helpers/helper.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative '../enriched_marc'
+require_relative '../mappers'
 require_relative '../util'
 
 module PennMARC

data/lib/pennmarc/helpers/language.rb

@@ -25,12 +25,12 @@ module PennMARC
       # the 008 control field. Language facet and search values will typically be the same.
       #
       # @param [MARC::Record] record
-      # @param [Hash] mapping hash for language code translation
+      # @param [Hash] language_map hash for language code translation
       # @return [String] nice value for language
-      def search(record, mapping = language_map)
+      def search(record, language_map: Mappers.language)
         control_field = record['008']&.value
         language_code = control_field[35..37]
-        mapping[language_code.to_sym || UNDETERMINED_CODE]
+        language_map[language_code.to_sym || UNDETERMINED_CODE]
       end
     end
   end

data/lib/pennmarc/helpers/location.rb

@@ -10,10 +10,10 @@ module PennMARC
       # @see https://developers.exlibrisgroup.com/alma/apis/docs/bibs/R0VUIC9hbG1hd3MvdjEvYmlicy97bW1zX2lkfQ==/
       #   Alma documentation for these added fields
       # @param [MARC::Record] record
-      # @param [Hash] location_mapping hash with location_code as key and location hash as value
+      # @param [Hash] location_map hash with location_code as key and location hash as value
       # @return [Array<String>] Array of library locations retrieved from location_map
-      def library(record, location_mapping = location_map)
-        location(record: record, location_mapping: location_mapping, display_value: 'library')
+      def library(record, location_map: Mappers.location)
+        location(record: record, location_map: location_map, display_value: 'library')
       end
 
       # Retrieves the specific location from enriched marc 'itm' or 'hld' fields, giving priority to the item location
@@ -23,10 +23,10 @@ module PennMARC
       # @see https://developers.exlibrisgroup.com/alma/apis/docs/bibs/R0VUIC9hbG1hd3MvdjEvYmlicy97bW1zX2lkfQ==/
       #   Alma documentation for these added fields
       # @param [MARC::Record] record
-      # @param [Hash] location_mapping hash with location_code as key and location hash as value
+      # @param [Hash] location_map hash with location_code as key and location hash as value
       # @return [Array<String>] Array of specific locations retrieved from location_map
-      def specific_location(record, location_mapping = location_map)
-        location(record: record, location_mapping: location_mapping, display_value: 'specific_location')
+      def specific_location(record, location_map: Mappers.location)
+        location(record: record, location_map: location_map, display_value: 'specific_location')
       end
 
       # Base method to retrieve location data from enriched marc 'itm' or 'hld' fields, giving priority to the item
@@ -36,9 +36,9 @@ module PennMARC
       #   Alma documentation for these added fields
       # @param [MARC::Record] record
       # @param [Symbol | String] display_value field in location hash to retrieve
-      # @param [Hash] location_mapping hash with location_code as key and location hash as value
+      # @param [Hash] location_map hash with location_code as key and location hash as value
       # @return [Array<String>]
-      def location(record:, display_value:, location_mapping: location_map)
+      def location(record:, display_value:, location_map:)
         # get enriched marc location tag and subfield code
         location_tag_and_subfield_code(record) => {tag:, subfield_code:}
 
@@ -56,9 +56,9 @@ module PennMARC
             # sometimes "happening locations" are mistakenly used in holdings records.
             # that's a data problem that should be fixed.
             # here, if we encounter a code we can't map, we ignore it, for faceting purposes
-            next unless location_mapping.key?(subfield.value.to_sym)
+            next unless location_map.key?(subfield.value.to_sym)
 
-            location_mapping[subfield.value.to_sym][display_value.to_sym]
+            location_map[subfield.value.to_sym][display_value.to_sym]
           }.flatten.compact_blank
         }.uniq
         locations << 'Online library' if record.fields(PennMARC::EnrichedMarc::TAG_ELECTRONIC_INVENTORY).any?

data/lib/pennmarc/helpers/relation.rb

@@ -46,15 +46,15 @@ module PennMARC
       # Get related work from {RELATED_WORK_FIELDS} in the 7XX range. Require presence of sf t (title) and absence of
       # an indicator2 value. Prefix returned values with sf i value. Also map relator codes found in sf 4. Ignore sf 0.
       # @param [MARC::Record] record
-      # @param [Hash] relator_mapping
+      # @param [Hash] relator_map
       # @return [Array]
-      def related_work_show(record, relator_mapping = relator_map)
+      def related_work_show(record, relator_map: Mappers.relator)
         values = record.fields(RELATED_WORK_FIELDS).filter_map do |field|
           next if field.indicator2.present?
 
           next unless subfield_defined?(field, 't')
 
-          values_with_title_prefix(field, sf_exclude: %w[0 4 6 8 i], relator_map: relator_mapping)
+          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|
           next if field.indicator2.present?
@@ -63,7 +63,7 @@ module PennMARC
 
           next unless subfield_defined?(field, 't')
 
-          values_with_title_prefix(field, sf_exclude: %w[0 4 6 8 i], relator_map: relator_mapping)
+          values_with_title_prefix(field, sf_exclude: %w[0 4 6 8 i], relator_map: relator_map)
         end
       end
 
@@ -71,13 +71,13 @@ module PennMARC
       # "Analytical Entry" meaning that the record is contained by the matching field. Map relator codes in sf 4. Ignore
       # values in sf 0, 5, 6, and 8.
       # @param [MARC::Record] record
-      # @param [Hash] relator_mapping
+      # @param [Hash] relator_map
       # @return [Array]
-      def contains_show(record, relator_mapping = relator_map)
+      def contains_show(record, relator_map: Mappers.relator)
         acc = 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_mapping)
+          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|
           next unless field.indicator2 == '2'

data/lib/pennmarc/helpers/series.rb

@@ -20,13 +20,13 @@ module PennMARC
 
       # Fields for display that pertain to series information.
       # @param [MARC::Record] record
-      # @param [Hash] relator_mapping
+      # @param [Hash] relator_map
       # @return [Array<String>] array of series information
-      def show(record, relator_mapping = relator_map)
+      def show(record, relator_map: Mappers.relator)
         tags_present = DISPLAY_TAGS.select { |tag| record[tag].present? }
 
         values = if %w[800 810 811 400 410 411].member?(tags_present.first)
-                   author_show_entries(record, tags_present.first, relator_mapping)
+                   author_show_entries(record, tags_present.first, relator_map)
                  elsif %w[830 440 490].member?(tags_present.first)
                    title_show_entries(record, tags_present.first)
                  end || []
@@ -37,14 +37,14 @@ module PennMARC
 
       # Values from series fields for display.
       # @param [MARC::Record] record
-      # @param [Hash] relator_mapping
+      # @param [Hash] relator_map
       # @return [Array<String>] array of series values
-      def values(record, relator_mapping = relator_map)
+      def values(record, relator_map: Mappers.relator)
         series_8x = record.fields(%w[800 810 811 830]).first
-        return Array.wrap(series_8xx_field(series_8x, relator_mapping)) if series_8x
+        return Array.wrap(series_field(series_8x, relator_map)) if series_8x
 
         series_4x = record.fields(%w[400 410 411 440 490]).first
-        return Array.wrap(series_4xx_field(series_4x, relator_mapping)) if series_4x
+        Array.wrap(series_field(series_4x, relator_map)) if series_4x
       end
 
       # Series fields for search.
@@ -111,8 +111,9 @@ module PennMARC
       def author_show_entries(record, first_tag, relator_mapping)
         record.fields(first_tag).map do |field|
           series = join_subfields(field, &subfield_not_in?(%w[0 5 6 8 e t w v n]))
+          author_show_subfields = %w[e w v n t]
           pairs = field.map do |sf|
-            if %w[e w v n t].member?(sf.code)
+            if author_show_subfields.member?(sf.code)
               [' ', sf.value]
             elsif sf.code == '4'
               [', ', translate_relator(sf.value, relator_mapping)]
@@ -164,31 +165,19 @@ module PennMARC
         end || []
       end
 
-      # Assemble a formatted string of a given 8xx field.
-      # @note added 2017/04/10: filter out 0 (authority record numbers) added by Alma
-      # @param [String] field
-      # @param [Hash] relator_mapping
-      # @return [String] series 8xx field
-      def series_8xx_field(field, relator_mapping)
-        s = field.filter_map { |sf|
-          if %w[0 4 5 6 8].exclude?(sf.code)
-            " #{sf.value}"
-          elsif sf.code == '4'
-            ", #{translate_relator(sf.value, relator_mapping)}"
-          end
-        }.join
-        s2 = s + (%w[. -].exclude?(s[-1]) ? '.' : '')
-        s2.squish
-      end
-
-      # Assemble a formatted string of a given 4xx field.
+      # Assemble a formatted string of a given field.
       # @note added 2017/04/10: filter out 0 (authority record numbers) added by Alma
-      # @param [String] field
+      # @param [MARC::Field] field
       # @param [Hash] relator_mapping
       # @return [String] series 4xx field
-      def series_4xx_field(field, relator_mapping)
+      def series_field(field, relator_mapping)
+        subfields = if field.tag.start_with? '4'
+                      %w[0 4 6 8]
+                    else
+                      %w[0 4 5 6 8]
+                    end
         s = field.filter_map { |sf|
-          if %w[0 4 6 8].exclude?(sf.code)
+          if subfields.exclude?(sf.code)
             " #{sf.value}"
           elsif sf.code == '4'
             ", #{translate_relator(sf.value, relator_mapping)}"

data/lib/pennmarc/helpers/subject.rb

@@ -26,14 +26,14 @@ module PennMARC
       # Local subject heading tags
       LOCAL_TAGS = %w[690 691 697].freeze
 
-      # All Subjects for searching. This includes most subfield content from any field contained in {SEARCH_TAGS} or 69X,
-      # including any linked 880 fields. Fields must have an indicator2 value in {SEARCH_SOURCE_INDICATORS}.
+      # All Subjects for searching. This includes most subfield content from any field contained in {SEARCH_TAGS} or
+      # 69X, including any linked 880 fields. Fields must have an indicator2 value in {SEARCH_SOURCE_INDICATORS}.
       # @todo this includes subfields that may not be desired like 1 (uri) and 2 (source code) but this might be OK for
       #       a search (non-display) field?
-      # @param [Hash] relator_mapping
+      # @param [Hash] relator_map
       # @param [MARC::Record] record
       # @return [Array] array of all subject values for search
-      def search(record, relator_mapping = relator_map)
+      def search(record, relator_map: Mappers.relator)
         subject_fields(record, type: :search).filter_map do |field|
           subj_parts = field.filter_map do |subfield|
             # TODO: use term hash here? pro/chr would be rejected...
@@ -45,10 +45,9 @@ module PennMARC
               # remove any ? at the end
               subfield.value.gsub(/^%?(PRO|CHR)/, '').gsub(/\?$/, '').strip
             when '4'
-              # TODO: use relation mapping method from Title helper? for potential URI support?
               # sf 4 should contain a 3-letter code or URI "that specifies the relationship from the entity described
               # in the record to the entity referenced in the field"
-              "#{subfield.value} #{relator_mapping[subfield.value.to_sym]}".strip
+              "#{subfield.value} #{translate_relator(subfield.value.to_sym, relator_map)}".strip
             else
               subfield.value
             end
@@ -183,7 +182,7 @@ module PennMARC
       # @param [MARC::DataField] field
       # @return [Boolean] whether a MARC field is intended for display under general "Subjects"
       def subject_general_display_field?(field)
-        return false unless field.tag.in? DISPLAY_TAGS + LOCAL_TAGS
+        return false unless field.tag.in?(DISPLAY_TAGS + LOCAL_TAGS) && field.respond_to?(:indicator2)
 
         return false if field.indicator2 == '7' && !valid_subject_genre_source_code?(field)
 
@@ -200,7 +199,7 @@ module PennMARC
       # @param [Hash] options include :tags and :indicator2 values
       # @return [Boolean] whether a MARC field should be considered for display
       def subject_display_field?(field, options)
-        return false if field.blank?
+        return false unless field.respond_to?(:indicator2)
 
         return true if field.tag.in?(options[:tags]) && field.indicator2.in?(options[:indicator2])
 
@@ -210,7 +209,7 @@ module PennMARC
       # @param [MARC::DataField] field
       # @return [Boolean]
       def subject_facet_field?(field)
-        return false if field.blank?
+        return false unless field.respond_to?(:indicator2)
 
         return true if field.tag.in?(DISPLAY_TAGS) && field.indicator2.in?(%w[0 2 4])
 
@@ -269,7 +268,7 @@ module PennMARC
       # @param [MARC::DataField] field
       # @return [Boolean]
       def subject_search_field?(field)
-        return false if field.blank? || SEARCH_SOURCE_INDICATORS.exclude?(field.indicator2)
+        return false unless field.respond_to?(:indicator2) && SEARCH_SOURCE_INDICATORS.include?(field.indicator2)
 
         tag = if field.tag == '880'
                 subfield_values(field, '6').first

data/lib/pennmarc/mappers.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module PennMARC
+  # reusable static mappers
+  class Mappers
+    class << self
+      # @return [Hash]
+      def language
+        @language ||= load_map('language.yml')
+      end
+
+      # @return [Hash]
+      def location
+        @location ||= load_map('locations.yml')
+      end
+
+      # @return [Hash]
+      def relator
+        @relator ||= load_map('relator.yml')
+      end
+
+      # @param [String] filename of mapping file in config directory, with file extension
+      # @return [Hash] mapping as hash
+      def load_map(filename)
+        puts { "Loading #{filename}" }
+        YAML.safe_load(File.read(File.join(File.expand_path(__dir__), 'mappings', filename)),
+                       symbolize_names: true)
+      end
+    end
+  end
+end