Merge pull request #1247 from pulibrary/controlled_vocabulary_qa

Add language dropdown from Vocabularies.

.rubocop.yml

@@ -29,6 +29,14 @@ Metrics/ClassLength:
     - 'app/controllers/catalog_controller.rb'
     - 'app/jobs/ingest_mets_job.rb'
 
+Metrics/CyclomaticComplexity:
+  Exclude:
+    - 'app/indexers/work_indexer.rb'
+
+Metrics/PerceivedComplexity:
+  Exclude:
+    - 'app/indexers/work_indexer.rb'
+
 Metrics/MethodLength:
   Enabled: false
 

app/indexers/work_indexer.rb

@@ -1,8 +1,12 @@
 class WorkIndexer < Hyrax::WorkIndexer
+  # TODO: Refactor complexity here.
   def generate_solr_document
     super.tap do |solr_doc|
       object.member_of_collections.each do |col|
-        solr_doc[Solrizer.solr_name('member_of_collection_slugs', :symbol)] = col.exhibit_id
+        key = Solrizer.solr_name('member_of_collection_slugs', :symbol)
+        solr_doc[key] ||= []
+        solr_doc[key] << col.try(:exhibit_id)
+        solr_doc[key].compact!
       end
       (PlumSchema.display_fields + [:title]).each do |field|
         objects = object.get_values(field, literal: true)
@@ -25,7 +29,7 @@ def generate_solr_document
       end
       solr_doc[Solrizer.solr_name("identifier", :symbol)] = object.identifier
       solr_doc[Solrizer.solr_name("language", :facetable)] = object.language.map do |code|
-        LanguageService.label(code)
+        AuthorityFinder.for(property: :language, model: object).try(:find, code).try(:[], :label) || LanguageService.label(code)
       end
 
       suppress solr_doc, 'source_metadata'

app/models/ephemera_folder.rb

@@ -9,6 +9,7 @@ class EphemeraFolder < ActiveFedora::Base
     ActiveFedora::Indexers::GlobalIndexer.new([:symbol, :stored_searchable, :facetable])
   )
   include ::CommonMetadata
+  self.indexer = ::WorkIndexer
   # Change this to restrict which works can be added as a child.
   # self.valid_child_concerns = []
   validates :title, presence: { message: 'Your work must have a title.' }

app/models/vocabulary.rb

@@ -1,4 +1,9 @@
 class Vocabulary < ApplicationRecord
   belongs_to :parent, class_name: "Vocabulary"
   validates :label, presence: true
+  after_create :register_authority
+
+  def register_authority
+    Qa::Authorities::Local.register_subauthority(label, 'VocabularySubauthority')
+  end
 end

app/models/vocabulary_subauthority.rb

@@ -1,7 +1,8 @@
 class VocabularySubauthority < Qa::Authorities::Base
-  attr_reader :vocabulary
+  attr_reader :vocabulary, :subauthority_name
 
   def initialize(subauthority_name)
+    @subauthority_name = subauthority_name
     @vocabulary = Vocabulary.find_by(label: subauthority_name)
   end
 
@@ -26,6 +27,6 @@ def sub_vocabs
     end
 
     def format_item(item)
-      { id: item.id, label: item.label, type: item.class.name }
+      { id: item.id, label: item.label, type: item.class.name, active: true }.with_indifferent_access
     end
 end

app/presenters/ephemera_folder_presenter.rb

@@ -6,4 +6,10 @@ def renderer_for(field, _options)
     return ::BarcodeAttributeRenderer if field == :identifier
     super
   end
+
+  def language
+    super.map do |id|
+      AuthorityFinder.for(property: :language, model: self).find(id)[:label]
+    end
+  end
 end

app/services/authority_finder.rb

@@ -0,0 +1,14 @@
+class AuthorityFinder
+  def self.for(property:, model:)
+    return unless model.model_name.singular == "ephemera_folder"
+    begin
+      case property
+      when :language
+        Qa::Authorities::Local.subauthority_for('languages')
+      end
+    rescue Qa::InvalidSubAuthority
+      Rails.logger.debug("Non-existent sub-authority requested for property #{property}")
+      nil
+    end
+  end
+end

app/views/records/edit_fields/_language.html.erb

@@ -0,0 +1,10 @@
+<% authority = AuthorityFinder.for(property: key, model: f.object) %>
+<% if authority %>
+  <% languages = Hyrax::QaSelectService.new(authority.subauthority_name) %>
+  <%= f.input :language,
+    collection: languages.select_active_options,
+    include_blank: true,
+    input_html: { class: 'form-control', multiple: f.object.multiple?(key) } %>
+<% else %>
+  <%= render "records/edit_fields/default", f: f, key: key%>
+<% end %>

spec/controllers/vocabularies_controller_spec.rb

@@ -53,6 +53,12 @@
         }.to change(Vocabulary, :count).by(1)
       end
 
+      it "registers the newly created Vocabulary" do
+        post :create, params: { vocabulary: valid_attributes }
+        vocab = Vocabulary.first
+        expect(Qa::Authorities::Local.subauthority_for(vocab.label)).not_to be_blank
+      end
+
       it "assigns a newly created vocabulary as @vocabulary" do
         post :create, params: { vocabulary: valid_attributes }
         expect(assigns(:vocabulary)).to be_a(Vocabulary)

spec/models/ephemera_folder_spec.rb

@@ -36,6 +36,28 @@
     end
   end
 
+  describe "language indexing" do
+    context "when given a set of language IDs" do
+      after do
+        Qa::Authorities::Local.registry.instance_variable_get(:@hash).delete("languages")
+      end
+      before do
+        Qa::Authorities::Local.registry.instance_variable_get(:@hash).delete("languages")
+        vocabulary
+      end
+      let(:vocabulary) do
+        Vocabulary.create!(label: "languages").tap do |vocab|
+          VocabularyTerm.create!(vocabulary: vocab, label: "English")
+          VocabularyTerm.create!(vocabulary: vocab, label: "Japanese")
+        end
+      end
+      let(:folder) { FactoryGirl.build(:ephemera_folder, language: [VocabularyTerm.first.id.to_s]) }
+      it "Returns the label for the IDs" do
+        expect(folder.to_solr["language_sim"]).to eq ["English"]
+      end
+    end
+  end
+
   describe "box and box_id" do
     let(:box) { FactoryGirl.create :ephemera_box }
     let(:col) { FactoryGirl.build :collection }

spec/models/scanned_resource_spec.rb

@@ -190,7 +190,7 @@
     let(:solr_doc) { scanned_resource.to_solr }
     it "indexes collection" do
       expect(solr_doc['member_of_collections_ssim']).to eq(['Test Collection'])
-      expect(solr_doc['member_of_collection_slugs_ssim']).to eq(scanned_resource.member_of_collections.first.exhibit_id)
+      expect(solr_doc['member_of_collection_slugs_ssim']).to eq([scanned_resource.member_of_collections.first.exhibit_id])
     end
   end
 

spec/models/vocabulary_subauthority_spec.rb

@@ -7,13 +7,13 @@
   subject { described_class.new(parent.label) }
 
   it 'lists terms and vocabularies' do
-    child_hash = { id: child.id, label: child.label, type: child.class.name }
-    term_hash = { id: term.id, label: term.label, type: term.class.name }
+    child_hash = { id: child.id, label: child.label, type: child.class.name, active: true }.with_indifferent_access
+    term_hash = { id: term.id, label: term.label, type: term.class.name, active: true }.with_indifferent_access
     expect(subject.all).to contain_exactly(child_hash, term_hash)
   end
 
   it 'finds terms by their ids' do
-    term_hash = { id: term.id, label: term.label, type: term.class.name }
+    term_hash = { id: term.id, label: term.label, type: term.class.name, active: true }.with_indifferent_access
     expect(subject.find(term.id)).to eq(term_hash)
   end
 end

spec/presenters/ephemera_folder_presenter_spec.rb

@@ -13,6 +13,28 @@
   let(:controller) { double(blacklight_config: blacklight_config) }
   subject { described_class.new(SolrDocument.new(folder.to_solr), controller) }
 
+  describe "#language" do
+    context "when given a set of language IDs" do
+      after do
+        Qa::Authorities::Local.registry.instance_variable_get(:@hash).delete("languages")
+      end
+      before do
+        Qa::Authorities::Local.registry.instance_variable_get(:@hash).delete("languages")
+        vocabulary
+      end
+      let(:vocabulary) do
+        Vocabulary.create!(label: "languages").tap do |vocab|
+          VocabularyTerm.create!(vocabulary: vocab, label: "English")
+          VocabularyTerm.create!(vocabulary: vocab, label: "Japanese")
+        end
+      end
+      let(:folder) { FactoryGirl.build(:ephemera_folder, language: [VocabularyTerm.first.id.to_s]) }
+      it "Returns the label for the IDs" do
+        expect(subject.language).to eq ["English"]
+      end
+    end
+  end
+
   describe "#renderer_for" do
     it "renders identifier as a barcodde" do
       expect(subject.renderer_for(:identifier, {})).to be BarcodeAttributeRenderer

spec/views/records/edit_fields/_identifier.html.erb_spec.rb

@@ -15,6 +15,13 @@
     end
   end
 
+  context 'with an ephemera folder' do
+    let(:form) { Hyrax::EphemeraFolderForm.new(EphemeraFolder.new, nil, nil) }
+    it 'auto-focuses the barcode field' do
+      expect(rendered).to have_selector 'input#ephemera_folder_identifier[@autofocus="autofocus"]'
+    end
+  end
+
   context 'with an ephemera box' do
     let(:form) { Hyrax::ScannedResourceForm.new(ScannedResource.new, nil, nil) }
     it 'auto-focuses the barcode field' do

spec/views/records/edit_fields/_language.html.erb_spec.rb

@@ -0,0 +1,49 @@
+require 'rails_helper'
+include SimpleForm::ActionViewExtensions::FormHelper
+
+RSpec.describe 'records/edit_fields/_language.html.erb' do
+  let(:vocabulary) { nil }
+  before do
+    Qa::Authorities::Local.registry.instance_variable_get(:@hash).delete("languages")
+    allow(view).to receive(:f).and_return(simple_form_for(form))
+    allow(view).to receive(:key).and_return(:language)
+    vocabulary
+    render
+  end
+  after do
+    Qa::Authorities::Local.registry.instance_variable_get(:@hash).delete("languages")
+  end
+
+  context 'with an ephemera folder' do
+    let(:form) { Hyrax::EphemeraBoxForm.new(EphemeraFolder.new, nil, nil) }
+    context "when there is no language vocabulary" do
+      it "doesn't create a select box" do
+        expect(rendered).not_to have_selector "select"
+      end
+    end
+    context "when there is a language vocabulary" do
+      let(:vocabulary) do
+        Vocabulary.create!(label: "languages").tap do |vocab|
+          VocabularyTerm.create!(vocabulary: vocab, label: "English")
+          VocabularyTerm.create!(vocabulary: vocab, label: "Japanese")
+        end
+      end
+      it "creates a select box" do
+        expect(rendered).to have_select("Language", options: ['', 'English', 'Japanese'])
+      end
+    end
+  end
+
+  context 'with a scanned resource' do
+    let(:form) { Hyrax::ScannedResourceForm.new(ScannedResource.new, nil, nil) }
+    let(:vocabulary) do
+      Vocabulary.create!(label: "languages").tap do |vocab|
+        VocabularyTerm.create!(vocabulary: vocab, label: "English")
+        VocabularyTerm.create!(vocabulary: vocab, label: "Japanese")
+      end
+    end
+    it "doesn't create a select box" do
+      expect(rendered).not_to have_selector "select"
+    end
+  end
+end