pennmarc 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96396e62916d963919d655e236402c3ae40386dc9ac6078e135f2d9c41481375
-  data.tar.gz: 554416ba78ce36f00e15b240e988421096349966edc5617b6c5b1f3d573d19f8
+  metadata.gz: fc24e1fe4c30a2cf49fe06d466deaff8ac61677b69b3ce673cebfb3729282ed7
+  data.tar.gz: cb7d013328a775f8c09d79cb4400374c4bb5ef5b97056e19c595d29707440469
 SHA512:
-  metadata.gz: 7b64b529c5929690130cce0480a0e7fd99d32c435e5cf37daa058ab55838c28f246c8cb250f0ee9a4c2c243a118a6815add56f16df6c8bd54edd4b08022b7e36
-  data.tar.gz: fcb648bce5413f48f719050e528ed9f329618cbb5ca0af5e15aa02abd40f35fedb81e64d4614e8fcea2f32a6c6b5784ac7559c44a4771a1ef17321fc56d2b220
+  metadata.gz: 15de4dca697023774cdbde7cfd805fab906c21f56d39824539204b796e0e25cac86415c971a73ec7c8bd8e6c9983fa8f9edb0231cbb942ef8880dfd7c968ad6c
+  data.tar.gz: a0d344dae1edbb7d7d4cd57ce698dd04007dfc30af9a981ff0db8708c5f1afe1b55347ec62ab4f544b51d5e187a95a945584d3c593f58f48804b691b384692b3

data/lib/pennmarc/helpers/genre.rb

@@ -43,7 +43,8 @@ module PennMARC
         }.uniq
       end
 
-      # Genre values for faceting. We only set Genre facet values for movies (videos) and manuscripts(?)
+      # Genre values for faceting. We only set Genre facet values for movies (videos) and manuscripts(?), and ensure
+      # that the headings come from our set of approved ontologies.
       # @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 record [MARC::Record]
@@ -55,6 +56,8 @@ module PennMARC
         return [] unless manuscript || video
 
         record.fields('655').filter_map { |field|
+          next unless allowed_genre_field?(field)
+
           join_subfields field, &subfield_not_in?(%w[0 2 5 c])
         }.uniq
       end

data/lib/pennmarc/helpers/title.rb

@@ -32,6 +32,9 @@ module PennMARC
     # This text is used in Alma to indicate a Bib record is a "Host" record for other bibs (bound-withs)
     HOST_BIB_TITLE = 'Host bibliographic record for boundwith'
 
+    # Title to use when no 245 field is present. This "shouldn't" occur, but it does.
+    NO_TITLE_PROVIDED = '[No title provided]'
+
     class << self
       # 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.
@@ -93,6 +96,8 @@ module PennMARC
       # @return [String] single title for display
       def show(record)
         field = record.fields('245')&.first
+        return Array.wrap(NO_TITLE_PROVIDED) unless field.present?
+
         values = title_values(field)
         [format_title(values[:title_or_form]), values[:punctuation], values[:other_info]].compact_blank.join(' ')
       end

data/lib/pennmarc/mappings/locations.yml

@@ -592,6 +592,12 @@ dentshils:
     - Health Sciences Libraries
     - Levy Dental Medicine Library
   display: Levy Dental Medicine Library - Shils Boardroom
+dentwellrm:
+  specific_location: Levy Dental Medicine Library - Wellness Room
+  library:
+    - Health Sciences Libraries
+    - Levy Dental Medicine Library
+  display: Levy Dental Medicine Library - Wellness Room
 dncirc:
   specific_location: Levy Dental Medicine Library - Circulation
   library:

data/lib/pennmarc/version.rb

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

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

@@ -47,7 +47,7 @@ describe 'PennMARC::Genre' do
       let(:fields) do
         [marc_control_field(tag: '007', value: 'x'),
          marc_field(tag: 'hld', subfields: { c: 'vanp' }),
-         marc_field(tag: '655', indicator2: '7', subfields: { a: 'Genre.' })]
+         marc_field(tag: '655', indicator2: '0', subfields: { a: 'Genre.' })]
       end
 
       it 'returns no genre values for faceting' do
@@ -59,11 +59,13 @@ describe 'PennMARC::Genre' do
       let(:fields) do
         [marc_control_field(tag: '007', value: 'v'),
          marc_field(tag: 'hld', subfields: { c: 'vanp' }),
-         marc_field(tag: '655', indicator2: '7', subfields: { a: 'Documentary films' }),
-         marc_field(tag: '655', indicator2: '7', subfields: { a: 'Sports' })]
+         marc_field(tag: '655', indicator2: '0', subfields: { a: 'Documentary films' }),
+         marc_field(tag: '655', indicator2: '7', subfields: { a: 'Sports', '2': 'fast' }),
+         marc_field(tag: '655', indicator2: '7', subfields: { a: 'Le cyclisme', '2': 'qlsp' }), # excluded due to sf2
+         marc_field(tag: '655', indicator2: '1', subfields: { a: 'Shredding' })] # excluded, invalid indicator value
       end
 
-      it 'contains the expected genre facet values' do
+      it 'contains only the desired genre facet values' do
         expect(values).to contain_exactly 'Documentary films', 'Sports'
       end
     end
@@ -72,7 +74,7 @@ describe 'PennMARC::Genre' do
       let(:record) { marc_record fields: fields, leader: '      t' }
       let(:fields) do
         [marc_control_field(tag: '007', value: 'x'),
-         marc_field(tag: '655', indicator2: '7', subfields: { a: 'Astronomy', '2': 'zzzz' })]
+         marc_field(tag: '655', indicator2: '7', subfields: { a: 'Astronomy', '2': 'fast' })]
       end
 
       it 'returns the expected genre values' do

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

@@ -2,13 +2,14 @@
 
 describe 'PennMARC::Title' do
   let(:helper) { PennMARC::Title }
+  let(:leader) { nil }
+  let(:fields) { [marc_field(tag: '245', subfields: subfields)] }
+  let(:record) { marc_record fields: fields, leader: leader }
 
   describe '.search' do
-    let(:record) do
-      marc_record fields: [
-        marc_field(tag: '245', subfields: { a: 'Title', b: 'Subtitle', c: 'Responsibility', h: 'Medium' }),
-        marc_field(tag: '880', subfields: { a: 'Linked Title', '6': '245' })
-      ]
+    let(:fields) do
+      [marc_field(tag: '245', subfields: { a: 'Title', b: 'Subtitle', c: 'Responsibility', h: 'Medium' }),
+       marc_field(tag: '880', subfields: { a: 'Linked Title', '6': '245' })]
     end
 
     it 'returns search values without ǂc or ǂh content' do
@@ -20,16 +21,14 @@ describe 'PennMARC::Title' do
 
   describe '.search_aux' do
     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
+    let(:fields) do
+      [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')]
     end
 
     it 'returns auxiliary titles' do
@@ -51,12 +50,10 @@ describe 'PennMARC::Title' do
 
   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
+    let(:fields) do
+      [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' })]
     end
 
     it 'returns journal search titles' do
@@ -74,16 +71,14 @@ describe 'PennMARC::Title' do
 
   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
+    let(:fields) do
+      [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')]
     end
 
     it 'returns auxiliary journal search titles' do
@@ -102,9 +97,19 @@ describe 'PennMARC::Title' do
   end
 
   describe '.show' do
-    let(:record) { marc_record fields: [marc_field(tag: '245', subfields: subfields)] }
+    context 'with no 245' do
+      let(:fields) do
+        # Simulate a miscoded record
+        [marc_field(tag: '246', indicator1: '1', indicator2: '4', subfields: { a: 'The horn concertos', c: 'Mozart' })]
+      end
+
+      it 'returns default title' do
+        expect(helper.show(record)).to eq [PennMARC::Title::NO_TITLE_PROVIDED]
+      end
+    end
 
     context 'with ǂa, ǂk and ǂn defined' do
+      let(:fields) { [marc_field(tag: '245', subfields: subfields)] }
       let(:subfields) { { a: 'Five Decades of MARC usage', k: 'journals', n: 'Part One' } }
 
       it 'returns single title value with text from ǂa and ǂn but not ǂk' do
@@ -113,6 +118,7 @@ describe 'PennMARC::Title' do
     end
 
     context 'with no ǂa but a ǂk and ǂn defined' do
+      let(:fields) { [marc_field(tag: '245', subfields: subfields)] }
       let(:subfields) { { k: 'journals', n: 'Part One' } }
 
       it 'returns single title value with text from ǂk and ǂn' do
@@ -140,10 +146,8 @@ describe 'PennMARC::Title' do
 
   describe '.detailed_show' do
     context 'with subfields ǂk, ǂf and ǂc' do
-      let(:record) do
-        marc_record fields: [
-          marc_field(tag: '245', subfields: { k: 'Letters,', f: '1972-1982,', b: 'to Lewis Mumford.' })
-        ]
+      let(:fields) do
+        [marc_field(tag: '245', subfields: { k: 'Letters,', f: '1972-1982,', b: 'to Lewis Mumford.' })]
       end
 
       it 'returns detailed title values' do
@@ -152,10 +156,8 @@ describe 'PennMARC::Title' do
     end
 
     context 'with subfields ǂk and ǂb' do
-      let(:record) do
-        marc_record fields: [
-          marc_field(tag: '245', subfields: { k: 'Letters', b: 'to Lewis Mumford.' })
-        ]
+      let(:fields) do
+        [marc_field(tag: '245', subfields: { k: 'Letters', b: 'to Lewis Mumford.' })]
       end
 
       it 'returns title value without dates' do
@@ -165,12 +167,10 @@ describe 'PennMARC::Title' do
 
     # e.g., 9977704838303681
     context 'with ǂa containing an " : " as well as inclusive dates' do
-      let(:record) do
-        marc_record fields: [
-          marc_field(tag: '245', subfields: { a: 'The frugal housewife : ',
-                                              b: 'dedicated to those who are not ashamed of economy, ',
-                                              f: '1830 / ', c: 'by the author of Hobomok.' })
-        ]
+      let(:fields) do
+        [marc_field(tag: '245', subfields: { a: 'The frugal housewife : ',
+                                             b: 'dedicated to those who are not ashamed of economy, ',
+                                             f: '1830 / ', c: 'by the author of Hobomok.' })]
       end
 
       it 'returns single title value with text from ǂa and ǂn' do
@@ -182,11 +182,9 @@ describe 'PennMARC::Title' do
   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.' })
-      ]
+    let(:fields) do
+      [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
@@ -196,10 +194,8 @@ describe 'PennMARC::Title' do
     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. ' })
-        ]
+      let(:fields) do
+        [marc_field(tag: '245', subfields: { k: 'Letters', b: 'to Lewis Mumford. ' })]
       end
 
       it 'returns nil' do
@@ -210,10 +206,9 @@ describe 'PennMARC::Title' do
 
   describe '.sort' do
     context 'with no 245' do
-      let(:record) do
+      let(:fields) do
         # Simulate a miscoded record
-        marc_record fields: [marc_field(tag: '246', indicator1: '1', indicator2: '4',
-                                        subfields: { a: 'The horn concertos', c: 'Mozart' })]
+        [marc_field(tag: '246', indicator1: '1', indicator2: '4', subfields: { a: 'The horn concertos', c: 'Mozart' })]
       end
 
       it 'returns nil' do
@@ -222,14 +217,12 @@ describe 'PennMARC::Title' do
     end
 
     context 'with a record with a valid indicator2 value' do
-      let(:record) do
-        marc_record fields: [
-          marc_field(tag: '245', indicator2: '4', subfields: {
-                       a: 'The Record Title',
-                       b: 'Remainder', n: 'Number', p: 'Section',
-                       h: 'Do not display'
-                     })
-        ]
+      let(:fields) do
+        [marc_field(tag: '245', indicator2: '4', subfields: {
+                      a: 'The Record Title',
+                      b: 'Remainder', n: 'Number', p: 'Section',
+                      h: 'Do not display'
+                    })]
       end
 
       it 'properly removes and appends the number of characters specified in indicator 2' do
@@ -244,8 +237,8 @@ describe 'PennMARC::Title' do
     end
 
     context 'with a record with no indicator2 value' do
-      let(:record) do
-        marc_record fields: [marc_field(tag: '245', subfields: { a: 'The Record Title' })]
+      let(:fields) do
+        [marc_field(tag: '245', subfields: { a: 'The Record Title' })]
       end
 
       it 'does not transform the title value' do
@@ -254,9 +247,7 @@ describe 'PennMARC::Title' do
     end
 
     context 'with a record with no ǂa and no indicator2 value' do
-      let(:record) do
-        marc_record fields: [marc_field(tag: '245', subfields: { k: 'diaries' })]
-      end
+      let(:fields) { [marc_field(tag: '245', subfields: { k: 'diaries' })] }
 
       it 'uses ǂk (form) value without transformation' do
         expect(helper.sort(record)).to eq 'diaries'
@@ -264,9 +255,7 @@ describe 'PennMARC::Title' do
     end
 
     context 'with a record with a leading bracket' do
-      let(:record) do
-        marc_record fields: [marc_field(tag: '245', subfields: { a: '[The Record Title]' })]
-      end
+      let(:fields) { [marc_field(tag: '245', subfields: { a: '[The Record Title]' })] }
 
       # TODO: is this the expected behavior? It would sort right, but looks silly.
       it 'removes the leading bracket and appends it to the full value' do
@@ -276,17 +265,15 @@ describe 'PennMARC::Title' do
   end
 
   describe '.standardized_show' do
-    let(:record) do
-      marc_record fields: [
-        marc_field(tag: '130', subfields: { a: 'Uniform Title', f: '2000', '8': 'Not Included' }),
-        marc_field(tag: '240', subfields: { a: 'Another Uniform Title', '0': 'Ugly Control Number' }),
-        marc_field(tag: '730', indicator2: '', subfields: { a: 'Yet Another Uniform Title' }),
-        marc_field(tag: '730', indicator1: '0', indicator2: '2', subfields: { a: 'Not Printed Title' }),
-        marc_field(tag: '730', indicator1: '', subfields: { i: 'Subfield i Title' }),
-        marc_field(tag: '880', subfields: { '6': '240', a: 'Translated Uniform Title' }),
-        marc_field(tag: '880', subfields: { '6': '730', a: 'Alt Ignore', i: 'Alt Subfield i' }),
-        marc_field(tag: '880', subfields: { '6': '100', a: 'Alt Ignore' })
-      ]
+    let(:fields) do
+      [marc_field(tag: '130', subfields: { a: 'Uniform Title', f: '2000', '8': 'Not Included' }),
+       marc_field(tag: '240', subfields: { a: 'Another Uniform Title', '0': 'Ugly Control Number' }),
+       marc_field(tag: '730', indicator2: '', subfields: { a: 'Yet Another Uniform Title' }),
+       marc_field(tag: '730', indicator1: '0', indicator2: '2', subfields: { a: 'Not Printed Title' }),
+       marc_field(tag: '730', indicator1: '', subfields: { i: 'Subfield i Title' }),
+       marc_field(tag: '880', subfields: { '6': '240', a: 'Translated Uniform Title' }),
+       marc_field(tag: '880', subfields: { '6': '730', a: 'Alt Ignore', i: 'Alt Subfield i' }),
+       marc_field(tag: '880', subfields: { '6': '100', a: 'Alt Ignore' })]
     end
 
     it 'returns the expected standardized title display values' do
@@ -299,13 +286,11 @@ describe 'PennMARC::Title' do
   end
 
   describe '.other_show' do
-    let(:record) do
-      marc_record fields: [
-        marc_field(tag: '246', subfields: { a: 'Varied Title', f: '2000', '8': 'Not Included' }),
-        marc_field(tag: '740', indicator2: '0', subfields: { a: 'Uncontrolled Title', '5': 'Penn' }),
-        marc_field(tag: '740', indicator2: '2', subfields: { a: 'A Title We Do Not Like' }),
-        marc_field(tag: '880', subfields: { '6': '246', a: 'Alternate Varied Title' })
-      ]
+    let(:fields) do
+      [marc_field(tag: '246', subfields: { a: 'Varied Title', f: '2000', '8': 'Not Included' }),
+       marc_field(tag: '740', indicator2: '0', subfields: { a: 'Uncontrolled Title', '5': 'Penn' }),
+       marc_field(tag: '740', indicator2: '2', subfields: { a: 'A Title We Do Not Like' }),
+       marc_field(tag: '880', subfields: { '6': '246', a: 'Alternate Varied Title' })]
     end
 
     it 'returns the expected other title display values' do
@@ -316,11 +301,9 @@ describe 'PennMARC::Title' do
   end
 
   describe '.former_show' do
-    let(:record) do
-      marc_record fields: [
-        marc_field(tag: '247', subfields: { a: 'Former Title', n: 'Part', '6': 'Linkage', e: 'Append' }),
-        marc_field(tag: '880', subfields: { a: 'Alt Title', n: 'Part', '6': '247' })
-      ]
+    let(:fields) do
+      [marc_field(tag: '247', subfields: { a: 'Former Title', n: 'Part', '6': 'Linkage', e: 'Append' }),
+       marc_field(tag: '880', subfields: { a: 'Alt Title', n: 'Part', '6': '247' })]
     end
 
     it 'returns the expected former title value' do
@@ -331,7 +314,7 @@ describe 'PennMARC::Title' do
   end
 
   describe '.host_bib_record?' do
-    let(:record) { marc_record fields: [marc_field(tag: '245', subfields: subfields)] }
+    let(:fields) { [marc_field(tag: '245', subfields: subfields)] }
 
     context 'with a host record' do
       let(:subfields) { { a: "#{PennMARC::Title::HOST_BIB_TITLE} for 123456789" } }

metadata

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