pennmarc 1.0.9 → 1.0.11.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 652039b781e2ce7442f628ca722f4fda59207d1d8171bfd2fad84d2c67f3c06f
-  data.tar.gz: 166bbf8498f673b36373671db47031ef8a2f4d5496ed1fddeee89718bd23e09c
+  metadata.gz: 102f9a975e2d103cdec48de5ef76c1577216d1055f46893ca39ac40a9fd717aa
+  data.tar.gz: 759fef85e9a2f5cc69bd100cd8552912831c7f70df5066f52824ec51ab483e03
 SHA512:
-  metadata.gz: 68df667344adaff013da3eab5417bdd44748726a113190d20c44cc1cf4d061269619265e3de1edc9c7c767ffff5a4548a9fcb3ed2039b28a2608ec62a6e024d1
-  data.tar.gz: 8df6d32dbc84ff3851e4b35576e24c96c42b536330ded1f0f1678de3d1aa0729547a71b0c6ccea15e7c949ee15e068d1c0f19b18a6b414167cb736effa2b01dd
+  metadata.gz: e2fbd84b36717b7c24a3966a19912e59be09b258eea4d62f2905ff7f117786f0594a9a9e9a6da031c52e639bad2407efa5feeef65d092e991457a449e8a17259
+  data.tar.gz: 1297a465f711238695f9faace643c20d06f2a07e56ba641c239ee4af71db38c6a1067a073703f0898031cb76bad1c4c8668835d5970ab5f6fc58508af7596105

data/.gitlab-ci.yml

@@ -0,0 +1,72 @@
+include:
+  - project: "devops/gitlab/ci-templates/ruby"
+    ref: "sans-dind"
+    file:
+      - ".rspec.yml"
+      - ".rubocop.yml"
+  - template: "Workflows/MergeRequest-Pipelines.gitlab-ci.yml"
+
+stages:
+  - test
+  - deploy
+
+rspec_app_test:
+  stage: test
+  image: ruby:3.2.2
+  before_script:
+    - bundle install -j $(nproc)
+  extends:
+    - .rspec
+  tags:
+    - build
+
+rubocop_app_test:
+  stage: test
+  image: ruby:3.2.2
+  before_script:
+    - bundle install -j $(nproc)
+  extends:
+    - .rubocop
+  tags:
+    - build
+  allow_failure: true
+
+# This step was inspired from Gitlab's example of gem publication:
+# https://gitlab.com/gitlab-org/quality/pipeline-common/-/blob/master/ci/gem-release.yml
+gem_publication:
+  stage: deploy
+  image: ruby:3.2.2
+  variables:
+    GEMSPEC_FILE: "${CI_PROJECT_NAME}.gemspec"
+    VAULT_VERSION: "1.10.1"
+  before_script:
+    - | 
+      apt-get update && apt-get -y install \
+      wget \
+      unzip && \
+      wget https://releases.hashicorp.com/vault/${VAULT_VERSION}/vault_${VAULT_VERSION}_linux_amd64.zip -O /tmp/vault_${VAULT_VERSION}.zip && \
+      unzip /tmp/vault_${VAULT_VERSION}.zip -d /usr/bin && \
+      rm -fr /tmp/vault_${VAULT_VERSION}.zip && \
+      apt-get remove -y wget unzip && \
+      apt-get clean
+    - export VAULT_ADDR=${VAULT_URL}
+    - export VAULT_TOKEN="$(vault write -field=token auth/jwt/${CI_SERVER_HOST}/login role=${JWT_ROLE} jwt=${CI_JOB_JWT})"
+    - export GEM_HOST_API_KEY="$(vault kv get -field=rubygems_api_key ${VAULT_KV_ENDPOINT}${ENVIRONMENT})"
+    - |
+      gem -v
+      rm -f ./*.gem
+      [ -f "${GEMSPEC_FILE}" ] || (echo "No ${GEMSPEC_FILE} file found!" && exit 1)
+    - '[ -n "${GEM_HOST_API_KEY}" ] || (echo "GEM_HOST_API_KEY is not set!" && exit 1)'
+  script:
+    - GEM_FILE=$(echo "${CI_PROJECT_NAME}-${CI_COMMIT_TAG:1}.gem")
+    - |
+      gem build "${GEMSPEC_FILE}"
+      [ -f "${GEM_FILE}" ] || (echo "No ${GEM_FILE} file found!" && exit 1)
+    - '[ "${DISABLE_GEM_PUSH}" == "true" ] || gem push "${GEM_FILE}"'
+  rules:
+     - if: $CI_COMMIT_TAG =~ /^v\d+\.\d+\.\d+(\.[a-zA-Z0-9]+)?$/
+  artifacts:
+    paths:
+      - "*.gem"
+  tags:
+    - deploy

data/Gemfile.lock

@@ -23,6 +23,8 @@ GEM
       racc (~> 1.4)
     nokogiri (1.15.2-x64-mingw-ucrt)
       racc (~> 1.4)
+    nokogiri (1.15.2-x86_64-darwin)
+      racc (~> 1.4)
     nokogiri (1.15.2-x86_64-linux)
       racc (~> 1.4)
     parallel (1.23.0)
@@ -104,6 +106,7 @@ PLATFORMS
   arm64-darwin-21
   arm64-darwin-22
   x64-mingw-ucrt
+  x86_64-darwin-21
   x86_64-linux
 
 DEPENDENCIES

data/README.md

@@ -71,22 +71,20 @@ rspec
 
 ## Publishing the Gem
 
-1. Update the `VERSION` constant in `lib/pennmarc/version.rb`.
-2. Run `gem build pennmarc.gemspec` with the latest code
-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
-
-### Checking output of an arbitrary MARC XML file
-
-TODO
-
-```bash
-MARC_FILE=path/to/marc.xml bundle exec rake pennmarc:parse
-```
-
-## TODO
- - 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?
+1. Update the `VERSION` constant in [lib/pennmarc/version.rb](lib/pennmarc/version.rb) following this gem's versioning pattern (ex 1.1.0).
+2. Merge the change into `main`.
+3. Create a Gitlab Release:
+   1. Go to https://gitlab.library.upenn.edu/dld/catalog/pennmarc/-/releases/new
+   2. Create a new tag that matches the version set in step 1 (ex: v1.1.0). 
+   3. Add a release title that is the same as the tag name. 
+   4. Submit by clicking "Create Release".
+4. Once the release is created a pipeline will run to publish the gem to RubyGems. 
+
+### Versioning Guidelines
+
+We do not explicitly follow [Semantic Versioning](https://semver.org/) principles, but follow it's general principles. 
+In common cases, here's what to do:
+
+- Increment **MAJOR_VERSION** if the `Parser` class functionality is modified in a breaking fashion.
+- Increment **MINOR_VERSION** if a `Helper` class is renamed, or if an existing helper method is renamed.
+- Increment **PATCH_VERSION** if a new `Helper` class or method is added, of if any non-breaking bugfix is made.

data/lib/pennmarc/enriched_marc.rb

@@ -42,6 +42,8 @@ module PennMARC
 
       SUB_PHYSICAL_CALL_NUMBER = 'd'
       SUB_PHYSICAL_CALL_NUMBER_TYPE = 'k'
+
+      SUB_HOLDING_LOCATION_CODE = 'j'
     end
   end
 end

data/lib/pennmarc/helpers/access.rb

@@ -5,8 +5,6 @@ module PennMARC
   class Access < Helper
     ONLINE = 'Online'
     AT_THE_LIBRARY = 'At the library'
-    ELEC_AVAILABILITY_TAG = 'AVE'
-    PHYS_AVAILABILITY_TAG = 'AVA'
 
     class << self
       # Based on enhanced metadata fields added by Alma publishing process or API, determine if the record has
@@ -35,14 +33,14 @@ module PennMARC
       # @param [MARC::Field] field
       # @return [Boolean]
       def electronic_holding_tag?(field)
-        field.tag.in? [EnrichedMarc::TAG_ELECTRONIC_INVENTORY, ELEC_AVAILABILITY_TAG]
+        field.tag.in? [EnrichedMarc::TAG_ELECTRONIC_INVENTORY, EnrichedMarc::AlmaApi::TAG_ELECTRONIC_INVENTORY]
       end
 
       # Does the record have added physical holding info?
       # @param [MARC::Field] field
       # @return [Boolean]
       def physical_holding_tag?(field)
-        field.tag.in? [EnrichedMarc::TAG_HOLDING, PHYS_AVAILABILITY_TAG]
+        field.tag.in? [EnrichedMarc::TAG_HOLDING, EnrichedMarc::AlmaApi::TAG_PHYSICAL_INVENTORY]
       end
 
       # Check if a record contains an 856 entry for an online finding aid, meeting these criteria:

data/lib/pennmarc/helpers/database.rb

@@ -18,7 +18,7 @@ module PennMARC
       # local field 944}. Only returns database subtype if Penn's Database facet value is present in subfield 'a'.
       # @param [Marc::Record]
       # @return [Array<string>] Array of types
-      def type(record)
+      def type_facet(record)
         record.fields('944').filter_map do |field|
           # skip unless specified database format type present
           next unless subfield_value?(field, 'a', /#{DATABASES_FACET_VALUE}/o)
@@ -34,7 +34,7 @@ module PennMARC
       # subfield '2'.
       # @param [Marc::Record]
       # @return [Array<string>] Array of categories
-      def db_category(record)
+      def category_facet(record)
         return [] unless curated_db?(record)
 
         record.fields('943').filter_map do |field|
@@ -55,7 +55,7 @@ module PennMARC
       #   an empty array.
       # @param [Marc::Record]
       # @return [Array<string>] Array of "category--subcategory"
-      def db_subcategory(record)
+      def subcategory_facet(record)
         return [] unless curated_db?(record)
 
         record.fields('943').filter_map do |field|

data/lib/pennmarc/helpers/date.rb

@@ -20,7 +20,8 @@ module PennMARC
       end
 
       # Retrieve date added (subfield 'q') from enriched marc 'itm' field.
-      # {PennMARC::EnrichedMarc} maps enriched marc fields and subfields created during Alma publishing.
+      # {PennMARC::EnrichedMarc} maps enriched marc fields and subfields created during Alma publishing. The enriched
+      # metadata provided by the Alma API does not include the date created value, so we can't work with that here.
       # @param [MARC::Record] record
       # @return [DateTime, nil] The date added, or nil if date found in record is invalid
       def added(record)

data/lib/pennmarc/helpers/format.rb

@@ -80,13 +80,6 @@ module PennMARC
         title_medium = subfield_values_for tag: '245', subfield: :h, record: record
         media_type = subfield_values_for tag: '337', subfield: :a, record: record
 
-        # Get Call Number for holdings - ǂh gives us the 'Classification part' which can contain strings like
-        # 'Microfilm'
-        call_nums = record.fields(EnrichedMarc::TAG_HOLDING).map do |field|
-          join_subfields(field, &subfield_in?([EnrichedMarc::SUB_HOLDING_CLASSIFICATION_PART,
-                                               EnrichedMarc::SUB_HOLDING_ITEM_PART]))
-        end
-
         # get all specific_location values from inventory info
         locations = Location.location record: record, location_map: location_map,
                                       display_value: :specific_location
@@ -95,7 +88,7 @@ module PennMARC
           formats << MANUSCRIPT
         elsif archives_but_not_cajs_or_nursing?(locations)
           formats << ARCHIVE
-        elsif micro_or_microform?(call_nums, locations, media_type, title_medium)
+        elsif micro_or_microform?(call_nums(record), locations, media_type, title_medium)
           formats << MICROFORMAT
         else
           # any of these
@@ -167,6 +160,25 @@ module PennMARC
 
       private
 
+      # Get Call Numbers for holdings using the 'Classification part' which can contain strings like
+      # 'Microfilm'. Look in enriched tags used by both Alma Publishing and API.
+      # @param [MARC::Record] record
+      # @return [Array]
+      def call_nums(record)
+        if field_defined?(record, EnrichedMarc::TAG_HOLDING)
+          record.fields(EnrichedMarc::TAG_HOLDING).map do |field|
+            join_subfields(field, &subfield_in?([EnrichedMarc::SUB_HOLDING_CLASSIFICATION_PART,
+                                                 EnrichedMarc::SUB_HOLDING_ITEM_PART]))
+          end
+        elsif field_defined?(record, EnrichedMarc::AlmaApi::TAG_PHYSICAL_INVENTORY)
+          record.fields(EnrichedMarc::AlmaApi::TAG_PHYSICAL_INVENTORY).map do |field|
+            join_subfields(field, &subfield_in?([EnrichedMarc::AlmaApi::SUB_PHYSICAL_CALL_NUMBER_TYPE]))
+          end
+        else
+          []
+        end
+      end
+
       # Get 'Curated' format from.
       # {https://upennlibrary.atlassian.net/wiki/spaces/ALMA/pages/323912493/Local+9XX+Field+Use+in+Alma local field
       # 944} ǂa, as long as it is not a numerical value.

data/lib/pennmarc/helpers/link.rb

@@ -13,7 +13,7 @@ module PennMARC
       # Full text links from MARC 856 fields.
       # @param [MARC::Record] record
       # @return [Array] array of hashes
-      def full_text(record)
+      def full_text_links(record)
         indicator2_options = %w[0 1]
         links_from_record(record, indicator2_options)
       end
@@ -21,7 +21,7 @@ module PennMARC
       # Web text links from MARC 856 fields.
       # @param [MARC::Record] record
       # @return [Array] array of hashes
-      def web(record)
+      def web_links(record)
         indicator2_options = ['2', ' ', '']
         links_from_record(record, indicator2_options)
       end

data/lib/pennmarc/helpers/location.rb

@@ -85,9 +85,14 @@ module PennMARC
         tag = PennMARC::EnrichedMarc::TAG_HOLDING
         subfield_code = PennMARC::EnrichedMarc::SUB_HOLDING_SHELVING_LOCATION
 
-        if record.fields(PennMARC::EnrichedMarc::TAG_ITEM).any?
+        # if the record has an enriched item field present, use it
+        if field_defined?(record, PennMARC::EnrichedMarc::TAG_ITEM)
           tag = PennMARC::EnrichedMarc::TAG_ITEM
           subfield_code = PennMARC::EnrichedMarc::SUB_ITEM_CURRENT_LOCATION
+        # otherwise, use the api enriched field value
+        elsif field_defined?(record, EnrichedMarc::AlmaApi::TAG_PHYSICAL_INVENTORY)
+          tag = EnrichedMarc::AlmaApi::TAG_PHYSICAL_INVENTORY
+          subfield_code = EnrichedMarc::AlmaApi::SUB_HOLDING_LOCATION_CODE
         end
 
         { tag: tag, subfield_code: subfield_code }

data/lib/pennmarc/helpers/note.rb

@@ -6,15 +6,16 @@ module PennMARC
     class << self
       # Retrieve notes for display from fields {https://www.oclc.org/bibformats/en/5xx/500.html 500},
       # {https://www.oclc.org/bibformats/en/5xx/502.html 502}, {https://www.oclc.org/bibformats/en/5xx/504.html 504},
-      # {https://www.oclc.org/bibformats/en/5xx/515.html 515}, {https://www.oclc.org/bibformats/en/5xx/518.html 518}
+      # {https://www.oclc.org/bibformats/en/5xx/515.html 515}, {https://www.oclc.org/bibformats/en/5xx/518.html 518},
       # {https://www.oclc.org/bibformats/en/5xx/525.html 525}, {https://www.oclc.org/bibformats/en/5xx/533.html 533},
-      # {https://www.oclc.org/bibformats/en/5xx/550.html 550}, {https://www.oclc.org/bibformats/en/5xx/580.html 580},
-      # {https://www.oclc.org/bibformats/en/5xx/586.html 586}, {https://www.oclc.org/bibformats/en/5xx/588.html 588},
+      # {https://www.oclc.org/bibformats/en/5xx/540.html 540}, {https://www.oclc.org/bibformats/en/5xx/550.html 550},
+      # {https://www.oclc.org/bibformats/en/5xx/580.html 580}, {https://www.oclc.org/bibformats/en/5xx/586.html 586},
+      # {https://www.oclc.org/bibformats/en/5xx/588.html 588}
       # and their linked alternates.
       # @param [MARC::Record] record
       # @return [Array<String>]
       def notes_show(record)
-        notes_fields = %w[500 502 504 515 518 525 533 550 580 586 588]
+        notes_fields = %w[500 502 504 515 518 525 533 540 550 580 586 588]
         record.fields(notes_fields + ['880']).filter_map do |field|
           next if field.tag == '880' && subfield_value_not_in?(field, '6', notes_fields)
 

data/lib/pennmarc/helpers/series.rb

@@ -84,7 +84,7 @@ module PennMARC
       # https://www.loc.gov/marc/bibliographic/bd780.html
       # @param [MARC::Record] record
       # @return [String] continues fields string
-      def get_continues_display(record)
+      def get_continues_show(record)
         continues(record, '780')
       end
 
@@ -94,7 +94,7 @@ module PennMARC
       # https://www.loc.gov/marc/bibliographic/bd785.html
       # @param [MARC::Record] record
       # @return [String] continued by fields string
-      def get_continued_by_display(record)
+      def get_continued_by_show(record)
         continues(record, '785')
       end
 

data/lib/pennmarc/helpers/title.rb

@@ -149,7 +149,7 @@ module PennMARC
       #       title browse and we will not be supporting that at this time
       # @param [MARC::Record] record
       # @return [Array<String>] Array of standardized titles as strings
-      def standardized(record)
+      def standardized_show(record)
         standardized_titles = record.fields(%w[130 240]).map do |field|
           join_subfields(field, &subfield_not_in?(%w[0 6 8 e w]))
         end
@@ -177,7 +177,7 @@ module PennMARC
       #
       # @param [MARC::Record] record
       # @return [Array<String>] Array of other titles as strings
-      def other(record)
+      def other_show(record)
         other_titles = record.fields('246').map do |field|
           join_subfields(field, &subfield_not_in?(%w[6 8]))
         end
@@ -202,7 +202,7 @@ module PennMARC
       # @todo what are e and w subfields?
       # @param [MARC::Record] record
       # @return [Array<String>] array of former titles
-      def former(record)
+      def former_show(record)
         record.fields
               .filter_map do |field|
           next unless field.tag == '247' || (field.tag == '880' && subfield_value?(field, '6', /^247/))

data/lib/pennmarc/mappings/locations.yml

@@ -1,8 +1,4 @@
 ---
-3eastelev:
-  specific_location: Van Pelt - third floor east elevator lobby
-  library: Van Pelt-Dietrich Library Center
-  display: Van Pelt - third floor east elevator lobby
 afro:
   specific_location: Van Pelt - Africana Studies Resource Room
   library: Van Pelt-Dietrich Library Center
@@ -177,12 +173,6 @@ biomlibr:
     - Health Sciences Libraries
     - Holman Biotech Commons
   display: Holman Biotech Commons - Librarian's Office
-biomonli:
-  specific_location: Holman Biotech Commons - Online Office
-  library:
-    - Health Sciences Libraries
-    - Holman Biotech Commons
-  display: Holman Biotech Commons - Online Office
 biomperi:
   specific_location: Holman Biotech Commons - Periodicals
   library:
@@ -550,10 +540,6 @@ dncirc:
     - Health Sciences Libraries
     - Levy Dental Medicine Library
   display: Levy Dental Medicine Library - Circulation
-easiacom:
-  specific_location: Van Pelt - East Asia Compact Shelving
-  library: Van Pelt-Dietrich Library Center
-  display: Van Pelt - East Asia Compact Shelving
 easiacmx:
   specific_location: Van Pelt - East Asia Comics
   library: Van Pelt-Dietrich Library Center
@@ -576,40 +562,6 @@ edcomm:
     - Van Pelt-Dietrich Library Center
     - Education Commons
   display: Education Commons
-engi:
-  specific_location: Engineering Library
-  library: Engineering Library
-  display: Engineering Library
-engicirc:
-  specific_location: Engineering Library - Circulation Desk
-  library: Engineering Library
-  display: Engineering Library - Circulation Desk
-enginewbk:
-  specific_location: Engineering Library - New Book
-  library: Engineering Library
-  display: Engineering Library - New Book
-engiperi:
-  specific_location: Engineering Library - Periodicals
-  library: Engineering Library
-  display: Engineering Library - Periodicals (alphabetical by title)
-engirefe:
-  specific_location: Engineering Library - Reference
-  library: Engineering Library
-  display: Engineering Library - Reference
-engirese:
-  specific_location: Engineering Library - Reserve
-  library:
-    - Engineering Library
-    - Reserve
-  display: Engineering Library - Reserve
-engsc:
-  specific_location: Engineering Library - Study Collection
-  library: Engineering Library
-  display: Engineering Library - Study Collection
-eres:
-  specific_location:
-  library:
-  display: E-reserves
 fanewbook:
   specific_location: Fisher Fine Arts Library - New Book Display
   library: Fisher Fine Arts Library
@@ -684,10 +636,6 @@ finestudio:
   specific_location: Fisher Fine Arts Library - Studio Collection
   library: Fisher Fine Arts Library
   display: Fine Arts Library - Studio Collection
-HARR:
-  specific_location:
-  library:
-  display:
 judaica:
   specific_location: Van Pelt - Judaica and Ancient Near East Resource Room
   library: Van Pelt-Dietrich Library Center
@@ -822,20 +770,6 @@ mideastres:
     - Van Pelt-Dietrich Library Center
     - Reserve
   display: Van Pelt - Middle East Seminar Reserve
-moor:
-  specific_location: Engineering Library
-  library: Engineering Library
-  display: Engineering Library
-moorrefe:
-  specific_location: Engineering Library - Reference
-  library: Engineering Library
-  display: Engineering Library - Reference
-moorrese:
-  specific_location: Engineering Library - Reserve
-  library:
-    - Engineering Library
-    - Reserve
-  display: Engineering Library - Reserve
 muse:
   specific_location: Penn Museum Library
   library: Penn Museum Library
@@ -876,6 +810,10 @@ musemedia:
   specific_location: Penn Museum Library - Media
   library: Penn Museum Library
   display: Penn Museum Library - Media
+musenewbk:
+  specific_location: Penn Museum Library - New Books Display
+  library: Penn Museum Library
+  display: Penn Museum Library - New Books Display
 muserefe:
   specific_location: Penn Museum Library - Reference
   library: Penn Museum Library
@@ -965,83 +903,6 @@ nursarch:
   specific_location: Nursing Archives
   library: Nursing Archives
   display: Barbara Bates Center for History of Nursing - Fagin Hall 2U
-oobiom:
-  specific_location: On Order
-  library:
-    - Health Sciences Libraries
-    - Holman Biotech Commons
-  display: Ordered for Holman Biotech Commons
-oochem:
-  specific_location: On Order
-  library: Chemistry Library
-  display: Ordered for Chemistry Library
-oocjs:
-  specific_location: On Order
-  library: Library at the Katz Center for Advanced Judaic Studies
-  display: Ordered for Center for Judaic Studies Library
-oodental:
-  specific_location: On Order
-  library:
-    - Health Sciences Libraries
-    - Levy Dental Medicine Library
-  display: Ordered for Levy Dental Medicine Library
-ooeastasia:
-  specific_location: On Order
-  library: Van Pelt-Dietrich Library Center
-  display: Ordered for East Asia
-ooengi:
-  specific_location: On Order
-  library: Engineering Library
-  display: Ordered for Engineering Library
-oofine:
-  specific_location: On Order
-  library: Fisher Fine Arts Library
-  display: Ordered for Fine Arts Library
-oolipp:
-  specific_location: On Order
-  library: Lippincott Library
-  display: Ordered for Lippincott Library
-oomath:
-  specific_location: On Order
-  library: Math/Physics/Astronomy Library
-  display: Ordered for Math-Physics-Astronomy Library
-oomuse:
-  specific_location: On Order
-  library: Penn Museum Library
-  display: Ordered for Museum Library
-oomusic:
-  specific_location: On Order
-  library: Van Pelt-Dietrich Library Center
-  display: Ordered for Music Library
-oonewbolt:
-  specific_location: On Order
-  library:
-    - Health Sciences Libraries
-    - Veterinary
-    - 'Veterinary: du Pont Library (New Bolton)'
-  display: Ordered for New Bolton Library
-ooormandy:
-  specific_location: On Order
-  library: Van Pelt-Dietrich Library Center
-  display: Ordered for Ormandy Center
-oostor:
-  specific_location: On Order
-  library: LIBRA
-  display: Ordered for LIBRA
-oovanp:
-  specific_location: On Order
-  library: Van Pelt-Dietrich Library Center
-  display: Ordered for Van Pelt Library
-oovete:
-  specific_location: On Order
-  library:
-    - Health Sciences Libraries
-    - Veterinary
-  display: 'Ordered for Veterinary: Atwood Library (Campus)'
-ooyarn:
-  specific_location: On Order
-  library: Yarnall Collection
-  display: Ordered for Yarnall collection
 pah:
   specific_location: Pennsylvania Hospital Library
   library:
@@ -1108,24 +969,6 @@ religious:
   specific_location: Van Pelt - Medieval Studies Resource Room
   library: Van Pelt-Dietrich Library Center
   display: Van Pelt - Medieval Studies Resource Room (405)
-rosedesk:
-  specific_location: Van Pelt - Rosengarten Reserve
-  library:
-    - Van Pelt-Dietrich Library Center
-    - Reserve
-  display: Van Pelt - Rosengarten Reserve Desk
-roserefe:
-  specific_location: Van Pelt - Rosengarten Reserve
-  library:
-    - Van Pelt-Dietrich Library Center
-    - Reserve
-  display: Van Pelt - Rosengarten Reserve Reference
-roserese:
-  specific_location: Van Pelt - Rosengarten Reserve
-  library:
-    - Van Pelt-Dietrich Library Center
-    - Reserve
-  display: Van Pelt - Rosengarten Reserve
 rotc:
   specific_location:
   library:
@@ -1526,41 +1369,14 @@ scrunning:
     - Special Collections
     - LIBRA
   display: LIBRA Running Press Collection
-sw3rdfl:
-  specific_location: Van Pelt - Temporarily shelved on third floor southwest corner
-  library: Van Pelt-Dietrich Library Center
-  display: Van Pelt - Temporarily shelved on third floor southwest corner
-refsw3rdfl:
-  specific_location: Van Pelt - Temporarily shelved on third floor southwest reference
-    corner
-  library: Van Pelt-Dietrich Library Center
-  display: Van Pelt - Temporarily shelved on third floor southwest reference corner
-town:
-  specific_location: Engineering Library
-  library: Engineering Library
-  display: Engineering Library
-townrefe:
-  specific_location: Engineering Library - Reference
-  library: Engineering Library
-  display: Engineering Library - Reference
-townrese:
-  specific_location: Engineering Library - Reserve
-  library:
-    - Engineering Library
-    - Reserve
-  display: Engineering Library - Reserve
-townthes:
-  specific_location: Engineering Library - Theses
-  library: Engineering Library
-  display: Engineering Library - Theses
-twcirc:
-  specific_location:
-  library: Engineering Library
-  display: Engineering Library - Circulation Desk
 univarch:
   specific_location: University Archives
   library: University Archives
   display: University Archives
+RDDSXBooks:
+  specific_location: Van Pelt - RDDSX Books
+  library: Van Pelt-Dietrich Library Center
+  display: Van Pelt - RDDSX Books
 vanp:
   specific_location: Van Pelt - Stacks
   library: Van Pelt-Dietrich Library Center
@@ -1577,14 +1393,14 @@ vanpcgc:
   specific_location: Van Pelt - Center for Global Collections
   library: Van Pelt-Dietrich Library Center
   display: Van Pelt - Center for Global Collections
+vanpcgccm:
+  specific_location: Van Pelt - Global Comics Collection
+  library: Van Pelt-Dietrich Library Center
+  display: Van Pelt - Global Comics Collection
 vanpmicro:
   specific_location: Van Pelt - Microtext
   library: Van Pelt-Dietrich Library Center
   display: Van Pelt - Microtext
-vanpmiddle:
-  specific_location:
-  library:
-  display: Van Pelt - Middle East Tech Services
 vanpNoCirc:
   specific_location: Van Pelt - Non Circulating
   library: Van Pelt-Dietrich Library Center
@@ -1798,4 +1614,4 @@ hspref:
 hspstafref:
   specific_location: Historical Society of Pennsylvania - Staff Reference
   library: Historical Society of Pennsylvania
-  display: Historical Society of Pennsylvania - Staff Reference
+  display: Historical Society of Pennsylvania - Staff Reference

data/lib/pennmarc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PennMARC
-  VERSION = '1.0.9'
+  VERSION = '1.0.11.pre1'
 end

data/pennmarc.gemspec

@@ -23,5 +23,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'marc', '~> 1.2'
   s.add_dependency 'nokogiri', '~> 1.15'
 
-  s.metadata['rubygems_mfa_required'] = 'true'
+  s.metadata['rubygems_mfa_required'] = 'false'
 end

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

@@ -18,7 +18,7 @@ describe 'PennMARC::Access' do
       end
 
       context 'with enrichment with availability info via the Alma API' do
-        let(:tag) { PennMARC::Access::ELEC_AVAILABILITY_TAG }
+        let(:tag) { PennMARC::EnrichedMarc::AlmaApi::TAG_ELECTRONIC_INVENTORY }
 
         it 'returns expected access value' do
           expect(helper.facet(record)).to contain_exactly(PennMARC::Access::ONLINE)
@@ -38,7 +38,7 @@ describe 'PennMARC::Access' do
       end
 
       context 'with enrichment with availability info via the Alma API' do
-        let(:tag) { PennMARC::Access::PHYS_AVAILABILITY_TAG }
+        let(:tag) { PennMARC::EnrichedMarc::AlmaApi::TAG_PHYSICAL_INVENTORY }
 
         it 'returns expected access value' do
           expect(helper.facet(record)).to contain_exactly(PennMARC::Access::AT_THE_LIBRARY)

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

@@ -21,39 +21,39 @@ describe 'PennMARC::Database' do
                 ])
   end
 
-  describe '.type' do
+  describe '.type_facet' do
     it 'returns database types' do
-      expect(helper.type(record)).to contain_exactly('Dictionaries and Thesauri (language based)',
-                                                     'Reference and Handbooks')
+      expect(helper.type_facet(record)).to contain_exactly('Dictionaries and Thesauri (language based)',
+                                                           'Reference and Handbooks')
     end
 
     context 'with uncurated database' do
       it 'returns empty array' do
-        expect(helper.type(record_uncurated_db)).to be_empty
+        expect(helper.type_facet(record_uncurated_db)).to be_empty
       end
     end
   end
 
-  describe '.db_category' do
+  describe '.category_facet' do
     it 'returns database categories' do
-      expect(helper.db_category(record)).to contain_exactly('Humanities', 'Social Sciences')
+      expect(helper.category_facet(record)).to contain_exactly('Humanities', 'Social Sciences')
     end
 
     context 'with uncurated database' do
       it 'returns empty array' do
-        expect(helper.db_category(record_uncurated_db)).to be_empty
+        expect(helper.category_facet(record_uncurated_db)).to be_empty
       end
     end
   end
 
-  describe '.db_subcategory' do
+  describe '.subcategory_facet' do
     it 'returns database subcategories' do
-      expect(helper.db_subcategory(record)).to contain_exactly('Social Sciences--Linguistics')
+      expect(helper.subcategory_facet(record)).to contain_exactly('Social Sciences--Linguistics')
     end
 
     context 'with uncurated database' do
       it 'returns empty array' do
-        expect(helper.db_subcategory(record_uncurated_db)).to be_empty
+        expect(helper.subcategory_facet(record_uncurated_db)).to be_empty
       end
     end
   end

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

@@ -60,18 +60,38 @@ describe 'PennMARC::Format' do
       end
 
       it 'returns a facet value of only "Microformat"' do
-        # expect(formats).to eq %w[Microformat Thesis/Dissertation]
         expect(formats).to eq %w[Microformat]
       end
     end
 
     context 'with Microformats as determined by the holding call numbers' do
-      let(:record) do
-        marc_record fields: [marc_field(tag: 'hld', subfields: { h: 'AB123', i: '.456 Microfilm' })]
+      context 'with API enriched fields' do
+        let(:record) do
+          marc_record fields: [
+            marc_field(tag: PennMARC::EnrichedMarc::AlmaApi::TAG_PHYSICAL_INVENTORY, subfields: {
+                         :h => 'AB123',
+                         PennMARC::EnrichedMarc::AlmaApi::SUB_PHYSICAL_CALL_NUMBER_TYPE => '.456 Microfilm'
+                       })
+          ]
+        end
+
+        it 'returns a facet value of "Microformat"' do
+          expect(formats).to eq ['Microformat']
+        end
       end
 
-      it 'returns a facet value of "Microformat"' do
-        expect(formats).to eq ['Microformat']
+      context 'with publishing enriched fields' do
+        let(:record) do
+          marc_record fields: [
+            marc_field(tag: PennMARC::EnrichedMarc::TAG_HOLDING,
+                       subfields: { :h => 'AB123',
+                                    PennMARC::EnrichedMarc::SUB_ITEM_CALL_NUMBER_TYPE => '.456 Microfilm' })
+          ]
+        end
+
+        it 'returns a facet value of "Microformat"' do
+          expect(formats).to eq ['Microformat']
+        end
       end
     end
 

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

@@ -5,7 +5,7 @@ describe 'PennMARC::Link' do
 
   let(:helper) { PennMARC::Link }
 
-  describe '.full_text' do
+  describe '.full_text_link' do
     let(:record) do
       marc_record fields: [marc_field(tag: '856', subfields: { '3': 'Materials specified',
                                                                z: 'Public note',
@@ -15,12 +15,12 @@ describe 'PennMARC::Link' do
     end
 
     it 'returns full text link text and url' do
-      expect(helper.full_text(record)).to contain_exactly({ link_text: 'Materials specified Public note',
-                                                            link_url: 'https://www.test-uri.com/' })
+      expect(helper.full_text_links(record)).to contain_exactly({ link_text: 'Materials specified Public note',
+                                                                  link_url: 'https://www.test-uri.com/' })
     end
   end
 
-  describe '.web' do
+  describe '.web_link' do
     let(:record) do
       marc_record fields: [marc_field(tag: '856', subfields: { '3': 'Materials specified',
                                                                z: 'Public note',
@@ -30,8 +30,8 @@ describe 'PennMARC::Link' do
     end
 
     it 'returns web link text and url' do
-      expect(helper.web(record)).to contain_exactly({ link_text: 'Materials specified Public note',
-                                                      link_url: 'https://www.test-uri.com/' })
+      expect(helper.web_links(record)).to contain_exactly({ link_text: 'Materials specified Public note',
+                                                            link_url: 'https://www.test-uri.com/' })
     end
   end
 end

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

@@ -67,5 +67,17 @@ describe 'PennMARC::Location' do
                                display_value: :library)).to contain_exactly('LIBRA', 'Online library')
       end
     end
+
+    context 'with AVA fields' do
+      let(:record) do
+        marc_record(fields: [marc_field(tag: 'AVA', subfields: { b: 'Libra', c: 'LIBRA', j: 'stor' })])
+      end
+
+      it 'returns expected values' do
+        expect(helper.location(record: record, location_map: mapping, display_value: :library)).to(
+          contain_exactly('LIBRA')
+        )
+      end
+    end
   end
 end

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

@@ -18,6 +18,7 @@ describe 'PennMARC::Note' do
                                 b: 'UK', c: 'Historical Association',
                                 d: '1917', e: '434 reels',
                                 f: '(Seized records)' }),
+        marc_field(tag: '540', subfields: { a: 'Restricted: Copying allowed only for nonprofit organizations' }),
         marc_field(tag: '588', subfields: { a: 'Print version record', '5': 'LoC' }),
         marc_field(tag: '880', subfields: { b: 'Alt PhD', c: 'Alt UPenn', d: 'Alt 2021', '6': '502' }),
         marc_field(tag: '880', subfields: { b: 'Ignore Note', '6': '501' })
@@ -32,6 +33,7 @@ describe 'PennMARC::Note' do
                                         'PhD University of Pennsylvania 2021',
                                         'Includes bibliographical references (pages 329-[342]) and index.',
                                         'Archives Microfilm UK Historical Association 1917 434 reels (Seized records)',
+                                        'Restricted: Copying allowed only for nonprofit organizations',
                                         'Print version record', 'Alt PhD Alt UPenn Alt 2021')
     end
   end

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

@@ -18,7 +18,7 @@ describe 'PennMARC::Series' do
   end
 
   describe '.show' do
-    it 'returns the series' do
+    it 'returns the series values for display' do
       expect(helper.show(record, relator_map: mapping)).to contain_exactly(
         'Bean Bagatolvski 1997- bk. 1',
         'Teachings of the feathered pillow',
@@ -28,7 +28,7 @@ describe 'PennMARC::Series' do
   end
 
   describe '.values' do
-    it 'returns the values' do
+    it 'returns the series values' do
       expect(helper.values(record, relator_map: mapping)).to contain_exactly('Bean Bagatolvski 1997- bk. 1.')
     end
   end
@@ -43,15 +43,15 @@ describe 'PennMARC::Series' do
     end
   end
 
-  describe '.get_continues_display' do
-    it 'gets continues for display' do
-      expect(helper.get_continues_display(record)).to contain_exactly('National Comfort Association')
+  describe '.get_continues_show' do
+    it 'gets continues values for display' do
+      expect(helper.get_continues_show(record)).to contain_exactly('National Comfort Association')
     end
   end
 
-  describe '.get_continued_by_display' do
-    it 'gets continued by display' do
-      expect(helper.get_continued_by_display(record)).to contain_exactly('NCA quarterly comfortology bulletin')
+  describe '.get_continued_by_show' do
+    it 'gets continued by values for display' do
+      expect(helper.get_continued_by_show(record)).to contain_exactly('NCA quarterly comfortology bulletin')
     end
   end
 end

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

@@ -195,7 +195,7 @@ describe 'PennMARC::Title' do
     end
   end
 
-  describe '.standardized' do
+  describe '.standardized_show' do
     let(:record) do
       marc_record fields: [
         marc_field(tag: '130', subfields: { a: 'Uniform Title', f: '2000', '8': 'Not Included' }),
@@ -208,7 +208,7 @@ describe 'PennMARC::Title' do
     end
 
     it 'returns the expected standardized title display values' do
-      values = helper.standardized(record)
+      values = helper.standardized_show(record)
       expect(values).to contain_exactly(
         'Another Uniform Title', 'Translated Uniform Title', 'Uniform Title 2000', 'Yet Another Uniform Title'
       )
@@ -216,7 +216,7 @@ describe 'PennMARC::Title' do
     end
   end
 
-  describe '.other' do
+  describe '.other_show' do
     let(:record) do
       marc_record fields: [
         marc_field(tag: '246', subfields: { a: 'Varied Title', f: '2000', '8': 'Not Included' }),
@@ -227,13 +227,13 @@ describe 'PennMARC::Title' do
     end
 
     it 'returns the expected other title display values' do
-      expect(helper.other(record)).to contain_exactly(
+      expect(helper.other_show(record)).to contain_exactly(
         'Alternate Varied Title', 'Uncontrolled Title', 'Varied Title 2000'
       )
     end
   end
 
-  describe '.former' do
+  describe '.former_show' do
     let(:record) do
       marc_record fields: [
         marc_field(tag: '247', subfields: { a: 'Former Title', n: 'Part', '6': 'Linkage', e: 'Append' }),
@@ -242,7 +242,7 @@ describe 'PennMARC::Title' do
     end
 
     it 'returns the expected former title value' do
-      values = helper.former(record)
+      values = helper.former_show(record)
       expect(values).to contain_exactly 'Former Title Part Append', 'Alt Title Part'
       expect(values).not_to include 'Linkage', '247'
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pennmarc
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.11.pre1
 platform: ruby
 authors:
 - Mike Kanning
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-08 00:00:00.000000000 Z
+date: 2024-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -77,6 +77,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".gitleaks.toml"
 - ".rspec"
 - ".rubocop.yml"
@@ -148,7 +149,7 @@ homepage: https://gitlab.library.upenn.edu/dld/catalog/pennmarc
 licenses:
 - MIT
 metadata:
-  rubygems_mfa_required: 'true'
+  rubygems_mfa_required: 'false'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -160,9 +161,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: