pennmarc 1.0.17 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90b9c248dbc3c08377212a70748dcf13728c9feaa037a4a64cc398c02a36c3df
-  data.tar.gz: f3c14ffea869113e6f94fc5d94ff5a083f2749cb17ed33854243131b134185a1
+  metadata.gz: 4f6b5628a407dc533c2f41b5c93d4b47239a36cc106c873b5bc7768825959451
+  data.tar.gz: 55db336dac7987be256abfec2830d72e9fc599346e49c2cc92c0cf61f7c810ff
 SHA512:
-  metadata.gz: 25f98a210e26abc52edefb5614bf5ebbdb1acc04baaaaa3c0a770f284f8161f301a2fe768a336ee9291ba640f9251e71d68d39cd5d222707254b8ca5763261b6
-  data.tar.gz: c0ee733d64114e1b5c317cd49ebedc330c2a179282be2cb43f3f9457d40253dd197da5fe18e6c09a04f945be1d43fa837a9920648ae8af439a3ad0fdcf23ee38
+  metadata.gz: 4e2c930016793ae39d206d55a574c3e26d329507f6be46cde19628bcf6f9cc55213fcc9e8c7866e3f031510261fbba1cd64e54fe429c1bb92f0cb9c9c03dc9f8
+  data.tar.gz: 2162e68b8aa887239e36333a9c1650a3f989cc1906b0c4271e419c4ad21a20e8cf2a19455fa3e77b8dbbf9bf4cdf4b9fdf6f99b6cfb61d68050d7362ae8867e3

data/lib/pennmarc/helpers/subject.rb

@@ -214,7 +214,7 @@ module PennMARC
 
         return true if field.tag.in?(DISPLAY_TAGS) && field.indicator2.in?(%w[0 2 4])
 
-        return true if field.indicator2 == '7' && valid_subject_genre_source_code?(field)
+        return true if field.tag.in?(DISPLAY_TAGS) && field.indicator2 == '7' && valid_subject_genre_source_code?(field)
 
         false
       end
@@ -254,8 +254,10 @@ module PennMARC
             term_info[:append] << subfield.value.strip # TODO: map relator code?
           when 'b', 'c', 'd', 'p', 'q', 't'
             # these are appended to the last component (part) if possible (i.e., when joined, should have no delimiter)
-            # assume that there is an 'a' preceding value
-            term_info[:parts].last << " #{subfield.value.strip}"
+            # if there is no preceding part then this is simply added to the parts array
+            to_append = " #{subfield.value.strip}"
+
+            term_info[:parts].empty? ? term_info[:parts] << subfield.value.strip : term_info[:parts].last << to_append
             term_info[:count] += 1
           else
             # the usual case; add a new component to `parts`

data/lib/pennmarc/version.rb

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

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

@@ -128,6 +128,16 @@ describe 'PennMARC::Subject' do
       end
     end
 
+    context 'with a record with an invalid tag, but valid indicator2 and source specified' do
+      let(:fields) do
+        [marc_field(tag: '654', indicator2: '7', subfields: { c: 'b', a: 'Architectural theory', '2': 'aat' })]
+      end
+
+      it 'does not include the field' do
+        expect(values).to be_empty
+      end
+    end
+
     context 'with a record with trailing periods' do
       let(:fields) do
         [marc_field(tag: '600', indicator2: '0',
@@ -142,6 +152,16 @@ describe 'PennMARC::Subject' do
                                           'to be consistent in the Churches of Christ')
       end
     end
+
+    context 'with a record where a main subject part does not precede other subject parts' do
+      let(:fields) do
+        [marc_field(tag: '650', indicator2: '0', subfields: { b: 'Italian', a: 'Architectural theory' })]
+      end
+
+      it 'treats the first part it comes across as a main subject part' do
+        expect(values).to contain_exactly('Italian--Architectural theory')
+      end
+    end
   end
 
   describe '.show' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pennmarc
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.0.18
 platform: ruby
 authors:
 - Mike Kanning
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-12 00:00:00.000000000 Z
+date: 2024-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport