berkeley_library-av-core 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79eeca0ec147ccba75f22e0589b58821fea176bf4aac9759cf18932fdad1deec
-  data.tar.gz: 48b3c4299e46475cf14b1d764eb84198d98e0571af648008ec3b46775bab478d
+  metadata.gz: 971da7efa1200b726375ad3d140e194e430dd26f445640469bacebc9c9f2a7ea
+  data.tar.gz: 20d351482ba8d7d9e31ae026d250462abaca8e1285793737c51f1ce0f0fa6386
 SHA512:
-  metadata.gz: dd767008eaf6d51c5a4e1ce94feeaa5951332c07eba79ce13101a4b79ecfa885c978f2d258946b6a5cb3ac66637ff1a7679aa18f0a44d4e42027f8f016fa87c3
-  data.tar.gz: f35e8b193c25d40ce110d7031875ac254c7521c4618c11c689ca853a92445be233c66da21ae7b3f895fe2db28290227cb23fd6cf6f48d3aabf8ea124b37e689d
+  metadata.gz: ab15fd5cbb329b686211a62c6d653e2c8af16f6a1bb68414e8eedfcb183b5e4b0bbcecabff013d724051059540e6b5b7f42018733dbbf629e6e7c04e3fc36c95
+  data.tar.gz: 3b3f405f9c7abb05037963e51e92cf8a83d47ea80881d9d4ba4e96a0846a1d7d7a12a1a54f0a7b09aa6178b9f4c797e6e97755614b035e3c82976f46afe071a9

data/.github/workflows/build.yml

@@ -11,7 +11,7 @@ jobs:
 
     steps:
       - name: Check out repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
@@ -24,7 +24,7 @@ jobs:
 
       - name: Upload artifacts
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: artifacts
+          name: artifacts-${{ matrix.os }}-${{ matrix.ruby }}
           path: artifacts/**

data/.github/workflows/gem-push.yml

@@ -13,7 +13,7 @@ jobs:
       packages: write
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1

data/CHANGES.md

@@ -1,3 +1,8 @@
+# 0.4.3 (2025-11-04)
+
+- BerkeleyLibrary::AV::Metadata::Readers:TIND now uses the /api/v1/search endpoint to retrieve records. The public /search endpoint stopped working for non-browser/human clients in the past week due to TIND changes.
+- BerkeleyLibrary::AV::Util#do_get sources the TIND API key from ENV['LIT_TIND_API_KEY'] if it's set.
+
 # 0.4.2 (2024-10-10)
 
 - Add TRANSCRIPTS to `AV::METADATA::FIELDS`
@@ -18,7 +23,7 @@
   - `Metadata#player_link_text`
   - `Metadata#player_url`
 - Remove the following constants:
-  - `AV::Constants::RESTRICTIONS_CALNET` 
+  - `AV::Constants::RESTRICTIONS_CALNET`
   - `AV::Constants::RESTRICTIONS_UCB_IP`
   - `AV::Constants::RESTRICTIONS`
   - `AV::Constants::RESTRICTIONS_NONE`

data/lib/berkeley_library/av/core/module_info.rb

@@ -8,7 +8,7 @@ module BerkeleyLibrary
         SUMMARY = 'UC Berkeley Library audio/video core code'.freeze
         DESCRIPTION = 'Gem for UC Berkeley Library shared audio/video code'.freeze
         LICENSE = 'MIT'.freeze
-        VERSION = '0.4.2'.freeze
+        VERSION = '0.4.3'.freeze
         HOMEPAGE = 'https://github.com/BerkeleyLibrary/av-core'.freeze
 
         private_class_method :new

data/lib/berkeley_library/av/metadata/readers/tind.rb

@@ -22,9 +22,9 @@ module BerkeleyLibrary
             id_field = id_field_for(record_id)
             query_string = URI.encode_www_form(
               'p' => "#{id_field}:\"#{record_id}\"",
-              'of' => 'xm'
+              'format' => 'xml'
             )
-            URIs.append(base_uri, 'search', '?', query_string)
+            URIs.append(base_uri, 'api/v1/search', '?', query_string)
           end
 
           protected

data/lib/berkeley_library/av/util.rb

@@ -12,7 +12,11 @@ module BerkeleyLibrary
       DEFAULT_USER_AGENT = "#{Core::ModuleInfo::NAME} #{Core::ModuleInfo::VERSION} (#{Core::ModuleInfo::HOMEPAGE})".freeze
 
       def do_get(uri, ignore_errors: false)
-        body = URIs.get(uri, headers: { user_agent: DEFAULT_USER_AGENT })
+        headers = { user_agent: DEFAULT_USER_AGENT }
+        if uri.to_s.start_with?(BerkeleyLibrary::AV::Config.tind_base_uri.to_s) && ENV['LIT_TIND_API_KEY']
+          headers[:authorization] = "Token #{ENV['LIT_TIND_API_KEY']}"
+        end
+        body = URIs.get(uri, headers:)
         body && body.scrub
       rescue RestClient::Exception
         raise unless ignore_errors

data/spec/lib/berkeley_library/av/metadata/metadata_spec.rb

@@ -183,7 +183,7 @@ module BerkeleyLibrary
           it 'injects a TIND URL if not present (1/2)' do
             tind_035 = '(miscmat)00615'
             marc_xml = File.read("spec/data/record-#{tind_035}.xml")
-            search_url = "https://digicoll.lib.berkeley.edu/search?p=035__a%3A%22#{CGI.escape(tind_035)}%22&of=xm"
+            search_url = "https://digicoll.lib.berkeley.edu/api/v1/search?p=035__a%3A%22#{CGI.escape(tind_035)}%22&format=xml"
             stub_request(:get, search_url).to_return(status: 200, body: marc_xml)
             metadata = Metadata.for_record(record_id: tind_035)
 
@@ -200,7 +200,7 @@ module BerkeleyLibrary
           it 'injects a TIND URL if not present (2/2)' do
             tind_035 = 'physcolloquia-bk00169017b'
             marc_xml = File.read("spec/data/record-#{tind_035}.xml")
-            search_url = "https://digicoll.lib.berkeley.edu/search?p=035__a%3A%22#{CGI.escape(tind_035)}%22&of=xm"
+            search_url = "https://digicoll.lib.berkeley.edu/api/v1/search?p=035__a%3A%22#{CGI.escape(tind_035)}%22&format=xml"
             stub_request(:get, search_url).to_return(status: 200, body: marc_xml)
             metadata = Metadata.for_record(record_id: tind_035)
 
@@ -218,7 +218,7 @@ module BerkeleyLibrary
           it 'works for TIND records with OskiCat URLs' do
             tind_035 = '(pacradio)00107'
             marc_xml = File.read("spec/data/record-#{tind_035}.xml")
-            search_url = "https://digicoll.lib.berkeley.edu/search?p=035__a%3A%22#{CGI.escape(tind_035)}%22&of=xm"
+            search_url = "https://digicoll.lib.berkeley.edu/api/v1/search?p=035__a%3A%22#{CGI.escape(tind_035)}%22&format=xml"
             stub_request(:get, search_url).to_return(status: 200, body: marc_xml)
             metadata = Metadata.for_record(record_id: tind_035)
 
@@ -239,7 +239,7 @@ module BerkeleyLibrary
           it 'works for TIND-only records' do
             tind_035 = 'physcolloquia-bk00169017b'
             marc_xml = File.read("spec/data/record-#{tind_035}.xml")
-            search_url = "https://digicoll.lib.berkeley.edu/search?p=035__a%3A%22#{CGI.escape(tind_035)}%22&of=xm"
+            search_url = "https://digicoll.lib.berkeley.edu/api/v1/search?p=035__a%3A%22#{CGI.escape(tind_035)}%22&format=xml"
             stub_request(:get, search_url).to_return(status: 200, body: marc_xml)
             metadata = Metadata.for_record(record_id: tind_035)
 
@@ -259,7 +259,7 @@ module BerkeleyLibrary
           it 'returns the values' do
             tind_035 = 'physcolloquia-bk00169017b'
             marc_xml = File.read("spec/data/record-#{tind_035}.xml")
-            search_url = "https://digicoll.lib.berkeley.edu/search?p=035__a%3A%22#{CGI.escape(tind_035)}%22&of=xm"
+            search_url = "https://digicoll.lib.berkeley.edu/api/v1/search?p=035__a%3A%22#{CGI.escape(tind_035)}%22&format=xml"
             stub_request(:get, search_url).to_return(status: 200, body: marc_xml)
             metadata = Metadata.for_record(record_id: tind_035)
 

data/spec/lib/berkeley_library/av/metadata/source_spec.rb

@@ -161,7 +161,7 @@ module BerkeleyLibrary
 
           before do
             AV::Config.tind_base_uri = 'https://digicoll.lib.berkeley.edu'
-            @record_url = 'https://digicoll.lib.berkeley.edu/search?p=035__a%3A%22%28pacradio%2900107%22&of=xm'
+            @record_url = 'https://digicoll.lib.berkeley.edu/api/v1/search?p=035__a%3A%22%28pacradio%2900107%22&format=xml'
           end
 
           after do

data/spec/lib/berkeley_library/av/record_spec.rb

@@ -46,7 +46,7 @@ module BerkeleyLibrary
         it 'returns a player URI based on the record ID for TIND records' do
           tind_035 = '(pacradio)01469'
           marc_xml = File.read("spec/data/record-#{tind_035}.xml")
-          search_url = "https://digicoll.lib.berkeley.edu/search?p=035__a%3A%22#{CGI.escape(tind_035)}%22&of=xm"
+          search_url = "https://digicoll.lib.berkeley.edu/api/v1/search?p=035__a%3A%22#{CGI.escape(tind_035)}%22&format=xml"
           stub_request(:get, search_url).to_return(status: 200, body: marc_xml)
 
           collection = 'Pacifica'
@@ -145,7 +145,7 @@ module BerkeleyLibrary
 
         it 'returns the TIND ID for TIND records' do
           marc_xml = File.read('spec/data/record-(pacradio)01469.xml')
-          search_url = 'https://digicoll.lib.berkeley.edu/search?p=035__a%3A%22%28pacradio%2901469%22&of=xm'
+          search_url = 'https://digicoll.lib.berkeley.edu/api/v1/search?p=035__a%3A%22%28pacradio%2901469%22&format=xml'
           stub_request(:get, search_url).to_return(status: 200, body: marc_xml)
 
           record = Record.from_metadata(
@@ -168,7 +168,7 @@ module BerkeleyLibrary
         it 'returns nil for TIND records with no bib number' do
           tind_id = '(clir)00020'
           marc_xml = File.read('spec/data/record-(clir)00020.xml')
-          search_url = 'https://digicoll.lib.berkeley.edu/search?p=035__a%3A%22%28clir%2900020%22&of=xm'
+          search_url = 'https://digicoll.lib.berkeley.edu/api/v1/search?p=035__a%3A%22%28clir%2900020%22&format=xml'
           stub_request(:get, search_url).to_return(status: 200, body: marc_xml)
 
           record = Record.from_metadata(collection: 'Video-Public-Bancroft', record_id: tind_id)
@@ -179,7 +179,7 @@ module BerkeleyLibrary
       describe :from_metadata do
         it 'loads the metadata' do
           marc_xml = File.read('spec/data/record-(pacradio)01469.xml')
-          search_url = 'https://digicoll.lib.berkeley.edu/search?p=035__a%3A%22%28pacradio%2901469%22&of=xm'
+          search_url = 'https://digicoll.lib.berkeley.edu/api/v1/search?p=035__a%3A%22%28pacradio%2901469%22&format=xml'
           stub_request(:get, search_url).to_return(status: 200, body: marc_xml)
 
           record = Record.from_metadata(collection: 'Pacifica', record_id: '(pacradio)01469')
@@ -223,7 +223,7 @@ module BerkeleyLibrary
         end
 
         it "raises #{AV::RecordNotFound} if the record cannot be found" do
-          search_url = 'https://digicoll.lib.berkeley.edu/search?p=035__a%3A%22%28pacradio%2901469%22&of=xm'
+          search_url = 'https://digicoll.lib.berkeley.edu/api/v1/search?p=035__a%3A%22%28pacradio%2901469%22&format=xml'
           stub_request(:get, search_url).to_return(status: 404)
           expect do
             Record.from_metadata(

data/spec/lib/berkeley_library/av/util_spec.rb

@@ -24,6 +24,32 @@ module BerkeleyLibrary
           result = AV::Util.do_get(url, ignore_errors: true)
           expect(result).to be_nil
         end
+
+        it 'includes authorization header for TIND requests if LIT_TIND_API_KEY is set' do
+          expected_ua = Util::DEFAULT_USER_AGENT
+          expected_auth = 'Token some-long-api-token-value'
+
+          # expect do_get to call URIs.get with the correct headers
+          # but we don't need to actually perform the request
+          allow(BerkeleyLibrary::Util::URIs).to receive(:get).and_return('<response></response>')
+          allow(AV::Config).to receive(:tind_base_uri).and_return(URI('https://tind.example.edu/'))
+          url = "#{AV::Config.tind_base_uri}/some/api/endpoint"
+          ENV['LIT_TIND_API_KEY'] = 'some-long-api-token-value'
+          AV::Util.do_get(url)
+          expect(BerkeleyLibrary::Util::URIs).to have_received(:get).with(url, headers: { user_agent: expected_ua, authorization: expected_auth })
+        end
+
+        it 'does not include authorization header for non-TIND requests' do
+          expected_ua = Util::DEFAULT_USER_AGENT
+
+          # expect do_get to call URIs.get with the correct headers
+          # but we don't need to actually perform the request
+          allow(BerkeleyLibrary::Util::URIs).to receive(:get).and_return('<response></response>')
+          url = URI('https://alma.example.edu/some/api/endpoint')
+          ENV['LIT_TIND_API_KEY'] = nil
+          AV::Util.do_get(url)
+          expect(BerkeleyLibrary::Util::URIs).to have_received(:get).with(url, headers: { user_agent: expected_ua })
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: berkeley_library-av-core
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - David Moles
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-10 00:00:00.000000000 Z
+date: 2025-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: berkeley_library-logging
@@ -428,7 +428,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -444,7 +444,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.19
-signing_key: 
+signing_key:
 specification_version: 4
 summary: UC Berkeley Library audio/video core code
 test_files: