qa 2.0.0 → 2.3.0

data/spec/lib/authorities/getty/ulan_spec.rb

@@ -69,25 +69,27 @@ describe Qa::Authorities::Getty::Ulan do
   describe "#sparql" do
     context "using a single subject term" do
       subject { authority.sparql('search_term') }
-      it { is_expected.to eq 'SELECT DISTINCT ?s ?name ?bio {
+      it {
+        is_expected.to eq 'SELECT DISTINCT ?s ?name ?bio {
               ?s a skos:Concept; luc:term "search_term";
                  skos:inScheme <http://vocab.getty.edu/ulan/> ;
                  gvp:prefLabelGVP [skosxl:literalForm ?name] ;
                  foaf:focus/gvp:biographyPreferred [schema:description ?bio] ;
                  skos:altLabel ?alt .
               FILTER regex(?name, "search_term", "i") .
-            } ORDER BY ?name' }
+            } ORDER BY ?name'.gsub(/[\s\n]+/, ' ') }
     end
     context "using a two subject terms" do
       subject { authority.sparql('search term') }
-      it { is_expected.to eq "SELECT DISTINCT ?s ?name ?bio {
-              ?s a skos:Concept; luc:term \"search term\";
+      it {
+        is_expected.to eq %(SELECT DISTINCT ?s ?name ?bio {
+              ?s a skos:Concept; luc:term "search term";
                  skos:inScheme <http://vocab.getty.edu/ulan/> ;
                  gvp:prefLabelGVP [skosxl:literalForm ?name] ;
                  foaf:focus/gvp:biographyPreferred [schema:description ?bio] ;
                  skos:altLabel ?alt .
-              FILTER (regex(CONCAT(?name, ' ', ?alt), \"search\",\"i\" ) && regex(CONCAT(?name, ' ', ?alt), \"term\",\"i\" ) ) .
-            } ORDER BY ?name" }
+              FILTER ((regex(?name, "search", "i") || regex(?alt, "search", "i")) && (regex(?name, "term", "i") || regex(?alt, "term", "i"))) .
+            } ORDER BY ?name).gsub(/[\s\n]+/, ' ') }
     end
   end
 end

data/spec/lib/authorities/getty_spec.rb

@@ -3,7 +3,8 @@ require 'spec_helper'
 describe Qa::Authorities::Getty do
   describe "#new" do
     it "raises an exception" do
-      expect { described_class.new }.to raise_error RuntimeError, "Initializing with as sub authority is removed. use Module.subauthority_for(nil) instead"
+      msg = "Initializing with as sub authority is removed. use Module.subauthority_for(nil) instead"
+      expect { described_class.new }.to raise_error RuntimeError, msg
     end
   end
 

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

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe Qa::Authorities::LinkedData::AuthorityService do
+  let(:auth_names) do
+    [:AGROVOC,
+     :LOC,
+     :LOD_ENCODING_CONFIG,
+     :LOD_FULL_CONFIG,
+     :LOD_LANG_DEFAULTS,
+     :LOD_LANG_MULTI_DEFAULTS,
+     :LOD_LANG_NO_DEFAULTS,
+     :LOD_LANG_PARAM,
+     :LOD_MIN_CONFIG,
+     :LOD_SEARCH_ONLY_CONFIG,
+     :LOD_SORT,
+     :LOD_TERM_ID_PARAM_CONFIG,
+     :LOD_TERM_ONLY_CONFIG,
+     :LOD_TERM_URI_PARAM_CONFIG,
+     :OCLC_FAST]
+  end
+
+  describe '#authority_configs' do
+    let(:result) { described_class.authority_configs }
+    it 'returns all authorities' do
+      expect(result).to be_kind_of(Hash)
+      expect(result.keys).to match_array auth_names
+      expect(result.values.first).to be_kind_of(Hash)
+      expect(result.values.first).to have_key(:term)
+      expect(result.values.first).to have_key(:search)
+    end
+  end
+
+  describe '#authority_config' do
+    let(:result) { described_class.authority_config(:LOD_FULL_CONFIG) }
+    it 'returns a single authority' do
+      expect(result).to be_kind_of(Hash)
+      expect(result).to have_key(:term)
+      expect(result).to have_key(:search)
+    end
+  end
+
+  describe '#authority_names' do
+    it "returns a list of all authorities' names" do
+      expect(described_class.authority_names).to eq auth_names
+    end
+  end
+end

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

@@ -62,7 +62,7 @@ RSpec.describe Qa::Authorities::LinkedData::GenericAuthority do
     context 'in AGROVOC authority' do
       context '0 search results' do
         let :results do
-          stub_request(:get, 'http://artemide.art.uniroma2.it:8081/agrovoc/rest/v1/search/?lang=en&query=*supercalifragilisticexpialidocious*')
+          stub_request(:get, 'http://artemide.art.uniroma2.it:8081/agrovoc/rest/v1/search/?lang=en&query=*supercalifragilisticexpialidocious*&maxhits=20')
             .to_return(status: 200, body: webmock_fixture('lod_agrovoc_query_no_results.json'), headers: { 'Content-Type' => 'application/json' })
           lod_agrovoc.search('supercalifragilisticexpialidocious')
         end
@@ -73,7 +73,7 @@ RSpec.describe Qa::Authorities::LinkedData::GenericAuthority do
 
       context '3 search results' do
         let :results do
-          stub_request(:get, 'http://artemide.art.uniroma2.it:8081/agrovoc/rest/v1/search/?lang=en&query=*milk*')
+          stub_request(:get, 'http://artemide.art.uniroma2.it:8081/agrovoc/rest/v1/search/?lang=en&query=*milk*&maxhits=20')
             .to_return(status: 200, body: webmock_fixture('lod_agrovoc_query_many_results.json'), headers: { 'Content-Type' => 'application/json' })
           lod_agrovoc.search('milk')
         end
@@ -93,6 +93,7 @@ RSpec.describe Qa::Authorities::LinkedData::GenericAuthority do
     #   # let(:lod_loc) { Qa::Authorities::LinkedData::GenericAuthority.new(:LOC) }
     # end
 
+    # rubocop:disable RSpec/NestedGroups
     describe "language processing" do
       context "when filtering #search results" do
         context "and lang NOT passed in" do
@@ -184,6 +185,7 @@ RSpec.describe Qa::Authorities::LinkedData::GenericAuthority do
         end
       end
     end
+    # rubocop:enable RSpec/NestedGroups
   end
 
   describe '#find' do
@@ -195,7 +197,7 @@ RSpec.describe Qa::Authorities::LinkedData::GenericAuthority do
       context 'with bad id' do
         before do
           stub_request(:get, 'http://id.worldcat.org/fast/FAKE_ID')
-            .to_return(status: 404, body: '', headers:  {})
+            .to_return(status: 404, body: '', headers: {})
         end
         it 'raises a TermNotFound exception' do
           expect { lod_oclc.find('FAKE_ID') }.to raise_error Qa::TermNotFound, /.*\/FAKE_ID\ Not Found - Term may not exist at LOD Authority./
@@ -256,14 +258,19 @@ RSpec.describe Qa::Authorities::LinkedData::GenericAuthority do
         it 'has primary predicates in pred-obj list' do
           expect(results['predicates']['http://purl.org/dc/terms/identifier']).to eq ['530369']
           expect(results['predicates']['http://www.w3.org/2004/02/skos/core#prefLabel']).to eq ['Cornell University']
-          expect(results['predicates']['http://www.w3.org/2004/02/skos/core#altLabel']).to include('Ithaca (N.Y.). Cornell University', "Kornel\\xCA\\xB9skii universitet", "K\\xCA\\xBBang-nai-erh ta hs\\xC3\\xBCeh")
+          expect(results['predicates']['http://www.w3.org/2004/02/skos/core#altLabel'])
+            .to include('Ithaca (N.Y.). Cornell University', "Kornel\\xCA\\xB9skii universitet",
+                        "K\\xCA\\xBBang-nai-erh ta hs\\xC3\\xBCeh")
           expect(results['predicates']['http://schema.org/sameAs']).to include('http://id.loc.gov/authorities/names/n79021621', 'https://viaf.org/viaf/126293486')
         end
 
         it 'has unspecified predicate values' do
           expect(results['predicates']['http://www.w3.org/1999/02/22-rdf-syntax-ns#type']).to eq ['http://schema.org/Organization']
-          expect(results['predicates']['http://www.w3.org/2004/02/skos/core#inScheme']).to include('http://id.worldcat.org/fast/ontology/1.0/#fast', 'http://id.worldcat.org/fast/ontology/1.0/#facet-Corporate')
-          expect(results['predicates']['http://schema.org/name']).to include('Cornell University', 'Ithaca (N.Y.). Cornell University', "Kornel\\xCA\\xB9skii universitet", "K\\xCA\\xBBang-nai-erh ta hs\\xC3\\xBCeh")
+          expect(results['predicates']['http://www.w3.org/2004/02/skos/core#inScheme'])
+            .to include('http://id.worldcat.org/fast/ontology/1.0/#fast', 'http://id.worldcat.org/fast/ontology/1.0/#facet-Corporate')
+          expect(results['predicates']['http://schema.org/name'])
+            .to include('Cornell University', 'Ithaca (N.Y.). Cornell University', "Kornel\\xCA\\xB9skii universitet",
+                        "K\\xCA\\xBBang-nai-erh ta hs\\xC3\\xBCeh")
         end
       end
     end
@@ -290,11 +297,24 @@ RSpec.describe Qa::Authorities::LinkedData::GenericAuthority do
         it 'has primary predicates in pred-obj list' do
           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#broader']).to eq ['http://aims.fao.org/aos/agrovoc/c_4830']
-          expect(results['predicates']['http://www.w3.org/2004/02/skos/core#exactMatch']).to include('http://cat.aii.caas.cn/concept/c_26308', 'http://lod.nal.usda.gov/nalt/20627', 'http://d-nb.info/gnd/4147072-2')
+          expect(results['predicates']['http://www.w3.org/2004/02/skos/core#exactMatch'])
+            .to include('http://cat.aii.caas.cn/concept/c_26308', 'http://lod.nal.usda.gov/nalt/20627',
+                        'http://d-nb.info/gnd/4147072-2')
         end
 
         it 'has skos predicate values' do
-          expect(results['predicates']['http://www.w3.org/2008/05/skos-xl#prefLabel']).to include('http://aims.fao.org/aos/agrovoc/xl_es_1299487482038', 'http://aims.fao.org/aos/agrovoc/xl_it_1299487482154', 'http://aims.fao.org/aos/agrovoc/xl_ko_1299487482210', 'http://aims.fao.org/aos/agrovoc/xl_pl_1299487482273', 'http://aims.fao.org/aos/agrovoc/xl_sk_1299487482378', 'http://aims.fao.org/aos/agrovoc/xl_en_1299487482019', 'http://aims.fao.org/aos/agrovoc/xl_tr_9513_1321792194941', 'http://aims.fao.org/aos/agrovoc/xl_de_1299487482000', 'http://aims.fao.org/aos/agrovoc/xl_fa_1299487482058', 'http://aims.fao.org/aos/agrovoc/xl_th_1299487482417', 'http://aims.fao.org/aos/agrovoc/xl_fr_1299487482080', 'http://aims.fao.org/aos/agrovoc/xl_hi_1299487482102', 'http://aims.fao.org/aos/agrovoc/xl_ar_1299487481966', 'http://aims.fao.org/aos/agrovoc/xl_ja_1299487482181', 'http://aims.fao.org/aos/agrovoc/xl_lo_1299487482240', 'http://aims.fao.org/aos/agrovoc/xl_ru_1299487482341', 'http://aims.fao.org/aos/agrovoc/xl_cs_1299487481982', 'http://aims.fao.org/aos/agrovoc/xl_zh_1299487482458', 'http://aims.fao.org/aos/agrovoc/xl_pt_1299487482307', 'http://aims.fao.org/aos/agrovoc/xl_hu_1299487482127')
+          expect(results['predicates']['http://www.w3.org/2008/05/skos-xl#prefLabel'])
+            .to include('http://aims.fao.org/aos/agrovoc/xl_es_1299487482038', 'http://aims.fao.org/aos/agrovoc/xl_it_1299487482154',
+                        'http://aims.fao.org/aos/agrovoc/xl_ko_1299487482210', 'http://aims.fao.org/aos/agrovoc/xl_pl_1299487482273',
+                        'http://aims.fao.org/aos/agrovoc/xl_sk_1299487482378', 'http://aims.fao.org/aos/agrovoc/xl_en_1299487482019',
+                        'http://aims.fao.org/aos/agrovoc/xl_tr_9513_1321792194941',
+                        'http://aims.fao.org/aos/agrovoc/xl_de_1299487482000', 'http://aims.fao.org/aos/agrovoc/xl_fa_1299487482058',
+                        'http://aims.fao.org/aos/agrovoc/xl_th_1299487482417', 'http://aims.fao.org/aos/agrovoc/xl_fr_1299487482080',
+                        'http://aims.fao.org/aos/agrovoc/xl_hi_1299487482102', 'http://aims.fao.org/aos/agrovoc/xl_ar_1299487481966',
+                        'http://aims.fao.org/aos/agrovoc/xl_ja_1299487482181', 'http://aims.fao.org/aos/agrovoc/xl_lo_1299487482240',
+                        'http://aims.fao.org/aos/agrovoc/xl_ru_1299487482341', 'http://aims.fao.org/aos/agrovoc/xl_cs_1299487481982',
+                        'http://aims.fao.org/aos/agrovoc/xl_zh_1299487482458', 'http://aims.fao.org/aos/agrovoc/xl_pt_1299487482307',
+                        'http://aims.fao.org/aos/agrovoc/xl_hu_1299487482127')
           expect(results['predicates']['http://www.w3.org/2004/02/skos/core#inScheme']).to eq ['http://aims.fao.org/aos/agrovoc']
           expect(results['predicates']['http://www.w3.org/2004/02/skos/core#closeMatch']).to eq ['http://dbpedia.org/resource/Buttermilk']
           expect(results['predicates']['http://www.w3.org/2008/05/skos-xl#altLabel']).to eq ['http://aims.fao.org/aos/agrovoc/xl_fa_1299487482544']
@@ -337,22 +357,43 @@ RSpec.describe Qa::Authorities::LinkedData::GenericAuthority do
 
         it 'has loc mads predicate values' do
           expect(results['predicates']['http://www.loc.gov/mads/rdf/v1#classification']).to eq ['Q']
-          expect(results['predicates']['http://www.loc.gov/mads/rdf/v1#isMemberOfMADSCollection']).to include('http://id.loc.gov/authorities/subjects/collection_LCSHAuthorizedHeadings', 'http://id.loc.gov/authorities/subjects/collection_LCSH_General', 'http://id.loc.gov/authorities/subjects/collection_SubdivideGeographically')
-          expect(results['predicates']['http://www.loc.gov/mads/rdf/v1#hasCloseExternalAuthority']).to include('http://data.bnf.fr/ark:/12148/cb12321484k', 'http://data.bnf.fr/ark:/12148/cb119673416', 'http://data.bnf.fr/ark:/12148/cb119934236', 'http://data.bnf.fr/ark:/12148/cb12062047t', 'http://data.bnf.fr/ark:/12148/cb119469567', 'http://data.bnf.fr/ark:/12148/cb11933232c', 'http://data.bnf.fr/ark:/12148/cb122890536', 'http://data.bnf.fr/ark:/12148/cb121155321', 'http://data.bnf.fr/ark:/12148/cb15556043g', 'http://data.bnf.fr/ark:/12148/cb123662513', 'http://d-nb.info/gnd/4066562-8', 'http://data.bnf.fr/ark:/12148/cb120745812', 'http://data.bnf.fr/ark:/12148/cb11973101n', 'http://data.bnf.fr/ark:/12148/cb13328497r')
-          expect(results['predicates']['http://www.loc.gov/mads/rdf/v1#isMemberOfMADSScheme']).to eq ['http://id.loc.gov/authorities/subjects']
-          expect(results['predicates']['http://www.loc.gov/mads/rdf/v1#editorialNote']).to eq ['headings beginning with the word [Scientific;] and subdivision [Science] under ethnic groups and individual wars, e.g. [World War, 1939-1945--Science]']
+          expect(results['predicates']['http://www.loc.gov/mads/rdf/v1#isMemberOfMADSCollection'])
+            .to include('http://id.loc.gov/authorities/subjects/collection_LCSHAuthorizedHeadings',
+                        'http://id.loc.gov/authorities/subjects/collection_LCSH_General',
+                        'http://id.loc.gov/authorities/subjects/collection_SubdivideGeographically')
+          expect(results['predicates']['http://www.loc.gov/mads/rdf/v1#hasCloseExternalAuthority'])
+            .to include('http://data.bnf.fr/ark:/12148/cb12321484k', 'http://data.bnf.fr/ark:/12148/cb119673416',
+                        'http://data.bnf.fr/ark:/12148/cb119934236', 'http://data.bnf.fr/ark:/12148/cb12062047t',
+                        'http://data.bnf.fr/ark:/12148/cb119469567', 'http://data.bnf.fr/ark:/12148/cb11933232c',
+                        'http://data.bnf.fr/ark:/12148/cb122890536', 'http://data.bnf.fr/ark:/12148/cb121155321',
+                        'http://data.bnf.fr/ark:/12148/cb15556043g', 'http://data.bnf.fr/ark:/12148/cb123662513',
+                        'http://d-nb.info/gnd/4066562-8', 'http://data.bnf.fr/ark:/12148/cb120745812',
+                        'http://data.bnf.fr/ark:/12148/cb11973101n', 'http://data.bnf.fr/ark:/12148/cb13328497r')
+          expect(results['predicates']['http://www.loc.gov/mads/rdf/v1#isMemberOfMADSScheme'])
+            .to eq ['http://id.loc.gov/authorities/subjects']
+          expect(results['predicates']['http://www.loc.gov/mads/rdf/v1#editorialNote'])
+            .to eq ['headings beginning with the word [Scientific;] and subdivision [Science] under ethnic groups and individual wars, e.g. [World War, 1939-1945--Science]']
         end
 
         it 'has more unspecified predicate values' do
           expect(results['predicates']['http://www.w3.org/1999/02/22-rdf-syntax-ns#type']).to include('http://www.loc.gov/mads/rdf/v1#Topic', 'http://www.loc.gov/mads/rdf/v1#Authority', 'http://www.w3.org/2004/02/skos/core#Concept')
           expect(results['predicates']['http://www.w3.org/2002/07/owl#sameAs']).to include('info:lc/authorities/sh85118553', 'http://id.loc.gov/authorities/sh85118553#concept')
-          expect(results['predicates']['http://www.w3.org/2004/02/skos/core#closeMatch']).to include('http://data.bnf.fr/ark:/12148/cb12321484k', 'http://data.bnf.fr/ark:/12148/cb119673416', 'http://data.bnf.fr/ark:/12148/cb119934236', 'http://data.bnf.fr/ark:/12148/cb12062047t', 'http://data.bnf.fr/ark:/12148/cb119469567', 'http://data.bnf.fr/ark:/12148/cb11933232c', 'http://data.bnf.fr/ark:/12148/cb122890536', 'http://data.bnf.fr/ark:/12148/cb121155321', 'http://data.bnf.fr/ark:/12148/cb15556043g', 'http://data.bnf.fr/ark:/12148/cb123662513', 'http://d-nb.info/gnd/4066562-8', 'http://data.bnf.fr/ark:/12148/cb120745812', 'http://data.bnf.fr/ark:/12148/cb11973101n', 'http://data.bnf.fr/ark:/12148/cb13328497r')
-          expect(results['predicates']['http://www.w3.org/2004/02/skos/core#editorial']).to eq ['headings beginning with the word [Scientific;] and subdivision [Science] under ethnic groups and individual wars, e.g. [World War, 1939-1945--Science]']
+          expect(results['predicates']['http://www.w3.org/2004/02/skos/core#closeMatch'])
+            .to include('http://data.bnf.fr/ark:/12148/cb12321484k', 'http://data.bnf.fr/ark:/12148/cb119673416',
+                        'http://data.bnf.fr/ark:/12148/cb119934236', 'http://data.bnf.fr/ark:/12148/cb12062047t',
+                        'http://data.bnf.fr/ark:/12148/cb119469567', 'http://data.bnf.fr/ark:/12148/cb11933232c',
+                        'http://data.bnf.fr/ark:/12148/cb122890536', 'http://data.bnf.fr/ark:/12148/cb121155321',
+                        'http://data.bnf.fr/ark:/12148/cb15556043g', 'http://data.bnf.fr/ark:/12148/cb123662513',
+                        'http://d-nb.info/gnd/4066562-8', 'http://data.bnf.fr/ark:/12148/cb120745812',
+                        'http://data.bnf.fr/ark:/12148/cb11973101n', 'http://data.bnf.fr/ark:/12148/cb13328497r')
+          expect(results['predicates']['http://www.w3.org/2004/02/skos/core#editorial'])
+            .to eq ['headings beginning with the word [Scientific;] and subdivision [Science] under ethnic groups and individual wars, e.g. [World War, 1939-1945--Science]']
           expect(results['predicates']['http://www.w3.org/2004/02/skos/core#inScheme']).to eq ['http://id.loc.gov/authorities/subjects']
         end
       end
     end
 
+    # rubocop:disable RSpec/NestedGroups
     describe "language processing" do
       context "when filtering #find result" do
         context "and lang NOT passed in" do
@@ -461,6 +502,7 @@ RSpec.describe Qa::Authorities::LinkedData::GenericAuthority do
         end
       end
     end
+    # rubocop:enable RSpec/NestedGroups
   end
 
   describe '#new' do

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

@@ -4,6 +4,7 @@ RSpec.describe Qa::Authorities::LinkedData::SearchConfig do
   let(:full_config) { Qa::Authorities::LinkedData::Config.new(:LOD_FULL_CONFIG).search }
   let(:min_config) { Qa::Authorities::LinkedData::Config.new(:LOD_MIN_CONFIG).search }
   let(:term_only_config) { Qa::Authorities::LinkedData::Config.new(:LOD_TERM_ONLY_CONFIG).search }
+  let(:encoding_config) { Qa::Authorities::LinkedData::Config.new(:LOD_ENCODING_CONFIG).search }
 
   describe '#search_config' do
     let(:full_search_config) do
@@ -335,29 +336,32 @@ RSpec.describe Qa::Authorities::LinkedData::SearchConfig do
     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
-    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
+    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
@@ -381,5 +385,15 @@ RSpec.describe Qa::Authorities::LinkedData::SearchConfig do
         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

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

@@ -14,7 +14,9 @@ RSpec.describe Qa::Authorities::LinkedData::SearchQuery do
       let(:auth_name) { :LOD_MIN_CONFIG }
 
       it "does not change order" do
-        json_results = [{ label: "[#{term_b}, #{term_c}]", sort: [term_b, term_c] }, { label: "[#{term_b}, #{term_d}]", sort: [term_b, term_d] }, { label: "[#{term_b}, #{term_a}]", sort: [term_b, term_a] }]
+        json_results = [{ label: "[#{term_b}, #{term_c}]", sort: [term_b, term_c] },
+                        { label: "[#{term_b}, #{term_d}]", sort: [term_b, term_d] },
+                        { label: "[#{term_b}, #{term_a}]", sort: [term_b, term_a] }]
         expect(instance.send(:sort_search_results, json_results)).to eq json_results
       end
     end
@@ -22,28 +24,58 @@ RSpec.describe Qa::Authorities::LinkedData::SearchQuery do
     context 'when sort predicate is specified in configuration' do
       let(:auth_name) { :LOD_SORT }
 
-      context "when sort term is empty" do
+      context "and sort term is empty" do
         context "for all" do
           it "does not change order" do
-            json_results = [{ label: "[#{term_b}]", sort: [""] }, { label: "[#{term_a}]", sort: [""] }, { label: "[#{term_c}]", sort: [""] }]
+            json_results = [{ label: "[#{term_b}]", sort: [""] },
+                            { label: "[#{term_a}]", sort: [""] },
+                            { label: "[#{term_c}]", sort: [""] }]
             expect(instance.send(:sort_search_results, json_results)).to eq json_results
           end
         end
 
         context "for one" do
-          it "puts empty first" do
-            json_results = [{ label: "[#{term_b}]", sort: [""] }, { label: "[#{term_c}]", sort: [term_c] }, { label: "[#{term_a}]", sort: [term_a] }]
-            expected_results = [{ label: "[#{term_b}]" }, { label: "[#{term_a}]" }, { label: "[#{term_c}]" }]
+          it "puts empty first when empty is in 1st position" do
+            json_results = [{ label: "['_empty_1_']", sort: [""] },
+                            { label: "[#{term_c}]", sort: [term_c] },
+                            { label: "[#{term_a}]", sort: [term_a] }]
+            expected_results = [{ label: "['_empty_1_']" },
+                                { label: "[#{term_a}]" },
+                                { label: "[#{term_c}]" }]
+            expect(instance.send(:sort_search_results, json_results)).to eq expected_results
+          end
+
+          it "puts empty first when empty is in 2nd position" do
+            json_results = [{ label: "[#{term_b}]", sort: [term_b] },
+                            { label: "['_empty_2_']", sort: [""] },
+                            { label: "[#{term_a}]", sort: [term_a] }]
+            expected_results = [{ label: "['_empty_2_']" },
+                                { label: "[#{term_a}]" },
+                                { label: "[#{term_b}]" }]
+            expect(instance.send(:sort_search_results, json_results)).to eq expected_results
+          end
+
+          it "puts empty first when empty is in last position" do
+            json_results = [{ label: "[#{term_b}]", sort: [term_b] },
+                            { label: "[#{term_c}]", sort: [term_c] },
+                            { label: "['_empty_last_']", sort: [""] }]
+            expected_results = [{ label: "['_empty_last_']" },
+                                { label: "[#{term_b}]" },
+                                { label: "[#{term_c}]" }]
             expect(instance.send(:sort_search_results, json_results)).to eq expected_results
           end
         end
       end
 
-      context "when sort term is single value" do
+      context "and sort term is single value" do
         context "for all" do
           it "sorts on the single value" do
-            json_results = [{ label: "[#{term_b}]", sort: [term_b] }, { label: "[#{term_c}]", sort: [term_c] }, { label: "[#{term_a}]", sort: [term_a] }]
-            expected_results = [{ label: "[#{term_a}]" }, { label: "[#{term_b}]" }, { label: "[#{term_c}]" }]
+            json_results = [{ label: "[#{term_b}]", sort: [term_b] },
+                            { label: "[#{term_c}]", sort: [term_c] },
+                            { label: "[#{term_a}]", sort: [term_a] }]
+            expected_results = [{ label: "[#{term_a}]" },
+                                { label: "[#{term_b}]" },
+                                { label: "[#{term_c}]" }]
             expect(instance.send(:sort_search_results, json_results)).to eq expected_results
           end
         end
@@ -51,8 +83,12 @@ RSpec.describe Qa::Authorities::LinkedData::SearchQuery do
 
       context "when first sort term is same" do
         it "sorts on second sort term" do
-          json_results = [{ label: "[#{term_b}, #{term_c}]", sort: [term_b, term_c] }, { label: "[#{term_b}, #{term_d}]", sort: [term_b, term_d] }, { label: "[#{term_b}, #{term_a}]", sort: [term_b, term_a] }]
-          expected_results = [{ label: "[#{term_b}, #{term_a}]" }, { label: "[#{term_b}, #{term_c}]" }, { label: "[#{term_b}, #{term_d}]" }]
+          json_results = [{ label: "[#{term_b}, #{term_c}]", sort: [term_b, term_c] },
+                          { label: "[#{term_b}, #{term_d}]", sort: [term_b, term_d] },
+                          { label: "[#{term_b}, #{term_a}]", sort: [term_b, term_a] }]
+          expected_results = [{ label: "[#{term_b}, #{term_a}]" },
+                              { label: "[#{term_b}, #{term_c}]" },
+                              { label: "[#{term_b}, #{term_d}]" }]
           expect(instance.send(:sort_search_results, json_results)).to eq expected_results
         end
       end
@@ -60,20 +96,36 @@ RSpec.describe Qa::Authorities::LinkedData::SearchQuery do
       context "when different number of sort terms" do
         context "and initial terms match" do
           it "puts shorter set of terms before longer set" do
-            json_results = [{ label: "[#{term_b}, #{term_c}]", sort: [term_b, term_c] }, { label: "[#{term_b}]", sort: [term_b] }, { label: "[#{term_b}, #{term_a}]", sort: [term_b, term_a] }]
-            expected_results = [{ label: "[#{term_b}]" }, { label: "[#{term_b}, #{term_a}]" }, { label: "[#{term_b}, #{term_c}]" }]
+            json_results = [{ label: "[#{term_b}, #{term_c}]", sort: [term_b, term_c] },
+                            { label: "[#{term_b}]", sort: [term_b] },
+                            { label: "[#{term_b}, #{term_a}]", sort: [term_b, term_a] }]
+            expected_results = [{ label: "[#{term_b}]" },
+                                { label: "[#{term_b}, #{term_a}]" },
+                                { label: "[#{term_b}, #{term_c}]" }]
             expect(instance.send(:sort_search_results, json_results)).to eq expected_results
           end
         end
 
         context "and a difference happens before end of term sets" do
           it "stops ordering as soon as a difference is found" do
-            json_results = [{ label: "[#{term_b}, #{term_d}, #{term_c}]", sort: [term_b, term_d, term_c] }, { label: "[#{term_a}, #{term_c}]", sort: [term_a, term_c] }, { label: "[#{term_b}, #{term_d}, #{term_a}]", sort: [term_b, term_d, term_a] }]
-            expected_results = [{ label: "[#{term_a}, #{term_c}]" }, { label: "[#{term_b}, #{term_d}, #{term_a}]" }, { label: "[#{term_b}, #{term_d}, #{term_c}]" }]
+            json_results = [{ label: "[#{term_b}, #{term_d}, #{term_c}]", sort: [term_b, term_d, term_c] },
+                            { label: "[#{term_a}, #{term_c}]", sort: [term_a, term_c] },
+                            { label: "[#{term_b}, #{term_d}, #{term_a}]", sort: [term_b, term_d, term_a] }]
+            expected_results = [{ label: "[#{term_a}, #{term_c}]" },
+                                { label: "[#{term_b}, #{term_d}, #{term_a}]" },
+                                { label: "[#{term_b}, #{term_d}, #{term_c}]" }]
             expect(instance.send(:sort_search_results, json_results)).to eq expected_results
           end
         end
       end
+
+      context "and sort values are numeric" do
+        it "does numeric compare" do
+          json_results = [{ label: "['22']", sort: ["22"] }, { label: "['1']", sort: ["1"] }, { label: "['215']", sort: ["215"] }]
+          expected_results = [{ label: "['1']" }, { label: "['22']" }, { label: "['215']" }]
+          expect(instance.send(:sort_search_results, json_results)).to eq expected_results
+        end
+      end
     end
   end
 end

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

@@ -4,6 +4,7 @@ describe Qa::Authorities::LinkedData::TermConfig do
   let(:full_config) { Qa::Authorities::LinkedData::Config.new(:LOD_FULL_CONFIG).term }
   let(:min_config) { Qa::Authorities::LinkedData::Config.new(:LOD_MIN_CONFIG).term }
   let(:search_only_config) { Qa::Authorities::LinkedData::Config.new(:LOD_SEARCH_ONLY_CONFIG).term }
+  let(:encoding_config) { Qa::Authorities::LinkedData::Config.new(:LOD_ENCODING_CONFIG).term }
 
   describe '#term_config' do
     let(:full_term_config) do
@@ -369,32 +370,35 @@ describe Qa::Authorities::LinkedData::TermConfig do
     end
   end
 
+  # rubocop:disable RSpec/RepeatedExample
   describe '#term_url_with_replacements' do
     it 'returns nil if only search configuration is defined' do
       expect(search_only_config.term_url_with_replacements('C123')).to eq nil
     end
-    it 'returns the url with query substitution applied' do
-      expected_url = 'http://localhost/test_default/term/term_sub2_name/C123?param1=alpha&param2=beta'
-      expect(full_config.term_url_with_replacements('C123')).to eq expected_url
-    end
-    it 'returns the url with default subauthority when NOT specified' do
-      expected_url = 'http://localhost/test_default/term/term_sub2_name/C123?param1=alpha&param2=beta'
-      expect(full_config.term_url_with_replacements('C123')).to eq expected_url
-    end
-    it 'returns the url with subauthority substitution when specified' do
-      expected_url = 'http://localhost/test_default/term/term_sub3_name/C123?param1=alpha&param2=beta'
-      expect(full_config.term_url_with_replacements('C123', 'term_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/term/term_sub2_name/C123?param1=alpha&param2=beta'
-      expect(full_config.term_url_with_replacements('C123')).to eq expected_url
-    end
-    it 'returns the url with replacement substitution values when replacements are specified' do
-      expected_url = 'http://localhost/test_default/term/term_sub2_name/C123?param1=golf&param2=hotel'
-      expect(full_config.term_url_with_replacements('C123', nil, param1: 'golf', param2: 'hotel')).to eq expected_url
+    context 'when subauthorities ARE defined' do
+      it 'returns the url with query substitution applied' do
+        expected_url = 'http://localhost/test_default/term/term_sub2_name/C123?param1=alpha&param2=beta'
+        expect(full_config.term_url_with_replacements('C123')).to eq expected_url
+      end
+      it 'returns the url with default subauthority when NOT specified' do
+        expected_url = 'http://localhost/test_default/term/term_sub2_name/C123?param1=alpha&param2=beta'
+        expect(full_config.term_url_with_replacements('C123')).to eq expected_url
+      end
+      it 'returns the url with subauthority substitution when specified' do
+        expected_url = 'http://localhost/test_default/term/term_sub3_name/C123?param1=alpha&param2=beta'
+        expect(full_config.term_url_with_replacements('C123', 'term_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/term/term_sub2_name/C123?param1=alpha&param2=beta'
+        expect(full_config.term_url_with_replacements('C123')).to eq expected_url
+      end
+      it 'returns the url with replacement substitution values when replacements are specified' do
+        expected_url = 'http://localhost/test_default/term/term_sub2_name/C123?param1=golf&param2=hotel'
+        expect(full_config.term_url_with_replacements('C123', nil, param1: 'golf', param2: 'hotel')).to eq expected_url
+      end
     end
 
-    context 'when subauthorities are not defined' do
+    context 'when subauthorities are NOT defined' do
       it 'returns the url with query substitution applied' do
         expected_url = 'http://localhost/test_default/term/C123'
         expect(min_config.term_url_with_replacements('C123')).to eq expected_url
@@ -415,5 +419,15 @@ describe Qa::Authorities::LinkedData::TermConfig do
         expect(min_config.term_url_with_replacements('C123', 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/term?uri=http%3A%2F%2Fencoded%2Ebecause%3Fencode%3Dtrue&yes%3Aencoded%20here&no:encoding here&defaults:to not encoded'
+        term_uri = 'http://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.term_url_with_replacements(term_uri, nil, replacements)).to eq expected_url
+      end
+    end
   end
+  # rubocop:enable RSpec/RepeatedExample
 end