hyrax 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53d0448b486959ee94b0d0162e0c63ce940ba4e7
-  data.tar.gz: 24c811f8e483eb5de9a5cbb05b763cb45748e0ba
+  metadata.gz: f8ad2991ded6a429bb8dad99fd4f9eccbbc7b74d
+  data.tar.gz: a3aa325263c85f965daf3b36ae3c76feee564dc4
 SHA512:
-  metadata.gz: 8e52f858b31059312c2905af9000b0035424ac47589ff0d5c40a87d6e3b92fd94c35ee9b6456bbebee70fae3804841fcc66b6a913b64e2fb8f47dfad66e1449c
-  data.tar.gz: 16c3b93cdbebcd3c2cbdee9527db865e88d9ad635e46d32979bb337862023a2ecf1992babe2a7ac196510e01f539c5a663706725220b6699a281c94e306e2f95
+  metadata.gz: 953b2193c4e569fd2d54b93f24c54960147a2399aa7967d140e95205536f353fafeb615c65c30e2b771a14d99603d441ec85cd301077e4fe7d1aa2fd26b33751
+  data.tar.gz: 04dd1fbcdf0d254710784c76bc5776ec373d480e350f6723a5ded2557eac36df6d5537baf8cdb13d190a79f590a5744f41ccd0ab0ad0ee31dd0dbe70233022cb

data/README.md

@@ -59,7 +59,7 @@ If you have questions or need help, please email [the Hydra community tech list]
 # Getting started
 
 This document contains instructions specific to setting up an app with __Hyrax
-v1.0.3__. If you are looking for instructions on installing a different
+v1.0.4__. 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.
 
@@ -133,7 +133,7 @@ Rails requires that you have a JavaScript runtime -- for example, nodejs -- inst
 Generate a new Rails application using the template.
 
 ```
-rails new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v1.0.3/template.rb
+rails new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v1.0.4/template.rb
 ```
 
 Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:

data/app/assets/javascripts/hyrax/autocomplete.es6

@@ -11,7 +11,6 @@ export default class Autocomplete {
         new Work(
           element,
           data.autocompleteUrl,
-          data.user,
           element.data('exclude-work')
         )
         break
@@ -21,4 +20,3 @@ export default class Autocomplete {
     }
   }
 }
-

data/app/helpers/hyrax/citations_behaviors/formatters/apa_formatter.rb

@@ -7,28 +7,28 @@ module Hyrax
 
         def format(work)
           text = ''
-
-          # setup formatted author list
-          authors_list = author_list(work).select { |author| !author.blank? }
-          text << format_authors(authors_list)
-          unless text.blank?
-            text = "<span class=\"citation-author\">#{text}</span> "
-          end
-          # Get Pub Date
-          pub_date = setup_pub_date(work)
-          text << format_date(pub_date)
-
-          # setup title info
-          title_info = setup_title_info(work)
-          text << format_title(title_info)
-
-          # Publisher info
-          pub_info = clean_end_punctuation(setup_pub_info(work))
-          text << pub_info unless pub_info.nil?
-          text << "." unless text.blank? || text =~ /\.$/
+          text << authors_text_for(work)
+          text << pub_date_text_for(work)
+          text << add_title_text_for(work)
+          text << add_publisher_text_for(work)
           text.html_safe
         end
 
+        private
+
+          def authors_text_for(work)
+            # setup formatted author list
+            authors_list = author_list(work).reject(&:blank?)
+            author_text = format_authors(authors_list)
+            if author_text.blank?
+              author_text
+            else
+              "<span class=\"citation-author\">#{author_text}</span> "
+            end
+          end
+
+        public
+
         def format_authors(authors_list = [])
           authors_list = Array.wrap(authors_list).collect { |name| abbreviate_name(surname_first(name)).strip }
           text = ''
@@ -44,6 +44,32 @@ module Hyrax
           text
         end
 
+        private
+
+          def pub_date_text_for(work)
+            # Get Pub Date
+            pub_date = setup_pub_date(work)
+            format_date(pub_date)
+          end
+
+          def add_title_text_for(work)
+            # setup title info
+            title_info = setup_title_info(work)
+            format_title(title_info)
+          end
+
+          def add_publisher_text_for(work)
+            # Publisher info
+            pub_info = clean_end_punctuation(setup_pub_info(work))
+            if pub_info.nil?
+              ''
+            else
+              pub_info + "."
+            end
+          end
+
+        public
+
         def format_date(pub_date)
           pub_date.blank? ? "" : "(" + pub_date + "). "
         end

data/app/helpers/hyrax/citations_behaviors/formatters/chicago_formatter.rb

@@ -11,17 +11,16 @@ module Hyrax
           # setup formatted author list
           authors_list = all_authors(work)
           text << format_authors(authors_list)
-          unless text.blank?
+          if text.present?
             text = "<span class=\"citation-author\">#{text}</span>"
           end
           # Get Pub Date
           pub_date = setup_pub_date(work)
           text << " #{pub_date}." unless pub_date.nil?
-          text << "." unless text.blank? || text =~ /\.$/
 
           text << format_title(work.to_s)
           pub_info = setup_pub_info(work, false)
-          text << " #{pub_info}." unless pub_info.blank?
+          text << " #{pub_info}." if pub_info.present?
           text.html_safe
         end
 

data/app/helpers/hyrax/citations_behaviors/formatters/mla_formatter.rb

@@ -9,7 +9,7 @@ module Hyrax
           text = ''
 
           # setup formatted author list
-          authors = author_list(work).select { |author| !author.blank? }
+          authors = author_list(work).reject(&:blank?)
           text << "<span class=\"citation-author\">#{format_authors(authors)}</span>"
           # setup title
           title_info = setup_title_info(work)
@@ -18,8 +18,7 @@ module Hyrax
           # Publication
           pub_info = clean_end_punctuation(setup_pub_info(work, true))
 
-          text << pub_info unless pub_info.blank?
-          text << "." unless text.blank? || text =~ /\.$/
+          text << pub_info + "." if pub_info.present?
           text.html_safe
         end
 
@@ -27,7 +26,7 @@ module Hyrax
           return "" if authors_list.blank?
           authors_list = Array.wrap(authors_list)
           text = concatenate_authors_from(authors_list)
-          unless text.blank?
+          if text.present?
             text << "." unless text =~ /\.$/
             text << " "
           end

data/app/services/hyrax/curation_concern.rb

@@ -1,7 +1,11 @@
 module Hyrax
   class CurationConcern
-    # This attribute is set by Hyrax::Engine
-    class_attribute :actor_factory
+    # You can customize the actor stack, so long as you do so before the actor
+    # is used.  Once it is used, it becomes immutable.
+    # @return [Hyrax::ActorFactory]
+    def self.actor_factory
+      Hyrax::ActorFactory
+    end
 
     # A consumer of this method can inject a different factory
     # into this class in order to change the behavior of this method.

data/app/services/hyrax/file_set_audit_service.rb

@@ -60,7 +60,7 @@ module Hyrax
       # @param [ActiveFedora::File] file to audit
       # @param [Array] log container for messages
       def audit_file(file, log = [])
-        versions = file.has_versions? ? file.versions.all : file
+        versions = file.has_versions? ? file.versions.all : Array.wrap(file)
         versions.each { |v| log << audit_file_version(file.id, v.uri) }
         log
       end

data/hyrax.gemspec

@@ -25,17 +25,17 @@ EOF
   spec.version       = Hyrax::VERSION
   spec.license       = 'Apache-2.0'
 
-  spec.add_dependency 'hydra-head', '>= 10.4.0'
+  spec.add_dependency 'hydra-head', '~> 10.4', '>= 10.4.0'
   spec.add_dependency 'hydra-editor', '~> 3.2'
   spec.add_dependency 'hydra-works', '~> 0.16'
   spec.add_dependency 'hydra-derivatives', '~> 3.3'
-  spec.add_dependency 'browse-everything', '>= 0.10.5'
+  spec.add_dependency 'browse-everything', '~> 0.10', '>= 0.10.5'
   spec.add_dependency 'blacklight', '~> 6.9'
   spec.add_dependency 'blacklight-gallery', '~> 0.7'
   spec.add_dependency 'tinymce-rails', '~> 4.1'
   spec.add_dependency 'tinymce-rails-imageupload', '~> 4.0.17.beta'
   spec.add_dependency 'font-awesome-rails', '~> 4.2'
-  spec.add_dependency 'select2-rails', '~> 3.5.9'
+  spec.add_dependency 'select2-rails', '~> 3.5', '>= 3.5.9'
   spec.add_dependency 'json-schema' # for Arkivio
   spec.add_dependency 'nest', '~> 2.0'
   spec.add_dependency 'mailboxer', '~> 0.12'
@@ -46,12 +46,12 @@ EOF
   spec.add_dependency 'legato', '~> 0.3'
   spec.add_dependency 'posix-spawn'
   spec.add_dependency 'jquery-ui-rails', '~> 5.0'
-  spec.add_dependency 'redis-namespace', '~> 1.5.2'
+  spec.add_dependency 'redis-namespace', '~> 1.5', '>= 1.5.2'
   spec.add_dependency 'flot-rails', '~> 0.0.6'
   spec.add_dependency 'almond-rails', '~> 0.1'
   spec.add_dependency 'qa', '~> 1.0' # questioning_authority
   spec.add_dependency 'flipflop', '~> 2.3'
-  spec.add_dependency 'jquery-datatables-rails', '~> 3.4.0'
+  spec.add_dependency 'jquery-datatables-rails', '~> 3.4', '>= 3.4.0'
   spec.add_dependency 'rdf-rdfxml' # controlled vocabulary importer
   spec.add_dependency 'railties', '~> 5.0'
   spec.add_dependency 'clipboard-rails', '~> 1.5'
@@ -67,7 +67,7 @@ EOF
   spec.add_dependency 'active_attr', '~> 0.9'
   spec.add_dependency 'redlock', '~> 0.1.2'
   spec.add_dependency 'retriable', '>= 2.9', '< 4.0'
-  spec.add_dependency 'active-fedora', '>= 11.3.1'
+  spec.add_dependency 'active-fedora', '~> 11.3', '>= 11.3.1'
   spec.add_dependency 'linkeddata' # Required for getting values from geonames
 
   spec.add_development_dependency 'engine_cart', '~> 1.0'
@@ -84,9 +84,9 @@ EOF
   spec.add_development_dependency "equivalent-xml", '~> 0.5'
   spec.add_development_dependency "jasmine", '~> 2.3'
   spec.add_development_dependency 'rubocop', '~> 0.47.0'
-  spec.add_development_dependency 'rubocop-rspec', '~> 1.10.0'
+  spec.add_development_dependency 'rubocop-rspec', '~> 1.10.0' # intentionally pessimistic
   spec.add_development_dependency 'shoulda-matchers', '~> 3.1'
-  spec.add_development_dependency 'rails-controller-testing', '~> 0'
+  spec.add_development_dependency 'rails-controller-testing'
   spec.add_development_dependency 'webmock'
   spec.add_development_dependency 'i18n-debug' unless ENV['TRAVIS']
   spec.add_development_dependency 'i18n_yaml_sorter' unless ENV['TRAVIS']

data/lib/hyrax/engine.rb

@@ -66,8 +66,6 @@ module Hyrax
         ActiveFedora::Noid.config.minter_class = c.noid_minter_class
         ActiveFedora::Noid.config.statefile = c.minter_statefile
       end
-
-      Hyrax::CurationConcern.actor_factory = Hyrax::ActorFactory
     end
 
     initializer 'hyrax.assets.precompile' do |app|

data/lib/hyrax/version.rb

@@ -1,3 +1,3 @@
 module Hyrax
-  VERSION = '1.0.3'.freeze
+  VERSION = '1.0.4'.freeze
 end

data/spec/services/hyrax/file_set_audit_service_spec.rb

@@ -22,6 +22,20 @@ describe Hyrax::FileSetAuditService do
     specify 'returns a single result' do
       expect(subject.length).to eq(1)
     end
+    context 'when a file has two versions' do
+      before do
+        Hyrax::VersioningService.create(f.original_file) # create a second version -- the factory creates the first version when it attaches +content+
+      end
+      specify 'returns two log results' do
+        expect(subject.count).to eq(2)
+      end
+    end
+    context "when a file has no versions (i.e. has_versions? == false)" do
+      subject { service_by_object.send(:audit_file, Hydra::PCDM::File.new) }
+      specify "returns one log result" do
+        expect(subject.count).to eq(1)
+      end
+    end
   end
 
   describe '#audit_file_version' do

data/spec/views/hyrax/citations/work.html.erb_spec.rb

@@ -1,84 +1,174 @@
+RSpec.describe 'hyrax/citations/work.html.erb', type: :view do
+  context "full work metadata" do
+    let(:object_profile) { ["{\"id\":\"999\"}"] }
+    let(:contributor) { ['Gandalf Grey'] }
+    let(:creator)     { ['Bilbo Baggins', 'Baggins, Frodo'] }
+    let(:solr_document) do
+      SolrDocument.new(
+        id: '999',
+        object_profile_ssm: object_profile,
+        has_model_ssim: ['GenericWork'],
+        human_readable_type_tesim: ['Generic Work'],
+        contributor_tesim: contributor,
+        creator_tesim: creator,
+        license_tesim: ['http://creativecommons.org/licenses/by/3.0/us/'],
+        title_tesim: ['the Roared about the Langs'],
+        based_near_tesim: ['London'],
+        date_created_tesim: ['1969']
+      )
+    end
+    let(:ability) { nil }
+    let(:presenter) do
+      Hyrax::WorkShowPresenter.new(solr_document, ability)
+    end
 
-describe 'hyrax/citations/work.html.erb', type: :view do
-  let(:object_profile) { ["{\"id\":\"999\"}"] }
-  let(:contributor) { ['Gandalf Grey'] }
-  let(:creator)     { ['Bilbo Baggins', 'Baggins, Frodo'] }
-  let(:solr_document) do
-    SolrDocument.new(
-      id: '999',
-      object_profile_ssm: object_profile,
-      has_model_ssim: ['GenericWork'],
-      human_readable_type_tesim: ['Generic Work'],
-      contributor_tesim: contributor,
-      creator_tesim: creator,
-      rights_tesim: ['http://creativecommons.org/licenses/by/3.0/us/'],
-      title_tesim: ['the Roared about the Langs'],
-      based_near_tesim: ['London'],
-      date_created_tesim: ['1969']
-    )
-  end
-  let(:ability) { nil }
-  let(:presenter) do
-    Hyrax::WorkShowPresenter.new(solr_document, ability)
-  end
+    describe 'citations' do
+      let(:page) { Capybara::Node::Simple.new(rendered) }
+      let(:citation) { page.find(citation_selector) }
+      let(:title_selector) { "#{citation_selector} > i.citation-title" }
+      let(:author_selector) { "#{citation_selector} > .citation-author" }
 
-  describe 'citations' do
-    let(:page) { Capybara::Node::Simple.new(rendered) }
-    let(:citation) { page.find(citation_selector) }
-    let(:title_selector) { "#{citation_selector} > i.citation-title" }
-    let(:author_selector) { "#{citation_selector} > .citation-author" }
-    before do
-      assign(:presenter, presenter)
-      render
-    end
+      before do
+        assign(:presenter, presenter)
+        render
+      end
 
-    context 'in APA style' do
-      let(:citation_selector) { 'span.apa-citation' }
-      let(:formatted_title) { 'the Roared about the Langs.' }
-      # entities will be unescaped
-      let(:authors) { 'Baggins, B., & Baggins, F.' }
-      it 'exports title' do
-        expect(page).to have_selector(title_selector, count: 1)
-        expect(page.find(title_selector)).to have_content(formatted_title)
+      context 'in APA style' do
+        let(:citation_selector) { 'span.apa-citation' }
+        let(:formatted_title) { 'the Roared about the Langs.' }
+        # entities will be unescaped
+        let(:authors) { 'Baggins, B., & Baggins, F.' }
+
+        it 'exports title' do
+          expect(page).to have_selector(title_selector, count: 1)
+          expect(page.find(title_selector)).to have_content(formatted_title)
+        end
+        it 'exports authors' do
+          expect(page).to have_selector(author_selector, count: 1)
+          expect(page.find(author_selector)).to have_content(authors)
+        end
+        it 'cites' do
+          expect(citation.text).to eql("#{authors} (1969). #{formatted_title} London.")
+        end
       end
-      it 'exports authors' do
-        expect(page).to have_selector(author_selector, count: 1)
-        expect(page.find(author_selector)).to have_content(authors)
+      context 'in Chicago style' do
+        let(:citation_selector) { 'span.chicago-citation' }
+        let(:formatted_title) { 'The Roared about the Langs.' }
+        let(:authors) { 'Baggins, Bilbo, and Frodo Baggins.' }
+
+        it 'exports title' do
+          expect(page).to have_selector(title_selector, count: 1)
+          expect(page.find(title_selector)).to have_content(formatted_title)
+        end
+        it 'exports authors' do
+          expect(page).to have_selector(author_selector, count: 1)
+          expect(page.find(author_selector)).to have_content(authors)
+        end
+        it 'cites' do
+          expect(citation.text).to eql("#{authors} 1969. #{formatted_title} London.")
+        end
       end
-      it 'cites' do
-        expect(citation.text).to eql("#{authors} (1969). #{formatted_title} London.")
+      context 'in MLA style' do
+        let(:citation_selector) { 'span.mla-citation' }
+        let(:formatted_title) { 'the Roared About the Langs.' }
+        let(:authors) { 'Baggins, Bilbo, and Frodo Baggins.' }
+
+        it 'exports title' do
+          expect(page).to have_selector(title_selector, count: 1)
+          expect(page.find(title_selector)).to have_content(formatted_title)
+        end
+        it 'exports authors' do
+          expect(page).to have_selector(author_selector, count: 1)
+          expect(page.find(author_selector)).to have_content(authors)
+        end
+        it 'cites' do
+          expect(citation.text).to eql("#{authors} #{formatted_title} London, 1969.")
+        end
       end
     end
-    context 'in Chicago style' do
-      let(:citation_selector) { 'span.chicago-citation' }
-      let(:formatted_title) { 'The Roared about the Langs.' }
-      let(:authors) { 'Baggins, Bilbo, and Frodo Baggins.' }
-      it 'exports title' do
-        expect(page).to have_selector(title_selector, count: 1)
-        expect(page.find(title_selector)).to have_content(formatted_title)
-      end
-      it 'exports authors' do
-        expect(page).to have_selector(author_selector, count: 1)
-        expect(page.find(author_selector)).to have_content(authors)
-      end
-      it 'cites' do
-        expect(citation.text).to eql("#{authors} 1969. #{formatted_title} London.")
-      end
+  end
+
+  context "minimal work metatdata" do
+    let(:object_profile) { ["{\"id\":\"999\"}"] }
+    let(:creator) { ['Bilbo Baggins', 'Baggins, Frodo'] }
+    let(:solr_document) do
+      SolrDocument.new(
+        id: '999',
+        object_profile_ssm: object_profile,
+        has_model_ssim: ['GenericWork'],
+        human_readable_type_tesim: ['Generic Work'],
+        creator_tesim: creator,
+        license_tesim: ['http://creativecommons.org/licenses/by/3.0/us/'],
+        title_tesim: ['the Roared about the Langs']
+      )
     end
-    context 'in MLA style' do
-      let(:citation_selector) { 'span.mla-citation' }
-      let(:formatted_title) { 'the Roared About the Langs.' }
-      let(:authors) { 'Baggins, Bilbo, and Frodo Baggins.' }
-      it 'exports title' do
-        expect(page).to have_selector(title_selector, count: 1)
-        expect(page.find(title_selector)).to have_content(formatted_title)
+    let(:ability) { nil }
+    let(:presenter) do
+      Hyrax::WorkShowPresenter.new(solr_document, ability)
+    end
+
+    describe 'citations' do
+      let(:page) { Capybara::Node::Simple.new(rendered) }
+      let(:citation) { page.find(citation_selector) }
+      let(:title_selector) { "#{citation_selector} > i.citation-title" }
+      let(:author_selector) { "#{citation_selector} > .citation-author" }
+
+      before do
+        assign(:presenter, presenter)
+        render
       end
-      it 'exports authors' do
-        expect(page).to have_selector(author_selector, count: 1)
-        expect(page.find(author_selector)).to have_content(authors)
+
+      context 'in APA style' do
+        let(:citation_selector) { 'span.apa-citation' }
+        let(:formatted_title) { 'the Roared about the Langs.' }
+        # entities will be unescaped
+        let(:authors) { 'Baggins, B., & Baggins, F.' }
+
+        it 'exports title' do
+          expect(page).to have_selector(title_selector, count: 1)
+          expect(page.find(title_selector)).to have_content(formatted_title)
+        end
+        it 'exports authors' do
+          expect(page).to have_selector(author_selector, count: 1)
+          expect(page.find(author_selector)).to have_content(authors)
+        end
+        it 'cites' do
+          expect(citation.text).to eql("#{authors} #{formatted_title} ")
+        end
       end
-      it 'cites' do
-        expect(citation.text).to eql("#{authors} #{formatted_title} London, 1969.")
+      context 'in Chicago style' do
+        let(:citation_selector) { 'span.chicago-citation' }
+        let(:formatted_title) { 'The Roared about the Langs.' }
+        let(:authors) { 'Baggins, Bilbo, and Frodo Baggins.' }
+
+        it 'exports title' do
+          expect(page).to have_selector(title_selector, count: 1)
+          expect(page.find(title_selector)).to have_content(formatted_title)
+        end
+        it 'exports authors' do
+          expect(page).to have_selector(author_selector, count: 1)
+          expect(page.find(author_selector)).to have_content(authors)
+        end
+        it 'cites' do
+          expect(citation.text).to eql("#{authors} #{formatted_title}")
+        end
+      end
+      context 'in MLA style' do
+        let(:citation_selector) { 'span.mla-citation' }
+        let(:formatted_title) { 'the Roared About the Langs.' }
+        let(:authors) { 'Baggins, Bilbo, and Frodo Baggins.' }
+
+        it 'exports title' do
+          expect(page).to have_selector(title_selector, count: 1)
+          expect(page.find(title_selector)).to have_content(formatted_title)
+        end
+        it 'exports authors' do
+          expect(page).to have_selector(author_selector, count: 1)
+          expect(page.find(author_selector)).to have_content(authors)
+        end
+        it 'cites' do
+          expect(citation.text).to eql("#{authors} #{formatted_title} ")
+        end
       end
     end
   end

data/template.rb

@@ -1,4 +1,4 @@
-gem 'hyrax', '1.0.3'
+gem 'hyrax', '1.0.4'
 
 run 'bundle install'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyrax
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Justin Coyne
@@ -14,12 +14,15 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-19 00:00:00.000000000 Z
+date: 2017-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
     - - ">="
       - !ruby/object:Gem::Version
         version: 10.4.0
@@ -27,6 +30,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
     - - ">="
       - !ruby/object:Gem::Version
         version: 10.4.0
@@ -76,6 +82,9 @@ dependencies:
   name: browse-everything
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.5
@@ -83,6 +92,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.5
@@ -161,6 +173,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.5.9
   type: :runtime
@@ -168,6 +183,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.5.9
 - !ruby/object:Gem::Dependency
@@ -315,6 +333,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.2
   type: :runtime
@@ -322,6 +343,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.2
 - !ruby/object:Gem::Dependency
@@ -385,6 +409,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.4.0
   type: :runtime
@@ -392,6 +419,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.4.0
 - !ruby/object:Gem::Dependency
@@ -626,6 +656,9 @@ dependencies:
   name: active-fedora
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 11.3.1
@@ -633,6 +666,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 11.3.1
@@ -884,14 +920,14 @@ dependencies:
   name: rails-controller-testing
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -2591,7 +2627,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Hyrax is a front-end based on the robust Samvera framework, providing a user