pennmarc 1.2.10 → 1.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc38a9c6a1409bc4aaaec31b6b0b8384dbc1d4e3895e593d024ff941f6cbe518
-  data.tar.gz: 20ffa419ce3ed488e4b3ba57936ea4adda09b16582fccd1143b7bb9d0509e210
+  metadata.gz: ba9e67db0150db000412aced9bbcfa47109e0a3d9e0077abb634a9aedc6110d2
+  data.tar.gz: 456f88b47a83305f0eb71b2daf5afc8704048e4761ae7f5ef5315b189ee89b85
 SHA512:
-  metadata.gz: a986b89add634ed795d3a2bac887618f1413f5d56f160b42134ca39d56626d5c159f8679dda9296ed7db2ae7e971d1383f9b414a61b654b6ca98e547835c6a0d
-  data.tar.gz: 3abd5a6471041195c79edf56454ff98530ece759d30a210688ed1894b42dcc986fe56dab672ee4e92df893d6ec81d06cd47dc1cc6daf6f542ad0dd4872cf1d90
+  metadata.gz: be56036ff189496fedb33c611578134b39975ea7c779fd73fe941cb26898c7bcbb3485f3a409c4b510f187985ca1a5df42a1309ceaa8b227d1ea261e5b861b1a
+  data.tar.gz: e84d79da22e084545f4d84b37364d39de44a16f4dcf2382d07b16b4a6992c39e9473df58576d9232af00c30d40e20cd96ddcba04352cfd2d9764f9c2a025f535

data/lib/pennmarc/helpers/creator.rb

@@ -131,11 +131,7 @@ module PennMARC
           relator = trim_punctuation(relator).capitalize
 
           name = trim_trailing(:comma, field['a'])
-          name = if name_only
-                   name
-                 else
-                   "#{name} #{join_subfields(field, &subfield_in?(%w[b c d j q u 3]))}, #{relator}"
-                 end
+          name = "#{name} #{join_subfields(field, &subfield_in?(%w[b c d j q u 3]))}, #{relator}" unless name_only
 
           if contributors.key?(relator)
             contributors[relator].push(name)
@@ -274,19 +270,23 @@ module PennMARC
       # 'a', 'b', 'c', 'd', 'j', and 'q', 'u', and '3'. Then appends resulting string with any encoded relationships
       # found in $4. If there are no valid encoded relationships, uses the value found in $e.
       # @note legacy version returns array of hash objects including data for display link
-      # @todo is it okay to include 880 $4 here? Legacy includes $4 in main author display 880 but not here.
       # @param record [MARC::Record]
       # @param relator_map [Hash]
+      # @param name_only [Boolean]
+      # @param vernacular [Boolean]
       # @return [Array<String>]
-      def contributor_show(record, relator_map: Mappers.relator)
+      def contributor_show(record, relator_map: Mappers.relator, name_only: false, vernacular: true)
         indicator_2_options = ['', ' ', '0']
         fields = record.fields(CONTRIBUTOR_TAGS)
-        fields += record.fields('880').select { |f| subfield_value?(f, '6', /^(#{CONTRIBUTOR_TAGS.join('|')})/) }
+        if vernacular
+          fields += record.fields('880').select { |f| subfield_value?(f, '6', /^(#{CONTRIBUTOR_TAGS.join('|')})/) }
+        end
+        sf = name_only ? %w[a] : %w[a b c d j q u 3]
         fields.filter_map { |field|
           next if indicator_2_options.exclude?(field.indicator2) && field.tag.in?(CONTRIBUTOR_TAGS)
           next if subfield_defined? field, 'i'
 
-          contributor = join_subfields(field, &subfield_in?(%w[a b c d j q u 3]))
+          contributor = join_subfields(field, &subfield_in?(sf))
           append_relator(field: field, joined_subfields: contributor, relator_term_sf: 'e', relator_map: relator_map)
         }.uniq
       end

data/lib/pennmarc/helpers/production.rb

@@ -209,13 +209,13 @@ module PennMARC
         values = record.fields('245').first(1).flat_map { |field| subfield_values(field, 'f') }
 
         values += record.fields(%w[260 261 262]).first(1).map do |field|
-          join_subfields(field, &subfield_in?([subfield]))
+          trim_punctuation(join_subfields(field, &subfield_in?([subfield])))
         end
 
         values += record.fields('264').filter_map do |field|
           next unless field.indicator2 == '1'
 
-          join_subfields(field, &subfield_in?([subfield]))
+          trim_punctuation(join_subfields(field, &subfield_in?([subfield])))
         end
 
         values.compact_blank.uniq

data/lib/pennmarc/mappings/locations.yml

@@ -1422,6 +1422,13 @@ scstor:
     - Van Pelt-Dietrich Library Center
   display: Kislak Center for Special Collections - Rare Book Collection Storage
   aeon: true
+scstorvil:
+  specific_location: LIBRA Vilain-Wieck Collection
+  library: 
+    - Special Collections
+    - LIBRA
+  display: LIBRA Vilain-Wieck Collection
+  aeon: true
 scteer:
   specific_location: Kislak Center for Special Collections - Teerink Collection
   library:
@@ -1522,6 +1529,13 @@ scrunning:
     - LIBRA
   display: LIBRA Running Press Collection
   aeon: true
+storvilain:
+  specific_location: LIBRA Vilain-Wieck Collection
+  library: 
+    - Special Collections
+    - LIBRA
+  display: LIBRA Vilain-Wieck Collection
+  aeon: true
 univarch:
   specific_location: University Archives
   library: University Archives
@@ -1587,6 +1601,13 @@ vetelibr:
     - Veterinary
     - 'Veterinary: Atwood Library (Campus)'
   display: 'Veterinary: Atwood Library (Campus) - Librarian''s Office'
+vetenewbk:
+  specific_location: 'Veterinary: Atwood Library (Campus) - New Books'
+  library:
+    - Health Sciences Libraries
+    - Veterinary
+    - 'Veterinary: Atwood Library (Campus)'
+  display: 'Veterinary: Atwood Library (Campus) - New Books'
 veteover:
   specific_location: 'Veterinary: Atwood Library (Campus) - Oversize'
   library:

data/lib/pennmarc/version.rb

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

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

@@ -453,6 +453,16 @@ describe 'PennMARC::Creator' do
           'Alt Name Alt num Alt title Alt date Alt qualifier Alt Fuller Name Alt affiliation Alt material, Alt relator.'
         )
       end
+
+      it 'returns contributor name only when called with name_only as true' do
+        values = helper.contributor_show(record, relator_map: mapping, name_only: true)
+        expect(values).to contain_exactly('Name, Author.', 'Alt Name, Alt relator.')
+      end
+
+      it 'returns contributor values without alternatives when called with vernacular as false' do
+        values = helper.contributor_show(record, relator_map: mapping, vernacular: false)
+        expect(values).to contain_exactly('Name I laureate 1968 pseud Fuller Name affiliation materials, Author.')
+      end
     end
 
     context 'with a corporate contributor and linked alternate' do

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

@@ -251,9 +251,9 @@ describe 'PennMARC::Production' do
     let(:record) { marc_record fields: fields }
     let(:fields) do
       [marc_field(tag: '245', subfields: { f: 'between 1800-1850' }),
-       marc_field(tag: '260', subfields: { a: ' Burnt Mill, Harlow, Essex, England', b: 'Longman',
+       marc_field(tag: '260', subfields: { a: ' Burnt Mill, Harlow, Essex, England : ', b: 'Longman',
                                            c: '1985, c1956.' }),
-       marc_field(tag: '264', subfields: { a: 'Leeds', b: 'Peepal Tree Press', c: '2019' }, indicator2: '1'),
+       marc_field(tag: '264', subfields: { a: 'Leeds,', b: 'Peepal Tree Press', c: '2019' }, indicator2: '1'),
        marc_field(tag: '880', subfields: { f: 'Alternate 1800-1850', '6': '245' }),
        marc_field(tag: '880',
                   subfields: { a: 'Alternate England', b: 'Alternate Longman', c: 'Alternate 1985, c1956.',
@@ -273,7 +273,7 @@ describe 'PennMARC::Production' do
     let(:record) { marc_record fields: fields }
     let(:fields) do
       [marc_field(tag: '245', subfields: { f: 'between 1800-1850' }),
-       marc_field(tag: '260', subfields: { a: ' Burnt Mill, Harlow, Essex, England', b: 'Longman',
+       marc_field(tag: '260', subfields: { a: ' Burnt Mill, Harlow, Essex, England,', b: 'Longman',
                                            c: '1985, c1956.' }),
        marc_field(tag: '264', subfields: { a: 'Leeds', b: 'Peepal Tree Press', c: '2019' }, indicator2: '1'),
        marc_field(tag: '880', subfields: { f: 'Alternate 1800-1850', '6': '245' }),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pennmarc
 version: !ruby/object:Gem::Version
-  version: 1.2.10
+  version: 1.2.12
 platform: ruby
 authors:
 - Mike Kanning
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-30 00:00:00.000000000 Z
+date: 2025-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport