pennmarc 1.2.4 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc24e1fe4c30a2cf49fe06d466deaff8ac61677b69b3ce673cebfb3729282ed7
-  data.tar.gz: cb7d013328a775f8c09d79cb4400374c4bb5ef5b97056e19c595d29707440469
+  metadata.gz: bc89ffad46c996296dc5cd84d8a2b9c81b82653b24c9d16f6aa9e12c9c3c6aaa
+  data.tar.gz: 5e1f488f73b07970e4242a7bbffb1536db2f800e73db72d4ad9b33d75375ad38
 SHA512:
-  metadata.gz: 15de4dca697023774cdbde7cfd805fab906c21f56d39824539204b796e0e25cac86415c971a73ec7c8bd8e6c9983fa8f9edb0231cbb942ef8880dfd7c968ad6c
-  data.tar.gz: a0d344dae1edbb7d7d4cd57ce698dd04007dfc30af9a981ff0db8708c5f1afe1b55347ec62ab4f544b51d5e187a95a945584d3c593f58f48804b691b384692b3
+  metadata.gz: 61a8aded7159b786a45213d03c4eb17b60eced7dba21e79b8b634a03bccdcd7f1e312f5205431e3215a95fbdba91ad60611312a03939f3c03bfc39b85dc5dc88
+  data.tar.gz: 756c4a538eedd1fd7b9bc12a347547863ea8674965c3a87669a32ca39d3c50724af0a17e3d1747e7e3a06385a9c6b55aead58d8c5d091996af5c37ed1c1641ba

data/.gitlab-ci.yml

@@ -1,65 +1,34 @@
+---
 include:
-  - project: "devops/gitlab/ci-templates/general"
-    file:
-      - ".install_hashicorp_vault.yml"
-      - ".vault_jwt_auth.yml"
-  - project: "devops/gitlab/ci-templates/ruby"
-    ref: "sans-dind"
-    file:
-      - ".rspec.yml"
-      - ".rubocop.yml"
-  - template: "Workflows/MergeRequest-Pipelines.gitlab-ci.yml"
+  - template: Jobs/Secret-Detection.gitlab-ci.yml
 
 stages:
-  - test
-  - deploy
+  - secret_check
+  - main_pipeline
 
-rspec_app_test:
-  stage: test
-  image: ruby:3.2.2
-  before_script:
-    - bundle install -j $(nproc)
-  extends:
-    - .rspec
-  tags:
-    - build
-
-rubocop_app_test:
-  stage: test
-  image: ruby:3.2.2
-  before_script:
-    - bundle install -j $(nproc)
-  extends:
-    - .rubocop
+secret_detection:
+  stage: secret_check
+  allow_failure: false
+  artifacts:
+    paths:
+      - .pipeline.yml
+    expire_in: 1 day
   tags:
     - build
+  rules:
+  - when: always
 
-# This step was inspired from Gitlab's example of gem publication:
-# https://gitlab.com/gitlab-org/quality/pipeline-common/-/blob/master/ci/gem-release.yml
-gem_publication:
-  stage: deploy
-  image: ruby:3.2.2
-  variables:
-    GEMSPEC_FILE: "${CI_PROJECT_NAME}.gemspec"
-  before_script:
-    - !reference [.install_hashicorp_vault, before_script]
-    - !reference [.vault_jwt_auth, before_script]
-    - export GEM_HOST_API_KEY="$(vault kv get -field=rubygems_api_key ${VAULT_KV_ENDPOINT}${ENVIRONMENT})"
-    - |
-      gem -v
-      rm -f ./*.gem
-      [ -f "${GEMSPEC_FILE}" ] || (echo "No ${GEMSPEC_FILE} file found!" && exit 1)
-    - '[ -n "${GEM_HOST_API_KEY}" ] || (echo "GEM_HOST_API_KEY is not set!" && exit 1)'
-  script:
-    - GEM_FILE=$(echo "${CI_PROJECT_NAME}-${CI_COMMIT_TAG:1}.gem")
-    - |
-      gem build "${GEMSPEC_FILE}"
-      [ -f "${GEM_FILE}" ] || (echo "No ${GEM_FILE} file found!" && exit 1)
-    - '[ "${DISABLE_GEM_PUSH}" == "true" ] || gem push "${GEM_FILE}"'
+main:
+  stage: main_pipeline
+  needs:
+    - secret_detection
+  allow_failure: false
+  trigger:
+    include:
+      - artifact: .pipeline.yml
+        job: secret_detection
+    strategy: depend
   rules:
-     - if: $CI_COMMIT_TAG =~ /^v\d+\.\d+\.\d+(\.[a-zA-Z0-9]+)?$/
-  artifacts:
-    paths:
-      - "*.gem"
-  tags:
-    - deploy
+  - if: "$CI_MERGE_REQUEST_IID"
+  - if: "$CI_COMMIT_TAG"
+  - if: "$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH"

data/.pipeline.yml

@@ -0,0 +1,64 @@
+include:
+  - project: "devops/gitlab/ci-templates/general"
+    file:
+      - ".install_hashicorp_vault.yml"
+      - ".vault_jwt_auth.yml"
+  - project: "devops/gitlab/ci-templates/ruby"
+    ref: "sans-dind"
+    file:
+      - ".rspec.yml"
+      - ".rubocop.yml"
+
+stages:
+  - test
+  - deploy
+
+rspec_app_test:
+  stage: test
+  image: ruby:3.2.2
+  before_script:
+    - bundle install -j $(nproc)
+  extends:
+    - .rspec
+  tags:
+    - build
+
+rubocop_app_test:
+  stage: test
+  image: ruby:3.2.2
+  before_script:
+    - bundle install -j $(nproc)
+  extends:
+    - .rubocop
+  tags:
+    - build
+
+# This step was inspired from Gitlab's example of gem publication:
+# https://gitlab.com/gitlab-org/quality/pipeline-common/-/blob/master/ci/gem-release.yml
+gem_publication:
+  stage: deploy
+  image: ruby:3.2.2
+  variables:
+    GEMSPEC_FILE: "${CI_PROJECT_NAME}.gemspec"
+  before_script:
+    - !reference [.install_hashicorp_vault, before_script]
+    - !reference [.vault_jwt_auth, before_script]
+    - export GEM_HOST_API_KEY="$(vault kv get -field=rubygems_api_key ${VAULT_KV_ENDPOINT}${ENVIRONMENT})"
+    - |
+      gem -v
+      rm -f ./*.gem
+      [ -f "${GEMSPEC_FILE}" ] || (echo "No ${GEMSPEC_FILE} file found!" && exit 1)
+    - '[ -n "${GEM_HOST_API_KEY}" ] || (echo "GEM_HOST_API_KEY is not set!" && exit 1)'
+  script:
+    - GEM_FILE=$(echo "${CI_PROJECT_NAME}-${CI_COMMIT_TAG:1}.gem")
+    - |
+      gem build "${GEMSPEC_FILE}"
+      [ -f "${GEM_FILE}" ] || (echo "No ${GEM_FILE} file found!" && exit 1)
+    - '[ "${DISABLE_GEM_PUSH}" == "true" ] || gem push "${GEM_FILE}"'
+  rules:
+     - if: $CI_COMMIT_TAG =~ /^v\d+\.\d+\.\d+(\.[a-zA-Z0-9]+)?$/
+  artifacts:
+    paths:
+      - "*.gem"
+  tags:
+    - deploy

data/Gemfile

@@ -3,6 +3,7 @@
 source 'https://rubygems.org'
 
 gem 'activesupport', '~> 7'
+gem 'lcsort'
 gem 'library_stdnums', '~> 1.6'
 gem 'marc', '~> 1.2'
 gem 'nokogiri', '~> 1.15'

data/Gemfile.lock

@@ -13,6 +13,7 @@ GEM
     i18n (1.13.0)
       concurrent-ruby (~> 1.0)
     json (2.6.3)
+    lcsort (0.9.1)
     library_stdnums (1.6.0)
     marc (1.2.0)
       rexml
@@ -111,6 +112,7 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport (~> 7)
+  lcsort
   library_stdnums (~> 1.6)
   marc (~> 1.2)
   nokogiri (~> 1.15)

data/lib/pennmarc/helpers/classification.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'lcsort'
+
 module PennMARC
   # Generates library of congress and dewey classifications using call number data.
   class Classification < Helper
@@ -42,26 +44,53 @@ module PennMARC
         }.uniq
       end
 
+      # Return a normalized Call Number value for sorting purposes. This uses the Lcsort gem normalization logic, which
+      # returns nil for non-LC call numbers. For now, this returns only the call number values from the enrichment
+      # inventory fields.
+      # @note this could be made more efficient by just returning the first value, but in the future we may want to be
+      #       more discerning about which call number we return (longest?)
+      # @param record [MARC::Record]
+      # @return [String, nil] a normalized call number
+      def sort(record)
+        values(record, loc_only: true).filter_map { |val| Lcsort.normalize(val) }.first
+      end
+
       # Parse call number values from inventory fields, including both hld and itm fields from publishing enrichment.
       # Return only unique values.
       # @param record [MARC::Record]
       # @return [Array<String>] array of call numbers from inventory fields
       def call_number_search(record)
+        values(record, loc_only: false)
+      end
+
+      # Return raw call number values from inventory fields
+      # @param record [MARC::Record]
+      # @param loc_only [Boolean] whether or not to explicitly return only LOC call numbers from ITM & AVA inventory
+      # @return [Array<String>]
+      def values(record, loc_only:)
         call_nums = record.fields(TAGS).filter_map do |field|
+          next if loc_only && !loc_call_number_type?(subfield_values(field, call_number_type_sf(field))&.first)
+
           subfield_values(field, call_number_sf(field))
         end
 
-        # Ensure we get call numbers for records with no `itm` tags by also checking `hld` and de-duping
-        call_nums += record.fields([Enriched::Pub::PHYS_INVENTORY_TAG]).filter_map do |field|
+        call_nums += hld_field_call_nums(record)
+        call_nums.flatten.uniq
+      end
+
+      private
+
+      # Get call nums from `hld` tags. Useful if no call nums are available from `itm` tags
+      # @param record [MARC::Record]
+      # @return [Array<String>]
+      def hld_field_call_nums(record)
+        record.fields([Enriched::Pub::PHYS_INVENTORY_TAG]).filter_map do |field|
           first = subfield_values(field, Enriched::Pub::HOLDING_CLASSIFICATION_PART)&.first
           last = subfield_values(field, Enriched::Pub::HOLDING_ITEM_PART)&.first
           "#{first} #{last}".squish.presence
         end
-        call_nums.flatten.uniq
       end
 
-      private
-
       # Retrieve subfield code that stores the call number on enriched marc field
       # @param field [MARC::DataField]
       # @return [String]
@@ -106,10 +135,10 @@ module PennMARC
       end
 
       # Determine whether call number type is library of congress
-      # @param call_number_type [String] value from call number type subfield
+      # @param call_number_type [String, nil] value from call number type subfield
       # @return [Boolean]
       def loc_call_number_type?(call_number_type)
-        call_number_type == '0'
+        call_number_type == LOC_CALL_NUMBER_TYPE
       end
     end
   end

data/lib/pennmarc/helpers/relation.rb

@@ -21,6 +21,16 @@ module PennMARC
         }.uniq
       end
 
+      # Get "Contained in" values from {https://www.oclc.org/bibformats/en/7xx/773.html MARC 773}
+      # subfield g for related parts.
+      # @param record [MARC::Record]
+      # @return [Array<String>] related parts values for display
+      def contained_in_related_parts_show(record)
+        record.fields('773').map { |field|
+          join_subfields(field, &subfield_in?(%w[g]))
+        }.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]

data/lib/pennmarc/mappings/locations.yml

@@ -840,6 +840,10 @@ mideastres:
     - Van Pelt-Dietrich Library Center
     - Reserve
   display: Van Pelt - Middle East Seminar Reserve
+mscirc:
+  specific_location: Penn Museum Library - Circulation
+  library: Penn Museum Library
+  display: Penn Museum Library - Circulation
 muse:
   specific_location: Penn Museum Library
   library: Penn Museum Library
@@ -867,6 +871,14 @@ museegypov:
   specific_location: Penn Museum Library - Egyptian Oversize
   library: Penn Museum Library
   display: Penn Museum Library - Egyptian Oversize
+museexhi:
+  specific_location: Penn Museum Library - Exhibition
+  library: Penn Museum Library
+  display: Penn Museum Library - Exhibition
+musefolio:
+  specific_location: Penn Museum Library - Folio
+  library: Penn Museum Library
+  display: Penn Museum Library - Folio
 musekolb:
   specific_location: Penn Museum Library - Kolb
   library: Penn Museum Library
@@ -882,10 +894,14 @@ musemedia:
   specific_location: Penn Museum Library - Media
   library: Penn Museum Library
   display: Penn Museum Library - Media
-musenewbk:
+musenewbks:
   specific_location: Penn Museum Library - New Books Display
   library: Penn Museum Library
   display: Penn Museum Library - New Books Display
+museover:
+  specific_location: Penn Museum Library - Oversize
+  library: Penn Museum Library
+  display: Penn Museum Library - Oversize
 muserefe:
   specific_location: Penn Museum Library - Reference
   library: Penn Museum Library

data/lib/pennmarc/version.rb

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

data/pennmarc.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 3.2'
 
   s.add_dependency 'activesupport', '~> 7'
+  s.add_dependency 'lcsort', '~> 0.9'
   s.add_dependency 'library_stdnums', '~> 1.6'
   s.add_dependency 'marc', '~> 1.2'
   s.add_dependency 'nokogiri', '~> 1.15'

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

@@ -43,6 +43,86 @@ describe 'PennMARC::Classification' do
     end
   end
 
+  describe '.sort' do
+    context 'with enrichment via the Alma publishing process and no valid call number' do
+      let(:fields) do
+        [marc_field(tag: PennMARC::Enriched::Pub::ITEM_TAG, subfields: {
+                      PennMARC::Enriched::Pub::ITEM_CALL_NUMBER_TYPE => helper::LOC_CALL_NUMBER_TYPE,
+                      PennMARC::Enriched::Pub::ITEM_CALL_NUMBER => 'Secret Drawer Copy'
+                    }),
+         marc_field(tag: PennMARC::Enriched::Pub::ITEM_TAG, subfields: {
+                      PennMARC::Enriched::Pub::ITEM_CALL_NUMBER_TYPE => helper::DEWEY_CALL_NUMBER_TYPE,
+                      PennMARC::Enriched::Pub::ITEM_CALL_NUMBER => '691.3 B2141'
+                    })]
+      end
+
+      it 'returns nil' do
+        expect(helper.sort(record)).to be_nil
+      end
+    end
+
+    context 'with enrichment via the Alma publishing process and itm fields' do
+      let(:fields) do
+        [marc_field(tag: PennMARC::Enriched::Pub::ITEM_TAG, subfields: {
+                      PennMARC::Enriched::Pub::ITEM_CALL_NUMBER_TYPE => helper::LOC_CALL_NUMBER_TYPE,
+                      PennMARC::Enriched::Pub::ITEM_CALL_NUMBER => 'QL756 .S643'
+                    }),
+         marc_field(tag: PennMARC::Enriched::Pub::ITEM_TAG, subfields: {
+                      PennMARC::Enriched::Pub::ITEM_CALL_NUMBER_TYPE => helper::LOC_CALL_NUMBER_TYPE,
+                      PennMARC::Enriched::Pub::ITEM_CALL_NUMBER => 'Secret Drawer Copy'
+                    }),
+         marc_field(tag: PennMARC::Enriched::Pub::ITEM_TAG, subfields: {
+                      PennMARC::Enriched::Pub::ITEM_CALL_NUMBER_TYPE => helper::DEWEY_CALL_NUMBER_TYPE,
+                      PennMARC::Enriched::Pub::ITEM_CALL_NUMBER => '691.3 B2141'
+                    })]
+      end
+
+      it 'returns a normalized version of the first valid call number' do
+        expect(helper.sort(record)).to eq 'QL.0756.S643'
+      end
+    end
+
+    context 'with enrichment via the Alma publishing process including both hld and itm fields' do
+      let(:fields) do
+        [marc_field(tag: PennMARC::Enriched::Pub::ITEM_TAG,
+                    subfields: { PennMARC::Enriched::Pub::ITEM_CALL_NUMBER_TYPE => helper::LOC_CALL_NUMBER_TYPE,
+                                 PennMARC::Enriched::Pub::ITEM_CALL_NUMBER => 'QL756 .S643 1989' }),
+         marc_field(tag: PennMARC::Enriched::Pub::PHYS_INVENTORY_TAG,
+                    subfields: { PennMARC::Enriched::Pub::HOLDING_CLASSIFICATION_PART => 'QL756',
+                                 PennMARC::Enriched::Pub::HOLDING_ITEM_PART => '.S643' })]
+      end
+
+      it 'returns a normalized version of the first valid call number' do
+        expect(helper.sort(record)).to eq 'QL.0756.S643.1989'
+      end
+    end
+
+    context 'with enrichment via the Alma publishing process and only hld fields' do
+      let(:fields) do
+        [marc_field(tag: PennMARC::Enriched::Pub::PHYS_INVENTORY_TAG,
+                    subfields: { PennMARC::Enriched::Pub::HOLDING_CLASSIFICATION_PART => 'KF6450',
+                                 PennMARC::Enriched::Pub::HOLDING_ITEM_PART => '.C59 1989' })]
+      end
+
+      it 'returns expected normalized value' do
+        expect(helper.sort(record)).to eq 'KF.6450.C59.1989'
+      end
+    end
+
+    context 'with enrichment with availability info via Alma Api' do
+      let(:fields) do
+        [marc_field(tag: PennMARC::Enriched::Api::PHYS_INVENTORY_TAG, subfields: {
+                      PennMARC::Enriched::Api::PHYS_CALL_NUMBER_TYPE => helper::LOC_CALL_NUMBER_TYPE,
+                      PennMARC::Enriched::Api::PHYS_CALL_NUMBER => 'QL756 .S643'
+                    })]
+      end
+
+      it 'returns expected normalized value' do
+        expect(helper.sort(record)).to eq 'QL.0756.S643'
+      end
+    end
+  end
+
   describe '.call_number_search' do
     let(:fields) do
       [marc_field(tag: config[:tag],

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

@@ -16,6 +16,16 @@ describe 'PennMARC::Relation' do
     end
   end
 
+  describe '.contained_in_related_parts_show' do
+    let(:fields) do
+      [marc_field(tag: '773', subfields: { g: 'Vol. 24, pt. B no. 9 (Sept. 1993)', q: '24:B:9<235' })]
+    end
+
+    it 'returns only the specified subfields' do
+      expect(helper.contained_in_related_parts_show(record)).to eq ['Vol. 24, pt. B no. 9 (Sept. 1993)']
+    end
+  end
+
   describe '.chronology_show' do
     let(:fields) do
       [marc_field(tag: '650', indicator2: '4', subfields: { a: 'CHR Heading' }),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pennmarc
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.6
 platform: ruby
 authors:
 - Mike Kanning
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-03 00:00:00.000000000 Z
+date: 2024-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -28,6 +28,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '7'
+- !ruby/object:Gem::Dependency
+  name: lcsort
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: library_stdnums
   requirement: !ruby/object:Gem::Requirement
@@ -81,6 +95,7 @@ files:
 - ".gitignore"
 - ".gitlab-ci.yml"
 - ".gitleaks.toml"
+- ".pipeline.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"