pennmarc 1.0.18 → 1.0.20

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

@@ -6,31 +6,36 @@ describe 'PennMARC::Format' do
   let(:helper) { PennMARC::Format }
 
   describe '.facet' do
-    let(:map) { location_map }
-    let(:formats) { helper.facet(record, location_map: map) }
+    let(:formats) { helper.facet(record) }
 
     context 'with an "Archive"' do
-      let(:map) do
-        { musearch: { specific_location: 'Penn Museum Archives',
-                      library: 'Penn Museum Archives',
-                      display: 'Penn Museum Archives, 215-898-8304' },
-          nursarch: { specific_location: 'Nursing Archives',
-                      library: 'Nursing Archives',
-                      display: 'Barbara Bates Center for History of Nursing - Fagin Hall 2U' } }
+      context 'with an 852 field' do
+        let(:record) do
+          marc_record fields: [marc_field(tag: '852', subfields: { c: 'archarch' })]
+        end
+
+        it 'returns format values of "Archive"' do
+          expect(formats).to include 'Archive'
+        end
       end
 
-      context 'with a record in "Penn Museum Archives (musearch)"' do
-        let(:record) { marc_record fields: [marc_field(tag: 'hld', subfields: { c: 'musearch' })] }
+      context 'with publishing enriched fields' do
+        let(:record) do
+          marc_record fields: [marc_field(tag: PennMARC::Enriched::Pub::ITEM_TAG, subfields: { g: 'archarch' })]
+        end
 
-        it 'returns format values of "Archive" for a record with holdings located in "musearch"' do
+        it 'returns format values of "Archive"' do
           expect(formats).to include 'Archive'
         end
       end
 
-      context 'with a record in "Nursing Archives (nursarch)"' do
-        let(:record) { marc_record fields: [marc_field(tag: 'hld', subfields: { c: 'nursarch' })] }
+      context 'without encoded archive location' do
+        let(:record) do
+          marc_record fields: [marc_field(tag: '852', subfields: { c: 'notanarchive' }),
+                               marc_field(tag: PennMARC::Enriched::Pub::ITEM_TAG, subfields: { g: 'notanarchive' })]
+        end
 
-        it 'returns format values of without "Archive" for a record with a holding in "nursarch"' do
+        it 'does not return format values of "Archive"' do
           expect(formats).not_to include 'Archive'
         end
       end
@@ -47,9 +52,6 @@ describe 'PennMARC::Format' do
       end
     end
 
-    # TODO: confirm this as desired functionality
-    # Inspired by https://franklin.library.upenn.edu/catalog/FRANKLIN_999444703503681
-    # which appears to be a thesis on microfilm, but only has microfilm as a format.
     context 'with a "Thesis" on "Microfilm"' do
       let(:record) do
         marc_record leader: '      tm',
@@ -59,8 +61,8 @@ describe 'PennMARC::Format' do
                     ]
       end
 
-      it 'returns a facet value of only "Microformat"' do
-        expect(formats).to eq %w[Microformat]
+      it 'returns all format values that meet the format facet encoding rules' do
+        expect(formats).to contain_exactly('Manuscript', 'Microformat', 'Thesis/Dissertation', 'Book')
       end
     end
 
@@ -95,6 +97,84 @@ describe 'PennMARC::Format' do
       end
     end
 
+    context 'with Microformats as determined by MARC control fields' do
+      context 'with 007 field' do
+        let(:record) do
+          marc_record fields: [marc_control_field(tag: '007', value: 'h')]
+        end
+
+        it 'returns "Microformat"' do
+          expect(formats).to contain_exactly('Microformat')
+        end
+      end
+
+      context 'with 008 field and valid value at position 23' do
+        let(:record) do
+          marc_record fields: [
+            marc_control_field(tag: '008', value: '                       a')
+          ]
+        end
+
+        it 'returns "Microformat"' do
+          expect(formats).to contain_exactly('Microformat')
+        end
+      end
+
+      context 'with 008 field and valid value at position 29' do
+        let(:record) do
+          marc_record fields: [
+            marc_control_field(tag: '008', value: '                             a')
+          ]
+        end
+
+        it 'returns "Microformat"' do
+          expect(formats).to contain_exactly('Microformat')
+        end
+      end
+    end
+
+    context 'with Microformats as determined by title medium' do
+      let(:record) do
+        marc_record(fields: [marc_field(tag: '245', subfields: { h: 'micro' })])
+      end
+
+      it 'returns "Microformat"' do
+        expect(formats).to contain_exactly('Microformat')
+      end
+    end
+
+    context 'with Microformats as determined by media type' do
+      let(:record) do
+        marc_record(fields: [marc_field(tag: '337', subfields: { a: 'microform' })])
+      end
+
+      it 'returns "Microformat"' do
+        expect(formats).to contain_exactly('Microformat')
+      end
+    end
+
+    context 'with "Manuscript"' do
+      context 'with valid manuscript format code in leader' do
+        let(:record) do
+          marc_record(leader: '      t')
+        end
+
+        it 'returns "Manuscript"' do
+          expect(formats).to contain_exactly('Manuscript')
+        end
+      end
+
+      context 'without valid manuscript format code in leader' do
+        let(:record) do
+          marc_record(leader: '      a')
+        end
+
+        it 'does not return "Manuscript"' do
+          expect(formats).not_to include('Manuscript')
+        end
+      end
+    end
+
     context 'with a "Book"' do
       let(:record) do
         marc_record leader: '      aa',
@@ -104,6 +184,33 @@ describe 'PennMARC::Format' do
       it 'returns a facet value including only "Book"' do
         expect(formats).to eq ['Book']
       end
+
+      context 'with a media type that contains "micro"' do
+        let(:record) do
+          marc_record leader: '      aa',
+                      fields: [
+                        marc_field(tag: '245', subfields: { k: 'blah' }),
+                        marc_field(tag: '337', subfields: { a: 'microform' })
+                      ]
+        end
+
+        it 'does not return a facet value including "Book"' do
+          expect(formats).not_to include('Book')
+        end
+      end
+
+      context 'with a 245 $k value of "kit"' do
+        let(:record) do
+          marc_record leader: '      tm',
+                      fields: [
+                        marc_field(tag: '245', subfields: { k: 'kit' })
+                      ]
+        end
+
+        it 'does not return a facet value including "Book"' do
+          expect(formats).not_to include('Book')
+        end
+      end
     end
 
     context 'with a "Projected Graphic"' do
@@ -126,7 +233,7 @@ describe 'PennMARC::Format' do
         let(:subfield_a_value) { 'Book' }
 
         it 'returns a facet value including a curated format of "Book"' do
-          expect(formats).to eq %w[Other Book]
+          expect(formats).to eq ['Book']
         end
       end
 
@@ -138,6 +245,28 @@ describe 'PennMARC::Format' do
         end
       end
     end
+
+    context 'with Other' do
+      context 'with another facet applied' do
+        let(:record) do
+          marc_record(leader: '      t')
+        end
+
+        it 'does not return "Other"' do
+          expect(formats).not_to include 'Other'
+        end
+      end
+
+      context 'without another facet applied' do
+        let(:record) do
+          marc_record(leader: '      z')
+        end
+
+        it 'returns "Other"' do
+          expect(formats).to contain_exactly 'Other'
+        end
+      end
+    end
   end
 
   describe '.show' do
@@ -235,19 +364,19 @@ describe 'PennMARC::Format' do
   end
 
   describe '.includes_manuscript?' do
-    context 'with a manuscript location included' do
-      let(:locations) { ['Van Pelt', 'Kislak Center for Special Collections - Manuscripts Storage'] }
+    context 'with a valid manuscript format code' do
+      let(:format_code) { 't' }
 
       it 'returns true' do
-        expect(helper.include_manuscripts?(locations)).to be true
+        expect(helper.include_manuscripts?(format_code)).to be true
       end
     end
 
-    context 'without a manuscript location included' do
-      let(:locations) { ['Van Pelt'] }
+    context 'without a valid manuscript format code' do
+      let(:format_code) { 'at' }
 
       it 'returns false' do
-        expect(helper.include_manuscripts?(locations)).to be false
+        expect(helper.include_manuscripts?(format_code)).to be false
       end
     end
   end

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

@@ -43,11 +43,7 @@ describe 'PennMARC::Genre' do
   end
 
   describe '.facet' do
-    let(:values) { helper.facet(record, location_map: location_map) }
-    let(:location_map) do
-      { manu: { specific_location: 'Secure Manuscripts Storage' },
-        vanp: { specific_location: 'Van Pelt' } }
-    end
+    let(:values) { helper.facet(record) }
 
     context 'with a non-video, non-manuscript record' do
       let(:fields) do
@@ -74,10 +70,10 @@ describe 'PennMARC::Genre' do
       end
     end
 
-    context 'with a manuscript-located record' do
+    context 'with a manuscript record' do
+      let(:record) { marc_record fields: fields, leader: '      t' }
       let(:fields) do
         [marc_control_field(tag: '007', value: 'x'),
-         marc_field(tag: 'hld', subfields: { c: 'manu' }),
          marc_field(tag: '655', indicator2: '7', subfields: { a: 'Astronomy', '2': 'zzzz' })]
       end
 

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

@@ -276,7 +276,7 @@ describe 'PennMARC::Note' do
           marc_field(tag: '880', subfields: { a: 'Alt video format', b: 'Alt broadcast', '3': 'Alt materials.',
                                               '6': '346' }),
           marc_field(tag: '880', subfields: { a: 'Alt file type', b: 'Alt encoding', '3': 'Alt materials.',
-                                              '6': 'Alt region' })
+                                              '6': '347-02' })
 
         ]
       end
@@ -292,7 +292,8 @@ text for URI http://www.universal.resource/locator'.squish,
           'Alt materials Alt system details Alternative display text Alt URI',
           'Alt materials Alt recording Alt medium Alt playing speed Alt channel Alt characteristic',
           'Alt materials Alt presentation format Alt projection speed',
-          'Alt materials Alt video format Alt broadcast'
+          'Alt materials Alt video format Alt broadcast',
+          'Alt materials Alt file type Alt encoding'
         )
       end
     end

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

@@ -66,10 +66,25 @@ describe 'PennMARC::Relation' do
 
     it 'returns specified subfield values from specified field with blank indicator2' do
       values = helper.related_work_show record, relator_map: relator_map
-      expect(values).to contain_exactly 'Translation of: Some Author Aphorisms, Translator',
+      expect(values).to contain_exactly 'Translation of: Some Author Aphorisms, Translator.',
                                         'Alt. Prefix: Alt. Author Alt. Aphorisms'
       expect(values).not_to include 'Ignored'
     end
+
+    context 'with a translatable relator code in a 711 field and its linked alternate' do
+      let(:fields) do
+        [marc_field(tag: '711', indicator2: '', subfields: { i: 'Index to (work):', a: 'The Law of Outer Space',
+                                                             e: 'Advisory Board', j: 'author', t: 'Proceedings' }),
+         marc_field(tag: '880', indicator2: '', subfields: { i: 'Alt. Prefix:', a: 'Alt. Name', j: 'author',
+                                                             t: 'Alt. Title', '6': '711' })]
+      end
+
+      it 'appends relator term found in $j' do
+        values = helper.related_work_show(record, relator_map: relator_map)
+        expect(values).to contain_exactly('Index to: The Law of Outer Space Advisory Board Proceedings, author.',
+                                          'Alt. Prefix: Alt. Name Alt. Title, author.')
+      end
+    end
   end
 
   describe '.contains_show' do
@@ -77,14 +92,43 @@ describe 'PennMARC::Relation' do
       [marc_field(tag: '700', indicator2: '2', subfields: { i: 'Container of (work):', a: 'Some Author', t: 'Works',
                                                             '4': 'aut' }),
        marc_field(tag: '700', indicator2: '', subfields: { i: 'Adaptation of (work):', t: 'Ignored' }),
-       marc_field(tag: '880', indicator2: '2', subfields: { i: 'Alt. Prefix:', a: 'Alt. Name', '6': '700' })]
+       marc_field(tag: '880', indicator2: '2', subfields: { i: 'Alt. Prefix:', a: 'Alt. Name', e: 'Alt relator',
+                                                            '6': '700' })]
     end
 
     it "returns specified subfield values from specified field with '2' in indicator2" do
       values = helper.contains_show record, relator_map: relator_map
-      expect(values).to contain_exactly 'Alt. Prefix: Alt. Name', 'Container of: Some Author Works, Author'
+      expect(values).to contain_exactly 'Alt. Prefix: Alt. Name, Alt relator.',
+                                        'Container of: Some Author Works, Author.'
       expect(values).not_to include 'Ignored'
     end
+
+    context 'with a translatable relator code in a 711 field and its linked alternate' do
+      let(:fields) do
+        [marc_field(tag: '711', indicator2: '2', subfields: { i: 'Index to (work):', a: 'The Law of Outer Space',
+                                                              e: 'Advisory Board', j: 'author', t: 'Proceedings' }),
+         marc_field(tag: '880', indicator2: '2', subfields: { i: 'Alt. Prefix:', a: 'Alt. Name', j: 'author',
+                                                              t: 'Alt. Title', '6': '711' })]
+      end
+
+      it 'appends relator term found in $j' do
+        values = helper.contains_show(record, relator_map: relator_map)
+        expect(values).to contain_exactly('Index to: The Law of Outer Space Advisory Board Proceedings, author.',
+                                          'Alt. Prefix: Alt. Name Alt. Title, author.')
+      end
+    end
+
+    context 'with translatable relator codes in a linked alternate' do
+      let(:fields) do
+        [marc_field(tag: '880', indicator2: '2', subfields: { i: 'Alt. Prefix:', a: 'Alt. Name', '4': 'aut',
+                                                              '6': '700' })]
+      end
+
+      it 'appends translatable relator codes' do
+        values = helper.contains_show record, relator_map: relator_map
+        expect(values).to contain_exactly 'Alt. Prefix: Alt. Name, Author.'
+      end
+    end
   end
 
   describe '.constituent_unit_show' do

data/spec/lib/pennmarc/marc_util_spec.rb

@@ -216,4 +216,122 @@ describe 'PennMARC::Util' do
       expect(values).not_to include 'Regular Local Heading', 'LoC Heading', 'Another Alt.'
     end
   end
+
+  describe '.field_or_its_linked_alternate?' do
+    let(:field) { marc_field(tag: '100', subfields: { a: 'Sylvia Wynter' }) }
+    let(:linked_alternate) { marc_field(tag: '880', subfields: { '6': '100' }) }
+
+    it "returns true when tags include the field's tag" do
+      expect(util.field_or_its_linked_alternate?(field, %w[100 200])).to be true
+    end
+
+    it "returns true when tags include linked alternate's $6 value" do
+      expect(util.field_or_its_linked_alternate?(linked_alternate, %w[100 200])).to be true
+    end
+
+    it "returns false when tags exclude the field's tag" do
+      expect(util.field_or_its_linked_alternate?(field, %w[200 300])).to be false
+    end
+
+    it "returns false when tags exclude the linked alternate's $6 value" do
+      expect(util.field_or_its_linked_alternate?(linked_alternate, %w[200 300])).to be false
+    end
+  end
+
+  describe '.relator_join_separator' do
+    it 'returns a space when string ends with an open date' do
+      expect(util.relator_join_separator('Nalo Hopkinson 1960-')).to be ' '
+    end
+
+    it 'returns a comma and a space (", ") when string does not end with an open date' do
+      expect(util.relator_join_separator('Audre Lorde 1934-1992')).to be ', '
+    end
+
+    context 'when a word character precedes the open date' do
+      it 'returns a comma and a space (", ")' do
+        expect(util.relator_join_separator('word120-')).to be ', '
+      end
+    end
+  end
+
+  describe '.relator_term_subfield' do
+    context 'with a field that uses $j for relator term' do
+      let(:field) { marc_field(tag: '111', subfields: { a: 'Code4Lib' }) }
+
+      it 'returns "j"' do
+        expect(util.relator_term_subfield(field)).to eq 'j'
+      end
+    end
+
+    context 'with any field that does not use $j for relator term' do
+      let(:field) { marc_field(tag: '100', subfields: { a: 'J.R.R. Tolkien' }) }
+
+      it 'defaults to "e"' do
+        expect(util.relator_term_subfield(field)).to eq 'e'
+      end
+    end
+  end
+
+  describe '.append_relator' do
+    let(:joined_subfields) { field.subfields.first.value }
+    let(:relator_map) { { aut: 'Author', ill: 'Illustrator' } }
+    let(:result) { util.append_relator(field: field, joined_subfields: joined_subfields, relator_term_sf: 'e') }
+
+    context 'when joined subfield values ends with a a comma' do
+      let(:field) { marc_field(tag: '100', subfields: { a: 'Capus, Alex,', '4': 'aut' }) }
+
+      it 'removes the trailing comma before joining the relator' do
+        expect(result).to eq 'Capus, Alex, Author.'
+      end
+    end
+
+    context 'with relator term and translatable relator code' do
+      let(:field) { marc_field(tag: '100', subfields: { a: 'Capus, Alex', e: 'editor', '4': 'aut' }) }
+
+      it 'only appends translatable relator' do
+        expect(result).to eq 'Capus, Alex, Author.'
+      end
+    end
+
+    context 'with multiple translatable relator codes' do
+      let(:field) { marc_field(tag: '100', subfields: { a: 'Capus, Alex', e: 'editor', '4': %w[aut ill doi] }) }
+
+      it 'appends all translatable relators with expected punctuation' do
+        expect(result).to eq 'Capus, Alex, Author, Illustrator.'
+      end
+    end
+
+    context 'with multiple relator terms' do
+      let(:field) { marc_field(tag: '100', subfields: { a: 'Capus, Alex', e: %w[author illustrator] }) }
+
+      it 'appends all translatable relators with expected punctuation' do
+        expect(result).to eq 'Capus, Alex, author, illustrator.'
+      end
+    end
+
+    context 'without translatable relator code' do
+      let(:field) { marc_field(tag: '100', subfields: { a: 'Capus, Alex,', e: %w[author illustrator], '4': 'doi' }) }
+
+      it 'appends relator term' do
+        expect(result).to eq 'Capus, Alex, author, illustrator.'
+      end
+    end
+
+    context 'when relator term has trailing period' do
+      let(:field) { marc_field(tag: '100', subfields: { a: 'Capus, Alex,', e: 'author.' }) }
+
+      it 'punctuates the value as expected' do
+        expect(result).to eq 'Capus, Alex, author.'
+      end
+    end
+
+    context 'when joined subfield values ends with an open date' do
+      let(:joined_subfields) { [field.subfields.first.value, field.subfields.second.value].join(' ') }
+      let(:field) { marc_field(tag: '100', subfields: { a: 'Capus, Alex,', d: '1808-', '4': %w[aut ill] }) }
+
+      it 'uses a space when appending the relator' do
+        expect(result).to eq 'Capus, Alex, 1808- Author, Illustrator.'
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pennmarc
 version: !ruby/object:Gem::Version
-  version: 1.0.18
+  version: 1.0.20
 platform: ruby
 authors:
 - Mike Kanning
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-18 00:00:00.000000000 Z
+date: 2024-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport