hyrax 3.0.0.pre.rc3 → 3.0.0.pre.rc4

data/app/services/hyrax/identifier/dispatcher.rb

@@ -44,7 +44,7 @@ module Hyrax
       # @return [ActiveFedora::Base, Hyrax::Resource] object
       def assign_for(object:, attribute: :identifier)
         record = registrar.register!(object: object)
-        object.public_send("#{attribute}=".to_sym, [record.identifier])
+        object.public_send("#{attribute}=".to_sym, Array.wrap(record.identifier))
         object
       end
 

data/app/services/hyrax/listeners/active_fedora_acl_index_listener.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Hyrax
+  module Listeners
+    ##
+    # Reindexes resources when their ACLs are updated
+    #
+    # Hyrax's `Ability` behavior depends on the index being up-to-date as
+    # concerns-their read/write users/groups, and visibility.
+    class ActiveFedoraAclIndexListener
+      ##
+      # Re-index the resource for the updated ACL.
+      #
+      # @param event [Dry::Event]
+      def on_object_acl_updated(event)
+        return unless event[:result] == :success # do nothing on failure
+
+        if Hyrax.metadata_adapter.is_a?(Wings::Valkyrie::MetadataAdapter)
+          Wings::ActiveFedoraConverter.convert(resource: event[:acl].resource).update_index
+        else
+          Hyrax.logger.info('Skipping ActiveFedora object reindex because the Wings adapter is not in use.')
+        end
+      end
+    end
+  end
+end

data/app/services/hyrax/listeners/metadata_index_listener.rb

@@ -16,7 +16,11 @@ module Hyrax
       #
       # @param event [Dry::Event]
       def on_object_metadata_updated(event)
-        Hyrax.index_adapter.save(resource: event[:object])
+        return Hyrax.index_adapter.save(resource: event[:object]) if
+          event[:object].is_a?(Valkyrie::Resource)
+
+        Hyrax.logger.info('Skipping object reindex because the object ' \
+                          "#{event[:object]} was not a Valkyrie::Resource.")
       end
     end
   end

data/app/views/catalog/_index_header_list_collection.html.erb

@@ -1,4 +1,4 @@
 <div class="search-results-title-row">
-  <h4 class="search-result-title"><%= link_to document.title_or_label, [hyrax, document] %></h4>
+  <h3 class="search-result-title"><%= link_to document.title_or_label, [hyrax, document] %></h3>
   <%= Hyrax::CollectionPresenter.new(document, current_ability).collection_type_badge %>
 </div>

data/app/views/catalog/_index_header_list_default.html.erb

@@ -1,3 +1,3 @@
 <div class="search-results-title-row">
-  <h4 class="search-result-title"><%= link_to document.title_or_label, document %></h4>
+  <h3 class="search-result-title"><%= link_to document.title_or_label, document %></h3>
 </div>

data/app/views/catalog/_index_list_default.html.erb

@@ -4,7 +4,7 @@
     <% doc_presenter = index_presenter(document) %>
     <% index_fields(document).each do |field_name, field| -%>
       <% if should_render_index_field? document, field %>
-          <dt><%= render_index_field_label document, field: field_name %></dt>
+          <dt data-solr-field-name="<%= field_name %>"><%= render_index_field_label document, field: field_name %></dt>
           <dd><%= doc_presenter.field_value field %></dd>
       <% end %>
     <% end %>

data/app/views/hyrax/admin/admin_sets/_show_document_list_row.html.erb

@@ -8,7 +8,7 @@
   </td>
   <td>
     <div class="media">
-      <%= link_to [main_app, document], class: "media-left" do %>
+      <%= link_to [main_app, document], "class" => "media-left", "aria-hidden" => "true" do %>
         <%= render_thumbnail_tag document, { class: "hidden-xs file_listing_thumbnail" }, { suppress_link: true } %>
       <% end %>
       <div class="media-body">

data/app/views/hyrax/base/_currently_shared.html.erb

@@ -0,0 +1,46 @@
+<% permission_service = Hyrax::EditPermissionsService.build_service_object_from(form: f, ability: current_ability) %>
+
+<h2><%= t('.currently_sharing') %></h2>
+
+<table class="table table-bordered">
+  <tr>
+    <th><%= t('.table_title_user') %></th>
+    <th><div class="col-sm-10"><%= t('.table_title_access') %></div></th>
+  </tr>
+  <tr id="file_permissions">
+    <td>
+      <%= label_tag :owner_access, class: "control-label" do %>
+        Depositor (<span id="file_owner" data-depositor="<%= permission_service.depositor %>"><%= link_to_profile permission_service.depositor %></span>)
+      <% end %>
+    </td>
+    <td>
+    <div class="col-sm-10">
+      <%= Hyrax.config.owner_permission_levels.keys[0] %>
+    </div>
+    </td>
+  </tr>
+  <%= f.fields_for :permissions do |permission_fields| %>
+    <% permission_service.with_applicable_permission(permission_hash: permission_fields.object.to_hash) do |permission| %>
+    <tr>
+      <td>
+        <%= permission_fields.label :agent_name, class: "control-label" do %>
+          <%= user_display_name_and_key(permission.name) %>
+          <%= permission.granted_by_html_hint %>
+        <% end %>
+      </td>
+      <td>
+        <div class="col-sm-10">
+        <% if permission.can_edit? %>
+          <%= permission_fields.select :access, Hyrax.config.permission_levels, {}, class: 'form-control select_perm' %>
+        <% else %>
+          <%= Hyrax.config.permission_levels.key(permission.access) %>
+        <% end %>
+        </div>
+        <% if permission.can_edit? %>
+          <button class="btn close remove_perm" data-index="<%= permission_fields.index %>">&times;</button>
+        <% end %>
+      </td>
+    </tr>
+    <% end %>
+  <% end %>
+</table>

data/app/views/hyrax/base/_form_share.html.erb

@@ -49,39 +49,11 @@
   </div>
 </fieldset>
 
-<h2><%= t('.currently_sharing') %></h2>
-
-<table class="table">
-  <tr id="file_permissions">
-    <td width="20%">
-      <%= configured_owner_permission_levels.keys.first %>
-    </td>
-    <td width="60%">
-      <%= label_tag :owner_access, class: "control-label" do %>
-        <%= t('.depositor') %>(<span id="file_owner" data-depositor="<%= depositor %>"><%= link_to_profile depositor %></span>)
-      <% end %>
-    </td>
-  </tr>
-  <%= f.fields_for :permissions do |permission_fields| %>
-    <%# skip the public, registered, and depositor perms as they are displayed first at the top %>
-    <% next if ['public', 'registered', depositor].include? permission_fields.object.agent_name.downcase %>
-    <tr>
-      <td>
-        <%= permission_fields.select :access, configured_permission_levels, {}, class: 'form-control select_perm' %>
-      </td>
-      <td>
-        <%= permission_fields.label :agent_name, class: "control-label" do %>
-          <%= user_display_name_and_key(permission_fields.object.agent_name) %>
-        <% end %>
-        <button class="btn close remove_perm" data-index="<%= permission_fields.index %>">&times;</button>
-      </td>
-    </tr>
-  <% end %>
-</table>
+<%= render 'currently_shared', f: f %>
 
 <script type="text/x-tmpl" id="tmpl-work-grant">
-<tr>
-  <td>{%= o.accessLabel %}</td>
-  <td><label class="control-label">{%= o.name %}</label> <button class="btn close">&times;</button></td>
-</tr>
+  <tr>
+    <td><label class="control-label">{%= o.name %}</label></td>
+    <td><div class="col-sm-10">{%= o.accessLabel %}<button class="btn close">&times;</button></div></td>
+  </tr>
 </script>

data/app/views/hyrax/base/_show_actions.html.erb

@@ -1,19 +1,21 @@
 <div class="row show-actions button-row-top-two-column">
   <div class="col-sm-6">
-    <% if presenter.show_deposit_for?(collections: @user_collections) %>
-      <input type="checkbox"  style="display:none" name="batch_document_ids[]" id="batch_document_<%= presenter.id %>" value="<%= presenter.id %>" class="batch_document_selector" checked="checked" />
-      <%= button_tag t('hyrax.dashboard.my.action.add_to_collection'),
-                    class: 'btn btn-default submits-batches submits-batches-add',
-                    data: { toggle: "modal", target: "#collection-list-container" } %>
-    <% end %>
-    <% if presenter.work_featurable? %>
-      <%= link_to t('.feature'), hyrax.featured_work_path(presenter, format: :json),
-          data: { behavior: 'feature' },
-          class: presenter.display_feature_link? ? 'btn btn-default' : 'btn btn-default collapse' %>
+    <% if !workflow_restriction?(presenter) %>
+      <% if presenter.show_deposit_for?(collections: @user_collections) %>
+        <input type="checkbox"  style="display:none" name="batch_document_ids[]" id="batch_document_<%= presenter.id %>" value="<%= presenter.id %>" class="batch_document_selector" checked="checked" />
+        <%= button_tag t('hyrax.dashboard.my.action.add_to_collection'),
+                      class: 'btn btn-default submits-batches submits-batches-add',
+                      data: { toggle: "modal", target: "#collection-list-container" } %>
+      <% end %>
+      <% if presenter.work_featurable? %>
+        <%= link_to t('.feature'), hyrax.featured_work_path(presenter, format: :json),
+            data: { behavior: 'feature' },
+            class: presenter.display_feature_link? ? 'btn btn-default' : 'btn btn-default collapse' %>
 
-      <%= link_to t('.unfeature'), hyrax.featured_work_path(presenter, format: :json),
-          data: { behavior: 'unfeature' },
-          class: presenter.display_unfeature_link? ? 'btn btn-default' : 'btn btn-default collapse' %>
+        <%= link_to t('.unfeature'), hyrax.featured_work_path(presenter, format: :json),
+            data: { behavior: 'unfeature' },
+            class: presenter.display_unfeature_link? ? 'btn btn-default' : 'btn btn-default collapse' %>
+      <% end %>
     <% end %>
     <% if Hyrax.config.analytics? %>
       <% # turbolinks needs to be turned off or the page will use the cache and the %>
@@ -23,7 +25,7 @@
   </div>
 
   <div class="col-sm-6 text-right">
-    <% if presenter.editor? %>
+    <% if presenter.editor? && !workflow_restriction?(presenter) %>
       <%= link_to t('.edit'), edit_polymorphic_path([main_app, presenter]), class: 'btn btn-default' %>
       <% if presenter.member_presenters.size > 1 %>
           <%= link_to t("hyrax.file_manager.link_text"), polymorphic_path([main_app, :file_manager, presenter]), class: 'btn btn-default' %>

data/app/views/hyrax/base/unavailable.html.erb

@@ -1,5 +1,5 @@
 <h1>
-    <%= @presenter %> <%= @presenter.workflow.badge %>
+    <%= @presenter %> <%= @presenter.try(:workflow).try(:badge) %>
 </h1>
 <% if @parent_presenter %>
     <ul class="breadcrumb">

data/app/views/hyrax/batch_edits/_currently_shared.html.erb

@@ -0,0 +1,8 @@
+<h2><%= t('.share_batch_with') %></h2>
+
+<table class="table table-bordered">
+  <tr id="file_permissions">
+    <th  width="65%"><%= t('.table_title_user') %></th>
+    <th><div class="col-sm-10"><%= t('.table_title_access') %></div></th>
+  </tr>
+</table>

data/app/views/hyrax/collections/_show_document_list_row.html.erb

@@ -7,7 +7,7 @@
   </td>
   <td>
     <div class="media">
-      <%= link_to [main_app, document], class: "media-left" do %>
+      <%= link_to [main_app, document], "class" => "media-left", "aria-hidden" => "true" do %>
         <%= render_thumbnail_tag document, { class: "hidden-xs file_listing_thumbnail", alt: "#{document.title_or_label} #{t('hyrax.homepage.admin_sets.thumbnail')}" }, { suppress_link: true } %>
       <% end %>
       <div class="media-body">

data/app/views/hyrax/collections/_sort_and_per_page.html.erb

@@ -7,7 +7,7 @@
       <%= select_tag(:sort, options_from_collection_for_select(collection_member_sort_fields, 'first', lambda {|field| field.last.label}, h(params[:sort]))) %>
       <%= label_tag(:per_page) do %>
         <span class="tiny-nudge"><%= t('.results_per_page') %></span>
-        <%= select_tag(:per_page, options_for_select(['10', '20', '50', '100'], h(params[:per_page])), title: t('.number_of_results_to_display_per_page')) %>
+        <%= select_tag(:per_page, options_for_select(Hyrax.config.range_for_number_of_results_to_display_per_page, h(params[:per_page])), title: t('.number_of_results_to_display_per_page')) %>
       <% end %>
       <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:per_page, :sort)) %>
       &nbsp;<button class="btn btn-xs btn-default tiny-nudge"><span class="glyphicon glyphicon-refresh"></span> <%= t('helpers.action.refresh') %></button>

data/app/views/hyrax/contact_form/new.html.erb

@@ -1,3 +1,5 @@
+<% provide :page_title, I18n.t('hyrax.contact_form.title') %>
+
 <div class="alert alert-info">
   <%= render 'directions' %>
 </div>
@@ -20,7 +22,7 @@
   <div class="form-group">
     <%= f.label :category, t('hyrax.contact_form.type_label'), class: "col-sm-2 control-label" %>
     <div class="col-sm-10">
-      <%= f.select 'category', options_for_select(contact_form_issue_type_options), {}, {class: 'form-control', required: true } %>
+      <%= f.select 'category', options_for_select(contact_form_issue_type_options), { include_blank: t('hyrax.contact_form.select_type') }, {class: 'form-control', required: true } %>
     </div>
   </div>
 

data/app/views/hyrax/dashboard/collections/_show_document_list_menu.html.erb

@@ -2,7 +2,7 @@
   <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><%= t('.select') %> <span class="caret"></span>
   </button>
   <ul class="dropdown-menu dropdown-menu-right">
-    <% if can? :edit, document %>
+    <% if can?( :edit, document ) && !workflow_restriction?(@presenter) %>
       <li>
         <%= link_to [main_app, :edit, document],
                     class: "itemicon itemedit",

data/app/views/hyrax/dashboard/collections/_show_document_list_row.html.erb

@@ -7,7 +7,7 @@
   </td>
   <td>
     <div class="media">
-      <%= link_to [main_app, document], class: "media-left" do %>
+      <%= link_to [main_app, document], "class" => "media-left", "aria-hidden" => "true" do %>
         <%= render_thumbnail_tag document, { class: "hidden-xs file_listing_thumbnail", alt: document.title_or_label }, { suppress_link: true } %>
       <% end %>
       <div class="media-body">

data/app/views/hyrax/dashboard/collections/_sort_and_per_page.html.erb

@@ -17,7 +17,7 @@
              <%= label_tag(:sort, t(".sort_by")) %>
              <%= select_tag(:sort, options_from_collection_for_select(collection_member_sort_fields, 'first', lambda {|field| field.last.label}, h(params[:sort]))) %>
              <%= label_tag(:per_page) do %>
-               <%= t(".show_par_page_html", select: select_tag(:per_page, options_for_select(['10', '20', '50', '100'], params[:per_page]), title: t('hyrax.dashboard.my.sr.results_per_page'))) %>
+               <%= t(".show_par_page_html", select: select_tag(:per_page, options_for_select(Hyrax.config.range_for_number_of_results_to_display_per_page, params[:per_page]), title: t('hyrax.dashboard.my.sr.results_per_page'))) %>
              <% end %>
              <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:per_page, :sort)) %>
              <button class="btn btn-info"><span class="glyphicon glyphicon-refresh"></span> <%= t('helpers.action.refresh') %></button>

data/app/views/hyrax/file_sets/_actions.html.erb

@@ -1,6 +1,5 @@
-<% if file_set.user_can_perform_any_action? %>
+<% if (can?(:download, file_set.id) || can?(:destroy, file_set.id) || can?(:edit, file_set.id)) && !workflow_restriction?(file_set.parent) %>
   <div class="btn-group">
-
     <button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button" id="dropdownMenu_<%= file_set.id %>" aria-haspopup="true" aria-expanded="false">
       <span class="sr-only"><%= t('.press_to') %> </span>
       <%= t('.header') %>

data/app/views/hyrax/file_sets/_permission_form.html.erb

@@ -65,37 +65,8 @@
   </div>
 </div>
 
-<table class="table table-bordered">
-  <tr>
-    <th width="60%"><%= t('.table_title_user') %></th>
-    <th width="40%"><%= t('.table_title_access') %></th>
-  </tr>
-  <tr id="file_permissions">
-    <td>
-      <%= label_tag :owner_access, class: "control-label" do %>
-        <%= t('.depositor') %> (<span id="file_owner" data-depositor="<%= depositor %>"><%= link_to_profile depositor %></span>)
-      <% end %>
-    </td>
-    <td>
-      <%= configured_owner_permission_levels.keys.first %>
-    </td>
-  </tr>
-  <%= f.fields_for :permissions do |permission_fields| %>
-    <%# skip the public, registered, and depositor perms as they are displayed first at the top %>
-    <% next if ['public', 'registered', depositor].include? permission_fields.object.agent_name.downcase %>
-    <tr>
-      <td><%= permission_fields.label :agent_name, class: "control-label" do %>
-        <%= user_display_name_and_key(permission_fields.object.agent_name) %>
-      <% end %></td>
-      <td>
-        <div class="col-sm-8">
-          <%= permission_fields.select :access, Hyrax.config.permission_levels, {}, class: 'form-control select_perm' %>
-        </div>
-        <button class="btn close remove_perm" data-index="<%= permission_fields.index %>">X</button>
-      </td>
-    </tr>
-  <% end %>
-</table>
+<%= render 'currently_shared', f: f %>
+
 <script type="text/x-tmpl" id="tmpl-file-set-grant">
 <tr>
   <td><label class="control-label">{%= o.name %}</label></td>

data/app/views/hyrax/file_sets/_show_actions.html.erb

@@ -5,7 +5,7 @@
     <%= link_to t('.analytics'), @presenter.stats_path, id: 'stats', class: 'btn btn-default', data: { turbolinks: false } %>
   <% end %>
 
-  <% if @presenter.editor? %>
+  <% if @presenter.editor? && !workflow_restriction?(@presenter) %>
       <%= link_to t(".edit_this", type: @presenter.human_readable_type), edit_polymorphic_path([main_app, @presenter]),
                   class: 'btn btn-default' %>
       <%= link_to t(".delete_this", type: @presenter.human_readable_type), [main_app, @presenter],

data/app/views/hyrax/file_sets/media_display/_audio.html.erb

@@ -1,5 +1,5 @@
-<% if Hyrax.config.display_media_download_link? %>
-    <div>
+<% if Hyrax.config.display_media_download_link? && !workflow_restriction?(file_set.try(:parent)) %>
+  <div>
       <h2 class="sr-only"><%= t('hyrax.file_set.show.downloadable_content.heading') %></h2>
       <audio controls="controls" class="audiojs" style="width:100%" controlsList="nodownload" preload="auto">
         <source src="<%= hyrax.download_path(file_set, file: 'ogg') %>" type="audio/ogg" />

data/app/views/hyrax/file_sets/media_display/_default.html.erb

@@ -1,6 +1,6 @@
 <div class="no-preview">
   <%= t('hyrax.works.show.no_preview') %>
-  <% if Hyrax.config.display_media_download_link? %>
+  <% if Hyrax.config.display_media_download_link? && !workflow_restriction?(file_set.try(:parent)) %>
     <p /><%= link_to t('hyrax.file_set.show.download'),
       hyrax.download_path(file_set),
       id: "file_download",

data/app/views/hyrax/file_sets/media_display/_image.html.erb

@@ -1,4 +1,4 @@
-<% if Hyrax.config.display_media_download_link? && can?(:download, file_set.id) %>
+<% if Hyrax.config.display_media_download_link? && can?(:download, file_set.id) && !workflow_restriction?(file_set.try(:parent)) %>
     <div>
       <h2 class="sr-only"><%= t('hyrax.file_set.show.downloadable_content.heading') %></h2>
       <%= image_tag thumbnail_url(file_set),

data/app/views/hyrax/file_sets/media_display/_office_document.html.erb

@@ -1,4 +1,4 @@
-<% if Hyrax.config.display_media_download_link? %>
+<% if Hyrax.config.display_media_download_link? && !workflow_restriction?(file_set.try(:parent)) %>
     <div>
       <h2 class="sr-only"><%= t('hyrax.file_set.show.downloadable_content.heading') %></h2>
       <%= image_tag thumbnail_url(file_set),

data/app/views/hyrax/file_sets/media_display/_pdf.html.erb

@@ -1,5 +1,5 @@
-<% if Hyrax.config.display_media_download_link? %>
-    <div>
+<% if Hyrax.config.display_media_download_link? && !workflow_restriction?(file_set.try(:parent)) %>
+  <div>
       <h2 class="sr-only"><%= t('hyrax.file_set.show.downloadable_content.heading') %></h2>
       <%= image_tag thumbnail_url(file_set),
                     class: "representative-media",

data/app/views/hyrax/file_sets/media_display/_video.html.erb

@@ -1,5 +1,5 @@
-<% if Hyrax.config.display_media_download_link? %>
-    <div>
+<% if Hyrax.config.display_media_download_link? && !workflow_restriction?(file_set.try(:parent)) %>
+  <div>
       <h2 class="sr-only"><%= t('hyrax.file_set.show.downloadable_content.heading') %></h2>
       <video controls="controls" class="video-js vjs-default-skin" style="width:100%" data-setup="{}" controlsList="nodownload" preload="auto">
         <source src="<%= hyrax.download_path(file_set, file: 'webm') %>" type="video/webm" />

data/app/views/hyrax/my/_sort_and_per_page.html.erb

@@ -5,7 +5,7 @@
           <fieldset class="col-xs-12">
             <legend class="sr-only"><%= t('hyrax.dashboard.my.sr.results_per_page') %></legend>
             <%= label_tag :per_page do %>
-                Show <%= select_tag :per_page, options_for_select(['10', '20', '50', '100'], h(params[:per_page])),
+                Show <%= select_tag :per_page, options_for_select(Hyrax.config.range_for_number_of_results_to_display_per_page.map(&:to_s), h(params[:per_page])),
                                     title: t(".number_of_results_to_display_per_page") %> per page
             <% end %>
             <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:per_page, :sort, :utf8)) %>

data/app/views/layouts/_head_tag_content.html.erb

@@ -22,7 +22,7 @@ signed in %>
 
 <!-- application js -->
 <%= javascript_include_tag 'application' %>
-<%= tinymce_assets if can? :update, ContentBlock %>
+
 <%= render 'shared/appearance_styles' %>
 
 <!-- Google Analytics -->

data/app/views/shared/_citations.html.erb

@@ -14,28 +14,31 @@
   <meta name="twitter:label2" content="Rights Statement" />
 <% end %>
 
+<% gscholar = Hyrax::GoogleScholarPresenter.new(@presenter) %>
+
+<% if gscholar.scholarly? %>
 <% content_for(:gscholar_meta) do %>
-  <meta name="description" content="<%= @presenter.description.first.truncate(200) rescue @presenter.title.first %>" />
-  <meta name="citation_title" content="<%= @presenter.title.first %>" />
+  <meta name="description" content="<%= gscholar.description %>" />
+  <meta name="citation_title" content="<%= gscholar.title %>" />
 
-  <% @presenter.creator.each do |creator| %>
-  <meta name="citation_author" content="<%= creator %>" />
+  <% gscholar.authors.each do |author| %>
+  <meta name="citation_author" content="<%= author %>" />
   <% end %>
 
-  <% unless @presenter.date_created.blank? %>
-  <meta name="citation_publication_date" content="<%= @presenter.date_created.first %>" />
+  <% if gscholar.publication_date.present? %>
+  <meta name="citation_publication_date" content="<%= gscholar.publication_date %>" />
   <% end %>
 
-  <% unless @presenter.download_url.blank? %>
-  <meta name="citation_pdf_url" content="<%= @presenter.download_url %>" />
+  <% if gscholar.pdf_url.present? %>
+  <meta name="citation_pdf_url" content="<%= gscholar.pdf_url %>" />
   <% end %>
 
-  <% unless @presenter.keyword.blank? %>
-  <meta name="citation_keywords" content="<%= @presenter.keyword.join('; ') %>" />
+  <% if gscholar.keywords.present? %>
+  <meta name="citation_keywords" content="<%= gscholar.keywords %>" />
   <% end %>
 
-  <% unless @presenter.publisher.blank? %>
-  <meta name="citation_publisher" content="<%= @presenter.publisher.join('; ') %>" />
+  <% if gscholar.publisher.present? %>
+  <meta name="citation_publisher" content="<%= gscholar.publisher %>" />
   <% end %>
 
   <!-- Hyrax does not yet support these metadata -->
@@ -47,3 +50,4 @@
     <meta name="citation_lastpage" content=""/>
   -->
 <% end %>
+<% end %>