pennmarc 1.0.0 → 1.0.2

data/lib/pennmarc/helpers/series.rb

@@ -4,7 +4,6 @@ module PennMARC
   # Do Series and series-related field processing. Many of these fields are added entries that are justified by
   # corresponding series statements (usually 490). These fields provide information about the published series in which
   # a book, encoded finding aid, or other published work has appeared
-  # @todo We may want to include 410 in the display tags, since it is included in references below.
   class Series < Helper
     class << self
       # 800 - Series Added Entry-Personal Name - https://www.loc.gov/marc/bibliographic/bd800.html
@@ -16,17 +15,17 @@ module PennMARC
       # 411 - Series Statement/Added Entry Meeting Name - https://www.loc.gov/marc/bibliographic/bd411.html
       # 440 - Series Statement/Added Entry-Title - https://www.loc.gov/marc/bibliographic/bd440.html
       # 490 - Series Statement - https://www.loc.gov/marc/bibliographic/bd490.html
-      DISPLAY_TAGS = %w[800 810 811 830 400 411 440 490].freeze
+      DISPLAY_TAGS = %w[800 810 811 830 400 410 411 440 490].freeze
 
       # 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 +36,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 +110,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 +164,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
@@ -169,7 +168,8 @@ module PennMARC
       def format_term(type:, term:)
         return unless type.in? %i[facet display]
 
-        normalize_single_subfield(term[:parts].first) if term[:count] == 1
+        # attempt to handle poorly coded record
+        normalize_single_subfield(term[:parts].first) if term[:count] == 1 && term[:parts].first.present?
 
         case type.to_sym
         when :facet
@@ -183,7 +183,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 +200,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 +210,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 +269,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/helpers/title.rb

@@ -89,7 +89,7 @@ module PennMARC
                  end
         raw_title = join_subfields(title_field, &subfield_in?(['a'])) # get title from subfield a
         value = if offset.between?(1, 9)
-                  { prefix: raw_title[0..offset - 1].strip, filing: raw_title[offset..].strip }
+                  { prefix: raw_title[0..offset - 1]&.strip, filing: raw_title[offset..]&.strip }
                 elsif raw_title.present?
                   handle_bracket_prefix raw_title
                 else

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

data/lib/pennmarc/parser.rb

@@ -2,79 +2,53 @@
 
 require 'active_support/all'
 require_relative 'helpers/helper'
-require_relative 'helpers/creator'
-require_relative 'helpers/database'
-require_relative 'helpers/date'
-require_relative 'helpers/format'
-require_relative 'helpers/genre'
-require_relative 'helpers/identifier'
-require_relative 'helpers/language'
-require_relative 'helpers/link'
-require_relative 'helpers/location'
-require_relative 'helpers/subject'
-require_relative 'helpers/title'
-require_relative 'helpers/citation'
-require_relative 'helpers/relation'
-require_relative 'helpers/production'
-require_relative 'helpers/edition'
-require_relative 'helpers/note'
-require_relative 'helpers/series'
+
+# Require all files in helpers directory
+# TODO: this double-requires Helper, but that needs to be required before other helpers...
+Dir[File.join(__dir__, 'helpers', '*.rb')].each { |file| require file }
 
 # Top level gem namespace
 module PennMARC
-  attr_accessor :mappings
-
-  DEFINED_HELPERS = %w[Creator Database Date Format Genre Language Link Location Subject Title Relation].freeze
-
-  # Methods here should return values used in the indexer. The parsing logic should
-  # NOT return values specific to any particular site/interface, but just general
-  # MARC parsing logic for "title", "subject", "author", etc., as much as reasonably
-  # possible. We'll see how it goes.
-  #
-  # Methods should, by default, take in a MARC::Record
+  # Access point for magic calls to helper methods
   class Parser
-    def initialize(helpers: DEFINED_HELPERS)
-      @mappings = {}
-      @helpers = Array.wrap(helpers) # TODO: load helpers dynamically?
+    # Allow calls to `respond_to?` on parser instances to respond accurately by checking helper classes
+    # @param [String, Symbol] name
+    # @return [Boolean]
+    def respond_to_missing?(name, include_private = false)
+      helper, method_name = parse_call(name)
+      begin
+        "PennMARC::#{helper}".constantize.respond_to?(method_name)
+      rescue NameError
+        super # Helper is not defined, so check self
+      end
     end
 
-    def respond_to_missing?(name)
-      name.split('_').first.in? @helpers
-    end
-
-    # Call helper class methods, e.g.,
+    # Call helper class methods, passing along additional arguments as needed, e.g.:
     # #title_show -> PennMARC::Title.show
     # #subject_facet -> PennMARC::Subject.facet
-    def method_missing(name, opts)
-      call = name.to_s.split('_')
-      helper = call.shift
-      meth = call.join('_')
-      "PennMARC::#{helper.titleize}".constantize.public_send(meth, opts)
+    # @param [Symbol] name
+    # @param [MARC::Record] record
+    # @param [Array] opts
+    def method_missing(name, record, *opts)
+      helper, method_name = parse_call(name)
+      raise NoMethodError unless helper && method_name
+
+      helper_klass = "PennMARC::#{helper.titleize}".constantize
+      if opts.any?
+        helper_klass.public_send(method_name, record, **opts.first)
+      else
+        helper_klass.public_send(method_name, record)
+      end
     end
 
-    # Load language map from YAML and memoize in @mappings hash
-    # @return [Hash]
-    def language_map
-      @mappings[:language] ||= load_map('language.yml')
-    end
-
-    # Load location map from YAML and memoize in @mappings hash
-    # @return [Hash]
-    def location_map
-      @mappings[:location] ||= load_map('locations.yml')
-    end
+    private
 
-    # Load relator map from YAML and memoize in @mappings hash
-    # @return [Hash]
-    def relator_map
-      @mappings[: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)
-      YAML.safe_load(File.read(File.join(File.expand_path(__dir__), 'mappings', filename)),
-                     symbolize_names: true)
+    # Parse out a method call name in the way method_missing is configured to handle
+    # @param [String, Symbol] name
+    # @return [Array]
+    def parse_call(name)
+      call = name.to_s.split('_')
+      [call.shift&.titleize, call.join('_').to_sym]
     end
   end
 end

data/lib/pennmarc/util.rb

@@ -9,8 +9,10 @@ module PennMARC
     # @param [MARC::DataField] field
     # @param [Proc] selector
     # @return [String]
-    def join_subfields(field, &)
-      field.select(&).filter_map { |sf|
+    def join_subfields(field, &selector)
+      return '' unless field
+
+      field.select(&selector).filter_map { |sf|
         value = sf.value&.strip
         next if value.blank?
 
@@ -26,7 +28,7 @@ module PennMARC
     # @param [Regexp] regex
     # @return [TrueClass, FalseClass]
     def subfield_value?(field, subfield, regex)
-      field.any? { |sf| sf.code == subfield.to_s && sf.value =~ regex }
+      field&.any? { |sf| sf.code == subfield.to_s && sf.value =~ regex }
     end
 
     # returns true if a given field has a given subfield value in a given array
@@ -49,7 +51,6 @@ module PennMARC
     end
 
     # returns a lambda checking if passed-in subfield's code is a member of array
-    # TODO: include lambda returning methods in their own module?
     # @param [Array] array
     # @return [Proc]
     def subfield_in?(array)
@@ -57,7 +58,6 @@ module PennMARC
     end
 
     # returns a lambda checking if passed-in subfield's code is NOT a member of array
-    # TODO: include lambda returning methods in their own module?
     # @param [Array] array
     # @return [Proc]
     def subfield_not_in?(array)
@@ -124,16 +124,15 @@ module PennMARC
     # See: https://www.loc.gov/marc/bibliographic/bd880.html
     # @param [MARC::Record] record
     # @param [String|Array] subfield6_value either a string to look for in sub6 or an array of them
-    # @param selector [Proc] takes a subfield as argument, returns a boolean
+    # @param [Proc] selector takes a subfield as argument, returns a boolean
     # @return [Array] array of linked alternates
-    def linked_alternate(record, subfield6_value, &)
+    def linked_alternate(record, subfield6_value, &selector)
       record.fields('880').filter_map do |field|
         next unless subfield_value?(field, '6', /^#{Array.wrap(subfield6_value).join('|')}/)
 
-        field.select(&).map(&:value).join(' ')
+        field.select(&selector).map(&:value).join(' ')
       end
     end
-    alias get_880 linked_alternate
 
     # Common case of wanting to extract all the subfields besides 6 or 8,
     # from 880 datafield that has a particular subfield 6 value. We exclude 6 because
@@ -142,8 +141,9 @@ module PennMARC
     # @param [String|Array] subfield6_value either a string to look for in sub6 or an array of them
     # @return [Array] array of linked alternates without 8 or 6 values
     def linked_alternate_not_6_or_8(record, subfield6_value)
+      excluded_subfields = %w[6 8]
       linked_alternate(record, subfield6_value) do |sf|
-        %w[6 8].exclude?(sf.code)
+        excluded_subfields.exclude?(sf.code)
       end
     end
 
@@ -179,7 +179,6 @@ module PennMARC
     def join_and_squish(array)
       array.join(' ').squish
     end
-    alias join_and_trim_whitespace join_and_squish
 
     # If there's a subfield i, extract its value, and if there's something
     # in parentheses in that value, extract that.

data/lib/pennmarc/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module PennMARC
+  VERSION = '1.0.2'
+end

data/pennmarc.gemspec

@@ -1,8 +1,12 @@
 # frozen_string_literal: true
 
+lib = File.expand_path('lib', __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'pennmarc/version'
+
 Gem::Specification.new do |s|
   s.name        = 'pennmarc'
-  s.version     = '1.0.0'
+  s.version     = PennMARC::VERSION
   s.summary     = 'Penn Libraries Catalog MARC parsing wisdom for cross-project usage'
   s.description = 'This gem provides methods for parsing a Penn Libraries MARCXML record into string, array and date
                    objects for use in discovery or preservation applications.'

data/spec/lib/pennmarc/helpers/creator_spec.rb

@@ -17,9 +17,9 @@ describe 'PennMARC::Creator' do
       end
 
       it 'contains the expected search field values for a single author work' do
-        expect(helper.search(record, mapping)).to eq ['Name Surname http://cool.uri/12345 author 1900-2000.',
-                                                      'Surname, Name http://cool.uri/12345 author 1900-2000.',
-                                                      'Alternative Surname']
+        expect(helper.search(record, relator_map: mapping)).to eq ['Name Surname http://cool.uri/12345 author 1900-2000.',
+                                                                   'Surname, Name http://cool.uri/12345 author 1900-2000.',
+                                                                   'Alternative Surname']
       end
     end
 
@@ -30,8 +30,8 @@ describe 'PennMARC::Creator' do
       end
 
       it 'contains the expected search field values for a corporate author work' do
-        expect(helper.search(record, mapping)).to eq ['Group of People Annual Meeting Author.',
-                                                      'Alt. Group Name Alt. Annual Meeting']
+        expect(helper.search(record, relator_map: mapping)).to eq ['Group of People Annual Meeting Author.',
+                                                                   'Alt. Group Name Alt. Annual Meeting']
       end
     end
   end
@@ -46,7 +46,7 @@ describe 'PennMARC::Creator' do
       end
 
       it 'returns values for the author, including mapped relator code from ǂ4' do
-        values = helper.values(record, mapping)
+        values = helper.values(record, relator_map: mapping)
         expect(values).to contain_exactly 'Author Fancy active 24th century AD, Author.'
         expect(values.join.downcase).not_to include 'alt'
       end
@@ -58,7 +58,7 @@ describe 'PennMARC::Creator' do
       end
 
       it 'returns values for the corporate author, including mapped relator code from ǂ4' do
-        expect(helper.values(record, mapping)).to contain_exactly 'Annual Report Leader author, Author.'
+        expect(helper.values(record, relator_map: mapping)).to contain_exactly 'Annual Report Leader author, Author.'
       end
     end
   end
@@ -160,7 +160,7 @@ describe 'PennMARC::Creator' do
     end
 
     it 'returns conference name information for display, ignoring any linked 880 fields' do
-      expect(helper.conference_show(record, mapping)).to eq ['MARC History Symposium, Author.']
+      expect(helper.conference_show(record, relator_map: mapping)).to eq ['MARC History Symposium, Author.']
     end
   end
 
@@ -204,7 +204,7 @@ describe 'PennMARC::Creator' do
     end
 
     it 'returns expected contributor values' do
-      expect(helper.contributor_show(record, mapping)).to contain_exactly(
+      expect(helper.contributor_show(record, relator_map: mapping)).to contain_exactly(
         'Name I laureate 1968 pseud Fuller Name author affiliation materials, Author',
         'Corporation A division Office 1968 author affiliation materials, Author',
         'Alt Name Alt num Alt title Alt date Alt qualifier Alt Fuller Name Alt relator Alt affiliation Alt materials',

data/spec/lib/pennmarc/helpers/edition_spec.rb

@@ -28,8 +28,9 @@ describe 'PennMARC::Edition' do
 
   describe '.other_show' do
     it 'returns other edition values' do
-      expect(helper.other_show(record, mapping)).to contain_exactly('Autre Editione',
-                                                                    'Other Edition: Author. (Cool Book)')
+      expect(helper.other_show(record, relator_map: mapping)).to(
+        contain_exactly('Autre Editione', 'Other Edition: Author. (Cool Book)')
+      )
     end
   end
 end

data/spec/lib/pennmarc/helpers/format_spec.rb

@@ -7,7 +7,7 @@ describe 'PennMARC::Format' do
 
   describe '.facet' do
     let(:map) { location_map }
-    let(:formats) { helper.facet(record, map) }
+    let(:formats) { helper.facet(record, location_map: map) }
 
     context 'with an "Archive"' do
       let(:map) do

data/spec/lib/pennmarc/helpers/genre_spec.rb

@@ -43,7 +43,7 @@ describe 'PennMARC::Genre' do
   end
 
   describe '.facet' do
-    let(:values) { helper.facet(record, location_map) }
+    let(:values) { helper.facet(record, location_map: location_map) }
     let(:location_map) do
       { manu: { specific_location: 'Secure Manuscripts Storage' },
         vanp: { specific_location: 'Van Pelt' } }

data/spec/lib/pennmarc/helpers/identifer_spec.rb

@@ -16,13 +16,14 @@ describe 'PennMARC::Identifier' do
   describe '.isxn_search' do
     let(:record) do
       marc_record fields: [
-        marc_field(tag: '020', subfields: { a: '9781594205071', z: '1594205078' }),
-        marc_field(tag: '022', subfields: { a: '0008-6533', l: '0300-7162', z: '0008-6533' })
+        marc_field(tag: '020', subfields: { a: '9781594205071', z: '1555975275' }),
+        marc_field(tag: '022', subfields: { a: '0008-6533', l: '0300-7162', z: '0799-5946 ' })
       ]
     end
 
     it 'returns expected search values' do
-      expect(helper.isxn_search(record)).to contain_exactly('9781594205071', '1594205078', '0300-7162', '0008-6533')
+      expect(helper.isxn_search(record)).to contain_exactly('9781594205071', '1555975275', '9781555975272',
+                                                            '1594205078', '0300-7162', '0008-6533', '0799-5946 ')
     end
 
     it 'converts ISBN10 values to ISBN13' do
@@ -40,9 +41,9 @@ describe 'PennMARC::Identifier' do
       ]
     end
 
-    it 'returns expected show values' do
-      expect(helper.isbn_show(record)).to contain_exactly('9781594205071 1594205078', '0805073698 9780735222786',
-                                                          '0735222789 9780805073690')
+    it 'returns expected ǂa values' do
+      expect(helper.isbn_show(record)).to contain_exactly('9781594205071', '0805073698',
+                                                          '0735222789')
     end
   end
 
@@ -55,9 +56,9 @@ describe 'PennMARC::Identifier' do
       ]
     end
 
-    it 'returns expected show values' do
-      expect(helper.issn_show(record)).to contain_exactly('0008-6533 0008-6533', '2470-6302 1534-6714',
-                                                          '1080-6512 2213-4360')
+    it 'returns ǂa values' do
+      expect(helper.issn_show(record)).to contain_exactly('0008-6533', '2470-6302',
+                                                          '1080-6512')
     end
   end
 
@@ -79,9 +80,11 @@ describe 'PennMARC::Identifier' do
     let(:record) do
       marc_record fields: [
         marc_field(tag: '024', subfields: { a: '602537854325', '6': '880-01' }),
+        marc_field(tag: '024', subfields: { a: '10.18574/9781479842865', '2': 'doi' }),
         marc_field(tag: '028', subfields: { a: 'B002086600', b: 'Island Def Jam Music Group', '6': '880-01' }),
         marc_field(tag: '880', subfields: { a: '523458735206', '6': '024' }),
-        marc_field(tag: '880', subfields: { a: '006680200B', b: 'Island', '6': '028' })
+        marc_field(tag: '880', subfields: { a: '006680200B', b: 'Island', '6': '028' }),
+        marc_field(tag: '880', subfields: { a: '006680200B', b: 'Island', '6': '021' })
       ]
     end
 
@@ -90,18 +93,26 @@ describe 'PennMARC::Identifier' do
                                                                       'B002086600 Island Def Jam Music Group',
                                                                       '523458735206', '006680200B Island')
     end
+
+    it 'does not return DOI values' do
+      expect(helper.publisher_number_show(record)).not_to include('10.18574/9781479842865')
+      expect(helper.publisher_number_show(record)).not_to include('doi')
+
+    end
   end
 
   describe '.publisher_number_search' do
     let(:record) do
       marc_record fields: [
-        marc_field(tag: '024', subfields: { a: '602537854325' }),
+        marc_field(tag: '024', subfields: { a: '602537854325', b: 'exclude' }),
+        marc_field(tag: '024', subfields: { a: '10.18574/9781479842865', '2': 'doi' }),
         marc_field(tag: '028', subfields: { a: 'B002086600', b: 'Island Def Jam Music Group' })
       ]
     end
 
-    it 'returns expected search values' do
-      expect(helper.publisher_number_search(record)).to contain_exactly('602537854325', 'B002086600')
+    it 'returns publisher numbers from 024/028 ǂa and DOI values in 024 ǂ2' do
+      expect(helper.publisher_number_search(record)).to contain_exactly('10.18574/9781479842865', '602537854325',
+                                                                        'B002086600')
     end
   end
 
@@ -117,4 +128,22 @@ describe 'PennMARC::Identifier' do
       expect(helper.fingerprint_show(record)).to contain_exactly('dete nkck vess lodo Anno Domini MDCXXXVI 3')
     end
   end
-end
+
+  describe '.doi_show' do
+    let(:record) do
+      marc_record fields: [
+        marc_field(tag: '024', indicator1: '7', subfields: { a: '10.1038/sdata.2016.18 ', '2': 'doi' }),
+        marc_field(tag: '024', indicator1: '7', subfields: { a: '10.18574/9781479842865', '2': 'doi' }),
+        marc_field(tag: '024', indicator1: '7',
+                   subfields: { a: '10.1016.12.31/nature.S0735-1097(98)2000/12?/31/34:7-7', '2': 'doi' }),
+        marc_field(tag: '024', indicator1: '7', subfields: { a: 'excluded', '2': 'non doi' }),
+        marc_field(tag: '024', indicator1: '0', subfields: { a: 'excluded', '2': 'doi' })
+      ]
+    end
+
+    it 'returns valid DOI values' do
+      expect(helper.doi_show(record)).to contain_exactly('10.1016.12.31/nature.S0735-1097(98)2000/12?/31/34:7-7',
+                                                         '10.1038/sdata.2016.18', '10.18574/9781479842865')
+    end
+  end
+end

data/spec/lib/pennmarc/helpers/language_spec.rb

@@ -18,7 +18,7 @@ describe 'PennMARC::Language' do
 
   describe '.search' do
     it 'returns the expected display value' do
-      expect(helper.search(record, mapping)).to eq 'English'
+      expect(helper.search(record, language_map: mapping)).to eq 'English'
     end
   end