pennmarc 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33527bf43532170690b9b591097fb03f854130b3383debfafe931417d0394f52
-  data.tar.gz: a18a5be08df6d7b74d2aaa61275cdecdedec6caa4b5e8b2b81c99e91411ce093
+  metadata.gz: 28dc70104803899434767b340182cb8eecff8c402cfb5e8547058d560a45a1e5
+  data.tar.gz: 1fc0897f12ffb24de8bc0f40b69474d29264c036e33ba4ea97390b60a9f60c43
 SHA512:
-  metadata.gz: 627a4da06351037f520bc02b0a9fd61ce6cfdec35c563f2b29e3c1c01b4ad76766f155630cafe680b010783ea4f4c285df2d499fd784b7ee4f3cb4948cd421dd
-  data.tar.gz: c966233bb00009a14babc5bc92f0399e75640e886f7c32d176fea8983813aca8936d0e8fab98576a797afaf0b60c5f24268c2ae4e2d8cca31900e590db0a9bc6
+  metadata.gz: c82d8a22f480a768a8f6cce3cb7bc2ed25f7d5b202e3b492ac572a6f5bfec0d801098e1d74db8eb470573a2afbdd9314a90e18955a576c9ff5dee42aa2fbc5cd
+  data.tar.gz: d3c69ce76e13c50b0f2da649ea9499dcb93a734944d298cb783e71e0c4bc59c76fad0ea344353124f024524d11b5f8c92318771d780848506d50940f483c427b

data/README.md

@@ -73,7 +73,7 @@ rspec
 
 1. Update the version in `pennmarc.gemspec`
 2. Run `gem build pennmarc.gemspec` with the latest code
-3. Run `gem push pennmarc-{version number here}`(e.g. `gem push pennmarc-1.0.0`) to push to RubyGems. You will need access and MFA setup with RubyGems.
+3. Run `gem push pennmarc-{version number here}.gem`(e.g. `gem push pennmarc-1.0.0.gem`) to push to RubyGems. You will need access and MFA setup with RubyGems.
 
 ## QA
 
@@ -89,4 +89,4 @@ MARC_FILE=path/to/marc.xml bundle exec rake pennmarc:parse
  - rake task or some similar command to return a full set of values extracted from a specified marcxml file
  - Pipeline to run tests and publish to Rubygems
     - rubocop check
-    - rdoc/yard coverage checks?
+    - rdoc/yard coverage checks?

data/lib/pennmarc/helpers/format.rb

@@ -41,10 +41,10 @@ module PennMARC
         results += record.fields('880').map do |f|
           subfield_to_ignore = if subfield_value?(f, 6, /^300/)
                                  %w[3 6 8]
-                               elsif subfield_value?(f, 6, /^(254|255|310|342|352|362)/)
-                                 %w[6 8]
                                elsif subfield_value?(f, 6, /^340/)
                                  %w[0 2 6 8]
+                               else
+                                 %w[6 8]
                                end
           join_subfields(f, &subfield_not_in?(subfield_to_ignore))
         end

data/lib/pennmarc/helpers/identifier.rb

@@ -23,7 +23,7 @@ module PennMARC
           if field.tag == '020'
             field.filter_map { |subfield| normalize_isbn(subfield.value) if subfield_in?(%w[a z]).call(subfield) }
           else
-            field.filter_map { |subfield| subfield.value if subfield_in?(%w[a l z]).call(subfield) }
+            field.filter_map { |subfield| subfield.value if subfield_in?(%w[a l m y z]).call(subfield) }
           end
         }.flatten.uniq
       end
@@ -56,21 +56,42 @@ module PennMARC
 
       # Get numeric OCLC ID of first {https://www.oclc.org/bibformats/en/0xx/035.html 035 field}
       # with an OCLC ID defined in subfield 'a'.
-      #
-      # @todo We should evaluate this to return a single value in the future since subfield a is non-repeatable
       # @param [MARC::Record] record
-      # @return [Array<String>]
-      def oclc_id(record)
-        oclc_id = Array.wrap(record.fields('035')
-                         .find { |field| field.any? { |subfield| subfield_a_is_oclc?(subfield) } })
-
-        oclc_id.flat_map do |field|
+      # @return [String, nil]
+      def oclc_id_show(record)
+        ids = Array.wrap(record.fields('035')
+                           .find { |field| field.any? { |subfield| subfield_a_is_oclc?(subfield) } })
+        ids.flat_map { |field|
           field.filter_map do |subfield|
             # skip unless subfield 'a' is an oclc id value
             next unless subfield_a_is_oclc?(subfield)
 
             # search for numeric part of oclc id (e.g. '610094484' in '(OCoLC)ocn610094484')
-            match = /^\s*\(OCoLC\)[^1-9]*([1-9][0-9]*).*$/.match(subfield.value)
+            match = match_oclc_number(subfield)
+
+            # skip unless search to find numeric part of oclc id has a match
+            next unless match
+
+            match[1]
+          end
+        }.first
+      end
+
+      # Retrieve valid and invalid numeric OCLC IDs from {https://www.oclc.org/bibformats/en/0xx/035.html 035 field}
+      # for search.
+      # @param [MARC::Record] record
+      # @return [Array<String>]
+      def oclc_id_search(record)
+        record.fields('035').flat_map do |field|
+          field.filter_map do |subfield|
+            # skip unless subfield 'a' or 'z'
+            next unless subfield.code.in?(%w[a z])
+
+            # skip unless subfield value matches OCLC ID
+            next unless subfield_is_oclc?(subfield)
+
+            # search for numeric part of oclc id
+            match = match_oclc_number(subfield)
 
             # skip unless search to find numeric part of oclc id has a match
             next unless match
@@ -143,7 +164,19 @@ module PennMARC
       # @param [MARC::Subfield]
       # @return [TrueClass, FalseClass]
       def subfield_a_is_oclc?(subfield)
-        subfield.code == 'a' && (subfield.value =~ /^\(OCoLC\).*/).present?
+        subfield.code == 'a' && subfield_is_oclc?(subfield)
+      end
+
+      # @param [MARC::Subfield]
+      # @return [TrueClass, FalseClass]
+      def subfield_is_oclc?(subfield)
+        (subfield.value =~ /^\(OCoLC\).*/).present?
+      end
+
+      # @param [MARC::Subfield]
+      # @return [MatchData, nil]
+      def match_oclc_number(subfield)
+        /^\s*\(OCoLC\)[^1-9]*([1-9][0-9]*).*$/.match(subfield.value)
       end
 
       # Normalize isbn value using {https://github.com/billdueber/library_stdnums library_stdnums gem}.

data/lib/pennmarc/version.rb

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

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

@@ -17,13 +17,15 @@ describe 'PennMARC::Identifier' do
     let(:record) do
       marc_record fields: [
         marc_field(tag: '020', subfields: { a: '9781594205071', z: '1555975275' }),
-        marc_field(tag: '022', subfields: { a: '0008-6533', l: '0300-7162', z: '0799-5946 ' })
+        marc_field(tag: '022',
+                   subfields: { a: '0008-6533', l: '0300-7162', m: 'cancelled', y: 'incorrect', z: '0799-5946' })
       ]
     end
 
     it 'returns expected search values' do
       expect(helper.isxn_search(record)).to contain_exactly('9781594205071', '1555975275', '9781555975272',
-                                                            '1594205078', '0300-7162', '0008-6533', '0799-5946 ')
+                                                            '1594205078', '0300-7162', '0008-6533', '0799-5946',
+                                                            'cancelled', 'incorrect')
     end
 
     it 'converts ISBN10 values to ISBN13' do
@@ -62,7 +64,7 @@ describe 'PennMARC::Identifier' do
     end
   end
 
-  describe '.oclc_id' do
+  describe '.oclc_id_show' do
     let(:record) do
       marc_record fields: [
         marc_field(tag: '035', subfields: { a: '(PU)4422776-penndb-Voyager' }),
@@ -72,7 +74,21 @@ describe 'PennMARC::Identifier' do
     end
 
     it 'returns expected show values' do
-      expect(helper.oclc_id(record)).to contain_exactly('610094484')
+      expect(helper.oclc_id_show(record)).to eq '610094484'
+    end
+  end
+
+  describe '.oclc_id_search' do
+    let(:record) do
+      marc_record fields: [
+        marc_field(tag: '035', subfields: { a: '(PU)4422776-penndb-Voyager' }),
+        marc_field(tag: '035', subfields: { z: '(OCoLC)ocn610094484' }),
+        marc_field(tag: '035', subfields: { a: '(OCoLC)ocn1483169584' })
+      ]
+    end
+
+    it 'returns expected search values' do
+      expect(helper.oclc_id_search(record)).to contain_exactly('610094484', '1483169584')
     end
   end
 
@@ -146,4 +162,4 @@ describe 'PennMARC::Identifier' do
                                                          '10.1038/sdata.2016.18', '10.18574/9781479842865')
     end
   end
-end
+end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: pennmarc
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Mike Kanning
 - Amrey Mathurin
 - Patrick Perkins
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-06 00:00:00.000000000 Z
+date: 2023-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -140,7 +140,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.10
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Penn Libraries Catalog MARC parsing wisdom for cross-project usage
 test_files: []