pennmarc 1.2.22 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5f3095fc6bb6a688539dc03d57678dcfe48a4e50c86e2f304f24c95c2520c3e
-  data.tar.gz: 7549c5774d952dd35062ee36b039e4db6137cfdb90840453752d60b0f817a455
+  metadata.gz: ce41a1f1d20b337d09c9efe7864702f2991fea918aadfaf2094e9a87c1291e47
+  data.tar.gz: 1b65ac76d70e6e9e6b9bf5c60d7bd9cfa3b352a2292486fb7e1668662bf81d9d
 SHA512:
-  metadata.gz: 2aff101e41d22473fa7da490ab347c04487ad6a0ae2e7a35cd91dfb8a4ab7251d397b0c5dcbc6ab64920821407d357cbd7c5673b46dfd7ca00f02c173eff03f2
-  data.tar.gz: e21ff016f09df155db0eaee8aec6132a86696c8609bf65ffc8cad2a246dff29cdfdb44d49d9b574d33cd42876eeecd70c973a86610d52b39710953001b790951
+  metadata.gz: 6c094891accf90519201927873b4e711b649efee1ab191118d541b9a733ecb573b1c0719306c1a958056f461947279312bed0b4950438bf23c91c437b7c251e7
+  data.tar.gz: c5578566958775705e86f5be697558468a061e089a361ab1629fa4aaa45758d1fb56970c6651a0bcbd5539c71e6802c61bc2b88b1ade7953ba06a395e2f9d442

data/.rubocop_todo.yml

@@ -1,20 +1,12 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --auto-gen-only-exclude --exclude-limit 10000`
-# on 2024-08-30 16:12:14 UTC using RuboCop version 1.51.0.
+# on 2025-08-15 20:13:24 UTC using RuboCop version 1.79.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Severity, Include.
-# Include: **/*.gemspec
-Gemspec/RequireMFA:
-  Exclude:
-    - 'pennmarc.gemspec'
-
-# Offense count: 26
+# Offense count: 27
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes, Max.
 Metrics/AbcSize:
   Exclude:
@@ -31,18 +23,17 @@ Metrics/AbcSize:
     - 'lib/pennmarc/helpers/title.rb'
     - 'lib/pennmarc/util.rb'
 
-# Offense count: 9
+# Offense count: 5
 # Configuration parameters: CountComments, Max, CountAsOne.
 Metrics/ClassLength:
   Exclude:
     - 'lib/pennmarc/helpers/creator.rb'
     - 'lib/pennmarc/helpers/format.rb'
-    - 'lib/pennmarc/helpers/production.rb'
     - 'lib/pennmarc/helpers/series.rb'
     - 'lib/pennmarc/helpers/subject.rb'
     - 'lib/pennmarc/helpers/title.rb'
 
-# Offense count: 19
+# Offense count: 21
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/CyclomaticComplexity:
   Exclude:
@@ -59,18 +50,16 @@ Metrics/CyclomaticComplexity:
     - 'lib/pennmarc/helpers/title.rb'
     - 'lib/pennmarc/util.rb'
 
-# Offense count: 28
+# Offense count: 17
 # Configuration parameters: CountComments, Max, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Exclude:
     - 'lib/pennmarc/helpers/creator.rb'
-    - 'lib/pennmarc/helpers/date.rb'
     - 'lib/pennmarc/helpers/edition.rb'
     - 'lib/pennmarc/helpers/format.rb'
     - 'lib/pennmarc/helpers/location.rb'
     - 'lib/pennmarc/helpers/note.rb'
     - 'lib/pennmarc/helpers/production.rb'
-    - 'lib/pennmarc/helpers/relation.rb'
     - 'lib/pennmarc/helpers/series.rb'
     - 'lib/pennmarc/helpers/subject.rb'
     - 'lib/pennmarc/helpers/title.rb'
@@ -81,7 +70,7 @@ Metrics/ModuleLength:
   Exclude:
     - 'lib/pennmarc/util.rb'
 
-# Offense count: 14
+# Offense count: 16
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/PerceivedComplexity:
   Exclude:
@@ -96,52 +85,33 @@ Metrics/PerceivedComplexity:
     - 'lib/pennmarc/helpers/title.rb'
     - 'lib/pennmarc/util.rb'
 
-# Offense count: 4
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, BlockForwardingName.
-# SupportedStyles: anonymous, explicit
-Naming/BlockForwarding:
-  Exclude:
-    - 'lib/pennmarc/util.rb'
-
 # Offense count: 1
-# Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros.
-# NamePrefix: is_, has_, have_
-# ForbiddenPrefixes: is_, has_, have_
+# Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros, UseSorbetSigs.
+# NamePrefix: is_, has_, have_, does_
+# ForbiddenPrefixes: is_, has_, have_, does_
 # AllowedMethods: is_a?
 # MethodDefinitionMacros: define_method, define_singleton_method
-Naming/PredicateName:
+Naming/PredicatePrefix:
   Exclude:
     - 'lib/pennmarc/helpers/relation.rb'
 
 # Offense count: 1
 # Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers, AllowedPatterns.
 # SupportedStyles: snake_case, normalcase, non_integer
-# AllowedIdentifiers: capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339, x86_64
+# AllowedIdentifiers: TLS1_1, TLS1_2, capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339, x86_64
 Naming/VariableNumber:
   Exclude:
     - 'lib/pennmarc/util.rb'
 
-# Offense count: 8
+# Offense count: 2
 # Configuration parameters: Max, CountAsOne.
 RSpec/ExampleLength:
   Exclude:
-    - 'spec/lib/pennmarc/helpers/creator_spec.rb'
-    - 'spec/lib/pennmarc/helpers/note_spec.rb'
-    - 'spec/lib/pennmarc/helpers/production_spec.rb'
     - 'spec/lib/pennmarc/marc_util_spec.rb'
 
 # Offense count: 1
-# Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
-# Include: **/*_spec*rb*, **/spec/**/*
-RSpec/FilePath:
+# Configuration parameters: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.
+# Include: **/*_spec.rb
+RSpec/SpecFilePathFormat:
   Exclude:
     - 'spec/lib/pennmarc/parser_spec.rb'
-
-# Offense count: 27
-# Configuration parameters: Max, AllowedGroups.
-RSpec/NestedGroups:
-  Exclude:
-    - 'spec/lib/pennmarc/helpers/access_spec.rb'
-    - 'spec/lib/pennmarc/helpers/format_spec.rb'
-    - 'spec/lib/pennmarc/helpers/location_spec.rb'

data/Gemfile.lock

@@ -1,86 +1,106 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.5)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activesupport (7.2.2.2)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    ast (2.4.2)
-    concurrent-ruby (1.2.2)
-    diff-lcs (1.5.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+    ast (2.4.3)
+    base64 (0.3.0)
+    benchmark (0.4.1)
+    bigdecimal (3.2.2)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.3)
+    diff-lcs (1.6.2)
     docile (1.4.0)
-    i18n (1.13.0)
+    drb (2.2.3)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.6.3)
+    json (2.13.2)
+    language_server-protocol (3.17.0.5)
     lcsort (0.9.1)
     library_stdnums (1.6.0)
-    marc (1.2.0)
+    lint_roller (1.1.0)
+    logger (1.7.0)
+    marc (1.3.0)
+      nokogiri (~> 1.0)
       rexml
-      scrub_rb (>= 1.0.1, < 2)
-      unf
-    minitest (5.18.0)
-    nokogiri (1.18.5-arm64-darwin)
+    minitest (5.25.5)
+    nokogiri (1.18.9-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.5-x64-mingw-ucrt)
+    nokogiri (1.18.9-x64-mingw-ucrt)
       racc (~> 1.4)
-    nokogiri (1.18.5-x86_64-darwin)
+    nokogiri (1.18.9-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.5-x86_64-linux-gnu)
+    nokogiri (1.18.9-x86_64-linux-gnu)
       racc (~> 1.4)
-    parallel (1.23.0)
-    parser (3.2.2.1)
+    parallel (1.27.0)
+    parser (3.3.9.0)
       ast (~> 2.4.1)
+      racc
+    prism (1.4.0)
     racc (1.8.1)
-    rack (3.0.7)
+    rack (3.2.0)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.8.0)
-    rexml (3.2.5)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rake (13.3.0)
+    regexp_parser (2.11.2)
+    rexml (3.4.1)
+    rspec (3.13.1)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.5)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.5)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    rubocop (1.51.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.4)
+    rubocop (1.79.2)
       json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.0, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.46.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.28.1)
-      parser (>= 3.2.1.0)
-    rubocop-capybara (2.18.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.23.1)
-      rubocop (~> 1.33)
-    rubocop-performance (1.18.0)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.19.1)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.46.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-capybara (2.22.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-performance (1.25.0)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+    rubocop-rails (2.33.3)
       activesupport (>= 4.2.0)
+      lint_roller (~> 1.1)
       rack (>= 1.1)
-      rubocop (>= 1.33.0, < 2.0)
-    rubocop-rake (0.6.0)
-      rubocop (~> 1.0)
-    rubocop-rspec (2.22.0)
-      rubocop (~> 1.33)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
+    rubocop-rake (0.7.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.72.1)
+    rubocop-rspec (3.6.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
     ruby-progressbar (1.13.0)
-    scrub_rb (1.0.1)
+    securerandom (0.4.1)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -89,19 +109,18 @@ GEM
     simplecov_json_formatter (0.1.4)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
-    unicode-display_width (2.4.2)
-    upennlib-rubocop (1.1.0)
-      rubocop (~> 1.24)
+    unicode-display_width (3.1.5)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    upennlib-rubocop (1.3.0)
+      rubocop (~> 1.72)
       rubocop-capybara
       rubocop-performance
       rubocop-rails
       rubocop-rake
       rubocop-rspec
     webrick (1.8.1)
-    yard (0.9.34)
+    yard (0.9.37)
 
 PLATFORMS
   arm64-darwin-21

data/lib/pennmarc/helpers/creator.rb

@@ -85,6 +85,36 @@ 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
+      # @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'
+
+          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
+      # @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'
+
+          show = parse_show_value(field, relator_map: relator_map)
+          facet = parse_facet_value(field, FACET_SOURCE_MAP[field.tag.to_i].chars)
+          { show: show, facet: facet }
+        end
+        creators.to_h { |h| [h[:show], h[:facet]] }
+      end
+
       # Returns the list of authors with name (subfield $a) only
       # @param record [MARC::Record]
       # @param main_tags_only [Boolean] only use TAGS; otherwise use both TAGS and CONTRIBUTOR_TAGS

data/lib/pennmarc/helpers/location.rb

@@ -42,7 +42,7 @@ module PennMARC
       # @return [Array<String>]
       def location(record:, display_value:, location_map:)
         # get enriched marc location tag and relevant subfields
-        enriched_location_tag_and_subfields(record) => {tag:, location_code_sf:, call_num_sf:, call_num_type_sf:}
+        enriched_location_tag_and_subfields(record) => { tag:, location_code_sf:, call_num_sf:, call_num_type_sf: }
 
         record.fields(tag).flat_map { |field|
           field.filter_map { |subfield|

data/lib/pennmarc/helpers/relation.rb

@@ -5,8 +5,6 @@ module PennMARC
   # records.
   class Relation < Helper
     class << self
-      CHRONOLOGY_PREFIX = 'CHR'
-
       RELATED_WORK_FIELDS = %w[700 710 711 730].freeze
       CONTAINS_FIELDS = %w[700 710 711 730 740].freeze
 
@@ -21,14 +19,6 @@ module PennMARC
         }.uniq
       end
 
-      # Get "chronology" information from specially-prefixed 650 (subject) fields
-      # @todo why do we stuff chronology data in a 650 field?
-      # @param record [MARC::Record]
-      # @return [Array] array of chronology values
-      def chronology_show(record)
-        prefixed_subject_and_alternate(record, CHRONOLOGY_PREFIX)
-      end
-
       # Get notes for Related Collections from {https://www.oclc.org/bibformats/en/5xx/544.html MARC 544}.
       # @param record [MARC::Record]
       # @return [Array]

data/lib/pennmarc/util.rb

@@ -269,7 +269,7 @@ module PennMARC
       mapping[relator_code&.to_sym]
     end
 
-    # Get 650 & 880 for Provenance and Chronology: prefix should be 'PRO' or 'CHR' and may be preceded by a '%'
+    # Get 650 & 880 for Provenance: prefix should be 'PRO' or 'CHR' and may be preceded by a '%'
     # @note 11/2018: do not display $5 in PRO or CHR subjs
     # @param record [MARC::Record]
     # @param prefix [String] prefix to select from subject field

data/lib/pennmarc/version.rb

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

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

@@ -93,6 +93,52 @@ describe 'PennMARC::Creator' do
     end
   end
 
+  describe '.extended_show' do
+    let(:record) { marc_record fields: fields }
+
+    context 'with a single author record' 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: '880', subfields: { a: 'Surname, Alternative', '6': '100' })]
+      end
+
+      it 'returns single author values with no URIs anywhere (the same as show)' do
+        values = helper.extended_show(record)
+        expect(values).to contain_exactly 'Surname, Name 1900-2000, author.'
+        expect(values.join.downcase).not_to include 'http'
+      end
+    end
+
+    context 'with author records in 100 and 700' 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, Not Included', '6': '100', '4': 'edt' })]
+      end
+
+      it 'returns two authors' do
+        values = helper.extended_show(record)
+        expect(values).to contain_exactly 'Surname, Name 1900-2000, author.', 'Surname, Alternative, Author.'
+        expect(values.join.downcase).not_to include 'http'
+      end
+    end
+
+    context 'with no 100 or 700 fields' do
+      let(:fields) do
+        [marc_field(tag: '110', subfields: { a: 'Group of People', b: 'Annual Meeting', '4': 'aut' }),
+         marc_field(tag: '880', subfields: { '6': '110', a: 'Alt. Group Name', b: 'Alt. Annual Meeting' })]
+      end
+
+      it 'returns empty' do
+        values = helper.extended_show(record, relator_map: mapping)
+        expect(values).to be_empty
+        expect(values.join.downcase).not_to include 'http'
+      end
+    end
+  end
+
   describe '.authors_list' do
     let(:record) { marc_record fields: fields }
 
@@ -198,6 +244,26 @@ describe 'PennMARC::Creator' do
     end
   end
 
+  describe '.extended_show_facet_map' do
+    let(:record) do
+      marc_record fields: [
+        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: 'Group of People', b: 'Annual Meeting', '4': 'aut' }),
+        marc_field(tag: '700', subfields: { a: 'Second Group of People', b: 'Meeting', '4': 'aut' }),
+        marc_field(tag: '700', subfields: { a: 'Ignore (not author)', '4': 'edt' }),
+        marc_field(tag: '880', subfields: { a: 'Ignore', '6': '100' })
+      ]
+    end
+
+    it 'returns expected hash' do
+      values = helper.extended_show_facet_map(record, relator_map: mapping)
+      expect(values).to eq({ 'Surname, Name 1900-2000, author.' => 'Surname, Name 1900-2000',
+                             'Group of People Annual Meeting, Author.' => 'Group of People Annual Meeting',
+                             'Second Group of People Meeting, Author.' => 'Second Group of People Meeting' })
+    end
+  end
+
   describe '.show_aux' do
     let(:record) { marc_record fields: fields }
 

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

@@ -16,20 +16,6 @@ describe 'PennMARC::Relation' do
     end
   end
 
-  describe '.chronology_show' do
-    let(:fields) do
-      [marc_field(tag: '650', indicator2: '4', subfields: { a: 'CHR Heading' }),
-       marc_field(tag: '650', indicator2: '4', subfields: { a: 'Regular Local Heading' }),
-       marc_field(tag: '650', indicator2: '1', subfields: { a: 'LoC Heading' }),
-       marc_field(tag: '880', indicator2: '4', subfields: { '6': '650', a: 'CHR Alt. Heading' }),
-       marc_field(tag: '880', indicator2: '4', subfields: { '6': '999', a: 'Another Alt.' })]
-    end
-
-    it 'returns only the specified subfield data and linked alternate field with CHR prefix removed' do
-      expect(helper.chronology_show(record)).to eq ['Heading', 'Alt. Heading']
-    end
-  end
-
   describe '.related_collections_show' do
     let(:fields) do
       [marc_field(tag: '544', subfields: { d: 'Penn Papers', c: 'USA' }),

metadata

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