qa 4.2.0 → 4.3.0

data/lib/qa/authorities/getty/tgn.rb

@@ -28,7 +28,7 @@ module Qa::Authorities
       end
       %(SELECT DISTINCT ?s ?name ?par {
         ?s a skos:Concept; luc:term "#{search}";
-            skos:inScheme <http://vocab.getty.edu/ulan/> ;
+            skos:inScheme <http://vocab.getty.edu/tgn/> ;
             gvp:prefLabelGVP [skosxl:literalForm ?name] ;
                   gvp:parentString ?par .
         FILTER #{ex} .

data/lib/qa/authorities/linked_data/find_term.rb

@@ -15,17 +15,21 @@ module Qa::Authorities
         @term_config = term_config
       end
 
-      attr_reader :term_config, :full_graph, :filtered_graph, :language, :id, :uri, :access_time_s, :normalize_time_s, :fetched_size, :normalized_size
-      private :full_graph, :filtered_graph, :language, :id, :uri, :access_time_s, :normalize_time_s, :fetched_size, :normalized_size
+      attr_reader :term_config, :full_graph, :filtered_graph, :language, :id, :uri, :access_time_s, :normalize_time_s, :fetched_size, :normalized_size, :subauthority
+      private :full_graph, :filtered_graph, :language, :id, :uri, :access_time_s, :normalize_time_s, :fetched_size, :normalized_size, :subauthority
 
       delegate :term_subauthority?, :prefixes, :authority_name, to: :term_config
 
       # Find a single term in a linked data authority
       # @param [String] the id of the term to fetch
-      # @param [Symbol] (optional) language: language used to select literals when multi-language is supported (e.g. :en, :fr, etc.)
-      # @param [Hash] (optional) replacements: replacement values with { pattern_name (defined in YAML config) => value }
-      # @param [String] subauth: the subauthority from which to fetch the term
-      # @return [Hash] json results
+      # @param request_header [Hash] optional attributes that can be appended to the generated URL
+      # @option language [Symbol] language used to select literals when multi-language is supported (e.g. :en, :fr, etc.)
+      # @option replacements [Hash] replacement values with { pattern_name (defined in YAML config) => value }
+      # @option subauthority [String] the subauthority from which to fetch the term
+      # @option format [String] return data in this format
+      # @option performance_data [Boolean] true if include_performance_data should be returned with the results; otherwise, false (default: false)
+      # @note All parameters after request_header are deprecated and will be removed in the next major release.
+      # @return [Hash, String] normalized json results when format='json'; otherwise, serialized RDF in the requested format
       # @example Json Results for Linked Data Term
       #   { "uri":"http://id.worldcat.org/fast/530369",
       #     "id":"530369","label":"Cornell University",
@@ -39,13 +43,12 @@ module Qa::Authorities
       #     "http://schema.org/name":["Cornell University","Ithaca (N.Y.). Cornell University"],
       #     "http://www.w3.org/2004/02/skos/core#altLabel":["Ithaca (N.Y.). Cornell University"],
       #     "http://schema.org/sameAs":["http://id.loc.gov/authorities/names/n79021621","https://viaf.org/viaf/126293486"] } }
-      def find(id, language: nil, replacements: {}, subauth: nil, jsonld: false, performance_data: false) # rubocop:disable Metrics/ParameterLists
-        raise Qa::InvalidLinkedDataAuthority, "Unable to initialize linked data term sub-authority #{subauth}" unless subauth.nil? || term_subauthority?(subauth)
-        @language = language_service.preferred_language(user_language: language, authority_language: term_config.term_language)
+      def find(id, request_header: {}, language: nil, replacements: {}, subauth: nil, format: 'json', performance_data: false) # rubocop:disable Metrics/ParameterLists
+        request_header = build_request_header(language: language, replacements: replacements, subauth: subauth, format: format, performance_data: performance_data) if request_header.empty?
+        unpack_request_header(request_header)
+        raise Qa::InvalidLinkedDataAuthority, "Unable to initialize linked data term sub-authority #{subauthority}" unless subauthority.nil? || term_subauthority?(subauthority)
         @id = id
-        @performance_data = performance_data
-        @jsonld = jsonld
-        url = authority_service.build_url(action_config: term_config, action: :term, action_request: normalize_id, substitutions: replacements, subauthority: subauth, language: @language)
+        url = authority_service.build_url(action_config: term_config, action: :term, action_request: normalize_id, request_header: request_header)
         Rails.logger.info "QA Linked Data term url: #{url}"
         load_graph(url: url)
         normalize_results
@@ -66,20 +69,22 @@ module Qa::Authorities
 
         def normalize_results
           normalize_start_dt = Time.now.utc
-          normalize_end_dt = Time.now.utc
 
-          json = perform_normalization
+          results = perform_normalization
 
+          normalize_end_dt = Time.now.utc
           @normalize_time_s = normalize_end_dt - normalize_start_dt
-          @normalized_size = json.to_s.size if performance_data?
-          Rails.logger.info("Time to convert data to json: #{normalize_time_s}s")
-          json = append_performance_data(json) if performance_data?
-          json
+          @normalized_size = results.to_s.size if performance_data?
+          Rails.logger.info("Time to normalize data: #{normalize_time_s}s")
+          results = append_performance_data(results) if performance_data?
+          results
         end
 
         def perform_normalization
           return "{}" unless full_graph.size.positive?
           return full_graph.dump(:jsonld, standard_prefixes: true) if jsonld?
+          return full_graph.dump(:n3, standard_prefixes: true) if n3?
+          return full_graph.dump(:ntriples, standard_prefixes: true) if ntriples?
 
           filter_graph
           extract_uri
@@ -87,6 +92,15 @@ module Qa::Authorities
           convert_results_to_json(results)
         end
 
+        def unpack_request_header(request_header)
+          @subauthority = request_header.fetch(:subauthority, nil)
+          @format = request_header.fetch(:format, 'json')
+          @performance_data = request_header.fetch(:performance_data, false)
+          @language = language_service.preferred_language(user_language: request_header.fetch(:user_language, nil),
+                                                          authority_language: term_config.term_language)
+          request_header[:language] = Array(@language)
+        end
+
         def filter_graph
           @filtered_graph = graph_service.deep_copy(graph: @full_graph)
           @filtered_graph = graph_service.filter(graph: @filtered_graph, language: language) unless language.blank?
@@ -182,10 +196,20 @@ module Qa::Authorities
           opt_ldpaths.delete_if { |_k, v| v.blank? }
         end
 
+        # Give precedent to format parameter over jsonld parameter.  NOTE: jsonld parameter for find method is deprecated.
         def jsonld?
+          return @format.casecmp?('jsonld') if @format
           @jsonld == true
         end
 
+        def n3?
+          @format && @format.casecmp?('n3')
+        end
+
+        def ntriples?
+          @format && @format.casecmp?('ntriples')
+        end
+
         def performance_data?
           @performance_data == true && !jsonld?
         end
@@ -270,6 +294,24 @@ module Qa::Authorities
                           total_time_s: (access_time_s + normalize_time_s) }
           { performance: performance, results: results }
         end
+
+        # This is providing support for calling build_url with individual parameters instead of the request_header.
+        # This is deprecated and will be removed in the next major release.
+        def build_request_header(language:, replacements:, subauth:, format:, performance_data:) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+          unless language.blank? && replacements.blank? && subauth.blank? && format == 'json' && !performance_data
+            Qa.deprecation_warning(
+              in_msg: 'Qa::Authorities::LinkedData::FindTerm',
+              msg: "individual attributes for options (e.g. replacements, subauth, language) are deprecated; use request_header instead"
+            )
+          end
+          request_header = {}
+          request_header[:replacements] = replacements || {}
+          request_header[:subauthority] = subauth || nil
+          request_header[:language] = language || nil
+          request_header[:format] = format || 'json'
+          request_header[:performance_data] = performance_data
+          request_header
+        end
     end
   end
 end

data/lib/qa/authorities/linked_data/search_query.rb

@@ -15,29 +15,30 @@ module Qa::Authorities
         @search_config = search_config
       end
 
-      attr_reader :search_config, :full_graph, :filtered_graph, :language, :access_time_s, :normalize_time_s, :fetched_size, :normalized_size
-      private :full_graph, :filtered_graph, :language, :access_time_s, :normalize_time_s, :fetched_size, :normalized_size
+      attr_reader :search_config, :full_graph, :filtered_graph, :language, :access_time_s, :normalize_time_s, :fetched_size, :normalized_size, :subauthority
+      private :full_graph, :filtered_graph, :language, :access_time_s, :normalize_time_s, :fetched_size, :normalized_size, :subauthority
 
       delegate :subauthority?, :supports_sort?, :prefixes, :authority_name, to: :search_config
 
       # Search a linked data authority
       # @praram [String] the query
-      # @param language [Symbol] (optional) language used to select literals when multi-language is supported (e.g. :en, :fr, etc.)
-      # @param replacements [Hash] (optional) replacement values with { pattern_name (defined in YAML config) => value }
-      # @param subauth [String] (optional) the subauthority to query
-      # @param context [Boolean] (optional) true if context should be returned with the results; otherwise, false (default: false)
-      # @param performance_data [Boolean] (optional) true if include_performance_data should be returned with the results; otherwise, false (default: false)
+      # @param request_header [Hash] optional attributes that can be appended to the generated URL
+      # @option language [Symbol] language used to select literals when multi-language is supported (e.g. :en, :fr, etc.)
+      # @option replacements [Hash] replacement values with { pattern_name (defined in YAML config) => value }
+      # @option subauthority [String] the subauthority to query
+      # @option context [Boolean] true if context should be returned with the results; otherwise, false (default: false)
+      # @option performance_data [Boolean] true if include_performance_data should be returned with the results; otherwise, false (default: false)
       # @return [String] json results
+      # @note All parameters after request_header are deprecated and will be removed in the next major release.
       # @example Json Results for Linked Data Search
       #   [ {"uri":"http://id.worldcat.org/fast/5140","id":"5140","label":"Cornell, Joseph"},
       #     {"uri":"http://id.worldcat.org/fast/72456","id":"72456","label":"Cornell, Sarah Maria, 1802-1832"},
       #     {"uri":"http://id.worldcat.org/fast/409667","id":"409667","label":"Cornell, Ezra, 1807-1874"} ]
-      def search(query, language: nil, replacements: {}, subauth: nil, context: false, performance_data: false) # rubocop:disable Metrics/ParameterLists
-        raise Qa::InvalidLinkedDataAuthority, "Unable to initialize linked data search sub-authority #{subauth}" unless subauth.nil? || subauthority?(subauth)
-        @context = context
-        @performance_data = performance_data
-        @language = language_service.preferred_language(user_language: language, authority_language: search_config.language)
-        url = authority_service.build_url(action_config: search_config, action: :search, action_request: query, substitutions: replacements, subauthority: subauth, language: @language)
+      def search(query, request_header: {}, language: nil, replacements: {}, subauth: nil, context: false, performance_data: false) # rubocop:disable Metrics/ParameterLists
+        request_header = build_request_header(language: language, replacements: replacements, subauth: subauth, context: context, performance_data: performance_data) if request_header.empty?
+        unpack_request_header(request_header)
+        raise Qa::InvalidLinkedDataAuthority, "Unable to initialize linked data search sub-authority #{subauthority}" unless subauthority.nil? || subauthority?(subauthority)
+        url = authority_service.build_url(action_config: search_config, action: :search, action_request: query, request_header: request_header)
         Rails.logger.info "QA Linked Data search url: #{url}"
         load_graph(url: url)
         normalize_results
@@ -66,7 +67,7 @@ module Qa::Authorities
           normalize_end_dt = Time.now.utc
           @normalize_time_s = normalize_end_dt - normalize_start_dt
           @normalized_size = json.to_s.size if performance_data?
-          Rails.logger.info("Time to convert data to json: #{normalize_time_s}s")
+          Rails.logger.info("Time to normalize data: #{normalize_time_s}s")
           json = append_performance_data(json) if performance_data?
           json
         end
@@ -87,7 +88,16 @@ module Qa::Authorities
 
           results_mapper_service.map_values(graph: filtered_graph, prefixes: prefixes, ldpath_map: ldpath_map,
                                             predicate_map: predicate_map, sort_key: :sort,
-                                            preferred_language: @language, context_map: context_map)
+                                            preferred_language: language, context_map: context_map)
+        end
+
+        def unpack_request_header(request_header)
+          @subauthority = request_header.fetch(:subauthority, nil)
+          @context = request_header.fetch(:context, false)
+          @performance_data = request_header.fetch(:performance_data, false)
+          @language = language_service.preferred_language(user_language: request_header.fetch(:user_language, nil),
+                                                          authority_language: search_config.language)
+          request_header[:language] = Array(@language)
         end
 
         def context_map
@@ -180,6 +190,24 @@ module Qa::Authorities
                           total_time_s: (access_time_s + normalize_time_s) }
           { performance: performance, results: results }
         end
+
+        # This is providing support for calling build_url with individual parameters instead of the request_header.
+        # This is deprecated and will be removed in the next major release.
+        def build_request_header(language:, replacements:, subauth:, context:, performance_data:) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+          unless language.blank? && replacements.blank? && subauth.blank? && !context && !performance_data
+            Qa.deprecation_warning(
+              in_msg: 'Qa::Authorities::LinkedData::SearchQuery',
+              msg: "individual attributes for options (e.g. replacements, subauth, language) are deprecated; use request_header instead"
+            )
+          end
+          request_header = {}
+          request_header[:replacements] = replacements || {}
+          request_header[:subauthority] = subauth || nil
+          request_header[:language] = language || nil
+          request_header[:context] = context
+          request_header[:performance_data] = performance_data
+          request_header
+        end
     end
   end
 end

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

@@ -26,7 +26,7 @@ module Qa::Authorities
     def build_query_url(q)
       escaped_query = ERB::Util.url_encode(q)
       authority_fragment = Loc.get_url_for_authority(subauthority) + ERB::Util.url_encode(subauthority)
-      "http://id.loc.gov/search/?q=#{escaped_query}&q=#{authority_fragment}&format=json"
+      "https://id.loc.gov/search/?q=#{escaped_query}&q=#{authority_fragment}&format=json"
     end
 
     def find(id)
@@ -34,7 +34,7 @@ module Qa::Authorities
     end
 
     def find_url(id)
-      "http://id.loc.gov/authorities/#{@subauthority}/#{id}.json"
+      "https://id.loc.gov/authorities/#{@subauthority}/#{id}.json"
     end
 
     private

data/lib/qa/version.rb

@@ -1,3 +1,3 @@
 module Qa
-  VERSION = "4.2.0".freeze
+  VERSION = "4.3.0".freeze
 end

data/spec/controllers/linked_data_terms_controller_spec.rb

@@ -425,6 +425,24 @@ describe Qa::LinkedDataTermsController, type: :controller do
             expect(JSON.parse(response.body).keys).to match_array ["@context", "@graph"]
           end
         end
+
+        context 'and it was requested as n3' do
+          it 'succeeds and returns term data as n3 content type' do
+            get :show, params: { id: '530369', vocab: 'OCLC_FAST', format: 'n3' }
+            expect(response).to be_successful
+            expect(response.content_type).to eq 'text/n3'
+            expect(response.body).to start_with "@prefix"
+          end
+        end
+
+        context 'and it was requested as ntriples' do
+          it 'succeeds and returns term data as ntriples content type' do
+            get :show, params: { id: '530369', vocab: 'OCLC_FAST', format: 'ntriples' }
+            expect(response).to be_successful
+            expect(response.content_type).to eq 'application/n-triples'
+            expect(response.body).to include('<http://id.worldcat.org/fast/530369> <http://www.w3.org/2004/02/skos/core#prefLabel> "Cornell University"')
+          end
+        end
       end
 
       context 'when cors headers are enabled' do
@@ -587,6 +605,24 @@ describe Qa::LinkedDataTermsController, type: :controller do
           end
         end
 
+        context 'and it was requested as n3' do
+          it 'succeeds and returns term data as n3 content type' do
+            get :fetch, params: { uri: 'http://id.worldcat.org/fast/530369', vocab: 'LOD_TERM_URI_PARAM_CONFIG', format: 'n3' }
+            expect(response).to be_successful
+            expect(response.content_type).to eq 'text/n3'
+            expect(response.body).to start_with "@prefix"
+          end
+        end
+
+        context 'and it was requested as ntriples' do
+          it 'succeeds and returns term data as ntriples content type' do
+            get :fetch, params: { uri: 'http://id.worldcat.org/fast/530369', vocab: 'LOD_TERM_URI_PARAM_CONFIG', format: 'ntriples' }
+            expect(response).to be_successful
+            expect(response.content_type).to eq 'application/n-triples'
+            expect(response.body).to include('<http://id.worldcat.org/fast/530369> <http://www.w3.org/2004/02/skos/core#prefLabel> "Cornell University"')
+          end
+        end
+
         context 'blank nodes not included in predicates list' do
           before do
             stub_request(:get, 'http://localhost/test_default/term?uri=http://id.worldcat.org/fast/530369wbn')

data/spec/controllers/terms_controller_spec.rb

@@ -82,7 +82,7 @@ describe Qa::TermsController, type: :controller do
 
     context "loc" do
       before do
-        stub_request(:get, "http://id.loc.gov/search/?format=json&q=Berry&q=cs:http://id.loc.gov/authorities/names")
+        stub_request(:get, "https://id.loc.gov/search/?format=json&q=Berry&q=cs:http://id.loc.gov/authorities/names")
           .with(headers: { 'Accept' => 'application/json' })
           .to_return(body: webmock_fixture("loc-names-response.txt"), status: 200)
       end
@@ -188,7 +188,7 @@ describe Qa::TermsController, type: :controller do
   describe "#show" do
     context "with supported authorities" do
       before do
-        stub_request(:get, "http://id.loc.gov/authorities/subjects/sh85077565.json")
+        stub_request(:get, "https://id.loc.gov/authorities/subjects/sh85077565.json")
           .with(headers: { 'Accept' => 'application/json' })
           .to_return(status: 200, body: webmock_fixture("loc-names-response.txt"), headers: {})
       end
@@ -228,5 +228,29 @@ describe Qa::TermsController, type: :controller do
         end
       end
     end
+    context "with request for n3" do
+      before do
+        stub_request(:get, "https://api.discogs.com/releases/3380671")
+          .to_return(status: 200, body: webmock_fixture("discogs-find-response-json.json"))
+      end
+      it 'Access-Control-Allow-Origin is not present' do
+        get :show, params: { vocab: "discogs", subauthority: "release", id: "3380671", format: 'n3' }
+        expect(response).to be_successful
+        expect(response.content_type).to eq 'text/n3'
+        expect(response.body).to start_with "@prefix"
+      end
+    end
+    context "with request for ntriples" do
+      before do
+        stub_request(:get, "https://api.discogs.com/releases/3380671")
+          .to_return(status: 200, body: webmock_fixture("discogs-find-response-json.json"))
+      end
+      it 'Access-Control-Allow-Origin is not present' do
+        get :show, params: { vocab: "discogs", subauthority: "release", id: "3380671", format: 'ntriples' }
+        expect(response).to be_successful
+        expect(response.content_type).to eq 'application/n-triples'
+        expect(response.body).to include('_:agentn1 <http://www.w3.org/2000/01/rdf-schema#label> "Dexter Gordon"')
+      end
+    end
   end
 end

data/spec/fixtures/discogs-find-response-json.json

@@ -1 +1 @@
-{"status":"Accepted","series":[],"labels":[{"name":"Blue Note"}],"year":1962,"artists":[{"name":"Dexter Gordon"}],"id":3380671,"genres":["Jazz"],"title":"A Swingin' Affair","styles":["Hard Bop"],"formats":[{"qty":"1","descriptions":["LP","Album","Mono"],"name":"Vinyl"}]}
+{"status":"Accepted","series":[],"labels":[{"name":"Blue Note"}],"year":1962,"artists":[{"name":"Dexter Gordon"}],"id":3380671,"genres":["Jazz"],"title":"A Swingin' Affair","styles":["Hard Bop"],"formats":[{"qty":"1","descriptions":["LP","Album","Mono"],"name":"Vinyl"}],"uri":"https://www.discogs.com/Dexter-Gordon-A-Swingin-Affair/release/3380671","resource_url":"https://api.discogs.com/releases/3380671"}

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

@@ -136,6 +136,50 @@ describe Qa::Authorities::Discogs::GenericAuthority do
         end
       end
 
+      context "n3 format and subauthority master" do
+        let(:tc) { instance_double(Qa::TermsController) }
+        let :results do
+          authority.find("950011", tc)
+        end
+        before do
+          allow(Qa::TermsController).to receive(:new).and_return(tc)
+          allow(tc).to receive(:params).and_return('format' => "n3", 'subauthority' => "master")
+        end
+
+        it "returns the Discogs data converted to n3 for a given id" do
+          expect(results).to start_with "@prefix"
+          expect(results).to include("Blue Moon / You Go To My Head")
+          expect(results).to include("Billie Holiday And Her Orchestra")
+          expect(results).to include("Haven Gillespie")
+          expect(results).to include("1952")
+          expect(results).to include("Jazz")
+          expect(results).to include("Barney Kessel")
+          expect(results).to include("Guitar")
+        end
+      end
+
+      context "ntriples format and subauthority master" do
+        let(:tc) { instance_double(Qa::TermsController) }
+        let :results do
+          authority.find("950011", tc)
+        end
+        before do
+          allow(Qa::TermsController).to receive(:new).and_return(tc)
+          allow(tc).to receive(:params).and_return('format' => "ntriples", 'subauthority' => "master")
+        end
+
+        it "returns the Discogs data converted to ntriples for a given id" do
+          expect(results).to include("https://www.discogs.com/Billie-Holiday-And-Her-Orchestra-Blue-Moon-You-Go-To-My-Head/master/950011")
+          expect(results).to include("Blue Moon / You Go To My Head")
+          expect(results).to include("Billie Holiday And Her Orchestra")
+          expect(results).to include("Haven Gillespie")
+          expect(results).to include("1952")
+          expect(results).to include("Jazz")
+          expect(results).to include("Barney Kessel")
+          expect(results).to include("Guitar")
+        end
+      end
+
       context "json-ld format and subauthority all" do
         let(:tc) { instance_double(Qa::TermsController) }
         let :results do
@@ -161,6 +205,56 @@ describe Qa::Authorities::Discogs::GenericAuthority do
           expect(results).to include("1952")
         end
       end
+
+      context "n3 format and subauthority all" do
+        let(:tc) { instance_double(Qa::TermsController) }
+        let :results do
+          authority.find("7143179", tc)
+        end
+        before do
+          allow(Qa::TermsController).to receive(:new).and_return(tc)
+          allow(tc).to receive(:params).and_return('format' => "n3", 'subauthority' => "all")
+        end
+
+        it "returns the Discogs data converted to n3 for a given id" do
+          expect(results).to start_with "@prefix"
+          expect(results).to include("You Go To My Head")
+          expect(results).to include("Rodgers & Hart")
+          expect(results).to include("Ray Brown")
+          expect(results).to include("1952")
+          expect(results).to include("Single")
+          expect(results).to include("mono")
+          expect(results).to include("45 RPM")
+          expect(results).to include("Vinyl")
+          expect(results).to include("http://id.loc.gov/vocabulary/carriers/sd")
+          expect(results).to include("1952")
+        end
+      end
+
+      context "ntriples format and subauthority all" do
+        let(:tc) { instance_double(Qa::TermsController) }
+        let :results do
+          authority.find("7143179", tc)
+        end
+        before do
+          allow(Qa::TermsController).to receive(:new).and_return(tc)
+          allow(tc).to receive(:params).and_return('format' => "ntriples", 'subauthority' => "all")
+        end
+
+        it "returns the Discogs data converted to ntriples for a given id" do
+          expect(results).to include("https://www.discogs.com/Billie-Holiday-And-Her-Orchestra-Blue-Moon-You-Go-To-My-Head/release/7143179")
+          expect(results).to include("You Go To My Head")
+          expect(results).to include("Rodgers & Hart")
+          expect(results).to include("Ray Brown")
+          expect(results).to include("1952")
+          expect(results).to include("Single")
+          expect(results).to include("mono")
+          expect(results).to include("45 RPM")
+          expect(results).to include("Vinyl")
+          expect(results).to include("http://id.loc.gov/vocabulary/carriers/sd")
+          expect(results).to include("1952")
+        end
+      end
     end
   end
 
@@ -179,13 +273,13 @@ describe Qa::Authorities::Discogs::GenericAuthority do
         end
 
         it "has id and label keys" do
-          expect(results.first["uri"]).to eq("https://api.discogs.com/releases/1750352")
+          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"
           expect(results.first["label"]).to eq "Melody Gardot - Who Will Comfort Me / Over The Rainbow"
-          expect(results.first["context"]["Year"]).to eq ['2009']
-          expect(results.first["context"]["Formats"][0]).to eq "Vinyl"
-          expect(results.first["context"]["Record Labels"][1]).to eq "Universal Music Classics & Jazz"
-          expect(results.first["context"]["Type"][0]).to eq "release"
+          expect(results.first["context"][1]["values"]).to eq ["2009"]
+          expect(results.first["context"][3]["values"][0]).to eq "Vinyl"
+          expect(results.first["context"][2]["values"][1]).to eq "Universal Music Classics & Jazz"
+          expect(results.first["context"][4]["values"][0]).to eq "release"
         end
       end
 
@@ -202,12 +296,12 @@ describe Qa::Authorities::Discogs::GenericAuthority do
         end
 
         it "has id and label keys" do
-          expect(results.first['uri']).to eq "https://api.discogs.com/masters/606116"
+          expect(results.first['uri']).to eq "https://www.discogs.com/Wes-Montgomery-Bumpin-On-Sunset-Tequila/master/606116"
           expect(results.first['id']).to eq "606116"
           expect(results.first['label']).to eq "Wes Montgomery - Bumpin' On Sunset / Tequila"
-          expect(results.first['context']["Year"]).to eq ['1966']
-          expect(results.first['context']["Formats"][2]).to eq "45 RPM"
-          expect(results.first["context"]["Type"][0]).to eq "master"
+          expect(results.first['context'][1]["values"]).to eq ['1966']
+          expect(results.first['context'][3]["values"][2]).to eq "45 RPM"
+          expect(results.first["context"][4]["values"][0]).to eq "master"
         end
       end