qa 4.0.0 → 4.1.0

data/spec/spec_helper.rb

@@ -27,7 +27,7 @@ require 'pry'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[Rails.root.join('spec', 'support', '**', '*.rb')].each { |f| require f }
+Dir[File.join(File.dirname(__FILE__), "support/**/*.rb")].each { |f| require f }
 
 RSpec.configure do |config|
   config.fixture_path = File.expand_path("../fixtures", __FILE__)

data/spec/support/matchers/include_hash.rb

@@ -0,0 +1,5 @@
+RSpec::Matchers.define :include_hash do |expected_hash|
+  match do |actual_array|
+    actual_array.any? { |a_hash| a_hash == expected_hash }
+  end
+end

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -22,6 +22,10 @@ class TestAppGenerator < Rails::Generators::Base
     directory "../spec/fixtures/authorities", "config/authorities"
   end
 
+  def run_discogs_installer
+    generate "qa:discogs"
+  end
+
   def run_migrations
     rake "qa:install:migrations"
     rake "db:migrate"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qa
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Stephen Anderson
@@ -16,7 +16,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-11 00:00:00.000000000 Z
+date: 2019-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-import
@@ -270,6 +270,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Provides a set of uniform RESTful routes to query any controlled vocabulary
   or set of authority terms.
 email:
@@ -301,9 +315,13 @@ files:
 - app/services/qa/linked_data/graph_service.rb
 - app/services/qa/linked_data/language_service.rb
 - app/services/qa/linked_data/language_sort_service.rb
+- app/services/qa/linked_data/ldpath_service.rb
 - app/services/qa/linked_data/mapper/context_mapper_service.rb
+- app/services/qa/linked_data/mapper/graph_ldpath_mapper_service.rb
 - app/services/qa/linked_data/mapper/graph_mapper_service.rb
+- app/services/qa/linked_data/mapper/graph_predicate_mapper_service.rb
 - app/services/qa/linked_data/mapper/search_results_mapper_service.rb
+- app/services/qa/linked_data/mapper/term_results_mapper_service.rb
 - app/views/layouts/qa/application.html.erb
 - config/authorities.yml
 - config/authorities/linked_data/loc.json
@@ -332,6 +350,10 @@ files:
 - lib/generators/qa/apidoc/templates/public/qa/apidoc/swagger-ui.css.map
 - lib/generators/qa/apidoc/templates/public/qa/apidoc/swagger-ui.js
 - lib/generators/qa/apidoc/templates/public/qa/apidoc/swagger-ui.js.map
+- lib/generators/qa/discogs/USAGE
+- lib/generators/qa/discogs/discogs_generator.rb
+- lib/generators/qa/discogs/templates/config/discogs-formats.yml
+- lib/generators/qa/discogs/templates/config/discogs-genres.yml
 - lib/generators/qa/install/USAGE
 - lib/generators/qa/install/install_generator.rb
 - lib/generators/qa/install/templates/config/initializers/qa.rb
@@ -353,6 +375,13 @@ files:
 - lib/qa/authorities/base.rb
 - lib/qa/authorities/crossref.rb
 - lib/qa/authorities/crossref/generic_authority.rb
+- lib/qa/authorities/discogs.rb
+- lib/qa/authorities/discogs/discogs_instance_builder.rb
+- lib/qa/authorities/discogs/discogs_translation.rb
+- lib/qa/authorities/discogs/discogs_utils.rb
+- lib/qa/authorities/discogs/discogs_works_builder.rb
+- lib/qa/authorities/discogs/generic_authority.rb
+- lib/qa/authorities/discogs_subauthority.rb
 - lib/qa/authorities/geonames.rb
 - lib/qa/authorities/getty.rb
 - lib/qa/authorities/getty/aat.rb
@@ -364,7 +393,6 @@ files:
 - lib/qa/authorities/linked_data/config/term_config.rb
 - lib/qa/authorities/linked_data/find_term.rb
 - lib/qa/authorities/linked_data/generic_authority.rb
-- lib/qa/authorities/linked_data/rdf_helper.rb
 - lib/qa/authorities/linked_data/search_query.rb
 - lib/qa/authorities/loc.rb
 - lib/qa/authorities/loc/generic_authority.rb
@@ -392,6 +420,7 @@ files:
 - lib/tasks/qa_tasks.rake
 - spec/controllers/linked_data_terms_controller_spec.rb
 - spec/controllers/terms_controller_spec.rb
+- spec/features/linked_data/language_spec.rb
 - spec/fixtures/aat-response.txt
 - spec/fixtures/assign-fast-noheader.json
 - spec/fixtures/assign-fast-noresults.json
@@ -414,6 +443,16 @@ files:
 - spec/fixtures/authorities/linked_data/lod_term_id_param_config.json
 - spec/fixtures/authorities/linked_data/lod_term_only_config.json
 - spec/fixtures/authorities/linked_data/lod_term_uri_param_config.json
+- spec/fixtures/discogs-find-response-json.json
+- spec/fixtures/discogs-find-response-jsonld-master.json
+- spec/fixtures/discogs-find-response-jsonld-release.json
+- spec/fixtures/discogs-id-matches-master.json
+- spec/fixtures/discogs-id-matches-release.json
+- spec/fixtures/discogs-id-not-found-master.json
+- spec/fixtures/discogs-id-not-found-release.json
+- spec/fixtures/discogs-search-response-no-auth.json
+- spec/fixtures/discogs-search-response-no-subauth.json
+- spec/fixtures/discogs-search-response-subauth.json
 - spec/fixtures/funders-find-response.json
 - spec/fixtures/funders-noquery.json
 - spec/fixtures/funders-noresults.json
@@ -437,10 +476,12 @@ files:
 - spec/fixtures/lod_2_ranked_2_unranked.nt
 - spec/fixtures/lod_3_ranked_varying_preds.nt
 - spec/fixtures/lod_lang_search_en.rdf.xml
+- spec/fixtures/lod_lang_search_enesfrde.rdf.xml
 - spec/fixtures/lod_lang_search_enfr.rdf.xml
 - spec/fixtures/lod_lang_search_enfrde.rdf.xml
 - spec/fixtures/lod_lang_search_filtering.nt
 - spec/fixtures/lod_lang_search_fr.rdf.xml
+- spec/fixtures/lod_lang_search_sv.rdf.xml
 - spec/fixtures/lod_lang_term_en.rdf.xml
 - spec/fixtures/lod_lang_term_enfr.rdf.xml
 - spec/fixtures/lod_lang_term_enfr_noalt.rdf.xml
@@ -462,13 +503,14 @@ files:
 - spec/lib/authorities/assign_fast_spec.rb
 - spec/lib/authorities/base_spec.rb
 - spec/lib/authorities/crossref_spec.rb
+- spec/lib/authorities/discogs/generic_authority_spec.rb
+- spec/lib/authorities/discogs_spec.rb
 - spec/lib/authorities/file_based_authority_spec.rb
 - spec/lib/authorities/geonames_spec.rb
 - spec/lib/authorities/getty/aat_spec.rb
 - spec/lib/authorities/getty/tgn_spec.rb
 - spec/lib/authorities/getty/ulan_spec.rb
 - spec/lib/authorities/getty_spec.rb
-- spec/lib/authorities/linked_data/authority_service_spec.rb
 - spec/lib/authorities/linked_data/config_spec.rb
 - spec/lib/authorities/linked_data/find_term_spec.rb
 - spec/lib/authorities/linked_data/generic_authority_spec.rb
@@ -497,15 +539,21 @@ files:
 - spec/routing/linked_data_route_spec.rb
 - spec/routing/route_spec.rb
 - spec/services/iri_template_service_spec.rb
+- spec/services/linked_data/authority_service_spec.rb
 - spec/services/linked_data/authority_url_service_spec.rb
 - spec/services/linked_data/deep_sort_service_spec.rb
 - spec/services/linked_data/graph_service_spec.rb
 - spec/services/linked_data/language_service_spec.rb
 - spec/services/linked_data/language_sort_service_spec.rb
+- spec/services/linked_data/ldpath_service_spec.rb
 - spec/services/linked_data/mapper/context_mapper_service_spec.rb
+- spec/services/linked_data/mapper/graph_ldpath_mapper_service_spec.rb
 - spec/services/linked_data/mapper/graph_mapper_service_spec.rb
+- spec/services/linked_data/mapper/graph_predicate_mapper_service_spec.rb
 - spec/services/linked_data/mapper/search_results_mapper_service_spec.rb
+- spec/services/linked_data/mapper/term_results_mapper_service_spec.rb
 - spec/spec_helper.rb
+- spec/support/matchers/include_hash.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 homepage: https://github.com/projecthydra/questioning_authority
@@ -534,12 +582,14 @@ specification_version: 4
 summary: You should question your authorities.
 test_files:
 - spec/spec_helper.rb
+- spec/features/linked_data/language_spec.rb
 - spec/models/linked_data/config/context_map_spec.rb
 - spec/models/linked_data/config/context_property_map_spec.rb
 - spec/models/iri_template/variable_map_spec.rb
 - spec/models/iri_template/url_config_spec.rb
 - spec/models/subject_mesh_term_spec.rb
 - spec/requests/cors_headers_spec.rb
+- spec/support/matchers/include_hash.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/lib/tasks/mesh.rake_spec.rb
@@ -548,7 +598,6 @@ test_files:
 - spec/lib/mesh_data_parser_spec.rb
 - spec/lib/authorities/linked_data/config_spec.rb
 - spec/lib/authorities/linked_data/search_config_spec.rb
-- spec/lib/authorities/linked_data/authority_service_spec.rb
 - spec/lib/authorities/linked_data/search_query_spec.rb
 - spec/lib/authorities/linked_data/term_config_spec.rb
 - spec/lib/authorities/linked_data/find_term_spec.rb
@@ -564,26 +613,33 @@ test_files:
 - spec/lib/authorities/getty/tgn_spec.rb
 - spec/lib/authorities/getty/ulan_spec.rb
 - spec/lib/authorities/getty/aat_spec.rb
+- spec/lib/authorities/discogs_spec.rb
 - spec/lib/authorities/mesh_spec.rb
 - spec/lib/authorities/mysql_table_based_authority_spec.rb
 - spec/lib/authorities/local_spec.rb
+- spec/lib/authorities/discogs/generic_authority_spec.rb
 - spec/lib/authorities/geonames_spec.rb
 - spec/lib/authorities/base_spec.rb
 - spec/lib/authorities/getty_spec.rb
 - spec/lib/services/rdf_authority_parser_spec.rb
+- spec/fixtures/lod_lang_search_enesfrde.rdf.xml
 - spec/fixtures/oclcts-response-mesh-3.txt
 - spec/fixtures/loc-names-response.txt
 - spec/fixtures/oclcts-response-mesh-2.txt
 - spec/fixtures/aat-response.txt
 - spec/fixtures/journals-result.json
+- spec/fixtures/discogs-search-response-no-subauth.json
 - spec/fixtures/lod_lang_search_fr.rdf.xml
 - spec/fixtures/oclcts-response-mesh-1.txt
 - spec/fixtures/lod_lang_term_fr.rdf.xml
+- spec/fixtures/discogs-search-response-no-auth.json
 - spec/fixtures/lod_3_ranked_varying_preds.nt
 - spec/fixtures/lod_lang_search_filtering.nt
+- spec/fixtures/discogs-find-response-jsonld-release.json
 - spec/fixtures/funders-noquery.json
 - spec/fixtures/lod_lang_term_enfrde.rdf.xml
 - spec/fixtures/assign-fast-oneresult.json
+- spec/fixtures/discogs-id-not-found-master.json
 - spec/fixtures/getty-aat-find-response.json
 - spec/fixtures/lod_lang_term_enfr_noalt.rdf.xml
 - spec/fixtures/assign-fast-noresults.json
@@ -593,6 +649,7 @@ test_files:
 - spec/fixtures/assign-fast-topical-result.json
 - spec/fixtures/getty-ulan-find-response.json
 - spec/fixtures/loc-subjects-response.txt
+- spec/fixtures/discogs-find-response-json.json
 - spec/fixtures/loc-subject-find-response.txt
 - spec/fixtures/lod_oclc_all_query_3_results.rdf.xml
 - spec/fixtures/lod_2_ranked_2_unranked.nt
@@ -601,16 +658,21 @@ test_files:
 - spec/fixtures/lod_lang_search_enfr.rdf.xml
 - spec/fixtures/journals-find-response-two-issn.json
 - spec/fixtures/mesh.txt
+- spec/fixtures/discogs-search-response-subauth.json
 - spec/fixtures/lod_term_with_blanknode_objects.nt
 - spec/fixtures/geonames-find-response.json
 - spec/fixtures/lod_oclc_personalName_query_3_results.rdf.xml
 - spec/fixtures/loc-response.txt
+- spec/fixtures/discogs-id-not-found-release.json
 - spec/fixtures/funders-find-response.json
 - spec/fixtures/lexvo_snippet.rdf.xml
 - spec/fixtures/journals-find-response.json
+- spec/fixtures/discogs-id-matches-master.json
+- spec/fixtures/discogs-find-response-jsonld-master.json
 - spec/fixtures/lod_lang_search_en.rdf.xml
 - spec/fixtures/lod_lang_term_en.rdf.xml
 - spec/fixtures/journals-noresults.json
+- spec/fixtures/discogs-id-matches-release.json
 - spec/fixtures/journals-noquery.json
 - spec/fixtures/lod_oclc_query_no_results.rdf.xml
 - spec/fixtures/authorities/linked_data/lod_search_only_config.json
@@ -637,16 +699,22 @@ test_files:
 - spec/fixtures/assign-fast-noheader.json
 - spec/fixtures/lod_lang_search_enfrde.rdf.xml
 - spec/fixtures/funders-result.json
+- spec/fixtures/lod_lang_search_sv.rdf.xml
 - spec/fixtures/ulan-response.txt
 - spec/routing/linked_data_route_spec.rb
 - spec/routing/route_spec.rb
 - spec/controllers/terms_controller_spec.rb
 - spec/controllers/linked_data_terms_controller_spec.rb
+- spec/services/linked_data/authority_service_spec.rb
+- spec/services/linked_data/ldpath_service_spec.rb
 - spec/services/linked_data/graph_service_spec.rb
 - spec/services/linked_data/language_sort_service_spec.rb
+- spec/services/linked_data/mapper/graph_ldpath_mapper_service_spec.rb
+- spec/services/linked_data/mapper/term_results_mapper_service_spec.rb
 - spec/services/linked_data/mapper/search_results_mapper_service_spec.rb
 - spec/services/linked_data/mapper/graph_mapper_service_spec.rb
 - spec/services/linked_data/mapper/context_mapper_service_spec.rb
+- spec/services/linked_data/mapper/graph_predicate_mapper_service_spec.rb
 - spec/services/linked_data/deep_sort_service_spec.rb
 - spec/services/linked_data/language_service_spec.rb
 - spec/services/linked_data/authority_url_service_spec.rb

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

@@ -1,49 +0,0 @@
-require 'rdf'
-
-# Encapsulates processing of RDF results returned by the linked data authority.  This is used exclussively by Qa::Authorities::LinkedData::GenericAuthority
-# @see Qa::Authorities::LinkedData::GenericAuthority
-module Qa::Authorities
-  module LinkedData
-    module RdfHelper
-      private
-
-        # TODO: elr - The bulk of the methods in this class moved to app/services/linked_data/rdf_service.rb.  The remaining
-        # methods are expected to move in a later refactor.
-
-        def object_value(stmt_hash, consolidated_hash, name, as_string = true)
-          new_object_value = stmt_hash[name]
-          new_object_value = new_object_value.to_s if as_string
-          all_object_values = consolidated_hash[name] || []
-          all_object_values << new_object_value unless new_object_value.nil? || all_object_values.include?(new_object_value)
-          all_object_values
-        end
-
-        def init_consolidated_hash(consolidated_results, uri, id)
-          consolidated_hash = consolidated_results[uri] || {}
-          if consolidated_hash.empty?
-            consolidated_hash[:id] = uri
-            consolidated_hash[:id] = id unless id.nil? || id.length <= 0
-          end
-          consolidated_hash
-        end
-
-        def extract_preds(graph, preds)
-          RDF::Query.execute(graph) do
-            preds[:required].each do |key, pred|
-              pattern([:uri, pred, key])
-            end
-            preds[:optional].each do |key, pred|
-              pattern([:uri, pred, key], optional: true)
-            end
-          end
-        end
-
-        def sort_string_by_language(str_literals)
-          return str_literals if str_literals.blank?
-          str_literals = Qa::LinkedData::LanguageSortService.new(str_literals).sort
-          str_literals.map!(&:to_s).uniq!
-          str_literals.delete_if { |s| s.nil? || s.length <= 0 }
-        end
-    end
-  end
-end