hyrax 3.0.0.pre.rc1 → 3.0.0.pre.rc2

data/app/controllers/hyrax/fixity_checks_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   class FixityChecksController < ApplicationController
     before_action :authenticate_user!
@@ -20,13 +21,13 @@ module Hyrax
 
     private
 
-      def fixity_check_service
-        # We are calling `async_jobs: false` to ensure we get a fixity result to
-        # return even if there are no 'fresh' ones on record. Otherwise, we'd
-        # have to sometimes return a 'in progress' status for some bytestreams,
-        # which is a possible future enhancement.
-        @fixity_check_service ||=
-          FileSetFixityCheckService.new(::FileSet.find(params[:file_set_id]), async_jobs: false)
-      end
+    def fixity_check_service
+      # We are calling `async_jobs: false` to ensure we get a fixity result to
+      # return even if there are no 'fresh' ones on record. Otherwise, we'd
+      # have to sometimes return a 'in progress' status for some bytestreams,
+      # which is a possible future enhancement.
+      @fixity_check_service ||=
+        FileSetFixityCheckService.new(::FileSet.find(params[:file_set_id]), async_jobs: false)
+    end
   end
 end

data/app/controllers/hyrax/homepage_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Hyrax::HomepageController < ApplicationController
   # Adds Hydra behaviors into the application controller
   include Blacklight::SearchContext
@@ -26,24 +27,24 @@ class Hyrax::HomepageController < ApplicationController
 
   private
 
-    # Return 5 collections
-    def collections(rows: 5)
-      builder = Hyrax::CollectionSearchBuilder.new(self)
-                                              .rows(rows)
-      response = repository.search(builder)
-      response.documents
-    rescue Blacklight::Exceptions::ECONNREFUSED, Blacklight::Exceptions::InvalidRequest
-      []
-    end
+  # Return 5 collections
+  def collections(rows: 5)
+    builder = Hyrax::CollectionSearchBuilder.new(self)
+                                            .rows(rows)
+    response = repository.search(builder)
+    response.documents
+  rescue Blacklight::Exceptions::ECONNREFUSED, Blacklight::Exceptions::InvalidRequest
+    []
+  end
 
-    def recent
-      # grab any recent documents
-      (_, @recent_documents) = search_results(q: '', sort: sort_field, rows: 4)
-    rescue Blacklight::Exceptions::ECONNREFUSED, Blacklight::Exceptions::InvalidRequest
-      @recent_documents = []
-    end
+  def recent
+    # grab any recent documents
+    (_, @recent_documents) = search_results(q: '', sort: sort_field, rows: 4)
+  rescue Blacklight::Exceptions::ECONNREFUSED, Blacklight::Exceptions::InvalidRequest
+    @recent_documents = []
+  end
 
-    def sort_field
-      "date_uploaded_dtsi desc"
-    end
+  def sort_field
+    "date_uploaded_dtsi desc"
+  end
 end

data/app/controllers/hyrax/leases_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   class LeasesController < ApplicationController
     include Hyrax::LeasesControllerBehavior

data/app/controllers/hyrax/my/collections_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   module My
     class CollectionsController < MyController
@@ -5,9 +6,9 @@ module Hyrax
       def self.configure_facets
         configure_blacklight do |config|
           # Name of pivot facet must match field name that uses helper_method
-          config.add_facet_field Collection.collection_type_gid_document_field_name,
+          config.add_facet_field ::Collection.collection_type_gid_document_field_name,
                                  helper_method: :collection_type_label, limit: 5,
-                                 pivot: ['has_model_ssim', Collection.collection_type_gid_document_field_name],
+                                 pivot: ['has_model_ssim', ::Collection.collection_type_gid_document_field_name],
                                  label: I18n.t('hyrax.dashboard.my.heading.collection_type')
           # This causes AdminSets to also be shown with the Collection Type label
           config.add_facet_field 'has_model_ssim',
@@ -32,22 +33,22 @@ module Hyrax
 
       private
 
-        def search_action_url(*args)
-          hyrax.my_collections_url(*args)
-        end
+      def search_action_url(*args)
+        hyrax.my_collections_url(*args)
+      end
 
-        # The url of the "more" link for additional facet values
-        def search_facet_path(args = {})
-          hyrax.my_dashboard_collections_facet_path(args[:id])
-        end
+      # The url of the "more" link for additional facet values
+      def search_facet_path(args = {})
+        hyrax.my_dashboard_collections_facet_path(args[:id])
+      end
 
-        def collection_type_list_presenter
-          @collection_type_list_presenter ||= Hyrax::SelectCollectionTypeListPresenter.new(current_user)
-        end
+      def collection_type_list_presenter
+        @collection_type_list_presenter ||= Hyrax::SelectCollectionTypeListPresenter.new(current_user)
+      end
 
-        def managed_collections_count
-          @managed_collection_count = Hyrax::Collections::ManagedCollectionsService.managed_collections_count(scope: self)
-        end
+      def managed_collections_count
+        @managed_collection_count = Hyrax::Collections::ManagedCollectionsService.managed_collections_count(scope: self)
+      end
     end
   end
 end

data/app/controllers/hyrax/my/highlights_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   module My
     class HighlightsController < MyController
@@ -12,30 +13,30 @@ module Hyrax
 
       private
 
-        def search_action_url(*args)
-          hyrax.dashboard_highlights_url(*args)
-        end
+      def search_action_url(*args)
+        hyrax.dashboard_highlights_url(*args)
+      end
 
-        def query_solr
-          return empty_search_result if Hyrax::TrophyPresenter.find_by_user(@user).count.zero?
-          super
-        end
+      def query_solr
+        return empty_search_result if Hyrax::TrophyPresenter.find_by_user(@user).count.zero?
+        super
+      end
 
-        def empty_search_result
-          solr_response = Blacklight::Solr::Response.new(empty_request, {})
-          docs = []
-          [solr_response, docs]
-        end
+      def empty_search_result
+        solr_response = Blacklight::Solr::Response.new(empty_request, {})
+        docs = []
+        [solr_response, docs]
+      end
 
-        def empty_request
-          {
-            responseHeader: {
-              status: 0,
-              params: { wt: 'ruby', rows: '11', q: '*:*' }
-            },
-            response: { numFound: 0, start: 0, docs: [] }
-          }
-        end
+      def empty_request
+        {
+          responseHeader: {
+            status: 0,
+            params: { wt: 'ruby', rows: '11', q: '*:*' }
+          },
+          response: { numFound: 0, start: 0, docs: [] }
+        }
+      end
     end
   end
 end

data/app/controllers/hyrax/my/shares_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   module My
     class SharesController < MyController
@@ -12,14 +13,14 @@ module Hyrax
 
       private
 
-        def search_action_url(*args)
-          hyrax.dashboard_shares_url(*args)
-        end
+      def search_action_url(*args)
+        hyrax.dashboard_shares_url(*args)
+      end
 
-        # The url of the "more" link for additional facet values
-        def search_facet_path(args = {})
-          hyrax.dashboard_shares_facet_path(args[:id])
-        end
+      # The url of the "more" link for additional facet values
+      def search_facet_path(args = {})
+        hyrax.dashboard_shares_facet_path(args[:id])
+      end
     end
   end
 end

data/app/controllers/hyrax/my/works_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   module My
     class WorksController < MyController
@@ -33,22 +34,22 @@ module Hyrax
 
       private
 
-        def collections_service
-          Hyrax::CollectionsService.new(self)
-        end
+      def collections_service
+        Hyrax::CollectionsService.new(self)
+      end
 
-        def search_action_url(*args)
-          hyrax.my_works_url(*args)
-        end
+      def search_action_url(*args)
+        hyrax.my_works_url(*args)
+      end
 
-        # The url of the "more" link for additional facet values
-        def search_facet_path(args = {})
-          hyrax.my_dashboard_works_facet_path(args[:id])
-        end
+      # The url of the "more" link for additional facet values
+      def search_facet_path(args = {})
+        hyrax.my_dashboard_works_facet_path(args[:id])
+      end
 
-        def managed_works_count
-          @managed_works_count = Hyrax::Works::ManagedWorksService.managed_works_count(scope: self)
-        end
+      def managed_works_count
+        @managed_works_count = Hyrax::Works::ManagedWorksService.managed_works_count(scope: self)
+      end
     end
   end
 end

data/app/controllers/hyrax/my_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   class MyController < ApplicationController
     include Hydra::Catalog
@@ -46,21 +47,21 @@ module Hyrax
 
     private
 
-      # TODO: Extract a presenter object that wrangles all of these instance variables.
-      def prepare_instance_variables_for_batch_control_display
-        # set up some parameters for allowing the batch controls to show appropriately
-        max_batch_size = 80
-        count_on_page = @document_list.count { |doc| batch.index(doc.id) }
-        @disable_select_all = @document_list.count > max_batch_size
-        @result_set_size = @response.response["numFound"]
-        @empty_batch = batch.empty?
-        @all_checked = (count_on_page == @document_list.count)
-        @add_works_to_collection = params.fetch(:add_works_to_collection, '')
-        @add_works_to_collection_label = params.fetch(:add_works_to_collection_label, '')
-      end
+    # TODO: Extract a presenter object that wrangles all of these instance variables.
+    def prepare_instance_variables_for_batch_control_display
+      # set up some parameters for allowing the batch controls to show appropriately
+      max_batch_size = 80
+      count_on_page = @document_list.count { |doc| batch.index(doc.id) }
+      @disable_select_all = @document_list.count > max_batch_size
+      @result_set_size = @response.response["numFound"]
+      @empty_batch = batch.empty?
+      @all_checked = (count_on_page == @document_list.count)
+      @add_works_to_collection = params.fetch(:add_works_to_collection, '')
+      @add_works_to_collection_label = params.fetch(:add_works_to_collection_label, '')
+    end
 
-      def query_solr
-        search_results(params)
-      end
+    def query_solr
+      search_results(params)
+    end
   end
 end

data/app/controllers/hyrax/notifications_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   class NotificationsController < ApplicationController
     before_action :authenticate_user!
@@ -25,8 +26,8 @@ module Hyrax
 
     private
 
-      def user_mailbox
-        UserMailbox.new(current_user)
-      end
+    def user_mailbox
+      UserMailbox.new(current_user)
+    end
   end
 end

data/app/controllers/hyrax/operations_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   class OperationsController < ApplicationController
     load_and_authorize_resource

data/app/controllers/hyrax/pages_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   # Shows the about and help page
   class PagesController < ApplicationController
@@ -30,23 +31,23 @@ module Hyrax
 
     private
 
-      def permitted_params
-        params.require(:content_block).permit(:about,
-                                              :agreement,
-                                              :help,
-                                              :terms)
-      end
+    def permitted_params
+      params.require(:content_block).permit(:about,
+                                            :agreement,
+                                            :help,
+                                            :terms)
+    end
 
-      # When a request comes to the controller, it will be for one and
-      # only one of the content blocks. Params always looks like:
-      #   {'about_page' => 'Here is an awesome about page!'}
-      # So reach into permitted params and pull out the first value.
-      def update_value_from_params
-        permitted_params.values.first
-      end
+    # When a request comes to the controller, it will be for one and
+    # only one of the content blocks. Params always looks like:
+    #   {'about_page' => 'Here is an awesome about page!'}
+    # So reach into permitted params and pull out the first value.
+    def update_value_from_params
+      permitted_params.values.first
+    end
 
-      def pages_layout
-        action_name == 'show' ? 'homepage' : 'hyrax/dashboard'
-      end
+    def pages_layout
+      action_name == 'show' ? 'homepage' : 'hyrax/dashboard'
+    end
   end
 end

data/app/controllers/hyrax/permissions_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   class PermissionsController < ApplicationController
     helper_method :curation_concern

data/app/controllers/hyrax/resource_sync_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Hyrax::ResourceSyncController < ApplicationController
   # We don't need locale here
   def default_url_options
@@ -22,31 +23,31 @@ class Hyrax::ResourceSyncController < ApplicationController
 
   private
 
-    def build_change_list
-      Hyrax::ResourceSync::ChangeListWriter.new(capability_list_url: hyrax.capability_list_url,
-                                                resource_host: request.host).write
-    end
+  def build_change_list
+    Hyrax::ResourceSync::ChangeListWriter.new(capability_list_url: hyrax.capability_list_url,
+                                              resource_host: request.host).write
+  end
 
-    def build_resource_list
-      Hyrax::ResourceSync::ResourceListWriter.new(capability_list_url: hyrax.capability_list_url,
-                                                  resource_host: request.host).write
-    end
+  def build_resource_list
+    Hyrax::ResourceSync::ResourceListWriter.new(capability_list_url: hyrax.capability_list_url,
+                                                resource_host: request.host).write
+  end
 
-    def build_capability_list
-      Hyrax::ResourceSync::CapabilityListWriter.new(resource_list_url: hyrax.resource_list_url,
-                                                    change_list_url: hyrax.change_list_url,
-                                                    description_url: hyrax.source_description_url).write
-    end
+  def build_capability_list
+    Hyrax::ResourceSync::CapabilityListWriter.new(resource_list_url: hyrax.resource_list_url,
+                                                  change_list_url: hyrax.change_list_url,
+                                                  description_url: hyrax.source_description_url).write
+  end
 
-    def build_source_description
-      Hyrax::ResourceSync::SourceDescriptionWriter.new(capability_list_url: hyrax.capability_list_url).write
-    end
+  def build_source_description
+    Hyrax::ResourceSync::SourceDescriptionWriter.new(capability_list_url: hyrax.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'
+  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/controllers/hyrax/single_use_links_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   class SingleUseLinksController < ApplicationController
     include Blacklight::SearchHelper
@@ -39,12 +40,12 @@ module Hyrax
 
     private
 
-      def authorize_user!
-        authorize! :edit, params[:id]
-      end
+    def authorize_user!
+      authorize! :edit, params[:id]
+    end
 
-      def asset_show_path
-        polymorphic_path([main_app, fetch(params[:id]).last])
-      end
+    def asset_show_path
+      polymorphic_path([main_app, fetch(params[:id]).last])
+    end
   end
 end