pennmarc 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb0bf4c30ad40bcee865ed6596fbfc6d6d16a5d3924d62947d270a3d5fa3aac5
-  data.tar.gz: 33ca607af919156ac45a73067605b6ac298fef9c17ef983060e6a871c54ca26f
+  metadata.gz: 9003d5a58efd2cbef83a220bd0d609edfdc2bfb883378c003d0bafa2d85e520e
+  data.tar.gz: d8f841dbba9e412848b31a7a11284b14e2bbb772fbb98762b827ab9e2baf6355
 SHA512:
-  metadata.gz: 5e5d316a7e1340aaf7438297e17198339d02ab797842b47ec2cece1daf75f96a387565b4fdc6ca273ef1a64630e1f486bc713ea75793ed3d783998234a83c517
-  data.tar.gz: 6f6d6824e1aa5fecbcd2dc13bbc94ea575531e96ea5f822b992719f3b28189cce4c26febc2f31848f24008a57f6a839f787383752cfd2c915695b1f1e66fe5ca
+  metadata.gz: a45d1e909a7a9efad1aec8047d79f3358b1ee3b523958661459c27b397f3a0f33c00deffeae2bdd30fad14156b8f348171639375677e6f600086e1b592fe2c51
+  data.tar.gz: ba609fef49f12f9341328fc292cc510fab6ab298174791afc99ec802ecd1c62448c9ccc009a7f01c6aefef7be2c56d794cc5f2e0bddf01c72fc4e9db11ce6961

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --auto-gen-only-exclude --exclude-limit 10000`
-# on 2024-07-02 15:41:46 UTC using RuboCop version 1.51.0.
+# on 2024-08-20 20:46:53 UTC using RuboCop version 1.51.0.
 # 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
@@ -14,7 +14,7 @@ Gemspec/RequireMFA:
   Exclude:
     - 'pennmarc.gemspec'
 
-# Offense count: 25
+# Offense count: 26
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes, Max.
 Metrics/AbcSize:
   Exclude:
@@ -31,7 +31,7 @@ Metrics/AbcSize:
     - 'lib/pennmarc/helpers/title.rb'
     - 'lib/pennmarc/util.rb'
 
-# Offense count: 8
+# Offense count: 9
 # Configuration parameters: CountComments, Max, CountAsOne.
 Metrics/ClassLength:
   Exclude:
@@ -138,9 +138,10 @@ RSpec/FilePath:
   Exclude:
     - 'spec/lib/pennmarc/parser_spec.rb'
 
-# Offense count: 23
+# Offense count: 26
 # 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/lib/pennmarc/helpers/location.rb

@@ -37,12 +37,12 @@ module PennMARC
       # @see https://developers.exlibrisgroup.com/alma/apis/docs/bibs/R0VUIC9hbG1hd3MvdjEvYmlicy97bW1zX2lkfQ==/
       #   Alma documentation for these added fields
       # @param record [MARC::Record]
-      # @param display_value [Symbol | String] field in location hash to retrieve
+      # @param display_value [Symbol,String] field in location hash to retrieve
       # @param location_map [Hash] hash with location_code as key and location hash as value
       # @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:}
+        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|
@@ -53,8 +53,10 @@ module PennMARC
 
             next if location_code_to_ignore?(location_map, location_code)
 
-            override = specific_location_override(display_value: display_value, location_code: location_code,
-                                                  field: field, call_num_sf: call_num_sf)
+            override = if display_value.to_sym == :specific_location
+                         specific_location_override(location_code: location_code, field: field,
+                                                    call_num_sf: call_num_sf, call_num_type_sf: call_num_type_sf)
+                       end
 
             override || location_map[location_code.to_sym][display_value.to_sym]
           }.flatten.compact_blank
@@ -70,6 +72,8 @@ module PennMARC
       # - `: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
+      # - `:call_num_type_sf` (String, nil): The subfield code where call number type is stored. nil if unavailable in a
+      #                                   MARC field and we need to look for an indicator.
       def enriched_location_tag_and_subfields(record)
         # in holdings records, the shelving location is always the permanent location.
         # in item records, the current location takes into account
@@ -84,19 +88,22 @@ module PennMARC
           tag = Enriched::Pub::ITEM_TAG
           location_code_sf = Enriched::Pub::ITEM_CURRENT_LOCATION
           call_num_sf = Enriched::Pub::ITEM_CALL_NUMBER
+          call_num_type_sf = Enriched::Pub::ITEM_CALL_NUMBER_TYPE
           # if the record has API inventory tags, use them
         elsif field_defined?(record, Enriched::Api::PHYS_INVENTORY_TAG)
           tag = Enriched::Api::PHYS_INVENTORY_TAG
           location_code_sf = Enriched::Api::PHYS_LOCATION_CODE
           call_num_sf = Enriched::Api::PHYS_CALL_NUMBER
+          call_num_type_sf = Enriched::Api::PHYS_CALL_NUMBER_TYPE
           # otherwise use Pub holding tags
         else
           tag = Enriched::Pub::PHYS_INVENTORY_TAG
           location_code_sf = Enriched::Pub::PHYS_LOCATION_CODE
           call_num_sf = Enriched::Pub::HOLDING_CLASSIFICATION_PART
+          call_num_type_sf = nil # for hld tags, the call num type is indicator0
         end
 
-        { tag: tag, location_code_sf: location_code_sf, call_num_sf: call_num_sf }
+        { tag: tag, location_code_sf: location_code_sf, call_num_sf: call_num_sf, call_num_type_sf: call_num_type_sf }
       end
 
       # Determines whether to ignore a location code.
@@ -105,32 +112,55 @@ module PennMARC
       # map, we ignore it, for faceting purposes. We also ignore the location code 'web'. We don't facet for 'web'
       # which is the 'Penn Library Web' location used in Voyager. This location should eventually go away completely
       # with data cleanup in Alma.
-      # @param location_map [location_map] hash with location_code as key and location hash as value
-      # @param location_code [location_code] retrieved from record
+      # @param location_map [Hash] hash with location_code as key and location hash as value
+      # @param location_code [String] retrieved from record
       # @return [Boolean]
       def location_code_to_ignore?(location_map, location_code)
-        location_map.key?(location_code.to_sym) == false || location_code == WEB_LOCATION_CODE
+        !location_map.key?(location_code.to_sym) || location_code == WEB_LOCATION_CODE
       end
 
       # Retrieves a specific location override based on location code and call number. Specific location overrides are
       # located in `location_overrides.yml`.
-      # @param display_value [String | Symbol]
       # @param location_code [String]
       # @param field [MARC::Field]
       # @param call_num_sf [String]
+      # @param call_num_type_sf [String, nil]
       # @return [String, Nil]
-      def specific_location_override(display_value:, location_code:, field:, call_num_sf:)
-        return unless display_value.to_sym == :specific_location
+      def specific_location_override(location_code:, field:, call_num_sf:, call_num_type_sf:)
+        callnum_type = callnum_type(field: field, call_num_type_sf: call_num_type_sf)
+        return unless callnum_type
 
-        locations_overrides = Mappers.location_overrides
+        override = Mappers.location_overrides.find do |_key, override_data|
+          override_matching?(override_data: override_data, location_code: location_code, callnum_type: callnum_type,
+                             call_numbers: subfield_values(field, call_num_sf))
+        end
 
-        call_numbers = subfield_values(field, call_num_sf)
+        override&.last&.dig(:specific_location)
+      end
 
-        override = locations_overrides.find do |_key, value|
-          value[:location_code] == location_code && call_numbers.any? { |num| num.match?(value[:call_num_pattern]) }
+      # Check override_data hash for a matching location name override
+      # @param override_data [Hash]
+      # @param location_code [String]
+      # @param call_numbers [Array]
+      # @param callnum_type [String]
+      # @return [Boolean]
+      def override_matching?(override_data:, location_code:, call_numbers:, callnum_type:)
+        call_numbers.any? do |call_number|
+          override_data[:location_code] == location_code &&
+            override_data[:call_num_type] == callnum_type &&
+            call_number.match?(override_data[:call_num_pattern])
         end
+      end
 
-        override&.last&.dig(:specific_location)
+      # Return call num type value for a given field. If no call number subfield is expected (publishing holding
+      # inventory case), the first indicator is checked.
+      # @param field [MARC::Field]
+      # @param call_num_type_sf [String, nil]
+      # @return [String, nil]
+      def callnum_type(field:, call_num_type_sf:)
+        return field.indicator1 if call_num_type_sf.nil?
+
+        subfield_values(field, call_num_type_sf).first
       end
     end
   end

data/lib/pennmarc/mappings/location_overrides.yml

@@ -1,5 +1,6 @@
 albrecht:
   location_code: 'vanp'
   call_num_pattern: '^M.*'
+  call_num_type: '0'
   specific_location: 'Van Pelt - Albrecht Music Library'
 

data/lib/pennmarc/version.rb

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

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

@@ -4,12 +4,13 @@ describe 'PennMARC::Location' do
   let(:helper) { PennMARC::Location }
   let(:enriched_marc) { PennMARC::Enriched }
   let(:mapping) { location_map }
+  let(:record) { marc_record(fields: fields) }
 
   describe 'location' do
     context "with only 'itm' field present" do
-      let(:record) do
-        marc_record(fields: [marc_field(tag: enriched_marc::Pub::ITEM_TAG,
-                                        subfields: { enriched_marc::Pub::ITEM_CURRENT_LOCATION => 'stor' })])
+      let(:fields) do
+        [marc_field(tag: enriched_marc::Pub::ITEM_TAG,
+                    subfields: { enriched_marc::Pub::ITEM_CURRENT_LOCATION => 'stor' })]
       end
 
       it 'returns expected value' do
@@ -21,9 +22,9 @@ describe 'PennMARC::Location' do
     end
 
     context "with only 'hld' field present" do
-      let(:record) do
-        marc_record(fields: [marc_field(tag: enriched_marc::Pub::PHYS_INVENTORY_TAG,
-                                        subfields: { enriched_marc::Pub::PHYS_LOCATION_CODE => 'stor' })])
+      let(:fields) do
+        [marc_field(tag: enriched_marc::Pub::PHYS_INVENTORY_TAG,
+                    subfields: { enriched_marc::Pub::PHYS_LOCATION_CODE => 'stor' })]
       end
 
       it 'returns expected value' do
@@ -35,11 +36,11 @@ describe 'PennMARC::Location' do
     end
 
     context 'with both holding and item tag fields present=' do
-      let(:record) do
-        marc_record(fields: [marc_field(tag: enriched_marc::Pub::ITEM_TAG,
-                                        subfields: { enriched_marc::Pub::ITEM_CURRENT_LOCATION => 'stor' }),
-                             marc_field(tag: enriched_marc::Pub::PHYS_INVENTORY_TAG,
-                                        subfields: { enriched_marc::Pub::PHYS_LOCATION_CODE => 'dent' })])
+      let(:fields) do
+        [marc_field(tag: enriched_marc::Pub::ITEM_TAG,
+                    subfields: { enriched_marc::Pub::ITEM_CURRENT_LOCATION => 'stor' }),
+         marc_field(tag: enriched_marc::Pub::PHYS_INVENTORY_TAG,
+                    subfields: { enriched_marc::Pub::PHYS_LOCATION_CODE => 'dent' })]
       end
 
       it 'returns item location' do
@@ -49,7 +50,7 @@ describe 'PennMARC::Location' do
     end
 
     context 'with multiple library locations' do
-      let(:record) { marc_record(fields: [marc_field(tag: enriched_marc::Pub::ITEM_TAG, subfields: { g: %w[dent] })]) }
+      let(:fields) { [marc_field(tag: enriched_marc::Pub::ITEM_TAG, subfields: { g: %w[dent] })] }
 
       it 'returns expected value' do
         expect(helper.location(record: record, location_map: mapping,
@@ -59,7 +60,7 @@ describe 'PennMARC::Location' do
     end
 
     context 'without enriched marc location tag' do
-      let(:record) { marc_record(fields: [marc_field(tag: '852', subfields: { g: 'stor' })]) }
+      let(:fields) { [marc_field(tag: '852', subfields: { g: 'stor' })] }
 
       it 'returns expected value' do
         expect(helper.location(record: record, location_map: mapping, display_value: :library)).to be_empty
@@ -67,13 +68,11 @@ describe 'PennMARC::Location' do
     end
 
     context 'with AVA fields' do
-      let(:record) do
-        marc_record(fields: [marc_field(tag: enriched_marc::Api::PHYS_INVENTORY_TAG,
-                                        subfields: {
-                                          enriched_marc::Api::PHYS_LIBRARY_CODE => 'Libra',
-                                          enriched_marc::Api::PHYS_LOCATION_NAME => 'LIBRA',
-                                          enriched_marc::Api::PHYS_LOCATION_CODE => 'stor'
-                                        })])
+      let(:fields) do
+        [marc_field(tag: enriched_marc::Api::PHYS_INVENTORY_TAG,
+                    subfields: { enriched_marc::Api::PHYS_LIBRARY_CODE => 'Libra',
+                                 enriched_marc::Api::PHYS_LOCATION_NAME => 'LIBRA',
+                                 enriched_marc::Api::PHYS_LOCATION_CODE => 'stor' })]
       end
 
       it 'returns expected values' do
@@ -84,23 +83,82 @@ describe 'PennMARC::Location' do
     end
 
     context 'with a specific location override' do
-      let(:record) do
-        marc_record(fields: [marc_field(tag: enriched_marc::Pub::ITEM_TAG,
-                                        subfields: { enriched_marc::Pub::ITEM_CURRENT_LOCATION => 'vanp',
-                                                     enriched_marc::Pub::ITEM_CALL_NUMBER => 'ML3534 .D85 1984' }),
-                             marc_field(tag: enriched_marc::Pub::ITEM_TAG,
-                                        subfields: { enriched_marc::Pub::ITEM_CURRENT_LOCATION => 'stor',
-                                                     enriched_marc::Pub::ITEM_CALL_NUMBER => 'L3534 .D85 1984' })])
+      context 'with item fields and LC call nums' do
+        let(:fields) do
+          [marc_field(tag: enriched_marc::Pub::ITEM_TAG,
+                      subfields: { enriched_marc::Pub::ITEM_CURRENT_LOCATION => 'vanp',
+                                   enriched_marc::Pub::ITEM_CALL_NUMBER_TYPE =>
+                                     PennMARC::Classification::LOC_CALL_NUMBER_TYPE,
+                                   enriched_marc::Pub::ITEM_CALL_NUMBER => 'ML3534 .D85 1984' }),
+           marc_field(tag: enriched_marc::Pub::ITEM_TAG,
+                      subfields: { enriched_marc::Pub::ITEM_CURRENT_LOCATION => 'stor',
+                                   enriched_marc::Pub::ITEM_CALL_NUMBER_TYPE => '8',
+                                   enriched_marc::Pub::ITEM_CALL_NUMBER => 'L3534 .D85 1984' })]
+        end
+
+        it 'returns expected values' do
+          expect(helper.location(record: record, display_value: :specific_location, location_map: mapping))
+            .to(contain_exactly(PennMARC::Mappers.location_overrides[:albrecht][:specific_location], 'LIBRA'))
+        end
+
+        it 'returns expected values when receiving a string for display_value' do
+          expect(helper.location(record: record, display_value: 'specific_location', location_map: mapping))
+            .to(contain_exactly(PennMARC::Mappers.location_overrides[:albrecht][:specific_location], 'LIBRA'))
+        end
       end
 
-      it 'returns expected values' do
-        expect(helper.location(record: record, display_value: :specific_location, location_map: mapping))
-          .to(contain_exactly(PennMARC::Mappers.location_overrides[:albrecht][:specific_location], 'LIBRA'))
+      context 'with item fields and microfilm call nums' do
+        let(:fields) do
+          [marc_field(tag: enriched_marc::Pub::ITEM_TAG, indicator1: ' ',
+                      subfields: { enriched_marc::Pub::ITEM_CURRENT_LOCATION => 'vanp',
+                                   enriched_marc::Pub::ITEM_CALL_NUMBER_TYPE => '8',
+                                   enriched_marc::Pub::ITEM_CALL_NUMBER => 'Microfilm 3140 item 8' })]
+        end
+
+        it 'returns expected values' do
+          expect(helper.location(record: record, display_value: :specific_location, location_map: mapping))
+            .to(contain_exactly(PennMARC::Mappers.location[:vanp][:specific_location]))
+        end
+      end
+
+      context 'with holding fields and both LC and non-LC call num type' do
+        let(:fields) do
+          [marc_field(indicator1: '8', tag: enriched_marc::Pub::PHYS_INVENTORY_TAG,
+                      subfields: { enriched_marc::Pub::PHYS_LOCATION_CODE => 'vanp' }),
+           marc_field(indicator1: '0', tag: enriched_marc::Pub::PHYS_INVENTORY_TAG,
+                      subfields: { enriched_marc::Pub::PHYS_LOCATION_CODE => 'vanp',
+                                   enriched_marc::Pub::HOLDING_CLASSIFICATION_PART => 'ML3534' })]
+        end
+
+        it 'returns expected values' do
+          expect(helper.location(record: record, display_value: :specific_location, location_map: mapping))
+            .to(contain_exactly(PennMARC::Mappers.location[:vanp][:specific_location],
+                                PennMARC::Mappers.location_overrides[:albrecht][:specific_location]))
+        end
       end
 
-      it 'returns expected values when receiving a string for display_value' do
-        expect(helper.location(record: record, display_value: 'specific_location', location_map: mapping))
-          .to(contain_exactly(PennMARC::Mappers.location_overrides[:albrecht][:specific_location], 'LIBRA'))
+      context 'with a variety of holding fields from the Alma API enrichment' do
+        let(:fields) do
+          [marc_field(tag: enriched_marc::Api::PHYS_INVENTORY_TAG,
+                      subfields: { enriched_marc::Api::PHYS_CALL_NUMBER => 'Locked Closet Floor',
+                                   enriched_marc::Api::PHYS_CALL_NUMBER_TYPE => '8' }),
+           marc_field(tag: enriched_marc::Api::PHYS_INVENTORY_TAG,
+                      subfields: { enriched_marc::Api::PHYS_LOCATION_CODE => 'vanp',
+                                   enriched_marc::Api::PHYS_CALL_NUMBER => ['ML123 .P567 1875', 'ML123'],
+                                   enriched_marc::Api::PHYS_CALL_NUMBER_TYPE =>
+                                     PennMARC::Classification::LOC_CALL_NUMBER_TYPE }),
+           marc_field(tag: enriched_marc::Api::PHYS_INVENTORY_TAG,
+                      subfields: { enriched_marc::Api::PHYS_LOCATION_CODE => 'vanp',
+                                   enriched_marc::Api::PHYS_CALL_NUMBER => 'P789 .D123 2012',
+                                   enriched_marc::Api::PHYS_CALL_NUMBER_TYPE =>
+                                     PennMARC::Classification::LOC_CALL_NUMBER_TYPE })]
+        end
+
+        it 'returns expected values' do
+          expect(helper.location(record: record, display_value: :specific_location, location_map: mapping))
+            .to(contain_exactly(PennMARC::Mappers.location[:vanp][:specific_location],
+                                PennMARC::Mappers.location_overrides[:albrecht][:specific_location]))
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pennmarc
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Mike Kanning
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-20 00:00:00.000000000 Z
+date: 2024-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport