pennmarc 1.0.25 → 1.0.27

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' }
@@ -304,6 +302,25 @@ describe 'PennMARC::Subject' do
         expect(values).to contain_exactly 'Philosophy in motion pictures.'
       end
     end
+
+    context 'with headings that contain terms for removal and replacement' do
+      let(:fields) do
+        [marc_field(tag: '650', subfields: { a: 'History.' }),
+         marc_field(tag: '650', subfields: { a: PennMARC::Mappers.headings_to_remove.first }),
+         marc_field(tag: '650', subfields: { a: PennMARC::Mappers.heading_overrides.first[0] })]
+      end
+
+      it 'removes and replaces terms as expected' do
+        expect(values).to contain_exactly 'History.', "#{PennMARC::Mappers.heading_overrides.first[1]}."
+      end
+
+      it 'does not remove or replace terms if override param is false' do
+        expect(helper.show(record, override: false)).to contain_exactly(
+          'History.', "#{PennMARC::Mappers.headings_to_remove.first}.",
+          "#{PennMARC::Mappers.heading_overrides.first[0]}."
+        )
+      end
+    end
   end
 
   describe '.childrens_show' do

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

data/spec/lib/pennmarc/marc_util_spec.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 describe 'PennMARC::Util' do
-  include MarcSpecHelpers
-
   subject(:util) do
     Class.new { extend PennMARC::Util }
   end

data/spec/lib/pennmarc/parser_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 describe PennMARC::Parser do
-  include MarcSpecHelpers
+  include FixtureHelpers
 
   subject(:parser) { described_class.new }
 

data/spec/spec_helper.rb

@@ -2,8 +2,12 @@
 
 $LOAD_PATH.unshift(__dir__) unless $LOAD_PATH.include?(__dir__)
 
+# Require spec-specific helpers dir
 Dir[File.join(__dir__, 'support', '**', '*.rb')].each { |f| require f }
 
+# Require test helpers from gem lib
+Dir[File.join(__dir__, '../lib/pennmarc/test', '*.rb')].each { |f| require f }
+
 require 'pennmarc'
 
 # This file was generated by the `rspec --init` command. Conventionally, all
@@ -22,6 +26,9 @@ require 'pennmarc'
 #
 # See https://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
+  # Include MarcHelpers by default
+  config.include(PennMARC::Test::MarcHelpers)
+
   # rspec-expectations config goes here. You can use an alternate
   # assertion/expectation library such as wrong or the stdlib/minitest
   # assertions if you prefer.

data/spec/support/fixture_helpers.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module FixtureHelpers
+  # Get the path for a test MARC XML file
+  # @param [String] filename of MARCXML fixture
+  # @return [String] full path of MARCXML fixture
+  def marc_xml_path(filename)
+    File.join File.dirname(__FILE__), '..', 'fixtures', 'marcxml', filename
+  end
+end

metadata

@@ -1,16 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: pennmarc
 version: !ruby/object:Gem::Version
-  version: 1.0.25
+  version: 1.0.27
 platform: ruby
 authors:
 - Mike Kanning
 - Amrey Mathurin
 - Patrick Perkins
+- Katherine Schultz
+- Baowei Wei
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-26 00:00:00.000000000 Z
+date: 2024-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -54,6 +56,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: multi_string_replace
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +132,8 @@ files:
 - lib/pennmarc/helpers/title.rb
 - lib/pennmarc/mappers.rb
 - lib/pennmarc/mappings/dewey_classification.yml
+- lib/pennmarc/mappings/headings_override.yml
+- lib/pennmarc/mappings/headings_remove.yml
 - lib/pennmarc/mappings/iso639-2-languages.yml
 - lib/pennmarc/mappings/iso639-3-languages.yml
 - lib/pennmarc/mappings/loc_classification.yml
@@ -123,10 +141,12 @@ files:
 - lib/pennmarc/mappings/locations.yml
 - lib/pennmarc/mappings/relator.yml
 - lib/pennmarc/parser.rb
+- lib/pennmarc/test/marc_helpers.rb
 - lib/pennmarc/util.rb
 - lib/pennmarc/version.rb
 - pennmarc.gemspec
 - spec/fixtures/marcxml/test.xml
+- spec/lib/pennmarc/heading_control_spec.rb
 - spec/lib/pennmarc/helpers/access_spec.rb
 - spec/lib/pennmarc/helpers/citation_spec.rb
 - spec/lib/pennmarc/helpers/classification_spec.rb
@@ -150,7 +170,7 @@ files:
 - spec/lib/pennmarc/marc_util_spec.rb
 - spec/lib/pennmarc/parser_spec.rb
 - spec/spec_helper.rb
-- spec/support/marc_spec_helpers.rb
+- spec/support/fixture_helpers.rb
 homepage: https://gitlab.library.upenn.edu/dld/catalog/pennmarc
 licenses:
 - MIT