hyrax 2.1.0.beta1 → 2.1.0.beta2

data/app/helpers/hyrax/trophy_helper.rb

@@ -1,6 +1,5 @@
 module Hyrax
   module TrophyHelper
-    # rubocop:disable Metrics/MethodLength
     def display_trophy_link(user, id, args = {}, &_block)
       return unless user
       trophy = user.trophies.where(work_id: id).exists?

data/app/indexers/hyrax/admin_set_indexer.rb

@@ -2,6 +2,8 @@ module Hyrax
   class AdminSetIndexer < ActiveFedora::IndexingService
     include Hyrax::IndexesThumbnails
 
+    self.thumbnail_path_service = Hyrax::CollectionThumbnailPathService
+
     def generate_solr_document
       super.tap do |solr_doc|
         # Makes Admin Sets show under the "Admin Sets" tab

data/app/inputs/multi_value_select_input.rb

@@ -39,9 +39,7 @@ class MultiValueSelectInput < MultiValueInput
     def build_field(value, index)
       render_options = select_options
       html_options = build_field_options(value)
-      if options[:item_helper]
-        (render_options, html_options) = options[:item_helper].call(value, index, render_options, html_options)
-      end
+      (render_options, html_options) = options[:item_helper].call(value, index, render_options, html_options) if options[:item_helper]
       template.select_tag(attribute_name, template.options_for_select(render_options, value), html_options)
     end
 end

data/app/jobs/attach_files_to_work_job.rb

@@ -6,7 +6,11 @@ class AttachFilesToWorkJob < Hyrax::ApplicationJob
   # @param [Array<Hyrax::UploadedFile>] uploaded_files - an array of files to attach
   def perform(work, uploaded_files, **work_attributes)
     validate_files!(uploaded_files)
-    user = User.find_by_user_key(work.depositor) # BUG? file depositor ignored
+    # When running as a background job (as opposed to running inline), a work with files attached
+    # by a proxy user will set the depositor as the intended user that the proxy user was depositing on
+    # behalf of. See ticket #2764.
+    depositor = work.on_behalf_of || work.depositor
+    user = User.find_by_user_key(depositor)
     work_permissions = work.permissions.map(&:to_hash)
     metadata = visibility_attributes(work_attributes)
     uploaded_files.each do |uploaded_file|

data/app/jobs/import_url_job.rb

@@ -49,15 +49,16 @@ class ImportUrlJob < Hyrax::ApplicationJob
     # @yield [IO] the stream to write to
     def copy_remote_file(uri)
       filename = File.basename(uri.path)
-      Dir.mktmpdir do |dir|
-        File.open(File.join(dir, filename), 'wb') do |f|
-          retriever = BrowseEverything::Retriever.new
-          retriever.retrieve('url' => uri) do |chunk|
-            f.write(chunk)
-          end
-          f.rewind
-          yield f
+      dir = Dir.mktmpdir
+      Rails.logger.debug("ImportUrlJob: Copying <#{uri}> to #{dir}")
+      File.open(File.join(dir, filename), 'wb') do |f|
+        retriever = BrowseEverything::Retriever.new
+        retriever.retrieve('url' => uri) do |chunk|
+          f.write(chunk)
         end
+        f.rewind
+        yield f
       end
+      Rails.logger.debug("ImportUrlJob: Closing #{File.join(dir, filename)}")
     end
 end

data/app/models/admin_set.rb

@@ -38,8 +38,6 @@ class AdminSet < ActiveFedora::Base
   property :creator, predicate: ::RDF::Vocab::DC11.creator do |index|
     index.as :symbol
   end
-
-  # rubocop:disable Rails/HasManyOrHasOneDependent
   has_many :members,
            predicate:  Hyrax.config.admin_set_predicate,
            class_name: 'ActiveFedora::Base'
@@ -58,9 +56,7 @@ class AdminSet < ActiveFedora::Base
 
   # Creates the default AdminSet and an associated PermissionTemplate with workflow
   def self.find_or_create_default_admin_set_id
-    unless exists?(DEFAULT_ID)
-      Hyrax::AdminSetCreateService.create_default_admin_set(admin_set_id: DEFAULT_ID, title: DEFAULT_TITLE)
-    end
+    Hyrax::AdminSetCreateService.create_default_admin_set(admin_set_id: DEFAULT_ID, title: DEFAULT_TITLE) unless exists?(DEFAULT_ID)
     DEFAULT_ID
   end
 

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

@@ -9,9 +9,10 @@ module Hyrax
       include Hyrax::Ability::PermissionTemplateAbility
       include Hyrax::Ability::SolrDocumentAbility
 
-      class_attribute :admin_group_name, :registered_group_name
+      class_attribute :admin_group_name, :registered_group_name, :public_group_name
       self.admin_group_name = 'admin'
       self.registered_group_name = 'registered'
+      self.public_group_name = 'public' # TODO: find hard coded values and replace with this
       self.ability_logic += [:admin_permissions,
                              :curation_concerns_permissions,
                              :operation_abilities,
@@ -112,9 +113,7 @@ module Hyrax
           end
         end
 
-        if Flipflop.proxy_deposit? && registered_user?
-          can :create, ProxyDepositRequest
-        end
+        can :create, ProxyDepositRequest if Flipflop.proxy_deposit? && registered_user?
 
         can :accept, ProxyDepositRequest, receiving_user_id: current_user.id, status: 'pending'
         can :reject, ProxyDepositRequest, receiving_user_id: current_user.id, status: 'pending'

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

@@ -136,10 +136,6 @@ module Hyrax
               edit_groups: edit_groups,
               read_users: read_users,
               read_groups: read_groups)
-      # added because the collection indexing happens before Hydra::AccessControls::Permission is
-      # saved, and the after_update_index callback in the nested_relationship_reindexer removes the
-      # permissions from the Solr document.
-      update_index
     end
 
     private

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

@@ -13,8 +13,20 @@ module Hyrax
       define_model_callbacks :update_index, only: :after
       after_update_index :update_nested_collection_relationship_indices
       after_destroy :update_child_nested_collection_relationship_indices
+      before_save :before_update_nested_collection_relationship_indices
+      after_save :after_update_nested_collection_relationship_indices
+
+      def before_update_nested_collection_relationship_indices
+        @during_save = true
+      end
+
+      def after_update_nested_collection_relationship_indices
+        @during_save = false
+        Hyrax.config.nested_relationship_reindexer.call(id: id)
+      end
 
       def update_nested_collection_relationship_indices
+        return if @during_save
         Hyrax.config.nested_relationship_reindexer.call(id: id)
       end
 

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

@@ -15,11 +15,7 @@ module Hyrax
     # Override this method if you have some criteria by which records should not display in the search results.
     def suppressed?
       return false if state.nil?
-      # This is a clumsy check only needed under RDF < 2.0 where there
-      # is a bug with `AT::Resource#==`
-      if RDF::VERSION.to_s < '2.0'
-        return state.rdf_subject == Vocab::FedoraResourceStatus.inactive
-      end
+
       state == Vocab::FedoraResourceStatus.inactive
     end
 

data/app/models/featured_work_list.rb

@@ -3,9 +3,7 @@ class FeaturedWorkList
 
   # @param [ActionController::Parameters] a collection of nested perameters
   def featured_works_attributes=(attributes_collection)
-    if attributes_collection.respond_to?(:permitted?)
-      attributes_collection = attributes_collection.to_h
-    end
+    attributes_collection = attributes_collection.to_h if attributes_collection.respond_to?(:permitted?)
     attributes_collection = attributes_collection.sort_by { |i, _| i.to_i }.map { |_, attributes| attributes } if attributes_collection.is_a? Hash
     attributes_collection.each do |attributes|
       raise "Missing id" if attributes['id'].blank?

data/app/models/hyrax/collection_type.rb

@@ -21,7 +21,7 @@ module Hyrax
     end
 
     class_attribute :collection_type_settings_methods, instance_writer: false
-    self.collection_type_settings_methods = [:nestable?, :discoverable?, :sharable?, :share_applies_to_new_works?,
+    self.collection_type_settings_methods = [:nestable?, :discoverable?, :brandable?, :sharable?, :share_applies_to_new_works?,
                                              :allow_multiple_membership?, :require_membership?, :assigns_workflow?,
                                              :assigns_visibility?]
 
@@ -31,6 +31,7 @@ module Hyrax
     alias_attribute :multiple_membership, :allow_multiple_membership
     alias_attribute :workflow, :assigns_workflow
     alias_attribute :visibility, :assigns_visibility
+    alias_attribute :branding, :brandable
 
     # Find the collection type associated with the Global Identifier (gid)
     # @param [String] gid - Global Identifier for this collection_type (e.g. gid://internal/hyrax-collectiontype/3)
@@ -144,7 +145,7 @@ module Hyrax
       end
 
       def collection_type_settings_changed?
-        (changes.keys & ['nestable', 'discoverable', 'sharable', 'share_applies_to_new_works', 'allow_multiple_membership',
+        (changes.keys & ['nestable', 'brandable', 'discoverable', 'sharable', 'share_applies_to_new_works', 'allow_multiple_membership',
                          'require_membership', 'assigns_workflow', 'assigns_visibility']).any?
       end
 

data/app/models/hyrax/permission_template_access.rb

@@ -29,13 +29,14 @@ module Hyrax
     #
     # @param access [Array<String>] one or more types of access (e.g. Hyrax::PermissionTemplateAccess::MANAGE, Hyrax::PermissionTemplateAccess::DEPOSIT, Hyrax::PermissionTemplateAccess::VIEW)
     # @param ability [Ability] the ability coming from cancan ability check
+    # @param exclude_groups [Array<String>] name of groups to exclude from the results
     # @return [ActiveRecord::Relation] relation of templates for which the user has specified roles
-    def self.for_user(ability:, access:)
+    def self.for_user(ability:, access:, exclude_groups: [])
       PermissionTemplateAccess.where(
         user_where(access: access, ability: ability)
       ).or(
         PermissionTemplateAccess
-          .where(group_where(access: access, ability: ability))
+          .where(group_where(access: access, ability: ability, exclude_groups: exclude_groups))
       )
     end
 
@@ -79,13 +80,14 @@ module Hyrax
     #
     # @param access [Array<String>] one or more types of access (e.g. Hyrax::PermissionTemplateAccess::MANAGE, Hyrax::PermissionTemplateAccess::DEPOSIT, Hyrax::PermissionTemplateAccess::VIEW)
     # @param ability [Ability] the cancan ability
+    # @param exclude_groups [Array<String>] name of groups to exclude from the results
     # @return [Hash] the where clause hash to pass to joins for groups
     # @note Several checks get the user's groups from the user's ability.  The same values can be retrieved directly from a passed in ability.
     #   If calling from Abilities, pass the ability.  If you try to get the ability from the user, you end up in an infinit loop.
-    def self.group_where(access:, ability:)
+    def self.group_where(access:, ability:, exclude_groups: [])
       where_clause = {}
       where_clause[:agent_type] = 'group'
-      where_clause[:agent_id] = ability.user_groups
+      where_clause[:agent_id] = ability.user_groups - exclude_groups
       where_clause[:access] = access
       where_clause
     end

data/app/models/proxy_deposit_request.rb

@@ -87,7 +87,7 @@ class ProxyDepositRequest < ActiveRecord::Base
   private
 
     def send_request_transfer_message_as_part_of_create
-      user_link = link_to(sending_user.name, Hyrax::Engine.routes.url_helpers.user_path(sending_user.user_key))
+      user_link = link_to(sending_user.name, Hyrax::Engine.routes.url_helpers.user_path(sending_user))
       transfer_link = link_to('transfer requests', Hyrax::Engine.routes.url_helpers.transfers_path)
       message = "#{user_link} wants to transfer a work to you. Review all #{transfer_link}"
       Hyrax::MessengerService.deliver(::User.batch_user, receiving_user, message, "Ownership Change Request")

data/app/presenters/hyrax/collection_presenter.rb

@@ -8,8 +8,6 @@ module Hyrax
     attr_accessor :parent_collections # This is expected to be a Blacklight::Solr::Response with all of the parent collections
     attr_writer :collection_type
 
-    NUM_PARENTS_TO_SHOW = 3
-
     class_attribute :create_work_presenter_class
     self.create_work_presenter_class = Hyrax::SelectTypeListPresenter
 
@@ -96,28 +94,6 @@ module Hyrax
       parent_collections.nil? ? 0 : parent_collections.documents.size
     end
 
-    # Of the number of parent collections shown on the current page, are there more to show?
-    def more_parent_collections?
-      parent_collection_count > NUM_PARENTS_TO_SHOW
-    end
-
-    # Are there few enough parent collections to use the more/less behavior?
-    def use_parent_more_less?
-      parent_collections.total_pages <= 1
-    end
-
-    # Returns a subset of parent collections that should be shown by default
-    def visible_parent_collections
-      return parent_collections.documents[0..NUM_PARENTS_TO_SHOW - 1] if more_parent_collections?
-      parent_collections && parent_collections.documents || []
-    end
-
-    # Returns the remaining subset of parent collections that should not be shown by default
-    def more_parent_collections
-      return parent_collections.documents[NUM_PARENTS_TO_SHOW..parent_collection_count - 1] if more_parent_collections?
-      []
-    end
-
     def user_can_nest_collection?
       current_ability.can?(:deposit, solr_document)
     end

data/app/presenters/hyrax/displays_image.rb

@@ -10,7 +10,7 @@ module Hyrax
     #
     # @return [IIIFManifest::DisplayImage] the display image required by the manifest builder.
     def display_image
-      return nil unless ::FileSet.exists?(id) && solr_document.image?
+      return nil unless ::FileSet.exists?(id) && solr_document.image? && current_ability.can?(:read, id)
       # @todo this is slow, find a better way (perhaps index iiif url):
       original_file = ::FileSet.find(id).original_file
 

data/app/presenters/hyrax/file_set_presenter.rb

@@ -65,7 +65,7 @@ module Hyrax
     end
 
     def stats_path
-      Hyrax::Engine.routes.url_helpers.stats_file_path(self)
+      Hyrax::Engine.routes.url_helpers.stats_file_path(self, locale: I18n.locale)
     end
 
     def events(size = 100)

data/app/presenters/hyrax/menu_presenter.rb

@@ -35,7 +35,7 @@ module Hyrax
       # we're using a case here because we need to differentiate UsersControllers
       # in different namespaces (Hyrax & Admin)
       case controller
-      when Hyrax::UsersController, Hyrax::NotificationsController, Hyrax::TransfersController
+      when Hyrax::UsersController, Hyrax::NotificationsController, Hyrax::TransfersController, Hyrax::DepositorsController
         true
       else
         false

data/app/presenters/hyrax/work_show_presenter.rb

@@ -28,7 +28,7 @@ module Hyrax
     end
 
     def page_title
-      title.first
+      "#{human_readable_type} | #{title.first} | ID: #{id} | #{I18n.t('hyrax.product_name')}"
     end
 
     # CurationConcern methods
@@ -57,10 +57,8 @@ module Hyrax
 
     # @return [Boolean] render the UniversalViewer
     def universal_viewer?
-      representative_id.present? &&
-        representative_presenter.present? &&
-        representative_presenter.image? &&
-        Hyrax.config.iiif_image_server?
+      Hyrax.config.iiif_image_server? &&
+        members_include_viewable_image?
     end
 
     # @return FileSetPresenter presenter for the representative FileSets
@@ -81,7 +79,7 @@ module Hyrax
     # Get presenters for the collections this work is a member of via the member_of_collections association.
     # @return [Array<CollectionPresenter>] presenters
     def member_of_collection_presenters
-      PresenterFactory.build_for(ids: member_of_collection_ids,
+      PresenterFactory.build_for(ids: member_of_authorized_parent_collections,
                                  presenter_class: collection_presenter_class,
                                  presenter_args: presenter_factory_arguments)
     end
@@ -145,7 +143,7 @@ module Hyrax
     end
 
     def stats_path
-      Hyrax::Engine.routes.url_helpers.stats_work_path(self)
+      Hyrax::Engine.routes.url_helpers.stats_work_path(self, locale: I18n.locale)
     end
 
     def model
@@ -194,9 +192,7 @@ module Hyrax
       end
 
       def featured?
-        if @featured.nil?
-          @featured = FeaturedWork.where(work_id: solr_document.id).exists?
-        end
+        @featured = FeaturedWork.where(work_id: solr_document.id).exists? if @featured.nil?
         @featured
       end
 
@@ -215,5 +211,14 @@ module Hyrax
       def graph
         GraphExporter.new(solr_document, request).fetch
       end
+
+      def member_of_authorized_parent_collections
+        # member_of_collection_ids with current_ability access
+        @member_of ||= Hyrax::CollectionMemberService.run(solr_document, current_ability).map(&:id)
+      end
+
+      def members_include_viewable_image?
+        file_set_presenters.any? { |presenter| presenter.image? && current_ability.can?(:read, presenter.id) }
+      end
   end
 end

data/app/search_builders/hyrax/abstract_type_relation.rb

@@ -16,7 +16,8 @@ module Hyrax
       clauses = allowable_types.map do |k|
         ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: k.to_s)
       end
-      clauses.size == 1 ? clauses.first : "(#{clauses.join(' OR ')})"
+      # empty array returns nil, AF finder method handles it properly, see hyrax issue #2844
+      clauses.size <= 1 ? clauses.first : "(#{clauses.join(' OR ')})"
     end
 
     class DummyModel

data/app/search_builders/hyrax/collection_member_search_builder.rb

@@ -5,7 +5,7 @@ module Hyrax
     attr_reader :collection, :search_includes_models
 
     class_attribute :collection_membership_field
-    self.collection_membership_field = 'nesting_collection__parent_ids_ssim'
+    self.collection_membership_field = 'member_of_collection_ids_ssim'
 
     # Defines which search_params_logic should be used when searching for Collection members
     self.default_processor_chain += [:member_of_collection]

data/app/search_builders/hyrax/dashboard/collections_search_builder.rb

@@ -35,7 +35,9 @@ module Hyrax
       private
 
         def collection_ids_for_deposit
-          Hyrax::Collections::PermissionsService.source_ids_for_deposit(ability: current_ability)
+          Hyrax::Collections::PermissionsService.source_ids_for_deposit(ability: current_ability,
+                                                                        exclude_groups: [::Ability.registered_group_name,
+                                                                                         ::Ability.public_group_name])
         end
     end
   end

data/app/search_builders/hyrax/parent_collection_search_builder.rb

@@ -3,10 +3,10 @@ module Hyrax
   class ParentCollectionSearchBuilder < Hyrax::CollectionSearchBuilder
     delegate :item, to: :scope
 
-    # include filters into the query to only include the collection memebers
+    # include filters into the query to only include the collections containing this item
     def include_item_ids(solr_parameters)
       solr_parameters[:fq] ||= []
-      solr_parameters[:fq] << "child_object_ids_ssim:#{item.id}"
+      solr_parameters[:fq] << ActiveFedora::SolrQueryBuilder.construct_query_for_ids(item.member_of_collection_ids)
     end
   end
 end

data/app/services/hyrax/admin_set_create_service.rb

@@ -72,9 +72,7 @@ module Hyrax
           { agent_type: 'group', agent_id: admin_group_name, access: Hyrax::PermissionTemplateAccess::MANAGE }
         ].tap do |attribute_list|
           # Grant manage access to the creating_user if it exists. Should exist for all but default Admin Set
-          if creating_user
-            attribute_list << { agent_type: 'user', agent_id: creating_user.user_key, access: Hyrax::PermissionTemplateAccess::MANAGE }
-          end
+          attribute_list << { agent_type: 'user', agent_id: creating_user.user_key, access: Hyrax::PermissionTemplateAccess::MANAGE } if creating_user
         end
       end
 

data/app/services/hyrax/analytics.rb

@@ -57,9 +57,7 @@ module Hyrax
     end
 
     def self.auth_client(scope)
-      unless File.exist?(config.privkey_path)
-        raise "Private key file for Google analytics was expected at '#{config.privkey_path}', but no file was found."
-      end
+      raise "Private key file for Google analytics was expected at '#{config.privkey_path}', but no file was found." unless File.exist?(config.privkey_path)
       private_key = File.read(config.privkey_path)
       Signet::OAuth2::Client.new token_credential_uri: 'https://accounts.google.com/o/oauth2/token',
                                  audience: 'https://accounts.google.com/o/oauth2/token',