hyrax 4.0.0.beta1 → 4.0.0.rc1

data/app/conversions/power_converters/sipity_action_name.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-PowerConverter.define_conversion_for(:sipity_action_name) do |input|
-  Deprecation.warn('PowerConverter is deprecated. Use `Sipity::WorkflowAction.name_for(input)` instead')
-  case input
-  when String, Symbol
-    input.to_s.sub(/[\?\!]\Z/, '')
-  when Sipity::WorkflowAction
-    input.name
-  end
-end

data/app/conversions/power_converters/sipity_agent.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-PowerConverter.define_conversion_for(:sipity_agent) do |input|
-  Deprecation.warn('PowerConverter is deprecated. Use `Sipity::Agent(input)` instead')
-
-  case input
-  when Sipity::Agent
-    input
-  end
-end

data/app/conversions/power_converters/sipity_entity.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-PowerConverter.define_conversion_for(:sipity_entity) do |input|
-  Deprecation.warn('PowerConverter is deprecated. Use `Sipity::Entity(input)` instead')
-  case input
-  when URI::GID
-    Sipity::Entity.find_by(proxy_for_global_id: input.to_s)
-  when SolrDocument
-    PowerConverter.convert_to_sipity_entity(input.to_model.to_global_id)
-  when Sipity::Entity
-    input
-  when Sipity::Comment
-    PowerConverter.convert_to_sipity_entity(input.entity)
-  end
-end

data/app/conversions/power_converters/sipity_role.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-PowerConverter.define_conversion_for(:sipity_role) do |input|
-  Deprecation.warn('PowerConverter is deprecated. Use `Sipity::WorkflowAction.name_for(input)` instead')
-  case input
-  when Sipity::Role
-    input
-  when String, Symbol
-    Sipity::Role.find_or_create_by(name: input)
-  end
-end

data/app/conversions/power_converters/sipity_workflow_id.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-PowerConverter.define_conversion_for(:sipity_workflow_id) do |input|
-  case input
-  when Sipity::Workflow
-    input.id
-  when Integer
-    input
-  when String
-    input.to_i
-  else
-    if input.respond_to?(:workflow_id)
-      input.workflow_id
-    else
-      PowerConverter.convert_to_sipity_workflow_id(PowerConverter.convert_to_sipity_entity(input))
-    end
-  end
-end

data/app/conversions/power_converters/sipity_workflow_state.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-require 'power_converter'
-
-PowerConverter.define_conversion_for(:sipity_workflow_state) do |input, workflow|
-  Deprecation.warn('PowerConverter is deprecated. Use `Sipity::WorkflowState(input, workflow)` instead')
-
-  case input
-  when Sipity::WorkflowState
-    input
-  when Symbol, String
-    Sipity::WorkflowState.where(workflow_id: workflow.id, name: input).first
-  end
-end

data/app/conversions/power_converters.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-require 'power_converter'
-
-pattern = File.expand_path('../power_converters/**/*.rb', __FILE__)
-Dir.glob(pattern).each do |filename|
-  require filename
-end

data/app/indexers/hyrax/repository_reindexer.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-require 'active_fedora/base'
-require 'active_fedora/version'
-
-module Hyrax
-  module RepositoryReindexer
-    extend ActiveSupport::Concern
-
-    module ClassMethods
-      # overrides https://github.com/samvera/active_fedora/blob/master/lib/active_fedora/indexing.rb#L95-L125
-      # see implementation details in adapters/nesting_index_adapter.rb#each_perservation_document_id_and_parent_ids
-      def reindex_everything(*)
-        Samvera::NestingIndexer.reindex_all!(extent: Hyrax::Adapters::NestingIndexAdapter::FULL_REINDEX)
-      end
-    end
-  end
-end
-
-ActiveFedora::Base.module_eval { include Hyrax::RepositoryReindexer }

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

@@ -1,73 +0,0 @@
-# frozen_string_literal: true
-module Hyrax
-  # Responsible for adding the necessary callbacks for updating the nested collection information
-  # This is part of the after update index because it is a potentially very expensive process.
-  #
-  # @todo Consider extracting the update_index callback to ActiveFedora::Base
-  module CollectionNesting
-    extend ActiveSupport::Concern
-
-    included do
-      extend ActiveModel::Callbacks
-      include ActiveModel::Validations::Callbacks
-
-      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
-        reindex_nested_relationships_for(id: id, extent: reindex_extent)
-      end
-
-      def update_nested_collection_relationship_indices
-        return if @during_save
-        reindex_nested_relationships_for(id: id, extent: reindex_extent)
-      end
-
-      def update_child_nested_collection_relationship_indices
-        children = find_children_of(destroyed_id: id)
-        children.each do |child|
-          reindex_nested_relationships_for(id: child.id, extent: Hyrax::Adapters::NestingIndexAdapter::FULL_REINDEX)
-        end
-      end
-    end
-
-    def update_index(*args)
-      _run_update_index_callbacks { super }
-    end
-
-    def find_children_of(destroyed_id:)
-      Hyrax::SolrService.query(Hyrax::SolrQueryBuilderService.construct_query(member_of_collection_ids_ssim: destroyed_id))
-    end
-
-    # Only models which include Hyrax::CollectionNesting will respond to this method.
-    # Used to determine whether a model gets reindexed via Samvera::NestingIndexer during full repository reindexing,
-    def use_nested_reindexing?
-      true
-    end
-
-    # The following methods allow an option to reindex an object only if the nesting indexer fields are not
-    # already in the object's solr document. Added to prevent unnecessary indexing of all ancestors of a parent
-    # when one child gets added to the parent. By default, we do the full graph indexing.
-    def reindex_extent
-      @reindex_extent ||= Hyrax::Adapters::NestingIndexAdapter::FULL_REINDEX
-    end
-
-    def reindex_extent=(val)
-      @reindex_extent = val
-    end
-
-    private
-
-    def reindex_nested_relationships_for(id:, extent:)
-      Hyrax.config.nested_relationship_reindexer.call(id: id, extent: extent)
-    end
-  end
-end

data/app/services/hyrax/adapters/nesting_index_adapter.rb

@@ -1,193 +0,0 @@
-# frozen_string_literal: true
-module Hyrax
-  module Adapters
-    module NestingIndexAdapter
-      FULL_REINDEX = "full"
-      LIMITED_REINDEX = "limited"
-
-      # @!group Providing interface for a Samvera::NestingIndexer::Adapter
-
-      ##
-      # @api public
-      #
-      # @param id [String]
-      # @return Samvera::NestingIndexer::Document::PreservationDocument
-      def self.find_preservation_document_by(id:)
-        # Not everything is guaranteed to have library_collection_ids
-        # If it doesn't have it, what do we do?
-        parent_ids = find_preservation_parent_ids_for(id: id)
-        Samvera::NestingIndexer::Documents::PreservationDocument.new(id: id, parent_ids: parent_ids)
-      end
-
-      ##
-      # @api public
-      #
-      # @param id [String]
-      # @return Samvera::NestingIndexer::Document::PreservationDocument
-      def self.find_preservation_parent_ids_for(id:)
-        # Not everything is guaranteed to have library_collection_ids
-        # If it doesn't have it, what do we do?
-        fedora_object = Hyrax::Base.uncached do
-          fedora_object = ActiveFedora::Base.find(id)
-        end
-
-        if fedora_object.respond_to?(:member_of_collection_ids)
-          fedora_object.member_of_collection_ids
-        else
-          []
-        end
-      end
-
-      ##
-      # @api public
-      #
-      # @param id [String]
-      # @return Samvera::NestingIndexer::Documents::IndexDocument
-      def self.find_index_document_by(id:)
-        solr_document = find_solr_document_by(id: id)
-        coerce_solr_document_to_index_document(original_solr_document: solr_document, id: id)
-      end
-
-      ##
-      # @api public
-      # @yieldparam id [String]
-      # @yieldparam parent_id [Array<String>]
-      #
-      # @see Samvera::NestingIndexer.reindex_all!(extent: FULL_REINDEX)
-      def self.each_perservation_document_id_and_parent_ids(&block) # rubocop:disable Lint/UnusedMethodArgument
-        ActiveFedora::Base.descendant_uris(ActiveFedora.fedora.base_uri, exclude_uri: true).each do |uri|
-          id = Hyrax.config.translate_uri_to_id.call(uri)
-          object = ActiveFedora::Base.find(id)
-          parent_ids = object.try(:member_of_collection_ids) || []
-
-          # NOTE: we do not yield when the object has parents. Calling the nested indexer for the
-          # top id will reindex all descendants as well.
-          if object.try(:use_nested_reindexing?)
-            yield(id, parent_ids) if parent_ids.empty?
-          else
-            Rails.logger.info "Re-indexing via to_solr ... #{id}"
-            Hyrax::SolrService.add(object.to_solr, commit: true)
-          end
-        end
-      end
-
-      ##
-      # @api public
-      #
-      # From the nesting_document, we will need to add the nesting attributes to the underlying SOLR document for the object
-      #
-      # @param nesting_document [Samvera::NestingIndexer::Documents::IndexDocument]
-      # @return Hash - the attributes written to the indexing layer
-      def self.write_nesting_document_to_index_layer(nesting_document:)
-        solr_doc = Hyrax::Base.uncached do
-          ActiveFedora::Base.find(nesting_document.id).to_solr # What is the current state of the solr document
-        end
-
-        # Now add the details from the nesting indexer to the document
-        add_nesting_attributes(
-          solr_doc: solr_doc,
-          ancestors: nesting_document.ancestors,
-          parent_ids: nesting_document.parent_ids,
-          pathnames: nesting_document.pathnames,
-          depth: nesting_document.deepest_nested_depth
-        )
-      end
-
-      ##
-      # @api public
-      #
-      # @param solr_doc [SolrDocument]
-      # @param ancestors [Array]
-      # @param parent_ids [Array]
-      # @param pathnames [Array]
-      # @param depth [Array] the object's deepest nesting depth
-      # @return [SolrDocument]
-      def self.add_nesting_attributes(solr_doc:, ancestors:, parent_ids:, pathnames:, depth:)
-        solr_doc[solr_field_name_for_storing_ancestors] = ancestors
-        solr_doc[solr_field_name_for_storing_parent_ids] = parent_ids
-        solr_doc[solr_field_name_for_storing_pathnames] = pathnames
-        solr_doc[solr_field_name_for_deepest_nested_depth] = depth
-        Hyrax::SolrService.add(solr_doc, commit: true)
-        solr_doc
-      end
-
-      ##
-      # @api public
-      #
-      # @param document [Samvera::NestingIndexer::Documents::IndexDocument]
-      # @param extent [String] if not "full" or nil, doesn't yield children for reindexing
-      # @yield Samvera::NestingIndexer::Documents::IndexDocument
-      #
-      # @return [void]
-      def self.each_child_document_of(document:, extent:, &block) # rubocop:disable Lint/UnusedMethodArgument
-        raw_child_solr_documents_of(parent_document: document).each do |solr_document|
-          child_document = coerce_solr_document_to_index_document(original_solr_document: solr_document, id: solr_document.fetch('id'))
-          # during light reindexing, we want to reindex the child only if fields aren't already there
-          yield(child_document) if full_reindex?(extent: extent) || child_document.pathnames.empty?
-        end
-      end
-
-      # @!endgroup
-      # @!group Supporting methods for interface implementation
-
-      ##
-      # @api private
-      #
-      # @todo Need to implement retrieving parent_ids, pathnames, and ancestors from the given document
-      def self.coerce_solr_document_to_index_document(original_solr_document:, id:)
-        Samvera::NestingIndexer::Documents::IndexDocument.new(
-          id: id,
-          parent_ids: original_solr_document.fetch(solr_field_name_for_storing_parent_ids) { [] },
-          pathnames: original_solr_document.fetch(solr_field_name_for_storing_pathnames) { [] },
-          ancestors: original_solr_document.fetch(solr_field_name_for_storing_ancestors) { [] }
-        )
-      end
-      private_class_method :coerce_solr_document_to_index_document
-
-      ##
-      # @api private
-      def self.find_solr_document_by(id:)
-        query = Hyrax::SolrQueryService.new.with_ids(ids: [id]).build
-        document = Hyrax::SolrService.query(query, rows: 1).first
-        document = ActiveFedora::Base.find(id).to_solr if document.nil?
-        raise "Unable to find SolrDocument with ID=#{id}" if document.nil?
-        document
-      end
-      private_class_method :find_solr_document_by
-
-      ##
-      # @api private
-      def self.nesting_configuration
-        @nesting_configuration ||= Samvera::NestingIndexer.configuration
-      end
-
-      class << self
-        delegate :solr_field_name_for_storing_pathnames,
-                 :solr_field_name_for_storing_ancestors,
-                 :solr_field_name_for_storing_parent_ids,
-                 :solr_field_name_for_deepest_nested_depth, to: :nesting_configuration
-      end
-
-      ##
-      # @api private
-      # @param parent_document [Curate::Indexer::Documents::IndexDocument]
-      # @return [Hash] A raw response document from SOLR
-      #
-      # @todo What is the appropriate suffix to apply to the solr_field_name?
-      def self.raw_child_solr_documents_of(parent_document:)
-        # query Solr for all of the documents included as a member_of_collection parent. Or up to 10000 of them.
-        child_query = Hyrax::SolrQueryBuilderService.construct_query(member_of_collection_ids_ssim: parent_document.id)
-        Hyrax::SolrService.query(child_query, rows: 10_000.to_i)
-      end
-      private_class_method :raw_child_solr_documents_of
-
-      def self.full_reindex?(extent:)
-        return true if extent == FULL_REINDEX
-        false
-      end
-      private_class_method :full_reindex?
-
-      # @!endgroup
-    end
-  end
-end

data/app/views/hyrax/my/_facet_layout.html.erb

@@ -1,7 +0,0 @@
-<fieldset class="btn-group">
-  <legend class="sr-only"><%= facet_field_label(facet_field.field) %></legend>
-  <button class="btn btn-secondary dropdown-toggle" type="button" id="<%= facet_field.field.parameterize %>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" aria-controls="<%= facet_field.field.parameterize + '-dropdown-options' %>">
-    <%= facet_field_label(facet_field.field) %>
-  </button>
-  <%= yield %>
-</fieldset>

data/app/views/hyrax/my/_facet_limit.html.erb

@@ -1,15 +0,0 @@
-  <%# This template is used to render the initial facet list (#index action)
-      and a paginated facet list in a modal (#facet action). The `dropdown-menu`
-      class in only necessary for the former and causes display issues in the latter. -%>
-  <ul id="<%= facet_field.field.parameterize + '-dropdown-options' %>" class="<%= 'dropdown-menu ' if action_name == 'index' %>facet-values" aria-labelledby="<%= facet_field.field.parameterize %>">
-    <% paginator = facet_paginator(facet_field, display_facet) %>
-    <%= render_facet_limit_list(paginator, facet_field.key) %>
-
-    <% unless paginator.last_page? || params[:action] == "facet" %>
-      <li role="separator" class="dropdown-divider"></li>
-      <li class="dropdown-item more_facets_link">
-        <%= link_to t("more_#{field_name}_html", scope: 'blacklight.search.facets', default: :more_html, field_name: facet_field_label(facet_field.field).pluralize),
-          search_facet_path(id: facet_field.key), class: "more_facets_link", data: { blacklight_modal: 'trigger' } %>
-      </li>
-    <% end %>
-  </ul>

data/app/views/hyrax/my/_facet_pivot.html.erb

@@ -1,26 +0,0 @@
-<% if !subfacet ||= false %>
-  <ul class="dropdown-menu pivot-facet list-unstyled" id="<%= facet_field.field.parameterize + '-dropdown-options' %>">
-<% end %>
-
-  <% display_facet.items.each do |item| -%>
-    <li class="dropdown-item">
-      <span class="facet-values">
-        <% # This prevents model Collection from being shown as a second filter along with the collection type. %>
-        <% item.fq= {} if subfacet %>
-
-        <% # The unless prevents Collection from being included in the select list for the Collection Type filter. %>
-        <%= render_facet_item(item.field, item) unless subfacet != true && item.value == "Collection" %>
-      </span>
-
-      <% unless item.items.blank? %>
-        <%= render partial: 'facet_pivot', locals: { subfacet: true,
-                                                     display_facet: item,
-                                                     field_name: field_name,
-                                                     solr_field: field_name } %>
-      <% end %>
-    </li>
-  <% end %>
-
-<% if !subfacet %>
-  </ul>
-<% end %>

data/config/initializers/nesting_indexer_initializer.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-require 'samvera/nesting_indexer'
-require 'hyrax/repository_reindexer'
-
-Samvera::NestingIndexer.configure do |config|
-  # How many layers of nesting are allowed for collections
-  # For maximum_nesting_depth of 3 the following will raise an exception
-  # C1 <- C2 <- C3 <- W1
-  config.maximum_nesting_depth = 5
-  config.adapter = Hyrax::Adapters::NestingIndexAdapter
-  config.solr_field_name_for_storing_parent_ids = "nesting_collection__parent_ids_ssim"
-  config.solr_field_name_for_storing_ancestors =  "nesting_collection__ancestors_ssim"
-  config.solr_field_name_for_storing_pathnames =  "nesting_collection__pathnames_ssim"
-  config.solr_field_name_for_deepest_nested_depth = 'nesting_collection__deepest_nested_depth_isi'
-end