hyrax 3.0.0.pre.rc4 → 3.0.0

data/app/jobs/file_set_attached_event_job.rb

@@ -30,6 +30,11 @@ class FileSetAttachedEventJob < ContentEventJob
   end
 
   def curation_concern
-    repo_object.in_works.first
+    case repo_object
+    when ActiveFedora::Base
+      repo_object.in_works.first
+    else
+      Hyrax.query_service.find_parents(resource: repo_object).first
+    end
   end
 end

data/app/jobs/lease_expiry_job.rb

@@ -1,15 +1,17 @@
 # frozen_string_literal: true
 class LeaseExpiryJob < Hyrax::ApplicationJob
   def perform
-    records_with_expired_leases.each do |id|
-      work = ActiveFedora::Base.find(id)
-      Hyrax::Actors::LeaseActor.new(work).destroy
+    records_with_expired_leases.each do |resource|
+      Hyrax::LeaseManager.release_lease_for(resource: resource) &&
+        Hyrax::AccessControlList(resource).save
     end
   end
 
   ##
   # @return [Enumerator<String>] ids for all the objects that have expired active leases
   def records_with_expired_leases
-    Hyrax::LeaseService.assets_with_expired_leases.map(&:id)
+    ids = Hyrax::LeaseService.assets_with_expired_leases.map(&:id)
+
+    Hyrax.query_service.find_many_by_ids(ids: ids)
   end
 end

data/app/models/concerns/hyrax/ability.rb

@@ -37,6 +37,7 @@ module Hyrax
       self.registered_group_name = Hyrax.config.registered_user_group_name
       self.public_group_name = Hyrax.config.public_user_group_name
       self.ability_logic += [:admin_permissions,
+                             :edit_resources,
                              :curation_concerns_permissions,
                              :operation_abilities,
                              :add_to_collection,
@@ -108,6 +109,16 @@ module Hyrax
       end
     end
 
+    ##
+    # @api public
+    #
+    # Allows
+    def edit_resources
+      can [:edit, :update, :destroy], Hyrax::Resource do |resource|
+        test_edit(resource.id)
+      end
+    end
+
     ##
     # @api public
     #

data/app/models/concerns/hyrax/solr_document_behavior.rb

@@ -74,8 +74,14 @@ module Hyrax
 
       ##
       # @api public
+      #
+      # @note uses the @model's `._to_partial_path` if implemented, otherwise
+      #   constructs a default
       def to_partial_path
-        @model._to_partial_path
+        return @model._to_partial_path if
+          @model.respond_to?(:_to_partial_path)
+
+        "hyrax/#{model_name.collection}/#{model_name.element}"
       end
 
       ##

data/app/models/hyrax/file_set.rb

@@ -7,6 +7,7 @@ module Hyrax
   # @see https://wiki.duraspace.org/display/samvera/Hydra%3A%3AWorks+Shared+Modeling
   class FileSet < Hyrax::Resource
     include Hyrax::Schema(:core_metadata)
+    include Hyrax::Schema(:basic_metadata)
 
     attribute :file_ids, Valkyrie::Types::Array.of(Valkyrie::Types::ID) # id for FileMetadata resources
     attribute :original_file_id, Valkyrie::Types::ID # id for FileMetadata resource

data/app/models/hyrax/work.rb

@@ -14,6 +14,8 @@ module Hyrax
     attribute :on_behalf_of,             Valkyrie::Types::String
     attribute :proxy_depositor,          Valkyrie::Types::String
     attribute :state,                    Valkyrie::Types::URI.default(Hyrax::ResourceStatus::ACTIVE)
+    attribute :representative_id,        Valkyrie::Types::ID
+    attribute :thumbnail_id,             Valkyrie::Types::ID
 
     ##
     # @return [Boolean] true

data/app/models/job_io_wrapper.rb

@@ -63,7 +63,7 @@ class JobIoWrapper < ApplicationRecord
     nil # unable to determine
   end
 
-  def file_set(use_valkyrie: false)
+  def file_set(use_valkyrie: Hyrax.config.query_index_from_valkyrie)
     return FileSet.find(file_set_id) unless use_valkyrie
     Hyrax.query_service.find_by(id: Valkyrie::ID.new(file_set_id))
   end

data/app/services/hyrax/access_control_list.rb

@@ -14,7 +14,7 @@ module Hyrax
     when AccessControlList
       obj
     else
-      AccessControlList.new(resource: obj)
+      obj.try(:permission_manager)&.acl || AccessControlList.new(resource: obj)
     end
   end
 

data/app/services/hyrax/adapters/nesting_index_adapter.rb

@@ -56,7 +56,7 @@ module Hyrax
       # @see Samvera::NestingIndexer.reindex_all!(extent: FULL_REINDEX)
       def self.each_perservation_document_id_and_parent_ids(&block) # rubocop:disable Lint/UnusedMethodArgument
         ActiveFedora::Base.descendant_uris(ActiveFedora.fedora.base_uri, exclude_uri: true).each do |uri|
-          id = Hyrax::Base.uri_to_id(uri)
+          id = Hyrax.config.translate_uri_to_id.call(uri)
           object = ActiveFedora::Base.find(id)
           parent_ids = object.try(:member_of_collection_ids) || []
 

data/app/services/hyrax/embargo_manager.rb

@@ -175,7 +175,7 @@ module Hyrax
 
     ##
     # @return [void]
-    # @raise [NotEnforcableError] when trying to release an embargo that
+    # @raise [NotReleasableError] when trying to release an embargo that
     #   is currently active
     def release!
       release || raise(NotReleasableError)

data/app/services/hyrax/graph_exporter.rb

@@ -140,7 +140,7 @@ module Hyrax
       # This method is called once for each statement in the graph.
       def replacer
         lambda do |resource_id, _graph|
-          parent_id = Hyrax::Base.uri_to_id(parent_url)
+          parent_id = Hyrax.config.translate_uri_to_id.call(parent_url)
           return parent_url + resource_id.sub(parent_id, '') if resource_id.start_with?(parent_id)
           Rails.application.routes.url_helpers.solr_document_url(resource_id, host: hostname)
         end

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

@@ -16,9 +16,26 @@ module Hyrax
       #
       # @param event [Dry::Event]
       def on_object_metadata_updated(event)
-        return Hyrax.index_adapter.save(resource: event[:object]) if
+        log_non_resource(event) && return unless
           event[:object].is_a?(Valkyrie::Resource)
 
+        Hyrax.index_adapter.save(resource: event[:object])
+      end
+
+      ##
+      # Remove the resource from the index.
+      #
+      # @param event [Dry::Event]
+      def on_object_deleted(event)
+        log_non_resource(event.payload) && return unless
+          event.payload[:object].is_a?(Valkyrie::Resource)
+
+        Hyrax.index_adapter.delete(resource: event[:object])
+      end
+
+      private
+
+      def log_non_resource(event)
         Hyrax.logger.info('Skipping object reindex because the object ' \
                           "#{event[:object]} was not a Valkyrie::Resource.")
       end

data/app/services/hyrax/versioning_service.rb

@@ -20,7 +20,7 @@ module Hyrax
       def versioned_file_id(file)
         versions = file.versions.all
         if versions.present?
-          Hyrax::Base.uri_to_id(versions.last.uri)
+          Hyrax.config.translate_uri_to_id.call(versions.last.uri)
         else
           file.id
         end

data/app/services/hyrax/work_uploads_handler.rb

@@ -64,7 +64,7 @@ module Hyrax
     # @note we immediately and silently discard uploads with an existing
     #   file_set_uri, in a half-considered attempt at supporting idempotency
     #   (for job retries). this is for legacy/AttachFilesToWorkJob
-    #   compatibility, but could stand for a roubst reimplementation.
+    #   compatibility, but could stand for a robust reimplementation.
     #
     # @param [Enumberable<Hyrax::UploadedFile>] files  files to add
     #
@@ -88,7 +88,8 @@ module Hyrax
 
       acquire_lock_for(work.id) do
         event_payloads = files.each_with_object([]) { |file, arry| arry << make_file_set_and_ingest(file) }
-        Hyrax.persister.save(resource: work)
+        @persister.save(resource: work)
+        Hyrax.publisher.publish('object.metadata.updated', object: work, user: files.first.user)
         event_payloads.each { |payload| Hyrax.publisher.publish('file.set.attached', payload) }
       end
     end
@@ -105,7 +106,9 @@ module Hyrax
       # copy ACLs; should we also be propogating embargo/lease?
       Hyrax::AccessControlList.copy_permissions(source: target_permissions, target: file_set)
       append_to_work(file_set)
+
       IngestJob.perform_later(wrap_file(file, file_set))
+      Hyrax.publisher.publish('object.metadata.updated', object: file_set, user: file.user)
       { file_set: file_set, user: file.user }
     end
 

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

@@ -14,7 +14,7 @@
       <div class="media-body">
         <p class="media-heading">
           <strong><%= link_to document.title_or_label, [main_app, document], id: "src_copy_link#{id}", class: "#{'document-title' if document.title_or_label == document.label}" %></strong>
-          <a href="#" class="small" title="Click for more details"><i id="expand_<%= id %>" class="glyphicon glyphicon-chevron-right"></i></a>
+          <a href="#" class="small" title="Click for more details"><span id="expand_<%= id %>" class="glyphicon glyphicon-chevron-right"></span></a>
         </p>
         <%= render_collection_links(document) %>
       </div>

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

@@ -18,11 +18,7 @@
   </legend>
   <div class="col-sm-9 form-inline">
     <label for="new_group_name_skel" class="sr-only"><%= t(".group") %></label>
-    <% if current_ability.admin? %>
-      <%= select_tag 'new_group_name_skel', options_for_select(["Select a group"] + current_user.group_service.map.keys), class: 'form-control' %>
-    <% else %>
-      <%= select_tag 'new_group_name_skel', options_for_select(["Select a group"] + current_user.groups), class: 'form-control' %>
-    <% end %>
+    <%= select_tag 'new_group_name_skel', options_for_select(["Select a group"] + available_user_groups(ability: current_ability)), class: 'form-control' %>
     <label for="new_group_permission_skel" class="sr-only"><%= t(".access_type_to_grant") %></label>
     <%= select_tag 'new_group_permission_skel', options_for_select(configured_permission_options), class: 'form-control' %>
 

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

@@ -1,7 +1,7 @@
 <div id="workflow_controls" class="panel panel-workflow">
   <div class="panel-heading">
     <a data-toggle="collapse" href="#workflow_controls_collapse">
-      <h2 class="panel-title"><%= t('.title') %> <i class="fa fa-chevron-right pull-right"></i></h2>
+      <h2 class="panel-title"><%= t('.title') %> <span class="fa fa-chevron-right pull-right"></span></h2>
     </a>
   </div>
   <%= form_tag main_app.hyrax_workflow_action_path(presenter), method: :put do %>

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

@@ -9,8 +9,8 @@
   <h3><%= t('.descriptions_title') %></h3>
   <div class="panel panel-default tabs">
     <ul class="nav nav-tabs">
-      <li id="edit_descriptions_link" class="active"><a href="#descriptions_display" data-toggle="tab"><i class="glyphicon glyphicon-tags"></i> <%= t('.descriptions') %></a></li>
-      <li id="edit_permissions_link"><a href="#permissions_display" data-toggle="tab"><i class="glyphicon glyphicon-lock"></i> <%= t('.permissions') %></a></li>
+      <li id="edit_descriptions_link" class="active"><a href="#descriptions_display" data-toggle="tab"><span class="glyphicon glyphicon-tags"></span> <%= t('.descriptions') %></a></li>
+      <li id="edit_permissions_link"><a href="#permissions_display" data-toggle="tab"><span class="glyphicon glyphicon-lock"></span> <%= t('.permissions') %></a></li>
     </ul>
     <div class="panel-body">
       <div class="tab-content">

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

@@ -11,7 +11,7 @@
               <%= collection_presenter.title_or_label %>
           <% end %>
           <a href="#" class="small" title="Click for more details">
-            <i id="expand_<%= id %>" class="glyphicon glyphicon-chevron-right" aria-hidden="true"></i>
+            <span id="expand_<%= id %>" class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
             <span class="sr-only"> <%= "#{t("hyrax.dashboard.my.sr.detail_label")} #{collection_presenter.title_or_label}" %></span>
           </a>
         </div>

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

@@ -3,7 +3,7 @@
       <div class="input-group">
         <%= text_field_tag :cq, params[:cq], class: "collection-query form-control", placeholder: t('hyrax.collections.search_form.placeholder'), size: '30', type: "search", id: "collection_search" %>
         <div class="input-group-btn">
-          <button type="submit" class="btn btn-primary" id="collection_submit"><i class="glyphicon glyphicon-search"></i> <%= t('hyrax.collections.search_form.button_label') %></button>
+          <button type="submit" class="btn btn-primary" id="collection_submit"><span class="glyphicon glyphicon-search"></span> <%= t('hyrax.collections.search_form.button_label') %></button>
         </div>
       </div>
       <%= hidden_field_tag :sort, params[:sort], id: 'collection_sort' %>

data/app/views/hyrax/stats/file.html.erb

@@ -13,7 +13,7 @@
   <div class="col-sm-12">
     <%= content_tag :h2, "File Analytics" %>
     <div class="alert alert-info">
-      <i class="glyphicon glyphicon-signal large-icon"></i>
+      <span class="glyphicon glyphicon-signal large-icon"></span>
       <%= content_tag :strong, @stats.total_pageviews %> views and <%= content_tag :strong, @stats.total_downloads %> downloads since <%= @stats.created.strftime("%B %-d, %Y") %>
     </div>
     <div class="stats-container">

data/app/views/hyrax/stats/work.html.erb

@@ -13,7 +13,7 @@
   <div class="col-sm-12">
     <%= content_tag :h2, "Work Analytics" %>
     <div class="alert alert-info">
-      <i class="glyphicon glyphicon-signal large-icon"></i>
+      <span class="glyphicon glyphicon-signal large-icon"></span>
       <%= content_tag :strong, @stats.total_pageviews %> views since <%= @stats.created.strftime("%B %-d, %Y") %>
     </div>
     <div class="stats-container">

data/app/views/hyrax/uploads/_js_templates.html.erb

@@ -17,13 +17,13 @@
         <td class="text-right">
             {% if (!i && !o.options.autoUpload) { %}
                 <button class="btn btn-primary start" disabled>
-                    <i class="glyphicon glyphicon-upload"></i>
+                    <span class="glyphicon glyphicon-upload"></span>
                     <span><%= t('.start') %></span>
                 </button>
             {% } %}
             {% if (!i) { %}
                 <button class="btn btn-sm btn-warning cancel">
-                    <i class="glyphicon glyphicon-ban-circle"></i>
+                    <span class="glyphicon glyphicon-ban-circle"></span>
                     <span><%= t('helpers.action.cancel') %></span>
                 </button>
             {% } %}
@@ -67,7 +67,7 @@
               {% } %}
               <span class="size">{%=o.formatFileSize(file.size)%}</span>
               <button class="btn btn-sm btn-danger delete pull-right" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}"{% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
-                  <i class="glyphicon glyphicon-trash"></i>
+                  <span class="glyphicon glyphicon-trash"></span>
                   <span><%= t('helpers.action.delete') %></span>
               </button>
             </div>
@@ -124,7 +124,7 @@
         </td>
         <td class="text-right">
             <button class="btn btn-sm btn-danger delete" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}"{% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
-                <i class="glyphicon glyphicon-trash"></i>
+                <span class="glyphicon glyphicon-trash"></span>
                 <%= t('helpers.action.delete') %>
             </button>
         </td>

data/app/views/hyrax/uploads/_js_templates_versioning.html.erb

@@ -23,13 +23,13 @@
         <td class="text-right">
             {% if (!i && !o.options.autoUpload) { %}
                 <button class="btn btn-primary start" disabled>
-                    <i class="glyphicon glyphicon-upload"></i>
+                    <span class="glyphicon glyphicon-upload"></span>
                     <span><%= t('.start') %></span>
                 </button>
             {% } %}
             {% if (!i) { %}
                 <button class="btn btn-sm btn-warning cancel">
-                    <i class="glyphicon glyphicon-ban-circle"></i>
+                    <span class="glyphicon glyphicon-ban-circle"></span>
                     <span><%= t('helpers.action.cancel') %></span>
                 </button>
             {% } %}
@@ -76,7 +76,7 @@
                       data-type="{%=file.deleteType%}"
                       data-url="{%=file.deleteUrl%}"
                       {% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
-                  <i class="glyphicon glyphicon-trash"></i>
+                  <span class="glyphicon glyphicon-trash"></span>
                   <span><%= t('helpers.action.delete') %></span>
               </button>
             </div>
@@ -169,4 +169,4 @@
                 minFileSize: '<%= t(".options.messages.min_file_size") %>',
             }});
     });
-</script>
+</script>

data/app/views/hyrax/users/_contributions.html.erb

@@ -12,7 +12,7 @@
             <%= link_to t.to_s, [main_app, t] %>
             <% if presenter.current_user? %>
               <%= display_trophy_link current_user, t.id, class: 'glyphicon glyphicon-star', data: { removerow: true } do %>
-                <i class='trophy-on glyphicon glyphicon-remove'></i>
+                <span class='trophy-on glyphicon glyphicon-remove'></span>
               <% end %>
             <% end %>
           </td>

data/app/views/hyrax/users/_profile_tabs.html.erb

@@ -1,6 +1,6 @@
       <ul class="nav nav-tabs" id="myTab">
-        <li class="active"><a href="#contributions"><i class="glyphicon glyphicon-star"></i> <%= I18n.t('hyrax.user_profile.tab_highlighted') %></a></li>
-        <li><a href="#activity_log"><i class="glyphicon glyphicon-calendar"></i> <%= I18n.t('hyrax.user_profile.tab_activity') %></a></li>
+        <li class="active"><a href="#contributions"><span class="glyphicon glyphicon-star"></span> <%= I18n.t('hyrax.user_profile.tab_highlighted') %></a></li>
+        <li><a href="#activity_log"><span class="glyphicon glyphicon-calendar"></span> <%= I18n.t('hyrax.user_profile.tab_activity') %></a></li>
       </ul>
 
       <div class="tab-content panel-body">

data/app/views/hyrax/users/_search_form.html.erb

@@ -6,7 +6,7 @@
     <%= hidden_field_tag :sort, params[:sort], id: 'user_sort' %>
     <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:uq, :sort, :qt, :page, :utf8)) %>
     <button type="submit" class="btn btn-primary" id="user_submit">
-      <i class="glyphicon glyphicon-search"></i><%= t('.go') %>
+      <span class="glyphicon glyphicon-search"></span><%= t('.go') %>
     </button>
   <% end %>
 </div>

data/app/views/hyrax/users/_user.html.erb

@@ -17,7 +17,7 @@
   <div class="panel-footer clearfix">
     <% if can? :edit, user %>
       <%= link_to hyrax.edit_dashboard_profile_path(user), class: "btn btn-default pull-right" do %>
-        <i class="glyphicon glyphicon-edit"></i> <%= t("hyrax.edit_profile") %>
+        <span class="glyphicon glyphicon-edit"></span> <%= t("hyrax.edit_profile") %>
       <% end %>
     <% end %>
   </div>

data/app/views/hyrax/users/_user_info.html.erb

@@ -11,35 +11,35 @@
 <% end %>
 
 <% if user.facebook_handle.present? %>
-  <dt><i class="fa fa-facebook" aria-hidden="true"></i> Facebook Handle</dt>
+  <dt><span class="fa fa-facebook" aria-hidden="true"></span> Facebook Handle</dt>
   <dd><%= link_to user.facebook_handle, "http://facebook.com/#{user.facebook_handle}", {target:'_blank'} %></dd>
 <% end %>
 
 <% if user.twitter_handle.present? %>
-  <dt><i class="fa fa-twitter" aria-hidden="true"></i> Twitter Handle</dt>
+  <dt><span class="fa fa-twitter" aria-hidden="true"></span> Twitter Handle</dt>
   <dd><%= link_to user.twitter_handle, "http://twitter.com/#{user.twitter_handle}", {target:'_blank'} %></dd>
 <% end %>
 
 <% if user.googleplus_handle.present? %>
-  <dt><i class="fa fa-google-plus" aria-hidden="true"></i> Google+ Handle</dt>
+  <dt><span class="fa fa-google-plus" aria-hidden="true"></span> Google+ Handle</dt>
   <dd><%= link_to user.googleplus_handle, "http://google.com/+#{user.googleplus_handle}", {target:'_blank'} %></dd>
 <% end %>
 
 <% if user.linkedin_handle.present? %>
-  <dt><i class="fa fa-linkedin" aria-hidden="true"></i> LinkedIn</dt>
+  <dt><span class="fa fa-linkedin" aria-hidden="true"></span> LinkedIn</dt>
   <dd><%= link_to "#{@linkedInUrl}", "#{@linkedInUrl}", { target: '_blank' } %></dd>
 <% end %>
 
-  <dt><i class="fa fa-envelope" aria-hidden="true"></i> Email</dt>
+  <dt><span class="fa fa-envelope" aria-hidden="true"></span> Email</dt>
   <dd><%= mail_to user.email %></dd>
 
   <% if user.chat_id %>
-    <dt><i class="glyphicon glyphicon-bullhorn" aria-hidden="true"></i> Chat ID</dt>
+    <dt><span class="glyphicon glyphicon-bullhorn" aria-hidden="true"></span> Chat ID</dt>
     <dd><%= user.chat_id %></dd>
   <% end %>
 
   <% if user.website %>
-    <dt><i class="glyphicon glyphicon-globe" aria-hidden="true"></i> Website(s)</dt>
+    <dt><span class="glyphicon glyphicon-globe" aria-hidden="true"></span> Website(s)</dt>
     <dd><%= iconify_auto_link(user.website) %></dd>
   <% end %>
 
@@ -64,7 +64,7 @@
   <% end %>
 
   <% if user.address %>
-    <dt><i class="glyphicon glyphicon-map-marker" aria-hidden="true"></i> Address</dt>
+    <dt><span class="glyphicon glyphicon-map-marker" aria-hidden="true"></span> Address</dt>
     <dd><%= user.address %></dd>
   <% end %>
 
@@ -74,7 +74,7 @@
   <% end %>
 
   <% if user.telephone %>
-    <dt><i class="glyphicon glyphicon-earphone" aria-hidden="true"></i> Telephone</dt>
+    <dt><span class="glyphicon glyphicon-earphone" aria-hidden="true"></span> Telephone</dt>
     <dd><%= link_to_telephone(user) %></dd>
   <% end %>