pennmarc 1.0.20 → 1.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cec796509d9822289de751b33395fa6de1c1c23fdbdf78de54de11152674733
-  data.tar.gz: 9a2aa7d1ca7c7bd27627fac7f676492100eb36cb823469fd5b7e987244795cee
+  metadata.gz: d9222d0bfd9ca8704ec91ef01d1e27ce90711506b648f2d0006fc2270dd6d82d
+  data.tar.gz: c250833003d00f8d2b12a6c8e4043d9eadcdaaa33bba8ae70468e3210cdb1780
 SHA512:
-  metadata.gz: 2076675bbbc9bc38f3c36ba0932211ee4726d618de8d3781cae5d314576162b13bd256918910e534b638cd601a5f0e2db0936c7e8fd7fb58f1788ef1f28552d2
-  data.tar.gz: d963b043b08eff3567d904b18d938cddd3edc7a8d5238c720203cce52657cc86f6f20445e3d1c0de7221c628822990c87ea4cb0a2191b33b49992f8d6fa87ac9
+  metadata.gz: b9a1c42746b7d1448df78aad4528c1bf20731feeadc073e4937d0722bcfbed6ec42c104ae2d1241cf31830e6c7e50b0b6ab125140cf9d232511530a7b82861ef
+  data.tar.gz: c143ab4e9056f6a62a06a90d01938d70a6b7088704930e0dcf402c392954c08164a9821f39f35d03d07023393ca1d64844fa56d16522155ec55ca4a9a35fcf9b

data/lib/pennmarc/helpers/location.rb

@@ -47,7 +47,7 @@ module PennMARC
 
         locations = record.fields(tag).flat_map { |field|
           field.filter_map { |subfield|
-            # skip unless subfield code does not match enriched marc tag subfield code
+            # skip unless subfield matches enriched marc tag subfield code
             next unless subfield.code == location_code_sf
 
             location_code = subfield.value
@@ -57,11 +57,7 @@ module PennMARC
             override = specific_location_override(display_value: display_value, location_code: location_code,
                                                   field: field, call_num_sf: call_num_sf)
 
-            if override.present?
-              override
-            else
-              location_map[location_code.to_sym][display_value.to_sym]
-            end
+            override || location_map[location_code.to_sym][display_value.to_sym]
           }.flatten.compact_blank
         }.uniq
         if record.tags.intersect?([Enriched::Pub::ELEC_INVENTORY_TAG, Enriched::Api::ELEC_INVENTORY_TAG])
@@ -124,25 +120,23 @@ module PennMARC
 
       # Retrieves a specific location override based on location code and call number. Specific location overrides are
       # located in `location_overrides.yml`.
-      # @param [String] display_value
+      # @param [String | Symbol] display_value
       # @param [String] location_code
       # @param [MARC::Field] field
       # @param [String] call_num_sf
       # @return [String, Nil]
       def specific_location_override(display_value:, location_code:, field:, call_num_sf:)
-        return unless display_value == :specific_location
+        return unless display_value.to_sym == :specific_location
 
         locations_overrides = Mappers.location_overrides
 
         call_numbers = subfield_values(field, call_num_sf)
 
-        override = locations_overrides.select do |_key, value|
+        override = locations_overrides.find do |_key, value|
           value[:location_code] == location_code && call_numbers.any? { |num| num.match?(value[:call_num_pattern]) }
         end
 
-        return if override.blank?
-
-        override[override.keys.first][:specific_location]
+        override&.last&.dig(:specific_location)
       end
     end
   end

data/lib/pennmarc/helpers/title.rb

@@ -165,7 +165,7 @@ module PennMARC
           join_subfields(field, &subfield_not_in?(%w[5 6 8 e w]))
         end
         titles = standardized_titles + record.fields('880').filter_map do |field|
-          next unless subfield_undefined?(field, 'i') ||
+          next unless subfield_undefined?(field, 'i') &&
                       subfield_value?(field, '6', /^(130|240|730)/)
 
           join_subfields field, &subfield_not_in?(%w[5 6 8 e w])

data/lib/pennmarc/version.rb

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

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

@@ -110,21 +110,26 @@ describe 'PennMARC::Location' do
         )
       end
     end
-  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' })])
-    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' })])
+      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'))
+      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
   end
 end

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

@@ -203,7 +203,9 @@ describe 'PennMARC::Title' do
         marc_field(tag: '730', indicator2: '', subfields: { a: 'Yet Another Uniform Title' }),
         marc_field(tag: '730', indicator1: '0', indicator2: '2', subfields: { a: 'Not Printed Title' }),
         marc_field(tag: '730', indicator1: '', subfields: { i: 'Subfield i Title' }),
-        marc_field(tag: '880', subfields: { '6': '240', a: 'Translated Uniform Title' })
+        marc_field(tag: '880', subfields: { '6': '240', a: 'Translated Uniform Title' }),
+        marc_field(tag: '880', subfields: { '6': '730', a: 'Alt Ignore', i: 'Alt Subfield i' }),
+        marc_field(tag: '880', subfields: { '6': '100', a: 'Alt Ignore' })
       ]
     end
 
@@ -212,7 +214,7 @@ describe 'PennMARC::Title' do
       expect(values).to contain_exactly(
         'Another Uniform Title', 'Translated Uniform Title', 'Uniform Title 2000', 'Yet Another Uniform Title'
       )
-      expect(values).not_to include 'Not Printed Title', 'Subfield i Title'
+      expect(values).not_to include 'Not Printed Title', 'Subfield i Title', 'Alt Ignore'
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pennmarc
 version: !ruby/object:Gem::Version
-  version: 1.0.20
+  version: 1.0.22
 platform: ruby
 authors:
 - Mike Kanning
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-22 00:00:00.000000000 Z
+date: 2024-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport