qa 0.0.1 → 0.0.2

data/lib/qa/authorities/local.rb

@@ -1,69 +1,34 @@
 module Qa::Authorities
+
   class Local < Qa::Authorities::Base
-    
-    attr_accessor :response
-    
-    def initialize(q, sub_authority)
-      begin
-        sub_authority_hash = YAML.load(File.read(File.join(Qa::Authorities::Local.sub_authorities_path, "#{sub_authority}.yml")))
-      rescue
-        sub_authority_hash = {}
-      end
-      @terms = normalize_terms(sub_authority_hash.fetch(:terms, []))
-      if q.blank?
-        self.response = @terms
-      else
-        sub_terms = []
-        @terms.each { |term| sub_terms << term if term[:term].downcase.start_with?(q.downcase) }
-        self.response = sub_terms
+
+    class << self
+      def sub_authority(name)
+        @sub_authorities ||= {}
+        raise ArgumentError, "Invalid sub-authority '#{name}'" unless Subauthority.names.include?(name)
+        @sub_authorities[name] ||= Subauthority.new(name)
       end
-    end
 
-    def normalize_terms(terms)
-      normalized_terms = []
-      terms.each do |term|
-        if term.is_a? String
-          normalized_terms << { :id => term, :term => term }
-        else
-          term[:id] = term[:id] || term[:term]
-          normalized_terms << term
-        end
+      def sub_authorities
+        Subauthority.names
       end
-      normalized_terms
-    end
 
-    def parse_authority_response
-      parsed_response = []
-      self.response.each do |res|
-        parsed_response << { :id => res[:id], :label => res[:term] }
+      def terms(sub_authority)
+        sub_authority(sub_authority).terms
       end
-      self.response = parsed_response
     end
-    
-    def get_full_record(id)
-      target_term = {}
-      @terms.each do |term|
-        if term[:id] == id
-          target_term = term
-        end
-      end
-      target_term.to_json
+
+    def search(q, sub_authority)
+      Local.sub_authority(sub_authority).search(q)
     end
-    
-    def self.sub_authorities_path
-      config_path = AUTHORITIES_CONFIG[:local_path]
-      if config_path.starts_with?(File::Separator)
-        config_path
-      else
-        File.join(Rails.root, config_path)
+
+    def get_full_record(id, sub_authority)
+      terms = Local.sub_authority(sub_authority).terms
+      terms.each do |term|
+        return term if term[:id] == id
       end
+      return {}
     end
-    
-    def self.sub_authorities
-      sub_auths = []
-      Dir.foreach(Qa::Authorities::Local.sub_authorities_path) { |file| sub_auths << File.basename(file, File.extname(file)) }
-      sub_auths
-    end
-        
+
   end
-end
+end

data/lib/qa/authorities/local/subauthority.rb

@@ -0,0 +1,61 @@
+module Qa::Authorities
+  # This is really just a sub-authority for Local
+  class Subauthority
+    attr_reader :name
+    def initialize(name)
+      @name = name
+    end
+
+    def terms
+      @terms ||= load_sub_authority_terms
+    end
+
+    def search(q)
+      r = q.blank? ? terms : terms.select { |term| /\b#{q.downcase}/.match(term[:term].downcase) }
+      r.map do |res|
+        { :id => res[:id], :label => res[:term] }.with_indifferent_access
+      end
+    end
+
+    class << self
+      def sub_authorities_path
+        config_path = AUTHORITIES_CONFIG[:local_path]
+        if config_path.starts_with?(File::Separator)
+          return config_path
+        end
+        File.join(Rails.root, config_path)
+      end
+
+      def names
+        @sub_auth_names ||=
+          begin
+            sub_auths = []
+            Dir.foreach(sub_authorities_path) { |file| sub_auths << File.basename(file, File.extname(file)) }
+            sub_auths
+          end
+      end
+    end
+
+    private
+      def load_sub_authority_terms
+        sub_authority_hash = YAML.load(File.read(sub_authority_filename))
+        terms = sub_authority_hash.with_indifferent_access.fetch(:terms, [])
+        normalize_terms(terms)
+      end
+
+      def sub_authority_filename
+        File.join(self.class.sub_authorities_path, "#{name}.yml")
+      end
+
+      def normalize_terms(terms)
+        terms.map do |term|
+          if term.is_a? String
+            { :id => term, :term => term }.with_indifferent_access
+          else
+            term[:id] ||= term[:term]
+            term
+          end
+        end
+      end
+  end
+end

data/lib/qa/authorities/mesh.rb

@@ -1,15 +1,22 @@
 module Qa::Authorities
   class Mesh
 
-    def initialize(q, sub_authority=nil)
+    def results
+      @results ||= begin
+                     r = Qa::SubjectMeshTerm.where('term_lower LIKE ?', "#{@q}%").limit(10)
+                     r.map { |t| {id: t.term_id, label: t.term} }
+                   end
+    end
+
+    def search(q, sub_authority=nil)
       @q = q
     end
 
-    def results
+    def get_full_record(id)
       @results ||= begin
-                     r = SubjectMeshTerm.where('term_lower LIKE ?', "#{@q}%").limit(10)
-                     r.map { |t| {id: t.term_id, label: t.term} }
-                   end.to_json
+                     r = Qa::SubjectMeshTerm.where(term_id: id).limit(1).first
+                     r.nil? ? nil : {id: r.term_id, label: r.term, synonyms: r.synonyms}
+                   end
     end
 
     # satisfy TermsController
@@ -17,4 +24,4 @@ module Qa::Authorities
     end
     
   end
-end
+end

data/lib/qa/authorities/oclcts.rb

@@ -8,56 +8,45 @@ module Qa::Authorities
     
     attr_accessor :sub_authority
 
-    def initialize(q, sub_authority='')
-      self.sub_authority = sub_authority
-      self.query_url = SRU_SERVER_CONFIG["url-pattern"]["prefix-query"].gsub(/\{query\}/, q).gsub(/\{authority\-id\}/, sub_authority)
-      self.raw_response = Nokogiri::XML(open(self.query_url))
+    def initialize
     end
 
     def self.authority_valid?(sub_authority)
-      sub_authorities.include?(sub_authority)
+      self.sub_authorities.include?(sub_authority)
     end
 
     def self.sub_authorities
-      a = []
-      SRU_SERVER_CONFIG["authorities"].each do | sub_authority |
-        a.append(sub_authority[0])
-      end
-      a
+      @sub_authorities ||= SRU_SERVER_CONFIG["authorities"].map { |sub_authority| sub_authority[0] }
     end
 
-    def parse_authority_response
+    def search(q, sub_authority=nil)
+      raw_response = get_raw_response("prefix-query", q, sub_authority)
       r = Array.new
-      self.raw_response.xpath('sru:searchRetrieveResponse/sru:records/sru:record/sru:recordData', 'sru' => 'http://www.loc.gov/zing/srw/').each do |record|
+      raw_response.xpath('sru:searchRetrieveResponse/sru:records/sru:record/sru:recordData', 'sru' => 'http://www.loc.gov/zing/srw/').each do |record|
         r.append({"id" => record.xpath('Zthes/term/termId').first.content, "label" => record.xpath('Zthes/term/termName').first.content})
       end
-      self.response = r
+      r
     end
 
-    def get_full_record(id)
-      unless self.raw_response.xpath("sru:searchRetrieveResponse/sru:records/sru:record/sru:recordData/Zthes/term[termId='" + id + "']", 'sru' => 'http://www.loc.gov/zing/srw/').blank?
-        parse_full_record(self.raw_response, id)
-      else
-        url = SRU_SERVER_CONFIG["url-pattern"]["id-lookup"].gsub(/\{id\}/, id).gsub(/\{authority\-id\}/, self.sub_authority)
-        parse_full_record(Nokogiri::XML(open(url)), id)
-      end
-      
+    def get_full_record(id, sub_authority)
+      raw_response = get_raw_response("id-lookup", id, sub_authority)
+      parse_full_record(raw_response, id)
     end
-    
+
     def parse_full_record(raw_xml, id)
       a = {}
-      zthes_record = raw_xml.xpath("sru:searchRetrieveResponse/sru:records/sru:record/sru:recordData/Zthes/term[termId='" + id + "']", 'sru' => 'http://www.loc.gov/zing/srw/');
-      zthes_record.children.each do | child | 
+      zthes_record = raw_xml.xpath("sru:searchRetrieveResponse/sru:records/sru:record/sru:recordData/Zthes/term[termId='#{id}']", 'sru' => 'http://www.loc.gov/zing/srw/')
+      zthes_record.children.each do |child|
         if (child.is_a? Nokogiri::XML::Element) && (!child.children.nil?) && (child.children.size == 1) && (child.children.first.is_a? Nokogiri::XML::Text)
-          a[child.name] = child.children.first.to_s;    
+          a[child.name] = child.children.first.to_s
         end
       end
-      a;
+      a
     end
 
-    def results
-      self.response.to_json
+    def get_raw_response(query_type, id, sub_authority)
+      query_url = SRU_SERVER_CONFIG["url-pattern"][query_type].gsub("{query}", id).gsub("{id}", id).gsub("{authority-id}", sub_authority)
+      Nokogiri::XML(open(query_url))
     end
-    
   end
 end

data/lib/qa/authorities/tgnlang.rb

@@ -1,40 +1,55 @@
 require 'nokogiri'
-require 'json'
 
 module Qa::Authorities
   class Tgnlang
-    attr_accessor :response, :raw_response
-    def initialize(q,sub_authority='')
-      self.raw_response = getTgnLang(q)
+    attr_accessor :response
+
+    def initialize
+    end
+
+    def search(q, sub_authority='')
+      self.response = getTgnLang(q)
     end
 
     def getTgnLang(q)
-      str = File.expand_path("../../data/TGN_LANGUAGES.xml", __FILE__)
-      doc = Nokogiri::XML(File.open(str))
-      size = doc.css("Language_Name").size
-      i=0
-      lang_array = Array.new
-      while i < size do
-        lang_hash = Hash.new
-        lang_hash["id"] = doc.css("Language_Code")[i].text
-        lang_hash["label"] = doc.css("Language_Name")[i].text
-        lang_array.push(lang_hash)
-        i+=1
-      end
-      obj = Array.new      
-      lang_array.each do |h|
-        if h["label"].downcase.start_with?(q.downcase)  
+      obj = Array.new
+      Tgnlang.languages.each do |h|
+        if h["label"].downcase.start_with?(q.downcase)
           obj.push(h)
         end
       end
-      obj.to_json
+      obj
+    end
+
+    def self.languages
+      @languages ||=
+        begin
+          language_filename = File.expand_path("../../data/TGN_LANGUAGES.xml", __FILE__)
+          lang_array = []
+          File.open(language_filename) do |f|
+            doc = Nokogiri::XML(f)
+            lang_array = doc.css("Language").map do |lang|
+              id = lang.css("Language_Code").first.text
+              label = lang.css("Language_Name").first.text
+              {"id" => id, "label" => label}
+            end
+          end
+          lang_array
+        end
     end
 
     def results
-      self.raw_response
+      self.response
     end
-    def parse_authority_response
-      self.raw_response
+
+    def get_full_record(id, sub_authority)
+      id = id.downcase
+      Tgnlang.languages.each do |h|
+        if h["label"].downcase == id
+          return h
+        end
+      end
+      return {}
     end
   end
 end

data/lib/qa/authorities/web_service_base.rb

@@ -0,0 +1,20 @@
+require 'curl'
+require 'rest_client'
+
+module Qa::Authorities
+  class WebServiceBase
+    attr_accessor :response, :raw_response
+
+    # mix-in to retreive and parse JSON content from the web
+    def get_json(url)
+      r = RestClient.get url, {accept: :json}
+      self.response = JSON.parse(r)
+    end
+
+    # This method should be removed
+    # use #response instead
+    def results
+      self.response
+    end
+  end
+end

data/lib/qa/version.rb

@@ -1,3 +1,3 @@
 module Qa
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/controllers/terms_controller_spec.rb

@@ -14,7 +14,7 @@ describe Qa::TermsController do
         get :index, { :vocab => nil}
         response.code.should == "400"
       end
-  
+
       it "should return 400 if no query is specified" do
         get :index, { :q => nil}
         response.code.should == "400"
@@ -65,6 +65,10 @@ describe Qa::TermsController do
       end
 
     end
-  
+
+    describe "#show" do
+      it "the path resolves"
+    end
+
   end
 end

data/spec/fixtures/authorities/authority_B.yml

@@ -1,7 +1,7 @@
-:terms:
-    - :id:
-      :term: Term B1
-    - :id:
-      :term: Term B2
-    - :id:
-      :term: Term B3
+terms:
+    - id:
+      term: Term B1
+    - id:
+      term: Term B2
+    - id:
+      term: Term B3

data/spec/fixtures/authorities/authority_D.yml

@@ -0,0 +1,4 @@
+# this file is purposfully malformed so it should raise an error.
+:terms:
+  -:bar: baz
+   :biz: bzzz

data/spec/internal/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.0.0'
+gem 'rails', '4.0.1'
 
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3'
@@ -33,7 +33,7 @@ group :doc do
 end
 
 # Use ActiveModel has_secure_password
-# gem 'bcrypt-ruby', '~> 3.0.0'
+# gem 'bcrypt-ruby', '~> 3.1.2'
 
 # Use unicorn as the app server
 # gem 'unicorn'

data/spec/internal/Gemfile.lock

@@ -6,95 +6,98 @@ PATH
       curb
       nokogiri (~> 1.6.0)
       rails (~> 4.0.0)
+      rest-client
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.0.0)
-      actionpack (= 4.0.0)
-      mail (~> 2.5.3)
-    actionpack (4.0.0)
-      activesupport (= 4.0.0)
+    actionmailer (4.0.1)
+      actionpack (= 4.0.1)
+      mail (~> 2.5.4)
+    actionpack (4.0.1)
+      activesupport (= 4.0.1)
       builder (~> 3.1.0)
       erubis (~> 2.7.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.0)
-      activesupport (= 4.0.0)
+    activemodel (4.0.1)
+      activesupport (= 4.0.1)
       builder (~> 3.1.0)
-    activerecord (4.0.0)
-      activemodel (= 4.0.0)
+    activerecord (4.0.1)
+      activemodel (= 4.0.1)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.0)
+      activesupport (= 4.0.1)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
     activerecord-import (0.4.1)
       activerecord (>= 3.0)
-    activesupport (4.0.0)
+    activesupport (4.0.1)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
     addressable (2.3.5)
-    arel (4.0.0)
+    arel (4.0.1)
     atomic (1.1.14)
     builder (3.1.4)
-    coffee-rails (4.0.0)
+    coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0.beta, < 5.0)
+      railties (>= 4.0.0, < 5.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
     coffee-script-source (1.6.3)
     crack (0.4.1)
       safe_yaml (~> 0.9.0)
-    curb (0.8.4)
+    curb (0.8.5)
     diff-lcs (1.2.4)
     erubis (2.7.0)
     execjs (2.0.2)
     hike (1.2.3)
     i18n (0.6.5)
-    jbuilder (1.5.1)
+    jbuilder (1.5.2)
       activesupport (>= 3.0.0)
       multi_json (>= 1.2.0)
     jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.0)
+    json (1.8.1)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.25)
-    mini_portile (0.5.1)
+    mini_portile (0.5.2)
     minitest (4.7.5)
-    multi_json (1.8.0)
+    multi_json (1.8.2)
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
     polyglot (0.3.3)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.0.0)
-      actionmailer (= 4.0.0)
-      actionpack (= 4.0.0)
-      activerecord (= 4.0.0)
-      activesupport (= 4.0.0)
+    rails (4.0.1)
+      actionmailer (= 4.0.1)
+      actionpack (= 4.0.1)
+      activerecord (= 4.0.1)
+      activesupport (= 4.0.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.0)
+      railties (= 4.0.1)
       sprockets-rails (~> 2.0.0)
-    railties (4.0.0)
-      actionpack (= 4.0.0)
-      activesupport (= 4.0.0)
+    railties (4.0.1)
+      actionpack (= 4.0.1)
+      activesupport (= 4.0.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.1.0)
     rdoc (3.12.2)
       json (~> 1.4)
-    rspec-core (2.14.5)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    rspec-core (2.14.7)
     rspec-expectations (2.14.3)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.3)
+    rspec-mocks (2.14.4)
     rspec-rails (2.14.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
@@ -103,9 +106,9 @@ GEM
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
     safe_yaml (0.9.7)
-    sass (3.2.11)
-    sass-rails (4.0.0)
-      railties (>= 4.0.0.beta, < 5.0)
+    sass (3.2.12)
+    sass-rails (4.0.1)
+      railties (>= 4.0.0, < 5.0)
       sass (>= 3.1.10)
       sprockets-rails (~> 2.0.0)
     sdoc (0.3.20)
@@ -116,7 +119,7 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.0)
+    sprockets-rails (2.0.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
@@ -130,11 +133,11 @@ GEM
       polyglot (>= 0.3.1)
     turbolinks (1.3.0)
       coffee-rails
-    tzinfo (0.3.37)
-    uglifier (2.2.1)
+    tzinfo (0.3.38)
+    uglifier (2.3.0)
       execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
-    webmock (1.13.0)
+      json (>= 1.8.0)
+    webmock (1.15.2)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
 
@@ -146,7 +149,7 @@ DEPENDENCIES
   jbuilder (~> 1.2)
   jquery-rails
   qa!
-  rails (= 4.0.0)
+  rails (= 4.0.1)
   rspec-rails
   sass-rails (~> 4.0.0)
   sdoc