pennmarc 1.0.2 → 1.0.4

data/lib/pennmarc/version.rb

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

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

@@ -27,6 +27,22 @@ describe 'PennMARC::Date' do
   end
 
   describe '.added' do
+    context 'with a robust itm tag' do
+      let(:fields) do
+        [marc_field(tag: 'itm', subfields: { g: 'VanPeltLib', i: 'Tw .156', q: '2023-10-19' })]
+      end
+
+      it 'returns only the expected date_added value' do
+        expect(helper.added(record)).to eq DateTime.strptime('2023-10-19', '%Y-%m-%d')
+      end
+
+      it 'does not output any warning to STDOUT' do
+        expect {
+          helper.added(record)
+        }.to_not output(a_string_including('Error parsing date in date added subfield')).to_stdout
+      end
+    end
+
     context "with date formatted '%Y-%m-%d'" do
       let(:fields) { [marc_field(tag: 'itm', subfields: { q: '2023-06-28' })] }
 

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

@@ -17,13 +17,15 @@ describe 'PennMARC::Identifier' do
     let(:record) do
       marc_record fields: [
         marc_field(tag: '020', subfields: { a: '9781594205071', z: '1555975275' }),
-        marc_field(tag: '022', subfields: { a: '0008-6533', l: '0300-7162', z: '0799-5946 ' })
+        marc_field(tag: '022',
+                   subfields: { a: '0008-6533', l: '0300-7162', m: 'cancelled', y: 'incorrect', z: '0799-5946' })
       ]
     end
 
     it 'returns expected search values' do
       expect(helper.isxn_search(record)).to contain_exactly('9781594205071', '1555975275', '9781555975272',
-                                                            '1594205078', '0300-7162', '0008-6533', '0799-5946 ')
+                                                            '1594205078', '0300-7162', '0008-6533', '0799-5946',
+                                                            'cancelled', 'incorrect')
     end
 
     it 'converts ISBN10 values to ISBN13' do
@@ -62,7 +64,7 @@ describe 'PennMARC::Identifier' do
     end
   end
 
-  describe '.oclc_id' do
+  describe '.oclc_id_show' do
     let(:record) do
       marc_record fields: [
         marc_field(tag: '035', subfields: { a: '(PU)4422776-penndb-Voyager' }),
@@ -72,7 +74,21 @@ describe 'PennMARC::Identifier' do
     end
 
     it 'returns expected show values' do
-      expect(helper.oclc_id(record)).to contain_exactly('610094484')
+      expect(helper.oclc_id_show(record)).to eq '610094484'
+    end
+  end
+
+  describe '.oclc_id_search' do
+    let(:record) do
+      marc_record fields: [
+        marc_field(tag: '035', subfields: { a: '(PU)4422776-penndb-Voyager' }),
+        marc_field(tag: '035', subfields: { z: '(OCoLC)ocn610094484' }),
+        marc_field(tag: '035', subfields: { a: '(OCoLC)ocn1483169584' })
+      ]
+    end
+
+    it 'returns expected search values' do
+      expect(helper.oclc_id_search(record)).to contain_exactly('610094484', '1483169584')
     end
   end
 
@@ -146,4 +162,4 @@ describe 'PennMARC::Identifier' do
                                                          '10.1038/sdata.2016.18', '10.18574/9781479842865')
     end
   end
-end
+end

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

@@ -4,27 +4,75 @@ describe 'PennMARC::Language' do
   include MarcSpecHelpers
 
   let(:helper) { PennMARC::Language }
-  let(:mapping) do
-    { eng: 'English', und: 'Undetermined' }
+  let(:iso_639_2_mapping) do
+    { eng: 'English', und: 'Undetermined', fre: 'French', ger: 'German', ulw: 'Ulwa' }
+  end
+  let(:iso_639_3_mapping) do
+    { eng: 'American', und: 'Undetermined', fre: 'Francais', ger: 'Deutsch', twf: 'Northern Tiwa' }
   end
   let(:record) do
     marc_record fields: [
       marc_control_field(tag: '008', value: '                                   eng'),
+      marc_field(tag: '041', subfields: { '2': 'iso639-2', a: 'eng', b: 'fre', d: 'ger' }),
       marc_field(tag: '546', subfields: { a: 'Great', c: 'Content', '6': 'Not Included' }),
       marc_field(tag: '546', subfields: { b: 'More!', '8': 'Not Included' }),
       marc_field(tag: '880', subfields: { c: 'Mas!', '6': '546', '8': 'Not Included' })
     ]
   end
 
-  describe '.search' do
-    it 'returns the expected display value' do
-      expect(helper.search(record, language_map: mapping)).to eq 'English'
-    end
-  end
-
   describe '.show' do
     it 'returns the expected show values' do
       expect(helper.show(record)).to contain_exactly 'Great Content', 'More!', 'Mas!'
     end
   end
+
+  describe '.search' do
+    context 'when using iso 639-2 spec' do
+      it 'returns the expected display values from iso639-2' do
+        expect(helper.values(record,
+                             iso_639_2_mapping: iso_639_2_mapping,
+                             iso_639_3_mapping: iso_639_3_mapping)).to contain_exactly('English', 'French', 'German')
+      end
+    end
+
+    context 'when using iso639-3 spec' do
+      let(:record) do
+        marc_record fields: [marc_field(tag: '041', subfields: { '2': 'iso639-3', a: 'eng', b: 'fre', d: 'ger' }),
+                             marc_field(tag: '041', subfields: { '2': 'iso639-3', a: 'twf' })]
+      end
+
+      it 'returns the expected display values from iso639-3' do
+        expect(helper.values(record,
+                             iso_639_2_mapping: iso_639_2_mapping,
+                             iso_639_3_mapping: iso_639_3_mapping)).to contain_exactly('American', 'Francais',
+                                                                                       'Deutsch', 'Northern Tiwa')
+      end
+    end
+
+    context 'when using multiple specs' do
+      let(:record) do
+        marc_record fields: [marc_field(tag: '041', subfields: { '2': 'iso639-3', a: 'eng', b: 'fre', d: 'ger' }),
+                             marc_field(tag: '041', subfields: { '2': 'iso639-2', a: 'ulw' })]
+      end
+
+      it 'returns the expected display values from iso639-3' do
+        expect(helper.values(record,
+                             iso_639_2_mapping: iso_639_2_mapping,
+                             iso_639_3_mapping: iso_639_3_mapping)).to contain_exactly('American', 'Francais',
+                                                                                       'Deutsch', 'Ulwa')
+      end
+    end
+
+    context 'with an empty record' do
+      let(:record) do
+        marc_record fields: [marc_field(tag: '041', subfields: { c: 'test' })]
+      end
+
+      it 'returns undetermined when there are no values' do
+        expect(helper.values(record,
+                             iso_639_2_mapping: iso_639_2_mapping,
+                             iso_639_3_mapping: iso_639_3_mapping)).to contain_exactly('Undetermined')
+      end
+    end
+  end
 end

data/spec/lib/pennmarc/parser_spec.rb

@@ -8,12 +8,12 @@ describe PennMARC::Parser do
   let(:record) { record_from 'test.xml' }
 
   it 'delegates to helper modules properly' do
-    expect(parser.language_search(record)).to eq 'English'
+    expect(parser.language_values(record)).to contain_exactly 'English'
   end
 
   it 'delegates to helper modules properly with extra params' do
     bogus_map = { eng: 'American' }
-    expect(parser.language_search(record, language_map: bogus_map)).to eq 'American'
+    expect(parser.language_values(record, iso_639_2_mapping: bogus_map)).to contain_exactly 'American'
   end
 
   it 'raises an exception if the method call is invalid' do
@@ -23,7 +23,7 @@ describe PennMARC::Parser do
 
   describe '#respond_to?' do
     it 'returns true if a helper has the expected method' do
-      expect(parser).to respond_to :language_search
+      expect(parser).to respond_to :language_values
     end
 
     it 'returns false if a helper does not have the expected method' do

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: pennmarc
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Mike Kanning
 - Amrey Mathurin
 - Patrick Perkins
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-06 00:00:00.000000000 Z
+date: 2023-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -77,6 +77,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitleaks.toml"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
@@ -107,7 +108,8 @@ files:
 - lib/pennmarc/helpers/subject.rb
 - lib/pennmarc/helpers/title.rb
 - lib/pennmarc/mappers.rb
-- lib/pennmarc/mappings/language.yml
+- lib/pennmarc/mappings/iso639-2-languages.yml
+- lib/pennmarc/mappings/iso639-3-languages.yml
 - lib/pennmarc/mappings/locations.yml
 - lib/pennmarc/mappings/relator.yml
 - lib/pennmarc/parser.rb
@@ -140,7 +142,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -156,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.10
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Penn Libraries Catalog MARC parsing wisdom for cross-project usage
 test_files: []