hyrax 2.7.2 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15c66e9b0693579023f7f5a57cd17c64d8e954e5178c4df7a4ac8b0ed006c1cb
-  data.tar.gz: 71707611232797f25219dd4f5bd6b7b8023d2a281fb1256dc04db210f1224d11
+  metadata.gz: 140c7caa34751f7a525eda269abcee6331a9e7d200863e2cbee29d315966de65
+  data.tar.gz: 7085c394edd0aa1e90baef7d13f90245d8fb0fb65659e54549cedda0487445e9
 SHA512:
-  metadata.gz: 88013dcbe9f0d04ee28edde4dae28fe811137c6c0d4681ab078a474f9991416fbd165fb71379c636a48f8836bf1676e9d6a85b8ce46f13eabcf00f98e6ea1510
-  data.tar.gz: e383285af351dd33e9141072201b264fbd4eb3947a6e9fce6fe75d9824357ba6813c27eba198569199469663504cc31453c1f1afaa49ea47ebd8f62ee5526a1c
+  metadata.gz: 691b84f363281552cbd84f85b767bb5b460ba749e0449aed0498594143767a6cd4dae187a5dd9c88bf3b7bd06a568375da70367b3b8faa674a59f39deaf4df06
+  data.tar.gz: e19605afaa51b569ea79e7e99d65fd0576b172cd6dfeb38f815c4dd3a7ac18678bb6b3ff4ac4a5af2b6358bf55c459baba0c4a98b393d20f7d64388f576c894f

data/.circleci/config.yml

@@ -6,16 +6,13 @@ jobs:
     parameters:
       ruby_version:
         type: string
-        default: 2.5.5
+        default: 2.5.8
       bundler_version:
         type: string
         default: 1.17.3
       rails_version:
         type: string
-        default: '5.2.2'
-      cache_version:
-        type: string
-        default: '1-2.x'
+        default: '5.2.4.3'
     executor:
       name: 'samvera/ruby'
       ruby_version: << parameters.ruby_version >>
@@ -28,6 +25,7 @@ jobs:
       - samvera/bundle_for_gem:
           ruby_version: << parameters.ruby_version >>
           bundler_version: << parameters.bundler_version >>
+          cache_version: '{{ checksum ".regen" }}'
           project: hyrax
       - persist_to_workspace:
           root: ~/
@@ -40,9 +38,6 @@ jobs:
       ruby_version:
         type: string
         default: 2.5.5
-      cache_version:
-        type: string
-        default: '1-2.x'
     executor:
       name: 'samvera/ruby'
       ruby_version: << parameters.ruby_version >>
@@ -56,16 +51,13 @@ jobs:
     parameters:
       ruby_version:
         type: string
-        default: 2.5.5
+        default: 2.5.8
       bundler_version:
         type: string
         default: 1.17.3
       rails_version:
         type: string
-        default: '5.2.2'
-      cache_version:
-        type: string
-        default: '1-2.x'
+        default: '5.2.4.3'
     executor:
       name: 'samvera/ruby'
       ruby_version: << parameters.ruby_version >>
@@ -78,11 +70,11 @@ jobs:
       - attach_workspace:
           at: ~/
       - samvera/engine_cart_generate:
-          cache_key: v<< parameters.cache_version >>--internal-test-app-{{ checksum "hyrax.gemspec" }}-{{ checksum "spec/test_app_templates/lib/generators/test_app_generator.rb" }}-{{ checksum "lib/generators/hyrax/install_generator.rb" }}-<< parameters.rails_version >>-<< parameters.ruby_version >>
+          cache_key: v1-2.x-internal-test-app-{{ checksum "hyrax.gemspec" }}-{{ checksum ".regen" }}-<< parameters.rails_version >>-<< parameters.ruby_version >>
       - samvera/bundle_for_gem:
           ruby_version: << parameters.ruby_version >>
           bundler_version: << parameters.bundler_version >>
-          cache_version: << parameters.cache_version >>
+          cache_version: '{{ checksum ".regen" }}'
           project: hyrax
       - persist_to_workspace:
           root: ~/
@@ -94,13 +86,10 @@ jobs:
     parameters:
       ruby_version:
         type: string
-        default: 2.5.5
+        default: 2.5.8
       bundler_version:
         type: string
         default: 1.17.3
-      cache_version:
-        type: string
-        default: '1-2.x'
     executor:
       name: 'samvera/ruby_fcrepo_solr_redis'
       ruby_version: << parameters.ruby_version >>
@@ -117,39 +106,77 @@ jobs:
       - samvera/bundle_for_gem:
           ruby_version: << parameters.ruby_version >>
           bundler_version: << parameters.bundler_version >>
-          cache_version: << parameters.cache_version >>
+          cache_version: '{{ checksum ".regen" }}'
           project: hyrax
       - samvera/parallel_rspec
 
 workflows:
   version: 2
-  ci:
+  ruby2-5rails5-1:
     jobs:
       - bundle:
-          ruby_version: "2.5.5"
+          ruby_version: "2.5.8"
           rails_version: "5.1.7"
-          cache_version: "1-2.x"
       - lint:
-          ruby_version: "2.5.5"
-          cache_version: "1-2.x"
+          ruby_version: "2.5.8"
           requires:
             - bundle
       - build:
-          ruby_version: "2.5.5"
+          ruby_version: "2.5.8"
           rails_version: "5.1.7"
-          cache_version: "1-2.x"
           requires:
             - bundle
       - test:
-          name: "ruby2-5-5"
-          ruby_version: "2.5.5"
+          name: "rails5-1"
+          ruby_version: "2.5.8"
           requires:
             - build
             - lint
+  ruby2-5rails5-2:
+    jobs:
+      - bundle:
+          ruby_version: "2.5.8"
+          rails_version: "5.2.4.3"
+      - build:
+          ruby_version: "2.5.8"
+          rails_version: "5.2.4.3"
+          requires:
+            - bundle
       - test:
-          name: "ruby2-6-2"
-          ruby_version: "2.6.2"
-          cache_version: "1-2.x"
+          name: "ruby2-5-8"
+          ruby_version: "2.5.8"
+          requires:
+            - build
+  ruby2-6rails5-2:
+    jobs:
+      - bundle:
+          ruby_version: "2.6.6"
+          rails_version: "5.2.4.3"
+      - build:
+          ruby_version: "2.6.6"
+          rails_version: "5.2.4.3"
+          requires:
+            - bundle
+      - test:
+          name: "ruby2-6-6"
+          ruby_version: "2.6.6"
+          requires:
+            - build
+  ruby2-7rails5-2:
+    jobs:
+      - bundle:
+          ruby_version: "2.7.1"
+          rails_version: "5.2.4.3"
+          bundler_version: "2.1.2"
+      - build:
+          ruby_version: "2.7.1"
+          rails_version: "5.2.4.3"
+          bundler_version: "2.1.2"
+          requires:
+            - bundle
+      - test:
+          name: "ruby2-7-1"
+          ruby_version: "2.7.1"
+          bundler_version: "2.1.2"
           requires:
             - build
-            - lint

data/.regen

@@ -0,0 +1 @@
+3

data/README.md

@@ -128,7 +128,7 @@ Note here that the following commands assume you're setting up Hyrax in a develo
 
 First, you'll need a working Ruby installation. You can install this via your operating system's package manager -- you are likely to get farther with OSX, Linux, or UNIX than Windows but your mileage may vary -- but we recommend using a Ruby version manager such as [RVM](https://rvm.io/) or [rbenv](https://github.com/sstephenson/rbenv).
 
-Hyrax supports Ruby 2.3, 2.4 and 2.5. When starting a new project, we recommend using the latest Ruby 2.5 version.
+Hyrax supports Ruby 2.3 and up. When starting a new project, we recommend using the latest Ruby 2.7 version.
 
 ## Redis
 
@@ -138,11 +138,11 @@ Starting up Redis will depend on your operating system, and may in fact already
 
 ## Rails
 
-Hyrax requires Rails 5. We recommend the latest Rails 5.1 release.
+Hyrax 2.x supports Rails 5.1 and 5.2. We recommend the latest Rails 5.2 release.
 
 ```
 # If you don't already have Rails at your disposal...
-gem install rails -v 5.1.6
+gem install rails -v '5.2.4.3'
 ```
 
 ### JavaScript runtime
@@ -158,7 +158,7 @@ NOTE: The steps need to be done in order to create a new Hyrax based app.
 Generate a new Rails application using the template.
 
 ```
-rails _5.1.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v2.6.0/template.rb
+rails _5.2.4.3_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v2.8.0/template.rb
 ```
 
 Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:

data/app/controllers/concerns/hyrax/local_file_downloads_controller_behavior.rb

@@ -29,6 +29,7 @@ module Hyrax
       end
 
       def send_local_file_contents
+        return unless stale?(last_modified: local_file_last_modified, template: false)
         self.status = 200
         prepare_local_file_headers
         # For derivatives stored on the local file system
@@ -65,7 +66,7 @@ module Hyrax
         response.headers['Content-Type'] = local_file_mime_type
         response.headers['Content-Length'] ||= local_file_size.to_s
         # Prevent Rack::ETag from calculating a digest over body
-        response.headers['Last-Modified'] = local_file_last_modified.utc.strftime("%a, %d %b %Y %T GMT")
+        response.headers['Last-Modified'] ||= local_file_last_modified.httpdate
         self.content_type = local_file_mime_type
       end
 

data/app/indexers/hyrax/deep_indexing_service.rb

@@ -67,13 +67,13 @@ module Hyrax
       # @param [Array] val an array of two elements, first is a string (the uri) and the second is a hash with one key: `:label`
       def append_label_and_uri(solr_doc, solr_field_key, field_info, val)
         val = val.solrize
-        self.class.create_and_insert_terms(solr_field_key,
-                                           val.first,
-                                           field_info.behaviors, solr_doc)
+        create_and_insert_terms_handler.create_and_insert_terms(solr_field_key,
+                                                                val.first,
+                                                                field_info.behaviors, solr_doc)
         return unless val.last.is_a? Hash
-        self.class.create_and_insert_terms("#{solr_field_key}_label",
-                                           label(val),
-                                           field_info.behaviors, solr_doc)
+        create_and_insert_terms_handler.create_and_insert_terms("#{solr_field_key}_label",
+                                                                label(val),
+                                                                field_info.behaviors, solr_doc)
       end
 
       # Use this method to append a string value from a controlled vocabulary field
@@ -83,12 +83,12 @@ module Hyrax
       # @param [Hash] field_info
       # @param [String] val
       def append_label(solr_doc, solr_field_key, field_info, val)
-        self.class.create_and_insert_terms(solr_field_key,
-                                           val,
-                                           field_info.behaviors, solr_doc)
-        self.class.create_and_insert_terms("#{solr_field_key}_label",
-                                           val,
-                                           field_info.behaviors, solr_doc)
+        create_and_insert_terms_handler.create_and_insert_terms(solr_field_key,
+                                                                val,
+                                                                field_info.behaviors, solr_doc)
+        create_and_insert_terms_handler.create_and_insert_terms("#{solr_field_key}_label",
+                                                                val,
+                                                                field_info.behaviors, solr_doc)
       end
 
       # Return a label for the solrized term:
@@ -98,5 +98,14 @@ module Hyrax
       def label(val)
         val.last[:label].split('$').first
       end
+
+      # create_and_insert_terms was moved to ActiveFedora::Indexing::Inserter
+      # in ActiveFedora 12. broker calls to it through here to ensure an
+      # implementation is available
+      def create_and_insert_terms_handler
+        return self.class if self.class.respond_to?(:create_and_insert_terms)
+
+        'ActiveFedora::Indexing::Inserter'.constantize
+      end
   end
 end

data/app/indexers/hyrax/file_set_indexer.rb

@@ -27,6 +27,7 @@ module Hyrax
         solr_doc['duration_tesim']          = object.duration
         solr_doc['sample_rate_tesim']       = object.sample_rate
         solr_doc['original_checksum_tesim'] = object.original_checksum
+        solr_doc['alpha_channels_ssi']      = object.try(:alpha_channels)
         solr_doc['original_file_id_ssi']    = original_file_id
       end
     end
@@ -40,7 +41,11 @@ module Hyrax
 
       def original_file_id
         return unless object.original_file
-        object.original_file.id
+        if object.original_file.versions.present?
+          ActiveFedora::File.uri_to_id(object.current_content_version_uri)
+        else
+          object.original_file.id
+        end
       end
 
       def file_format

data/app/models/concerns/hyrax/solr_document/characterization.rb

@@ -99,7 +99,11 @@ module Hyrax
       end
 
       def original_checksum
-        self[Solrizer.solr_name("original_checksum")]
+        self["original_checksum_tesim"]
+      end
+
+      def alpha_channels
+        self["alpha_channels_ssi"]
       end
     end
   end

data/app/models/concerns/hyrax/solr_document/metadata.rb

@@ -75,14 +75,15 @@ module Hyrax
         attribute :rendering_ids, Solr::Array, solr_name(Hyrax.config.rendering_predicate.value.split(/#|\/|,/).last, :symbol)
         attribute :thumbnail_id, Solr::String, solr_name('hasRelatedImage', :symbol)
         attribute :thumbnail_path, Solr::String, CatalogController.blacklight_config.index.thumbnail_field
-        attribute :label, Solr::String, solr_name('label')
-        attribute :file_format, Solr::String, solr_name('file_format')
-        attribute :suppressed?, Solr::String, solr_name('suppressed', Solrizer::Descriptor.new(:boolean, :stored, :indexed))
 
-        attribute :date_modified, Solr::Date, solr_name('date_modified', :stored_sortable, type: :date)
-        attribute :date_uploaded, Solr::Date, solr_name('date_uploaded', :stored_sortable, type: :date)
-        attribute :create_date, Solr::Date, solr_name('system_create', :stored_sortable, type: :date)
-        attribute :modified_date, Solr::Date, solr_name('system_modified', :stored_sortable, type: :date)
+        attribute :label, Solr::String, "label_tesim"
+        attribute :file_format, Solr::String, "file_format_tesim"
+        attribute :suppressed?, Solr::String, "suppressed_bsi"
+        attribute :original_file_id, Solr::String, "original_file_id_ssi"
+        attribute :date_modified, Solr::Date, "date_modified_dtsi"
+        attribute :date_uploaded, Solr::Date, "date_uploaded_dtsi"
+        attribute :create_date, Solr::Date, "system_create_dtsi"
+        attribute :modified_date, Solr::Date, "system_modified_dtsi"
         attribute :embargo_release_date, Solr::Date, Hydra.config.permissions.embargo.release_date
         attribute :lease_expiration_date, Solr::Date, Hydra.config.permissions.lease.expiration_date
       end

data/app/models/hyrax/uploaded_file.rb

@@ -10,7 +10,5 @@ module Hyrax
              class_name: 'JobIoWrapper',
              dependent: :destroy
     belongs_to :user, class_name: '::User'
-
-    before_destroy :remove_file!
   end
 end

data/app/presenters/hyrax/displays_image.rb

@@ -10,20 +10,24 @@ module Hyrax
     #
     # @return [IIIFManifest::DisplayImage] the display image required by the manifest builder.
     def display_image
-      return nil unless ::FileSet.exists?(id) && solr_document.image? && current_ability.can?(:read, id)
-      # @todo this is slow, find a better way (perhaps index iiif url):
-      original_file = ::FileSet.find(id).original_file
+      return nil unless solr_document.image? && current_ability.can?(:read, solr_document)
+
+      latest_file_id = lookup_original_file_id
+
+      return nil unless latest_file_id
 
       url = Hyrax.config.iiif_image_url_builder.call(
-        original_file.id,
+        latest_file_id,
         request.base_url,
         Hyrax.config.iiif_image_size_default
       )
+
       # @see https://github.com/samvera-labs/iiif_manifest
       IIIFManifest::DisplayImage.new(url,
-                                     width: 640,
-                                     height: 480,
-                                     iiif_endpoint: iiif_endpoint(original_file.id))
+                                     format: image_format([]),
+                                     width: width,
+                                     height: height,
+                                     iiif_endpoint: iiif_endpoint(latest_file_id))
     end
 
     private
@@ -35,5 +39,23 @@ module Hyrax
           profile: Hyrax.config.iiif_image_compliance_level_uri
         )
       end
+
+      def image_format(channels)
+        channels.find { |c| c.include?('rgba') }.nil? ? 'jpg' : 'png'
+      end
+
+      def unindexed_current_file_version
+        Rails.logger.warn "Indexed current_file_version for #{id} not found, falling back to Fedora."
+        ActiveFedora::File.uri_to_id(::FileSet.find(id).current_content_version_uri)
+      end
+
+      def lookup_original_file_id
+        result = original_file_id
+        if result.blank?
+          Rails.logger.warn "original_file_id for #{id} not found, falling back to Fedora."
+          result = ActiveFedora::File.uri_to_id(::FileSet.find(id).current_content_version_uri)
+        end
+        result
+      end
   end
 end

data/app/presenters/hyrax/file_set_presenter.rb

@@ -30,8 +30,13 @@ module Hyrax
              :embargo_release_date, :lease_expiration_date,
              :depositor, :keyword, :title_or_label, :keyword,
              :date_created, :date_modified, :itemtype,
+             :original_file_id,
              to: :solr_document
 
+    def alpha_channels
+      []
+    end
+
     def single_use_links
       @single_use_links ||= SingleUseLink.where(itemId: id).map { |link| link_presenter_class.new(link) }
     end

data/app/search_builders/hyrax/embargo_search_builder.rb

@@ -14,7 +14,7 @@ module Hyrax
 
     def only_active_embargoes(solr_params)
       solr_params[:fq] ||= []
-      solr_params[:fq] = 'embargo_release_date_dtsi:*'
+      solr_params[:fq] = 'embargo_release_date_dtsi:[* TO *]'
     end
   end
 end

data/app/search_builders/hyrax/lease_search_builder.rb

@@ -14,7 +14,7 @@ module Hyrax
 
     def only_active_leases(solr_params)
       solr_params[:fq] ||= []
-      solr_params[:fq] = 'lease_expiration_date_dtsi:*'
+      solr_params[:fq] = 'lease_expiration_date_dtsi:[* TO *]'
     end
   end
 end

data/app/services/hyrax/workflow/workflow_schema.rb

@@ -14,47 +14,107 @@ module Hyrax
     # @see Sipity::Notification
     # @see Sipity::Method
     # @see ./lib/generators/hyrax/templates/workflow.json.erb
-    WorkflowSchema = Dry::Validation.Schema do
-      configure do
-        def self.messages
-          Dry::Validation::Messages.default.merge(
-            en: { errors: { constant_name?: 'must be an initialized Ruby constant' } }
-          )
+
+    # If using dry-validation < 1, create a Dry::Validation::Schema for backwards-compatibility.
+    # This schema should never ever change.  If you need to modify it, upgrade to dry-validation >= 1
+    # and use the Dry::Validation::Contract subclass below.
+    if defined? Dry::Validation::Schema
+      Deprecation.warn(self, 'The Dry::Validation::Schema implemenation of Hyrax::Workflow::WorkflowSchema is deprecated. ' \
+                       'Please upgrade to dry-validation >= 1 to use the Dry::Validation::Contract implementation which will be part of Hyrax 3.0')
+      WorkflowSchema = Dry::Validation.Schema do
+        configure do
+          def self.messages
+            Dry::Validation::Messages.default.merge(
+              en: { errors: { constant_name?: 'must be an initialized Ruby constant' } }
+            )
+          end
+
+          def constant_name?(value)
+            value.constantize
+            true
+          rescue NameError
+            false
+          end
         end
 
-        def constant_name?(value)
-          value.constantize
-          true
-        rescue NameError
-          false
+        required(:workflows).each do
+          required(:name).filled(:str?) # Sipity::Workflow#name
+          optional(:label).filled(:str?) # Sipity::Workflow#label
+          optional(:description).filled(:str?) # Sipity::Workflow#description
+          optional(:allows_access_grant).filled(:bool?) # Sipity::Workflow#allows_access_grant?
+          required(:actions).each do
+            schema do
+              required(:name).filled(:str?) # Sipity::WorkflowAction#name
+              required(:from_states).each do
+                schema do
+                  required(:names) { array? { each(:str?) } } # Sipity::WorkflowState#name
+                  required(:roles) { array? { each(:str?) } } # Sipity::Role#name
+                end
+              end
+              optional(:transition_to).filled(:str?) # Sipity::WorkflowState#name
+              optional(:notifications).each do
+                schema do
+                  required(:name).value(:constant_name?) # Sipity::Notification#name
+                  required(:notification_type).value(included_in?: Sipity::Notification.valid_notification_types)
+                  required(:to) { array? { each(:str?) } }
+                  optional(:cc) { array? { each(:str?) } }
+                  optional(:bcc) { array? { each(:str?) } }
+                end
+              end
+              optional(:methods) { array? { each(:str?) } } # See it_behaves_like "a Hyrax workflow method"
+            end
+          end
         end
       end
+    elsif defined? Dry::Validation::Contract
+      # For dry-validation >= 1
+      class WorkflowSchema < Dry::Validation::Contract
+        class Types
+          include Dry::Types()
 
-      required(:workflows).each do
-        required(:name).filled(:str?) # Sipity::Workflow#name
-        optional(:label).filled(:str?) # Sipity::Workflow#label
-        optional(:description).filled(:str?) # Sipity::Workflow#description
-        optional(:allows_access_grant).filled(:bool?) # Sipity::Workflow#allows_access_grant?
-        required(:actions).each do
-          schema do
-            required(:name).filled(:str?) # Sipity::WorkflowAction#name
-            required(:from_states).each do
-              schema do
-                required(:names) { array? { each(:str?) } } # Sipity::WorkflowState#name
-                required(:roles) { array? { each(:str?) } } # Sipity::Role#name
-              end
+          Constant = Types::Class.constructor do |v|
+            begin
+              v.constantize
+            rescue NameError => _err
+              v
             end
-            optional(:transition_to).filled(:str?) # Sipity::WorkflowState#name
-            optional(:notifications).each do
-              schema do
-                required(:name).value(:constant_name?) # Sipity::Notification#name
+          end
+        end
+
+        # Wrap the result for backwards-compatibility. This will be removed in Hyrax 3.0.
+        class ResultWrapper < SimpleDelegator
+          def messages(opts = {})
+            errors(opts)
+          end
+        end
+
+        # Provide a class method for backwards-compatibility. This will be removed in Hyrax 3.0.
+        def self.call(data)
+          ResultWrapper.new(new.call(data))
+        end
+
+        params do
+          required(:workflows).array(:hash) do
+            required(:name).filled(:string) # Sipity::Workflow#name
+            optional(:label).filled(:string) # Sipity::Workflow#label
+            optional(:description).filled(:string) # Sipity::Workflow#description
+            optional(:allows_access_grant).filled(:bool) # Sipity::Workflow#allows_access_grant?
+            required(:actions).array(:hash) do
+              required(:name).filled(:string) # Sipity::WorkflowAction#name
+              required(:from_states).array(:hash) do
+                required(:names) { array? { each(:string) } } # Sipity::WorkflowState#name
+                required(:roles) { array? { each(:string) } } # Sipity::Role#name
+              end
+              optional(:transition_to).filled(:string) # Sipity::WorkflowState#name
+              optional(:notifications).array(:hash) do
+                required(:name).value(Types::Constant) # Sipity::Notification#name
                 required(:notification_type).value(included_in?: Sipity::Notification.valid_notification_types)
-                required(:to) { array? { each(:str?) } }
-                optional(:cc) { array? { each(:str?) } }
-                optional(:bcc) { array? { each(:str?) } }
+                required(:to) { array? { each(:string) } }
+                optional(:cc) { array? { each(:string) } }
+                optional(:bcc) { array? { each(:string) } }
               end
             end
-            optional(:methods) { array? { each(:str?) } } # See it_behaves_like "a Hyrax workflow method"
+            optional(:methods) { array? { each(:string) } } # See it_behaves_like "a Hyrax workflow method"
           end
         end
       end

data/hyrax.gemspec

@@ -30,7 +30,7 @@ SUMMARY
   # http://guides.rubyonrails.org/maintenance_policy.html
   spec.add_dependency 'rails', '~> 5.0'
 
-  spec.add_dependency 'active-fedora', '~> 11.5', '>= 11.5.2'
+  spec.add_dependency 'active-fedora', '>= 11.5.2', '< 12.2'
   spec.add_dependency 'almond-rails', '~> 0.1'
   spec.add_dependency 'awesome_nested_set', '~> 3.1'
   spec.add_dependency 'blacklight', '~> 6.14'
@@ -40,9 +40,9 @@ SUMMARY
   spec.add_dependency 'carrierwave', '~> 1.0'
   spec.add_dependency 'clipboard-rails', '~> 1.5'
   spec.add_dependency 'dry-equalizer', '~> 0.2'
-  spec.add_dependency 'dry-struct', '~> 0.1'
+  spec.add_dependency 'dry-struct', '>= 0.1', '< 2.0'
   spec.add_dependency 'dry-transaction', '~> 0.11'
-  spec.add_dependency 'dry-validation', '~> 0.9'
+  spec.add_dependency 'dry-validation', '>= 0.9', '< 2.0'
   spec.add_dependency 'flipflop', '~> 2.3'
   # Pin more tightly because 0.x gems are potentially unstable
   spec.add_dependency 'flot-rails', '~> 0.0.6'
@@ -58,7 +58,7 @@ SUMMARY
   # Pin more tightly because 0.x gems are potentially unstable
   spec.add_dependency 'kaminari_route_prefix', '~> 0.1.1'
   spec.add_dependency 'legato', '~> 0.3'
-  spec.add_dependency 'linkeddata' # Required for getting values from geonames
+  spec.add_dependency 'linkeddata', '~> 3.1' # Required for getting values from geonames
   spec.add_dependency 'mailboxer', '~> 0.12'
   spec.add_dependency 'nest', '~> 3.1'
   spec.add_dependency 'noid-rails', '~> 3.0.0'
@@ -70,12 +70,14 @@ SUMMARY
   spec.add_dependency 'qa', '~> 2.0' # questioning_authority
   spec.add_dependency 'rails_autolink', '~> 1.1'
   spec.add_dependency 'rdf-rdfxml' # controlled vocabulary importer
+  spec.add_dependency 'rdf-vocab', '< 3.1.5'
   spec.add_dependency 'redis-namespace', '~> 1.5'
   spec.add_dependency 'redlock', '>= 0.1.2'
   spec.add_dependency 'retriable', '>= 2.9', '< 4.0'
   spec.add_dependency 'samvera-nesting_indexer', '~> 2.0'
   spec.add_dependency 'select2-rails', '~> 3.5'
   spec.add_dependency 'signet'
+  spec.add_dependency 'solrizer', '>= 3.4', '< 5'
   spec.add_dependency 'tinymce-rails', '~> 4.1'
 
   # temporary pin to 2.17 due to failures caused in 2.18.0

data/lib/hyrax.rb

@@ -17,6 +17,7 @@ require 'hyrax/engine'
 require 'hyrax/version'
 require 'hyrax/inflections'
 require 'kaminari_route_prefix'
+require 'solrizer'
 
 module Hyrax
   extend ActiveSupport::Autoload

data/lib/hyrax/version.rb

@@ -1,3 +1,3 @@
 module Hyrax
-  VERSION = '2.7.2'.freeze
+  VERSION = '2.8.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyrax
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 2.8.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-07 00:00:00.000000000 Z
+date: 2020-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -34,22 +34,22 @@ dependencies:
   name: active-fedora
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '11.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 11.5.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '12.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '11.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 11.5.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '12.2'
 - !ruby/object:Gem::Dependency
   name: almond-rails
   requirement: !ruby/object:Gem::Requirement
@@ -180,16 +180,22 @@ dependencies:
   name: dry-struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: dry-transaction
   requirement: !ruby/object:Gem::Requirement
@@ -208,16 +214,22 @@ dependencies:
   name: dry-validation
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: flipflop
   requirement: !ruby/object:Gem::Requirement
@@ -422,16 +434,16 @@ dependencies:
   name: linkeddata
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: mailboxer
   requirement: !ruby/object:Gem::Requirement
@@ -592,6 +604,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdf-vocab
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.1.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.1.5
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
@@ -682,6 +708,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: solrizer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: tinymce-rails
   requirement: !ruby/object:Gem::Requirement
@@ -1104,6 +1150,7 @@ files:
 - ".github/stale.yml"
 - ".gitignore"
 - ".hound.yml"
+- ".regen"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_fixme.yml"
@@ -2387,7 +2434,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Hyrax is a front-end based on the robust Samvera framework, providing a user