qa 4.2.3 → 4.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eba5e21a3c6692b86e9974f53a642c22fe4b15e6
-  data.tar.gz: 5d62930818fc514a4e685f5480a15592f5c7c1d3
+  metadata.gz: 01ad19bed0c7676d2a803cdf50f3edb8f3786f88
+  data.tar.gz: 30f46f8326eabb8fc00e3e27dadd0f2d2c72d8fa
 SHA512:
-  metadata.gz: c24bd0c98bb86cca3dbeb5d0889f017af4c97911bbaab33e2a413562f9ce954d6128042b3dd09647483990517d90ec0f6ac493a0fcae3277b215cc75613e4e21
-  data.tar.gz: c81ee4a69c029942069d39a4b0cb5e3cb3b199abf65b94a7a57e29e5bf3eb9f999e67584a65b6b26d5ebed3790550e2870a7bce38087bd5409f13c2cb5f3abce
+  metadata.gz: 3ea728ae633c1a0f504f3d76ac7eb0bd1c353f35a2fdb174d3dcfa42a8798c5c18af88f1bef2d0224fe13b7b583a285f350e13ae78377d09b73b83c40c0505fc
+  data.tar.gz: e11d1a74bc87fc1d93b1c5a543ac10a928f3d8c562762b0ecd1e801851f14e26190d69ea532d67d760631c02c120e5970f90ff901595392a4b69c3ebadddc352

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

@@ -30,17 +30,16 @@ module Qa::Authorities
         # all we need is a work and not an instance. If there's no subauthority, we can determine
         # if the discogs record is a master because it will have a main_release field.
         if master_only(response, subauthority)
-          self.work_uri = response["uri"]
+          self.work_uri = response["uri"].present? ? response["uri"] : response["resource_url"]
           complete_rdf_stmts.concat(build_master_statements(response))
         else
-          # If the subauthority is not "master," we need to define an instance as well as a
+          # If the subauthority is "release," we need to define an instance as well as a
           # work. If the discogs record has a master_id, fetch that and use the results to
           # build the statements for the work.
           master_resp = response["master_id"].present? ? json("https://api.discogs.com/masters/#{response['master_id']}") : response
-          self.work_uri = master_resp["uri"] if master_resp["uri"].present? && master_resp["uri"].include?("master")
           complete_rdf_stmts.concat(build_master_statements(master_resp))
-          # Now do the statements for the instance.
-          self.instance_uri = response["uri"] if response["uri"].present?
+          # Now do the statements for the release/instance.
+          self.instance_uri = response["uri"].present? ? response["uri"] : response["resource_url"]
           complete_rdf_stmts.concat(build_instance_statements(response))
         end
       end
@@ -93,7 +92,7 @@ module Qa::Authorities
       # @return [Array] rdf statements
       def get_primary_instance_definition(response)
         stmts = []
-        stmts << contruct_stmt_uri_object(work_uri, "http://id.loc.gov/ontologies/bibframe/hasInstance", instance_uri)
+        stmts << contruct_stmt_uri_object(instance_uri, "http://id.loc.gov/ontologies/bibframe/instanceOf", work_uri)
         stmts << contruct_stmt_uri_object(instance_uri, rdf_type_predicate, "http://id.loc.gov/ontologies/bibframe/Instance")
         stmts << contruct_stmt_uri_object(instance_uri, "http://id.loc.gov/ontologies/bibframe/title", "titlen2")
         stmts << contruct_stmt_literal_object("titlen2", bf_main_title_predicate, response["title"])

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

@@ -12,8 +12,8 @@ module Qa::Authorities
     def initialize(subauthority)
       @subauthority = subauthority
       self.primary_artists = []
-      self.work_uri = "http://generic.uri/workn1"
-      self.instance_uri = "http://generic.uri/instn1"
+      self.work_uri = "workn1"
+      self.instance_uri = "instn1"
     end
 
     # @param [String] the query
@@ -127,13 +127,18 @@ module Qa::Authorities
       #   }
       def parse_authority_response(response)
         response['results'].map do |result|
-          { 'uri' => result['resource_url'].to_s,
+          { 'uri' => build_uri(result),
             'id' => result['id'].to_s,
             'label' => result['title'].to_s,
             'context' => assemble_search_context(result) }
         end
       end
 
+      # @param [Hash] the results hash from the JSON returned by Discogs
+      def build_uri(result)
+        result['uri'].present? ? "https://www.discogs.com" + result['uri'].to_s : result['resource_url'].to_s
+      end
+
       # @param [Hash] the results hash from the JSON returned by Discogs
       def assemble_search_context(result)
         { "Image URL" => get_context_for_string(result['cover_image']),

data/lib/qa/version.rb

@@ -1,3 +1,3 @@
 module Qa
-  VERSION = "4.2.3".freeze
+  VERSION = "4.2.4".freeze
 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

@@ -273,7 +273,7 @@ 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']
@@ -296,7 +296,7 @@ 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']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qa
 version: !ruby/object:Gem::Version
-  version: 4.2.3
+  version: 4.2.4
 platform: ruby
 authors:
 - Stephen Anderson
@@ -16,7 +16,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-10 00:00:00.000000000 Z
+date: 2019-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-import