pennmarc 1.0.12 → 1.0.15.pre

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

@@ -101,13 +101,14 @@ describe 'PennMARC::Subject' do
       let(:fields) do
         [marc_field(tag: '650', indicator2: '7',
                     subfields: {
-                      a: 'Libraries', x: 'History', e: 'relator', d: '22nd Century',
+                      a: 'Libraries', d: '22nd Century', x: 'History', e: 'relator',
                       '2': 'fast', '0': 'http://fast.org/libraries'
                     })]
       end
 
       it 'properly concatenates heading components' do
-        expect(values.first).to include 'Libraries--History'
+        expect(values.first).to start_with 'Libraries'
+        expect(values.first).to end_with '--History'
       end
 
       it 'excludes URI values from ǂ0 or ǂ1' do
@@ -123,14 +124,14 @@ describe 'PennMARC::Subject' do
       end
 
       it 'joins all values in the expected way' do
-        expect(values.first).to eq 'Libraries--History 22nd Century'
+        expect(values.first).to eq 'Libraries, 22nd Century--History'
       end
     end
   end
 
   describe '.show' do
     let(:record) { marc_record fields: fields }
-    let(:values) { helper.facet(record) }
+    let(:values) { helper.show(record) }
 
     context 'with a variety of headings' do
       let(:fields) do
@@ -162,8 +163,28 @@ describe 'PennMARC::Subject' do
       end
 
       it 'properly formats the heading parts' do
-        expect(values.first).to eq 'Subways--Pennsylvania--Philadelphia Metropolitan Area--Maps--1989'
-        expect(values.first).not_to include 'relator'
+        expect(values.first).to eq 'Subways--Pennsylvania--Philadelphia Metropolitan Area--Maps--1989 relator'
+      end
+    end
+
+    context 'with the record including trailing punctuation in the parts' do
+      let(:fields) do
+        [marc_field(tag: '600', indicator2: '7', subfields: {
+                      a: 'Franklin, Benjamin,',
+                      d: '1706-1790',
+                      '2': 'fast',
+                      '0': 'http://id.worldcat.org/fast/34115'
+                    }),
+         marc_field(tag: '600', indicator1: '1', indicator2: '0', subfields: {
+                      a: 'Franklin, Benjamin,',
+                      d: '1706-1790.',
+                      x: 'As inventor.'
+                    })]
+      end
+
+      it 'returns what Franklin shows', pending: 'proper handling of punctuation in subject parts' do
+        expect(values).to contain_exactly 'Franklin, Benjamin, 1706-1790.',
+                                          'Franklin, Benjamin, 1706-1790--As inventor.'
       end
     end
 
@@ -187,14 +208,14 @@ describe 'PennMARC::Subject' do
       let(:fields) do
         [marc_field(tag: '611', indicator2: '0', subfields: {
                       a: 'Conference',
-                      d: '(2002',
-                      n: '2nd',
-                      c: ['Johannesburg, South Africa', 'Cape Town, South Africa)']
+                      c: ['(Johannesburg, South Africa', 'Cape Town, South Africa'],
+                      d: '2002)',
+                      n: '2nd'
                     })]
       end
 
       it 'properly formats the heading parts' do
-        expect(values.first).to eq 'Conference--2nd (2002 Johannesburg, South Africa Cape Town, South Africa)'
+        expect(values.first).to eq 'Conference, (Johannesburg, South Africa, Cape Town, South Africa, 2002)--2nd'
       end
     end
 
@@ -202,14 +223,17 @@ describe 'PennMARC::Subject' do
       let(:fields) do
         [marc_field(tag: '600', indicator2: '0', subfields: {
                       a: 'Person, Significant Author',
+                      b: 'Numerator',
+                      c: %w[Title Rank],
                       d: '1899-1971',
-                      v: 'Early works to 1950',
-                      t: 'Collection'
+                      t: 'Collection',
+                      v: 'Early works to 1950'
                     })]
       end
 
       it 'properly formats the heading parts' do
-        expect(values.first).to eq 'Person, Significant Author--Early works to 1950 1899-1971 Collection'
+        expect(values.first).to eq('Person, Significant Author, Numerator, Title, Rank, 1899-1971, Collection--' \
+                                   'Early works to 1950')
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pennmarc
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.15.pre
 platform: ruby
 authors:
 - Mike Kanning
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-17 00:00:00.000000000 Z
+date: 2024-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -88,7 +88,7 @@ files:
 - README.md
 - lib/pennmarc.rb
 - lib/pennmarc/encoding_level.rb
-- lib/pennmarc/enriched_marc.rb
+- lib/pennmarc/enriched.rb
 - lib/pennmarc/heading_control.rb
 - lib/pennmarc/helpers/access.rb
 - lib/pennmarc/helpers/citation.rb
@@ -101,6 +101,10 @@ files:
 - lib/pennmarc/helpers/genre.rb
 - lib/pennmarc/helpers/helper.rb
 - lib/pennmarc/helpers/identifier.rb
+- lib/pennmarc/helpers/inventory.rb
+- lib/pennmarc/helpers/inventory_entry/base.rb
+- lib/pennmarc/helpers/inventory_entry/electronic.rb
+- lib/pennmarc/helpers/inventory_entry/physical.rb
 - lib/pennmarc/helpers/language.rb
 - lib/pennmarc/helpers/link.rb
 - lib/pennmarc/helpers/location.rb
@@ -132,6 +136,7 @@ files:
 - spec/lib/pennmarc/helpers/format_spec.rb
 - spec/lib/pennmarc/helpers/genre_spec.rb
 - spec/lib/pennmarc/helpers/identifer_spec.rb
+- spec/lib/pennmarc/helpers/inventory_spec.rb
 - spec/lib/pennmarc/helpers/language_spec.rb
 - spec/lib/pennmarc/helpers/link_spec.rb
 - spec/lib/pennmarc/helpers/location_spec.rb
@@ -161,9 +166,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.4.10
 signing_key:

data/lib/pennmarc/enriched_marc.rb

@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-# Constants for Alma's MARC enrichment
-# MARC enrichment is performed during the Alma Publishing process
-# @see https://developers.exlibrisgroup.com/alma/apis/docs/bibs/R0VUIC9hbG1hd3MvdjEvYmlicy97bW1zX2lkfQ==/
-#   Alma documentation for these added fields
-module PennMARC
-  module EnrichedMarc
-    # terminology follows the Publishing Profile screen
-    TAG_HOLDING = 'hld'
-    TAG_ITEM = 'itm'
-    TAG_ELECTRONIC_INVENTORY = 'prt'
-    TAG_DIGITAL_INVENTORY = 'dig'
-
-    # these are 852 subfield codes; terminology comes from MARC spec
-    SUB_HOLDING_SHELVING_LOCATION = 'c'
-    SUB_HOLDING_SEQUENCE_NUMBER = '8'
-    SUB_HOLDING_CLASSIFICATION_PART = 'h'
-    SUB_HOLDING_ITEM_PART = 'i'
-
-    SUB_ITEM_CURRENT_LOCATION = 'g'
-    SUB_ITEM_CALL_NUMBER_TYPE = 'h'
-    SUB_ITEM_CALL_NUMBER = 'i'
-    SUB_ITEM_DATE_CREATED = 'q'
-
-    SUB_ELEC_PORTFOLIO_PID = 'a'
-    SUB_ELEC_ACCESS_URL = 'b'
-    SUB_ELEC_COLLECTION_NAME = 'c'
-    SUB_ELEC_COVERAGE = 'g'
-
-    # TODO: evaluate this in context of changed boundwiths processing
-    # a subfield code NOT used by the MARC 21 spec for 852 holdings records.
-    # we add this subfield during preprocessing to store boundwith record IDs.
-    SUB_BOUND_WITH_ID = 'y'
-
-    # MARC enrichment originating from Alma Api
-    # @see https://developers.exlibrisgroup.com/alma/apis/docs/bibs/R0VUIC9hbG1hd3MvdjEvYmlicy97bW1zX2lkfQ==/ Alma docs
-    module AlmaApi
-      TAG_PHYSICAL_INVENTORY = 'AVA'
-      TAG_DIGITAL_INVENTORY = 'AVA'
-      TAG_ELECTRONIC_INVENTORY = 'AVE'
-
-      SUB_PHYSICAL_CALL_NUMBER = 'd'
-      SUB_PHYSICAL_CALL_NUMBER_TYPE = 'k'
-
-      SUB_HOLDING_LOCATION_CODE = 'j'
-    end
-  end
-end