sufia 7.1.0 → 7.2.0

data/app/controllers/my/highlights_controller.rb

@@ -16,7 +16,7 @@ module My
       end
 
       def query_solr
-        return empty_search_result if Sufia::TrophyPresenter.find_by_user(@user).count == 0
+        return empty_search_result if Sufia::TrophyPresenter.find_by_user(@user).count.zero?
         super
       end
 

data/app/controllers/stats_controller.rb

@@ -5,11 +5,11 @@ class StatsController < ApplicationController
   before_action :build_breadcrumbs, only: [:work, :file]
 
   def work
-    @stats = WorkUsage.new(params[:id])
+    @stats = Sufia::WorkUsage.new(params[:id])
   end
 
   def file
-    @stats = FileUsage.new(params[:id])
+    @stats = Sufia::FileUsage.new(params[:id])
   end
 
   protected

data/app/controllers/sufia/admin/admin_sets_controller.rb

@@ -0,0 +1,114 @@
+module Sufia
+  class Admin::AdminSetsController < ApplicationController
+    include CurationConcerns::CollectionsControllerBehavior
+
+    before_action :ensure_admin!
+    load_and_authorize_resource
+
+    layout 'admin'
+    self.presenter_class = Sufia::AdminSetPresenter
+    self.form_class = Sufia::Forms::AdminSetForm
+
+    # Used for the show action
+    self.single_item_search_builder_class = Sufia::SingleAdminSetSearchBuilder
+
+    # Used to get the members for the show action
+    self.member_search_builder_class = Sufia::AdminSetMemberSearchBuilder
+
+    # Used to get a list of admin sets for the index action
+    self.list_search_builder_class = CurationConcerns::AdminSetSearchBuilder
+
+    def show
+      add_breadcrumb t(:'sufia.controls.home'), root_path
+      add_breadcrumb t(:'sufia.toolbar.admin.menu'), sufia.admin_path
+      add_breadcrumb t(:'sufia.admin.sidebar.admin_sets'), sufia.admin_admin_sets_path
+      add_breadcrumb 'View Set', request.path
+      super
+    end
+
+    def index
+      add_breadcrumb t(:'sufia.controls.home'), root_path
+      add_breadcrumb t(:'sufia.toolbar.admin.menu'), sufia.admin_path
+      add_breadcrumb t(:'sufia.admin.sidebar.admin_sets'), sufia.admin_admin_sets_path
+      @admin_sets = CurationConcerns::AdminSetService.new(self).search_results(:read)
+    end
+
+    def new
+      setup_form
+    end
+
+    def edit
+      setup_form
+    end
+
+    def update
+      if @admin_set.update(admin_set_params)
+        redirect_to sufia.admin_admin_sets_path
+      else
+        setup_form
+        render :edit
+      end
+    end
+
+    def create
+      if create_admin_set
+        redirect_to sufia.admin_admin_sets_path
+      else
+        setup_form
+        render :new
+      end
+    end
+
+    # for the AdminSetService
+    def repository
+      repository_class.new(blacklight_config)
+    end
+
+    # Override the default prefixes so that we use the collection partals.
+    def self.local_prefixes
+      ["sufia/admin/admin_sets", "collections", 'catalog']
+    end
+
+    private
+
+      def ensure_admin!
+        # Even though the user can view this admin set, they may not be able to view
+        # it on the admin page.
+        authorize! :read, :admin_dashboard
+      end
+
+      # Overriding the way that the search builder is initialized
+      def list_search_builder
+        list_search_builder_class.new(self, :read)
+      end
+
+      def create_admin_set
+        AdminSetService.new(@admin_set, current_user).create
+      end
+
+      def setup_form
+        add_breadcrumb t(:'sufia.controls.home'), root_path
+        add_breadcrumb t(:'sufia.toolbar.admin.menu'), sufia.admin_path
+        add_breadcrumb t(:'sufia.admin.sidebar.admin_sets'), sufia.admin_admin_sets_path
+        add_breadcrumb action_breadcrumb, request.path
+        @form = form_class.new(@admin_set)
+      end
+
+      def action_breadcrumb
+        case action_name
+        when 'edit', 'update'
+          t(:'helpers.action.edit')
+        else
+          t(:'helpers.action.admin_set.new')
+        end
+      end
+
+      def admin_set_params
+        form_class.model_attributes(params[:admin_set])
+      end
+
+      def repository_class
+        blacklight_config.repository_class
+      end
+  end
+end

data/app/controllers/sufia/admin/features_controller.rb

@@ -0,0 +1,13 @@
+module Sufia
+  module Admin
+    class FeaturesController < Flipflop::FeaturesController
+      layout 'admin'
+      before_action do
+        authorize! :manage, Sufia::Feature
+        add_breadcrumb t(:'sufia.controls.home'), root_path
+        add_breadcrumb t(:'sufia.toolbar.admin.menu'), sufia.admin_path
+        add_breadcrumb t(:'sufia.admin.sidebar.settings'), sufia.admin_features_path
+      end
+    end
+  end
+end

data/app/controllers/sufia/admin/stats_controller.rb

@@ -0,0 +1,5 @@
+module Sufia
+  class Admin::StatsController < ApplicationController
+    include Sufia::Admin::StatsBehavior
+  end
+end

data/app/controllers/sufia/admin/strategies_controller.rb

@@ -0,0 +1,14 @@
+module Sufia
+  module Admin
+    class StrategiesController < Flipflop::StrategiesController
+      before_action do
+        authorize! :manage, Sufia::Feature
+      end
+
+      # TODO: we could remove this if we used an isolated engine
+      def features_url
+        sufia.admin_features_path
+      end
+    end
+  end
+end

data/app/controllers/sufia/admin_controller.rb

@@ -0,0 +1,11 @@
+module Sufia
+  class AdminController < ApplicationController
+    layout 'admin'
+    def show
+      authorize! :read, :admin_dashboard
+      add_breadcrumb t(:'sufia.controls.home'), root_path
+      add_breadcrumb t(:'sufia.toolbar.admin.menu'), sufia.admin_path
+      @presenter = AdminDashboardPresenter.new
+    end
+  end
+end

data/app/controllers/sufia/admin_sets_controller.rb

@@ -0,0 +1,25 @@
+module Sufia
+  class AdminSetsController < ApplicationController
+    include CurationConcerns::CollectionsControllerBehavior
+
+    self.presenter_class = Sufia::AdminSetPresenter
+
+    self.list_search_builder_class = CurationConcerns::AdminSetSearchBuilder
+    # Used for the show action
+    self.single_item_search_builder_class = Sufia::SingleAdminSetSearchBuilder
+    # Used to get the members for the show action
+    self.member_search_builder_class = Sufia::AdminSetMemberSearchBuilder
+
+    # Override the default prefixes so that we use the collection partals.
+    def self.local_prefixes
+      ["sufia/admin_sets", "collections", 'catalog']
+    end
+
+    private
+
+      # Overriding the way that the search builder is initialized
+      def list_search_builder
+        list_search_builder_class.new(self, :read)
+      end
+  end
+end

data/app/controllers/sufia/resource_sync_controller.rb

@@ -1,26 +1,14 @@
 class Sufia::ResourceSyncController < ApplicationController
   def source_description
-    # Caching based on host, for multitenancy support
-    body = Rails.cache.fetch("source_description_#{request.host}", expires_in: 1.week) do
-      build_source_description
-    end
-    render body: body, content_type: 'application/xml'
+    render_from_cache_as_xml(:source_description)
   end
 
   def capability_list
-    # Caching based on host, for multitenancy support
-    body = Rails.cache.fetch("source_description_#{request.host}", expires_in: 1.week) do
-      build_capability_list
-    end
-    render body: body, content_type: 'application/xml'
+    render_from_cache_as_xml(:capability_list)
   end
 
   def resource_list
-    # Caching based on host, for multitenancy support
-    body = Rails.cache.fetch("source_description_#{request.host}", expires_in: 1.week) do
-      build_resource_list
-    end
-    render body: body, content_type: 'application/xml'
+    render_from_cache_as_xml(:resource_list)
   end
 
   private
@@ -38,4 +26,12 @@ class Sufia::ResourceSyncController < ApplicationController
     def build_source_description
       Sufia::ResourceSync::SourceDescriptionWriter.new(capability_list_url: sufia.capability_list_url).write
     end
+
+    def render_from_cache_as_xml(resource_sync_type)
+      # Caching based on host, for multi-tenancy support
+      body = Rails.cache.fetch("#{resource_sync_type}_#{request.host}", expires_in: 1.week) do
+        send("build_#{resource_sync_type}")
+      end
+      render body: body, content_type: 'application/xml'
+    end
 end

data/app/forms/sufia/forms/admin_set_form.rb

@@ -0,0 +1,30 @@
+module Sufia
+  module Forms
+    class AdminSetForm < CurationConcerns::Forms::CollectionEditForm
+      self.model_class = AdminSet
+      self.terms = [:title, :description, :thumbnail_id]
+
+      # Cast any array values on the model to scalars.
+      def [](key)
+        return super if key == :thumbnail_id
+        super.first
+      end
+
+      class << self
+        # This determines whether the allowed parameters are single or multiple.
+        # By default it delegates to the model.
+        def multiple?(_term)
+          false
+        end
+
+        # Overriden to cast 'title' and 'description' to an array
+        def sanitize_params(form_params)
+          super.tap do |params|
+            params['title'] = Array.wrap(params['title']) if params.key?('title')
+            params['description'] = Array.wrap(params['description']) if params.key?('description')
+          end
+        end
+      end
+    end
+  end
+end

data/app/forms/sufia/forms/batch_edit_form.rb

@@ -31,7 +31,7 @@ module Sufia
             work = model_class.find(doc_id)
             terms.each do |key|
               combined_attributes[key] ||= []
-              combined_attributes[key] = (combined_attributes[key] + work[key]).uniq
+              combined_attributes[key] = (combined_attributes[key] + work[key].to_a).uniq
             end
             names << work.to_s
             permissions = (permissions + work.permissions).uniq

data/app/forms/sufia/forms/work_form.rb

@@ -9,7 +9,7 @@ module Sufia::Forms
 
     attr_reader :agreement_accepted
 
-    self.terms += [:collection_ids]
+    self.terms += [:collection_ids, :admin_set_id]
     self.required_fields = [:title, :creator, :keyword, :rights]
 
     def initialize(model, current_ability)
@@ -34,7 +34,7 @@ module Sufia::Forms
          :visibility_after_embargo, :visibility_during_lease,
          :lease_expiration_date, :visibility_after_lease, :visibility,
          :thumbnail_id, :representative_id, :ordered_member_ids,
-         :collection_ids, :in_works_ids]
+         :collection_ids, :in_works_ids, :admin_set_id]
     end
 
     # The ordered_members which are FileSet types

data/app/helpers/sufia/citations_behaviors/title_behavior.rb

@@ -8,7 +8,7 @@ module Sufia
 
       def chicago_citation_title(title_text)
         process_title_parts(title_text) do |w, index|
-          if (index == 0 && w.casecmp(w).zero?) || (w.length > 1 && w.casecmp(w).zero? && !EXPANDED_NOCAPS.include?(w))
+          if (index.zero? && w.casecmp(w).zero?) || (w.length > 1 && w.casecmp(w).zero? && !EXPANDED_NOCAPS.include?(w))
             # the split("-") will handle the capitalization of hyphenated words
             w.split("-").map!(&:capitalize).join("-")
           else

data/app/helpers/sufia/dashboard_helper_behavior.rb

@@ -42,14 +42,20 @@ module Sufia
 
     def number_of_works(user = current_user)
       CurationConcerns::WorkRelation.new.where(DepositSearchBuilder.depositor_field => user.user_key).count
+    rescue RSolr::Error::ConnectionRefused
+      'n/a'
     end
 
     def number_of_files(user = current_user)
       ::FileSet.where(DepositSearchBuilder.depositor_field => user.user_key).count
+    rescue RSolr::Error::ConnectionRefused
+      'n/a'
     end
 
     def number_of_collections(user = current_user)
       ::Collection.where(DepositSearchBuilder.depositor_field => user.user_key).count
+    rescue RSolr::Error::ConnectionRefused
+      'n/a'
     end
 
     def notifications_for_dashboard

data/app/helpers/sufia/permissions_helper.rb

@@ -0,0 +1,19 @@
+module Sufia
+  module PermissionsHelper
+    def help_text(file)
+      capture_content(file)
+    end
+
+    private
+
+      def capture_content(file)
+        capture do
+          render file
+        end
+      end
+
+      def help_icon
+        content_tag 'i', '', 'aria-hidden' => true, class: 'help-icon'
+      end
+  end
+end

data/app/helpers/sufia/sufia_helper_behavior.rb

@@ -2,6 +2,7 @@ module Sufia
   module SufiaHelperBehavior
     include Sufia::CitationsBehavior
     include ERB::Util # provides html_escape
+    extend Deprecation
 
     def application_name
       t('sufia.product_name', default: super)
@@ -61,10 +62,6 @@ module Sufia
       !params[:cq].blank?
     end
 
-    def number_of_deposits(user)
-      ActiveFedora::Base.where(DepositSearchBuilder.depositor_field => user.user_key).count
-    end
-
     # @param item [Object]
     # @param field [String]
     # @return [ActiveSupport::SafeBuffer] the html_safe link
@@ -104,7 +101,8 @@ module Sufia
     # @see #index_field_link params
     # @return [Date]
     def human_readable_date(options)
-      Date.parse(options[:value]).to_formatted_s(:standard)
+      value = options[:value].first
+      Date.parse(value).to_formatted_s(:standard)
     end
 
     # A Blacklight helper_method
@@ -165,7 +163,16 @@ module Sufia
     # @param [Hash] options from blacklight helper_method invocation. Maps rights URIs to links with labels.
     # @return [ActiveSupport::SafeBuffer] rights statement links, html_safe
     def rights_statement_links(options)
-      options[:value].map { |right| link_to RightsService.label(right), right }.to_sentence.html_safe
+      license_links(options)
+    end
+    deprecation_deprecate rights_statement_links: "use licence_links instead"
+
+    # A Blacklight helper_method
+    # @param [Hash] options from blacklight helper_method invocation. Maps rights URIs to links with labels.
+    # @return [ActiveSupport::SafeBuffer] rights statement links, html_safe
+    def license_links(options)
+      service = CurationConcerns::LicenseService.new
+      options[:value].map { |right| link_to service.label(right), right }.to_sentence.html_safe
     end
 
     def link_to_telephone(user)

data/app/indexers/sufia/work_indexer.rb

@@ -8,6 +8,10 @@ module Sufia
         # when a work in the collection matches the query.
         solr_doc[Solrizer.solr_name('file_set_ids', :symbol)] = solr_doc[Solrizer.solr_name('member_ids', :symbol)]
         solr_doc[Solrizer.solr_name('resource_type', :facetable)] = object.resource_type
+
+        admin_set_label = object.admin_set.to_s
+        solr_doc[Solrizer.solr_name('admin_set', :facetable)] = admin_set_label
+        solr_doc[Solrizer.solr_name('admin_set', :stored_searchable)] = admin_set_label
       end
     end
   end

data/app/jobs/attach_files_to_work_job.rb

@@ -9,7 +9,9 @@ class AttachFilesToWorkJob < ActiveJob::Base
       file_set = FileSet.new
       user = User.find_by_user_key(work.depositor)
       actor = CurationConcerns::Actors::FileSetActor.new(file_set, user)
-      actor.create_metadata(work, visibility: work.visibility)
+      actor.create_metadata(work, visibility: work.visibility) do |file|
+        file.permissions_attributes = work.permissions.map(&:to_hash)
+      end
 
       attach_content(actor, uploaded_file.file)
       uploaded_file.update(file_set_uri: file_set.uri)