qa 3.1.0 → 4.0.0.rc1

data/spec/lib/authorities/linked_data/find_term_spec.rb

@@ -1,5 +1,7 @@
 require 'spec_helper'
 
 RSpec.describe Qa::Authorities::LinkedData::FindTerm do
-  it "should have tests"
+  # all term fetch functionality is tested in spec/lib/authorities/linked_data/generic_authority_spec.rb and
+  # spec/controllers/linked_data_term_controller_spec.rb
+  it "is tested elsewhere"
 end

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

@@ -69,50 +69,75 @@ RSpec.describe Qa::Authorities::LinkedData::GenericAuthority do
     describe "language processing" do
       context "when filtering #search results" do
         context "and lang NOT passed in" do
-          context "and NO default defined in config" do
-            let(:lod_lang_no_defaults) { described_class.new(:LOD_LANG_NO_DEFAULTS) }
-            let :results do
-              stub_request(:get, "http://localhost/test_no_default/search?query=milk")
-                .to_return(status: 200, body: webmock_fixture("lod_lang_search_enfr.rdf.xml"), headers: { 'Content-Type' => 'application/rdf+xml' })
-              lod_lang_no_defaults.search('milk')
+          context "and NO language defined in authority config" do
+            context "and NO language defined in Qa config" do
+              let(:lod_lang_no_defaults) { described_class.new(:LOD_LANG_NO_DEFAULTS) }
+              let :results do
+                stub_request(:get, "http://localhost/test_no_default/search?query=milk")
+                  .to_return(status: 200, body: webmock_fixture("lod_lang_search_enfr.rdf.xml"), headers: { 'Content-Type' => 'application/rdf+xml' })
+                lod_lang_no_defaults.search('milk')
+              end
+
+              before do
+                Qa.config.default_language = []
+              end
+
+              after do
+                Qa.config.default_language = :en
+              end
+
+              it "is not filtered" do
+                expect(results.first[:label]).to eq('[buttermilk, Babeurre] (yummy, délicieux)')
+                expect(results.second[:label]).to eq('[condensed milk, lait condensé] (creamy, crémeux)')
+                expect(results.third[:label]).to eq('[dried milk, lait en poudre] (powdery, poudreux)')
+              end
             end
-            it "is not filtered" do
-              expect(results.first[:label]).to eq('[buttermilk, Babeurre] (yummy, délicieux)')
-              expect(results.second[:label]).to eq('[condensed milk, lait condensé] (creamy, crémeux)')
-              expect(results.third[:label]).to eq('[dried milk, lait en poudre] (powdery, poudreux)')
+
+            context "and default_language is defined in Qa config" do
+              let(:lod_lang_no_defaults) { described_class.new(:LOD_LANG_NO_DEFAULTS) }
+              let :results do
+                stub_request(:get, "http://localhost/test_no_default/search?query=milk")
+                  .to_return(status: 200, body: webmock_fixture("lod_lang_search_enfr.rdf.xml"), headers: { 'Content-Type' => 'application/rdf+xml' })
+                lod_lang_no_defaults.search('milk')
+              end
+              it "filters using Qa configured default" do
+                expect(results.first[:label]).to eq('buttermilk (yummy)')
+                expect(results.second[:label]).to eq('condensed milk (creamy)')
+                expect(results.third[:label]).to eq('dried milk (powdery)')
+              end
             end
           end
 
-          context "and default IS defined in config" do
+          context "and language IS defined in authority config" do
             let(:lod_lang_defaults) { described_class.new(:LOD_LANG_DEFAULTS) }
             let :results do
               stub_request(:get, "http://localhost/test_default/search?query=milk")
                 .to_return(status: 200, body: webmock_fixture("lod_lang_search_enfr.rdf.xml"), headers: { 'Content-Type' => 'application/rdf+xml' })
               lod_lang_defaults.search('milk')
             end
-            it "is filtered to default" do
-              expect(results.first[:label]).to eq('buttermilk (yummy)')
-              expect(results.second[:label]).to eq('condensed milk (creamy)')
-              expect(results.third[:label]).to eq('dried milk (powdery)')
+            it "is filtered to authority defined language" do
+              expect(results.first[:label]).to eq('Babeurre (délicieux)')
+              expect(results.second[:label]).to eq('lait condensé (crémeux)')
+              expect(results.third[:label]).to eq('lait en poudre (poudreux)')
             end
           end
         end
 
-        context "and multiple defaults ARE defined in config" do
+        context "and multiple languages ARE defined in authority config" do
           let(:lod_lang_multi_defaults) { described_class.new(:LOD_LANG_MULTI_DEFAULTS) }
           let :results do
             stub_request(:get, "http://localhost/test_default/search?query=milk")
               .to_return(status: 200, body: webmock_fixture("lod_lang_search_enfrde.rdf.xml"), headers: { 'Content-Type' => 'application/rdf+xml' })
             lod_lang_multi_defaults.search('milk')
           end
-          it "is filtered to default" do
+          it "is filtered to authority defined languages" do
             expect(results.first[:label]).to eq('[buttermilk, Babeurre] (yummy, délicieux)')
             expect(results.second[:label]).to eq('[condensed milk, lait condensé] (creamy, crémeux)')
             expect(results.third[:label]).to eq('[dried milk, lait en poudre] (powdery, poudreux)')
           end
         end
 
-        context "and lang IS passed in" do
+        context "and language IS passed in to search" do
           let(:lod_lang_defaults) { described_class.new(:LOD_LANG_DEFAULTS) }
           let :results do
             stub_request(:get, "http://localhost/test_default/search?query=milk")
@@ -313,46 +338,71 @@ RSpec.describe Qa::Authorities::LinkedData::GenericAuthority do
     describe "language processing" do
       context "when filtering #find result" do
         context "and lang NOT passed in" do
-          context "and NO default defined in config" do
-            let(:lod_lang_no_defaults) { described_class.new(:LOD_LANG_NO_DEFAULTS) }
-            let :results do
-              stub_request(:get, "http://localhost/test_no_default/term/c_9513")
-                .to_return(status: 200, body: webmock_fixture("lod_lang_term_enfr.rdf.xml"), headers: { 'Content-Type' => 'application/rdf+xml' })
-              lod_lang_no_defaults.find('c_9513')
+          context "and NO language defined in authority config" do
+            context "and NO language defined in Qa config" do
+              let(:lod_lang_no_defaults) { described_class.new(:LOD_LANG_NO_DEFAULTS) }
+              let :results do
+                stub_request(:get, "http://localhost/test_no_default/term/c_9513")
+                  .to_return(status: 200, body: webmock_fixture("lod_lang_term_enfr.rdf.xml"), headers: { 'Content-Type' => 'application/rdf+xml' })
+                lod_lang_no_defaults.find('c_9513')
+              end
+
+              before do
+                Qa.config.default_language = []
+              end
+
+              after do
+                Qa.config.default_language = :en
+              end
+
+              it "is not filtered" do
+                expect(results[:label]).to eq ['buttermilk', 'Babeurre']
+                expect(results[:altlabel]).to eq ['yummy', 'délicieux']
+                expect(results["predicates"]["http://www.w3.org/2004/02/skos/core#prefLabel"]).to include("buttermilk", "Babeurre")
+                expect(results["predicates"]["http://www.w3.org/2004/02/skos/core#altLabel"]).to include("yummy", "délicieux")
+              end
             end
-            it "is not filtered" do
-              expect(results[:label]).to eq ['buttermilk', 'Babeurre']
-              expect(results[:altlabel]).to eq ['yummy', 'délicieux']
-              expect(results["predicates"]["http://www.w3.org/2004/02/skos/core#prefLabel"]).to include("buttermilk", "Babeurre")
-              expect(results["predicates"]["http://www.w3.org/2004/02/skos/core#altLabel"]).to include("yummy", "délicieux")
+            context "and default_language is defined in Qa config" do
+              let(:lod_lang_no_defaults) { described_class.new(:LOD_LANG_NO_DEFAULTS) }
+              let :results do
+                stub_request(:get, "http://localhost/test_no_default/term/c_9513")
+                  .to_return(status: 200, body: webmock_fixture("lod_lang_term_enfr.rdf.xml"), headers: { 'Content-Type' => 'application/rdf+xml' })
+                lod_lang_no_defaults.find('c_9513')
+              end
+              it "filters using Qa configured default for summary but not for predicates list" do
+                expect(results[:label]).to eq ['buttermilk']
+                expect(results[:altlabel]).to eq ['yummy']
+                expect(results["predicates"]["http://www.w3.org/2004/02/skos/core#prefLabel"]).to include("buttermilk", "Babeurre")
+                expect(results["predicates"]["http://www.w3.org/2004/02/skos/core#altLabel"]).to include("yummy", "délicieux")
+              end
             end
           end
-          context "and default IS defined in config" do
+          context "and language IS defined in authority config" do
             let(:lod_lang_defaults) { described_class.new(:LOD_LANG_DEFAULTS) }
             let :results do
               stub_request(:get, "http://localhost/test_default/term/c_9513")
                 .to_return(status: 200, body: webmock_fixture("lod_lang_term_enfr.rdf.xml"), headers: { 'Content-Type' => 'application/rdf+xml' })
               lod_lang_defaults.find('c_9513')
             end
-            it "is filtered to default" do
-              expect(results[:label]).to eq ['buttermilk']
-              expect(results[:altlabel]).to eq ['yummy']
-              expect(results["predicates"]["http://www.w3.org/2004/02/skos/core#prefLabel"]).to eq ['buttermilk']
-              expect(results["predicates"]["http://www.w3.org/2004/02/skos/core#altLabel"]).to eq ['yummy']
+            it "filters using authority configured language for summary but not for predicates list" do
+              expect(results[:label]).to eq ['Babeurre']
+              expect(results[:altlabel]).to eq ['délicieux']
+              expect(results["predicates"]["http://www.w3.org/2004/02/skos/core#prefLabel"]).to include("buttermilk", "Babeurre")
+              expect(results["predicates"]["http://www.w3.org/2004/02/skos/core#altLabel"]).to include("yummy", "délicieux")
             end
           end
-          context "and multiple defaults ARE defined in config" do
+          context "and multiple languages ARE defined in authority config" do
             let(:lod_lang_multi_defaults) { described_class.new(:LOD_LANG_MULTI_DEFAULTS) }
             let :results do
               stub_request(:get, "http://localhost/test_default/term/c_9513")
                 .to_return(status: 200, body: webmock_fixture("lod_lang_term_enfrde.rdf.xml"), headers: { 'Content-Type' => 'application/rdf+xml' })
               lod_lang_multi_defaults.find('c_9513')
             end
-            it "is filtered to default" do
+            it "filters using authority configured languages for summary but not for predicates list" do
               expect(results[:label]).to eq ['buttermilk', 'Babeurre']
               expect(results[:altlabel]).to eq ['yummy', 'délicieux']
-              expect(results["predicates"]["http://www.w3.org/2004/02/skos/core#prefLabel"]).to include("buttermilk", "Babeurre")
-              expect(results["predicates"]["http://www.w3.org/2004/02/skos/core#altLabel"]).to include("yummy", "délicieux")
+              expect(results["predicates"]["http://www.w3.org/2004/02/skos/core#prefLabel"]).to include("buttermilk", "Babeurre", "Buttermilch")
+              expect(results["predicates"]["http://www.w3.org/2004/02/skos/core#altLabel"]).to include("yummy", "délicieux", "lecker")
             end
           end
         end
@@ -367,8 +417,8 @@ RSpec.describe Qa::Authorities::LinkedData::GenericAuthority do
           it "is filtered to specified language" do
             expect(results[:label]).to eq ['Babeurre']
             expect(results[:altlabel]).to eq ['délicieux']
-            expect(results["predicates"]["http://www.w3.org/2004/02/skos/core#prefLabel"]).to eq ['Babeurre']
-            expect(results["predicates"]["http://www.w3.org/2004/02/skos/core#altLabel"]).to eq ['délicieux']
+            expect(results["predicates"]["http://www.w3.org/2004/02/skos/core#prefLabel"]).to include("buttermilk", "Babeurre")
+            expect(results["predicates"]["http://www.w3.org/2004/02/skos/core#altLabel"]).to include("yummy", "délicieux")
           end
         end
 
@@ -381,7 +431,7 @@ RSpec.describe Qa::Authorities::LinkedData::GenericAuthority do
           end
           it "is filtered to specified language" do
             expect(results[:label]).to eq ['Babeurre']
-            expect(results["predicates"]["http://www.w3.org/2004/02/skos/core#prefLabel"]).to eq ['Babeurre']
+            expect(results["predicates"]["http://www.w3.org/2004/02/skos/core#prefLabel"]).to include("buttermilk", "Babeurre")
           end
         end
 

data/spec/lib/authorities/linked_data/search_config_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe Qa::Authorities::LinkedData::SearchConfig do
         url: {
           :@context => 'http://www.w3.org/ns/hydra/context.jsonld',
           :@type => 'IriTemplate',
-          template: 'http://localhost/test_default/search?subauth={?subauth}&query={?query}&param1={?param1}&param2={?param2}',
+          template: 'http://localhost/test_default/search?{?subauth}&{?query}&{?param1}&{?param2}',
           variableRepresentation: 'BasicRepresentation',
           mapping: [
             {
@@ -55,6 +55,55 @@ RSpec.describe Qa::Authorities::LinkedData::SearchConfig do
           altlabel_predicate: 'http://www.w3.org/2004/02/skos/core#altLabel',
           sort_predicate: 'http://www.w3.org/2004/02/skos/core#prefLabel'
         },
+        context: {
+          groups: {
+            dates: {
+              group_label_i18n: "qa.linked_data.authority.locnames_ld4l_cache.dates",
+              group_label_default: "Dates"
+            },
+            hierarchy: {
+              group_label_i18n: "qa.linked_data.authority.locgenres_ld4l_cache.hierarchy",
+              group_label_default: "Hierarchy"
+            }
+          },
+          properties: [
+            {
+              property_label_i18n: "qa.linked_data.authority.locgenres_ld4l_cache.authoritative_label",
+              property_label_default: "Authoritative Label",
+              ldpath: "madsrdf:authoritativeLabel",
+              selectable: true,
+              drillable: false
+            },
+            {
+              group_id: "dates",
+              property_label_i18n: "qa.linked_data.authority.locnames_ld4l_cache.birth_date",
+              property_label_default: "Birth",
+              ldpath: "madsrdf:identifiesRWO/madsrdf:birthDate/schema:label",
+              selectable: false,
+              drillable: false
+            },
+            {
+              group_id: "hierarchy",
+              property_label_i18n: "qa.linked_data.authority.locgenres_ld4l_cache.narrower",
+              property_label_default: "Narrower",
+              ldpath: "skos:narrower :: xsd:string",
+              selectable: true,
+              drillable: true,
+              expansion_label_ldpath: "skos:prefLabel ::xsd:string",
+              expansion_id_ldpath: "loc:lccn ::xsd:string"
+            },
+            {
+              group_id: "hierarchy",
+              property_label_i18n: "qa.linked_data.authority.locgenres_ld4l_cache.broader",
+              property_label_default: "Broader",
+              ldpath: "skos:broader :: xsd:string",
+              selectable: true,
+              drillable: true,
+              expansion_label_ldpath: "skos:prefLabel ::xsd:string",
+              expansion_id_ldpath: "loc:lccn ::xsd:string"
+            }
+          ]
+        },
         subauthorities: {
           search_sub1_key: 'search_sub1_name',
           search_sub2_key: 'search_sub2_name',
@@ -80,60 +129,12 @@ RSpec.describe Qa::Authorities::LinkedData::SearchConfig do
     end
   end
 
-  describe '#url' do
-    let(:url_config) do
-      {
-        :@context => 'http://www.w3.org/ns/hydra/context.jsonld',
-        :@type => 'IriTemplate',
-        template: 'http://localhost/test_default/search?subauth={?subauth}&query={?query}&param1={?param1}&param2={?param2}',
-        variableRepresentation: 'BasicRepresentation',
-        mapping: [
-          {
-            :@type => 'IriTemplateMapping',
-            variable: 'query',
-            property: 'hydra:freetextQuery',
-            required: true
-          },
-          {
-            :@type => 'IriTemplateMapping',
-            variable: 'subauth',
-            property: 'hydra:freetextQuery',
-            required: false,
-            default: 'search_sub1_name'
-          },
-          {
-            :@type => 'IriTemplateMapping',
-            variable: 'param1',
-            property: 'hydra:freetextQuery',
-            required: false,
-            default: 'delta'
-          },
-          {
-            :@type => 'IriTemplateMapping',
-            variable: 'param2',
-            property: 'hydra:freetextQuery',
-            required: false,
-            default: 'echo'
-          }
-        ]
-      }
-    end
-
-    it 'returns nil if only term configuration is defined' do
-      expect(term_only_config.url).to eq nil
-    end
-    it 'returns the search url from the configuration' do
-      expect(full_config.url).to eq url_config
-    end
-  end
-
-  describe '#url_template' do
+  describe '#url_config' do
     it 'returns nil if only term configuration is defined' do
-      expect(term_only_config.url).to eq nil
+      expect(term_only_config.url_config).to eq nil
     end
-    it 'returns the search url from the configuration' do
-      expected_url_template = 'http://localhost/test_default/search?subauth={?subauth}&query={?query}&param1={?param1}&param2={?param2}'
-      expect(full_config.url_template).to eq expected_url_template
+    it 'returns the url config from the configuration' do
+      expect(full_config.url_config).to be_kind_of Qa::IriTemplate::UrlConfig
     end
   end
 
@@ -221,45 +222,27 @@ RSpec.describe Qa::Authorities::LinkedData::SearchConfig do
     end
   end
 
-  describe '#replacements?' do
+  describe '#supports_context?' do
     it 'returns false if only term configuration is defined' do
-      expect(term_only_config.replacements?).to eq false
-    end
-    it 'returns false if the configuration does NOT define replacements' do
-      expect(min_config.replacements?).to eq false
-    end
-    it 'returns true if the configuration defines replacements' do
-      expect(full_config.replacements?).to eq true
-    end
-  end
-
-  describe '#replacement_count' do
-    it 'returns 0 if only term configuration is defined' do
-      expect(term_only_config.replacement_count).to eq 0
+      expect(term_only_config.supports_context?).to eq false
     end
-    it 'returns 0 if replacement_count is NOT defined' do
-      expect(min_config.replacement_count).to eq 0
+    it 'returns false if NOT defined in the configuration' do
+      expect(min_config.supports_context?).to eq false
     end
-    it 'returns the number of replacements if defined' do
-      expect(full_config.replacement_count).to eq 2
+    it 'returns true if defined in the configuration' do
+      expect(full_config.supports_context?).to eq true
     end
   end
 
-  describe '#replacements' do
-    it 'returns empty hash if only term configuration is defined' do
-      empty_hash = {}
-      expect(term_only_config.replacements).to eq empty_hash
+  describe '#context_map' do
+    it 'returns nil if only term configuration is defined' do
+      expect(term_only_config.context_map).to eq nil
     end
-    it 'returns empty hash if no replacement patterns are defined' do
-      empty_hash = {}
-      expect(min_config.replacements).to eq empty_hash
+    it 'returns nil if NOT defined in the configuration' do
+      expect(min_config.context_map).to eq nil
     end
-    it 'returns hash of all replacement patterns' do
-      expected_hash = {
-        param1: { :@type => 'IriTemplateMapping', variable: 'param1', property: 'hydra:freetextQuery', required: false, default: 'delta' },
-        param2: { :@type => 'IriTemplateMapping', variable: 'param2', property: 'hydra:freetextQuery', required: false, default: 'echo' }
-      }
-      expect(full_config.replacements).to eq expected_hash
+    it 'returns the context map if defined in the configuration' do
+      expect(full_config.context_map).to be_kind_of Qa::LinkedData::Config::ContextMap
     end
   end
 
@@ -320,80 +303,4 @@ RSpec.describe Qa::Authorities::LinkedData::SearchConfig do
       expect(full_config.subauthorities).to eq expected_hash
     end
   end
-
-  describe '#subauthority_replacement_pattern' do
-    it 'returns empty hash if only term configuration is defined' do
-      empty_hash = {}
-      expect(term_only_config.subauthority_replacement_pattern).to eq empty_hash
-    end
-    it 'returns empty hash if no subauthorities are defined' do
-      empty_hash = {}
-      expect(min_config.subauthority_replacement_pattern).to eq empty_hash
-    end
-    it 'returns hash replacement pattern for subauthority and the default value' do
-      expected_hash = { pattern: 'subauth', default: 'search_sub1_name' }
-      expect(full_config.subauthority_replacement_pattern).to eq expected_hash
-    end
-  end
-
-  # rubocop:disable RSpec/RepeatedExample
-  describe '#search_url_with_replacements' do
-    it 'returns nil if only term configuration is defined' do
-      expect(term_only_config.url_with_replacements('Smith')).to eq nil
-    end
-    context 'when subauthorities ARE defined' do
-      it 'returns the url with query substitution applied' do
-        expected_url = 'http://localhost/test_default/search?subauth=search_sub1_name&query=Smith&param1=delta&param2=echo'
-        expect(full_config.url_with_replacements('Smith')).to eq expected_url
-      end
-      it 'returns the url with default subauthority when NOT specified' do
-        expected_url = 'http://localhost/test_default/search?subauth=search_sub1_name&query=Smith&param1=delta&param2=echo'
-        expect(full_config.url_with_replacements('Smith')).to eq expected_url
-      end
-      it 'returns the url with subauthority substitution when specified' do
-        expected_url = 'http://localhost/test_default/search?subauth=search_sub3_name&query=Smith&param1=delta&param2=echo'
-        expect(full_config.url_with_replacements('Smith', 'search_sub3_key')).to eq expected_url
-      end
-      it 'returns the url with default values when replacements are NOT specified' do
-        expected_url = 'http://localhost/test_default/search?subauth=search_sub1_name&query=Smith&param1=delta&param2=echo'
-        expect(full_config.url_with_replacements('Smith')).to eq expected_url
-      end
-      it 'returns the url with replacement substitution values when replacements are specified' do
-        expected_url = 'http://localhost/test_default/search?subauth=search_sub1_name&query=Smith&param1=golf&param2=hotel'
-        expect(full_config.url_with_replacements('Smith', nil, param1: 'golf', param2: 'hotel')).to eq expected_url
-      end
-    end
-
-    context 'when subauthorities are not defined' do
-      it 'returns the url with query substitution applied' do
-        expected_url = 'http://localhost/test_default/search?query=Smith'
-        expect(min_config.url_with_replacements('Smith')).to eq expected_url
-      end
-      it 'and subauth param is included returns the url with query substitution applied ignoring the subauth' do
-        expected_url = 'http://localhost/test_default/search?query=Smith'
-        expect(min_config.url_with_replacements('Smith', 'fake_subauth_key')).to eq expected_url
-      end
-    end
-
-    context 'when replacements are not defined' do
-      it 'returns the url with query substitution applied' do
-        expected_url = 'http://localhost/test_default/search?query=Smith'
-        expect(min_config.url_with_replacements('Smith')).to eq expected_url
-      end
-      it 'and replacements param is included returns the url with query substitution applied ignoring the replacements' do
-        expected_url = 'http://localhost/test_default/search?query=Smith'
-        expect(min_config.url_with_replacements('Smith', nil, fake_replacement_key: 'fake_value')).to eq expected_url
-      end
-    end
-
-    context 'with encoding specified in config' do
-      it 'returns the uri as the url' do
-        expected_url = 'http://localhost/test_default/search?query=encoded%20because%3Aencode%3Dtrue&yes%3Aencoded%20here&no:encoding here&defaults:to not encoded'
-        query = 'encoded because:encode=true'
-        replacements = { encode_true: 'yes:encoded here', encode_false: 'no:encoding here', encode_not_specified: 'defaults:to not encoded' }
-        expect(encoding_config.url_with_replacements(query, nil, replacements)).to eq expected_url
-      end
-    end
-  end
-  # rubocop:enable RSpec/RepeatedExample
 end