pennmarc 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce41a1f1d20b337d09c9efe7864702f2991fea918aadfaf2094e9a87c1291e47
-  data.tar.gz: 1b65ac76d70e6e9e6b9bf5c60d7bd9cfa3b352a2292486fb7e1668662bf81d9d
+  metadata.gz: b69f7173f51a48c0748bf1d537392c6bda0919312009c85bd70e603cf4cb0240
+  data.tar.gz: fa0e2d2c724e26734890fcc1fe4e20899a6141d0e0f0cdebe9e242b03070be35
 SHA512:
-  metadata.gz: 6c094891accf90519201927873b4e711b649efee1ab191118d541b9a733ecb573b1c0719306c1a958056f461947279312bed0b4950438bf23c91c437b7c251e7
-  data.tar.gz: c5578566958775705e86f5be697558468a061e089a361ab1629fa4aaa45758d1fb56970c6651a0bcbd5539c71e6802c61bc2b88b1ade7953ba06a395e2f9d442
+  metadata.gz: 4ed0b2699d095d4f07483e38fd99d8bcc52d2fd69f8c6b94dfba410a8d6f42329dda379e7eb8809ec43687d8552cc38471f85859ff0d73c0888026845caed1e6
+  data.tar.gz: 62d4f90ff259a2188fc0cc5eee803cd18e9f1a83d15874de77ef956e6dd836ae6a822a433770c0e56e2f583c15f696919be30f7298c080b4404d27e3f247d245

data/lib/pennmarc/helpers/access.rb

@@ -5,7 +5,8 @@ module PennMARC
   class Access < Helper
     ONLINE = 'Online'
     AT_THE_LIBRARY = 'At the library'
-    RESOURCE_LINK_BASE_URL = 'hdl.library.upenn.edu'
+    HANDLE_BASE_URL = 'hdl.library.upenn.edu'
+    COLENDA_BASE_URL = 'colenda.library.upenn.edu'
 
     class << self
       # Based on enhanced metadata fields added by Alma publishing process or API, determine if the record has
@@ -46,7 +47,7 @@ module PennMARC
       # Check if a record contains an 856 entry with a Penn Handle server link meeting these criteria:
       # 1. Indicator 1 is 4 (HTTP resource)
       # 2. Indicator 2 is NOT 2 (indicating the linkage is to a "related" thing)
-      # 3. The URL specified in subfield u (URI) is a Penn Handle link
+      # 3. The URL specified in subfield u (URI) is a Penn Handle link or Penn Colenda link
       # 4. The subfield z does NOT include the string 'Finding aid'
       # See: https://www.loc.gov/marc/bibliographic/bd856.html
       # @note Some electronic records do not have Portfolios in Alma, so we rely upon the Resource Link in the 856 to
@@ -54,15 +55,19 @@ module PennMARC
       # @param record [MARC::Record]
       # @return [Boolean]
       def resource_link?(record)
-        record.fields('856').filter_map do |field|
-          next if field.indicator2 == '2' || field.indicator1 != '4'
+        record.fields('856').any? { |field| valid_resource_field?(field) }
+      end
+
+      # Check if a field contains valid resource
+      # @param field [MARC::Field]
+      # @return [Boolean]
+      def valid_resource_field?(field)
+        return false if field.indicator2 == '2' || field.indicator1 != '4'
+        return false if subfield_values(field, 'z')&.include?('Finding aid')
 
-          subz = subfield_values(field, 'z')
-          subfield_values(field, 'u').filter_map do |value|
-            return true if subz.exclude?('Finding aid') && value.include?(RESOURCE_LINK_BASE_URL)
-          end
+        subfield_values(field, 'u').any? do |value|
+          [HANDLE_BASE_URL, COLENDA_BASE_URL].any? { |url| value.include?(url) }
         end
-        false
       end
     end
   end

data/lib/pennmarc/helpers/creator.rb

@@ -85,28 +85,28 @@ module PennMARC
         creators.to_h { |h| [h[:show], h[:facet]] }
       end
 
-      # Show more credited authors - both 100 field and 700 entries where the relator term is aut
+      # Show more credited authors - both 100 field and 700 entries where the relator (codes e or 4) is author/aut
       # @param record [MARC::Record]
       # @return [Array<String>] array of author/creator values for display
       def extended_show(record, relator_map: Mappers.relator)
         fields = record.fields(%w[100 700])
         fields.filter_map { |field|
-          # for 700 entries, only include ones with relator code of aut
-          next if (field.tag == '700') && field['4']&.downcase != 'aut'
+          # for 700 entries, only include ones with relator code ('4') = aut, or code 'e' = 'author'
+          next if field.tag == '700' && !(field['4']&.downcase == 'aut' || field['e']&.downcase&.start_with?('author'))
 
           parse_show_value(field, relator_map: relator_map)
         }.uniq
       end
 
       # Hash with extended creators show values as the fields and the corresponding facet as the values.
-      # Only include 100, and 700 with relator of aut
+      # Only include 100, and 700 with relator (codes e or 4) of author/aut
       # @param record [MARC::Record]
       # @param relator_map [Hash]
       # @return [Hash]
       def extended_show_facet_map(record, relator_map: Mappers.relator)
         creators = record.fields(%w[100 700]).filter_map do |field|
-          # for 700 entries, only include ones with relator code of aut
-          next if (field.tag == '700') && field['4']&.downcase != 'aut'
+          # for 700 entries, only include ones with relator code ('4') = aut, or code 'e' = 'author'
+          next if field.tag == '700' && !(field['4']&.downcase == 'aut' || field['e']&.downcase&.start_with?('author'))
 
           show = parse_show_value(field, relator_map: relator_map)
           facet = parse_facet_value(field, FACET_SOURCE_MAP[field.tag.to_i].chars)

data/lib/pennmarc/version.rb

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

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

@@ -44,7 +44,7 @@ describe 'PennMARC::Access' do
       end
     end
 
-    context 'with a record containing a link to a finding aid (as a handle link)' do
+    context 'with a record containing a link to an online resource' do
       let(:record) do
         marc_record fields: [marc_field(tag: PennMARC::Enriched::Pub::PHYS_INVENTORY_TAG),
                              marc_field(tag: '856', subfields: location_and_access_subfields, **indicators)]
@@ -72,7 +72,7 @@ describe 'PennMARC::Access' do
         end
       end
 
-      context 'with an 856 describing a resource link' do
+      context 'with an 856 describing a handle resource link' do
         let(:indicators) { { indicator1: '4', indicator2: '1' } }
         let(:location_and_access_subfields) do
           { z: 'Connect to resource', u: 'http://hdl.library.upenn.edu/1234' }
@@ -82,6 +82,28 @@ describe 'PennMARC::Access' do
           expect(helper.facet(record)).to contain_exactly(PennMARC::Access::ONLINE, PennMARC::Access::AT_THE_LIBRARY)
         end
       end
+
+      context 'with an 856 describing a colenda resource link' do
+        let(:indicators) { { indicator1: '4', indicator2: '1' } }
+        let(:location_and_access_subfields) do
+          { z: 'Connect to resource', u: 'http://colenda.library.upenn.edu/1234' }
+        end
+
+        it 'includes online access' do
+          expect(helper.facet(record)).to contain_exactly(PennMARC::Access::ONLINE, PennMARC::Access::AT_THE_LIBRARY)
+        end
+      end
+
+      context 'with an 856 describing some other resource link' do
+        let(:indicators) { { indicator1: '4', indicator2: '1' } }
+        let(:location_and_access_subfields) do
+          { z: 'Connect to resource', u: 'http://vanpelt.upenn.edu/something' }
+        end
+
+        it 'does not includes online access' do
+          expect(helper.facet(record)).not_to include PennMARC::Access::ONLINE
+        end
+      end
     end
   end
 end

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

@@ -114,13 +114,16 @@ describe 'PennMARC::Creator' 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', e: 'author', '6': '100', '4': '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' })]
       end
 
-      it 'returns two authors' do
+      it 'returns three authors' do
         values = helper.extended_show(record)
-        expect(values).to contain_exactly 'Surname, Name 1900-2000, author.', 'Surname, Alternative, Author.'
+        expect(values).to contain_exactly 'Surname, Name 1900-2000, author.',
+                                          'Surname, Alternative, Author.', 'Surname, Third, author.'
         expect(values.join.downcase).not_to include 'http'
       end
     end

metadata

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