hyrax 2.9.5 → 2.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0148443e7ca6987d77b7ccbad46c89c895ae60e226565819b095293884c040cc'
-  data.tar.gz: 5a2cfda462e5415dc6c736dcbaaf4bb7b7a202fa0afe54c2819026f4559d7942
+  metadata.gz: eef9eee3ec09eb7e1d4ce28266b7a925c1d7a8b71a91c2d73241582c8023f6da
+  data.tar.gz: 10cd6ddbec25e1e76fb178eb6f58afd65e3d84567ffef55b370cc459424d0c75
 SHA512:
-  metadata.gz: faaee31b6dec44292d47981fe77d22bc9f8f40865670b9f2b1a470aca00b10193cb01931c1084a9622cb3a4e6fca5803c1b6a8a77965dca75619cc59f5da1d67
-  data.tar.gz: b3232036171e55e8166da5d4886d52b91fe6ce3f0c05018508deee6b594491df87b0d7b925b477e4d8a6a5134c0233026433d4df47d9902c28e074614dd3e18d
+  metadata.gz: 7e626a4775a4d33d8a73bd758c24975884a54a3dddcfa5b4e4f25e454b68f3ea47f2414e16fe8dab6389f869810e67afc36a40a85861cde73c13c43f0e512818
+  data.tar.gz: 550869d00a885866fc5995e36982b862822c0325c2ab0a541e7902fb0b4d78cb7808f231ea330507d06de56e5ae0c3a428ef94600598074219c68415d89e3133

data/.circleci/config.yml

@@ -101,7 +101,7 @@ jobs:
       - attach_workspace:
           at: ~/
       - samvera/install_solr_core:
-          solr_config_path: .internal_test_app/solr/config
+          solr_config_path: .internal_test_app/solr/conf
       # Rerun bundler in case this is a different ruby version than bundle and build steps
       - samvera/bundle_for_gem:
           ruby_version: << parameters.ruby_version >>

data/README.md

@@ -63,7 +63,7 @@ The Samvera community is here to help. Please see our [support guide](./.github/
 # Getting started
 
 This document contains instructions specific to setting up an app with __Hyrax
-v2.5.0__. If you are looking for instructions on installing a different
+v2.9.6__. If you are looking for instructions on installing a different
 version, be sure to select the appropriate branch or tag from the drop-down
 menu above.
 
@@ -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.2.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v2.9.5/template.rb
+rails _5.2.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v2.9.6/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/works_controller_behavior.rb

@@ -10,11 +10,12 @@ module Hyrax
       with_themed_layout :decide_layout
       copy_blacklight_config_from(::CatalogController)
 
-      class_attribute :_curation_concern_type, :show_presenter, :work_form_service, :search_builder_class, :iiif_manifest_builder
+      class_attribute :_curation_concern_type, :show_presenter, :work_form_service, :search_builder_class
+      class_attribute :iiif_manifest_builder, instance_accessor: false
       self.show_presenter = Hyrax::WorkShowPresenter
       self.work_form_service = Hyrax::WorkFormService
       self.search_builder_class = WorkSearchBuilder
-      self.iiif_manifest_builder = (Flipflop.cache_work_iiif_manifest? ? Hyrax::CachingIiifManifestBuilder.new : Hyrax::ManifestBuilderService.new)
+      self.iiif_manifest_builder = nil
       attr_accessor :curation_concern
       helper_method :curation_concern, :contextual_path
 
@@ -140,7 +141,8 @@ module Hyrax
     private
 
       def iiif_manifest_builder
-        self.class.iiif_manifest_builder
+        self.class.iiif_manifest_builder ||
+          (Flipflop.cache_work_iiif_manifest? ? Hyrax::CachingIiifManifestBuilder.new : Hyrax::ManifestBuilderService.new)
       end
 
       def iiif_manifest_presenter

data/app/views/catalog/_search_form.html.erb

@@ -35,9 +35,9 @@
               <%= link_to t("hyrax.search.form.option.my_collections.label_long"), "#",
                   data: { "search-option" => hyrax.my_collections_path, "search-label" => t("hyrax.search.form.option.my_collections.label_short") } %>
             </li>
-          <% end %>
+          </ul>
+        <% end %>
 
-        </ul>
       </div><!-- /.input-group-btn -->
     </div><!-- /.input-group -->
     

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.2', '< 12.2'
+  spec.add_dependency 'active-fedora', '>= 11.5.2', '< 13'
   spec.add_dependency 'almond-rails', '~> 0.1'
   spec.add_dependency 'awesome_nested_set', '~> 3.1'
   spec.add_dependency 'blacklight', '~> 6.14'

data/lib/generators/hyrax/install_generator.rb

@@ -34,7 +34,7 @@ module Hyrax
 
     def run_required_generators
       say_status('info', '[Hyrax] GENERATING BLACKLIGHT', :blue)
-      generate 'blacklight:install --devise'
+      generate 'blacklight:install --devise --skip-solr'
       say_status('info', '[Hyrax] GENERATING HYDRA-HEAD', :blue)
       generate 'hydra:head -f'
       generate "hyrax:models#{options[:force] ? ' -f' : ''}"

data/lib/hyrax/version.rb

@@ -1,3 +1,3 @@
 module Hyrax
-  VERSION = '2.9.5'.freeze
+  VERSION = '2.9.6'.freeze
 end

data/lib/hyrax.rb

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

data/template.rb

@@ -1,6 +1,6 @@
 # Hack for https://github.com/rails/rails/issues/35153
 gsub_file 'Gemfile', /^gem ["']sqlite3["']$/, 'gem "sqlite3", "~> 1.3.0"'
-gem 'hyrax', '2.9.5'
+gem 'hyrax', '2.9.6'
 run 'bundle install'
 generate 'hyrax:install', '-f'
 rails_command 'db:migrate'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyrax
 version: !ruby/object:Gem::Version
-  version: 2.9.5
+  version: 2.9.6
 platform: ruby
 authors:
 - Justin Coyne
@@ -14,7 +14,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-07 00:00:00.000000000 Z
+date: 2021-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -39,7 +39,7 @@ dependencies:
         version: 11.5.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '12.2'
+        version: '13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: 11.5.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '12.2'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: almond-rails
   requirement: !ruby/object:Gem::Requirement