Merge fffd5b4 into 4ec1a0c

app/controllers/catalog_controller.rb

@@ -89,6 +89,8 @@ def self.modified_field
     config.add_index_field solr_name("department", :stored_searchable), label: "Department"
     config.add_index_field solr_name("school", :stored_searchable), label: "School"
     config.add_index_field solr_name("partnering_agency", :stored_searchable), label: "Partnering Agency"
+    config.add_index_field solr_name("submitting_type", :stored_searchable), label: "I am submitting"
+
     # solr fields to be displayed in the show (single result) view
     #   The ordering of the field names is the order of the display
     config.add_show_field solr_name("title", :stored_searchable), label: "Title"
@@ -107,6 +109,7 @@ def self.modified_field
     config.add_show_field solr_name("resource_type", :stored_searchable), label: "Resource Type"
     config.add_show_field solr_name("format", :stored_searchable), label: "File Format"
     config.add_show_field solr_name("identifier", :stored_searchable), label: "Identifier"
+    config.add_show_field solr_name("submitting_type", :stored_searchable), label: "I am submitting"
     config.add_show_field solr_name("degree", :stored_searchable), label: "Degree"
     config.add_show_field solr_name("department", :stored_searchable), label: "Department"
     config.add_show_field solr_name("school", :stored_searchable), label: "School"

app/forms/hyrax/etd_form.rb

@@ -9,6 +9,7 @@ class EtdForm < Hyrax::Forms::WorkForm
     self.terms += [:school]
     self.terms += [:degree]
     self.terms += [:partnering_agency]
-    self.single_valued_fields = [:title, :creator]
+    self.terms += [:submitting_type]
+    self.single_valued_fields = [:title, :creator, :submitting_type]
   end
 end

app/models/etd.rb

@@ -30,4 +30,7 @@ def set_defaults
   property :partnering_agency, predicate: "http://id.loc.gov/vocabulary/relators/ctb" do |index|
     index.as :stored_searchable
   end
+  property :submitting_type, predicate: "http://www.europeana.eu/schemas/edm/hasType" do |index|
+    index.as :stored_searchable
+  end
 end

app/models/solr_document.rb

@@ -48,4 +48,8 @@ def partnering_agency
   def primary
     self[Solrizer.solr_name('primary')]
   end
+
+  def submitting_type
+    self[Solrizer.solr_name('submitting_type')]
+  end
 end

app/presenters/etd_presenter.rb

@@ -1,3 +1,3 @@
 class EtdPresenter < Hyrax::WorkShowPresenter
-  delegate :degree, :department, :school, :partnering_agency, to: :solr_document
+  delegate :degree, :department, :school, :partnering_agency, :submitting_type, to: :solr_document
 end

app/services/hyrax/submitting_service.rb

@@ -0,0 +1,16 @@
+# services/submitting_service.rb
+module Hyrax
+  class SubmittingService < Hyrax::QaSelectService
+    def initialize
+      super('submitting_type')
+    end
+
+    def include_current_value(value, _index, render_options, html_options)
+      unless value.blank? || active?(value)
+        html_options[:class] << ' force-select'
+        render_options += [[label(value), value]]
+      end
+      [render_options, html_options]
+    end
+  end
+end

app/views/hyrax/base/_attribute_rows.html.erb

@@ -14,3 +14,4 @@
 <%= presenter.attribute_to_html(:school) %>
 <%= presenter.attribute_to_html(:department) %>
 <%= presenter.attribute_to_html(:partnering_agency) %>
+<%= presenter.attribute_to_html(:submitting_type) %>

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

@@ -0,0 +1,7 @@
+<% submitting_service = Hyrax::SubmittingService.new %>
+<%= f.input :submitting_type, as: :select,
+    collection: submitting_service.select_all_options,
+    include_blank: true,
+    item_helper: submitting_service.method(:include_current_value),
+    input_html: { class: 'form-control' },
+    label: "I am submitting" %>

app/views/records/edit_fields/hyrax/_submitting_type.html.erb

@@ -0,0 +1,6 @@
+<% submitting_service = Hyrax::SubmittingService.new %>
+<%= f.input :submitting_type, as: :select,
+    collection: submitting_service.select_all_options,
+    include_blank: true,
+    item_helper: submitting_service.method(:include_current_value),
+    input_html: { class: 'form-control' } %>

config/authorities/submitting_type.yml

@@ -0,0 +1,4 @@
+terms:
+    - Honors Thesis
+    - Dissertation
+    - Masters Thesis

spec/factories/etd.rb

@@ -7,6 +7,7 @@
     department ['Department of Russian and East Asian Languages and Cultures']
     school ['Emory College of Arts and Sciences']
     partnering_agency ["Does not apply (no collaborating organization)"]
+    submitting_type ["Honors Thesis"]
     visibility Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
   end
 end

spec/features/create_etd_spec.rb

@@ -41,6 +41,7 @@
       fill_in "Degree", with: "Bachelor of Arts with Honors"
       select('All rights reserved', from: 'Rights')
       select('CDC', from: 'Partnering agency')
+      select("Honors Thesis", from: "I am submitting")
       choose('open')
       check('agreement')
       click_on('My PDF')

spec/features/search_etd_spec.rb

@@ -24,6 +24,7 @@
       expect(page).to have_content etd.department.first
       expect(page).to have_content etd.school.first
       expect(page).to have_content etd.partnering_agency.first
+      expect(page).to have_content etd.submitting_type.first
       # Now look for degree in the facets on the left
       expect(page).to have_xpath("//h3", text: "Creator")
       expect(page).to have_link(etd.creator.first, class: "facet_select")

spec/features/show_etd_spec.rb

@@ -20,6 +20,7 @@
       expect(page).to have_content etd.department.first
       expect(page).to have_content etd.school.first
       expect(page).to have_content etd.partnering_agency.first
+      expect(page).to have_content etd.submitting_type.first
     end
   end
 end

spec/forms/hyrax/etd_form_spec.rb

@@ -16,5 +16,6 @@
     its(:terms) { is_expected.to include(:school) }
     its(:terms) { is_expected.to include(:degree) }
     its(:terms) { is_expected.to include(:partnering_agency) }
+    its(:single_valued_fields) { is_expected.to include(:submitting_type) }
   end
 end

spec/forms/single_valued_form_spec.rb

@@ -0,0 +1,43 @@
+require 'rails_helper'
+
+RSpec.describe SingleValuedForm do
+  subject(:etd) { TestForm.new(work, nil, nil) }
+  let(:work) { FactoryGirl.build :etd }
+
+  before do
+    class TestForm < Hyrax::Forms::WorkForm
+      include SingleValuedForm
+    end
+    TestForm.single_valued_fields = [:identifier]
+    TestForm.model_class = ::Etd
+    TestForm.terms = [:identifier, :title]
+  end
+
+  after do
+    Object.send(:remove_const, :TestForm)
+  end
+
+  context "an instance" do
+    it "reports single-valued fields" do
+      expect(etd.multiple?(:identifier)).to be false
+      expect(etd.multiple?(:title)).to be true
+    end
+  end
+
+  context "the class" do
+    it "reports single-valued fields" do
+      expect(TestForm.multiple?(:identifier)).to be false
+      expect(TestForm.multiple?(:title)).to be true
+    end
+  end
+
+  describe "model_attributes" do
+    let(:params) { ActionController::Parameters.new(identifier: '123', title: ['Box 1']) }
+    let(:attribs) { TestForm.model_attributes(params).to_h }
+
+    it "converts singular fields to arrays" do
+      expect(attribs[:identifier]).to eq(['123'])
+      expect(attribs[:title]).to eq(['Box 1'])
+    end
+  end
+end

spec/models/etd_spec.rb

@@ -25,7 +25,7 @@
     context "with a new ETD" do
       its(:partnering_agency) { is_expected.to be_empty }
     end
-    context "with an existing ETD that has a degree defined" do
+    context "with an existing ETD that has a partnering agency defined" do
       subject do
         described_class.create.tap do |etd|
           etd.partnering_agency = partnering_agency
@@ -35,6 +35,22 @@
     end
   end
 
+  describe "#submitting_type" do
+    subject { described_class.new }
+    let(:submitting_type) { ["Honors Thesis"] }
+    context "with a new ETD" do
+      its(:submitting_type) { is_expected.to be_empty }
+    end
+    context "with an existing ETD that has a submitting work defined" do
+      subject do
+        described_class.create.tap do |etd|
+          etd.submitting_type = submitting_type
+        end
+      end
+      its(:submitting_type) { is_expected.to eq(submitting_type) }
+    end
+  end
+
   describe "#department" do
     subject { described_class.new }
     context "with a new ETD" do

spec/presenters/etd_presenter_spec.rb

@@ -11,9 +11,11 @@
   let(:department) { ['Department of Russian and East Asian Languages and Cultures'] }
   let(:school) { ['Emory College of Arts and Sciences'] }
   let(:partnering_agency) { ["Does not apply (no collaborating organization)"] }
+  let(:submitting_type) { ["Honors Thesis"] }
   let(:visibility) { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC }
   let :etd do
-    Etd.new(title: title, creator: creator, keyword: keyword, degree: degree, department: department, school: school, partnering_agency: partnering_agency, visibility: visibility)
+    Etd.new(title: title, creator: creator, keyword: keyword, degree: degree, department: department,
+            school: school, partnering_agency: partnering_agency, submitting_type: submitting_type, visibility: visibility)
   end
 
   let(:ability) { Ability.new(user) }
@@ -28,4 +30,5 @@
   it { is_expected.to delegate_method(:department).to(:solr_document) }
   it { is_expected.to delegate_method(:school).to(:solr_document) }
   it { is_expected.to delegate_method(:partnering_agency).to(:solr_document) }
+  it { is_expected.to delegate_method(:submitting_type).to(:solr_document) }
 end

spec/services/hyrax/submitting_service_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+RSpec.describe Hyrax::SubmittingService do
+  before do
+    # Configure QA to use fixtures
+    qa_fixtures = { local_path: File.expand_path('config/authorities') }
+    allow(Qa::Authorities::Local).to receive(:config).and_return(qa_fixtures)
+  end
+
+  let(:service) { described_class.new }
+
+  describe "#select_all_options" do
+    it "has a select list" do
+      expect(service.select_all_options).to include(["Honors Thesis", "Honors Thesis"])
+    end
+  end
+end