berkeley_library-location 4.1.0 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38e532bc61a09117863f2ac3583ec26735685d03b9a22ece2cc55a32490cc31e
-  data.tar.gz: 3cdec6c95056bdc388716b4153d46a6ea1e7dfd529fe18dc9660de32068bb55b
+  metadata.gz: 5b728d789ffd4c43c031e74e6e529994c5da2f0c68091f7d2dcca48c7cb92b63
+  data.tar.gz: ecbfee1a9349510009ff7d9a8700e71a3c31633ca362475b9910ff25ca5fb1aa
 SHA512:
-  metadata.gz: 1883e646eab5646d0dcde57e88477d758b52939ab2b0f0033e7aecf1184c7a342ac0c339060cd2ead515ccdcd7005d84df6f6700cb0095955e4d817c9ca28fe7
-  data.tar.gz: fb64c8aa2204c0a60d36ae504d96c5e2e946e71517d4b9e11584f48f91b0bc3339dcece2e4f906145c866a124fe260117ba1849a87244eccb89bf3f7401aeed3
+  metadata.gz: 84b9c151fbe29c5f11902bb8c0c8aa9d5495e55fdd5da873fc0445a6750896b4d6ae2360674cdece0fc8f7dd24d7c6597c2a388cde3c265216acf52ea07a6f96
+  data.tar.gz: 6bef93e48408b413c96d10ed43c59d63a38691668bd4f96f7e9ebbc126a6c3c28c1cd532214c0e3c41dfed5823a09e0565bb9b68cc03d9cbc9aae3ff8b3e16c3

data/CHANGES.md

@@ -1,3 +1,15 @@
+# 4.3.0 (2026-03-17)
+
+- Convert fload to int in spreadsheet if oclc number is a float
+- bump ruby version to 3.3
+- bump nokogiri to 1.19.1
+- bump rubocop to 1.75.0
+
+# 4.2.0 (2026-01-06)
+
+- Rename RLF to SLF (NRLF -> SLFN, SRLF -> SLFS)
+- Added bypass to skip SSL verification ONLY when recording new VCR cassettes
+
 # 4.1.0 (2025-01-10)
 
 - Fixed token refresh function and test

data/lib/berkeley_library/location/location_result.rb

@@ -13,12 +13,12 @@ module BerkeleyLibrary
         @ht_error = ht_error
       end
 
-      def nrlf?
-        @has_nrlf ||= wc_symbols.intersection(WorldCat::Symbols::NRLF).any?
+      def slfn?
+        @has_slfn ||= wc_symbols.intersection(WorldCat::Symbols::SLFN).any?
       end
 
-      def srlf?
-        @has_srlf ||= wc_symbols.intersection(WorldCat::Symbols::SRLF).any?
+      def slfs?
+        @has_slfs ||= wc_symbols.intersection(WorldCat::Symbols::SLFS).any?
       end
 
       def uc_symbols

data/lib/berkeley_library/location/module_info.rb

@@ -7,7 +7,7 @@ module BerkeleyLibrary
       SUMMARY = 'Locaton-related utilities for the UC Berkeley Library'.freeze
       DESCRIPTION = 'A collection of location-related utilities for the UC Berkeley Library'.freeze
       LICENSE = 'MIT'.freeze
-      VERSION = '4.1.0'.freeze
+      VERSION = '4.3.0'.freeze
       HOMEPAGE = 'https://github.com/BerkeleyLibrary/location'.freeze
     end
   end

data/lib/berkeley_library/location/world_cat/oclc_auth.rb

@@ -17,16 +17,7 @@ module BerkeleyLibrary
         end
 
         def fetch_token
-          url = oclc_token_url
-
-          http = Net::HTTP.new(url.host, url.port)
-          http.use_ssl = url.scheme == 'https'
-
-          request = Net::HTTP::Post.new(url.request_uri)
-          request.basic_auth(Config.api_key, Config.api_secret)
-          request['Accept'] = 'application/json'
-          response = http.request(request)
-
+          response = http_request(oclc_token_url)
           JSON.parse(response.body, symbolize_names: true)
         end
 
@@ -42,6 +33,23 @@ module BerkeleyLibrary
 
         private
 
+        def http_request(url)
+          http = build_http(url)
+          request = Net::HTTP::Post.new(url.request_uri)
+          request.basic_auth(Config.api_key, Config.api_secret)
+          request['Accept'] = 'application/json'
+          http.request(request)
+        end
+
+        def build_http(url)
+          http = Net::HTTP.new(url.host, url.port)
+          http.use_ssl = url.scheme == 'https'
+
+          # Skip SSL verification ONLY when recording new VCR cassettes
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE if ENV['RE_RECORD_VCR'] == 'true'
+          http
+        end
+
         def token_params
           {
             grant_type: 'client_credentials',

data/lib/berkeley_library/location/world_cat/symbols.rb

@@ -2,12 +2,12 @@ module BerkeleyLibrary
   module Location
     module WorldCat
       module Symbols
-        NRLF = %w[ZAP ZAPSP].freeze
-        SRLF = %w[HH0 ZAS ZASSP].freeze
-        RLF = (NRLF + SRLF).freeze
+        SLFN = %w[ZAP ZAPSP].freeze
+        SLFS = %w[HH0 ZAS ZASSP].freeze
+        SLF = (SLFN + SLFS).freeze
 
         UC = %w[CLU CRU CUI CUN CUS CUT CUV CUX CUY CUZ MERUC].freeze
-        ALL = (RLF + UC).freeze
+        ALL = (SLF + UC).freeze
 
         class << self
           include Symbols

data/lib/berkeley_library/location/xlsx_reader.rb

@@ -19,6 +19,8 @@ module BerkeleyLibrary
         return to_enum(:each_oclc_number) unless block_given?
 
         ss.each_value(oclc_col_index, include_header: false) do |v|
+          # convert to integer if oclc number is a float in the spreadsheet
+          v = v.to_i if v.is_a?(Float)
           next if (v_str = v.to_s).strip == ''
 
           yield v_str

data/lib/berkeley_library/location/xlsx_writer.rb

@@ -7,22 +7,22 @@ module BerkeleyLibrary
       include Constants
       include BerkeleyLibrary::Logging
 
-      COL_NRLF = 'NRLF'.freeze
-      COL_SRLF = 'SRLF'.freeze
+      COL_SLFN = 'SLFN'.freeze
+      COL_SLFS = 'SLFS'.freeze
       COL_OTHER_UC = 'Other UC'.freeze
       COL_WC_ERROR = 'WorldCat Error'.freeze
 
       COL_HATHI_TRUST = 'Hathi Trust'.freeze
       COL_HATHI_TRUST_ERROR = "#{COL_HATHI_TRUST} Error".freeze
 
-      V_NRLF = 'nrlf'.freeze
-      V_SRLF = 'srlf'.freeze
+      V_SLFN = 'slfn'.freeze
+      V_SLFS = 'slfs'.freeze
 
-      attr_reader :ss, :rlf, :uc, :hathi_trust
+      attr_reader :ss, :slf, :uc, :hathi_trust
 
-      def initialize(ss, rlf: true, uc: true, hathi_trust: true)
+      def initialize(ss, slf: true, uc: true, hathi_trust: true)
         @ss = ss
-        @rlf = rlf
+        @slf = slf
         @uc = uc
         @hathi_trust = hathi_trust
 
@@ -32,7 +32,7 @@ module BerkeleyLibrary
       def <<(result)
         r_indices = row_indices_for(result.oclc_number)
         r_indices.each do |idx|
-          write_wc_cols(idx, result) if rlf || uc
+          write_wc_cols(idx, result) if slf || uc
           write_ht_cols(idx, result) if hathi_trust
         end
       end
@@ -41,7 +41,7 @@ module BerkeleyLibrary
 
       def write_wc_cols(r_index, result)
         write_wc_error(r_index, result)
-        write_rlf(r_index, result) if rlf
+        write_slf(r_index, result) if slf
         write_uc(r_index, result) if uc
       end
 
@@ -51,9 +51,9 @@ module BerkeleyLibrary
       end
 
       def ensure_columns!
-        if rlf
-          nrlf_col_index
-          srlf_col_index
+        if slf
+          slfn_col_index
+          slfs_col_index
         end
         uc_col_index if uc
         ht_col_index if hathi_trust
@@ -66,9 +66,9 @@ module BerkeleyLibrary
         raise ArgumentError, "Unknown OCLC number: #{oclc_number}"
       end
 
-      def write_rlf(r_index, result)
-        ss.set_value_at(r_index, nrlf_col_index, V_NRLF) if result.nrlf?
-        ss.set_value_at(r_index, srlf_col_index, V_SRLF) if result.srlf?
+      def write_slf(r_index, result)
+        ss.set_value_at(r_index, slfn_col_index, V_SLFN) if result.slfn?
+        ss.set_value_at(r_index, slfs_col_index, V_SLFS) if result.slfs?
       end
 
       def write_uc(r_index, result)
@@ -99,12 +99,12 @@ module BerkeleyLibrary
         @oclc_col_index ||= ss.find_column_index_by_header!(OCLC_COL_HEADER)
       end
 
-      def nrlf_col_index
-        @nrlf_col_index ||= ss.ensure_column!(COL_NRLF)
+      def slfn_col_index
+        @slfn_col_index ||= ss.ensure_column!(COL_SLFN)
       end
 
-      def srlf_col_index
-        @srlf_col_index ||= ss.ensure_column!(COL_SRLF)
+      def slfs_col_index
+        @slfs_col_index ||= ss.ensure_column!(COL_SLFS)
       end
 
       def uc_col_index

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: berkeley_library-location
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.3.0
 platform: ruby
 authors:
 - UC Berkeley Library IT
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-13 00:00:00.000000000 Z
+date: 2026-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: berkeley_library-logging
@@ -72,6 +72,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.2
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.19.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.19.1
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -188,16 +202,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.39'
+        version: 1.75.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.39'
+        version: 1.75.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -328,14 +342,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Locaton-related utilities for the UC Berkeley Library