pennmarc 1.4.8 → 1.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a51f4a4e365a774002e2dbddfa2d1ba72b37e7ed5b98c2b6ca7910e45c571568
-  data.tar.gz: 795408a49a463709d3d0805ec5a66b58c822ee99630f9ed281583c2c954e23b4
+  metadata.gz: 8afdbe2c48c9cf22c9d3242757f070996e6181f3d1ac570ece3fdbf04e8c2f5d
+  data.tar.gz: 3ddc3f81b9a8152e53aa19430cc45180e30fc89a11f3cda5ebae41cb9c0a275c
 SHA512:
-  metadata.gz: 64213422101fa26f03d675af34ffb5f0169b266c6173689516fb9a33120d3fca8c709392ccea842baf96ae08887c9aea238d542e932cf289428437fce7685df9
-  data.tar.gz: b29c0fb8dd64d223b0749b1179286bd99d430e658d38e236cfed0747b96fc88dd9494c213ecd0c007c03a0bca03ea49a6ba61fce2eb59578e6c42cc337ee46e1
+  metadata.gz: 7fd53869a4b48a1d8446a969283c8e60f467952dfc17a7c251ca9ffae767bc4f9a9e04f7dba24a3c6a97aa18856a23b79bb181dadf8766832c6d85fbfa4a3928
+  data.tar.gz: 35a12593cd5352b3ffa9de11afa86ef22b7b00d2ae0f48f1e78f961f71a68d50bd694e13baaa41bf85ca25e9877097360405e57619a976fa0e688ef6845856e9

data/.rubocop.yml

@@ -3,5 +3,16 @@ inherit_from: .rubocop_todo.yml
 inherit_gem:
   upennlib-rubocop: upennlib_rubocop_defaults.yml
 
+plugins:
+  - rubocop-yard
+
+YARD/MismatchName:
+  Description: 'Check @param and @option name and method parameters'
+  Enabled: true
+  VersionAdded: '0.3.0'
+  EnforcedStylePrototypeName: before
+  SupportedStylesPrototypeName:
+    - before
+
 Rails:
   Enabled: false

data/Gemfile

@@ -8,6 +8,7 @@ gem 'library_stdnums', '~> 1.6'
 gem 'marc', '~> 1.2'
 gem 'nokogiri', '~> 1.15'
 gem 'rake', '~> 13.0'
+gem 'rubocop-yard', require: false
 gem 'upennlib-rubocop', require: false
 
 group :test, :development do

data/Gemfile.lock

@@ -127,6 +127,10 @@ GEM
     rubocop-rspec (3.9.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.81)
+    rubocop-yard (1.1.0)
+      lint_roller
+      rubocop (~> 1.72)
+      yard
     ruby-progressbar (1.13.0)
     securerandom (0.4.1)
     simplecov (0.22.0)
@@ -171,6 +175,7 @@ DEPENDENCIES
   rackup
   rake (~> 13.0)
   rspec (~> 3.12)
+  rubocop-yard
   simplecov (~> 0.22)
   upennlib-rubocop
   yard

data/lib/pennmarc/helpers/creator.rb

@@ -23,6 +23,8 @@ module PennMARC
     CONTRIBUTOR_TAGS = %w[700 710].freeze
     CONTRIBUTOR_DISPLAY_SUBFIELDS = %w[a b c d j q u 3].freeze
 
+    UNIVERSITY_IDENTIFIER = 'PU'
+
     FACET_SOURCE_MAP = {
       100 => 'abcdjq', 110 => 'abcdjq', 111 => 'abcen',
       700 => 'abcdjq', 710 => 'abcdjq', 711 => 'abcen',
@@ -52,6 +54,7 @@ module PennMARC
       # theme to the 7xx fields but apply to serial records. Includes all subfield values except those in the
       # {SEARCH_EXCLUDED_SUBFIELDS} constant.
       # @param record [MARC::Record]
+      # @param relator_map [Hash]
       # @return [Array<String>] array of extended author/creator values for indexing
       def search_aux(record, relator_map: Mappers.relator)
         name_search_values record: record, tags: AUX_TAGS, relator_map: relator_map
@@ -62,6 +65,7 @@ module PennMARC
       # value except for those defined in the {DISPLAY_EXCLUDED_SUBFIELDS} constant. Then, appends any encoded relators
       # found in $4. If there are no valid encoded relators, uses the value found in $e.
       # @param record [MARC::Record]
+      # @param relator_map [Hash]
       # @return [Array<String>] array of author/creator values for display
       def show(record, relator_map: Mappers.relator)
         fields = record.fields(TAGS)
@@ -87,6 +91,7 @@ module PennMARC
 
       # Show more credited authors - both 100 field and 700 entries where the relator (codes e or 4) is author/aut
       # @param record [MARC::Record]
+      # @param relator_map [Hash]
       # @return [Array<String>] array of author/creator values for display
       def extended_show(record, relator_map: Mappers.relator)
         fields = record.fields(TAGS + %w[700 710])
@@ -124,6 +129,8 @@ module PennMARC
       def authors_list(record, main_tags_only: false, first_initial_only: false)
         fields = record.fields(main_tags_only ? TAGS : TAGS + CONTRIBUTOR_TAGS)
         fields.filter_map { |field|
+          next if university_provenance? field
+
           if field['a'].present?
             name = trim_trailing(:comma, field['a'])
             first_initial_only ? abbreviate_name(name) : name
@@ -150,6 +157,7 @@ module PennMARC
         fields.each do |field|
           next if indicator_2_options.exclude?(field.indicator2) && field.tag.in?(CONTRIBUTOR_TAGS)
           next if subfield_defined? field, 'i'
+          next if university_provenance? field
 
           relator = relator(field: field, relator_term_sf: 'e', relator_map: relator_map)
           relator = 'Contributor' if relator.blank?
@@ -231,6 +239,7 @@ module PennMARC
       # @note ported from get_conference_values
       # @todo what is ǂi for?
       # @param record [MARC::Record]
+      # @param relator_map [Hash]
       # @return [Array<String>] array of conference values
       def conference_detail_show(record, relator_map: Mappers.relator)
         conferences = record.fields(%w[111 711]).filter_map do |field|
@@ -462,6 +471,7 @@ module PennMARC
       # values other than $0, $4, $5, $6, $8, $e, $j, and $w to create conference value. We join subfields $e and $w to
       # determine the subunit value. We append any relators, preferring those defined in $4 and using $j as a fallback.
       # @param field [MARC::Field]
+      # @param relator_map [Hash]
       # @return [String]
       def parse_conference_detail_show_value(field, relator_map: Mappers.relator)
         conf = if subfield_undefined? field, 'i'
@@ -481,6 +491,14 @@ module PennMARC
       def describes_author?(field)
         field['4']&.downcase == 'aut' || field['e']&.downcase&.start_with?('author')
       end
+
+      # Does the given field describe a contributor representing university provenance. A contributor tag with a '$5'
+      # value starting with the university identifier represents university provenance.
+      # @param field [MARC::Field]
+      # @return [Boolean]
+      def university_provenance?(field)
+        field.tag.in?(CONTRIBUTOR_TAGS) && subfield_value?(field, '5', /^#{UNIVERSITY_IDENTIFIER}/)
+      end
     end
   end
 end

data/lib/pennmarc/helpers/edition.rb

@@ -12,6 +12,7 @@ module PennMARC
       # Publication and/or Volume Designation).
       # https://www.loc.gov/marc/bibliographic/bd250.html
       # @param record [MARC::Record]
+      # @param with_alternate [Boolean]
       # @return [Array<String>] array of editions and their alternates
       def show(record, with_alternate: true)
         editions = record.fields('250').map do |field|

data/lib/pennmarc/helpers/inventory_entry/electronic.rb

@@ -7,7 +7,7 @@ module PennMARC
     # Represent a Electronic inventory entry - simple because the subfield specification is identical across
     # entries returned by the API and Alma Publishing enrichment
     class Electronic < Base
-      # @return [Hash{Symbol->Unknown}]
+      # @return [Hash{Symbol=>Unknown}]
       def to_h
         { portfolio_id: field[mapper::ELEC_PORTFOLIO_ID],
           url: field[mapper::ELEC_SERVICE_URL],

data/lib/pennmarc/helpers/inventory_entry/physical.rb

@@ -25,7 +25,7 @@ module PennMARC
         field[mapper::PHYS_PRIORITY]
       end
 
-      # @return [Hash{Symbol->Unknown}]
+      # @return [Hash{Symbol=>Unknown}]
       def to_h
         { holding_id: field[mapper::PHYS_HOLDING_ID],
           location_name: field[mapper::PHYS_LOCATION_NAME],

data/lib/pennmarc/helpers/location.rb

@@ -68,7 +68,7 @@ module PennMARC
       # Determine enriched marc location tag, location code subfield, and call number subfield,
       # giving priority to using 'itm', 'AVA', or 'hld' fields.
       # @param record [MARC::Record]
-      # @return [Hash<String, String>] containing location tag and subfield code
+      # @return [Hash{String => String}] containing location tag and subfield code
       # - `:tag` (String): The enriched marc location tag
       # - `:location_code_sf` (String): The subfield code where location code is stored
       # - `:call_num_sf` (String): The subfield code where call number is stored

data/lib/pennmarc/mappings/locations.yml

@@ -1602,6 +1602,10 @@ vetewellrm:
     - Veterinary
     - 'Veterinary: Atwood Library (Campus)'
   display: 'Veterinary: Atwood Library (Campus)- Wellness Room'  
+vpcgcdisp:
+  specific_location: Van Pelt - Global Collections Book Display
+  library: Van Pelt-Dietrich Library Center
+  display: Van Pelt - Global Collections Book Display -- First Floor
 vpexhibits:
   specific location: Van Pelt - Exhibits and Events
   library: Van Pelt-Dietrich Library Center

data/lib/pennmarc/parser.rb

@@ -13,6 +13,7 @@ module PennMARC
   class Parser
     # Allow calls to `respond_to?` on parser instances to respond accurately by checking helper classes
     # @param name [String, Symbol]
+    # @param include_private [Boolean]
     # @return [Boolean]
     def respond_to_missing?(name, include_private = false)
       helper, method_name = parse_call(name)

data/lib/pennmarc/services/title_suggestion_weight_service.rb

@@ -41,7 +41,7 @@ module PennMARC
         end
       end
 
-      # @return [Array[Array]]
+      # @return [Array<Array>]
       def factors
         FACTORS
       end

data/lib/pennmarc/util.rb

@@ -38,7 +38,7 @@ module PennMARC
     # returns true if field has a value that matches
     # passed-in regex and passed in subfield
     # @param field [MARC::DataField]
-    # @param subfield [String|Integer|Symbol]
+    # @param subfield [String, Integer, Symbol]
     # @param regex [Regexp]
     # @return [Boolean, nil]
     def subfield_value?(field, subfield, regex)
@@ -48,7 +48,7 @@ module PennMARC
     # returns true if field has no value that matches
     # passed-in regex and passed in subfield
     # @param field [MARC::DataField]
-    # @param subfield [String|Integer|Symbol]
+    # @param subfield [String, Integer, Symbol]
     # @param regex [Regexp]
     # @return [Boolean, nil]
     def no_subfield_value_matches?(field, subfield, regex)
@@ -57,7 +57,7 @@ module PennMARC
 
     # returns true if a given field has a given subfield value in a given array
     # @param field [MARC::DataField]
-    # @param subfield [String|Integer|Symbol]
+    # @param subfield [String, Integer, Symbol]
     # @param array [Array]
     # @return [Boolean]
     def subfield_value_in?(field, subfield, array)
@@ -65,8 +65,8 @@ module PennMARC
     end
 
     # returns true if a given field does not have a given subfield value in a given array
-    # @param field [MARC:DataField]
-    # @param subfield [String|Integer|Symbol]
+    # @param field [MARC::DataField]
+    # @param subfield [String, Integer, Symbol]
     # @param array [Array]
     # @return [Boolean]
     def subfield_value_not_in?(field, subfield, array)
@@ -89,7 +89,7 @@ module PennMARC
 
     # Check if a field has a given subfield defined
     # @param field [MARC::DataField]
-    # @param subfield [String|Symbol|Integer]
+    # @param subfield [String, Symbol, Integer]
     # @return [Boolean]
     def subfield_defined?(field, subfield)
       field.any? { |sf| sf.code == subfield.to_s }
@@ -97,7 +97,7 @@ module PennMARC
 
     # Check if a field does not have a given subfield defined
     # @param field [MARC::DataField]
-    # @param subfield [String|Symbol|Integer]
+    # @param subfield [String, Symbol, Integer]
     # @return [Boolean]
     def subfield_undefined?(field, subfield)
       field.none? { |sf| sf.code == subfield.to_s }
@@ -105,7 +105,7 @@ module PennMARC
 
     # Gets all subfield values for a subfield in a given field
     # @param field [MARC::DataField]
-    # @param subfield [String|Symbol] as a string or symbol
+    # @param subfield [String, Symbol] as a string or symbol
     # @return [Array] subfield values for given subfield code
     def subfield_values(field, subfield)
       field.filter_map do |sf|
@@ -183,7 +183,7 @@ module PennMARC
     # passed-in block from 880 datafield that has a particular subfield 6 value.
     # See: https://www.loc.gov/marc/bibliographic/bd880.html
     # @param record [MARC::Record]
-    # @param subfield6_value [String|Array] either a string to look for in sub6 or an array of them
+    # @param subfield6_value [String, Array] either a string to look for in sub6 or an array of them
     # @param selector [Proc] takes a subfield as argument, returns a boolean
     # @return [Array] array of linked alternates
     def linked_alternate(record, subfield6_value, &selector)
@@ -198,7 +198,7 @@ module PennMARC
     # from 880 datafield that has a particular subfield 6 value. We exclude 6 because
     # that value is the linkage ID itself and 8 because... IDK
     # @param record [MARC::Record]
-    # @param subfield6_value [String|Array] either a string to look for in sub6 or an array of them
+    # @param subfield6_value [String, Array] either a string to look for in sub6 or an array of them
     # @return [Array] array of linked alternates without 8 or 6 values
     def linked_alternate_not_6_or_8(record, subfield6_value)
       excluded_subfields = %w[6 8]
@@ -319,7 +319,7 @@ module PennMARC
     # {https://www.loc.gov/marc/bibliographic/bd111.html 111}, {https://www.loc.gov/marc/bibliographic/bd411.html 411},
     # {https://www.loc.gov/marc/bibliographic/bd611.html 611}, {https://www.loc.gov/marc/bibliographic/bd711.html 711},
     # {https://www.loc.gov/marc/bibliographic/bd811.html 811}
-    # @param field [MARC:Field]
+    # @param field [MARC::Field]
     # @return [String (frozen)]
     def relator_term_subfield(field)
       field_or_its_linked_alternate?(field, %w[111 411 611 711 811]) ? 'j' : 'e'

data/lib/pennmarc/version.rb

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

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

@@ -192,6 +192,23 @@ describe 'PennMARC::Creator' do
                                           'Name ends with comma', 'Name with no comma'
       end
     end
+
+    context 'with university donor/fund provenance' 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: 'A contributor', e: 'contributor',
+                                             '5': "Does-not-start-with-#{helper::UNIVERSITY_IDENTIFIER}" }),
+         marc_field(tag: '700', subfields: { a: 'Important Person Collection', '6': '100', d: '1970-',
+                                             '5': helper::UNIVERSITY_IDENTIFIER }),
+         marc_field(tag: '710', subfields: { a: 'Important Person Collection Library', '6': '100', d: '1970-',
+                                             '5': helper::UNIVERSITY_IDENTIFIER })]
+      end
+
+      it 'omits any university donor/fund provenance' do
+        expect(helper.authors_list(record)).to contain_exactly 'Surname, Name', 'A contributor'
+      end
+    end
   end
 
   describe '.contributors_list' do
@@ -245,6 +262,21 @@ describe 'PennMARC::Creator' do
                                           ['Translator', ['Einstein, Albert 1970-, Translator']]
       end
     end
+
+    context 'with university donor/fund provenance' do
+      let(:fields) do
+        [marc_field(tag: '700', 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: 'Important Person Collection', '6': '100', d: '1970-',
+                                             '5': helper::UNIVERSITY_IDENTIFIER }),
+         marc_field(tag: '710', subfields: { a: 'Important Person Collection Library', '6': '100', d: '1970-',
+                                             '5': helper::UNIVERSITY_IDENTIFIER })]
+      end
+
+      it 'omits any university donor/fund provenance' do
+        expect(helper.contributors_list(record)).to contain_exactly ['Author', ['Surname, Name']]
+      end
+    end
   end
 
   describe '.show_facet_map' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pennmarc
 version: !ruby/object:Gem::Version
-  version: 1.4.8
+  version: 1.4.11
 platform: ruby
 authors:
 - Mike Kanning
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-07-24 00:00:00.000000000 Z
+date: 2026-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport