sufia 7.0.0.beta3 → 7.0.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 425e77caaca484e6386192bbda30de4535f2e3c7
-  data.tar.gz: b0bf0312c34896bfe6d74bec79edaa4291ba20e3
+  metadata.gz: 8e48d49a101fe907425b8153aa726ea8643f897d
+  data.tar.gz: 43cc5a32c71d57f9b013c7ab253d9072c3e41f10
 SHA512:
-  metadata.gz: a81ac16b3e74bd6f433903f9b595afabda03f6a1a9dd9674f844fb758ff069428e9e917ee8b46f16b28446cd7550e203390502f1e20d7331f65a57b3637bc1e7
-  data.tar.gz: 0ec61fb29710436341b2d47d6601c610ff4ad02e545f69aa3a913134e0374d97ef9ca9c044d1ae59c66668bde59c385f2ba3f9cbea55b991dc171c0dea4ff8e1
+  metadata.gz: cec16b9098ee70db08ab1e3b728884c34b8bb7c967992c6af08ea01720eb20f2f8650e203bc63cfbc505587f79cc1fd8218e7c75764758fe0313e2fef5616144
+  data.tar.gz: dab357b2da1216878cd10d0b45a3063ce500c0363bd4729dbc841356b38e0abdfe2432f83d09636db7dd5520ea2c3e1d1c28619fd946335edcbd4238e08b4e34

data/.rubocop.yml

@@ -1,6 +1,7 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
+  TargetRubyVersion: 2.1
   DisplayCopNames: true
   Include:
     - '**/Rakefile'
@@ -81,3 +82,12 @@ Style/SingleLineBlockParams:
 
 Rails:
   Enabled: true
+
+RSpec/DescribeClass:
+  Exclude:
+    - 'spec/tasks/rake_spec.rb'
+    - 'spec/javascripts/jasmine_spec.rb'
+    - 'spec/features/**/*'
+    - 'spec/config/sufia_events_spec.rb'
+
+

data/.rubocop_todo.yml

@@ -1,3 +1,5 @@
+require: rubocop-rspec
+
 Metrics/CyclomaticComplexity:
   Exclude:
     - 'lib/sufia/arkivo/metadata_munger.rb'
@@ -26,10 +28,6 @@ Metrics/MethodLength:
     - 'lib/generators/sufia/install_generator.rb'
     - 'lib/sufia/arkivo/metadata_munger.rb'
 
-Style/HashSyntax:
-  Exclude:
-    - 'lib/generators/sufia/templates/catalog_controller.rb'
-
 Style/LineEndConcatenation:
   Exclude:
     - 'spec/test_app_templates/lib/generators/**/*'
@@ -38,7 +36,6 @@ Style/LineEndConcatenation:
 Style/PredicateName:
   Exclude:
     - 'app/helpers/sufia/sufia_helper_behavior.rb'
-    - 'app/controllers/concerns/sufia/controller.rb'
 
 Rails/Output:
   Exclude:
@@ -50,6 +47,68 @@ Rails/HasAndBelongsToMany:
     - 'app/models/domain_term.rb'
     - 'app/models/local_authority.rb'
 
-Lint/HandleExceptions:
+RSpec/ExampleLength:
+  Max: 7 
   Exclude:
-    - 'lib/sufia/engine.rb'
+    - 'spec/controllers/api/items_controller_spec.rb'
+    - 'spec/controllers/authorities_controller_spec.rb'
+    - 'spec/controllers/collections_controller_spec.rb'
+    - 'spec/controllers/curation_concerns/file_sets_controller_spec.rb'
+    - 'spec/controllers/my/highlights_controller_spec.rb'
+    - 'spec/controllers/curation_concerns/generic_works_controller_spec.rb'
+    - 'spec/controllers/stats_controller_spec.rb'
+    - 'spec/controllers/sufia/batch_uploads_controller_spec.rb'
+    - 'spec/controllers/transfers_controller_spec.rb'
+    - 'spec/controllers/users_controller_spec.rb'
+    - 'spec/forms/sufia/forms/collection_form_spec.rb'
+    - 'spec/forms/sufia/forms/batch_edit_form_spec.rb'
+    - 'spec/forms/sufia/forms/batch_upload_form_spec.rb'
+    - 'spec/features/**/*'
+    - 'spec/helpers/sufia_helper_spec.rb'
+    - 'spec/helpers/dashboard_helper_spec.rb'
+    - 'spec/javascripts/jasmine_spec.rb'
+    - 'spec/jobs/user_unfollow_event_job_spec.rb'
+    - 'spec/jobs/user_follow_event_job_spec.rb'
+    - 'spec/jobs/file_set_attached_event_job_spec.rb'
+    - 'spec/jobs/content_update_event_job_spec.rb'
+    - 'spec/jobs/content_restored_version_event_job_spec.rb'
+    - 'spec/jobs/content_new_version_event_job_spec.rb'
+    - 'spec/jobs/content_depositor_change_event_job_spec.rb'
+    - 'spec/jobs/content_deposit_event_job_spec.rb'
+    - 'spec/jobs/content_delete_event_job_spec.rb'
+    - 'spec/lib/sufia/user_stat_importer_spec.rb'
+    - 'spec/lib/sufia/resource_sync/capability_list_writer_spec.rb'
+    - 'spec/models/generic_work_spec.rb'
+    - 'spec/models/featured_work_spec.rb'
+    - 'spec/services/sufia/actor_factory_spec.rb'
+    - 'spec/views/catalog/_index_list_default.html.erb_spec.rb'
+    - 'spec/views/collections/_form.html.erb_spec.rb'
+
+RSpec/VerifiedDoubles:
+  Enabled: false
+
+RSpec/AnyInstance:
+  Exclude:
+    - 'spec/controllers/api/items_controller_spec.rb'
+    - 'spec/controllers/api/zotero_controller_spec.rb'
+    - 'spec/controllers/batch_edits_controller_spec.rb'
+    - 'spec/controllers/collections_controller_spec.rb'
+    - 'spec/controllers/dashboard_controller_spec.rb'
+    - 'spec/controllers/downloads_controller_spec.rb'
+    - 'spec/controllers/mailbox_controller_spec.rb'
+    - 'spec/controllers/stats_controller_spec.rb'
+    - 'spec/controllers/curation_concerns/file_sets_controller_spec.rb'
+    - 'spec/controllers/users_controller_spec.rb'
+    - 'spec/controllers/transfers_controller_spec.rb'
+    - 'spec/jobs/file_set_attached_event_job_spec.rb'
+    - 'spec/jobs/content_update_event_job_spec.rb'
+    - 'spec/jobs/content_restored_version_event_job_spec.rb'
+    - 'spec/jobs/content_new_version_event_job_spec.rb'
+    - 'spec/jobs/content_depositor_change_event_job_spec.rb'
+    - 'spec/jobs/content_deposit_event_job_spec.rb'
+    - 'spec/lib/sufia/arkivo/create_subscription_job_spec.rb'
+    - 'spec/lib/sufia/arkivo/actor_spec.rb'
+    - 'spec/presenters/sufia/work_usage_spec.rb'
+    - 'spec/presenters/sufia/file_usage_spec.rb'
+    - 'spec/services/sufia/repository_audit_service_spec.rb'
+

data/app/controllers/concerns/sufia/batch_uploads_controller_behavior.rb

@@ -7,7 +7,6 @@ module Sufia
     included do
       layout "sufia-one-column"
       self.curation_concern_type = GenericWork
-      before_action :has_access?
     end
 
     def create

data/app/controllers/concerns/sufia/collections_controller_behavior.rb

@@ -4,7 +4,6 @@ module Sufia
     include Sufia::Breadcrumbs
 
     included do
-      before_action :has_access?, except: :show
       before_action :build_breadcrumbs, only: [:edit, :show]
       layout "sufia-one-column"
       # include the link_to_remove_from_collection view helper methods

data/app/controllers/concerns/sufia/contact_form_controller_behavior.rb

@@ -8,7 +8,7 @@ module Sufia
       @contact_form = ContactForm.new(params[:contact_form])
       @contact_form.request = request
       # not spam and a valid form
-      if @contact_form.respond_to?(:deliver_now) ? @contact_form.deliver_now : @contact_form.deliver
+      if @contact_form.deliver
         flash.now[:notice] = 'Thank you for your message!'
         after_deliver
         @contact_form = ContactForm.new
@@ -17,13 +17,16 @@ module Sufia
         flash.now[:error] << @contact_form.errors.full_messages.map(&:to_s).join(",")
       end
       render :new
-    rescue
+    rescue RuntimeError => e
+      logger.error("Contact form failed to send: #{e.inspect}")
       flash.now[:error] = 'Sorry, this message was not delivered.'
       render :new
     end
 
+    # Override this method if you want to perform additional operations
+    # when a email is successfully sent, such as sending a confirmation
+    # response to the user.
     def after_deliver
-      return unless Sufia::Engine.config.enable_contact_form_delivery
     end
   end
 end

data/app/controllers/concerns/sufia/controller.rb

@@ -14,11 +14,4 @@ module Sufia::Controller
   def after_sign_in_path_for(_resource)
     sufia.dashboard_index_path
   end
-
-  protected
-
-    ### Hook which is overridden in Sufia::Ldap::Controller
-    def has_access?
-      true
-    end
 end

data/app/controllers/concerns/sufia/file_sets_controller_behavior.rb

@@ -39,7 +39,7 @@ module Sufia
       when 'edit'.freeze
         add_breadcrumb I18n.t("sufia.file_set.browse_view"), main_app.curation_concerns_file_set_path(params["id"])
       when 'show'.freeze
-        add_breadcrumb presenter.parent.to_s, sufia.polymorphic_path(presenter.parent)
+        add_breadcrumb presenter.parent.to_s, main_app.polymorphic_path(presenter.parent)
         add_breadcrumb presenter.to_s, main_app.polymorphic_path(presenter)
       end
     end

data/app/controllers/concerns/sufia/uploads_controller_behavior.rb

@@ -0,0 +1,18 @@
+module Sufia::UploadsControllerBehavior
+  extend ActiveSupport::Concern
+
+  included do
+    load_and_authorize_resource class: Sufia::UploadedFile
+  end
+
+  def create
+    @upload.attributes = { file: params[:files].first,
+                           user: current_user }
+    @upload.save!
+  end
+
+  def destroy
+    @upload.destroy
+    head :no_content
+  end
+end

data/app/controllers/concerns/sufia/users_controller_behavior.rb

@@ -28,14 +28,7 @@ module Sufia::UsersControllerBehavior
 
   # Display user profile
   def show
-    @events = if @user.respond_to? :profile_events
-                @user.profile_events(100)
-              else
-                []
-              end
-    @trophies = @user.trophy_works
-    @followers = @user.followers
-    @following = @user.all_following
+    @presenter = Sufia::UserProfilePresenter.new(@user, current_ability)
   end
 
   # Display form for users to edit their profile information
@@ -67,23 +60,6 @@ module Sufia::UsersControllerBehavior
     ['1', 'true'].include? params[:user][:update_directory]
   end
 
-  def toggle_trophy
-    work_id = params[:work_id]
-    unless current_user.can? :edit, work_id
-      redirect_to root_path, alert: "You do not have permissions to the work"
-      return false
-    end
-    t = current_user.trophies.where(work_id: work_id).first
-    if t
-      t.destroy
-      return false if t.persisted?
-    else
-      t = current_user.trophies.create(work_id: work_id)
-      return false unless t.persisted?
-    end
-    render json: t
-  end
-
   # Follow a user
   def follow
     unless current_user.following?(@user)

data/app/controllers/concerns/sufia/works_controller_behavior.rb

@@ -6,7 +6,6 @@ module Sufia
     include CurationConcerns::CurationConcernController
 
     included do
-      before_action :has_access?, except: :show
       before_action :build_breadcrumbs, only: [:edit, :show]
       self.curation_concern_type = GenericWork
       self.show_presenter = Sufia::WorkShowPresenter
@@ -18,43 +17,43 @@ module Sufia
       super
     end
 
-    # Override the default behavior from curation_concerns in order to add uploaded_files to the parameters received by the actor.
-    def attributes_for_actor
-      attributes = super
-      # If they selected a BrowseEverything file, but then clicked the
-      # remove button, it will still show up in `selected_files`, but
-      # it will no longer be in uploaded_files. By checking the
-      # intersection, we get the files they added via BrowseEverything
-      # that they have not removed from the upload widget.
-      uploaded_files = params.fetch(:uploaded_files, [])
-      selected_files = params.fetch(:selected_files, {}).values
-      browse_everything_urls = uploaded_files &
-                               selected_files.map { |f| f[:url] }
+    protected
 
-      # we need the hash of files with url and file_name
-      browse_everything_files = selected_files
-                                .select { |v| uploaded_files.include?(v[:url]) }
+      # Override the default behavior from curation_concerns in order to add uploaded_files to the parameters received by the actor.
+      def attributes_for_actor
+        attributes = super
+        # If they selected a BrowseEverything file, but then clicked the
+        # remove button, it will still show up in `selected_files`, but
+        # it will no longer be in uploaded_files. By checking the
+        # intersection, we get the files they added via BrowseEverything
+        # that they have not removed from the upload widget.
+        uploaded_files = params.fetch(:uploaded_files, [])
+        selected_files = params.fetch(:selected_files, {}).values
+        browse_everything_urls = uploaded_files &
+                                 selected_files.map { |f| f[:url] }
 
-      attributes[:remote_files] = browse_everything_files
-      # Strip out any BrowseEverthing files from the regular uploads.
-      attributes[:uploaded_files] = uploaded_files -
-                                    browse_everything_urls
-      attributes
-    end
+        # we need the hash of files with url and file_name
+        browse_everything_files = selected_files
+                                  .select { |v| uploaded_files.include?(v[:url]) }
 
-    def after_create_response
-      respond_to do |wants|
-        wants.html do
-          flash[:notice] = t('sufia.generic_works.new.after_create_html', application_name: view_context.application_name)
-          redirect_to [main_app, curation_concern]
-        end
-        wants.json { render :show, status: :created, location: polymorphic_path([main_app, curation_concern]) }
+        attributes[:remote_files] = browse_everything_files
+        # Strip out any BrowseEverthing files from the regular uploads.
+        attributes[:uploaded_files] = uploaded_files -
+                                      browse_everything_urls
+        attributes
       end
-    end
 
-    protected
+      def after_create_response
+        respond_to do |wants|
+          wants.html do
+            flash[:notice] = t('sufia.generic_works.new.after_create_html', application_name: view_context.application_name)
+            redirect_to [main_app, curation_concern]
+          end
+          wants.json { render :show, status: :created, location: polymorphic_path([main_app, curation_concern]) }
+        end
+      end
 
-      # Called by CurationConcerns::FileSetsControllerBehavior#show
+      # Called by CurationConcerns::CurationConcernController#show
       def additional_response_formats(format)
         format.endnote { render text: presenter.solr_document.export_as_endnote }
       end

data/app/controllers/curation_concerns/audits_controller.rb

@@ -1,6 +1,5 @@
 class CurationConcerns::AuditsController < ApplicationController
   before_action :authenticate_user!
-  before_action :has_access?
 
   def create
     render json: audit_service.audit

data/app/controllers/sufia/resource_sync_controller.rb

@@ -0,0 +1,41 @@
+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'
+  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'
+  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'
+  end
+
+  private
+
+    def build_resource_list
+      Sufia::ResourceSync::ResourceListWriter.new(capability_list_url: sufia.capability_list_url,
+                                                  resource_host: request.host).write
+    end
+
+    def build_capability_list
+      Sufia::ResourceSync::CapabilityListWriter.new(resource_list_url: sufia.resource_list_url,
+                                                    description_url: sufia.source_description_url).write
+    end
+
+    def build_source_description
+      Sufia::ResourceSync::SourceDescriptionWriter.new(capability_list_url: sufia.capability_list_url).write
+    end
+end

data/app/controllers/sufia/trophies_controller.rb

@@ -0,0 +1,17 @@
+module Sufia
+  class TrophiesController < ApplicationController
+    def toggle_trophy
+      work_id = params[:id]
+      authorize! :edit, work_id
+      t = current_user.trophies.where(work_id: work_id).first
+      if t
+        t.destroy
+        return false if t.persisted?
+      else
+        t = current_user.trophies.create(work_id: work_id)
+        return false unless t.persisted?
+      end
+      render json: t
+    end
+  end
+end

data/app/controllers/sufia/uploads_controller.rb

@@ -1,16 +1,5 @@
 module Sufia
   class UploadsController < ApplicationController
-    load_and_authorize_resource class: UploadedFile
-
-    def create
-      @upload.attributes = { file: params[:files].first,
-                             user: current_user }
-      @upload.save!
-    end
-
-    def destroy
-      @upload.destroy
-      head :no_content
-    end
+    include Sufia::UploadsControllerBehavior
   end
 end

data/app/helpers/sufia/sufia_helper_behavior.rb

@@ -91,6 +91,18 @@ module Sufia
       link_to(label, main_app.search_catalog_path(state))
     end
 
+    def index_field_link(options = {})
+      field_name = options[:config][:field_name]
+      values = options[:value]
+      safe_join(values.map { |item| link_to_index_field(item, field_name) }, ", ")
+    end
+
+    def link_to_index_field(name, value)
+      params = { search_field: 'advanced', name => "\"#{value}\"" }
+      state = search_state.params_for_search(params)
+      link_to(name, main_app.search_catalog_path(state))
+    end
+
     # @param [String,Hash] text either the string to escape or a hash containing the
     #                           string to escape under the :value key.
     def iconify_auto_link(text, showLink = true)
@@ -128,9 +140,9 @@ module Sufia
       options[:value].map { |right| link_to RightsService.label(right), right }.to_sentence.html_safe
     end
 
-    def link_to_telephone(user = nil)
-      @user ||= user
-      link_to @user.telephone, "wtai://wp/mc;#{@user.telephone}" if @user.telephone
+    def link_to_telephone(user)
+      return unless user
+      link_to user.telephone, "wtai://wp/mc;#{user.telephone}" if user.telephone
     end
 
     # Only display the current search parameters if the user is not in the dashboard.