pennmarc 1.4.3 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 054ef76358b852e38d5b5b141928dd20b810a8b13d4e82bc49d5acffb9349350
-  data.tar.gz: a8caa31d65cd455efa11f36e40c9c98c0320944495c5dad2a7169d8512be6306
+  metadata.gz: '081d17dd7ed356e36a029c244a36c6c8a5e1fd5670e17b8b13af945a888f9465'
+  data.tar.gz: e49fdb730bb47d7afeab2ed4ed47dba4fd8fa11f4c2b88d02b109d7c0a22a892
 SHA512:
-  metadata.gz: 1a7428835604fd9f9377e9791c876f5f78ea797fb953b59669dfa699a1ac93b961f90265135726b0ebec2761444509745a66cbcd604ed383fe281d3539b98372
-  data.tar.gz: 6d12216bf9716493fb372e2ef1d7e88003f63ca02b5433fb84fc144b854801deae12bfb52170418f64d1a837b2e842da6df1135b295f63f0ba9e2658b9b82b3d
+  metadata.gz: 66241f9ba06920b4563d1a20d2f219f8b7327b406a7dab717e392975410d4952781d94a5fafec5de0487fe8d0524cd73adc218c9d634ee3dba56e65a430e8738
+  data.tar.gz: e8c43cb88c4dedfb0e63e523c8ccbc88bf47448dc3ed190bb61ac3ec8244be1d9a4bd87d505c6ce7769962005602170889d8d02511d160cbf446fcd075da5c60

data/lib/pennmarc/helpers/creator.rb

@@ -92,8 +92,8 @@ module PennMARC
         fields = record.fields(TAGS + %w[700 710])
         fields += record.fields('880').select { |field| subfield_value?(field, '6', /^(#{TAGS.join('|')})/) }
         fields.filter_map { |field|
-          # for 700 and 880 entries, only include ones with relator code ('4') = aut, or code 'e' = 'author'
-          next if field.tag.in?(%w[700 880]) && !describes_author?(field)
+          # for 700, 710 and 880 entries, only include ones with relator code ('4') = aut, or code 'e' = 'author'
+          next if field.tag.in?(%w[700 710 880]) && !describes_author?(field)
 
           parse_show_value(field, relator_map: relator_map)
         }.uniq

data/lib/pennmarc/helpers/format.rb

@@ -85,7 +85,12 @@ module PennMARC
         # any of these
         formats << MANUSCRIPT if include_manuscripts?(format_code)
         formats << ARCHIVE if archive?(record)
-        formats << MICROFORMAT if micro_or_microform?(call_nums(record), f007, f008, media_type, title_medium)
+
+        if micro_or_microform?(micro_code(record.leader, f006_forms, f008),
+                               call_nums(record), f007, media_type, title_medium)
+          formats << MICROFORMAT
+        end
+
         formats << THESIS_DISSERTATION if thesis_or_dissertation?(format_code, record)
         formats << CONFERENCE_EVENT if conference_event?(record)
         formats << NEWSPAPER if newspaper?(f008, format_code)
@@ -275,14 +280,28 @@ module PennMARC
         record.fields('502').any? && format_code.in?(%w[am tm dm])
       end
 
+      # @param leader [String]
+      # @param f006_forms [Array<String>]
+      # @param f008 [String]
+      # @return [String]
+      def micro_code(leader, f006_forms, f008)
+        map_or_visual = %w[e g k r]
+
+        if map_or_visual.include?(leader[6]) || f006_forms.any? { |str| map_or_visual.include?(str) }
+          f008[29] || ' '
+        else
+          f008[23] || ' '
+        end
+      end
+
+      # @param micro_code [String]
       # @param call_nums [Array<String>]
       # @param f007 [Array<String>]
-      # @param f008 [String]
       # @param title_medium [Array<String>]
       # @param media_type [Array<String>]
       # @return [Boolean]
-      def micro_or_microform?(call_nums, f007, f008, media_type, title_medium)
-        [f008[23], f008[29]].any? { |v| v.in?(%w[a b c]) } ||
+      def micro_or_microform?(micro_code, call_nums, f007, media_type, title_medium)
+        %w[a b c].include?(micro_code) ||
           f007.any? { |v| v.start_with?('h') } ||
           title_medium.any? { |val| val =~ /micro/i } ||
           call_nums.any? { |val| val =~ /micro/i } ||

data/lib/pennmarc/mappings/locations.yml

@@ -1220,12 +1220,12 @@ scinc:
   display: Kislak Center for Special Collections - Incunables
   aeon: true
 sckatzstor:
-  specific_location: LIBRA Rare Library at the Katz Center
+  specific_location: LIBRA - Rare Library at the Katz Center
   library:
     - Special Collections
     - LIBRA
     - Library at the Katz Center for Advanced Judaic Studies
-  display: LIBRA Rare Library at the Katz Center
+  display: LIBRA - Rare Library at the Katz Center
   aeon: true
 sclea:
   specific_location: Kislak Center for Special Collections - Lea Collection
@@ -1361,12 +1361,19 @@ scstor:
     - LIBRA
   display: LIBRA - Rare Book Collection Storage
   aeon: true
+scstorcomx:
+  specific_location: LIBRA - Rare Comics Collection
+  library:
+    - Special Collections
+    - LIBRA
+  display: LIBRA - Rare Comics Collection
+  aeon: true
 scstorvil:
-  specific_location: LIBRA Vilain-Wieck Collection
+  specific_location: LIBRA - Vilain-Wieck Collection
   library: 
     - Special Collections
     - LIBRA
-  display: LIBRA Vilain-Wieck Collection
+  display: LIBRA - Vilain-Wieck Collection
   aeon: true
 scteer:
   specific_location: Kislak Center for Special Collections - Teerink Collection
@@ -1432,41 +1439,41 @@ storcrstxt:
     - GIC Collection
   display: GIC Collection at Penn Libraries
 storfine:
-  specific_location: LIBRA Fisher Fine Arts
+  specific_location: LIBRA - Fisher Fine Arts
   library: LIBRA
-  display: LIBRA Fisher Fine Arts
+  display: LIBRA - Fisher Fine Arts
   aeon: true
 storm:
   specific_location: LIBRA
   library: LIBRA
   display: LIBRA - Music
 storlimit:
-  specific_location: LIBRA Limited
+  specific_location: LIBRA - Limited
   library:
     - Special Collections
     - LIBRA
-  display: LIBRA Limited
+  display: LIBRA - Limited
   aeon: true
 storrare:
-  specific_location: LIBRA Rare
+  specific_location: LIBRA - Rare
   library:
     - Special Collections
     - LIBRA
-  display: LIBRA Rare
+  display: LIBRA - Rare
   aeon: true
 storspec:
-  specific_location: LIBRA Special
+  specific_location: LIBRA - Special
   library:
     - Special Collections
     - LIBRA
-  display: LIBRA Special
+  display: LIBRA - Special
   aeon: true
 scrunning:
-  specific_location: LIBRA Running Press Collection
+  specific_location: LIBRA - Running Press Collection
   library:
     - Special Collections
     - LIBRA
-  display: LIBRA Running Press Collection
+  display: LIBRA - Running Press Collection
   aeon: true
 univarch:
   specific_location: University Archives

data/lib/pennmarc/version.rb

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

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

@@ -112,26 +112,29 @@ describe 'PennMARC::Creator' do
       end
     end
 
-    context 'with a corporate author records in 110 and 710' do
+    context 'with an author in 100 and a corporate author records in 710' do
       let(:fields) do
-        [marc_field(tag: '110', subfields: { a: 'Island Records', '0': 'http://cool.uri/12345' }),
-         marc_field(tag: '710', subfields: { a: 'Def Jam Records', '0': 'http://cool.uri/45678' })]
+        [marc_field(tag: '100', subfields: { a: 'Sparky the Fire Dog', '4': 'aut' }),
+         marc_field(tag: '710', subfields: { a: 'National Fire Protection Association', '4': 'aut' })]
       end
 
-      it 'returns single author value' do
+      it 'returns two author values' do
         values = helper.extended_show(record)
-        expect(values).to contain_exactly 'Def Jam Records', 'Island Records'
+        expect(values).to contain_exactly 'Sparky the Fire Dog, Author.',
+                                          'National Fire Protection Association, Author.'
       end
     end
 
-    context 'with author records in 100 and 700' do
+    context 'with author records in 100 and 700, and non-author content in 710' do
       let(:fields) do
         [marc_field(tag: '100', subfields: { a: 'Surname, Name', '0': 'http://cool.uri/12345', d: '1900-2000',
                                              e: 'author.', '4': 'http://cool.uri/vocabulary/relators/aut' }),
          marc_field(tag: '700', subfields: { a: 'Surname, Alternative', '6': '100', '4': 'aut' }),
          marc_field(tag: '700', subfields: { a: 'Surname, Third', e: 'author.', '6': '100' }),
          marc_field(tag: '700', subfields: { a: 'Surname, Ignore', e: 'editor.', '6': '100' }),
-         marc_field(tag: '700', subfields: { a: 'Surname, Not Included', '6': '100', '4': 'edt' })]
+         marc_field(tag: '700', subfields: { a: 'Surname, Not Included', '6': '100', '4': 'edt' }),
+         marc_field(tag: '710',
+                    subfields: { a: 'Culinary Archive and Library (University of Pennsylvania)' })]
       end
 
       it 'returns three authors' do

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

@@ -106,11 +106,11 @@ describe 'PennMARC::Format' do
         end
       end
 
-      context 'with 008 field and valid value at position 23' do
+      context 'with non-map/visual record (LDR06 and 006/00 not egkr) and 008 field valid value at position 23' do
         let(:record) do
-          marc_record fields: [
-            marc_control_field(tag: '008', value: '                       a')
-          ]
+          marc_record leader: '     h',
+                      fields: [marc_control_field(tag: '006', value: 'c  '),
+                               marc_control_field(tag: '008', value: '                       a')]
         end
 
         it 'returns "Microformat"' do
@@ -118,11 +118,23 @@ describe 'PennMARC::Format' do
         end
       end
 
-      context 'with 008 field and valid value at position 29' do
+      context 'with map/visual record (LDR06 value egkr) and 008 field valid value at position 29' do
         let(:record) do
-          marc_record fields: [
-            marc_control_field(tag: '008', value: '                             a')
-          ]
+          marc_record leader: '      k',
+                      fields: [marc_control_field(tag: '008', value: '                             b')]
+        end
+
+        it 'returns "Microformat"' do
+          expect(formats).to contain_exactly('Microformat')
+        end
+      end
+
+      context 'with map/visual record (LDR06 not egkr but 006/00 is), and 008 field valid value at position 29' do
+        let(:record) do
+          marc_record leader: '      h',
+                      fields: [marc_control_field(tag: '006', value: 'a  '),
+                               marc_control_field(tag: '006', value: 'g  '),
+                               marc_control_field(tag: '008', value: '                             c')]
         end
 
         it 'returns "Microformat"' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pennmarc
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.5
 platform: ruby
 authors:
 - Mike Kanning
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-25 00:00:00.000000000 Z
+date: 2026-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport