qa 0.4.3 → 0.5.0

data/spec/lib/{authorities_local_spec.rb → authorities/file_based_authority_spec.rb}

@@ -1,22 +1,10 @@
 require 'spec_helper'
 
-describe Qa::Authorities::Local do
-
-  let(:authority_a) { Qa::Authorities::Local.new("authority_A") }
-  let(:authority_b) { Qa::Authorities::Local.new("authority_B") }
-  let(:authority_c) { Qa::Authorities::Local.new("authority_C") }
-  let(:authority_d) { Qa::Authorities::Local.new("authority_D") }
-
-  describe "::new" do
-    context "without a sub-authority" do
-      it "should raise an error is the sub-authority is not provided" do
-        expect { Qa::Authorities::Local.new }.to raise_error
-      end
-      it "should raise an error is the sub-authority does not exist" do
-        expect { Qa::Authorities::Local.new("foo") }.to raise_error
-      end
-    end
-  end
+describe Qa::Authorities::Local::FileBasedAuthority do
+  let(:authority_a) { Qa::Authorities::Local.subauthority_for("authority_A") }
+  let(:authority_b) { Qa::Authorities::Local.subauthority_for("authority_B") }
+  let(:authority_c) { Qa::Authorities::Local.subauthority_for("authority_C") }
+  let(:authority_d) { Qa::Authorities::Local.subauthority_for("authority_D") }
 
   describe "#all" do
     let(:expected) { [ { 'id'=> "A1", 'label' => "Abc Term A1" },
@@ -34,12 +22,12 @@ describe Qa::Authorities::Local do
       end
     end
     context "authority YAML file is a list of terms" do
-      let(:expected) { [ { 'id' => "Term C1", 'label' => "Term C1" }, 
+      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
         expect(authority_c.all).to eq(expected)
-      end   
+      end
     end
     context "YAML file is malformed" do
       it "should raise an error" do
@@ -75,7 +63,7 @@ describe Qa::Authorities::Local do
       end
     end
   end
-  
+
   describe "#find" do
     context "source is a hash" do
       let(:id) { "A2" }

data/spec/lib/{authorities_getty_spec.rb → authorities/getty/aat_spec.rb}

@@ -1,26 +1,9 @@
 require 'spec_helper'
 
-describe Qa::Authorities::Getty do
+describe Qa::Authorities::Getty::AAT do
 
-  describe "#new" do
-    context "without a sub-authority" do
-      it "should raise an exception" do
-        expect { described_class.new }.to raise_error
-      end
-    end
-    context "with an invalid sub-authority" do
-      it "should raise an exception" do
-        expect { described_class.new("foo") }.to raise_error
-      end
-    end
-    context "with a valid sub-authority" do
-      it "should create the authority" do
-        expect(described_class.new("aat")).to be_kind_of described_class
-      end
-    end
-  end
+  let(:authority) { described_class.new }
 
-  let(:authority) { described_class.new("aat") }
   describe "#build_query_url" do
     subject { authority.build_query_url("foo") }
     it { is_expected.to  match /^http:\/\/vocab\.getty\.edu\// }
@@ -84,5 +67,16 @@ describe Qa::Authorities::Getty do
     it { is_expected.to eq(accept: "application/sparql-results+json") }
   end
 
+  describe "#sparql" do
+    subject { authority.sparql('search_term') }
+    it { is_expected.to eq 'SELECT ?s ?name {
+              ?s a skos:Concept; luc:term "search_term";
+                 skos:inScheme <http://vocab.getty.edu/aat/> ;
+                 gvp:prefLabelGVP [skosxl:literalForm ?name].
+              FILTER regex(?name, "search_term", "i") .
+            } LIMIT 10' }
+  end
+
 end
 
+

data/spec/lib/authorities/getty_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe Qa::Authorities::Getty do
+
+  describe "#new" do
+    it "should raise an exception" do
+      expect { described_class.new }.to raise_error
+    end
+  end
+
+  describe "#subauthority_for" do
+    context "without a sub-authority" do
+      it "should raise an exception" do
+        expect { described_class.subauthority_for }.to raise_error
+      end
+    end
+
+    context "with an invalid sub-authority" do
+      it "should raise an exception" do
+        expect { described_class.subauthority_for("foo") }.to raise_error
+      end
+    end
+
+    context "with a valid sub-authority" do
+      it "should create the authority" do
+        expect(described_class.subauthority_for("aat")).to be_kind_of Qa::Authorities::Getty::AAT
+      end
+    end
+  end
+end

data/spec/lib/{authorities_loc_spec.rb → authorities/loc_spec.rb}

@@ -8,24 +8,26 @@ describe Qa::Authorities::Loc do
         expect { Qa::Authorities::Loc.new }.to raise_error
       end
     end
+  end
+
+  describe "#subauthority_for" do
     context "with an invalid sub-authority" do
       it "should raise an exception" do
-        expect { Qa::Authorities::Loc.new("foo") }.to raise_error
+        expect { Qa::Authorities::Loc.subauthority_for("foo") }.to raise_error
       end
     end
     context "with a valid sub-authority" do
       it "should create the authority" do
-        expect(Qa::Authorities::Loc.new("subjects")).to be_kind_of Qa::Authorities::Loc
+        expect(Qa::Authorities::Loc.subauthority_for("subjects")).to be_kind_of Qa::Authorities::Loc::GenericAuthority
       end
     end
   end
-    
-  describe "urls" do
 
+  describe "urls" do
     let :authority do
-      Qa::Authorities::Loc.new("subjects")
+      Qa::Authorities::Loc.subauthority_for("subjects")
     end
-    
+
     context "for searching" do
       it "should return a url" do
         url = 'http://id.loc.gov/search/?q=foo&q=cs%3Ahttp%3A%2F%2Fid.loc.gov%2Fauthorities%2Fsubjects&format=json'
@@ -39,7 +41,6 @@ describe Qa::Authorities::Loc do
         expect(authority.find_url("sh2002003586")).to eq(url)
       end
     end
-  
   end
 
   describe "#search" do
@@ -49,7 +50,7 @@ describe Qa::Authorities::Loc do
         stub_request(:get, "http://id.loc.gov/search/?format=json&q=s&q=cs:http://id.loc.gov/vocabulary/geographicAreas").
             with(:headers => {'Accept'=>'application/json'}).
             to_return(:body => webmock_fixture("loc-response.txt"), :status => 200)
-        Qa::Authorities::Loc.new("geographicAreas")
+        Qa::Authorities::Loc.subauthority_for("geographicAreas")
       end
 
       it "should retain the raw respsonse from the LC service in JSON" do
@@ -80,7 +81,7 @@ describe Qa::Authorities::Loc do
         stub_request(:get, "http://id.loc.gov/search/?format=json&q=History--&q=cs:http://id.loc.gov/authorities/subjects").
             with(:headers => {'Accept'=>'application/json'}).
             to_return(:body => webmock_fixture("loc-subjects-response.txt"), :status => 200)
-        Qa::Authorities::Loc.new("subjects").search("History--")
+        Qa::Authorities::Loc.subauthority_for("subjects").search("History--")
       end
       it "should have a URI for the id and a string label" do
         expect(results.count).to eq(20)
@@ -96,7 +97,7 @@ describe Qa::Authorities::Loc do
         stub_request(:get, "http://id.loc.gov/search/?format=json&q=Berry&q=cs:http://id.loc.gov/authorities/names").
             with(:headers => {'Accept'=>'application/json'}).
             to_return(:body => webmock_fixture("loc-names-response.txt"), :status => 200)
-            Qa::Authorities::Loc.new("names").search("Berry")
+            Qa::Authorities::Loc.subauthority_for("names").search("Berry")
       end
       it "should retrieve names via search" do
         expect(results.first["label"]).to eq("Berry, James W. (James William), 1938-")
@@ -111,7 +112,7 @@ describe Qa::Authorities::Loc do
         stub_request(:get, "http://id.loc.gov/authorities/subjects/sh2002003586.json").
           with(:headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip, deflate', 'User-Agent'=>'Ruby'}).
           to_return(:status => 200, :body => webmock_fixture("loc-subject-find-response.txt"), :headers => {})
-        Qa::Authorities::Loc.new("subjects").find("sh2002003586")
+        Qa::Authorities::Loc.subauthority_for("subjects").find("sh2002003586")
       end
       it "returns the complete record for a given subject" do
         expect(results.count).to eq(20)

data/spec/lib/authorities/local_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe Qa::Authorities::Local do
+
+  describe "new" do
+    it "should raise an error" do
+      expect { described_class.new }.to raise_error
+    end
+  end
+
+  describe ".subauthority_for" do
+    context "without a sub-authority" do
+      it "should raise an error is the sub-authority is not provided" do
+        expect { described_class.subauthority_for }.to raise_error
+      end
+      it "should raise an error is the sub-authority does not exist" do
+        expect { described_class.subauthority_for("foo") }.to raise_error
+      end
+    end
+
+    context "with a sub authority" do
+      subject { described_class.subauthority_for("authority_A") }
+      it "should return a file authority" do
+        expect(subject).to be_kind_of Qa::Authorities::Local::FileBasedAuthority
+      end
+    end
+  end
+
+  describe ".register" do
+    before do
+      class SolrAuthority
+        def initialize(one)
+        end
+      end
+      described_class.register_subauthority('new_sub', 'SolrAuthority')
+    end
+
+    after { Object.send(:remove_const, :SolrAuthority) }
+
+    it "adds an entry to subauthorities" do
+      expect(described_class.subauthorities).to include 'new_sub'
+    end
+
+    it "creates authorities of the proper type" do
+      expect(described_class.subauthority_for('new_sub')).to be_kind_of SolrAuthority
+    end
+  end
+end

data/spec/lib/{authorities_oclcts_spec.rb → authorities/oclcts_spec.rb}

@@ -10,10 +10,10 @@ describe Qa::Authorities::Oclcts do
     stub_request(:get, "http://tspilot.oclc.org/mesh/?maximumRecords=10&operation=searchRetrieve&query=dc.identifier%20exact%20%22D031329Q000821%22&recordPacking=xml&recordSchema=http://zthes.z3950.org/xml/1.0/&recordXPath=&resultSetTTL=300&sortKeys=&startRecord=1&version=1.1").
         to_return(:body => webmock_fixture("oclcts-response-mesh-3.txt"), :status => 200)
 
-    @first_query = Qa::Authorities::Oclcts.new("mesh")
+    @first_query = Qa::Authorities::Oclcts.subauthority_for("mesh")
     @terms = @first_query.search("ball")
     @term_record = @first_query.find(@terms.first["id"])
-    @second_query = Qa::Authorities::Oclcts.new("mesh")
+    @second_query = Qa::Authorities::Oclcts.subauthority_for("mesh")
     @second_query.search("alph")
   end
 

data/spec/lib/authorities_loc_subauthorities.rb

@@ -11,8 +11,8 @@ describe Qa::Authorities::LocSubauthority do
 
   context "with a valid subauthority" do
     it "should return a url" do
-      sub_authority_table.keys.each do |authority|
-        expect(subject.get_url_for_authority(authority)).to eq(sub_authority_table[authority])
+      subauthority_table.keys.each do |authority|
+        expect(subject.get_url_for_authority(authority)).to eq(subauthority_table[authority])
       end
     end
   end
@@ -25,7 +25,7 @@ describe Qa::Authorities::LocSubauthority do
 
   # This is the original data structure that was used to define subauthority urls
   # It is retained here to ensure our refactor succeeded
-  def sub_authority_table
+  def subauthority_table
     begin
       vocab_base_url = 'cs%3Ahttp%3A%2F%2Fid.loc.gov%2Fvocabulary%2F'
       authority_base_url = 'cs%3Ahttp%3A%2F%2Fid.loc.gov%2Fauthorities%2F'

data/spec/lib/authorities_local_subauthorities_spec.rb

@@ -15,13 +15,13 @@ describe Qa::Authorities::LocalSubauthority do
   before { @original_path = AUTHORITIES_CONFIG[:local_path] }
   after { AUTHORITIES_CONFIG[:local_path] = @original_path }
 
-  describe "#sub_authorities_path" do
+  describe "#subauthorities_path" do
     before { AUTHORITIES_CONFIG[:local_path] = path }
     context "configured with a full path" do
       let(:path) { "/full/path" }
 
       it "returns a full path" do
-        expect(test.sub_authorities_path).to eq(path)
+        expect(test.subauthorities_path).to eq(path)
       end
     end
 
@@ -29,7 +29,7 @@ describe Qa::Authorities::LocalSubauthority do
       let(:path) { "relative/path" }
 
       it "returns a path relative to the Rails applicaition" do
-        expect(test.sub_authorities_path).to eq(File.join(Rails.root, path))
+        expect(test.subauthorities_path).to eq(File.join(Rails.root, path))
       end
     end
   end

data/spec/routing/route_spec.rb

@@ -9,7 +9,7 @@ describe "QA Routes", :type => :routing do
       expect({ get: '/terms/vocab' }).to route_to(controller: 'qa/terms', action: 'index', vocab: 'vocab')
     end
     it "should route to index with an authority and a subauthority" do
-      expect({ get: '/terms/vocab/sub' }).to route_to(controller: 'qa/terms', action: 'index', vocab: 'vocab', sub_authority: 'sub')
+      expect({ get: '/terms/vocab/sub' }).to route_to(controller: 'qa/terms', action: 'index', vocab: 'vocab', subauthority: 'sub')
     end
   end
 
@@ -18,7 +18,7 @@ describe "QA Routes", :type => :routing do
       expect({ get: '/search/vocab' }).to route_to(controller: 'qa/terms', action: 'search', vocab: 'vocab')
     end
     it "should route to searching for an authority and a subauthority" do
-      expect({ get: '/search/vocab/sub' }).to route_to(controller: 'qa/terms', action: 'search', vocab: 'vocab', sub_authority: 'sub')
+      expect({ get: '/search/vocab/sub' }).to route_to(controller: 'qa/terms', action: 'search', vocab: 'vocab', subauthority: 'sub')
     end
   end
 
@@ -27,7 +27,7 @@ describe "QA Routes", :type => :routing do
       expect({ get: '/show/vocab/term_id' }).to route_to(controller: 'qa/terms', action: 'show', vocab: 'vocab', id: 'term_id')
     end
     it "should route to an authority with a subauthority" do
-      expect({ get: '/show/vocab/sub/term_id' }).to route_to(controller: 'qa/terms', action: 'show', vocab: 'vocab', sub_authority: 'sub', id: 'term_id')
+      expect({ get: '/show/vocab/sub/term_id' }).to route_to(controller: 'qa/terms', action: 'show', vocab: 'vocab', subauthority: 'sub', id: 'term_id')
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qa
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Stephen Anderson
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-09 00:00:00.000000000 Z
+date: 2015-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -216,15 +216,19 @@ files:
 - lib/qa/authorities/authority_with_sub_authority.rb
 - lib/qa/authorities/base.rb
 - lib/qa/authorities/getty.rb
+- lib/qa/authorities/getty/aat.rb
 - lib/qa/authorities/loc.rb
+- lib/qa/authorities/loc/generic_authority.rb
 - lib/qa/authorities/loc_subauthority.rb
 - lib/qa/authorities/local.rb
+- lib/qa/authorities/local/file_based_authority.rb
 - lib/qa/authorities/local_subauthority.rb
 - lib/qa/authorities/mesh.rb
 - lib/qa/authorities/mesh_tools.rb
 - lib/qa/authorities/mesh_tools/mesh_data_parser.rb
 - lib/qa/authorities/mesh_tools/mesh_importer.rb
 - lib/qa/authorities/oclcts.rb
+- lib/qa/authorities/oclcts/generic_oclc_authority.rb
 - lib/qa/authorities/tgnlang.rb
 - lib/qa/authorities/web_service_base.rb
 - lib/qa/data/TGN_LANGUAGES.xml
@@ -301,14 +305,16 @@ files:
 - spec/internal/public/favicon.ico
 - spec/internal/public/robots.txt
 - spec/internal/test/test_helper.rb
-- spec/lib/authorities_getty_spec.rb
-- spec/lib/authorities_loc_spec.rb
+- spec/lib/authorities/file_based_authority_spec.rb
+- spec/lib/authorities/getty/aat_spec.rb
+- spec/lib/authorities/getty_spec.rb
+- spec/lib/authorities/loc_spec.rb
+- spec/lib/authorities/local_spec.rb
+- spec/lib/authorities/mesh_spec.rb
+- spec/lib/authorities/oclcts_spec.rb
+- spec/lib/authorities/tgnlang_spec.rb
 - spec/lib/authorities_loc_subauthorities.rb
-- spec/lib/authorities_local_spec.rb
 - spec/lib/authorities_local_subauthorities_spec.rb
-- spec/lib/authorities_mesh_spec.rb
-- spec/lib/authorities_oclcts_spec.rb
-- spec/lib/authorities_tgnlang_spec.rb
 - spec/lib/mesh_data_parser_spec.rb
 - spec/lib/tasks/mesh.rake_spec.rb
 - spec/models/subject_mesh_term_spec.rb
@@ -409,14 +415,16 @@ test_files:
 - spec/internal/Rakefile
 - spec/internal/README.rdoc
 - spec/internal/test/test_helper.rb
-- spec/lib/authorities_getty_spec.rb
-- spec/lib/authorities_loc_spec.rb
+- spec/lib/authorities/file_based_authority_spec.rb
+- spec/lib/authorities/getty/aat_spec.rb
+- spec/lib/authorities/getty_spec.rb
+- spec/lib/authorities/loc_spec.rb
+- spec/lib/authorities/local_spec.rb
+- spec/lib/authorities/mesh_spec.rb
+- spec/lib/authorities/oclcts_spec.rb
+- spec/lib/authorities/tgnlang_spec.rb
 - spec/lib/authorities_loc_subauthorities.rb
-- spec/lib/authorities_local_spec.rb
 - spec/lib/authorities_local_subauthorities_spec.rb
-- spec/lib/authorities_mesh_spec.rb
-- spec/lib/authorities_oclcts_spec.rb
-- spec/lib/authorities_tgnlang_spec.rb
 - spec/lib/mesh_data_parser_spec.rb
 - spec/lib/tasks/mesh.rake_spec.rb
 - spec/models/subject_mesh_term_spec.rb