pennmarc 1.0.5 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9aa7e5cf7ade86fc51db4d35791eed5e3e38784e35d33bd9b82379a91ab3786e
-  data.tar.gz: 8b2668fbfd1fc645b203e23f12cfe5681014a870fa504f45c7c0b034682be325
+  metadata.gz: 11dd403cd5a0f964db340be6258d2cc510c99ccc0fc6d43a65b236853cb5b87c
+  data.tar.gz: 85eed79f3e637121cce8be8b0f0509d26e3fa9b6283b7f5bc48b0b321259e3f3
 SHA512:
-  metadata.gz: aff6902488cb0d85bee32f3a3c5f4b613c8c5867ab3b594af40dad4c54e501b735b79fbed1ba8656c1144b87b58a9edc6e0ed961cc62603c7ccefb0c244b3117
-  data.tar.gz: e262a56ed0512de8c93c4ef0f94f87c322904d44ed845a64b9eb8dc58c8c3cc9c62675d52e314c5cd15eba0d7f4daea4725675af0c3e96ac7cb501a55074edf7
+  metadata.gz: 90a59eaf167d985b596663d6b8d1eab0c3263724da550babfb28fa253df326b07b72bbb5aac1cf1d4150efd2eaecce84686b2de9e99801ff178bbfabc982b765
+  data.tar.gz: 5e0a4fdc1518af2b3a52bc137f76a30430d025f58f5cd46b9d0347a7a6a08f901e72e45917cc9a52d0352a6dbb0213725fd5a6e22650cfedb00d534fb72b44f2

data/README.md

@@ -71,7 +71,7 @@ rspec
 
 ## Publishing the Gem
 
-1. Update the version in `pennmarc.gemspec`
+1. Update the `VERSION` constant in `lib/pennmarc/version.rb`.
 2. Run `gem build pennmarc.gemspec` with the latest code
 3. Run `gem push pennmarc-{version number here}.gem`(e.g. `gem push pennmarc-1.0.0.gem`) to push to RubyGems. You will need access and MFA setup with RubyGems.
 

data/lib/pennmarc/helpers/access.rb

@@ -5,20 +5,22 @@ module PennMARC
   class Access < Helper
     ONLINE = 'Online'
     AT_THE_LIBRARY = 'At the library'
+    ELEC_AVAILABILITY_TAG = 'AVE'
+    PHYS_AVAILABILITY_TAG = 'AVA'
 
     class << self
-      # Based primarily on the "enhanced MARC" fields added by Alma, determine if the record has
-      # electronic access or has physical holding, and is therefore "Online" or "At the library". If a record is "At the
-      # library", but has a link to a finding aid in the 856 field (matching certain criteria), also add 'Online' as an
-      # access method.
+      # Based on enhanced metadata fields added by Alma publishing process or API, determine if the record has
+      # electronic access or has physical holdings, and is therefore "Online" or "At the library". If a record is "At
+      # the library", but has a link to a finding aid in the 856 field (matching certain criteria), also add 'Online' as
+      # an access method.
       # @todo What if none of these criteria match? Should we include "At the library" by default? Records with no value
       #       in this field would be lost if the user selects a facet value.
       # @param [MARC::Record] record
       # @return [Array]
       def facet(record)
         acc = record.filter_map do |field|
-          next AT_THE_LIBRARY if field.tag == EnrichedMarc::TAG_HOLDING
-          next ONLINE if field.tag == EnrichedMarc::TAG_ELECTRONIC_INVENTORY
+          next AT_THE_LIBRARY if physical_holding_tag?(field)
+          next ONLINE if electronic_holding_tag?(field)
         end
 
         return acc if acc.size == 2 # return early if all values are already present
@@ -29,6 +31,20 @@ module PennMARC
 
       private
 
+      # Does the record have added electronic holding info?
+      # @param [MARC::Field] field
+      # @return [Boolean]
+      def electronic_holding_tag?(field)
+        field.tag.in? [EnrichedMarc::TAG_ELECTRONIC_INVENTORY, ELEC_AVAILABILITY_TAG]
+      end
+
+      # Does the record have added physical holding info?
+      # @param [MARC::Field] field
+      # @return [Boolean]
+      def physical_holding_tag?(field)
+        field.tag.in? [EnrichedMarc::TAG_HOLDING, PHYS_AVAILABILITY_TAG]
+      end
+
       # Check if a record contains an 856 entry for an online finding aid, meeting these criteria:
       # 1. Indicator 1 is 4 (HTTP resource)
       # 2. Indicator 2 is NOT 2 (indicating the linkage is to a "related" thing)

data/lib/pennmarc/helpers/language.rb

@@ -26,9 +26,9 @@ module PennMARC
       # when no linguistic content is found.
       #
       # @note In franklin, we extracted the language code from the 008 control field. After engaging cataloging unit
-      #   representatives, we decided to extract these values from the 041 field: Includes records for multilingual
-      #   items, items that involve translation, and items where the medium of communication is a sign language.
-      #   https://www.loc.gov/marc/bibliographic/bd041.html
+      #   representatives, we decided to also extract these values from the 041 field: Includes records for
+      #   multilingual items, items that involve translation, and items where the medium of communication is a sign
+      #   language. https://www.loc.gov/marc/bibliographic/bd041.html
       #
       # @param [MARC::Record] record
       # @param [Hash] iso_639_2_mapping iso-639-2 spec hash for language code translation

data/lib/pennmarc/helpers/link.rb

@@ -10,9 +10,52 @@ module PennMARC
       # @return [Object]
       def offsite(record); end
 
-      def full_text(record:); end
+      # Full text links from MARC 856 fields.
+      # @param [MARC::Record] record
+      # @return [Array] array of hashes
+      def full_text(record:)
+        indicator2_options = %w[0 1]
+        links_from_record(record, indicator2_options)
+      end
+
+      # Web text links from MARC 856 fields.
+      # @param [MARC::Record] record
+      # @return [Array] array of hashes
+      def web(record:)
+        indicator2_options = ['2', ' ', '']
+        links_from_record(record, indicator2_options)
+      end
+
+      private
+
+      # Extract subfield 3 and z/y depending on the presence of either. Extract link url and assemble array
+      # with text and link.
+      # @param [MARC::Field] field
+      # @return [Array]
+      def link_text_and_url(field)
+        subfield3 = subfield_values(field, 3)
+        subfield_zy = field.find_all(&subfield_in?(%w[z y])).map(&:value)
+        link_text = [subfield3, subfield_zy.first].compact.join(' ')
+        link_url = subfield_values(field, 'u')&.first || ''
+        [link_text, link_url.sub(' target=_blank', '')]
+      end
+
+      # Assemble array of link text, link URL values from 856 fields. Ensure indicator1 (access method)
+      # is always 4 (HTTP) and indicator2 (relationship) can be specified by caller method.
+      # @param [MARC::Record] record
+      # @param [Array] indicator2_options
+      # @return [Array]
+      def links_from_record(record, indicator2_options)
+        record.fields('856').filter_map do |field|
+          next unless field.indicator1 == '4' && indicator2_options.include?(field.indicator2)
 
-      def web(record:); end
+          link_text, link_url = link_text_and_url(field)
+          {
+            link_text: link_text.present? ? link_text : link_url,
+            link_url: link_url
+          }
+        end
+      end
     end
   end
 end

data/lib/pennmarc/helpers/title.rb

@@ -4,46 +4,81 @@ module PennMARC
   # This helper contains logic for parsing out Title and Title-related fields.
   class Title < Helper
     class << self
-      # these will be used when completing the *search_aux methods
+      # We use these fields when retrieving auxiliary titles in the *search_aux methods:
+      # {https://www.loc.gov/marc/bibliographic/bd130.html 130},
+      # {https://www.loc.gov/marc/bibliographic/bd210.html 210},
+      # {https://www.loc.gov/marc/bibliographic/bd245.html 245},
+      # {https://www.loc.gov/marc/bibliographic/bd246.html 246},
+      # {https://www.loc.gov/marc/bibliographic/bd247.html 247},
+      # {https://www.loc.gov/marc/bibliographic/bd440.html 440},
+      # {https://www.loc.gov/marc/bibliographic/bd490.html 490},
+      # {https://www.loc.gov/marc/bibliographic/bd730.html 730},
+      # {https://www.loc.gov/marc/bibliographic/bd740.html 740},
+      # {https://www.loc.gov/marc/bibliographic/bd830.html 830},
+      # {https://www.loc.gov/marc/bibliographic/bd773.html 773},
+      # {https://www.loc.gov/marc/bibliographic/bd774.html 774},
+      # {https://www.loc.gov/marc/bibliographic/bd780.html 780},
+      # {https://www.loc.gov/marc/bibliographic/bd785.html 785},
+      # {https://www.loc.gov/marc/bibliographic/bd700.html 700},
+      # {https://www.loc.gov/marc/bibliographic/bd710.html 710},
+      # {https://www.loc.gov/marc/bibliographic/bd711.html 711},
+      # {https://www.loc.gov/marc/bibliographic/bd505.html 505}
       AUX_TITLE_TAGS = {
         main: %w[130 210 240 245 246 247 440 490 730 740 830],
         related: %w[773 774 780 785],
-        entity: %w[700 710 711]
+        entity: %w[700 710 711],
+        note: %w[505]
       }.freeze
 
-      # Main Title Search field. Takes from 245 and linked 880.
+      # Main Title Search field. Takes from {https://www.loc.gov/marc/bibliographic/bd245.html 245} and linked 880.
       # @note Ported from get_title_1_search_values.
       # @param [MARC::Record] record
       # @return [Array<String>] array of title values for search
       def search(record)
-        titles = record.fields('245').filter_map do |field|
-          join_subfields(field, &subfield_not_in?(%w[c 6 8 h]))
-        end
-        titles + record.fields('880').filter_map do |field|
-          next unless subfield_value?(field, '6', /245/)
+        record.fields(%w[245 880]).filter_map do |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
       end
 
-      # Auxiliary Title Search field. Takes from many fields that contain title-like information.
-      # @note Ported from get_title_2_search_values.
-      # @todo port this, it is way complicated but essential for relevance
+      # Auxiliary Title Search field. Takes from many fields defined in {AUX_TITLE_TAGS} that contain title-like
+      # information.
       # @param [MARC::Record] record
-      # @return [Array<String>] array of title values for search
-      def search_aux(record); end
+      # @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]))
+      end
 
-      # Journal Title Search field.
-      # @todo port this, it is way complicated but essential for relevance
+      # Journal Title Search field. Takes from {https://www.loc.gov/marc/bibliographic/bd245.html 245} and linked 880.
+      # We do not return any values if the {https://www.loc.gov/marc/bibliographic/bdleader.html MARC leader}
+      # indicates that the record is not a serial.
       # @param [MARC::Record] record
       # @return [Array<String>] journal title information for search
-      def journal_search(record); end
+      def journal_search(record)
+        return [] if not_a_serial?(record)
+
+        record.fields(%w[245 880]).filter_map do |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
+      end
 
-      # Auxiliary Journal Title Search field.
-      # @todo port this, it is way complicated but essential for relevance
+      # Auxiliary Journal Title Search field. Takes from many fields defined in {AUX_TITLE_TAGS} that contain title-like
+      # information. Does not return any titles if the {https://www.loc.gov/marc/bibliographic/bdleader.html MARC leader}
+      # indicates that the record is not a serial.
       # @param [MARC::Record] record
-      # @return [Array<String>] journal title information for search
-      def journal_search_aux(record); end
+      # @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]))
+      end
 
       # Single-valued Title, for use in headings. Takes the first {https://www.oclc.org/bibformats/en/2xx/245.html 245}
       # value. Special consideration for
@@ -192,6 +227,43 @@ module PennMARC
           { prefix: '', filing: title.strip }
         end
       end
+
+      # Evaluate {https://www.loc.gov/marc/bibliographic/bdleader.html MARC leader} to determine if record is a serial.
+      # @param [MARC::Record] record
+      # @return [Boolean]
+      def not_a_serial?(record)
+        !record.leader[6..7].ends_with?('s')
+      end
+
+      # @param [MARC::DataField] field
+      # @param [String] value
+      # @return [Boolean]
+      def indicators_are_not_value?(field, value)
+        field.indicator1 != value && field.indicator2 != value
+      end
+
+      # Retrieve auxiliary title values. Returns no values if a journal is expected but the
+      # {https://www.loc.gov/marc/bibliographic/bdleader.html MARC leader} indicates that the record is not a serial.
+      # We take special consideration for the {https://www.loc.gov/marc/bibliographic/bd505.html 505 field}, extracting
+      # values only when indicator1 and indicator2 are both '0'.
+      # @param [MARC::Record] record
+      # @param [Symbol] title_type
+      # @param [Boolean] journal
+      # @bloc [Proc] join_selector
+      # @return [Array<String>]
+      def search_aux_values(record:, title_type:, journal: false, &join_selector)
+        return [] if journal && not_a_serial?(record)
+
+        tags = AUX_TITLE_TAGS[title_type] + ['880']
+
+        record.fields(tags).filter_map do |field|
+          next if field.tag == '505' && indicators_are_not_value?(field, '0')
+
+          next if field.tag == '880' && subfield_value_not_in?(field, '6', tags)
+
+          join_subfields(field, &join_selector)
+        end
+      end
     end
   end
 end

data/lib/pennmarc/version.rb

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

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

@@ -7,28 +7,48 @@ describe 'PennMARC::Access' do
 
   describe '.facet' do
     context 'with an electronic record' do
-      let(:record) do
-        marc_record fields: [marc_field(tag: 'prt')]
+      let(:record) { marc_record fields: [marc_field(tag: tag)] }
+
+      context 'with enrichment via the Alma publishing process' do
+        let(:tag) { PennMARC::EnrichedMarc::TAG_ELECTRONIC_INVENTORY }
+
+        it 'returns expected access value' do
+          expect(helper.facet(record)).to contain_exactly(PennMARC::Access::ONLINE)
+        end
       end
 
-      it 'returns expected access value' do
-        expect(helper.facet(record)).to contain_exactly(PennMARC::Access::ONLINE)
+      context 'with enrichment with availability info via the Alma API' do
+        let(:tag) { PennMARC::Access::ELEC_AVAILABILITY_TAG }
+
+        it 'returns expected access value' do
+          expect(helper.facet(record)).to contain_exactly(PennMARC::Access::ONLINE)
+        end
       end
     end
 
     context 'with a print record' do
-      let(:record) do
-        marc_record fields: [marc_field(tag: 'hld')]
+      let(:record) { marc_record fields: [marc_field(tag: tag)] }
+
+      context 'with enrichment via the Alma publishing process' do
+        let(:tag) { PennMARC::EnrichedMarc::TAG_HOLDING }
+
+        it 'returns expected access value' do
+          expect(helper.facet(record)).to contain_exactly(PennMARC::Access::AT_THE_LIBRARY)
+        end
       end
 
-      it 'returns expected access value' do
-        expect(helper.facet(record)).to contain_exactly(PennMARC::Access::AT_THE_LIBRARY)
+      context 'with enrichment with availability info via the Alma API' do
+        let(:tag) { PennMARC::Access::PHYS_AVAILABILITY_TAG }
+
+        it 'returns expected access value' do
+          expect(helper.facet(record)).to contain_exactly(PennMARC::Access::AT_THE_LIBRARY)
+        end
       end
     end
 
     context 'with a record containing a link to a finding aid (as a handle link)' do
       let(:record) do
-        marc_record fields: [marc_field(tag: 'hld'),
+        marc_record fields: [marc_field(tag: PennMARC::EnrichedMarc::TAG_HOLDING),
                              marc_field(tag: '856', subfields: location_and_access_subfields, **indicators)]
       end
 

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+describe 'PennMARC::Link' do
+  include MarcSpecHelpers
+
+  let(:helper) { PennMARC::Link }
+
+  describe '.full_text' do
+    let(:record) do
+      marc_record fields: [marc_field(tag: '856', subfields: { '3': 'Materials specified',
+                                                               z: 'Public note',
+                                                               y: 'Link text',
+                                                               u: 'https://www.test-uri.com/' },
+                                      indicator1: '4', indicator2: '0')]
+    end
+
+    it 'returns full text link text and url' do
+      expect(helper.full_text(record: record)).to contain_exactly({ link_text: 'Materials specified Public note',
+                                                                    link_url: 'https://www.test-uri.com/' })
+    end
+  end
+
+  describe '.web' do
+    let(:record) do
+      marc_record fields: [marc_field(tag: '856', subfields: { '3': 'Materials specified',
+                                                               z: 'Public note',
+                                                               y: 'Link text',
+                                                               u: 'https://www.test-uri.com/' },
+                                      indicator1: '4', indicator2: '')]
+    end
+
+    it 'returns web link text and url' do
+      expect(helper.web(record: record)).to contain_exactly({ link_text: 'Materials specified Public note',
+                                                              link_url: 'https://www.test-uri.com/' })
+    end
+  end
+end

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

@@ -21,7 +21,86 @@ describe 'PennMARC::Title' do
   end
 
   describe '.search_aux' do
-    it 'returns search aux values', pending: 'Not implemented yet'
+    let(:leader) { 'ZZZZZnaaZa22ZZZZZzZZ4500' }
+    let(:record) do
+      marc_record fields: [
+        marc_field(tag: '130', subfields: { a: 'Uniform Title', c: '130 not included' }),
+        marc_field(tag: '880', subfields: { '6': '130', a: 'Alternative Uniform Title' }),
+        marc_field(tag: '773', subfields: { a: 'Host Uniform Title', s: '773 not included' }),
+        marc_field(tag: '700', subfields: { t: 'Personal Entry Title', s: '700 not included' }),
+        marc_field(tag: '505', subfields: { t: 'Invalid Formatted Contents Note Title' }, indicator1: 'invalid'),
+        marc_field(tag: '505', subfields: { t: 'Formatted Contents Note Title', s: '505 not included' },
+                   indicator1: '0', indicator2: '0')
+      ], leader: leader
+    end
+
+    it 'returns auxiliary titles' do
+      expect(helper.search_aux(record)).to contain_exactly('Uniform Title', 'Host Uniform Title',
+                                                           'Alternative Uniform Title', 'Personal Entry Title',
+                                                           'Formatted Contents Note Title')
+    end
+
+    context 'when the leader indicates the record is a serial' do
+      let(:leader) { 'ZZZZZnasZa22ZZZZZzZZ4500' }
+
+      it 'returns auxiliary titles' do
+        expect(helper.search_aux(record)).to contain_exactly('Uniform Title', 'Host Uniform Title',
+                                                             'Alternative Uniform Title', 'Personal Entry Title',
+                                                             'Formatted Contents Note Title')
+      end
+    end
+  end
+
+  describe '.journal_search' do
+    let(:leader) { 'ZZZZZnasZa22ZZZZZzZZ4500' }
+    let(:record) do
+      marc_record fields: [
+        marc_field(tag: '245', subfields: { a: 'Some Journal Title' }),
+        marc_field(tag: '880', subfields: { a: 'Alternative Script', '6': '245' }),
+        marc_field(tag: '880', subfields: { a: 'Unrelated 880', '6': 'invalid' })
+      ], leader: leader
+    end
+
+    it 'returns journal search titles' do
+      expect(helper.journal_search(record)).to contain_exactly('Some Journal Title', 'Alternative Script')
+    end
+
+    context 'when the record is not a serial' do
+      let(:leader) { 'ZZZZZnaaZa22ZZZZZzZZ4500' }
+
+      it 'returns an empty array' do
+        expect(helper.journal_search_aux(record)).to be_empty
+      end
+    end
+  end
+
+  describe '.journal_search_aux' do
+    let(:leader) { 'ZZZZZnasZa22ZZZZZzZZ4500' }
+    let(:record) do
+      marc_record fields: [
+        marc_field(tag: '130', subfields: { a: 'Uniform Title', c: '130 not included' }),
+        marc_field(tag: '880', subfields: { '6': '130', a: 'Alternative Uniform Title' }),
+        marc_field(tag: '773', subfields: { a: 'Host Uniform Title', s: '773 not included' }),
+        marc_field(tag: '700', subfields: { t: 'Personal Entry Title', s: '700 not included' }),
+        marc_field(tag: '505', subfields: { t: 'Invalid Formatted Contents Note Title' }, indicator1: 'invalid'),
+        marc_field(tag: '505', subfields: { t: 'Formatted Contents Note Title', s: '505 not included' },
+                   indicator1: '0', indicator2: '0')
+      ], leader: leader
+    end
+
+    it 'returns auxiliary journal search titles' do
+      expect(helper.journal_search_aux(record)).to contain_exactly('Uniform Title', 'Alternative Uniform Title',
+                                                                   'Host Uniform Title', 'Personal Entry Title',
+                                                                   'Formatted Contents Note Title')
+    end
+
+    context 'when the record is not a serial' do
+      let(:leader) { 'ZZZZZnaaZa22ZZZZZzZZ4500' }
+
+      it 'returns an empty array' do
+        expect(helper.journal_search_aux(record)).to be_empty
+      end
+    end
   end
 
   describe '.show' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pennmarc
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.7
 platform: ruby
 authors:
 - Mike Kanning
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-09 00:00:00.000000000 Z
+date: 2023-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -128,6 +128,7 @@ files:
 - spec/lib/pennmarc/helpers/genre_spec.rb
 - spec/lib/pennmarc/helpers/identifer_spec.rb
 - spec/lib/pennmarc/helpers/language_spec.rb
+- spec/lib/pennmarc/helpers/link_spec.rb
 - spec/lib/pennmarc/helpers/location_spec.rb
 - spec/lib/pennmarc/helpers/note_spec.rb
 - spec/lib/pennmarc/helpers/production_spec.rb