qa 0.10.1 → 0.10.2

data/spec/lib/authorities/assign_fast_spec.rb

@@ -1,11 +1,10 @@
 require 'spec_helper'
 
 describe Qa::Authorities::AssignFast do
-
   # subauthority infrastructure
   describe "#new" do
     context "without a sub-authority" do
-      it "should raise an exception" 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"
       end
     end
@@ -13,13 +12,13 @@ describe Qa::Authorities::AssignFast do
 
   describe "#subauthority_for" do
     context "with an invalid sub-authority" do
-      it "should raise an exception" do
-        expect { Qa::Authorities::AssignFast.subauthority_for("foo") }.to raise_error Qa::InvalidSubAuthority
+      it "raises an exception" do
+        expect { described_class.subauthority_for("foo") }.to raise_error Qa::InvalidSubAuthority
       end
     end
     context "with a valid sub-authority" do
-      it "should create the authority" do
-        expect(Qa::Authorities::AssignFast.subauthority_for("all")).to be_kind_of Qa::Authorities::AssignFast::GenericAuthority
+      it "creates the authority" do
+        expect(described_class.subauthority_for("all")).to be_kind_of Qa::Authorities::AssignFast::GenericAuthority
       end
     end
   end
@@ -27,7 +26,7 @@ describe Qa::Authorities::AssignFast do
   # api call
   describe "query url" do
     let :authority do
-      Qa::Authorities::AssignFast.subauthority_for("all")
+      described_class.subauthority_for("all")
     end
 
     it "is correctly formed" do
@@ -38,15 +37,15 @@ describe Qa::Authorities::AssignFast do
 
   describe "search result" do
     let :authority do
-      Qa::Authorities::AssignFast.subauthority_for("all")
+      described_class.subauthority_for("all")
     end
 
     context "when we sent a bad character" do
       # server returns 200 with empty response; JSON throws a ParserError
       before do
-        stub_request(:get, "http://fast.oclc.org/searchfast/fastsuggest?query=word%20ling&queryIndex=suggestall&queryReturn=suggestall,idroot,auth,type&rows=20&suggest=autoSubject").
-         with(:headers => {'Accept'=>'application/json'}).
-         to_return(:status => 200, :body => "", :headers => {})
+        stub_request(:get, "http://fast.oclc.org/searchfast/fastsuggest?query=word%20ling&queryIndex=suggestall&queryReturn=suggestall,idroot,auth,type&rows=20&suggest=autoSubject")
+          .with(headers: { 'Accept' => 'application/json' })
+          .to_return(status: 200, body: "", headers: {})
       end
       it "logs an info and returns an empty array" do
         expect(Rails.logger).to receive(:info).with("Could not parse response as JSON. Request url: http://fast.oclc.org/searchfast/fastsuggest?&query=word%20ling&queryIndex=suggestall&queryReturn=suggestall%2Cidroot%2Cauth%2Ctype&suggest=autoSubject&rows=20")
@@ -58,11 +57,11 @@ describe Qa::Authorities::AssignFast do
     context "when query is blank" do
       # server returns results but no results header
       let :results do
-        stub_request(:get, "http://fast.oclc.org/searchfast/fastsuggest?&query=&queryIndex=suggestall&queryReturn=suggestall%2Cidroot%2Cauth%2Ctype&suggest=autoSubject&rows=20").
-          with(:headers => {'Accept'=>'application/json'}).
-          to_return(:body => webmock_fixture("assign-fast-noheader.json"), :status => 200, :headers => {})
+        stub_request(:get, "http://fast.oclc.org/searchfast/fastsuggest?&query=&queryIndex=suggestall&queryReturn=suggestall%2Cidroot%2Cauth%2Ctype&suggest=autoSubject&rows=20")
+          .with(headers: { 'Accept' => 'application/json' })
+          .to_return(body: webmock_fixture("assign-fast-noheader.json"), status: 200, headers: {})
         authority.search("")
-       end
+      end
       it "returns an empty array" do
         expect(results).to eq([])
       end
@@ -70,9 +69,9 @@ describe Qa::Authorities::AssignFast do
 
     context "with no results" do
       let :results do
-        stub_request(:get, "http://fast.oclc.org/searchfast/fastsuggest?query=word%20ling&queryIndex=suggestall&queryReturn=suggestall,idroot,auth,type&rows=20&suggest=autoSubject").
-          with(:headers => {'Accept'=>'application/json'}).
-          to_return(:body => webmock_fixture("assign-fast-noresults.json"), :status => 200, :headers => {})
+        stub_request(:get, "http://fast.oclc.org/searchfast/fastsuggest?query=word%20ling&queryIndex=suggestall&queryReturn=suggestall,idroot,auth,type&rows=20&suggest=autoSubject")
+          .with(headers: { 'Accept' => 'application/json' })
+          .to_return(body: webmock_fixture("assign-fast-noresults.json"), status: 200, headers: {})
         authority.search("word (ling")
       end
       it "returns an empty array" do
@@ -82,9 +81,9 @@ describe Qa::Authorities::AssignFast do
 
     context "with suggestall results" do
       let :results do
-        stub_request(:get, "http://fast.oclc.org/searchfast/fastsuggest?query=word%20ling&queryIndex=suggestall&queryReturn=suggestall,idroot,auth,type&rows=20&suggest=autoSubject").
-          with(:headers => {'Accept'=>'application/json'}).
-          to_return(:body => webmock_fixture("assign-fast-oneresult.json"), :status => 200, :headers => {})
+        stub_request(:get, "http://fast.oclc.org/searchfast/fastsuggest?query=word%20ling&queryIndex=suggestall&queryReturn=suggestall,idroot,auth,type&rows=20&suggest=autoSubject")
+          .with(headers: { 'Accept' => 'application/json' })
+          .to_return(body: webmock_fixture("assign-fast-oneresult.json"), status: 200, headers: {})
         authority.search("word (ling")
       end
       it "is correctly parsed" do
@@ -92,16 +91,16 @@ describe Qa::Authorities::AssignFast do
         expect(results.first[:id]).to eq('fst01180101')
         expect(results.first[:label]).to eq('Word (Linguistics)')
         expect(results.first[:value]).to eq('Word (Linguistics)')
-        expect(results.first).to eq({:id=>"fst01180101", :label=>"Word (Linguistics)", :value=>"Word (Linguistics)"})
+        expect(results.first).to eq(id: "fst01180101", label: "Word (Linguistics)", value: "Word (Linguistics)")
       end
     end
 
     context "with topical results" do
       let :results do
-        stub_request(:get, "http://fast.oclc.org/searchfast/fastsuggest?query=word&queryIndex=suggest50&queryReturn=suggest50,idroot,auth,type&rows=20&suggest=autoSubject").
-          with(:headers => {'Accept'=>'application/json'}).
-          to_return(:body => webmock_fixture("assign-fast-topical-result.json"), :status => 200, :headers => {})
-        Qa::Authorities::AssignFast.subauthority_for("topical").search("word")
+        stub_request(:get, "http://fast.oclc.org/searchfast/fastsuggest?query=word&queryIndex=suggest50&queryReturn=suggest50,idroot,auth,type&rows=20&suggest=autoSubject")
+          .with(headers: { 'Accept' => 'application/json' })
+          .to_return(body: webmock_fixture("assign-fast-topical-result.json"), status: 200, headers: {})
+        described_class.subauthority_for("topical").search("word")
       end
       it "is correctly parsed" do
         expect(results.count).to eq(20)
@@ -111,5 +110,4 @@ describe Qa::Authorities::AssignFast do
       end
     end
   end
-
 end

data/spec/lib/authorities/file_based_authority_spec.rb

@@ -7,30 +7,30 @@ describe Qa::Authorities::Local::FileBasedAuthority do
   let(:authority_d) { Qa::Authorities::Local.subauthority_for("authority_D") }
 
   describe "#all" do
-    let(:expected) { [ { 'id'=> "A1", 'label' => "Abc Term A1" },
-                       { 'id' => "A2", 'label'=> "Term A2" },
-                       { 'id' => "A3", 'label' => "Abc Term A3" } ] }
-    it "should return all the entries" do
+    let(:expected) { [{ 'id' => "A1", 'label' => "Abc Term A1" },
+                      { 'id' => "A2", 'label' => "Term A2" },
+                      { 'id' => "A3", 'label' => "Abc Term A3" }] }
+    it "returns all the entries" do
       expect(authority_a.all).to eq(expected)
     end
     context "when terms do not have ids" do
-      let(:expected) { [ { 'id' => "Term B1", 'label' => "Term B1" },
-                         { 'id' => "Term B2", 'label' => "Term B2" },
-                         { 'id' => "Term B3", 'label' => "Term B3" } ] }
-      it "should set the id to be same as the label" do
+      let(:expected) { [{ 'id' => "Term B1", 'label' => "Term B1" },
+                        { 'id' => "Term B2", 'label' => "Term B2" },
+                        { 'id' => "Term B3", 'label' => "Term B3" }] }
+      it "sets the id to be same as the label" do
         expect(authority_b.all).to eq(expected)
       end
     end
     context "authority YAML file is a list of terms" do
-      let(:expected) { [ { 'id' => "Term C1", 'label' => "Term C1" },
-                         { 'id' => "Term C2", 'label' => "Term C2" },
-                         { 'id' => "Term C3", 'label' => "Term C3" } ] }
-      it "should use the terms as labels" do
+      let(:expected) { [{ 'id' => "Term C1", 'label' => "Term C1" },
+                        { 'id' => "Term C2", 'label' => "Term C2" },
+                        { 'id' => "Term C3", 'label' => "Term C3" }] }
+      it "uses the terms as labels" do
         expect(authority_c.all).to eq(expected)
       end
     end
     context "YAML file is malformed" do
-      it "should raise an error" do
+      it "raises an error" do
         expect { authority_d.all }.to raise_error Psych::SyntaxError
       end
     end
@@ -39,26 +39,26 @@ describe Qa::Authorities::Local::FileBasedAuthority do
   describe "#search" do
     context "with an empty query string" do
       let(:expected) { [] }
-      it "should return no results" do
+      it "returns no results" do
         expect(authority_a.search("")).to eq(expected)
       end
     end
     context "with at least one matching entry" do
-      let(:expected) { [ { 'id' => "A1", 'label' => "Abc Term A1" },
-                         { 'id' => "A3", 'label' => "Abc Term A3" } ] }
-      it "should return only entries matching the query term" do
+      let(:expected) { [{ 'id' => "A1", 'label' => "Abc Term A1" },
+                        { 'id' => "A3", 'label' => "Abc Term A3" }] }
+      it "returns only entries matching the query term" do
         expect(authority_a.search("Abc")).to eq(expected)
       end
-      it "should match parts of words in the middle of the term" do
-        expect(authority_a.search("Term A1")).to eq([{"id"=>"A1", "label"=>"Abc Term A1"}])
+      it "matches parts of words in the middle of the term" do
+        expect(authority_a.search("Term A1")).to eq([{ "id" => "A1", "label" => "Abc Term A1" }])
       end
-      it "should be case insensitive" do
+      it "is case insensitive" do
         expect(authority_a.search("aBc")).to eq(expected)
       end
     end
     context "with no matching entries" do
       let(:expected) { [] }
-      it "should return an empty array" do
+      it "returns an empty array" do
         expect(authority_a.search("def")).to eq(expected)
       end
     end
@@ -68,14 +68,14 @@ describe Qa::Authorities::Local::FileBasedAuthority do
     context "source is a hash" do
       let(:id) { "A2" }
       let(:expected) { { 'id' => "A2", 'term' => "Term A2", 'active' => false } }
-      it "should return the full term record" do
+      it "returns the full term record" do
         record = authority_a.find(id)
         expect(record).to be_a HashWithIndifferentAccess
         expect(record).to eq(expected)
       end
     end
     context "source is a list" do
-      it "should be indifferent access" do
+      it "is indifferent access" do
         record = authority_c.find("Term C1")
         expect(record).to be_a HashWithIndifferentAccess
       end
@@ -83,17 +83,16 @@ describe Qa::Authorities::Local::FileBasedAuthority do
     context "term does not exist" do
       let(:id) { "NonID" }
       let(:expected) { {} }
-      it "should return an empty hash" do
+      it "returns an empty hash" do
         expect(authority_a.find(id)).to eq(expected)
       end
     end
     context "on a sub-authority" do
-      it "should return the full term record" do
+      it "returns the full term record" do
         record = authority_a.find("A2")
         expect(record).to be_a HashWithIndifferentAccess
         expect(record).to eq('id' => "A2", 'term' => "Term A2", 'active' => false)
       end
     end
   end
-
 end

data/spec/lib/authorities/geonames_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Qa::Authorities::Geonames do
-
   before do
     described_class.username = 'dummy'
   end
@@ -21,8 +20,8 @@ describe Qa::Authorities::Geonames do
   describe "#search" do
     context "authorities" do
       before do
-        stub_request(:get, /api\.geonames\.org.*/).
-            to_return(:body => webmock_fixture("geonames-response.json"), status: 200)
+        stub_request(:get, /api\.geonames\.org.*/)
+          .to_return(body: webmock_fixture("geonames-response.json"), status: 200)
       end
 
       subject { authority.search('whatever') }
@@ -77,13 +76,13 @@ describe Qa::Authorities::Geonames do
   describe "#find" do
     context "using a subject id" do
       before do
-        stub_request(:get, "http://www.geonames.org/getJSON?geonameId=2088122&username=dummy").
-            to_return(status: 200, body: webmock_fixture("geonames-find-response.json"))
+        stub_request(:get, "http://www.geonames.org/getJSON?geonameId=2088122&username=dummy")
+          .to_return(status: 200, body: webmock_fixture("geonames-find-response.json"))
       end
       subject { authority.find("2088122") }
 
       it "returns the complete record for a given subject" do
-        expect(subject['geonameId']).to eq 2088122
+        expect(subject['geonameId']).to eq 2_088_122
         expect(subject['name']).to eq "Port Moresby"
       end
     end

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

@@ -1,12 +1,11 @@
 require 'spec_helper'
 
 describe Qa::Authorities::Getty::AAT do
-
   let(:authority) { described_class.new }
 
   describe "#build_query_url" do
     subject { authority.build_query_url("foo") }
-    it { is_expected.to  match /^http:\/\/vocab\.getty\.edu\// }
+    it { is_expected.to match(/^http:\/\/vocab\.getty\.edu\//) }
   end
 
   describe "#find_url" do
@@ -17,13 +16,13 @@ describe Qa::Authorities::Getty::AAT do
   describe "#search" do
     context "authorities" do
       before do
-        stub_request(:get, /vocab\.getty\.edu.*/).
-            to_return(:body => webmock_fixture("aat-response.txt"), :status => 200)
+        stub_request(:get, /vocab\.getty\.edu.*/)
+          .to_return(body: webmock_fixture("aat-response.txt"), status: 200)
       end
 
       subject { authority.search('whatever') }
 
-      it "should have id and label keys" do
+      it "has id and label keys" do
         expect(subject.first).to eq("id" => 'http://vocab.getty.edu/aat/300053264', "label" => "photocopying")
         expect(subject.last).to eq("id" => 'http://vocab.getty.edu/aat/300265560', "label" => "photoscreenprints")
         expect(subject.size).to eq(10)
@@ -48,8 +47,8 @@ describe Qa::Authorities::Getty::AAT do
   describe "#find" do
     context "using a subject id" do
       before do
-        stub_request(:get, "http://vocab.getty.edu/aat/300265560.json").
-          to_return(status: 200, body: webmock_fixture("getty-aat-find-response.json"))
+        stub_request(:get, "http://vocab.getty.edu/aat/300265560.json")
+          .to_return(status: 200, body: webmock_fixture("getty-aat-find-response.json"))
       end
       subject { authority.find("300265560") }
 
@@ -76,7 +75,4 @@ describe Qa::Authorities::Getty::AAT do
               FILTER regex(?name, "search_term", "i") .
             } ORDER BY ?name' }
   end
-
 end
-
-

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

@@ -1,12 +1,11 @@
 require 'spec_helper'
 
 describe Qa::Authorities::Getty::TGN do
-
   let(:authority) { described_class.new }
 
   describe "#build_query_url" do
     subject { authority.build_query_url("foo") }
-    it { is_expected.to  match /^http:\/\/vocab\.getty\.edu\// }
+    it { is_expected.to match(/^http:\/\/vocab\.getty\.edu\//) }
   end
 
   describe "#find_url" do
@@ -17,13 +16,13 @@ describe Qa::Authorities::Getty::TGN do
   describe "#search" do
     context "authorities" do
       before do
-        stub_request(:get, /vocab\.getty\.edu.*/).
-            to_return(:body => webmock_fixture("tgn-response.txt"), :status => 200)
+        stub_request(:get, /vocab\.getty\.edu.*/)
+          .to_return(body: webmock_fixture("tgn-response.txt"), status: 200)
       end
 
       subject { authority.search('whatever') }
 
-      it "should have id and label keys" do
+      it "has id and label keys" do
         expect(subject.first).to eq("id" => 'http://vocab.getty.edu/tgn/2058300', "label" => "Cawood (Andrew, Missouri, United States)")
         expect(subject.last).to eq("id" => 'http://vocab.getty.edu/tgn/7022503', "label" => "Cawood Branch (Kentucky, United States)")
         expect(subject.size).to eq(6)
@@ -48,8 +47,8 @@ describe Qa::Authorities::Getty::TGN do
   describe "#find" do
     context "using a subject id" do
       before do
-        stub_request(:get, "http://vocab.getty.edu/tgn/1028772.json").
-            to_return(status: 200, body: webmock_fixture("getty-tgn-find-response.json"))
+        stub_request(:get, "http://vocab.getty.edu/tgn/1028772.json")
+          .to_return(status: 200, body: webmock_fixture("getty-tgn-find-response.json"))
       end
       subject { authority.find("1028772") }
 
@@ -89,7 +88,4 @@ describe Qa::Authorities::Getty::TGN do
             } ORDER BY ?name ASC(?par)" }
     end
   end
-
 end
-
-

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

@@ -1,12 +1,11 @@
 require 'spec_helper'
 
 describe Qa::Authorities::Getty::Ulan do
-
   let(:authority) { described_class.new }
 
   describe "#build_query_url" do
     subject { authority.build_query_url("foo") }
-    it { is_expected.to  match /^http:\/\/vocab\.getty\.edu\// }
+    it { is_expected.to match(/^http:\/\/vocab\.getty\.edu\//) }
   end
 
   describe "#find_url" do
@@ -17,13 +16,13 @@ describe Qa::Authorities::Getty::Ulan do
   describe "#search" do
     context "authorities" do
       before do
-        stub_request(:get, /vocab\.getty\.edu.*/).
-            to_return(:body => webmock_fixture("ulan-response.txt"), :status => 200)
+        stub_request(:get, /vocab\.getty\.edu.*/)
+          .to_return(body: webmock_fixture("ulan-response.txt"), status: 200)
       end
 
       subject { authority.search('whatever') }
 
-      it "should have id and label keys" do
+      it "has id and label keys" do
         expect(subject.first).to eq("id" => 'http://vocab.getty.edu/ulan/500233743', "label" => "Alan Turner and Associates (British architectural firm, contemporary)")
         expect(subject.last).to eq("id" => 'http://vocab.getty.edu/ulan/500023812', "label" => "Warren, Charles Turner (English engraver, 1762-1823)")
         expect(subject.size).to eq(142)
@@ -48,8 +47,8 @@ describe Qa::Authorities::Getty::Ulan do
   describe "#find" do
     context "using a subject id" do
       before do
-        stub_request(:get, "http://vocab.getty.edu/ulan/500026846.json").
-            to_return(status: 200, body: webmock_fixture("getty-ulan-find-response.json"))
+        stub_request(:get, "http://vocab.getty.edu/ulan/500026846.json")
+          .to_return(status: 200, body: webmock_fixture("getty-ulan-find-response.json"))
       end
       subject { authority.find("500026846") }
 
@@ -91,7 +90,4 @@ describe Qa::Authorities::Getty::Ulan do
             } ORDER BY ?name" }
     end
   end
-
 end
-
-

data/spec/lib/authorities/getty_spec.rb

@@ -1,28 +1,27 @@
 require 'spec_helper'
 
 describe Qa::Authorities::Getty do
-
   describe "#new" do
-    it "should raise an exception" 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"
     end
   end
 
   describe "#subauthority_for" do
     context "without a sub-authority" do
-      it "should raise an exception" do
+      it "raises an exception" do
         expect { described_class.subauthority_for }.to raise_error ArgumentError
       end
     end
 
     context "with an invalid sub-authority" do
-      it "should raise an exception" do
+      it "raises an exception" do
         expect { described_class.subauthority_for("foo") }.to raise_error Qa::InvalidSubAuthority
       end
     end
 
     context "with a valid sub-authority" do
-      it "should create the authority" do
+      it "creates the authority" do
         expect(described_class.subauthority_for("aat")).to be_kind_of Qa::Authorities::Getty::AAT
       end
     end