pennmarc 1.0.21 → 1.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec3fde9cb69168e9d4f3221df750bc9b6345409a2e413e0b7117f66f7e1be843
-  data.tar.gz: 32cb166f43c18235282e10927c9589e9b62b4889c247adf4628a8459a5c4e47c
+  metadata.gz: 7c906223a9bcdb4ba4792ac50462b8c57e41e71fa1e83cd8e63018d360ebfe0a
+  data.tar.gz: 5d1a420e07734370c95ab1f83d3c519a1d75a7faaa807f1d3ee436808779c586
 SHA512:
-  metadata.gz: 3e114ad5839e035a3297f45548a4dccad0bd3b752b01126612307c0cb08d30cf2d2da7a752f6049a48014e9145c7fdb882294a936b998f5d6c644154609ec21d
-  data.tar.gz: 3d2874d2d62231efb4d887ae14fc69ccdc7bd3ca3d4fa929a56c6a7b39b121f10cfc34cb1222e80fdbcac38395b9279d3c05b130c166fe011f93ff7b4a0fea74
+  metadata.gz: 32e47c254c1a2bb78e861003c864bdbc22833439cff22ebe00148df081c74fed85f60e2f743b5ea65065e5db576e3a304710b1a68b2cdc1e08a1a5f7808e5fc3
+  data.tar.gz: 6051840a95afdcb41640abf2c42ce699deddc93970c5d117cb445474d4f5998996ee05651ec1e59da3e45886e00f6c058b881b1bf9103de92deb5cf6d868ce80

data/lib/pennmarc/helpers/date.rb

@@ -8,14 +8,14 @@ module PennMARC
       # Publication date is a four-digit year found in position 7-10 and may contain 'u' characters to represent
       # partially known dates. We replace any occurrences of 'u' with '0' before converting to DateTime object.
       # @param [MARC::Record] record
-      # @return [DateTime, nil] The publication date, or nil if date found in record is invalid
+      # @return [Time, nil] The publication date, or nil if date found in record is invalid
       def publication(record)
         record.fields('008').filter_map { |field|
           four_digit_year = sanitize_partially_known_date(field.value[7, 4], '0')
 
           next if four_digit_year.blank?
 
-          DateTime.new(four_digit_year.to_i)
+          Time.new(four_digit_year.to_i)
         }.first
       end
 
@@ -23,7 +23,7 @@ module PennMARC
       # {PennMARC::Enriched} maps enriched marc fields and subfields created during Alma publishing. The enriched
       # metadata provided by the Alma API does not include the date created value, so we can't work with that here.
       # @param [MARC::Record] record
-      # @return [DateTime, nil] The date added, or nil if date found in record is invalid
+      # @return [Time, nil] The date added, or nil if date found in record is invalid
       def added(record)
         record.fields(Enriched::Pub::ITEM_TAG).flat_map { |field|
           subfield_values(field, Enriched::Pub::ITEM_DATE_CREATED).filter_map do |date_added|
@@ -34,9 +34,10 @@ module PennMARC
 
             format = date_added.size == 10 ? '%Y-%m-%d' : '%Y-%m-%d %H:%M:%S'
 
-            DateTime.strptime(date_added, format)
+            Time.strptime(date_added, format)
           rescue StandardError => e
-            puts "Error parsing date in date added subfield: #{date_added} - #{e}"
+            puts 'Error parsing date in date added subfield. ' \
+                 "mmsid: #{Identifier.mmsid(record)}, value: #{date_added}, error: #{e}"
             nil
           end
         }.max
@@ -46,7 +47,7 @@ module PennMARC
       # Date last updated is a sixteen character String recorded in
       # {https://www.iso.org/iso-8601-date-and-time-format.html ISO 8601} format.
       # @param [MARC::Record] record
-      # @return [DateTime, nil] The date last updated, or nil if date found in record is invalid
+      # @return [Time, nil] The date last updated, or nil if date found in record is invalid
       def last_updated(record)
         record.fields('005').filter_map { |field|
           begin
@@ -56,9 +57,10 @@ module PennMARC
 
             next if date_time_string.start_with?('0000')
 
-            DateTime.iso8601(date_time_string).to_datetime
-          rescue ArgumentError => e
-            puts "Error parsing last updated date: #{date_time_string} - #{e}"
+            Time.strptime(date_time_string, '%Y%m%d%H%M%S.%N')
+          rescue StandardError => e
+            puts 'Error parsing last updated date. ' \
+                 "mmsid: #{Identifier.mmsid(record)}, value: #{date_time_string}, error: #{e}"
             nil
           end
         }.first

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/version.rb

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

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

@@ -10,7 +10,7 @@ describe 'PennMARC::Date' do
     let(:fields) { [marc_control_field(tag: '008', value: '130827s2010 nyu o 000 1 eng d')] }
 
     it 'returns publication date' do
-      expect(helper.publication(record)).to eq(DateTime.new(2010))
+      expect(helper.publication(record)).to eq(Time.new(2010))
     end
 
     it 'returns a year value' do
@@ -33,7 +33,7 @@ describe 'PennMARC::Date' do
       end
 
       it 'returns only the expected date_added value' do
-        expect(helper.added(record)).to eq DateTime.strptime('2023-10-19', '%Y-%m-%d')
+        expect(helper.added(record)).to eq Time.strptime('2023-10-19', '%Y-%m-%d')
       end
 
       it 'does not output any warning to STDOUT' do
@@ -47,7 +47,7 @@ describe 'PennMARC::Date' do
       let(:fields) { [marc_field(tag: 'itm', subfields: { q: '2023-06-28' })] }
 
       it 'returns expected value' do
-        expect(helper.added(record)).to eq(DateTime.strptime('2023-06-28', '%Y-%m-%d'))
+        expect(helper.added(record)).to eq(Time.strptime('2023-06-28', '%Y-%m-%d'))
       end
 
       it 'returns a year value' do
@@ -59,7 +59,7 @@ describe 'PennMARC::Date' do
       let(:fields) { [marc_field(tag: 'itm', subfields: { q: '2023-06-29 11:04:30:10' })] }
 
       it 'returns expected value' do
-        expect(helper.added(record)).to eq(DateTime.strptime('2023-06-29 11:04:30:10', '%Y-%m-%d %H:%M:%S'))
+        expect(helper.added(record)).to eq(Time.strptime('2023-06-29 11:04:30:10', '%Y-%m-%d %H:%M:%S'))
       end
 
       it 'returns a year value' do
@@ -74,12 +74,15 @@ describe 'PennMARC::Date' do
       end
 
       it 'returns most recent date' do
-        expect(helper.added(record)).to eq(DateTime.strptime('2023-06-29', '%Y-%m-%d'))
+        expect(helper.added(record)).to eq(Time.strptime('2023-06-29', '%Y-%m-%d'))
       end
     end
 
     context 'with invalid date' do
-      let(:fields) { [marc_field(tag: 'itm', subfields: { q: 'invalid date' })] }
+      let(:fields) do
+        [marc_control_field(tag: '001', value: 'mmsid'),
+         marc_field(tag: 'itm', subfields: { q: 'invalid date' })]
+      end
 
       it 'returns nil' do
         expect(helper.added(record)).to be_nil
@@ -88,7 +91,8 @@ describe 'PennMARC::Date' do
       it 'outputs error message' do
         expect {
           helper.added(record)
-        }.to output("Error parsing date in date added subfield: invalid date - invalid date\n").to_stdout
+        }.to output('Error parsing date in date added subfield. mmsid: mmsid, value: invalid date, ' \
+                    "error: invalid date or strptime format - `invalid date' `%Y-%m-%d %H:%M:%S'\n").to_stdout
       end
     end
   end
@@ -97,7 +101,7 @@ describe 'PennMARC::Date' do
     let(:fields) { [marc_field(tag: '005', subfields: { q: '20230213163851.1' })] }
 
     it 'returns date last updated' do
-      expect(helper.last_updated(record)).to eq(DateTime.iso8601('20230213163851.1').to_datetime)
+      expect(helper.last_updated(record)).to eq(Time.strptime('20230213163851.1', '%Y%m%d%H%M%S.%N'))
     end
 
     it 'returns year value' do
@@ -105,7 +109,10 @@ describe 'PennMARC::Date' do
     end
 
     context 'with invalid date' do
-      let(:fields) { [marc_field(tag: '005', subfields: { q: 'invalid date' })] }
+      let(:fields) do
+        [marc_control_field(tag: '001', value: 'mmsid'),
+         marc_field(tag: '005', subfields: { q: 'invalid date' })]
+      end
 
       it 'returns nil' do
         expect(helper.last_updated(record)).to be_nil
@@ -114,7 +121,8 @@ describe 'PennMARC::Date' do
       it 'outputs error message' do
         expect {
           helper.last_updated(record)
-        }.to output("Error parsing last updated date: invalid date - invalid date\n").to_stdout
+        }.to output('Error parsing last updated date. mmsid: mmsid, value: invalid date, ' \
+                    "error: invalid date or strptime format - `invalid date' `%Y%m%d%H%M%S.%N'\n").to_stdout
       end
     end
   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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pennmarc
 version: !ruby/object:Gem::Version
-  version: 1.0.21
+  version: 1.0.23
 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-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport