hyrax 2.0.0.beta2 → 2.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1cd321b1dc4e68407d13358c574ce8fe0a0d5c9
-  data.tar.gz: 92530f677f3c9cedb6d6c88446437cf9742596a1
+  metadata.gz: 27103abf150fd3dd2b63b38050aef6931771f425
+  data.tar.gz: 0c4d916191c24c29f57d8c592d347b3b1d6d1ae3
 SHA512:
-  metadata.gz: a7aad9a39bc1ff847e9e40ddcdbe7c3eebd24a115ba5967b84cf1482e9225f87f29435a65a19ad4c10f39b4fe4401612ad92dc2d30a42ae4da5df249291c4574
-  data.tar.gz: 740acb400efae6271442fdca1b88506f86cfccbbd6efff94c2a2e1641c78d3fad59d79841c527f2393dd1478632c8ce1098d33c0aa978167e333d94801695434
+  metadata.gz: b216a95f0c59c6b2c89c967766a13130836d5d2bfba53033527f16d8ae6ff7fe4e6699467a9aa5a30e294749e48d66cc760894ed6b733df37c388b6944ba56e2
+  data.tar.gz: 51e8e2356363bbb696144a0c84b9241cb7f8a40f8846878d80dda8385c728f191f6c42a741d31f7aa6203137322150c83d128bb8e66d9d90732771949c2788f9

data/.rubocop_fixme.yml

@@ -148,3 +148,35 @@ RSpec/AnyInstance:
     - 'spec/services/hyrax/workflow/sipity_actions_generator_spec.rb'
     - 'spec/services/hyrax/workflow/state_machine_generator_spec.rb'
     - 'spec/services/hyrax/workflow/workflow_permissions_generator_spec.rb'
+
+# Offense count: 51
+RSpec/ExpectInHook:
+  Enabled: false
+
+# Offense count: 31
+RSpec/LetBeforeExamples:
+  Exclude:
+    - 'spec/forms/hyrax/forms/collection_form_spec.rb'
+    - 'spec/presenters/hyrax/collection_presenter_spec.rb'
+    - 'spec/presenters/hyrax/trophy_presenter_spec.rb'
+    - 'spec/services/hyrax/query_service_spec.rb'
+    - 'spec/services/hyrax/workflow/action_taken_service_spec.rb'
+    - 'spec/services/hyrax/workflow/notification_service_spec.rb'
+
+# Offense count: 27
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: and_return, block
+RSpec/ReturnFromStub:
+  Exclude:
+    - 'spec/controllers/hyrax/api/items_controller_spec.rb'
+    - 'spec/controllers/hyrax/file_sets_controller_spec.rb'
+    - 'spec/lib/hyrax/arkivo/create_subscription_job_spec.rb'
+    - 'spec/models/file_set_spec.rb'
+    - 'spec/presenters/hyrax/admin_set_options_presenter_spec.rb'
+    - 'spec/routing/api_route_spec.rb'
+    - 'spec/views/_user_util_links.html.erb_spec.rb'
+    - 'spec/views/hyrax/base/_attributes.html.erb_spec.rb'
+    - 'spec/views/hyrax/base/_form.html.erb_spec.rb'
+    - 'spec/views/hyrax/base/file_manager.html.erb_spec.rb'
+    - 'spec/views/hyrax/dashboard/profiles/edit.html.erb_spec.rb'
+    - 'spec/views/hyrax/users/_user_info.html.erb_spec.rb'

data/.solr_wrapper

@@ -1,5 +1,7 @@
 # Place any default configuration for solr_wrapper here
 # port: 8983
+# TODO: Relax this when we're Solr 7-compliant
+version: 6.6.1
 collection:
   persist: true
   dir: solr/config/

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.0.0.beta2__. If you are looking for instructions on installing a different
+v2.0.0.beta3__. 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.
 
@@ -160,7 +160,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.0.5_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v2.0.0.beta2/template.rb
+rails _5.0.5_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v2.0.0.beta3/template.rb
 ```
 
 Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:
@@ -255,6 +255,8 @@ development:
   url: redis://localhost:6379
 ```
 
+Note that the Hyrax Management Guide contains additional information on [how to configure ActionCable in production environments](https://github.com/samvera/hyrax/wiki/Hyrax-Management-Guide#notifications).
+
 # Managing a Hyrax-based app
 
 The [Hyrax Management Guide](https://github.com/samvera/hyrax/wiki/Hyrax-Management-Guide) provides tips for how to manage, customize, and enhance your Hyrax application, including guidance specific to:

data/app/assets/javascripts/hyrax/app.js.erb

@@ -88,6 +88,9 @@ Hyrax = {
 
     // ActionCable for user notifications. This is displayed in the navbar.
     notifications: function() {
+        // Do not create a consumer if user is not logged in
+        if ($("meta[name='current-user']").length === 0)
+            return;
         var consumer = ActionCable.createConsumer("<%= Hyrax::Engine.routes.url_helpers.notifications_endpoint_path %>");
         consumer.subscriptions.create("Hyrax::NotificationsChannel", {
             connected: function(data) {

data/app/channels/hyrax/application_cable/connection.rb

@@ -20,6 +20,8 @@ module Hyrax
 
         def user_id
           session['warden.user.user.key'][0][0]
+        rescue NoMethodError
+          nil
         end
 
         def session

data/app/jobs/stream_notifications_job.rb

@@ -1,5 +1,7 @@
 class StreamNotificationsJob < Hyrax::ApplicationJob
   def perform(users)
+    # Do not use the ActionCable machinery if the feature is disabled
+    return unless Hyrax.config.realtime_notifications?
     Array.wrap(users).each do |user|
       mailbox = UserMailbox.new(user)
       Hyrax::NotificationsChannel.broadcast_to(user,

data/app/presenters/hyrax/presents_attributes.rb

@@ -11,6 +11,7 @@ module Hyrax
     #   you can explicitly set the URL's search field name
     # @option options [String] :label The default label for the field if no translation is found
     # @option options [TrueClass, FalseClass] :include_empty should we display a row if there are no values?
+    # @option options [String] :work_type name of work type class (e.g., "GenericWork")
     def attribute_to_html(field, options = {})
       unless respond_to?(field)
         Rails.logger.warn("#{self.class} attempted to render #{field}, but no method exists with that name.")

data/app/renderers/hyrax/renderers/attribute_renderer.rb

@@ -38,8 +38,10 @@ module Hyrax
       #   name. Can be overridden if more complicated logic is needed.
       def label
         translate(
-          :"blacklight.search.fields.show.#{field}",
-          default: [:"blacklight.search.fields.#{field}", options.fetch(:label, field.to_s.humanize)]
+          :"blacklight.search.fields.#{work_type_label_key}.show.#{field}",
+          default: [:"blacklight.search.fields.show.#{field}",
+                    :"blacklight.search.fields.#{field}",
+                    options.fetch(:label, field.to_s.humanize)]
         )
       end
 
@@ -65,6 +67,10 @@ module Hyrax
         def li_value(value)
           auto_link(ERB::Util.h(value))
         end
+
+        def work_type_label_key
+          options[:work_type] ? options[:work_type].underscore : nil
+        end
     end
   end
 end

data/app/views/layouts/_head_tag_content.html.erb

@@ -1,6 +1,11 @@
 <%= csrf_meta_tag %>
 <meta charset="utf-8" />
-
+<%# Only display meta tag, which enables creation of the ActionCable
+consumer, when realtime notifications are enabled and the user is
+signed in %>
+<% if Hyrax.config.realtime_notifications? && signed_in? %>
+    <%= tag :meta, name: 'current-user', data: { user_key: current_user.user_key } %>
+<% end %>
 <!-- added for use on small devices like phones -->
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
 <link rel="resourcesync" href="<%= hyrax.capability_list_url %>"/>

data/config/routes.rb

@@ -92,9 +92,11 @@ Hyrax::Engine.routes.draw do
       delete 'delete_all'
     end
   end
-  namespace :notifications do
-    # WebSocket for notifications
-    mount ActionCable.server => 'endpoint', as: :endpoint
+  if Hyrax.config.realtime_notifications?
+    namespace :notifications do
+      # WebSocket for notifications
+      mount ActionCable.server => 'endpoint', as: :endpoint
+    end
   end
 
   # User profile

data/hyrax.gemspec

@@ -40,8 +40,8 @@ EOF
   spec.add_dependency 'blacklight-gallery', '~> 0.7'
   spec.add_dependency 'tinymce-rails', '~> 4.1'
   spec.add_dependency 'font-awesome-rails', '~> 4.2'
-  spec.add_dependency 'select2-rails', '~> 3.5.9'
-  spec.add_dependency 'json-schema' # for Arkivio
+  spec.add_dependency 'select2-rails', '~> 3.5'
+  spec.add_dependency 'json-schema' # for Arkivo
   spec.add_dependency 'nest', '~> 2.0'
   spec.add_dependency 'mailboxer', '~> 0.12'
   spec.add_dependency 'carrierwave', '~> 1.0'
@@ -51,18 +51,20 @@ 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'
+  # Pin more tightly because 0.x gems are potentially unstable
   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'
   spec.add_dependency 'rdf-rdfxml' # controlled vocabulary importer
   spec.add_dependency 'clipboard-rails', '~> 1.5'
   spec.add_dependency 'rails_autolink', '~> 1.1'
   spec.add_dependency 'active_fedora-noid', '~> 2.0', '>= 2.0.2'
   spec.add_dependency 'awesome_nested_set', '~> 3.1'
   spec.add_dependency 'breadcrumbs_on_rails', '~> 3.0'
+  # Pin more tightly because 0.x gems are potentially unstable
   spec.add_dependency 'kaminari_route_prefix', '~> 0.1.1'
   spec.add_dependency 'power_converter', '~> 0.1', '>= 0.1.2'
   spec.add_dependency 'dry-validation', '~> 0.9'
@@ -88,8 +90,18 @@ EOF
   spec.add_development_dependency "factory_girl_rails", '~> 4.4'
   spec.add_development_dependency "equivalent-xml", '~> 0.5'
   spec.add_development_dependency "jasmine", '~> 2.3'
+  # Pin rubocop and rubocop-rspec tightly. Minor-level version bumps
+  # in these gems cause Rubocop violations, and those violations cause
+  # continuous integration builds to fail, and those failures prevent
+  # us from merging pull requests. As a community, we have decided
+  # that it is not reasonable to manage style violations to be dealt
+  # with in a pull request *unless* said pull request's intent is to
+  # bring the codebase in further alignment with community style
+  # conventions. This allows us to take a managed approach to code
+  # style -- we choose to update style when we wish, not when a
+  # minor-level version bump in a dependency comes out.
   spec.add_development_dependency 'rubocop', '~> 0.49.1'
-  spec.add_development_dependency 'rubocop-rspec', '~> 1.15.0'
+  spec.add_development_dependency 'rubocop-rspec', '~> 1.16.0'
   spec.add_development_dependency 'shoulda-matchers', '~> 3.1'
   spec.add_development_dependency 'rails-controller-testing', '~> 0'
   spec.add_development_dependency 'webmock'

data/lib/generators/hyrax/templates/config/hyrax.rb

@@ -89,6 +89,9 @@ Hyrax.config do |config|
   # of Zotero-managed research items.
   # config.arkivo_api = false
 
+  # Stream realtime notifications to users in the browser
+  # config.realtime_notifications = true
+
   # Location autocomplete uses geonames to search for named regions
   # Username for connecting to geonames
   # config.geonames_username = ''

data/lib/hyrax/configuration.rb

@@ -271,6 +271,22 @@ module Hyrax
       @arkivo_api ||= false
     end
 
+    # rubocop:disable Metrics/LineLength
+    attr_writer :realtime_notifications
+    def realtime_notifications?
+      # Coerce @realtime_notifications to false if server software
+      # does not support WebSockets, and warn the user that we are
+      # overriding the value in their config unless it's already
+      # flipped to false
+      if ENV.fetch('SERVER_SOFTWARE', '').match(/Apache.*Phusion_Passenger/).present?
+        Rails.logger.warn('Cannot enable realtime notifications atop Passenger + Apache. Coercing `Hyrax.config.realtime_notifications` to `false`. Set this value to `false` in config/initializers/hyrax.rb to stop seeing this warning.') unless @realtime_notifications == false
+        @realtime_notifications = false
+      end
+      return @realtime_notifications unless @realtime_notifications.nil?
+      @realtime_notifications = true
+    end
+    # rubocop:enable Metrics/LineLength
+
     def geonames_username=(username)
       Qa::Authorities::Geonames.username = username
     end

data/lib/hyrax/version.rb

@@ -1,3 +1,3 @@
 module Hyrax
-  VERSION = '2.0.0.beta2'.freeze
+  VERSION = '2.0.0.beta3'.freeze
 end

data/spec/channels/hyrax/application_cable/connection_spec.rb

@@ -21,6 +21,12 @@ RSpec.describe Hyrax::ApplicationCable::Connection, no_clean: true do
     end
 
     context 'when user is not found' do
+      # rubocop:disable RSpec/SubjectStub
+      before do
+        allow(subject).to receive(:session).and_raise(NoMethodError)
+      end
+      # rubocop:enable RSpec/SubjectStub
+
       let(:user_id) { nil }
 
       it 'rejects the unauthorized connection' do

data/spec/jobs/import_url_job_spec.rb

@@ -17,8 +17,14 @@ RSpec.describe ImportUrlJob do
   before do
     allow(Hyrax::Actors::FileSetActor).to receive(:new).with(file_set, user).and_return(actor)
 
+    response_headers = { 'Content-Type' => 'image/png', 'Content-Length' => File.size(File.expand_path(file_path, __FILE__)) }
+
+    stub_request(:head, "http://example.org#{file_hash}").to_return(
+      body: "", status: 200, headers: response_headers
+    )
+
     stub_request(:get, "http://example.org#{file_hash}").to_return(
-      body: File.open(File.expand_path(file_path, __FILE__)).read, status: 200, headers: { 'Content-Type' => 'image/png' }
+      body: File.open(File.expand_path(file_path, __FILE__)).read, status: 200, headers: response_headers
     )
   end
 

data/spec/jobs/stream_notifications_job_spec.rb

@@ -1,4 +1,10 @@
 RSpec.describe StreamNotificationsJob do
+  let(:realtime_notifications) { true }
+
+  before do
+    allow(Hyrax.config).to receive(:realtime_notifications?).and_return(realtime_notifications)
+  end
+
   describe '#perform' do
     context 'with zero users' do
       let(:users) { nil }
@@ -25,6 +31,15 @@ RSpec.describe StreamNotificationsJob do
                 notifications_label: "You've got mail!")
         described_class.perform_now(users)
       end
+
+      context 'when realtime notifications feature is disabled' do
+        let(:realtime_notifications) { false }
+
+        it 'does not broadcast' do
+          expect(Hyrax::NotificationsChannel).not_to receive(:broadcast_to)
+          described_class.perform_now(users)
+        end
+      end
     end
   end
 end

data/spec/lib/hyrax/configuration_spec.rb

@@ -50,6 +50,8 @@ RSpec.describe Hyrax::Configuration do
   it { is_expected.to respond_to(:permission_levels) }
   it { is_expected.to respond_to(:permission_options) }
   it { is_expected.to respond_to(:persistent_hostpath) }
+  it { is_expected.to respond_to(:realtime_notifications?) }
+  it { is_expected.to respond_to(:realtime_notifications=) }
   it { is_expected.to respond_to(:redis_namespace) }
   it { is_expected.to respond_to(:subject_prefix) }
   it { is_expected.to respond_to(:translate_id_to_uri) }

data/spec/renderers/hyrax/renderers/attribute_renderer_spec.rb

@@ -72,4 +72,28 @@ RSpec.describe Hyrax::Renderers::AttributeRenderer do
       it { expect(subject).to be_equivalent_to(expected) }
     end
   end
+
+  describe "#label" do
+    subject { renderer }
+
+    context 'with work type option' do
+      let(:work_type) { "GenericWork".underscore }
+      let(:renderer) { described_class.new(field, ['Bob', 'Jessica'], work_type: work_type) }
+
+      context 'no work type specific label' do
+        it { expect(subject.label).to eq(field.to_s.humanize) }
+      end
+      context 'work type specific label' do
+        let(:work_type_name_label) { "Appellation" }
+
+        before do
+          allow(I18n).to receive(:translate).and_call_original
+          allow(I18n).to receive(:translate).with(:"blacklight.search.fields.#{work_type}.show.#{field}", Hash) do
+            work_type_name_label
+          end
+        end
+        it { expect(subject.label).to eq(work_type_name_label) }
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -140,7 +140,7 @@ RSpec.configure do |config|
     Hyrax.config.enable_noids = false
   end
 
-  config.before :each do |example|
+  config.before do |example|
     if example.metadata[:type] == :feature && Capybara.current_driver != :rack_test
       DatabaseCleaner.strategy = :truncation
     else

data/spec/tasks/rake_spec.rb

@@ -11,15 +11,15 @@ RSpec.describe "Rake tasks" do
 
     it "creates a file" do
       run_task "hyrax:user:list_emails"
-      expect(File.exist?("user_emails.txt")).to be_truthy
+      expect(File).to exist("user_emails.txt")
       expect(IO.read("user_emails.txt")).to include(user1.email, user2.email)
       File.delete("user_emails.txt")
     end
 
     it "creates a file I give it" do
       run_task "hyrax:user:list_emails", "abc123.txt"
-      expect(File.exist?("user_emails.txt")).not_to be_truthy
-      expect(File.exist?("abc123.txt")).to be_truthy
+      expect(File).not_to exist("user_emails.txt")
+      expect(File).to exist("abc123.txt")
       expect(IO.read("abc123.txt")).to include(user1.email, user2.email)
       File.delete("abc123.txt")
     end

data/spec/views/hyrax/base/show.html.erb_spec.rb

@@ -49,6 +49,7 @@ RSpec.describe 'hyrax/base/show.html.erb', type: :view do
     allow(controller).to receive(:current_user).and_return(depositor)
     allow(User).to receive(:find_by_user_key).and_return(depositor.user_key)
     allow(view).to receive(:blacklight_config).and_return(Blacklight::Configuration.new)
+    allow(view).to receive(:signed_in?)
     allow(view).to receive(:on_the_dashboard?).and_return(false)
     stub_template 'hyrax/base/_metadata.html.erb' => ''
     stub_template 'hyrax/base/_relationships.html.erb' => ''

data/spec/views/hyrax/homepage/index.html.erb_spec.rb

@@ -4,15 +4,59 @@ RSpec.describe "hyrax/homepage/index.html.erb", type: :view do
   let(:presenter) { instance_double(Hyrax::HomepagePresenter) }
   let(:type_presenter) { instance_double(Hyrax::SelectTypeListPresenter, many?: true) }
 
-  describe "share your work button" do
+  before do
+    allow(view).to receive(:create_work_presenter).and_return(type_presenter)
+    allow(view).to receive(:signed_in?).and_return(signed_in)
+    allow(controller).to receive(:current_ability).and_return(ability)
+    assign(:presenter, presenter)
+    stub_template "hyrax/homepage/_marketing.html.erb" => "marketing"
+    stub_template "hyrax/homepage/_home_content.html.erb" => "home content"
+  end
+
+  describe 'meta tag with current user info' do
+    let(:realtime_notifications) { true }
+
     before do
-      allow(view).to receive(:create_work_presenter).and_return(type_presenter)
-      allow(view).to receive(:signed_in?).and_return(signed_in)
-      assign(:presenter, presenter)
+      allow(Hyrax.config).to receive(:realtime_notifications?).and_return(realtime_notifications)
+      allow(view).to receive(:on_the_dashboard?).and_return(false)
+      allow(controller).to receive(:current_user).and_return(current_user)
       allow(controller).to receive(:current_ability).and_return(ability)
+      allow(presenter).to receive(:display_share_button?).and_return(true)
+      stub_template "_controls.html.erb" => "controls"
+      stub_template "_masthead.html.erb" => "masthead"
+      render template: 'hyrax/homepage/index', layout: 'layouts/homepage'
+    end
+
+    context 'when signed in' do
+      let(:signed_in) { true }
+      let(:current_user) { create(:user) }
+
+      it 'renders' do
+        expect(rendered).to have_selector('meta[name="current-user"]', visible: false)
+      end
+
+      context 'when realtime notifications are disabled' do
+        let(:realtime_notifications) { false }
+
+        it 'does not render' do
+          expect(rendered).not_to have_selector('meta[name="current-user"]', visible: false)
+        end
+      end
+    end
+
+    context 'when not signed in' do
+      let(:signed_in) { false }
+      let(:current_user) { nil }
+
+      it 'does not render' do
+        expect(rendered).not_to have_selector('meta[name="current-user"]', visible: false)
+      end
+    end
+  end
+
+  describe "share your work button" do
+    before do
       allow(presenter).to receive(:display_share_button?).and_return(display_share_button)
-      stub_template "hyrax/homepage/_marketing.html.erb" => "marketing"
-      stub_template "hyrax/homepage/_home_content.html.erb" => "home content"
       render
     end
 

data/spec/views/pages/show.html.erb_spec.rb

@@ -3,6 +3,7 @@ RSpec.describe "hyrax/pages/show", type: :view do
 
   before do
     assign(:page, content_block)
+    allow(view).to receive(:signed_in?)
     allow(view).to receive(:displayable_content_block)
     allow(view).to receive(:can?).and_return(false)
     stub_template 'catalog/_search_form.html.erb' => ''

data/template.rb

@@ -1,4 +1,4 @@
-gem 'hyrax', '2.0.0.beta2'
+gem 'hyrax', '2.0.0.beta3'
 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.0.0.beta2
+  version: 2.0.0.beta3
 platform: ruby
 authors:
 - Justin Coyne
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-14 00:00:00.000000000 Z
+date: 2017-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -162,14 +162,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.9
+        version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.9
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
@@ -316,14 +316,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: flot-rails
   requirement: !ruby/object:Gem::Requirement
@@ -386,14 +386,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
   requirement: !ruby/object:Gem::Requirement
@@ -858,14 +858,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.16.0
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -1011,7 +1011,6 @@ files:
 - app/assets/javascripts/hyrax/batch_select.es6
 - app/assets/javascripts/hyrax/batch_select_all.js
 - app/assets/javascripts/hyrax/browse_everything.js
-- app/assets/javascripts/hyrax/channels/notifications.js
 - app/assets/javascripts/hyrax/collections.js
 - app/assets/javascripts/hyrax/collections/editor.es6
 - app/assets/javascripts/hyrax/config.js.erb