pennmarc 1.0.3 → 1.0.5

data/lib/pennmarc/util.rb

@@ -5,6 +5,14 @@ require_relative 'heading_control'
 module PennMARC
   # class to hold "utility" methods used in MARC parsing methods
   module Util
+    # Check if a given record has a field present by tag (e.g., '041')
+    # @param [MARC::Record] record
+    # @param [String] marc_field
+    # @return [Boolean]
+    def field_defined?(record, marc_field)
+      record.select { |field| field.tag == marc_field }.any?
+    end
+
     # Join subfields from a field selected based on a provided proc
     # @param [MARC::DataField] field
     # @param [Proc] selector

data/lib/pennmarc/version.rb

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

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

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+describe 'PennMARC::Access' do
+  include MarcSpecHelpers
+
+  let(:helper) { PennMARC::Access }
+
+  describe '.facet' do
+    context 'with an electronic record' do
+      let(:record) do
+        marc_record fields: [marc_field(tag: 'prt')]
+      end
+
+      it 'returns expected access value' do
+        expect(helper.facet(record)).to contain_exactly(PennMARC::Access::ONLINE)
+      end
+    end
+
+    context 'with a print record' do
+      let(:record) do
+        marc_record fields: [marc_field(tag: 'hld')]
+      end
+
+      it 'returns expected access value' do
+        expect(helper.facet(record)).to contain_exactly(PennMARC::Access::AT_THE_LIBRARY)
+      end
+    end
+
+    context 'with a record containing a link to a finding aid (as a handle link)' do
+      let(:record) do
+        marc_record fields: [marc_field(tag: 'hld'),
+                             marc_field(tag: '856', subfields: location_and_access_subfields, **indicators)]
+      end
+
+      context 'with an 856 describing a related record, not the record itself' do
+        let(:indicators) { { indicator1: '4', indicator2: '2' } }
+        let(:location_and_access_subfields) do
+          { z: 'Finding Aid', u: 'http://hdl.library.upenn.edu/1017/d/pacscl/UPENN_RBML_MsColl200' }
+        end
+
+        it 'does not include online access' do
+          expect(helper.facet(record)).not_to include PennMARC::Access::ONLINE
+        end
+      end
+
+      context 'with an 865 describing a link to a finding aid' do
+        let(:indicators) { { indicator1: '4', indicator2: '1' } }
+        let(:location_and_access_subfields) do
+          { z: 'Finding aid', u: 'http://hdl.library.upenn.edu/1017/d/pacscl/UPENN_RBML_MsColl200' }
+        end
+
+        it 'includes online access' do
+          expect(helper.facet(record)).to contain_exactly(PennMARC::Access::ONLINE, PennMARC::Access::AT_THE_LIBRARY)
+        end
+      end
+    end
+  end
+end

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

@@ -17,9 +17,11 @@ describe 'PennMARC::Creator' do
       end
 
       it 'contains the expected search field values for a single author work' do
-        expect(helper.search(record, relator_map: mapping)).to eq ['Name Surname http://cool.uri/12345 author 1900-2000.',
-                                                                   'Surname, Name http://cool.uri/12345 author 1900-2000.',
-                                                                   'Alternative Surname']
+        expect(helper.search(record, relator_map: mapping)).to eq [
+          'Name Surname http://cool.uri/12345 author 1900-2000.',
+          'Surname, Name http://cool.uri/12345 author 1900-2000.',
+          'Alternative Surname'
+        ]
       end
     end
 
@@ -58,7 +60,9 @@ describe 'PennMARC::Creator' do
       end
 
       it 'returns values for the corporate author, including mapped relator code from ǂ4' do
-        expect(helper.values(record, relator_map: mapping)).to contain_exactly 'Annual Report Leader author, Author.'
+        expect(helper.values(record, relator_map: mapping)).to contain_exactly(
+          'Annual Report Leader author, Author.'
+        )
       end
     end
   end
@@ -146,7 +150,8 @@ describe 'PennMARC::Creator' do
       end
 
       it 'includes corporate author and creator values from allowed subfields' do
-        expect(values).to contain_exactly 'Conference on Things Earth', 'Series of Things Earth', 'Thing Institute'
+        expect(values).to contain_exactly 'Conference on Things Earth', 'Series of Things Earth',
+                                          'Thing Institute'
       end
     end
   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)
+        }.not_to 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

@@ -113,7 +113,6 @@ describe 'PennMARC::Identifier' do
     it 'does not return DOI values' do
       expect(helper.publisher_number_show(record)).not_to include('10.18574/9781479842865')
       expect(helper.publisher_number_show(record)).not_to include('doi')
-
     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/helpers/series_spec.rb

@@ -19,9 +19,11 @@ describe 'PennMARC::Series' do
 
   describe '.show' do
     it 'returns the series' do
-      expect(helper.show(record, relator_map: mapping)).to contain_exactly('Bean Bagatolvski 1997- bk. 1',
-                                                              'Teachings of the feathered pillow',
-                                                              'Учения пернатой подушки', 'Evil Giant Megacorp')
+      expect(helper.show(record, relator_map: mapping)).to contain_exactly(
+        'Bean Bagatolvski 1997- bk. 1',
+        'Teachings of the feathered pillow',
+        'Учения пернатой подушки', 'Evil Giant Megacorp'
+      )
     end
   end
 

data/spec/lib/pennmarc/marc_util_spec.rb

@@ -7,6 +7,18 @@ describe 'PennMARC::Util' do
     Class.new { extend PennMARC::Util }
   end
 
+  describe '.field_defined?' do
+    let(:record) { marc_record fields: [marc_field(tag: '100')] }
+
+    it 'returns true if the field is present in the record' do
+      expect(util.field_defined?(record, '100')).to be true
+    end
+
+    it 'returns false if the field is not present in the record' do
+      expect(util.field_defined?(record, '101')).to be false
+    end
+  end
+
   describe '.join_subfields' do
     let(:field) { marc_field subfields: { a: 'bad', '1': 'join', '3': '', '9': 'subfields' } }
 

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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pennmarc
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.5
 platform: ruby
 authors:
 - Mike Kanning
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-12 00:00:00.000000000 Z
+date: 2023-11-09 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"
@@ -88,6 +89,7 @@ files:
 - lib/pennmarc/encoding_level.rb
 - lib/pennmarc/enriched_marc.rb
 - lib/pennmarc/heading_control.rb
+- lib/pennmarc/helpers/access.rb
 - lib/pennmarc/helpers/citation.rb
 - lib/pennmarc/helpers/creator.rb
 - lib/pennmarc/helpers/database.rb
@@ -107,7 +109,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
@@ -115,6 +118,7 @@ files:
 - lib/pennmarc/version.rb
 - pennmarc.gemspec
 - spec/fixtures/marcxml/test.xml
+- spec/lib/pennmarc/helpers/access_spec.rb
 - spec/lib/pennmarc/helpers/citation_spec.rb
 - spec/lib/pennmarc/helpers/creator_spec.rb
 - spec/lib/pennmarc/helpers/database_spec.rb