pennmarc 1.0.15 → 1.0.17

data/lib/pennmarc/util.rb

@@ -5,6 +5,13 @@ require_relative 'heading_control'
 module PennMARC
   # class to hold "utility" methods used in MARC parsing methods
   module Util
+    TRAILING_PUNCTUATIONS_PATTERNS = { semicolon: /\s*;\s*$/,
+                                       colon: /\s*:\s*$/,
+                                       equal: /=$/,
+                                       slash: %r{\s*/\s*$},
+                                       comma: /\s*,\s*$/,
+                                       period: /\.\s*$/ }.freeze # TODO: revise to exclude "etc."
+
     # Check if a given record has a field present by tag (e.g., '041')
     # @param [MARC::Record] record
     # @param [String] marc_field
@@ -115,14 +122,17 @@ module PennMARC
 
     # @param [Symbol|String] trailer to target for removal
     # @param [String] string to modify
+    # @return [String]
     def trim_trailing(trailer, string)
-      map = { semicolon: /\s*;\s*$/,
-              colon: /\s*:\s*$/,
-              equal: /=$/,
-              slash: %r{\s*/\s*$},
-              comma: /\s*,\s*$/,
-              period: /\.\s*$/ } # TODO: revise to exclude "etc."
-      string.sub map[trailer.to_sym], ''
+      string.sub TRAILING_PUNCTUATIONS_PATTERNS[trailer.to_sym], ''
+    end
+
+    # trim trailing punctuation, manipulating string in place
+    # @param [Symbol|String] trailer to target for removal
+    # @param [String] string to modify
+    # @return [String, Nil] string to modify
+    def trim_trailing!(trailer, string)
+      string.sub! TRAILING_PUNCTUATIONS_PATTERNS[trailer.to_sym], ''
     end
 
     # Intelligently append given punctuation to the end of a string

data/lib/pennmarc/version.rb

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

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

@@ -181,6 +181,20 @@ describe 'PennMARC::Format' do
         expect(value.join(' ')).not_to include 'excluded'
       end
     end
+
+    context 'with an unrelated linked alternate' do
+      let(:fields) do
+        [marc_field(tag: '300', subfields: { a: '96 pages ;', c: '23 cm ' }),
+         marc_field(tag: '880', subfields: { '6': '700', a: 'Schweizer, Shlomo,', d: '1903-',
+                                             '0': 'https://id.loc.gov/authorities/names/no95018724' })]
+      end
+
+      it 'returns the expected format values' do
+        value = helper.show(record)
+        expect(value).to contain_exactly '96 pages ; 23 cm'
+        expect(value.join(' ')).not_to include 'https://id.loc.gov/authorities/names/no95018724'
+      end
+    end
   end
 
   describe '.other_show' do

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

@@ -111,4 +111,20 @@ describe 'PennMARC::Location' do
       end
     end
   end
+
+  context 'with a specific location override' do
+    let(:record) do
+      marc_record(fields: [marc_field(tag: enriched_marc::Pub::ITEM_TAG,
+                                      subfields: { enriched_marc::Pub::ITEM_CURRENT_LOCATION => 'vanp',
+                                                   enriched_marc::Pub::ITEM_CALL_NUMBER => 'ML3534 .D85 1984' }),
+                           marc_field(tag: enriched_marc::Pub::ITEM_TAG,
+                                      subfields: { enriched_marc::Pub::ITEM_CURRENT_LOCATION => 'stor',
+                                                   enriched_marc::Pub::ITEM_CALL_NUMBER => 'L3534 .D85 1984' })])
+    end
+
+    it 'returns expected values' do
+      expect(helper.location(record: record, display_value: :specific_location, location_map: mapping))
+        .to(contain_exactly(PennMARC::Mappers.location_overrides[:albrecht][:specific_location], 'LIBRA'))
+    end
+  end
 end

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

@@ -296,5 +296,23 @@ text for URI http://www.universal.resource/locator'.squish,
         )
       end
     end
+
+    describe '.bound_with_show' do
+      let(:record) { marc_record(fields: fields) }
+
+      let(:fields) do
+        [
+          marc_field(tag: '501', subfields: { a: 'With: Peer Gynt (Suite) no. 1-2 / Edvard Grieg' }),
+          marc_field(tag: '501', subfields: { a: 'With: Schumann, C. Romances, piano, op. 11. No. 2' })
+        ]
+      end
+
+      let(:values) { helper.bound_with_show(record) }
+
+      it 'returns expected values' do
+        expect(values).to contain_exactly('With: Peer Gynt (Suite) no. 1-2 / Edvard Grieg',
+                                          'With: Schumann, C. Romances, piano, op. 11. No. 2')
+      end
+    end
   end
 end

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

@@ -101,7 +101,7 @@ describe 'PennMARC::Subject' do
       let(:fields) do
         [marc_field(tag: '650', indicator2: '7',
                     subfields: {
-                      a: 'Libraries', d: '22nd Century', x: 'History', e: 'relator',
+                      a: 'Libraries,', d: '22nd Century,', x: 'History.', e: 'relator',
                       '2': 'fast', '0': 'http://fast.org/libraries'
                     })]
       end
@@ -127,6 +127,21 @@ describe 'PennMARC::Subject' do
         expect(values.first).to eq 'Libraries, 22nd Century--History'
       end
     end
+
+    context 'with a record with trailing periods' do
+      let(:fields) do
+        [marc_field(tag: '600', indicator2: '0',
+                    subfields: {
+                      a: 'R.G.', q: '(Robert Gordon).',
+                      t: 'Spiritual order and Christian liberty proved to be consistent in the Churches of Christ. '
+                    })]
+      end
+
+      it 'drops the final trailing period' do
+        expect(values).to contain_exactly('R.G. (Robert Gordon). Spiritual order and Christian liberty proved ' \
+                                          'to be consistent in the Churches of Christ')
+      end
+    end
   end
 
   describe '.show' do
@@ -146,8 +161,8 @@ describe 'PennMARC::Subject' do
       end
 
       it 'shows all valid subject headings without duplicates' do
-        expect(helper.show(record)).to contain_exactly('Nephrology--Periodicals', 'Nephrology', 'Kidney Diseases',
-                                                       'Local Heading')
+        expect(helper.show(record)).to contain_exactly('Nephrology--Periodicals.', 'Nephrology.', 'Kidney Diseases.',
+                                                       'Local Heading.')
       end
     end
 
@@ -155,7 +170,7 @@ describe 'PennMARC::Subject' do
       let(:fields) do
         [marc_field(tag: '650', indicator2: '0', subfields: {
                       a: 'Subways',
-                      z: ['Pennsylvania', 'Philadelphia Metropolitan Area'],
+                      z: ['Pennsylvania,', 'Philadelphia Metropolitan Area,'],
                       v: 'Maps',
                       y: '1989',
                       e: 'relator'
@@ -163,7 +178,7 @@ describe 'PennMARC::Subject' do
       end
 
       it 'properly formats the heading parts' do
-        expect(values.first).to eq 'Subways--Pennsylvania--Philadelphia Metropolitan Area--Maps--1989 relator'
+        expect(values.first).to eq 'Subways--Pennsylvania--Philadelphia Metropolitan Area--Maps--1989 relator.'
       end
     end
 
@@ -171,20 +186,37 @@ describe 'PennMARC::Subject' do
       let(:fields) do
         [marc_field(tag: '600', indicator2: '7', subfields: {
                       a: 'Franklin, Benjamin,',
-                      d: '1706-1790',
+                      d: '1706-1790.',
                       '2': 'fast',
                       '0': 'http://id.worldcat.org/fast/34115'
                     }),
          marc_field(tag: '600', indicator1: '1', indicator2: '0', subfields: {
                       a: 'Franklin, Benjamin,',
-                      d: '1706-1790.',
+                      d: '1706-1790',
                       x: 'As inventor.'
+                    }),
+         marc_field(tag: '650', indicator1: '1', indicator2: '0', subfields: {
+                      a: 'Franklin stoves.'
                     })]
       end
 
-      it 'returns what Franklin shows', pending: 'proper handling of punctuation in subject parts' do
+      it 'properly handles punctuation in subject parts' do
         expect(values).to contain_exactly 'Franklin, Benjamin, 1706-1790.',
-                                          'Franklin, Benjamin, 1706-1790--As inventor.'
+                                          'Franklin, Benjamin, 1706-1790--As inventor.', 'Franklin stoves.'
+      end
+    end
+
+    context 'with a record without trailing period in last subject part' do
+      let(:fields) do
+        [marc_field(tag: '651', indicator2: '7',
+                    subfields: {
+                      a: 'New York State (State)', z: 'New York', '2': 'fast', '0': '(OCoLC)fst01204333',
+                      '1': 'https://id.oclc.org/worldcat/entity/E39QbtfRvQh7864Jh4rDGBFDWc'
+                    })]
+      end
+
+      it 'adds a trailing period' do
+        expect(values).to contain_exactly('New York State (State)--New York.')
       end
     end
 
@@ -200,40 +232,40 @@ describe 'PennMARC::Subject' do
       end
 
       it 'properly formats the heading parts' do
-        expect(values.first).to eq 'Chicago (Ill.)--Moral conditions--Church minutes--1875-1878'
+        expect(values.first).to eq 'Chicago (Ill.)--Moral conditions--Church minutes--1875-1878.'
       end
     end
 
     context 'with a robust 611 heading including many subfields' do
       let(:fields) do
         [marc_field(tag: '611', indicator2: '0', subfields: {
-                      a: 'Conference',
-                      c: ['(Johannesburg, South Africa', 'Cape Town, South Africa'],
+                      a: 'Conference,',
+                      c: ['(Johannesburg, South Africa,', 'Cape Town, South Africa,'],
                       d: '2002)',
                       n: '2nd'
                     })]
       end
 
       it 'properly formats the heading parts' do
-        expect(values.first).to eq 'Conference, (Johannesburg, South Africa, Cape Town, South Africa, 2002)--2nd'
+        expect(values.first).to eq 'Conference, (Johannesburg, South Africa, Cape Town, South Africa, 2002)--2nd.'
       end
     end
 
     context 'with a robust 600 heading including many subfields' do
       let(:fields) do
         [marc_field(tag: '600', indicator2: '0', subfields: {
-                      a: 'Person, Significant Author',
-                      b: 'Numerator',
-                      c: %w[Title Rank],
-                      d: '1899-1971',
+                      a: 'Person, Significant Author,',
+                      b: 'Numerator,',
+                      c: ['Title,', 'Rank,'],
+                      d: '1899-1971,',
                       t: 'Collection',
-                      v: 'Early works to 1950'
+                      v: 'Early works to 1950.'
                     })]
       end
 
       it 'properly formats the heading parts' do
         expect(values.first).to eq('Person, Significant Author, Numerator, Title, Rank, 1899-1971, Collection--' \
-                                   'Early works to 1950')
+                                   'Early works to 1950.')
       end
     end
   end
@@ -249,7 +281,7 @@ describe 'PennMARC::Subject' do
     let(:values) { helper.childrens_show(record) }
 
     it 'includes heading terms only from subject tags with an indicator 2 of "1"' do
-      expect(values).to contain_exactly 'Frogs--Fiction', 'Toads--Fiction'
+      expect(values).to contain_exactly 'Frogs--Fiction.', 'Toads--Fiction.'
     end
   end
 
@@ -267,7 +299,7 @@ describe 'PennMARC::Subject' do
     end
 
     it 'includes heading terms only from subject tags with indicator 2 of "2"' do
-      expect(helper.medical_show(record)).to contain_exactly 'Nephrology'
+      expect(helper.medical_show(record)).to contain_exactly 'Nephrology.'
     end
   end
 
@@ -280,7 +312,7 @@ describe 'PennMARC::Subject' do
     end
 
     it 'includes heading terms only from subject tags with indicator 2 of "4" or in the 69X range' do
-      expect(helper.local_show(record)).to contain_exactly 'Local--Heading', 'Super Local.'
+      expect(helper.local_show(record)).to contain_exactly 'Local--Heading.', 'Super Local.'
     end
   end
 end

data/spec/support/marc_spec_helpers.rb

@@ -72,13 +72,14 @@ module MarcSpecHelpers
   #   location_map[:stor][:library] #=> 'LIBRA'
   # @return [Hash]
   def location_map
-    {
-      dent: {  specific_location: 'Levy Dental Medicine Library - Stacks',
+    { dent: {  specific_location: 'Levy Dental Medicine Library - Stacks',
                library: ['Health Sciences Libraries', 'Levy Dental Medicine Library'],
                display: 'Levy Dental Medicine Library - Stacks' },
       stor: { specific_location: 'LIBRA',
               library: 'LIBRA',
-              display: 'LIBRA' }
-    }
+              display: 'LIBRA' },
+      vanp: { specific_location: 'Van Pelt - Stacks',
+              library: 'Van Pelt-Dietrich Library Center',
+              display: 'Van Pelt Library' } }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pennmarc
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.17
 platform: ruby
 authors:
 - Mike Kanning
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-06 00:00:00.000000000 Z
+date: 2024-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -119,6 +119,7 @@ files:
 - lib/pennmarc/mappings/iso639-2-languages.yml
 - lib/pennmarc/mappings/iso639-3-languages.yml
 - lib/pennmarc/mappings/loc_classification.yml
+- lib/pennmarc/mappings/location_overrides.yml
 - lib/pennmarc/mappings/locations.yml
 - lib/pennmarc/mappings/relator.yml
 - lib/pennmarc/parser.rb