hyrax 2.8.0 → 3.0.0.pre.rc2

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   class Admin::StatsController < ApplicationController
     include Hyrax::Admin::StatsBehavior

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   module Admin
     class StrategiesController < Flipflop::StrategiesController

data/app/controllers/hyrax/admin/users_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   class Admin::UsersController < ApplicationController
     include Hyrax::Admin::UsersControllerBehavior

data/app/controllers/hyrax/admin/workflow_roles_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   module Admin
     class WorkflowRolesController < ApplicationController
@@ -31,9 +32,9 @@ module Hyrax
 
       private
 
-        def require_permissions
-          authorize! :read, :admin_dashboard
-        end
+      def require_permissions
+        authorize! :read, :admin_dashboard
+      end
     end
   end
 end

data/app/controllers/hyrax/admin/workflows_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   # Presents a list of works in workflow
   class Admin::WorkflowsController < ApplicationController
@@ -20,8 +21,8 @@ module Hyrax
 
     private
 
-      def ensure_authorized!
-        authorize! :review, :submissions
-      end
+    def ensure_authorized!
+      authorize! :review, :submissions
+    end
   end
 end

data/app/controllers/hyrax/api/items_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   module API
     # Adds an endpoint that consumes and RESTfully emits JSON from Arkivo
@@ -31,48 +32,48 @@ module Hyrax
 
       private
 
-        def my_load_and_authorize_resource
-          @work = Hyrax::WorkRelation.new.find(params[:id])
+      def my_load_and_authorize_resource
+        @work = Hyrax::WorkRelation.new.find(params[:id])
 
-          return render plain: "#{user} lacks access to #{@work}", status: :unauthorized unless user.can? :edit, @work
+        return render plain: "#{user} lacks access to #{@work}", status: :unauthorized unless user.can? :edit, @work
 
-          return render plain: "Forbidden: #{@work} not deposited via Arkivo", status: :forbidden if @work.arkivo_checksum.nil?
-        rescue ActiveFedora::ObjectNotFoundError
-          return render plain: "id '#{params[:id]}' not found", status: :not_found
-        end
+        return render plain: "Forbidden: #{@work} not deposited via Arkivo", status: :forbidden if @work.arkivo_checksum.nil?
+      rescue ActiveFedora::ObjectNotFoundError
+        render plain: "id '#{params[:id]}' not found", status: :not_found
+      end
 
-        def actor
-          Hyrax::Arkivo::Actor.new(user, item)
-        end
+      def actor
+        Hyrax::Arkivo::Actor.new(user, item)
+      end
 
-        def token
-          request.get? || request.delete? ? params[:token] : item['token']
-        end
+      def token
+        request.get? || request.delete? ? params[:token] : item['token']
+      end
 
-        def user
-          ::User.find_by(arkivo_token: token)
-        end
+      def user
+        ::User.find_by(arkivo_token: token)
+      end
 
-        def validate_item
-          return render plain: 'no item parameter', status: :bad_request if post_data.blank?
-          Hyrax::Arkivo::SchemaValidator.new(post_data).call
-        rescue Hyrax::Arkivo::InvalidItem => exception
-          return render plain: "invalid item parameter: #{exception.message}", status: :bad_request
-        else
-          @item = JSON.parse(post_data)
-        end
+      def validate_item
+        return render plain: 'no item parameter', status: :bad_request if post_data.blank?
+        Hyrax::Arkivo::SchemaValidator.new(post_data).call
+      rescue Hyrax::Arkivo::InvalidItem => exception
+        render plain: "invalid item parameter: #{exception.message}", status: :bad_request
+      else
+        @item = JSON.parse(post_data)
+      end
 
-        def post_data
-          request.raw_post
-        end
+      def post_data
+        request.raw_post
+      end
 
-        def authorize_token
-          render plain: "invalid user token: #{token}", status: :unauthorized unless valid_token?
-        end
+      def authorize_token
+        render plain: "invalid user token: #{token}", status: :unauthorized unless valid_token?
+      end
 
-        def valid_token?
-          user.present?
-        end
+      def valid_token?
+        user.present?
+      end
     end
   end
 end

data/app/controllers/hyrax/api/zotero_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'oauth'
 
 module Hyrax
@@ -34,52 +35,52 @@ module Hyrax
 
       private
 
-        def authorize_user!
-          authorize! :create, Hyrax.primary_work_type
-        rescue CanCan::AccessDenied
-          return redirect_to root_url, alert: 'You are not authorized to perform this operation'
-        end
+      def authorize_user!
+        authorize! :create, Hyrax.primary_work_type
+      rescue CanCan::AccessDenied
+        redirect_to root_url, alert: 'You are not authorized to perform this operation'
+      end
 
-        def validate_params
-          if malformed_request?
-            redirect_to hyrax.edit_dashboard_profile_path(current_user.to_param),
-                        alert: "Malformed request from Zotero"
-          elsif invalid_token?
-            redirect_to hyrax.edit_dashboard_profile_path(current_user.to_param),
-                        alert: "You have not yet connected to Zotero"
-          end
+      def validate_params
+        if malformed_request?
+          redirect_to hyrax.edit_dashboard_profile_path(current_user.to_param),
+                      alert: "Malformed request from Zotero"
+        elsif invalid_token?
+          redirect_to hyrax.edit_dashboard_profile_path(current_user.to_param),
+                      alert: "You have not yet connected to Zotero"
         end
+      end
 
-        def malformed_request?
-          params[:oauth_token].blank? || params[:oauth_verifier].blank?
-        end
+      def malformed_request?
+        params[:oauth_token].blank? || params[:oauth_verifier].blank?
+      end
 
-        def invalid_token?
-          !current_token || current_token.params[:oauth_token] != params[:oauth_token]
-        end
+      def invalid_token?
+        !current_token || current_token.params[:oauth_token] != params[:oauth_token]
+      end
 
-        def client
-          ::OAuth::Consumer.new(Hyrax::Zotero.config['client_key'], Hyrax::Zotero.config['client_secret'], options)
-        end
+      def client
+        ::OAuth::Consumer.new(Hyrax::Zotero.config['client_key'], Hyrax::Zotero.config['client_secret'], options)
+      end
 
-        def current_token
-          current_user.zotero_token
-        end
+      def current_token
+        current_user.zotero_token
+      end
 
-        def callback_url
-          "#{request.base_url}/api/zotero/callback"
-        end
+      def callback_url
+        "#{request.base_url}/api/zotero/callback"
+      end
 
-        def options
-          {
-            site: 'https://www.zotero.org',
-            scheme: :query_string,
-            http_method: :get,
-            request_token_path: '/oauth/request',
-            access_token_path: '/oauth/access',
-            authorize_path: '/oauth/authorize'
-          }
-        end
+      def options
+        {
+          site: 'https://www.zotero.org',
+          scheme: :query_string,
+          http_method: :get,
+          request_token_path: '/oauth/request',
+          access_token_path: '/oauth/access',
+          authorize_path: '/oauth/authorize'
+        }
+      end
     end
   end
 end

data/app/controllers/hyrax/batch_edits_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   class BatchEditsController < ApplicationController
     include FileSetHelper
@@ -38,7 +39,7 @@ module Hyrax
 
     def destroy_collection
       batch.each do |doc_id|
-        obj = ActiveFedora::Base.find(doc_id, cast: true)
+        obj = Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: doc_id, use_valkyrie: false)
         obj.destroy
       end
       flash[:notice] = "Batch delete complete"
@@ -50,14 +51,7 @@ module Hyrax
       obj.attributes = work_params(admin_set_id: obj.admin_set_id).except(*visibility_params)
       obj.date_modified = Time.current.ctime
 
-      if params[:visibility]
-        Deprecation.warn(self, "visibility is not submitted by the Hyrax UI and is deprecated " \
-                               "for removal in Hyrax 3.0. Please use " \
-                               "#{form_class.model_name.param_key}[visibility] instead.")
-        obj.visibility = params[:visibility]
-      end
-
-      InheritPermissionsJob.perform_now(obj)
+      InheritPermissionsJob.perform_now(obj, use_valkyrie: false)
       VisibilityCopyJob.perform_now(obj)
 
       obj.save
@@ -67,7 +61,7 @@ module Hyrax
       case params["update_type"]
       when "update"
         batch.each do |doc_id|
-          update_document(ActiveFedora::Base.find(doc_id))
+          update_document(Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: doc_id, use_valkyrie: false))
         end
         flash[:notice] = "Batch update complete"
         after_update
@@ -78,59 +72,59 @@ module Hyrax
 
     private
 
-      def add_breadcrumb_for_controller
-        add_breadcrumb I18n.t('hyrax.dashboard.my.works'), hyrax.my_works_path
-      end
+    def add_breadcrumb_for_controller
+      add_breadcrumb I18n.t('hyrax.dashboard.my.works'), hyrax.my_works_path
+    end
 
-      def _prefixes
-        # This allows us to use the templates in hyrax/base, while prefering
-        # our local paths. Thus we are unable to just override `self.local_prefixes`
-        @_prefixes ||= super + ['hyrax/base']
-      end
+    def _prefixes
+      # This allows us to use the templates in hyrax/base, while prefering
+      # our local paths. Thus we are unable to just override `self.local_prefixes`
+      @_prefixes ||= super + ['hyrax/base']
+    end
 
-      def destroy_batch
-        batch.each { |id| ActiveFedora::Base.find(id).destroy }
-        after_update
-      end
+    def destroy_batch
+      batch.each { |id| Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: id, use_valkyrie: false).destroy }
+      after_update
+    end
 
-      def form_class
-        Forms::BatchEditForm
-      end
+    def form_class
+      Forms::BatchEditForm
+    end
 
-      def terms
-        form_class.terms
-      end
+    def terms
+      form_class.terms
+    end
 
-      def work_params(extra_params = {})
-        work_params = params[form_class.model_name.param_key] || ActionController::Parameters.new
-        form_class.model_attributes(work_params.merge(extra_params))
-      end
+    def work_params(extra_params = {})
+      work_params = params[form_class.model_name.param_key] || ActionController::Parameters.new
+      form_class.model_attributes(work_params.merge(extra_params))
+    end
 
-      def interpret_visiblity_params(obj)
-        stack = ActionDispatch::MiddlewareStack.new.tap do |middleware|
-          middleware.use Hyrax::Actors::InterpretVisibilityActor
-        end
-        env = Hyrax::Actors::Environment.new(obj, current_ability, work_params(admin_set_id: obj.admin_set_id))
-        last_actor = Hyrax::Actors::Terminator.new
-        stack.build(last_actor).update(env)
+    def interpret_visiblity_params(obj)
+      stack = ActionDispatch::MiddlewareStack.new.tap do |middleware|
+        middleware.use Hyrax::Actors::InterpretVisibilityActor
       end
+      env = Hyrax::Actors::Environment.new(obj, current_ability, work_params(admin_set_id: obj.admin_set_id))
+      last_actor = Hyrax::Actors::Terminator.new
+      stack.build(last_actor).update(env)
+    end
 
-      def visibility_params
-        ['visibility',
-         'lease_expiration_date',
-         'visibility_during_lease',
-         'visibility_after_lease',
-         'embargo_release_date',
-         'visibility_during_embargo',
-         'visibility_after_embargo']
-      end
+    def visibility_params
+      ['visibility',
+       'lease_expiration_date',
+       'visibility_during_lease',
+       'visibility_after_lease',
+       'embargo_release_date',
+       'visibility_during_embargo',
+       'visibility_after_embargo']
+    end
 
-      def redirect_to_return_controller
-        if params[:return_controller]
-          redirect_to hyrax.url_for(controller: params[:return_controller], only_path: true)
-        else
-          redirect_to hyrax.dashboard_path
-        end
+    def redirect_to_return_controller
+      if params[:return_controller]
+        redirect_to hyrax.url_for(controller: params[:return_controller], only_path: true)
+      else
+        redirect_to hyrax.dashboard_path
       end
+    end
   end
 end

data/app/controllers/hyrax/batch_uploads_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   class BatchUploadsController < ApplicationController
     include Hydra::Controller::ControllerBehavior
@@ -31,63 +32,63 @@ module Hyrax
 
     private
 
-      def respond_with_batch_upload_disabled
-        respond_to do |wants|
-          wants.json do
-            return render_json_response(response_type: :forbidden, message: view_context.t('hyrax.batch_uploads.disabled'))
-          end
-          wants.html do
-            return redirect_to hyrax.my_works_path, alert: view_context.t('hyrax.batch_uploads.disabled')
-          end
+    def respond_with_batch_upload_disabled
+      respond_to do |wants|
+        wants.json do
+          return render_json_response(response_type: :forbidden, message: view_context.t('hyrax.batch_uploads.disabled'))
+        end
+        wants.html do
+          return redirect_to hyrax.my_works_path, alert: view_context.t('hyrax.batch_uploads.disabled')
         end
       end
+    end
 
-      def build_form
-        super
-        @form.payload_concern = params[:payload_concern]
-      end
+    def build_form
+      super
+      @form.payload_concern = params[:payload_concern]
+    end
 
-      def handle_payload_concern!
-        unsafe_pc = params.fetch(:batch_upload_item, {})[:payload_concern]
-        # Calling constantize on user params is disfavored (per brakeman), so we sanitize by matching it against an authorized model.
-        safe_pc = Hyrax::SelectTypeListPresenter.new(current_user).authorized_models.map(&:to_s).find { |x| x == unsafe_pc }
-        raise CanCan::AccessDenied, "Cannot create an object of class '#{unsafe_pc}'" unless safe_pc
-        # authorize! :create, safe_pc
-        create_update_job(safe_pc)
-      end
+    def handle_payload_concern!
+      unsafe_pc = params.fetch(:batch_upload_item, {})[:payload_concern]
+      # Calling constantize on user params is disfavored (per brakeman), so we sanitize by matching it against an authorized model.
+      safe_pc = Hyrax::SelectTypeListPresenter.new(current_user).authorized_models.map(&:to_s).find { |x| x == unsafe_pc }
+      raise CanCan::AccessDenied, "Cannot create an object of class '#{unsafe_pc}'" unless safe_pc
+      # authorize! :create, safe_pc
+      create_update_job(safe_pc)
+    end
 
-      def redirect_after_update!
-        # Calling `#t` in a controller context does not mark _html keys as html_safe
-        flash[:notice] = view_context.t('hyrax.works.create.after_create_html', application_name: view_context.application_name)
-        if uploading_on_behalf_of?
-          redirect_to hyrax.dashboard_works_path
-        else
-          redirect_to hyrax.my_works_path
-        end
+    def redirect_after_update!
+      # Calling `#t` in a controller context does not mark _html keys as html_safe
+      flash[:notice] = view_context.t('hyrax.works.create.after_create_html', application_name: view_context.application_name)
+      if uploading_on_behalf_of?
+        redirect_to hyrax.dashboard_works_path
+      else
+        redirect_to hyrax.my_works_path
       end
+    end
 
-      # @param [String] klass the name of the Hyrax Work Class being created by the batch
-      # @note Cannot use a proper Class here because it won't serialize
-      def create_update_job(klass)
-        operation = BatchCreateOperation.create!(user: current_user,
-                                                 operation_type: "Batch Create")
-        # ActionController::Parameters are not serializable, so cast to a hash
-        BatchCreateJob.perform_later(current_user,
-                                     params[:title].permit!.to_h,
-                                     params.fetch(:resource_type, {}).permit!.to_h,
-                                     params[:uploaded_files],
-                                     attributes_for_actor.to_h.merge!(model: klass),
-                                     operation)
-      end
+    # @param [String] klass the name of the Hyrax Work Class being created by the batch
+    # @note Cannot use a proper Class here because it won't serialize
+    def create_update_job(klass)
+      operation = BatchCreateOperation.create!(user: current_user,
+                                               operation_type: "Batch Create")
+      # ActionController::Parameters are not serializable, so cast to a hash
+      BatchCreateJob.perform_later(current_user,
+                                   params[:title].permit!.to_h,
+                                   params.fetch(:resource_type, {}).permit!.to_h,
+                                   params[:uploaded_files],
+                                   attributes_for_actor.to_h.merge!(model: klass),
+                                   operation)
+    end
 
-      def uploading_on_behalf_of?
-        params.fetch(hash_key_for_curation_concern).key?(:on_behalf_of)
-      end
+    def uploading_on_behalf_of?
+      params.fetch(hash_key_for_curation_concern).key?(:on_behalf_of)
+    end
 
-      def attributes_for_actor
-        raw_params = params[hash_key_for_curation_concern]
-        return {} unless raw_params
-        work_form_service.form_class(curation_concern).model_attributes(raw_params)
-      end
+    def attributes_for_actor
+      raw_params = params[hash_key_for_curation_concern]
+      return {} unless raw_params
+      work_form_service.form_class(curation_concern).model_attributes(raw_params)
+    end
   end
 end