Add controlled vocabulary properties

* follow instructions for adding custom metadata
  * define properties in models
  * add to New/Edit form
  * add to show page

Test with
* login
* add a demo work -- Works -> New Work (confirm new properties are on the form)
* add string values for testing
* save
* confirm properties and values are displayed on the show page

Author: elrayle

app/controllers/catalog_controller.rb

@@ -89,6 +89,11 @@ def self.modified_field
     #   The ordering of the field names is the order of the display
     config.add_show_field solr_name("title", :stored_searchable), label: "Title"
     config.add_show_field solr_name("description", :stored_searchable), label: "Description"
+
+    config.add_show_field solr_name("oclc_organization", :stored_searchable), label: "Oclc Organization"
+    config.add_show_field solr_name("agrovoc_keyword", :stored_searchable), label: "Agrovoc Keyword (en)"
+    config.add_show_field solr_name("agrovoc_keyword_fr", :stored_searchable), label: "Agrovoc Keyword (fr)"
+
     config.add_show_field solr_name("keyword", :stored_searchable), label: "Keyword"
     config.add_show_field solr_name("subject", :stored_searchable), label: "Subject"
     config.add_show_field solr_name("creator", :stored_searchable), label: "Creator"

app/controllers/hyrax/demo_works_controller.rb

@@ -7,5 +7,6 @@ class DemoWorksController < ApplicationController
     include Hyrax::WorksControllerBehavior
     include Hyrax::BreadcrumbsForWorks
     self.curation_concern_type = DemoWork
+    self.show_presenter = DemoWorkPresenter
   end
 end

app/forms/hyrax/demo_work_form.rb

@@ -3,6 +3,7 @@
 module Hyrax
   class DemoWorkForm < Hyrax::Forms::WorkForm
     self.model_class = ::DemoWork
-    self.terms += [:resource_type]
+    self.terms += [:resource_type, :oclc_organization, :agrovoc_keyword, :agrovoc_keyword_fr, :loc_name]
+    self.required_fields += [:oclc_organization, :agrovoc_keyword, :agrovoc_keyword_fr]
   end
 end

app/models/demo_work.rb

@@ -8,4 +8,24 @@ class DemoWork < ActiveFedora::Base
   validates :title, presence: { message: 'Your work must have a title.' }
 
   self.human_readable_type = 'Demo Work'
+
+  property :oclc_organization_uri, predicate: ::RDF::URI.new('http://www.example.org/ns#oclc_org'), multiple: true
+  property :oclc_organization, predicate: ::RDF::URI.new('http://www.example.org/ns#oclc_org_label'), multiple: true do |index|
+    index.as :stored_searchable, :facetable
+  end
+
+  property :agrovoc_keyword_uri, predicate: ::RDF::URI.new('http://www.example.org/ns#agrovoc_keyword'), multiple: true
+  property :agrovoc_keyword, predicate: ::RDF::URI.new('http://www.example.org/ns#agrovoc_keyword_label'), multiple: true do |index|
+    index.as :stored_searchable, :facetable
+  end
+
+  property :agrovoc_keyword_fr_uri, predicate: ::RDF::URI.new('http://www.example.org/ns#agrovoc_keyword_fr'), multiple: true
+  property :agrovoc_keyword_fr, predicate: ::RDF::URI.new('http://www.example.org/ns#agrovoc_keyword_label_fr'), multiple: true do |index|
+    index.as :stored_searchable, :facetable
+  end
+
+  property :loc_name_uri, predicate: ::RDF::URI.new('http://www.example.org/ns#loc_name'), multiple: true
+  property :loc_name, predicate: ::RDF::URI.new('http://www.example.org/ns#loc_name_label'), multiple: true do |index|
+    index.as :stored_searchable, :facetable
+  end
 end

app/models/solr_document.rb

@@ -25,4 +25,28 @@ class SolrDocument
   # Do content negotiation for AF models. 
 
   use_extension( Hydra::ContentNegotiation )
+
+  def oclc_organization
+    self[Solrizer.solr_name('oclc_organization')]
+  end
+
+  def oclc_organization_uri
+    self[Solrizer.solr_name('oclc_organization_uri')]
+  end
+
+  def agrovoc_keyword
+    self[Solrizer.solr_name('agrovoc_keyword')]
+  end
+
+  def agrovoc_keyword_uri
+    self[Solrizer.solr_name('agrovoc_keyword_uri')]
+  end
+
+  def agrovoc_keyword_fr
+    self[Solrizer.solr_name('agrovoc_keyword_fr')]
+  end
+
+  def agrovoc_keyword_fr_uri
+    self[Solrizer.solr_name('agrovoc_keyword_fr_uri')]
+  end
 end

app/presenters/demo_work_presenter.rb

@@ -0,0 +1,4 @@
+# app/presenters/demo_work_presenter.rb
+class DemoWorkPresenter < Hyrax::WorkShowPresenter
+  delegate :oclc_organization, :oclc_organization_uri, :agrovoc_keyword, :agrovoc_keyword_uri, :agrovoc_keyword_fr, :agrovoc_keyword_fr_uri, to: :solr_document
+end

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

@@ -0,0 +1,15 @@
+<%= presenter.attribute_to_html(:creator, render_as: :faceted) %>
+<%= presenter.attribute_to_html(:contributor, render_as: :faceted) %>
+<%= presenter.attribute_to_html(:oclc_organization, render_as: :faceted) %>
+<%= presenter.attribute_to_html(:agrovoc_keyword, render_as: :faceted) %>
+<%= presenter.attribute_to_html(:agrovoc_keyword_fr, render_as: :faceted) %>
+<%= presenter.attribute_to_html(:subject, render_as: :faceted) %>
+<%= presenter.attribute_to_html(:publisher, render_as: :faceted) %>
+<%= presenter.attribute_to_html(:language, render_as: :faceted) %>
+<%= presenter.attribute_to_html(:identifier, render_as: :linked, search_field: 'identifier_tesim') %>
+<%= presenter.attribute_to_html(:keyword, render_as: :faceted) %>
+<%= presenter.attribute_to_html(:date_created, render_as: :linked, search_field: 'date_created_tesim') %>
+<%= presenter.attribute_to_html(:based_near, render_as: :faceted) %>
+<%= presenter.attribute_to_html(:related_url, render_as: :external_link) %>
+<%= presenter.attribute_to_html(:resource_type, render_as: :faceted) %>
+<%= presenter.attribute_to_html(:source) %>