qa 5.15.0 → 5.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11cbb13006d50dd1457c8782b84f49a677717302d43a3978e3629670ac9ec433
-  data.tar.gz: 72c2de2f8114cc9df223ef68eeac9f3ff9046a74c87dd93103a3461d24c2c15e
+  metadata.gz: 72045748a59fdac5d424b0f6f0703e55282b3971380bc8c8288ccc66677d38d8
+  data.tar.gz: b03d37809c9d45a4c20b2b3dce9ce3a650fbb187580b21f6fdc956f549fef710
 SHA512:
-  metadata.gz: 30f799610d3d6980f0e33d3b5fcb2364e9c0019c18f8a12f5474dd22a82ccb865f95cc5f4d49da70df2246fda033ab17ea20dd3da554c220b881841d2a64c1bf
-  data.tar.gz: cc3c22f2e7cb940eff5f7f3d398090ae2caaff78840a81eff1ea9e229d1db2c2a17673617e0cd12fd9aef1a6ffa30128accf66cf8eaa1537b0df901e1847ceac
+  metadata.gz: be2bdd94bae283c15a285c3213be0d780053948da33da5e933cc790cdf3ba2fac4c343380b68b80853d2c0fd83aee7c15ed059372fe314af3094376df855b8d7
+  data.tar.gz: 85500cf3c3b1d1a86b002ec6ef748d70b91a0f021caec6ef6ba94861766b67035bfb926fcd59c9e6a6d67abf107c99bf5d0a475b64f122604a006d1386753b29

data/lib/qa/authorities/discogs/generic_authority.rb

@@ -1,12 +1,15 @@
 require 'rdf'
 require 'rdf/ntriples'
+require 'net/http'
+require 'json'
+
 module Qa::Authorities
   class Discogs::GenericAuthority < Base
     include WebServiceBase
     include Discogs::DiscogsTranslation
     include Discogs::DiscogsUtils
 
-    class_attribute :discogs_secret, :discogs_key
+    class_attribute :discogs_secret, :discogs_key, :discogs_user_token
     attr_accessor :primary_artists, :selected_format, :work_uri, :instance_uri
 
     # @param [String] subauthority to use
@@ -26,8 +29,8 @@ module Qa::Authorities
       # physical or digital object and a master represents a set of similar releases. Use of a
       # subauthority (e.g., /qa/search/discogs/master) will target a specific type. Using the "all"
       #  subauthority will search for both types.
-      unless discogs_key && discogs_secret
-        Rails.logger.error "Questioning Authority tried to call Discogs, but no secret and/or key were set."
+      unless discogs_user_token.present? || (discogs_key && discogs_secret)
+        Rails.logger.error "Questioning Authority tried to call Discogs, but no user token, secret and/or key were set."
         return []
       end
       response = json(build_query_url(q, tc))
@@ -72,7 +75,9 @@ module Qa::Authorities
         per_page = tc.params["per_page"]
       end
       escaped_q = ERB::Util.url_encode(q)
-      "https://api.discogs.com/database/search?q=#{escaped_q}&type=#{tc.params['subauthority']}&page=#{page}&per_page=#{per_page}&key=#{discogs_key}&secret=#{discogs_secret}"
+      url = "https://api.discogs.com/database/search?q=#{escaped_q}&type=#{tc.params['subauthority']}&page=#{page}&per_page=#{per_page}"
+      url += "&key=#{discogs_key}&secret=#{discogs_secret}" if discogs_user_token.blank?
+      url
     end
 
     # @param [String] the id of the selected item
@@ -82,6 +87,23 @@ module Qa::Authorities
       "https://api.discogs.com/#{subauthority}s/#{id}"
     end
 
+    def json(url)
+      if discogs_user_token.present?
+        uri = URI(url)
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = true
+
+        request = Net::HTTP::Get.new(uri)
+        request['Authorization'] = "Discogs token=#{discogs_user_token}"
+        request['User-Agent'] = 'HykuApp/1.0'
+
+        response = http.request(request)
+        JSON.parse(response.body)
+      else
+        super
+      end
+    end
+
     private
 
       # In the unusual case that we have an id and the subauthority is "all", we don't know which Discogs url to

data/lib/qa/version.rb

@@ -1,3 +1,3 @@
 module Qa
-  VERSION = "5.15.0".freeze
+  VERSION = "5.16.0".freeze
 end

data/spec/lib/authorities/discogs/generic_authority_spec.rb

@@ -4,6 +4,7 @@ describe Qa::Authorities::Discogs::GenericAuthority do
   before do
     described_class.discogs_key = 'dummy_key'
     described_class.discogs_secret = 'dummy_secret'
+    described_class.discogs_user_token = nil
   end
 
   let(:authority) { described_class.new "all" }
@@ -29,6 +30,18 @@ describe Qa::Authorities::Discogs::GenericAuthority do
 
       it { is_expected.to eq 'https://api.discogs.com/database/search?q=foo&type=master&page=1&per_page=10&key=dummy_key&secret=dummy_secret' }
     end
+
+    context "with a user token" do
+      subject { authority.build_query_url("foo", tc) }
+      let(:tc) { instance_double(Qa::TermsController) }
+      before do
+        described_class.discogs_user_token = 'dummy_token'
+        allow(Qa::TermsController).to receive(:new).and_return(tc)
+        allow(tc).to receive(:params).and_return('page' => "1", 'per_page' => "10", 'subauthority' => "master")
+      end
+
+      it { is_expected.to eq 'https://api.discogs.com/database/search?q=foo&type=master&page=1&per_page=10' }
+    end
   end
 
   describe "#find_url" do
@@ -363,6 +376,33 @@ describe Qa::Authorities::Discogs::GenericAuthority do
         end
       end
 
+      context "with user token authentication" do
+        let(:tc) { instance_double(Qa::TermsController) }
+        let :results do
+          described_class.discogs_user_token = 'dummy_token'
+          described_class.discogs_key = nil
+          described_class.discogs_secret = nil
+          stub_request(:get, "https://api.discogs.com/database/search?q=melody+gardot&type=all&page=&per_page=")
+            .with(
+              headers: {
+                'Authorization' => 'Discogs token=dummy_token',
+                'User-Agent' => 'HykuApp/1.0'
+              }
+            )
+            .to_return(status: 200, body: webmock_fixture("discogs-search-response-no-subauth.json"))
+          authority.search("melody gardot", tc)
+        end
+        before do
+          allow(Qa::TermsController).to receive(:new).and_return(tc)
+          allow(tc).to receive(:params).and_return('subauthority' => "all")
+        end
+
+        it "has id and label keys" do
+          expect(results.first["uri"]).to eq("https://www.discogs.com/Melody-Gardot-Who-Will-Comfort-Me-Over-The-Rainbow/release/1750352")
+          expect(results.first["id"]).to eq "1750352"
+        end
+      end
+
       context "when authentication isn't set" do
         let(:tc) { instance_double(Qa::TermsController) }
         let :results do
@@ -373,12 +413,13 @@ describe Qa::Authorities::Discogs::GenericAuthority do
         before do
           described_class.discogs_secret = nil
           described_class.discogs_key = nil
+          described_class.discogs_user_token = nil
           allow(Qa::TermsController).to receive(:new).and_return(tc)
           allow(tc).to receive(:params).and_return('subauthority' => "master")
         end
 
         it "logs an error" do
-          expect(Rails.logger).to receive(:error).with('Questioning Authority tried to call Discogs, but no secret and/or key were set.')
+          expect(Rails.logger).to receive(:error).with('Questioning Authority tried to call Discogs, but no user token, secret and/or key were set.')
           expect(results).to be_empty
         end
       end

data/spec/spec_helper.rb

@@ -22,7 +22,11 @@ require 'pry'
 Dir[File.join(File.dirname(__FILE__), "support/**/*.rb")].each { |f| require f }
 
 RSpec.configure do |config|
-  config.fixture_path = File.expand_path("../fixtures", __FILE__)
+  if config.respond_to?(:fixture_paths=)
+    config.fixture_paths = [File.expand_path("../fixtures", __FILE__)]
+  else
+    config.fixture_path = File.expand_path("../fixtures", __FILE__)
+  end
 
   config.use_transactional_fixtures = true
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qa
 version: !ruby/object:Gem::Version
-  version: 5.15.0
+  version: 5.16.0
 platform: ruby
 authors:
 - Stephen Anderson
@@ -16,7 +16,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-02 00:00:00.000000000 Z
+date: 2025-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-import
@@ -114,20 +114,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '8.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '8.2'
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement