pennmarc 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84864756f38d54ec58b75b355931ba9b4310f7f880245c2c437ecebb63fee447
-  data.tar.gz: ee807c262dc0f5e2117b779b44a47cf10012c8e019340a789ac4c60d21223842
+  metadata.gz: 33527bf43532170690b9b591097fb03f854130b3383debfafe931417d0394f52
+  data.tar.gz: a18a5be08df6d7b74d2aaa61275cdecdedec6caa4b5e8b2b81c99e91411ce093
 SHA512:
-  metadata.gz: fee3c852594dcdbb871e093f0bd45efb4043e14bfe323f6da3d48bab3dc75eb58f968b26a24e3ae786742c112f3a9ebf7ae43fb1688f33011d4b89c4ded7af1c
-  data.tar.gz: 1192019b7f5b79c90a2d68fa46d7aa6ce7b8a2cea55f78072db3191401a4109c8d96fc5eb47ff86d05805a4cabb3409d4d90062c57ff96bdcbd9d987037160fd
+  metadata.gz: 627a4da06351037f520bc02b0a9fd61ce6cfdec35c563f2b29e3c1c01b4ad76766f155630cafe680b010783ea4f4c285df2d499fd784b7ee4f3cb4948cd421dd
+  data.tar.gz: c966233bb00009a14babc5bc92f0399e75640e886f7c32d176fea8983813aca8936d0e8fab98576a797afaf0b60c5f24268c2ae4e2d8cca31900e590db0a9bc6

data/.rubocop.yml

@@ -2,3 +2,6 @@ inherit_from: .rubocop_todo.yml
 
 inherit_gem:
   upennlib-rubocop: upennlib_rubocop_defaults.yml
+
+Rails:
+  Enabled: false

data/.rubocop_todo.yml

@@ -1,12 +1,36 @@
 # 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-25 13:55:25 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: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: with_first_argument, with_fixed_indentation
+Layout/ArgumentAlignment:
+  Exclude:
+    - 'spec/lib/pennmarc/helpers/series_spec.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: empty_lines, no_empty_lines
+Layout/EmptyLinesAroundBlockBody:
+  Exclude:
+    - 'spec/lib/pennmarc/helpers/identifer_spec.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: final_newline, final_blank_line
+Layout/TrailingEmptyLines:
+  Exclude:
+    - 'spec/lib/pennmarc/helpers/identifer_spec.rb'
+
+# Offense count: 22
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes, Max.
 Metrics/AbcSize:
   Exclude:
@@ -50,7 +74,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 +110,14 @@ Metrics/PerceivedComplexity:
     - 'lib/pennmarc/helpers/title.rb'
     - 'lib/pennmarc/util.rb'
 
+# Offense count: 4
+# 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_
@@ -96,7 +128,7 @@ Naming/PredicateName:
   Exclude:
     - 'lib/pennmarc/helpers/relation.rb'
 
-# Offense count: 2
+# Offense count: 1
 # Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers, AllowedPatterns.
 # SupportedStyles: snake_case, normalcase, non_integer
 # AllowedIdentifiers: capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339, x86_64
@@ -104,14 +136,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:
@@ -135,17 +159,9 @@ RSpec/NestedGroups:
     - 'spec/lib/pennmarc/helpers/format_spec.rb'
 
 # Offense count: 2
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Include.
-# Include: app/**/*.rb, config/**/*.rb, db/**/*.rb, lib/**/*.rb
-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'
+    - 'spec/lib/pennmarc/helpers/creator_spec.rb'

data/Gemfile.lock

@@ -21,6 +21,8 @@ GEM
     minitest (5.18.0)
     nokogiri (1.15.2-arm64-darwin)
       racc (~> 1.4)
+    nokogiri (1.15.2-x64-mingw-ucrt)
+      racc (~> 1.4)
     nokogiri (1.15.2-x86_64-linux)
       racc (~> 1.4)
     parallel (1.23.0)
@@ -101,6 +103,7 @@ GEM
 PLATFORMS
   arm64-darwin-21
   arm64-darwin-22
+  x64-mingw-ucrt
   x86_64-linux
 
 DEPENDENCIES

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/identifier.rb

@@ -33,14 +33,12 @@ module PennMARC
       #
       # @param [MARC::Record] record
       # @return [Array<String>]
-      # @todo look into z subfield for 020 field, should we show cancelled isbn?
       def isbn_show(record)
         isbn_values = record.fields('020').filter_map do |field|
-          joined_isbn = join_subfields(field, &subfield_in?(%w[a z]))
+          joined_isbn = join_subfields(field, &subfield_in?(%w[a]))
           joined_isbn.presence
         end
-        isbn_values += linked_alternate(record, '020', &subfield_in?(%w[a z]))
-        isbn_values
+        isbn_values + linked_alternate(record, '020', &subfield_in?(%w[a]))
       end
 
       # Get ISSN values for display from the {https://www.oclc.org/bibformats/en/0xx/022.html 022 field} and related
@@ -50,11 +48,10 @@ module PennMARC
       # @return [Array<String>]
       def issn_show(record)
         issn_values = record.fields('022').filter_map do |field|
-          joined_issn = join_subfields(field, &subfield_in?(%w[a z]))
+          joined_issn = join_subfields(field, &subfield_in?(%w[a]))
           joined_issn.presence
         end
-        issn_values += linked_alternate(record, '022', &subfield_in?(%w[a z]))
-        issn_values
+        issn_values + linked_alternate(record, '022', &subfield_in?(%w[a]))
       end
 
       # Get numeric OCLC ID of first {https://www.oclc.org/bibformats/en/0xx/035.html 035 field}
@@ -85,17 +82,22 @@ module PennMARC
 
       # Get publisher issued identifiers from fields {https://www.oclc.org/bibformats/en/0xx/024.html 024},
       # {https://www.oclc.org/bibformats/en/0xx/024.html 028}, and related
-      # {https://www.oclc.org/bibformats/en/8xx/880.html 880 field}.
+      # {https://www.oclc.org/bibformats/en/8xx/880.html 880 field}. We do not return DOI values stored in 024 ǂ2,
+      # see {PennMARC::Identifier.doi_show} for parsing DOI values.
       #
       # @param [MARC::Record] record
       # @return [Array<string>]
       def publisher_number_show(record)
-        publisher_numbers = record.fields(%w[024 028]).filter_map do |field|
-          joined_identifiers = join_subfields(field, &subfield_not_in?(%w[5 6]))
-          joined_identifiers.presence
+        record.fields(%w[024 028 880]).filter_map do |field|
+          next if field.tag == '880' && subfield_value_not_in?(field, '6', %w[024 028])
+
+          # do not return doi values from 024 ǂ2
+          if field.tag == '024' && subfield_value_in?(field, '2', %w[doi])
+            join_subfields(field, &subfield_not_in?(%w[a 2 5 6])).presence
+          else
+            join_subfields(field, &subfield_not_in?(%w[5 6])).presence
+          end
         end
-        publisher_numbers += linked_alternate(record, %w[024 028], &subfield_not_in?(%w[5 6]))
-        publisher_numbers
       end
 
       # Get publisher issued identifiers for searching of a record. Values extracted from fields
@@ -119,6 +121,21 @@ module PennMARC
         end
       end
 
+      # Retrieve DOI values stored in {https://www.oclc.org/bibformats/en/0xx/024.html 024}.
+      # Penn MARC records give the first indicator a value of '7' and ǂ2 a value of 'doi' to denote that ǂa is a doi.
+      # @param [MARC::Record] record
+      # @return [Array<String>]
+      def doi_show(record)
+        record.fields('024').filter_map do |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
+      end
+
       private
 
       # Determine if subfield 'a' is an OCLC id.
@@ -126,11 +143,11 @@ module PennMARC
       # @param [MARC::Subfield]
       # @return [TrueClass, FalseClass]
       def subfield_a_is_oclc?(subfield)
-        subfield.code == 'a' && subfield.value =~ /^\(OCoLC\).*/
+        subfield.code == 'a' && (subfield.value =~ /^\(OCoLC\).*/).present?
       end
 
       # Normalize isbn value using {https://github.com/billdueber/library_stdnums library_stdnums gem}.
-      # Converts ISBN10 (ten-digit) to validated ISBN13 (thriteen-digit) and returns both values. If passed
+      # Converts ISBN10 (ten-digit) to validated ISBN13 (thirteen-digit) and returns both values. If passed
       # ISBN13 parameter, only returns validated ISBN13 value.
       #
       #  @param [String] isbn

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/note.rb

@@ -11,8 +11,6 @@ module PennMARC
       # {https://www.oclc.org/bibformats/en/5xx/550.html 550}, {https://www.oclc.org/bibformats/en/5xx/580.html 580},
       # {https://www.oclc.org/bibformats/en/5xx/586.html 586}, {https://www.oclc.org/bibformats/en/5xx/588.html 588},
       # and their linked alternates.
-      # @todo legacy implementation used conditional to separate join logic for 588 field. However, this doesn't seem
-      #   necessary because 588 only has subfields 'a', '5', '6', and '8'. Do we need to look into this?
       # @param [MARC::Record] record
       # @return [Array<String>]
       def notes_show(record)

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'