pennmarc 1.0.33 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f26c7e473bed7b22bd7aa63257b9647dd808f79a02aa1aab21e965f264d545a
-  data.tar.gz: f793a9945291b9b66ee6c4155446c9270fc6e2f994c0754fa6dc0b4ba887cebc
+  metadata.gz: cb0bf4c30ad40bcee865ed6596fbfc6d6d16a5d3924d62947d270a3d5fa3aac5
+  data.tar.gz: 33ca607af919156ac45a73067605b6ac298fef9c17ef983060e6a871c54ca26f
 SHA512:
-  metadata.gz: b3b5296a1f285562ed9c2fd88e5f06f3c3127fd988ad7066298fcbc3cbb3b143678ac1da9c2e63e1fcf5df3075ea763197928712db0221042164525a6191a635
-  data.tar.gz: 3201a8f615d58871620081112eb663d7526911a68f1eae4a561e3216d77ada399cc10164be0532fdf7d2992a9cc964a829abfeb9272d64fabaa263ddb8f2f31c
+  metadata.gz: 5e5d316a7e1340aaf7438297e17198339d02ab797842b47ec2cece1daf75f96a387565b4fdc6ca273ef1a64630e1f486bc713ea75793ed3d783998234a83c517
+  data.tar.gz: 6f6d6824e1aa5fecbcd2dc13bbc94ea575531e96ea5f822b992719f3b28189cce4c26febc2f31848f24008a57f6a839f787383752cfd2c915695b1f1e66fe5ca

data/lib/pennmarc/helpers/classification.rb

@@ -42,6 +42,24 @@ module PennMARC
         }.uniq
       end
 
+      # Parse call number values from inventory fields, including both hld and itm fields from publishing enrichment.
+      # Return only unique values.
+      # @param record [MARC::Record]
+      # @return [Array<String>] array of call numbers from inventory fields
+      def call_number_search(record)
+        call_nums = record.fields(TAGS).filter_map do |field|
+          subfield_values(field, call_number_sf(field))
+        end
+
+        # Ensure we get call numbers for records with no `itm` tags by also checking `hld` and de-duping
+        call_nums += record.fields([Enriched::Pub::PHYS_INVENTORY_TAG]).filter_map do |field|
+          first = subfield_values(field, Enriched::Pub::HOLDING_CLASSIFICATION_PART)&.first
+          last = subfield_values(field, Enriched::Pub::HOLDING_ITEM_PART)&.first
+          "#{first} #{last}".squish.presence
+        end
+        call_nums.flatten.uniq
+      end
+
       private
 
       # Retrieve subfield code that stores the call number on enriched marc field

data/lib/pennmarc/helpers/location.rb

@@ -3,7 +3,6 @@
 module PennMARC
   # Methods that return Library and Location values from Alma enhanced MARC fields
   class Location < Helper
-    ONLINE_LIBRARY = 'Online library'
     WEB_LOCATION_CODE = 'web'
 
     class << self
@@ -45,7 +44,7 @@ module PennMARC
         # get enriched marc location tag and relevant subfields
         enriched_location_tag_and_subfields(record) => {tag:, location_code_sf:, call_num_sf:}
 
-        locations = record.fields(tag).flat_map { |field|
+        record.fields(tag).flat_map { |field|
           field.filter_map { |subfield|
             # skip unless subfield matches enriched marc tag subfield code
             next unless subfield.code == location_code_sf
@@ -60,17 +59,12 @@ module PennMARC
             override || location_map[location_code.to_sym][display_value.to_sym]
           }.flatten.compact_blank
         }.uniq
-        if record.tags.intersect?([Enriched::Pub::ELEC_INVENTORY_TAG, Enriched::Api::ELEC_INVENTORY_TAG])
-          locations << ONLINE_LIBRARY
-        end
-
-        locations
       end
 
       private
 
       # Determine enriched marc location tag, location code subfield, and call number subfield,
-      # giving priority to using 'itm', 'AVA', or 'AVE' fields.
+      # giving priority to using 'itm', 'AVA', or 'hld' fields.
       # @param record [MARC::Record]
       # @return [Hash<String, String>] containing location tag and subfield code
       # - `:tag` (String): The enriched marc location tag

data/lib/pennmarc/helpers/note.rb

@@ -90,7 +90,7 @@ module PennMARC
       # @return [Array<String>]
       def access_restriction_show(record)
         record.fields('506').filter_map { |field|
-          join_subfields(field, &subfield_not_in?(%w[5 6]))
+          join_subfields(field, &subfield_not_in?(%w[2 5 6]))
         }.uniq
       end
 

data/lib/pennmarc/helpers/title.rb

@@ -93,22 +93,46 @@ module PennMARC
       # @param record [MARC::Record]
       # @return [String] single title for display
       def show(record)
+        field = record.fields('245')&.first
+        values = title_values(field)
+        [format_title(values[:title_or_form]), values[:punctuation], values[:other_info]].compact_blank.join(' ')
+      end
+
+      # Same as show, but with inclusive dates appended. For use on show page.
+      # @param record [MARC::Record]
+      # @return [String] detailed title for display
+      def detailed_show(record)
+        field = record.fields('245')&.first
+        values = title_values(field)
+        title = [format_title(values[:title_or_form]), values[:punctuation],
+                 trim_trailing(:period, values[:other_info])].compact_blank.join(' ')
+        values[:inclusive_dates].present? ? [title, values[:inclusive_dates]].compact_blank.join(', ') : title
+      end
+
+      # Same structure as show, but linked alternate title.
+      # @param record [MARC::Record]
+      # @return [String, nil] alternate title for display
+      def alternate_show(record)
+        field = record.fields('880').filter_map { |alternate_field|
+          next unless subfield_value?(alternate_field, '6', /^245/)
+
+          alternate_field
+        }.first
+        return unless field
+
+        values = title_values(field)
+        [format_title(values[:title_or_form]), values[:punctuation], values[:other_info]].compact_blank.join(' ')
+      end
+
+      # Title statement of responsibility (field 245, subfield c) and linked alternate for display.
+      # See https://www.oclc.org/bibformats/en/2xx/245.html#subfieldc for examples
+      # @param [MARC::Record] record
+      # @return [Array<String>] statement of responsibility and linked alternate
+      def statement_of_responsibility_show(record)
         field = record.fields('245').first
-        title_or_form = field.find_all(&subfield_in?(%w[a k]))
-                             .map { |sf| trim_trailing(:comma, trim_trailing(:slash, sf.value).rstrip) }
-                             .first || ''
-        other_info = field.find_all(&subfield_in?(%w[b n p]))
-                          .map { |sf| trim_trailing(:slash, sf.value) }
-                          .join(' ')
-        hpunct = field.find_all { |sf| sf.code == 'h' }.map { |sf| sf.value.last }.first
-        punctuation = if [title_or_form.last, hpunct].include?('=')
-                        '='
-                      else
-                        [title_or_form.last, hpunct].include?(':') ? ':' : nil
-                      end
-        [trim_trailing(:colon, trim_trailing(:equal, title_or_form)).strip,
-         punctuation,
-         other_info].compact_blank.join(' ')
+        statement = field&.find { |sf| sf.code == 'c' }&.value
+        alternate_statement = linked_alternate(record, '245', &subfield_in?(%w[c]))&.first
+        [statement, alternate_statement].compact_blank
       end
 
       # Canonical title with non-filing characters relocated to the end.
@@ -212,12 +236,13 @@ module PennMARC
       def former_show(record)
         record.fields
               .filter_map { |field|
-          next unless field.tag == '247' || (field.tag == '880' && subfield_value?(field, '6', /^247/))
+                next unless field.tag == '247' || (field.tag == '880' && subfield_value?(field, '6', /^247/))
 
-          former_title = join_subfields field, &subfield_not_in?(%w[6 8 e w]) # 6 and 8 are not meaningful for display
-          former_title_append = join_subfields field, &subfield_in?(%w[e w])
-          "#{former_title} #{former_title_append}".strip
-        }.uniq
+                # 6 and 8 are not meaningful for display
+                former_title = join_subfields field, &subfield_not_in?(%w[6 8 e w])
+                former_title_append = join_subfields field, &subfield_in?(%w[e w])
+                "#{former_title} #{former_title_append}".strip
+              }.uniq
       end
 
       # Determine if the record is a "Host" bibliographic record for other bib records ("bound-withs")
@@ -232,6 +257,44 @@ module PennMARC
 
       private
 
+      # Extract title values from provided 245 subfields. Main title components are the following:
+      # - title_or_form: subfields a and k
+      # - inclusive_dates: subfield c
+      # - other_info: subfields b, n, and p
+      # https://www.oclc.org/bibformats/en/2xx/245.html
+      #
+      # @param field [MARC::Field]
+      # @return [Hash] title values
+      def title_values(field)
+        title_or_form = field.find_all(&subfield_in?(%w[a k]))
+                             .map { |sf| trim_trailing(:comma, trim_trailing(:slash, sf.value).rstrip) }
+                             .first || ''
+        inclusive_dates = field.find { |sf| sf.code == 'f' }&.value
+        other_info = field.find_all(&subfield_in?(%w[b n p]))
+                          .map { |sf| trim_trailing(:slash, sf.value) }
+                          .join(' ')
+        title_punctuation = title_or_form.last
+        medium_punctuation = field.find_all { |sf| sf.code == 'h' }
+                                  .map { |sf| sf.value.last }
+                                  .first
+        punctuation = if [title_punctuation, medium_punctuation].include?('=')
+                        '='
+                      else
+                        [title_punctuation, medium_punctuation].include?(':') ? ':' : nil
+                      end
+        { title_or_form: title_or_form,
+          inclusive_dates: inclusive_dates,
+          other_info: other_info,
+          punctuation: punctuation }
+      end
+
+      # Remove trailing equal from title, then remove trailing colon.
+      # @param title [String]
+      # @return [String]
+      def format_title(title)
+        trim_trailing(:colon, trim_trailing(:equal, title)).strip
+      end
+
       # Create prefix/filing hash for representing a title value with filing characters removed, with special
       # consideration for bracketed titles
       # @todo Is this still useful?

data/lib/pennmarc/version.rb

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

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

@@ -2,22 +2,26 @@
 
 describe 'PennMARC::Classification' do
   let(:helper) { PennMARC::Classification }
-  let(:record) do
-    marc_record fields: [marc_field(tag: tag,
-                                    subfields: { call_number_type_sf => '0', call_number_sf => 'TA683 .B3 1909b' }),
-                         marc_field(tag: tag,
-                                    subfields: { call_number_type_sf => '0', call_number_sf => 'QL756 .S643' }),
-                         marc_field(tag: tag,
-                                    subfields: { call_number_type_sf => '1', call_number_sf => '691.3 B2141' }),
-                         marc_field(tag: tag,
-                                    subfields: { call_number_type_sf => '1', call_number_sf => '378.748 POS1952.29' })]
-  end
+  let(:record) { marc_record fields: fields }
 
   describe '.facet' do
-    context 'with enrichment via the Alma publishing process' do
-      let(:tag) { PennMARC::Enriched::Pub::ITEM_TAG }
-      let(:call_number_type_sf) { PennMARC::Enriched::Pub::ITEM_CALL_NUMBER_TYPE }
-      let(:call_number_sf) { PennMARC::Enriched::Pub::ITEM_CALL_NUMBER }
+    let(:fields) do
+      [marc_field(tag: config[:tag],
+                  subfields: { config[:call_number_type_sf] => '0', config[:call_number_sf] => 'TA683 .B3 1909b' }),
+       marc_field(tag: config[:tag],
+                  subfields: { config[:call_number_type_sf] => '0', config[:call_number_sf] => 'QL756 .S643' }),
+       marc_field(tag: config[:tag],
+                  subfields: { config[:call_number_type_sf] => '1', config[:call_number_sf] => '691.3 B2141' }),
+       marc_field(tag: config[:tag],
+                  subfields: { config[:call_number_type_sf] => '1', config[:call_number_sf] => '378.748 POS1952.29' })]
+    end
+
+    context 'with enrichment via the Alma publishing process and itm fields' do
+      let(:config) do
+        { tag: PennMARC::Enriched::Pub::ITEM_TAG,
+          call_number_type_sf: PennMARC::Enriched::Pub::ITEM_CALL_NUMBER_TYPE,
+          call_number_sf: PennMARC::Enriched::Pub::ITEM_CALL_NUMBER }
+      end
 
       it 'returns expected values' do
         expect(helper.facet(record)).to contain_exactly('T - Technology', '600 - Technology',
@@ -26,9 +30,11 @@ describe 'PennMARC::Classification' do
     end
 
     context 'with enrichment with availability info via Alma Api' do
-      let(:tag) { PennMARC::Enriched::Api::PHYS_INVENTORY_TAG }
-      let(:call_number_type_sf) { PennMARC::Enriched::Api::PHYS_CALL_NUMBER_TYPE }
-      let(:call_number_sf) { PennMARC::Enriched::Api::PHYS_CALL_NUMBER }
+      let(:config) do
+        { tag: PennMARC::Enriched::Api::PHYS_INVENTORY_TAG,
+          call_number_type_sf: PennMARC::Enriched::Api::PHYS_CALL_NUMBER_TYPE,
+          call_number_sf: PennMARC::Enriched::Api::PHYS_CALL_NUMBER }
+      end
 
       it 'returns expected values' do
         expect(helper.facet(record)).to contain_exactly('T - Technology', '600 - Technology',
@@ -36,4 +42,63 @@ describe 'PennMARC::Classification' do
       end
     end
   end
+
+  describe '.call_number_search' do
+    let(:fields) do
+      [marc_field(tag: config[:tag],
+                  subfields: { config[:call_number_type_sf] => '0', config[:call_number_sf] => 'QL756 .S643' }),
+       marc_field(tag: config[:tag],
+                  subfields: { config[:call_number_type_sf] => '1', config[:call_number_sf] => '691.3 B2141' })]
+    end
+
+    context 'with enrichment via the Alma publishing process' do
+      let(:config) do
+        { tag: PennMARC::Enriched::Pub::ITEM_TAG,
+          call_number_type_sf: PennMARC::Enriched::Pub::ITEM_CALL_NUMBER_TYPE,
+          call_number_sf: PennMARC::Enriched::Pub::ITEM_CALL_NUMBER }
+      end
+
+      it 'returns expected values' do
+        expect(helper.call_number_search(record)).to contain_exactly '691.3 B2141', 'QL756 .S643'
+      end
+    end
+
+    context 'with enrichment via the Alma publishing process and no itm fields' do
+      let(:fields) do
+        [marc_field(tag: PennMARC::Enriched::Pub::PHYS_INVENTORY_TAG,
+                    subfields: { PennMARC::Enriched::Pub::HOLDING_CLASSIFICATION_PART => 'KF6450',
+                                 PennMARC::Enriched::Pub::HOLDING_ITEM_PART => '.C59 1989' })]
+      end
+
+      it 'returns expected values from the hld tag' do
+        expect(helper.call_number_search(record)).to contain_exactly('KF6450 .C59 1989')
+      end
+    end
+
+    context 'with enrichment via the Alma publishing process and values from both hld and itm fields' do
+      let(:fields) do
+        [marc_field(tag: PennMARC::Enriched::Pub::PHYS_INVENTORY_TAG,
+                    subfields: { PennMARC::Enriched::Pub::HOLDING_CLASSIFICATION_PART => 'KF6450',
+                                 PennMARC::Enriched::Pub::HOLDING_ITEM_PART => '.C59 1989' }),
+         marc_field(tag: PennMARC::Enriched::Pub::ITEM_TAG,
+                    subfields: { PennMARC::Enriched::Pub::ITEM_CALL_NUMBER => 'KF6450 .C59 1989' })]
+      end
+
+      it 'returns a single call number' do
+        expect(helper.call_number_search(record)).to contain_exactly('KF6450 .C59 1989')
+      end
+    end
+
+    context 'with enrichment with availability info via Alma Api' do
+      let(:config) do
+        { tag: PennMARC::Enriched::Api::PHYS_INVENTORY_TAG,
+          call_number_type_sf: PennMARC::Enriched::Api::PHYS_CALL_NUMBER_TYPE,
+          call_number_sf: PennMARC::Enriched::Api::PHYS_CALL_NUMBER }
+      end
+
+      it 'returns expected values' do
+        expect(helper.call_number_search(record)).to contain_exactly '691.3 B2141', 'QL756 .S643'
+      end
+    end
+  end
 end

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

@@ -66,19 +66,6 @@ describe 'PennMARC::Location' do
       end
     end
 
-    context 'with electronic inventory tag' do
-      let(:record) do
-        marc_record(fields: [marc_field(tag: enriched_marc::Pub::ITEM_TAG,
-                                        subfields: { enriched_marc::Pub::ITEM_CURRENT_LOCATION => 'stor' }),
-                             marc_field(tag: enriched_marc::Pub::ELEC_INVENTORY_TAG)])
-      end
-
-      it 'returns expected value' do
-        expect(helper.location(record: record, location_map: mapping,
-                               display_value: :library)).to contain_exactly('LIBRA', helper::ONLINE_LIBRARY)
-      end
-    end
-
     context 'with AVA fields' do
       let(:record) do
         marc_record(fields: [marc_field(tag: enriched_marc::Api::PHYS_INVENTORY_TAG,
@@ -96,19 +83,6 @@ describe 'PennMARC::Location' do
       end
     end
 
-    context 'with AVE fields' do
-      let(:record) do
-        marc_record(fields: [marc_field(tag: enriched_marc::Api::ELEC_INVENTORY_TAG,
-                                        subfields: { enriched_marc::Api::ELEC_COLLECTION_NAME => 'Nature' })])
-      end
-
-      it 'returns expected values' do
-        expect(helper.location(record: record, location_map: mapping, display_value: :library)).to(
-          contain_exactly(helper::ONLINE_LIBRARY)
-        )
-      end
-    end
-
     context 'with a specific location override' do
       let(:record) do
         marc_record(fields: [marc_field(tag: enriched_marc::Pub::ITEM_TAG,

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

@@ -136,7 +136,7 @@ describe 'PennMARC::Note' do
     it 'returns expected values from 506' do
       expect(values).to contain_exactly(
         'Open to users with valid PennKey Donor Appointment Only estate executors Some Policy No online access
-20300101 Van Pelt URI star'.squish
+20300101 Van Pelt URI'.squish
       )
     end
   end

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

@@ -138,6 +138,66 @@ describe 'PennMARC::Title' do
     end
   end
 
+  describe '.detailed_show' do
+    let(:record) do
+      marc_record fields: [
+        marc_field(tag: '245', subfields: { k: 'Letters', f: '1972-1982', b: 'to Lewis Mumford.' })
+      ]
+    end
+
+    context 'with subfields ǂk, ǂf and ǂc' do
+      it 'returns detailed title values' do
+        expect(helper.detailed_show(record)).to eq 'Letters to Lewis Mumford, 1972-1982'
+      end
+    end
+  end
+
+  describe '.alternate_show' do
+    let(:record) do
+      marc_record fields: [
+        marc_field(tag: '245', subfields: { k: 'Letters', b: 'to Lewis Mumford. ' }),
+        marc_field(tag: '880', subfields: { '6': '245', k: 'Lettres', b: 'à Lewis Mumford.' })
+      ]
+    end
+
+    context 'with subfields ǂk and ǂb' do
+      it 'returns alternate title values' do
+        expect(helper.alternate_show(record)).to eq 'Lettres à Lewis Mumford.'
+      end
+    end
+
+    context 'when 880 field is not present' do
+      let(:record) do
+        marc_record fields: [
+          marc_field(tag: '245', subfields: { k: 'Letters', b: 'to Lewis Mumford. ' })
+        ]
+      end
+
+      it 'returns nil' do
+        expect(helper.alternate_show(record)).to be_nil
+      end
+    end
+  end
+
+  describe '.statement_of_responsibility_show' do
+    let(:record) do
+      marc_record fields: [marc_field(tag: '245', subfields: { c: 'statement of responsibility' }),
+                           marc_field(tag: '880', subfields: { '6': '245', c: 'déclaration de responsabilité' })]
+    end
+
+    context 'with ǂc defined' do
+      it 'returns statement of responsibility' do
+        expect(helper.statement_of_responsibility_show(record)).to include 'statement of responsibility'
+      end
+    end
+
+    context 'with linked alternate of 245 ǂc defined' do
+      it 'returns alternate statement of responsibility' do
+        expect(helper.statement_of_responsibility_show(record)).to include 'déclaration de responsabilité'
+      end
+    end
+  end
+
   describe '.sort' do
     context 'with a record with a valid indicator2 value' do
       let(:record) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pennmarc
 version: !ruby/object:Gem::Version
-  version: 1.0.33
+  version: 1.1.0
 platform: ruby
 authors:
 - Mike Kanning
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-12 00:00:00.000000000 Z
+date: 2024-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport