pennmarc 1.0.25 → 1.0.26

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

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 describe 'PennMARC::Classification' do
-  include MarcSpecHelpers
-
   let(:helper) { PennMARC::Classification }
   let(:record) do
     marc_record fields: [marc_field(tag: tag,

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

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 describe 'PennMARC::Creator' do
-  include MarcSpecHelpers
-
   let(:helper) { PennMARC::Creator }
   let(:mapping) { { aut: 'Author' } }
 
@@ -95,6 +93,91 @@ describe 'PennMARC::Creator' do
     end
   end
 
+  describe '.authors_list' do
+    let(:record) { marc_record fields: fields }
+
+    context 'with two author records' do
+      let(:fields) do
+        [marc_field(tag: '100', subfields: { a: 'Surname, Name', '0': 'http://cool.uri/12345', d: '1900-2000',
+                                             e: 'author.', '4': 'http://cool.uri/vocabulary/relators/aut' }),
+         marc_field(tag: '700', subfields: { a: 'Surname, Alternative', '6': '100', d: '1970-' })]
+      end
+
+      it 'returns single author values with no URIs anywhere' do
+        values = helper.authors_list(record)
+        expect(values).to contain_exactly 'Surname, Name', 'Surname, Alternative'
+      end
+    end
+
+    context 'with three author records - abbreviated names' do
+      let(:fields) do
+        [marc_field(tag: '100', subfields: { a: 'Surname, Alex', '0': 'http://cool.uri/12345', d: '1900-2000',
+                                             e: 'author.', '4': 'http://cool.uri/vocabulary/relators/aut' }),
+         marc_field(tag: '110', subfields: { a: 'Second, NameX', '0': 'http://cool.uri/12345', d: '1901-2010',
+                                             e: 'author.', '4': 'http://cool.uri/vocabulary/relators/aut' }),
+         marc_field(tag: '700', subfields: { a: 'Alt, Alternative', '6': '100', d: '1970-' })]
+      end
+
+      it 'returns single author values with no URIs anywhere' do
+        values = helper.authors_list(record, first_initial_only: true)
+        expect(values).to contain_exactly 'Surname, A.', 'Second, N.', 'Alt, A.'
+      end
+    end
+  end
+
+  describe '.contributors_list' do
+    let(:record) { marc_record fields: fields }
+
+    context 'with two authors and four contributors records, names only' do
+      let(:fields) do
+        [marc_field(tag: '100', subfields: { a: 'Hamilton, Alex', '0': 'http://cool.uri/12345', d: '1900-2000',
+                                             e: 'author.' }),
+         marc_field(tag: '100', subfields: { a: 'Lincoln, Abraham', b: 'I', c: 'laureate', d: '1968', e: 'author',
+                                             j: 'pseud', q: 'Fuller Name', u: 'affiliation', '3': 'materials',
+                                             '4': 'aut' }),
+         marc_field(tag: '700', subfields: { a: 'Einstein, Albert', '6': '100', d: '1970-', '4': 'trl',
+                                             e: 'translator' }),
+         marc_field(tag: '700', subfields: { a: 'Franklin, Ben', '6': '100', d: '1970-', '4': 'edt' }),
+         marc_field(tag: '710', subfields: { a: 'Jefferson, Thomas', '6': '100', d: '1870-', '4': 'edt' }),
+         marc_field(tag: '700', subfields: { a: 'Dickens, Charles', '6': '100', d: '1970-', '4': 'com' })]
+      end
+
+      it 'returns two authors and four contributors' do
+        values = helper.contributors_list(record)
+        expect(values).to contain_exactly ['Author', ['Hamilton, Alex', 'Lincoln, Abraham']],
+                                          ['Compiler', ['Dickens, Charles']],
+                                          ['Editor', ['Franklin, Ben', 'Jefferson, Thomas']],
+                                          ['Translator', ['Einstein, Albert']]
+      end
+    end
+
+    context 'with two authors and four contributors records, with full information and relator' do
+      let(:fields) do
+        [marc_field(tag: '100', subfields: { a: 'Hamilton, Alex', '0': 'http://cool.uri/12345', d: '1900-2000',
+                                             e: 'author.', '4': 'aut' }),
+         marc_field(tag: '100', subfields: { a: 'Lincoln, Abraham', b: 'I', c: 'laureate', d: '1968', e: 'author',
+                                             j: 'pseud', q: 'Fuller Name', u: 'affiliation', '3': 'materials',
+                                             '4': 'aut' }),
+         marc_field(tag: '700', subfields: { a: 'Einstein, Albert', '6': '100', d: '1970-', '4': 'trl',
+                                             e: 'translator' }),
+         marc_field(tag: '700', subfields: { a: 'Franklin, Ben', '6': '100', d: '1970-', '4': 'edt' }),
+         marc_field(tag: '710', subfields: { a: 'Jefferson, Thomas', '6': '100', d: '1870-', '4': 'edt' }),
+         marc_field(tag: '700', subfields: { a: 'Dickens, Charles', '6': '100', d: '1970-', '4': 'com' }),
+         marc_field(tag: '880', subfields: { a: '狄更斯', '6': '700', d: '1970-', '4': 'com' }),
+         marc_field(tag: '700', subfields: { a: 'Twain, Mark', '6': '100', d: '1870-' })]
+      end
+
+      it 'returns four contributors' do
+        values = helper.contributors_list(record, include_authors: false, name_only: false, vernacular: true)
+        expect(values).to contain_exactly ['Compiler', ['Dickens, Charles 1970-, Compiler', '狄更斯 1970-, Compiler']],
+                                          ['Contributor', ['Twain, Mark 1870-, Contributor']],
+                                          ['Editor',
+                                           ['Franklin, Ben 1970-, Editor', 'Jefferson, Thomas 1870-, Editor']],
+                                          ['Translator', ['Einstein, Albert 1970-, Translator']]
+      end
+    end
+  end
+
   describe '.show_facet_map' do
     let(:record) do
       marc_record fields: [
@@ -302,6 +385,24 @@ describe 'PennMARC::Creator' do
     end
   end
 
+  describe '.corporate_search' do
+    let(:record) do
+      marc_record fields: [
+        marc_field(tag: '110', subfields: { a: 'Penn Libraries', b: 'Digital Library Development' }),
+        marc_field(tag: '710', subfields: { a: 'Working Group on Digital Repository Infrastructure' }),
+        marc_field(tag: '810', subfields: { a: 'Constellation of Repositories Strategic Team' })
+      ]
+    end
+
+    it 'returns expected values' do
+      expect(helper.corporate_search(record)).to contain_exactly(
+        'Constellation of Repositories Strategic Team',
+        'Penn Libraries Digital Library Development',
+        'Working Group on Digital Repository Infrastructure'
+      )
+    end
+  end
+
   describe '.contributor_show' do
     let(:record) { marc_record fields: fields }
 

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

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 describe 'PennMARC::Database' do
-  include MarcSpecHelpers
-
   let(:helper) { PennMARC::Database }
   let(:record) do
     marc_record(fields: [

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

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 describe 'PennMARC::Date' do
-  include MarcSpecHelpers
-
   let(:helper) { PennMARC::Date }
   let(:record) { marc_record fields: fields }
 

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

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 describe 'PennMARC::Edition' do
-  include MarcSpecHelpers
-
   let(:helper) { PennMARC::Edition }
   let(:mapping) { { aut: 'Author' } }
   let(:record) do
@@ -18,6 +16,10 @@ describe 'PennMARC::Edition' do
     it 'returns the editions' do
       expect(helper.show(record)).to contain_exactly('5th Edition Remastered', 'رمستر')
     end
+
+    it 'returns the editions without alternate' do
+      expect(helper.show(record, with_alternate: false)).to contain_exactly('5th Edition Remastered')
+    end
   end
 
   describe '.values' do

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

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 describe 'PennMARC::Format' do
-  include MarcSpecHelpers
-
   let(:helper) { PennMARC::Format }
 
   describe '.facet' do

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

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 describe 'PennMARC::Genre' do
-  include MarcSpecHelpers
-
   let(:helper) { PennMARC::Genre }
   let(:record) { marc_record fields: fields }
 

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

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 describe 'PennMARC::Identifier' do
-  include MarcSpecHelpers
-
   let(:helper) { PennMARC::Identifier }
 
   describe '.mmsid' do

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

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 describe 'PennMARC::Inventory' do
-  include MarcSpecHelpers
-
   let(:helper) { PennMARC::Inventory }
   let(:record) do
     marc_record fields: fields

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

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 describe 'PennMARC::Language' do
-  include MarcSpecHelpers
-
   let(:helper) { PennMARC::Language }
   let(:iso_639_2_mapping) do
     { eng: 'English', und: 'Undetermined', fre: 'French', ger: 'German', ulw: 'Ulwa' }

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

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 describe 'PennMARC::Link' do
-  include MarcSpecHelpers
-
   let(:helper) { PennMARC::Link }
 
   describe '.full_text_link' do

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

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 describe 'PennMARC::Location' do
-  include MarcSpecHelpers
-
   let(:helper) { PennMARC::Location }
   let(:enriched_marc) { PennMARC::Enriched }
   let(:mapping) { location_map }

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

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
 describe 'PennMARC::Note' do
-  include MarcSpecHelpers
-
   let(:helper) { PennMARC::Note }
+  let(:record) { marc_record(fields: fields) }
 
   describe '.notes_show' do
-    let(:record) { marc_record(fields: fields) }
     let(:fields) do
       [
         marc_field(tag: '500',
@@ -39,7 +37,6 @@ describe 'PennMARC::Note' do
   end
 
   describe '.local_notes_show' do
-    let(:record) { marc_record(fields: fields) }
     let(:fields) do
       [
         marc_field(tag: '561', subfields: { a: 'Athenaeum copy: ', u: 'No URI' }),
@@ -76,7 +73,6 @@ describe 'PennMARC::Note' do
   end
 
   describe '.provenance_show' do
-    let(:record) { marc_record(fields: fields) }
     let(:fields) do
       [
         marc_field(tag: '561', subfields: { a: 'Not Athenaeum copy: ', u: 'No URI' }, indicator1: '1', indicator2: ' '),
@@ -99,29 +95,35 @@ describe 'PennMARC::Note' do
     end
   end
 
-  describe '.contents_show' do
-    let(:record) { marc_record(fields: fields) }
+  describe '.contents_values' do
     let(:fields) do
-      [
-        marc_field(tag: '505', subfields: { a: 'Formatted content notes', g: 'Misc Info', r: 'Responsible Agent',
-                                            t: 'A Title', u: 'URI' }),
-        marc_field(tag: '880', subfields: { a: 'Alt Formatted content notes', g: ' Alt Misc Info',
-                                            r: 'Alt Responsible Agent', t: 'Alt Title', u: 'Alt URI', '6': '505' })
-      ]
+      [marc_field(tag: '505', subfields: { a: 'Formatted content notes', g: 'Misc Info', r: 'Responsible Agent',
+                                           t: 'A Title', u: 'URI' }),
+       marc_field(tag: '880', subfields: { a: 'Alt Formatted content notes', g: ' Alt Misc Info',
+                                           r: 'Alt Responsible Agent', t: 'Alt Title', u: 'Alt URI', '6': '505' })]
     end
 
-    let(:values) { helper.contents_show(record) }
+    context 'with vernacular included' do
+      let(:values) { helper.contents_values(record) }
 
-    it 'returns expected values from 505 and its linked alternate' do
-      expect(values).to contain_exactly(
-        'Formatted content notes Misc Info Responsible Agent A Title URI',
-        'Alt Formatted content notes Alt Misc Info Alt Responsible Agent Alt Title Alt URI'
-      )
+      it 'returns expected values from 505 and its linked alternate' do
+        expect(values).to contain_exactly(
+          'Formatted content notes Misc Info Responsible Agent A Title URI',
+          'Alt Formatted content notes Alt Misc Info Alt Responsible Agent Alt Title Alt URI'
+        )
+      end
+    end
+
+    context 'with vernacular excluded' do
+      let(:values) { helper.contents_values(record, with_alternate: false) }
+
+      it 'returns expected values from 505 but not its linked alternate' do
+        expect(values).to contain_exactly('Formatted content notes Misc Info Responsible Agent A Title URI')
+      end
     end
   end
 
   describe '.access_restriction_show' do
-    let(:record) { marc_record(fields: fields) }
     let(:fields) do
       [
         marc_field(tag: '506', subfields: { a: 'Open to users with valid PennKey', b: 'Donor', c: 'Appointment Only',
@@ -129,7 +131,6 @@ describe 'PennMARC::Note' do
                                             g: '20300101', q: 'Van Pelt', u: 'URI', '2': 'star' })
       ]
     end
-
     let(:values) { helper.access_restriction_show(record) }
 
     it 'returns expected values from 506' do
@@ -141,8 +142,6 @@ describe 'PennMARC::Note' do
   end
 
   describe '.finding_aid_show' do
-    let(:record) { marc_record(fields: fields) }
-
     let(:fields) do
       [
         marc_field(tag: '555', subfields: { a: 'Finding aid', b: 'Source', c: 'Item level control',
@@ -151,7 +150,6 @@ describe 'PennMARC::Note' do
                                             d: 'Alt citation', u: 'Alt URI', '3': 'Alt Materials', '6': '555' })
       ]
     end
-
     let(:values) { helper.finding_aid_show(record) }
 
     it 'returns expected values from 555 and its linked alternate' do
@@ -163,15 +161,12 @@ describe 'PennMARC::Note' do
   end
 
   describe '.participant_show' do
-    let(:record) { marc_record(fields: fields) }
-
     let(:fields) do
       [
         marc_field(tag: '511', subfields: { a: 'Narrator: Some Dev' }),
         marc_field(tag: '880', subfields: { a: 'Alt Participant', '6': '511' })
       ]
     end
-
     let(:values) { helper.participant_show(record) }
 
     it 'returns expected values from 511 and its linked alternate' do
@@ -180,8 +175,6 @@ describe 'PennMARC::Note' do
   end
 
   describe '.credits_show' do
-    let(:record) { marc_record(fields: fields) }
-
     let(:fields) do
       [
         marc_field(tag: '508', subfields: { a: 'Music: Some Dev' }),

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

@@ -1,13 +1,10 @@
 # frozen_string_literal: true
 
 describe 'PennMARC::Production' do
-  include MarcSpecHelpers
-
   let(:helper) { PennMARC::Production }
+  let(:record) { marc_record fields: fields }
 
   describe '.show' do
-    let(:record) { marc_record fields: fields }
-
     let(:fields) do
       [
         marc_field(tag: '264', subfields: { a: 'Marabella, Trinidad, West Indies',
@@ -19,7 +16,6 @@ describe 'PennMARC::Production' do
                    indicator2: '0')
       ]
     end
-
     let(:values) { helper.show(record) }
 
     it 'returns expected values' do
@@ -31,6 +27,21 @@ describe 'PennMARC::Production' do
     end
   end
 
+  describe '.search' do
+    let(:fields) do
+      [
+        marc_field(tag: '260', subfields: { a: 'Marabella, Trinidad, West Indies',
+                                            b: 'Ramjohn Publishing', c: '1999' }, indicator2: '0'),
+        marc_field(tag: '264', subfields: { a: 'Leeds', b: 'Peepal Tree Productions', c: '2019' }, indicator2: '0'),
+        marc_field(tag: '264', subfields: { a: 'Nowhere', b: 'Wasteland Publishing', c: '1999' }, indicator2: '1')
+      ]
+    end
+
+    it 'returns expected values' do
+      expect(helper.search(record)).to contain_exactly('Wasteland Publishing', 'Ramjohn Publishing')
+    end
+  end
+
   describe '.distribution_show' do
     let(:record) { marc_record fields: fields }
     let(:fields) do
@@ -57,7 +68,6 @@ describe 'PennMARC::Production' do
 
   describe '.manufacture_show' do
     let(:record) { marc_record fields: fields }
-
     let(:fields) do
       [
         marc_field(tag: '264', subfields: { a: 'Marabella, Trinidad, West Indies',
@@ -69,7 +79,6 @@ describe 'PennMARC::Production' do
                    indicator2: '3')
       ]
     end
-
     let(:values) { helper.manufacture_show(record) }
 
     it 'returns expected values' do
@@ -83,8 +92,6 @@ describe 'PennMARC::Production' do
 
   describe '.publication_values' do
     context 'with date in 245 ǂf' do
-      let(:record) { marc_record fields: fields }
-
       let(:fields) do
         [
           marc_field(tag: '245', subfields: { f: '1869-1941' }),
@@ -93,7 +100,6 @@ describe 'PennMARC::Production' do
                                               c: '1920' }, indicator2: '1')
         ]
       end
-
       let(:values) { helper.publication_values(record) }
 
       it 'returns expected values' do
@@ -103,16 +109,13 @@ describe 'PennMARC::Production' do
     end
 
     context 'with 260, 261, or 262 fields' do
-      let(:record) { marc_record fields: fields }
-
       let(:fields) do
         [
-          marc_field(tag: '260', subfields: { a: ' Burnt Mill, Harlow, Essex, England', b: 'Longman',
+          marc_field(tag: '260', subfields: { a: 'Burnt Mill, Harlow, Essex, England', b: 'Longman',
                                               c: '1985, c1956.' }),
           marc_field(tag: '264', subfields: { a: 'Nowhere', b: 'Wasteland Publishers', c: '1999' }, indicator2: '1')
         ]
       end
-
       let(:values) { helper.publication_values(record) }
 
       it 'returns expected values' do
@@ -121,8 +124,6 @@ describe 'PennMARC::Production' do
     end
 
     context 'without 260, 261, or 262 fields' do
-      let(:record) { marc_record fields: fields }
-
       let(:fields) do
         [
           marc_field(tag: '264', subfields: { a: 'Nowhere', b: 'Wasteland Publishers', c: '1999' }, indicator2: '1'),
@@ -130,7 +131,6 @@ describe 'PennMARC::Production' do
           marc_field(tag: '264', subfields: { c: ' c2016' }, indicator2: '4')
         ]
       end
-
       let(:values) { helper.publication_values(record) }
 
       it 'returns publication values from field 264' do
@@ -140,8 +140,6 @@ describe 'PennMARC::Production' do
   end
 
   describe '.publication_show' do
-    let(:record) { marc_record fields: fields }
-
     let(:fields) do
       [marc_field(tag: '245', subfields: { f: 'between 1800-1850' }),
        marc_field(tag: '260', subfields: { a: ' Burnt Mill, Harlow, Essex, England', b: 'Longman',
@@ -154,7 +152,6 @@ describe 'PennMARC::Production' do
        marc_field(tag: '880', subfields: { a: 'Linked', b: 'Alternate Publishers', c: '880', '6': '264' },
                   indicator2: '1')]
     end
-
     let(:values) { helper.publication_show(record) }
 
     it 'returns expected values' do
@@ -167,9 +164,38 @@ describe 'PennMARC::Production' do
     end
   end
 
-  describe 'place_of_publication_show' do
+  describe '.publication_citation_show' do
     let(:record) { marc_record fields: fields }
 
+    let(:fields) do
+      [marc_field(tag: '245', subfields: { f: 'between 1800-1850' }),
+       marc_field(tag: '260', subfields: { a: ' Burnt Mill, Harlow, Essex, England', b: 'Longman',
+                                           c: '1985, c1956.' }),
+       marc_field(tag: '264', subfields: { a: 'Leeds', b: 'Peepal Tree Press', c: '2019' }, indicator2: '1'),
+       marc_field(tag: '880', subfields: { f: 'Alternate 1800-1850', '6': '245' }),
+       marc_field(tag: '880',
+                  subfields: { a: 'Alternate England', b: 'Alternate Longman', c: 'Alternate 1985, c1956.',
+                               '6': '260' }),
+       marc_field(tag: '880', subfields: { a: 'Linked', b: 'Alternate Publishers', c: '880', '6': '264' },
+                  indicator2: '1')]
+    end
+    let(:values) { helper.publication_citation_show(record) }
+    let(:values_no_year) { helper.publication_citation_show(record, with_year: false) }
+
+    it 'returns publication citation values' do
+      expect(values).to contain_exactly('between 1800-1850',
+                                        'Burnt Mill, Harlow, Essex, England Longman 1985, c1956.',
+                                        'Leeds Peepal Tree Press 2019')
+    end
+
+    it 'returns publication citation values without year' do
+      expect(values_no_year).to contain_exactly('between 1800-1850',
+                                                'Burnt Mill, Harlow, Essex, England Longman',
+                                                'Leeds Peepal Tree Press')
+    end
+  end
+
+  describe 'place_of_publication_show' do
     let(:fields) do
       [marc_field(tag: '752', subfields: { a: 'United States', b: 'California', c: 'Los Angeles (County)',
                                            d: 'Los Angeles', e: 'publication place', f: 'Little Tokyo',
@@ -180,7 +206,6 @@ describe 'PennMARC::Production' do
                                            f: 'Alt Tokyo', g: 'NA',
                                            h: 'Alt Earth', '6': '752' })]
     end
-
     let(:values) { helper.place_of_publication_show(record) }
 
     it 'returns expected values' do
@@ -190,4 +215,78 @@ describe 'PennMARC::Production' do
       )
     end
   end
+
+  describe 'place_of_publication_search' do
+    let(:values) { helper.place_of_publication_search(record) }
+
+    context 'with publication info in the 26x fields' do
+      let(:fields) do
+        [marc_field(tag: '260', subfields: { a: 'Marabella, Trinidad, West Indies',
+                                             b: 'Ramjohn Publishing', c: '1999' }, indicator2: '0'),
+         marc_field(tag: '264', subfields: { a: 'Leeds', b: 'Peepal Tree Productions', c: '2019' }, indicator2: '0'),
+         marc_field(tag: '264', subfields: { a: 'Nowhere', b: 'Wasteland Publishing', c: '1983' }, indicator2: '1')]
+      end
+
+      it 'returns expected values' do
+        expect(values).to contain_exactly('Marabella, Trinidad, West Indies', 'Nowhere')
+      end
+    end
+
+    context 'with publication info in 752' do
+      let(:fields) do
+        [marc_field(tag: '752', subfields: { a: 'United States', b: 'California', c: 'Los Angeles (County)',
+                                             d: 'Los Angeles', e: 'publication place', f: 'Little Tokyo',
+                                             g: 'North America',  h: 'Earth' })]
+      end
+
+      it 'returns expected values' do
+        expect(values).to contain_exactly(
+          'United States California Los Angeles (County) Los Angeles Little Tokyo North America Earth'
+        )
+      end
+    end
+  end
+
+  describe 'publication_ris_place_of_pub' do
+    let(:record) { marc_record fields: fields }
+    let(:fields) do
+      [marc_field(tag: '245', subfields: { f: 'between 1800-1850' }),
+       marc_field(tag: '260', subfields: { a: ' Burnt Mill, Harlow, Essex, England', b: 'Longman',
+                                           c: '1985, c1956.' }),
+       marc_field(tag: '264', subfields: { a: 'Leeds', b: 'Peepal Tree Press', c: '2019' }, indicator2: '1'),
+       marc_field(tag: '880', subfields: { f: 'Alternate 1800-1850', '6': '245' }),
+       marc_field(tag: '880',
+                  subfields: { a: 'Alternate England', b: 'Alternate Longman', c: 'Alternate 1985, c1956.',
+                               '6': '260' }),
+       marc_field(tag: '880', subfields: { a: 'Linked', b: 'Alternate Publishers', c: '880', '6': '264' },
+                  indicator2: '1')]
+    end
+
+    let(:values) { helper.publication_ris_place_of_pub(record) }
+
+    it 'returns expected values' do
+      expect(values).to contain_exactly('between 1800-1850', 'Burnt Mill, Harlow, Essex, England', 'Leeds')
+    end
+  end
+
+  describe 'publication_ris_publisher' do
+    let(:record) { marc_record fields: fields }
+    let(:fields) do
+      [marc_field(tag: '245', subfields: { f: 'between 1800-1850' }),
+       marc_field(tag: '260', subfields: { a: ' Burnt Mill, Harlow, Essex, England', b: 'Longman',
+                                           c: '1985, c1956.' }),
+       marc_field(tag: '264', subfields: { a: 'Leeds', b: 'Peepal Tree Press', c: '2019' }, indicator2: '1'),
+       marc_field(tag: '880', subfields: { f: 'Alternate 1800-1850', '6': '245' }),
+       marc_field(tag: '880',
+                  subfields: { a: 'Alternate England', b: 'Alternate Longman', c: 'Alternate 1985, c1956.',
+                               '6': '260' }),
+       marc_field(tag: '880', subfields: { a: 'Linked', b: 'Alternate Publishers', c: '880', '6': '264' },
+                  indicator2: '1')]
+    end
+    let(:values) { helper.publication_ris_publisher(record) }
+
+    it 'returns expected values' do
+      expect(values).to contain_exactly('between 1800-1850', 'Longman', 'Peepal Tree Press')
+    end
+  end
 end

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

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 describe 'PennMARC::Relation' do
-  include MarcSpecHelpers
-
   let(:helper) { PennMARC::Relation }
   let(:record) { marc_record fields: fields }
   let(:relator_map) { { aut: 'Author', trl: 'Translator' } }

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

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 describe 'PennMARC::Series' do
-  include MarcSpecHelpers
-
   let(:helper) { PennMARC::Series }
   let(:mapping) { { aut: 'Author' } }
   let(:record) do

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

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 describe 'PennMARC::Subject' do
-  include MarcSpecHelpers
-
   let(:helper) { PennMARC::Subject }
   let(:relator_map) do
     { dpc: 'Depicted' }

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

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 describe 'PennMARC::Title' do
-  include MarcSpecHelpers
-
   let(:helper) { PennMARC::Title }
 
   describe '.search' do